gentoo auto-resync : 07:12:2023 - 05:04:01

3 files changed, 13 insertions, 51 deletions

diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 7a9732ff0534..91652e59c94c 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,8 +1,6 @@
-DIST gallery-dl-1.26.1.gh.tar.gz 604212 BLAKE2B 980e7b8b3c8ec966bb77db7c4312398490add75580e557f4654ca3aeb62ab287599f85dc401ed5bfae4dc6124e5a87b9254904b442b3a0cc2b10acdf5ce6695a SHA512 60d32ac82df5dd837399b778c118d8f944b7f35c5dfbbe8168841f0ff76471016b6049b617fef4825b3e21b37237c58bbc9f44be3e4e7ddb9bdf97cba11154bb
 DIST gallery-dl-1.26.2.gh.tar.gz 607389 BLAKE2B 9bacfa4ba4019dbd8abd87ad868b1f6d2c56eab165633a07ba99c569962f26df6d82c96ef12c0c033792ece2084e4f5b7a2121483d51d765b828d4997780edc1 SHA512 08f0caa07f1e3fddf003658e9261e711b2a5fc0049447f36794c441f37ba01b74cc091f90378d5a649196ceba487d5dff541dbfcd86ca8c1b0551a972dc1f848
 DIST gallery-dl-1.26.3.gh.tar.gz 621229 BLAKE2B d85be6e8f3e21d5f8e18bcf70fb51f46d5672d48115bf88fb5fa3316b6e8cddca8c8c6f540f3b1529e6607d746aba98097aa95f692e98effa4e51ba4578d16aa SHA512 43891d40de26527b7195c064fda6c8303461c5e4107b0482ca535f06b8fe923513acc212bd75b4d8d82fa12e19ef214e1ee395ced1525eceda7a433d3d05fef3
-EBUILD gallery-dl-1.26.1.ebuild 1030 BLAKE2B f8eee827828a8096cb6ed53104a861a301744f3e443daf3f266b3fa608a5d0942a8b20ad7218ab121e8ec211ec33a1c1eee4f937c88824b2920fe6979c022be3 SHA512 78712cbe3a8bcda690528ceda50de032ca877e4101f989b66b9876980844240aec4c561eee93ebbfaf4b475a4965237effabf5d95b4f271c36cefc335a308c47
 EBUILD gallery-dl-1.26.2.ebuild 1030 BLAKE2B f8eee827828a8096cb6ed53104a861a301744f3e443daf3f266b3fa608a5d0942a8b20ad7218ab121e8ec211ec33a1c1eee4f937c88824b2920fe6979c022be3 SHA512 78712cbe3a8bcda690528ceda50de032ca877e4101f989b66b9876980844240aec4c561eee93ebbfaf4b475a4965237effabf5d95b4f271c36cefc335a308c47
 EBUILD gallery-dl-1.26.3.ebuild 1037 BLAKE2B d0a577a5e71be88d28c735580b24617e1d87bac48ed8ce1044991fc8eddf1044d1cb69d2bccbf40843fe0b99877cce069ae048d43f1016bd687f5a7ab8589298 SHA512 8b209c0d297af4f95c9dea25e22df7a4f3323ac1396c644b07e99a782d42f343065c846dbbc9b0c05a98d20e4b456ab5509ff7ff91b0904668509efb26425f26
-EBUILD gallery-dl-9999.ebuild 1037 BLAKE2B d0a577a5e71be88d28c735580b24617e1d87bac48ed8ce1044991fc8eddf1044d1cb69d2bccbf40843fe0b99877cce069ae048d43f1016bd687f5a7ab8589298 SHA512 8b209c0d297af4f95c9dea25e22df7a4f3323ac1396c644b07e99a782d42f343065c846dbbc9b0c05a98d20e4b456ab5509ff7ff91b0904668509efb26425f26
+EBUILD gallery-dl-9999.ebuild 1074 BLAKE2B 1b6c6fb5ef3964f88245b18be917156351251f80d6b3aa7f7c8132e9aaf7af67ae1eefd2bcc6d193e80bf9247e7ff4a6553f44cede2cb6dc17114aa6d09ecd82 SHA512 1027e4244c20acc30f9df8ddfcc9fa8efbbd94fd6375f7855e8d9dc2121eb207025820c9e4fdddab8acc176dc2e5a4d12106a5f3461123b80ecf8eb41e79f9fa
 MISC metadata.xml 747 BLAKE2B bb63a74ca71891f1e937e6bd41b4cef50f1e1d459ab389f83f881cbfcc5c39bf5c4b8e999ea6cab7406a97f3dca9644380eaf1930d811746c5b893b948085ecd SHA512 302b9f3cde6c404de62347415c1f02d6884a9327c88871ea67b986ac7eaadac6b79018d919f5e6a2d8dde5dfd9e12d6c7c4702120fb08bfbfa291df4d1baecae
diff --git a/net-misc/gallery-dl/gallery-dl-1.26.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.1.ebuild
deleted file mode 100644
index e83e798733f1..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.26.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_compile_all() {
-	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index b3da2a9c870f..b8a8623c53a8 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -4,34 +4,38 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite,ssl,xml(+)"
 
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
+HOMEPAGE="https://github.com/mikf/gallery-dl/"
 
-if [[ ${PV} == 9999 ]]; then
+if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-# Tests require network access.
-PROPERTIES="test_network"
+PROPERTIES="test_network"                       # Tests require network access.
 RESTRICT="test"
 
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests setup.py
 
 python_compile_all() {
-	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
 }
 
 pkg_postinst() {