From da47cae35ebd08b8abbc97401d7fbf2241db2921 Mon Sep 17 00:00:00 2001 From: wgjak47 Date: Tue, 20 Jun 2023 00:45:58 +0800 Subject: [PATCH 1/3] media-sound/feeluown: bump feeluown version and add new plugin --- dev-python/feeluown-bilibili/Manifest | 1 + .../feeluown-bilibili-0.1.5.ebuild | 28 ++++++++++++++++ dev-python/feeluown-bilibili/metadata.xml | 9 +++++ dev-python/fuo-local/Manifest | 1 - dev-python/fuo-local/fuo-local-0.3.ebuild | 29 ---------------- dev-python/fuo-netease/Manifest | 2 +- ...-0.9.4.ebuild => fuo-netease-0.9.6.ebuild} | 1 + dev-python/fuo-ytmusic/Manifest | 1 + .../fuo-ytmusic/fuo-ytmusic-0.2.0.ebuild | 33 +++++++++++++++++++ dev-python/fuo-ytmusic/metadata.xml | 9 +++++ dev-python/pytube/Manifest | 1 + dev-python/{fuo-local => pytube}/metadata.xml | 4 +-- dev-python/pytube/pytube-15.0.0.ebuild | 33 +++++++++++++++++++ media-sound/feeluown/Manifest | 4 +-- ...n-3.8.10.ebuild => feeluown-3.8.11.ebuild} | 7 ++-- ...wn-3.8.9.ebuild => feeluown-3.8.12.ebuild} | 7 ++-- media-sound/feeluown/metadata.xml | 3 +- 17 files changed, 131 insertions(+), 42 deletions(-) create mode 100644 dev-python/feeluown-bilibili/Manifest create mode 100644 dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild create mode 100644 dev-python/feeluown-bilibili/metadata.xml delete mode 100644 dev-python/fuo-local/Manifest delete mode 100644 dev-python/fuo-local/fuo-local-0.3.ebuild rename dev-python/fuo-netease/{fuo-netease-0.9.4.ebuild => fuo-netease-0.9.6.ebuild} (94%) create mode 100644 dev-python/fuo-ytmusic/Manifest create mode 100644 dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0.ebuild create mode 100644 dev-python/fuo-ytmusic/metadata.xml create mode 100644 dev-python/pytube/Manifest rename dev-python/{fuo-local => pytube}/metadata.xml (63%) create mode 100644 dev-python/pytube/pytube-15.0.0.ebuild rename media-sound/feeluown/{feeluown-3.8.10.ebuild => feeluown-3.8.11.ebuild} (86%) rename media-sound/feeluown/{feeluown-3.8.9.ebuild => feeluown-3.8.12.ebuild} (86%) diff --git a/dev-python/feeluown-bilibili/Manifest b/dev-python/feeluown-bilibili/Manifest new file mode 100644 index 00000000000..0ed4b29aabf --- /dev/null +++ b/dev-python/feeluown-bilibili/Manifest @@ -0,0 +1 @@ +DIST feeluown_bilibili-0.1.5.tar.gz 54756 BLAKE2B ab58acb7a55c37999b96497ea0fc82879f82f37714bf3ecac3f369973e107bb378ebe57c4feb08f3076bd544ad87a7abca75803bb9ab22fd168960e93de9c972 SHA512 e32b7ad1f9fa59fd5e61ab0b3863188c9348980ca083aed69a72655cc5ed06713d80949750038fe6646ee682c87a131feadbd8b2fcf174a37d91fa9c8a0f669d diff --git a/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild b/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild new file mode 100644 index 00000000000..b83afb57588 --- /dev/null +++ b/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 pypi + +DESCRIPTION="bilibili support for feeluown" +HOMEPAGE="https://github.com/feeluown/feeluown-bilibili" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/cachetools[${PYTHON_USEDEP}] +" + +PDEPEND=" + media-sound/feeluown +" + +python_install_all() { + distutils-r1_python_install_all +} diff --git a/dev-python/feeluown-bilibili/metadata.xml b/dev-python/feeluown-bilibili/metadata.xml new file mode 100644 index 00000000000..9270ccf2319 --- /dev/null +++ b/dev-python/feeluown-bilibili/metadata.xml @@ -0,0 +1,9 @@ + + + + + + feeluown/feeluown-bilibili + feeluown-bilibili + + diff --git a/dev-python/fuo-local/Manifest b/dev-python/fuo-local/Manifest deleted file mode 100644 index 30baefcfc26..00000000000 --- a/dev-python/fuo-local/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fuo_local-0.3.tar.gz 10498 BLAKE2B 842ae39f302c78a896ab77c5c48a43b229188ec01b2f1f53b258390ffcf4c771446bfeba60cec9e415e08f40b7b6ea2de16c0fa6a8c55129a6b237a450558362 SHA512 af656ed48bff252699d4043b8bc5b0b931f530a047f38ac649f4e2b0d27f703ee6a711fb0bed62e051ce89382628c32820a3194555489ca858cbe41396a40032 diff --git a/dev-python/fuo-local/fuo-local-0.3.ebuild b/dev-python/fuo-local/fuo-local-0.3.ebuild deleted file mode 100644 index 98e43ede1e7..00000000000 --- a/dev-python/fuo-local/fuo-local-0.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="local music support for feeluown" -HOMEPAGE="https://github.com/feeluown/feeluown-local" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/marshmallow[${PYTHON_USEDEP}] - dev-python/fuzzywuzzy[${PYTHON_USEDEP}] - media-libs/mutagen[${PYTHON_USEDEP}] -" - -PDEPEND=" - media-sound/feeluown -" - -python_install_all() { - distutils-r1_python_install_all -} diff --git a/dev-python/fuo-netease/Manifest b/dev-python/fuo-netease/Manifest index 4a7ed1cb654..4b1b1625e4c 100644 --- a/dev-python/fuo-netease/Manifest +++ b/dev-python/fuo-netease/Manifest @@ -1 +1 @@ -DIST fuo_netease-0.9.4.tar.gz 32991 BLAKE2B 8ca38e6202ad09169a85678e17f1f3fdb1123e33e9e9d65ed6061195249bcb445d7bfb44770511294e9acc7f599fe22e495660cf18935ff0fe6ae029c168fd9c SHA512 11f76786f8c1ef6b19f81c936f8387e9938ee62b07f562cbaff9cc12b4fc6240b0561d3219ac4b447449fe580457019d6d0c5e1433ce1622636f5fd0389e6f6b +DIST fuo_netease-0.9.6.tar.gz 32501 BLAKE2B 1069fa1d51c48998f5d7705ed8e2bf631ad0f642b4a1559e6f1f0444533e162f4d52062a7bcc5e97e02f26ed8d693fe8f2ffebf9879481d2d7e68f015aee5878 SHA512 9de056d4715760dac68c33d16b03e16c38b5bab0630ae1b2d58a4153af4e27118ae17f10dc55c05faebd548626a0f683c41fd2bee2944c14f1537580bd8df650 diff --git a/dev-python/fuo-netease/fuo-netease-0.9.4.ebuild b/dev-python/fuo-netease/fuo-netease-0.9.6.ebuild similarity index 94% rename from dev-python/fuo-netease/fuo-netease-0.9.4.ebuild rename to dev-python/fuo-netease/fuo-netease-0.9.6.ebuild index de89766b961..cfc3bad398b 100644 --- a/dev-python/fuo-netease/fuo-netease-0.9.4.ebuild +++ b/dev-python/fuo-netease/fuo-netease-0.9.6.ebuild @@ -19,6 +19,7 @@ RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/pycryptodome[${PYTHON_USEDEP}] + media-libs/mutagen[${PYTHON_USEDEP}] " PDEPEND=" diff --git a/dev-python/fuo-ytmusic/Manifest b/dev-python/fuo-ytmusic/Manifest new file mode 100644 index 00000000000..7da934f6d97 --- /dev/null +++ b/dev-python/fuo-ytmusic/Manifest @@ -0,0 +1 @@ +DIST fuo-ytmusic-0.2.0.gh.tar.gz 53182 BLAKE2B 3545d8ea2e0333636deab29d33459d1e42efd92bed65a478a371b9853ecebf8a9e1448e773efd10631e4fb46c4c5a9f3761d1ede8b7c7fa5a1e3f8395f0b9ca7 SHA512 01e6f73581646a94925488fc885210d14a15f863f47c8ab560c5dcb0544acc1d61f16a1c0716a67e7c560c4584cbdfa31d54f09bfa29cc07cb2575428fedcd24 diff --git a/dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0.ebuild b/dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0.ebuild new file mode 100644 index 00000000000..22c28cd1bee --- /dev/null +++ b/dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 + +DESCRIPTION="youtube music support for feeluown" +HOMEPAGE="https://github.com/feeluown/feeluown-ytmusic" + +S="${WORKDIR}/feeluown-ytmusic-${PV}" +SRC_URI="https://github.com/feeluown/feeluown-ytmusic/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/cachetools[${PYTHON_USEDEP}] + dev-python/pytube[${PYTHON_USEDEP}] + dev-python/ytmusicapi[${PYTHON_USEDEP}] +" + +PDEPEND=" + media-sound/feeluown +" + +python_install_all() { + distutils-r1_python_install_all +} diff --git a/dev-python/fuo-ytmusic/metadata.xml b/dev-python/fuo-ytmusic/metadata.xml new file mode 100644 index 00000000000..cb00e068a29 --- /dev/null +++ b/dev-python/fuo-ytmusic/metadata.xml @@ -0,0 +1,9 @@ + + + + + + feeluown/feeluown-ytmusic + fuo-ytmusic + + diff --git a/dev-python/pytube/Manifest b/dev-python/pytube/Manifest new file mode 100644 index 00000000000..1488dded26b --- /dev/null +++ b/dev-python/pytube/Manifest @@ -0,0 +1 @@ +DIST pytube-15.0.0.tar.gz 67229 BLAKE2B 6894ec98c9c41ce42479278d47e3de2ee3564f670cb0a85e6591af152484ae2cbdc1d6e9613977c76bebe42ba963e0ab707ad99def5d4b1c0c50c2b82d2dae86 SHA512 68174a3392e5f2ff3059dc1f301783b1ce0a0334044b9e96b6066052066b3c3cee93bfc87449d10589795b3e43055cf6d629f1cac21bfc9ea2c4249b5f264c26 diff --git a/dev-python/fuo-local/metadata.xml b/dev-python/pytube/metadata.xml similarity index 63% rename from dev-python/fuo-local/metadata.xml rename to dev-python/pytube/metadata.xml index f0aa3a2edab..e28e53131dc 100644 --- a/dev-python/fuo-local/metadata.xml +++ b/dev-python/pytube/metadata.xml @@ -3,7 +3,7 @@ - feeluown/feeluown-local - fuo-local + pytube/pytube + pytube diff --git a/dev-python/pytube/pytube-15.0.0.ebuild b/dev-python/pytube/pytube-15.0.0.ebuild new file mode 100644 index 00000000000..86577c94dc8 --- /dev/null +++ b/dev-python/pytube/pytube-15.0.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} pypy3 ) + +inherit distutils-r1 pypi + +DESCRIPTION=" A lightweight, dependency-free Python library (and command-line utility) for downloading YouTube Videos. " +HOMEPAGE="https://github.com/pytube/pytube" +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="Unlicense license" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + ) +" + +python_test() { + py.test -v || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all +} diff --git a/media-sound/feeluown/Manifest b/media-sound/feeluown/Manifest index fa7699de76b..d54dea1ce17 100644 --- a/media-sound/feeluown/Manifest +++ b/media-sound/feeluown/Manifest @@ -1,2 +1,2 @@ -DIST feeluown-3.8.10.gh.tar.gz 1054985 BLAKE2B af3d6ae79c7cdf49fe855a050cd1ab1f49152bc72ab576b11e3d6d123883ba58a5dd2f97a1022d7b486b6135d2f759f0217ccdd47d70eb69cb1938b58a6d1b4c SHA512 822c24613d429aef976f074e571dde75d34e41884552cd6a54f57f4c9b89a2d93c6c81ebbe29d69783e66bf57419ef5ef5aa2fdc6babf40d7e3533169daae3f7 -DIST feeluown-3.8.9.gh.tar.gz 1049059 BLAKE2B ee8312baa041370eef1a48cbb6aa259222c14f46fdda12e08a3ae306f244306fa71556986e7dadf17c196e406517b6c3b11f0610381c1689c48c7edbcb1eb50a SHA512 dad507bc19a202afbb780222bb84833ac51f59b1a703a2ffd8efb1c0f801dd871e5de9739fec2836c77358e94bce56d3ecb49d8a5c72bde7419d9bf2bd312fc2 +DIST feeluown-3.8.11.gh.tar.gz 1061564 BLAKE2B 42f4c20d117b8c4807b09e9e5d37f56e3e0ce78073815f76fa316084b4e04f5f6c882fb0c50b19d672f3cce1dc8892fd01ff57dad5be0dd8f52e26dd31827742 SHA512 62f7c8df4c4e73c95ec02636a0c4f76a5944e2116ad881183355aafe374e3086066ade01cc2f25ce7b58eef1a45079b461146275bd6c363a739e99957b73063e +DIST feeluown-3.8.12.gh.tar.gz 1065252 BLAKE2B 813cdb2dc17e8c2596d12d56d4b99a2a9bc6f72f1369c86ab2ea90eb9cf33689227e709e740891e0cd877d24784fbccef9f3c785eb0cf65795ddee4ae57652a6 SHA512 83292cda3eeeeb0d2e2fed45ec7b52222c5cf94718978c3fe2e50012fd6a94ab4bcb2ed492a86975b3e83ae306cdf2f237b932649ddc13d2d39d2d9361726d7b diff --git a/media-sound/feeluown/feeluown-3.8.10.ebuild b/media-sound/feeluown/feeluown-3.8.11.ebuild similarity index 86% rename from media-sound/feeluown/feeluown-3.8.10.ebuild rename to media-sound/feeluown/feeluown-3.8.11.ebuild index c6844d22d56..7430f5672e3 100644 --- a/media-sound/feeluown/feeluown-3.8.10.ebuild +++ b/media-sound/feeluown/feeluown-3.8.11.ebuild @@ -3,7 +3,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 desktop @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/FeelUOwn/archive/refs/tags/v${PV}.tar.gz -> ${ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="+netease +local +qqmusic +kuwo +webengine" +IUSE="+netease +qqmusic +kuwo +webengine +ytmusic +bilibili" RDEPEND=" dev-python/janus[${PYTHON_USEDEP}] @@ -32,9 +32,10 @@ RDEPEND=" PDEPEND=" media-video/mpv[libmpv] netease? ( dev-python/fuo-netease[${PYTHON_USEDEP}] ) - local? ( dev-python/fuo-local[${PYTHON_USEDEP}] ) qqmusic? ( dev-python/fuo-qqmusic[${PYTHON_USEDEP}] ) kuwo? ( dev-python/fuo-kuwo[$PYTHON_USEDEP] ) + bilibili? ( dev-python/feeluown-bilibili[$PYTHON_USEDEP] ) + ytmusic? ( dev-python/fuo-ytmusic[$PYTHON_USEDEP] ) webengine? ( dev-python/PyQtWebEngine[$PYTHON_USEDEP] ) " diff --git a/media-sound/feeluown/feeluown-3.8.9.ebuild b/media-sound/feeluown/feeluown-3.8.12.ebuild similarity index 86% rename from media-sound/feeluown/feeluown-3.8.9.ebuild rename to media-sound/feeluown/feeluown-3.8.12.ebuild index c6844d22d56..0de882a47df 100644 --- a/media-sound/feeluown/feeluown-3.8.9.ebuild +++ b/media-sound/feeluown/feeluown-3.8.12.ebuild @@ -3,7 +3,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 desktop @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/FeelUOwn/archive/refs/tags/v${PV}.tar.gz -> ${ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="+netease +local +qqmusic +kuwo +webengine" +IUSE="+netease +qqmusic +kuwo +webengine +ytmusic +bilibili" RDEPEND=" dev-python/janus[${PYTHON_USEDEP}] @@ -32,10 +32,11 @@ RDEPEND=" PDEPEND=" media-video/mpv[libmpv] netease? ( dev-python/fuo-netease[${PYTHON_USEDEP}] ) - local? ( dev-python/fuo-local[${PYTHON_USEDEP}] ) qqmusic? ( dev-python/fuo-qqmusic[${PYTHON_USEDEP}] ) kuwo? ( dev-python/fuo-kuwo[$PYTHON_USEDEP] ) webengine? ( dev-python/PyQtWebEngine[$PYTHON_USEDEP] ) + ytmusic? ( dev-python/fuo-ytmusic[$PYTHON_USEDEP] ) + bilibili? ( dev-python/feeluown-bilibili[$PYTHON_USEDEP] ) " DEPEND=" diff --git a/media-sound/feeluown/metadata.xml b/media-sound/feeluown/metadata.xml index fada36029f1..231a8cb1d7d 100644 --- a/media-sound/feeluown/metadata.xml +++ b/media-sound/feeluown/metadata.xml @@ -6,10 +6,11 @@ add kuwo music support for feeluown - add local music support for feeluown add netease cloud music support for feeluown add qq music support for feeluown add support to login via web page + add support for bilibili + add support for youtube music feeluown/FeelUOwn From 9d36b976cc1b69a9dc2f24990f84824b4815d590 Mon Sep 17 00:00:00 2001 From: wgjak47 Date: Tue, 20 Jun 2023 23:13:58 +0800 Subject: [PATCH 2/3] dev-python/feeluown-bilibili: patch feeluown bilibili to replace pycryptodomex --- .../feeluown-bilibili-0.1.5.ebuild | 4 ++ ...bilibili-0.1.5-replace-pycryptodomex.patch | 55 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 dev-python/feeluown-bilibili/files/feeluown-bilibili-0.1.5-replace-pycryptodomex.patch diff --git a/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild b/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild index b83afb57588..271b000fb68 100644 --- a/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild +++ b/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild @@ -23,6 +23,10 @@ PDEPEND=" media-sound/feeluown " +PATCHES=( + "${FILESDIR}/${PN}-0.1.5-replace-pycryptodomex.patch" +) + python_install_all() { distutils-r1_python_install_all } diff --git a/dev-python/feeluown-bilibili/files/feeluown-bilibili-0.1.5-replace-pycryptodomex.patch b/dev-python/feeluown-bilibili/files/feeluown-bilibili-0.1.5-replace-pycryptodomex.patch new file mode 100644 index 00000000000..426023c9aee --- /dev/null +++ b/dev-python/feeluown-bilibili/files/feeluown-bilibili-0.1.5-replace-pycryptodomex.patch @@ -0,0 +1,55 @@ +From debeec6349611107f8421ef7f4c5cbf1effac4b7 Mon Sep 17 00:00:00 2001 +From: wgjak47 +Date: Tue, 20 Jun 2023 21:58:45 +0800 +Subject: [PATCH] feat: replace pycryptodomex with pycryptodome + +--- + fuo_bilibili/util.py | 4 +- + pyproject.toml | 2 +- + setup.py | 2 +- + 5 files changed, 205 insertions(+), 244 deletions(-) + +diff --git a/fuo_bilibili/util.py b/fuo_bilibili/util.py +index bc9db3d..576ff6c 100644 +--- a/fuo_bilibili/util.py ++++ b/fuo_bilibili/util.py +@@ -11,8 +11,8 @@ def rsa_encrypt(text: str, public_key: str) -> str: + :return: + """ + import base64 +- from Cryptodome.PublicKey import RSA +- from Cryptodome.Cipher import PKCS1_v1_5 ++ from Crypto.PublicKey import RSA ++ from Crypto.Cipher import PKCS1_v1_5 + key = RSA.import_key(public_key.encode()) + encrypted = PKCS1_v1_5.new(key).encrypt(text.encode()) + return base64.b64encode(encrypted).decode() +diff --git a/poetry.lock b/poetry.lock +index 752b3e7..127cb3b 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -14,7 +14,7 @@ python = "^3.10" + feeluown = ">=3.8.7" + cachetools = "*" + beautifulsoup4 = "*" +-pycryptodomex = "*" ++pycryptodome = "*" + + [tool.poetry.dev-dependencies] + pytest = "*" +diff --git a/setup.py b/setup.py +index 0f696b6..4e629ae 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,7 +11,7 @@ package_data = \ + {'': ['*'], 'fuo_bilibili': ['assets/*']} + + install_requires = \ +-['beautifulsoup4', 'cachetools', 'feeluown>=3.8.7', 'pycryptodomex'] ++['beautifulsoup4', 'cachetools', 'feeluown>=3.8.7', 'pycryptodome'] + + entry_points = \ + {'fuo.plugins_v1': ['bilibili = fuo_bilibili']} +-- +2.39.3 + From ed5ee50eaaa7628aba9de8b52ce34cb75cb5281d Mon Sep 17 00:00:00 2001 From: wgjak47 Date: Tue, 20 Jun 2023 23:29:31 +0800 Subject: [PATCH 3/3] */*: fix pkgcheck error dev-python/*: fix pkgcheck error */*: remove python 3.12 support dev-python/fuo-ytmusic: fix ytmusic PEP517 net-misc/apifox: bump version to 2.3.1 dev-db/dbeaver-bin: bump version to 23.1.0 bump feeluown and add new plugin (bilibili & youtube music) (#3361) * media-sound/feeluown: bump feeluown version and add new plugin * dev-python/feeluown-bilibili: patch feeluown bilibili to replace pycryptodomex * */*: fix pkgcheck error * dev-python/*: fix pkgcheck error * */*: remove python 3.12 support x11-misc/ly: add 0.6.0, drop 0.5.3 Signed-off-by: Linerre remove old version --- dev-db/dbeaver-bin/Manifest | 4 +- ...3.0.1.ebuild => dbeaver-bin-23.1.0.ebuild} | 0 .../feeluown-bilibili-0.1.5.ebuild | 1 + .../fuo-netease/fuo-netease-0.9.6.ebuild | 2 +- .../fuo-qqmusic/fuo-qqmusic-0.4.1.ebuild | 4 +- ...2.0.ebuild => fuo-ytmusic-0.2.0-r1.ebuild} | 3 +- dev-python/pytube/pytube-15.0.0.ebuild | 4 +- net-misc/apifox/Manifest | 2 +- ...pifox-2.3.0.ebuild => apifox-2.3.1.ebuild} | 0 x11-misc/ly/Manifest | 7 ++- x11-misc/ly/ly-0.5.3.ebuild | 32 ------------ x11-misc/ly/ly-0.6.0.ebuild | 52 +++++++++++++++++++ 12 files changed, 69 insertions(+), 42 deletions(-) rename dev-db/dbeaver-bin/{dbeaver-bin-23.0.1.ebuild => dbeaver-bin-23.1.0.ebuild} (100%) rename dev-python/fuo-ytmusic/{fuo-ytmusic-0.2.0.ebuild => fuo-ytmusic-0.2.0-r1.ebuild} (91%) rename net-misc/apifox/{apifox-2.3.0.ebuild => apifox-2.3.1.ebuild} (100%) delete mode 100644 x11-misc/ly/ly-0.5.3.ebuild create mode 100644 x11-misc/ly/ly-0.6.0.ebuild diff --git a/dev-db/dbeaver-bin/Manifest b/dev-db/dbeaver-bin/Manifest index 0374a6958ca..c45d87277d3 100644 --- a/dev-db/dbeaver-bin/Manifest +++ b/dev-db/dbeaver-bin/Manifest @@ -1,2 +1,2 @@ -DIST dbeaver-bin-23.0.1-amd64.tar.gz 81918738 BLAKE2B 21eba58d16c6a9700f8e2ae061183f538ba6a58b0db8983326524eb8f1c82851c7cba8d75851a9a10f59d0a3ab1f5346f0c0af3389dc7d227a27c835bf153a28 SHA512 3fcacca52ddf7104a949e2945dedaa62f23355fbad1245b98cc8d13b43c03a15c263a8b28c2616054b4bd7787de04db46c3870758bd2c978f5385f233ff3333b -DIST dbeaver-bin-23.0.1-arm64.tar.gz 81856015 BLAKE2B 37e9a3e390f77de08d0799dfe6cf0b347e389fcc854b364c5e33117505c3cc1e7afb4db6520d3f332ab0806be4c538adb71394c6e6be190aaf2b87c343511e6c SHA512 6fc4aafb5b92aa4dc776a5777a7f31509502922f685cb8ed86eb108f92d7287a0ebd0127795d3d9334fca3f0913a8d376b81319ee865da790c95beaf623ea6b0 +DIST dbeaver-bin-23.1.0-amd64.tar.gz 84274129 BLAKE2B 2b7b7cff51896801c6908412997ae31bbc9198b06ac75b0f046bf71cf81aa1a2481b2b010334fc9b9a0023d9e03a1fcf328d27ec7696e84d82ba718a8ffef6da SHA512 d5e924bd8bb099701413e2507feebbf7cc1b22724569d278ed31446f0ed3fa71fa2eddd0f26c7f65f6b71f992dd58d3307d288322f81081aa3f6f28b0c2852bd +DIST dbeaver-bin-23.1.0-arm64.tar.gz 84211872 BLAKE2B acc5402991435a60d6ef908f8a128db687f85cbd8364a19eeb7c35de6ad4a7402e7e49cabbad43eedda74c0091368e35927e3316a5b86481f9b5370e767c9b15 SHA512 529c5d3b1a5a2ef974a84e19970e95c9092f54d00c6e2dc0681425c5d0c4239a5540b4a2eee5d103abba3e0c564cd0186b6bb6ad9c7cc8449bca06dfd9fe80c3 diff --git a/dev-db/dbeaver-bin/dbeaver-bin-23.0.1.ebuild b/dev-db/dbeaver-bin/dbeaver-bin-23.1.0.ebuild similarity index 100% rename from dev-db/dbeaver-bin/dbeaver-bin-23.0.1.ebuild rename to dev-db/dbeaver-bin/dbeaver-bin-23.1.0.ebuild diff --git a/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild b/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild index 271b000fb68..eba2b4845db 100644 --- a/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild +++ b/dev-python/feeluown-bilibili/feeluown-bilibili-0.1.5.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 +DISTUTILS_USE_PEP517=poetry PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 pypi diff --git a/dev-python/fuo-netease/fuo-netease-0.9.6.ebuild b/dev-python/fuo-netease/fuo-netease-0.9.6.ebuild index cfc3bad398b..e5010c7ddbb 100644 --- a/dev-python/fuo-netease/fuo-netease-0.9.6.ebuild +++ b/dev-python/fuo-netease/fuo-netease-0.9.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..11} pypy) inherit distutils-r1 pypi diff --git a/dev-python/fuo-qqmusic/fuo-qqmusic-0.4.1.ebuild b/dev-python/fuo-qqmusic/fuo-qqmusic-0.4.1.ebuild index 9db01e9d2d1..14d59e3614b 100644 --- a/dev-python/fuo-qqmusic/fuo-qqmusic-0.4.1.ebuild +++ b/dev-python/fuo-qqmusic/fuo-qqmusic-0.4.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..11} pypy) inherit distutils-r1 pypi diff --git a/dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0.ebuild b/dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0-r1.ebuild similarity index 91% rename from dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0.ebuild rename to dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0-r1.ebuild index 22c28cd1bee..30de59873d0 100644 --- a/dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0.ebuild +++ b/dev-python/fuo-ytmusic/fuo-ytmusic-0.2.0-r1.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{10..11} pypy) inherit distutils-r1 diff --git a/dev-python/pytube/pytube-15.0.0.ebuild b/dev-python/pytube/pytube-15.0.0.ebuild index 86577c94dc8..76d6b385c92 100644 --- a/dev-python/pytube/pytube-15.0.0.ebuild +++ b/dev-python/pytube/pytube-15.0.0.ebuild @@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{9..11} pypy3 ) inherit distutils-r1 pypi -DESCRIPTION=" A lightweight, dependency-free Python library (and command-line utility) for downloading YouTube Videos. " +DESCRIPTION="Python tools for downloading YouTube Videos" HOMEPAGE="https://github.com/pytube/pytube" IUSE="test" RESTRICT="!test? ( test )" -LICENSE="Unlicense license" +LICENSE="Unlicense" SLOT="0" KEYWORDS="~amd64" diff --git a/net-misc/apifox/Manifest b/net-misc/apifox/Manifest index 7875892352c..353fa017aac 100644 --- a/net-misc/apifox/Manifest +++ b/net-misc/apifox/Manifest @@ -1 +1 @@ -DIST apifox-2.3.0-amd64.zip 174895027 BLAKE2B 0edfa098fa255e9d2ef56d2f825a81fecc9161482148e0074b343ab0f456f1f135fc513b1ec63460c1d0acedb8bfde8455cf510d19baac7716a83828b12cb62c SHA512 9f6e2f2deb1899b73a9a335906ecb39d5c3bdd85ac91a6c2e65ef5d6e40a2514f496447067977ec7caf0d8f865a02522aa54b84d739dfe60223aff621f4fa594 +DIST apifox-2.3.1-amd64.zip 175609766 BLAKE2B f67fe0f88ffb9ea000dfba7d7ec8dfdaf95175dbb75041ed9a94103a151bebb130fca693d1e0da405f1948e307b2210494b9f01a6bab7791ae5676f6bc6133fd SHA512 54c99d418eb9b7f110ae519e75163ede7ece132e25b17cc6f73c8f03c418704ed51c42c3f29ec534770a08f93a02ec587916117ee3ae22f354b5bd1e0d78494e diff --git a/net-misc/apifox/apifox-2.3.0.ebuild b/net-misc/apifox/apifox-2.3.1.ebuild similarity index 100% rename from net-misc/apifox/apifox-2.3.0.ebuild rename to net-misc/apifox/apifox-2.3.1.ebuild diff --git a/x11-misc/ly/Manifest b/x11-misc/ly/Manifest index 698bf9d5e67..51241cfcdca 100644 --- a/x11-misc/ly/Manifest +++ b/x11-misc/ly/Manifest @@ -1 +1,6 @@ -DIST ly-0.5.3.tar.gz 22464 BLAKE2B 3065f20c34e07292194e060c805c2f98c601f0c607fa769589f0edc38ce0484de404feb3ee6c7dfde627b7870c7649d2c3da54ba915f89ea85f97b97ae9798b5 SHA512 09456d3ed34ad7e6b859c1def02cd1595f663356dec5e0037fac9f91aa526e7a252de6676c9bfcd4eb1e0c5b3c302344dc523239e313cbf107b6a4119fe261c7 +DIST argoat.tar.gz 5382 BLAKE2B ed4b98064f1b664f1e8bff8e6cdc15da48e22a63353bc42a3bc9533168e2311d6a0f5ff0e401a8d3b56cdd34c54b2bbff6a4aca010bf27f914460577fa0dc130 SHA512 c82b39c2fcc152076528ffebd3e62d7d69e171853077a2ab6d6e4b8df49942bad7fe2817736b76630fb813fc1bf44b16d25bf78a0addf81448427288b9935dda +DIST configator.tar.gz 4504 BLAKE2B 481b3ada0783ed0a1ff7d63886594443acc8a35617d4b9f4e02c1491c7397a802fc7776037b09e77d19b02d93f92b9e208aa08d52092435628b464c7c364cad6 SHA512 0ecb0590fb29dd1c2468cbffb5b3a1ff8720543b8802b0af903c48f64c4bee76c3105166c25c900ab168ab86de63cefbe1d20bb80b80a91e8448f7848a995d0b +DIST dragonfail.tar.gz 3646 BLAKE2B 033ba605dcd8d1b49fe0be07ef44606b08f1cf694e293e533254b9dde50c5ec30608a6151731ee99d3ac02fa0a8944f8d06107885736fd0dd6f5aac9e6b36761 SHA512 d68a6bfe21e07901e5c4c6c21b1aaf1397ed60f9aa59525c894970dfd78f174d52892df86ba84d13df859c8dbd863e1de1a1e6b4f1069dcc843eebaae56f5730 +DIST ly-0.6.0.tar.gz 32706 BLAKE2B 7322239ac6245d4df9f4857275d42361b594acf54e4d5e61634d42dedf8a2b36582566bad60e323d368510352a732c44e2373e458b19cde6b47d9473ef8f3ffe SHA512 a59d2ae8002a657ebdd72b8918f7d47504fbc49480dcd881da8f87550c595c89526e4117672ed4fbf1f6d5542819055b5d65658fb2bcd9b708271645df3d06d1 +DIST termbox_next.tar.gz 23489 BLAKE2B b6866bd442af45ac56acd362b273f63f50c112bbfd4011c09605c21c83f30db76016fcf14a58787cba27912af71009578a92b8ee1850bf215a1dc95d4dd2483b SHA512 8e69f3c886cc70601289f1e50b2a5fb9cc3eeb8eed2090cdd2e08114ab1d629fd8fe83e217eb0b189c0cfa58b397baf3b30409f712d64c8a4f208a1fffd4e7db +DIST testoasterror.tar.gz 3362 BLAKE2B 3868b5a4d37439ee28c5a8f320d2b3ff81d7a4af16eec7e8e2c5015d7e512cbe2f16f8f228e2f202aed01b86739b59a2211832911f753d04269547824c56775d SHA512 ac4eab7517ac46eac6dbdcb8123679c75f8a2a8ff794016de26af9db2994b63d3de12107eb0c5473836606fbf1cbc2ff149c69cdb6c29cf8d3d5d4a49bfae11d diff --git a/x11-misc/ly/ly-0.5.3.ebuild b/x11-misc/ly/ly-0.5.3.ebuild deleted file mode 100644 index 8f5a343ae07..00000000000 --- a/x11-misc/ly/ly-0.5.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit git-r3 - -DESCRIPTION="Ly - a TUI display manager" -HOMEPAGE="https://github.com/nullgemm/ly" -SRC_URI="https://github.com/nullgemm/ly/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_CHECKOUT_DIR="${S}/sub" - -LICENSE="WTFPL-2" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="sys-libs/pam - x11-libs/libxcb - x11-base/xorg-server - x11-apps/xauth" -RDEPEND="${DEPEND}" -BDEPEND="" - -src_unpack() { - if [[ -n ${A} ]]; then - unpack ${A} || die - fi - for _i in argoat configator dragonfail termbox_next; do - git-r3_fetch ${HOMEPAGE%ly}${_i} || die - git-r3_checkout ${HOMEPAGE%ly}${_i} ${EGIT_CHECKOUT_DIR}/${_i} || die - done -} diff --git a/x11-misc/ly/ly-0.6.0.ebuild b/x11-misc/ly/ly-0.6.0.ebuild new file mode 100644 index 00000000000..dca174c556a --- /dev/null +++ b/x11-misc/ly/ly-0.6.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Latest hash of each submodule's master branch +ARGOAT="e1844c4c94b70bb351ec2bd2ac6bb320ee793d8f" +CONFIGATOR="8cec1786196ae6f6a8b35e66181277457f2a2bb2" +DRAGONFAIL="15bd3299bf3e49bd6734bff385cb0392cd2fa502" +TERMBOX="d961a8122210010e7c2c8f201e61170c13d319b4" +TESTOASTERROR="ee7c9d031d4632a6f381a6c174a38539bac04068" + +DESCRIPTION="Ly - a TUI display manager" +HOMEPAGE="https://github.com/nullgemm/ly" +SRC_URI="https://github.com/nullgemm/ly/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz +https://github.com/nullgemm/argoat/archive/${ARGOAT}.tar.gz -> argoat.tar.gz +https://github.com/nullgemm/configator/archive/${CONFIGATOR}.tar.gz -> configator.tar.gz +https://github.com/nullgemm/dragonfail/archive/${DRAGONFAIL}.tar.gz -> dragonfail.tar.gz +https://github.com/nullgemm/termbox_next/archive/${TERMBOX}.tar.gz -> termbox_next.tar.gz +https://github.com/nullgemm/testoasterror/archive/${TESTOASTERROR}.tar.gz -> testoasterror.tar.gz +" +SUB="${S}/sub/" + +LICENSE="WTFPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="sys-libs/pam + x11-libs/libxcb + x11-base/xorg-server + x11-apps/xauth" +RDEPEND="${DEPEND}" +BDEPEND="" + +src_unpack() { + if [[ -n ${A} ]]; then + unpack ${A} || die + fi + + # Trim commit ids + for _i in argoat configator dragonfail termbox_next testoasterror; do + mv ${_i}-* ${_i} || die + done + + # Move testoasterror to argoat/sub + cp -r testoasterror argoat/sub/ || die + + # Move submodules to ly's sub dir + for _i in argoat configator dragonfail termbox_next; do + cp -r ${_i} ${SUB} || die + done +}