gentoo auto-resync : 23:03:2024 - 01:00:42

5 files changed, 19 insertions, 53 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 67d033d8e3d4..5d1d3157c29a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 86e84fc695c2..8080213a26d9 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,6 +1,4 @@
-DIST gallery-dl-1.26.7.gh.tar.gz 649312 BLAKE2B b9b493c03c459d9ff0fafce8d48b9fef075d17cc5b1d7133f2f24841ddf0af96297c284d114088825afa3b4be6499ac98b2be44aabe11d31d27ea0718d5cd453 SHA512 fdd00e43d91c5ab577f21f874ddbaa18031af308c8ca7ee8996a0b816ab9f9d422cb870467f83b3c2ce5f943727fd26af4e5597cd808fbef2df88a874bcbd9bc
 DIST gallery-dl-1.26.8.gh.tar.gz 659327 BLAKE2B f0d394c077fefda91fce494fa8bd6ef369a634f06f3303c4f91009b3d5d381a40aa8918e639ed6faddc9000d5a3091a569124d62b794d727c46354bc144c8b63 SHA512 f8093d8e51c815333a182d1cdf5134d2e54d10b44067a0130943993d63e49d4e51d5bb9eb1704b7999639e73ae8ab4cadb6a8d0fb444abbe26ffdc445e5cdb5f
-EBUILD gallery-dl-1.26.7.ebuild 1067 BLAKE2B a36dbbd2236c7319589d7879ae74a492ef85863d8bcb2b0bafad1626ccc651d5da110acef1804066e0e81a13917482ad9b2ab94c468013e7516916b69a116d90 SHA512 1455ab65c6951d6a82868f233717e99cebf4ef407068429bb38755478f13adc7664974cae7983ca8a7fe5c0a1ad278870e99e6011f61f433cc7b5b7a9f989330
-EBUILD gallery-dl-1.26.8.ebuild 1067 BLAKE2B a36dbbd2236c7319589d7879ae74a492ef85863d8bcb2b0bafad1626ccc651d5da110acef1804066e0e81a13917482ad9b2ab94c468013e7516916b69a116d90 SHA512 1455ab65c6951d6a82868f233717e99cebf4ef407068429bb38755478f13adc7664974cae7983ca8a7fe5c0a1ad278870e99e6011f61f433cc7b5b7a9f989330
-EBUILD gallery-dl-9999.ebuild 1074 BLAKE2B 1b6c6fb5ef3964f88245b18be917156351251f80d6b3aa7f7c8132e9aaf7af67ae1eefd2bcc6d193e80bf9247e7ff4a6553f44cede2cb6dc17114aa6d09ecd82 SHA512 1027e4244c20acc30f9df8ddfcc9fa8efbbd94fd6375f7855e8d9dc2121eb207025820c9e4fdddab8acc176dc2e5a4d12106a5f3461123b80ecf8eb41e79f9fa
+EBUILD gallery-dl-1.26.8.ebuild 1135 BLAKE2B 3c2d4c20d3ceaa605b7a3f995e9829c83ccb8359e752e9e693fe4183fe6fa13fdfeef89e82ec6d075174bc960cb0d0347b65f06d366626c93ab941844b36e531 SHA512 3f1092f2fda60dfe920456ca40ca03f4ffb6c0d4afe956b36ba48a3b7805297b18299caa2fd44d6ea4d2ca79ce2abf23d426498ccd4387512729c57afbc982ef
+EBUILD gallery-dl-9999.ebuild 1238 BLAKE2B 0a9c63bbefc8c478353fdcbeb4e2f6d551f48294cb6379189e832edf75bb6bd37c837bed4749302666d5f92bd475d333f4673ee74971fbc300f8fa3f2849436b SHA512 8ddeb85ffc5ce52a7ca2fb1a13f40e8e94d7918b7319dde1206ddf1c9c7738aa19be10ed24130f9e35d1f1e89d37925cea65a495ae1cad3d63bb66327e05d61e
 MISC metadata.xml 747 BLAKE2B bb63a74ca71891f1e937e6bd41b4cef50f1e1d459ab389f83f881cbfcc5c39bf5c4b8e999ea6cab7406a97f3dca9644380eaf1930d811746c5b893b948085ecd SHA512 302b9f3cde6c404de62347415c1f02d6884a9327c88871ea67b986ac7eaadac6b79018d919f5e6a2d8dde5dfd9e12d6c7c4702120fb08bfbfa291df4d1baecae
diff --git a/net-misc/gallery-dl/gallery-dl-1.26.7.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.7.ebuild
deleted file mode 100644
index 736c8bce293d..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.26.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/"
-
-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"
-PROPERTIES="test_network"                       # Tests require network access.
-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-1.26.8.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild
index 736c8bce293d..310c7066bc74 100644
--- a/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild
@@ -25,14 +25,19 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-PROPERTIES="test_network"                       # Tests require network access.
-RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Tests against real servers, some tests always fail and some are subject to change.
+	rm test/test_results.py || die
+
+	distutils-r1_src_prepare
+}
 
 python_compile_all() {
 	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index b8a8623c53a8..fc74f32338d2 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,7 +32,14 @@ RDEPEND="
 	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Tests against real servers, some tests always fail and some are subject to change.
+	rm test/test_results.py || die
+
+	distutils-r1_src_prepare
+}
 
 python_compile_all() {
 	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man