gentoo auto-resync : 25:03:2024 - 07:01:01

8 files changed, 66 insertions, 9 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 80a713d9f32a..9dce984ec9f1 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 8080213a26d9..70e96dfe9587 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,4 +1,6 @@
 DIST gallery-dl-1.26.8.gh.tar.gz 659327 BLAKE2B f0d394c077fefda91fce494fa8bd6ef369a634f06f3303c4f91009b3d5d381a40aa8918e639ed6faddc9000d5a3091a569124d62b794d727c46354bc144c8b63 SHA512 f8093d8e51c815333a182d1cdf5134d2e54d10b44067a0130943993d63e49d4e51d5bb9eb1704b7999639e73ae8ab4cadb6a8d0fb444abbe26ffdc445e5cdb5f
+DIST gallery-dl-1.26.9.gh.tar.gz 670467 BLAKE2B 849d20ff6fd802915b3bc4f6bb11d638d1e8f24f1dbdcfd5946461798044d59bf9243faa370cdddcdffe40a24d39d44a43abc79b4c8e89e7c60b40e5e204603a SHA512 54c2a86a67c53b7d5c62e6c23c549fd89503386549dc9d2f9c7de058b52ecb60b5089555e97dd0b63d33686e1bd08a3be940152715a6d26647e6949e641df9cb
 EBUILD gallery-dl-1.26.8.ebuild 1135 BLAKE2B 3c2d4c20d3ceaa605b7a3f995e9829c83ccb8359e752e9e693fe4183fe6fa13fdfeef89e82ec6d075174bc960cb0d0347b65f06d366626c93ab941844b36e531 SHA512 3f1092f2fda60dfe920456ca40ca03f4ffb6c0d4afe956b36ba48a3b7805297b18299caa2fd44d6ea4d2ca79ce2abf23d426498ccd4387512729c57afbc982ef
-EBUILD gallery-dl-9999.ebuild 1238 BLAKE2B 0a9c63bbefc8c478353fdcbeb4e2f6d551f48294cb6379189e832edf75bb6bd37c837bed4749302666d5f92bd475d333f4673ee74971fbc300f8fa3f2849436b SHA512 8ddeb85ffc5ce52a7ca2fb1a13f40e8e94d7918b7319dde1206ddf1c9c7738aa19be10ed24130f9e35d1f1e89d37925cea65a495ae1cad3d63bb66327e05d61e
+EBUILD gallery-dl-1.26.9.ebuild 1142 BLAKE2B 6a0c03091500dd90754cc580a693c3ee9544d7ea1188fa56f7e5c08c2b678e540aa7a23c8b859921518c722a135a02328144d52f5bd485f07b3a0f9076e5edc0 SHA512 119516d297a7abceb2d9fde4bf9c9edf1fff83bcac856efc67e8b35c6b4b58b3080bb50f2a59a90ba858bf30a9c42f391be67187e4e363f1cdeee284b2043cba
+EBUILD gallery-dl-9999.ebuild 1142 BLAKE2B 6a0c03091500dd90754cc580a693c3ee9544d7ea1188fa56f7e5c08c2b678e540aa7a23c8b859921518c722a135a02328144d52f5bd485f07b3a0f9076e5edc0 SHA512 119516d297a7abceb2d9fde4bf9c9edf1fff83bcac856efc67e8b35c6b4b58b3080bb50f2a59a90ba858bf30a9c42f391be67187e4e363f1cdeee284b2043cba
 MISC metadata.xml 747 BLAKE2B bb63a74ca71891f1e937e6bd41b4cef50f1e1d459ab389f83f881cbfcc5c39bf5c4b8e999ea6cab7406a97f3dca9644380eaf1930d811746c5b893b948085ecd SHA512 302b9f3cde6c404de62347415c1f02d6884a9327c88871ea67b986ac7eaadac6b79018d919f5e6a2d8dde5dfd9e12d6c7c4702120fb08bfbfa291df4d1baecae
diff --git a/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild
new file mode 100644
index 000000000000..1e6696f28666
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild
@@ -0,0 +1,49 @@
+# 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"
+
+RDEPEND="
+	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
+
+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
+}
+
+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 fc74f32338d2..1e6696f28666 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -25,8 +25,6 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-PROPERTIES="test_network"                       # Tests require network access.
-RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index 0f6ad26c94d1..87b1215bb914 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -2,10 +2,10 @@ AUX sks-1.1.6_p20200624-QA-fixups.patch 1907 BLAKE2B ec655c5116f4d51df33ccff21dd
 AUX sks-1.1.6_p20200624-r1-db-hang.patch 1083 BLAKE2B 1a6b12638f9b870bc3f6537c1e27e426ae75931160c876d1cc5fdf395bc07cc78788b87e1dc162a11032c5519826b6440fb0678fccf43fe5117f4a6ab0f2f3de SHA512 a5d120a3b28e2a49c7db294a5a31afb364c578a9ffd8c5802e4ae95925becaa4f702e3d83480c0915b0049ce63e18de5ebd114ff5827daba894c767f9a67f1f5
 AUX sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch 2664 BLAKE2B 72395bae7dc4b6de6659de53ec766e04ba7707ee72fb910aea2ca36874b023920b5ad96391fa2ca6738224b23b334ec48d864d648e960d1ff049cd7c6ffea14c SHA512 6fa55c14a345b6d9d04cce3916d82e27aafe6d2a40d766269349ad952d0c5d07f858f7829656a6759618e38ac7c25e9d32426b86a197b4d8682dd8b371cb6088
 AUX sks-db.initd 520 BLAKE2B aff93d88445deb50506d778ca3e81d65a7376d637ab998f9f4d896060355fb6489990e9fe8ac916582ac18d25b582ea9407b1c9d0783ac799ecc8050de75e85d SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6
-AUX sks-db.service 174 BLAKE2B 7b41dd84e4284493ab1ce42a65da60ae24a95c016670516cbeaf22e6278922ef34daf9dbda14217377f12c831836a64b4e1a9b4868be41db834fa024a59be35b SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e
+AUX sks-db.service 542 BLAKE2B fababa8b9939fd6099fe9afad192c6ada6c8fdac9c0d783e64f40f8a58067380d7af85f50cb22d0867177bf5bda7ce6a8f205fdf97809600839207044cf91460 SHA512 d12846f4eeda2bdc809383fcef1d0ea712fdf58d95632fa5cde14af048be3409336c9be555adb1803b6c082fe51121c32b7f438d521b72b24db9340426711976
 AUX sks-recon.initd 583 BLAKE2B b3cab1745c0019f2cee5e771b2685ae72e68b428079f93fdb79a8e75facbcf256dfdaff8ebf4f4f04885e0d0e52591cc0c3b1c0e0ed84fbd39c2f7ab8cd2bf4d SHA512 5d26e2196428a76bb454e2bf9e0d3813e96f894ef4f326650300874efb71a303eeb7267270327036da38960a8b68e420ce7e7e61cf21f7be85c80612c00a0f6c
-AUX sks-recon.service 187 BLAKE2B 8dace8512685ea3581b8de941037b00a35c955e5ec2d35fd886a50e91f2b77fde591d5820705ddf1a9dea205de69a45d24bc920c3eb9bc08de7657668db0957a SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef
+AUX sks-recon.service 348 BLAKE2B 19a9d3473d65685a61e3a9df7b08293da578c8420ce1ccaf47756078880e78f8e6398829679f23d9889e91e6238e85f6b01baa30f436f62005abad5a2fa03bd8 SHA512 36f9b830fbbf57c6fe64b1dd11fd76822d121e09176855602a36de4eb563162315b7023fedb106be3873f37783f5b962f9e878d38f501edec6560d48da912928
 AUX sks.confd 87 BLAKE2B d6bbbd08e452047c33eb2248135e68fa2c09fd3753118a5dde4431beff909e6270cf2f9d5e4679e12d69db33a5c6802b0729ff751663d4b040340cfaa8193918 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660
 DIST sks-1.1.6_p20200624.tar.gz 213871 BLAKE2B d44dc73aa49bf1b1375acbb141dd7f62732866f87e48d25d0ed3fdae4e00f7ced42bef2fe73ea0a065772b8b33b7e9da14508b5d8591313566269c24bd9c1d6a SHA512 b0de7803afd61b45051daad67b2b63f9b4685c7820485326c63e053ce09f545ff0b9b8a91fb6543712c16e508ab20176d259c2fba3a47e0e75a862932954183a
-EBUILD sks-1.1.6_p20200624-r1.ebuild 3851 BLAKE2B f7ca22e206d272e178ddc5643b76ad3eb7b832a72b2b8150a5ebf90566ec3a4200b490cdf9e1edbe2f202862a72e961622cd98ae3276815be657e1296c9efb62 SHA512 39fdf9d06ba8103e5d22922c5616f4ddce7af8a400ddf31e3a567b1215a4345d4bb3a7cabe5a31b6686e002f63be57a80ae64619790d0e703280046a470587e7
+EBUILD sks-1.1.6_p20200624-r2.ebuild 3851 BLAKE2B f7ca22e206d272e178ddc5643b76ad3eb7b832a72b2b8150a5ebf90566ec3a4200b490cdf9e1edbe2f202862a72e961622cd98ae3276815be657e1296c9efb62 SHA512 39fdf9d06ba8103e5d22922c5616f4ddce7af8a400ddf31e3a567b1215a4345d4bb3a7cabe5a31b6686e002f63be57a80ae64619790d0e703280046a470587e7
 MISC metadata.xml 336 BLAKE2B 202a294f17b3169b1c55afb032d4c2deee102fbae93da51b269424e9e4ab7e3917a4f80b2625c98f6e29acdeed24aaf5d6869c5514f5fcc57993fbf5fdeceac1 SHA512 acaf29a2c8706fa6d1e90d4ab3a41cdf92d19ac54e0edb68487e7906363fad2533220c0792abf2f0e496e68e029f697f035da216a30f8c039c1a88bd7886febd
diff --git a/net-misc/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service
index bbc3ba7e2b2d..b48db1add6ff 100644
--- a/net-misc/sks/files/sks-db.service
+++ b/net-misc/sks/files/sks-db.service
@@ -3,8 +3,13 @@ Description=SKS database thread
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/sks db
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} ${SKS_DIR}/SKS ${SKS_DIR}/PTree
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS}
 User=sks
+# WorkingDirectory cannot use a variable
 WorkingDirectory=/var/lib/sks
 
 [Install]
diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service
index 97ee52ffc0ed..d56731d1c961 100644
--- a/net-misc/sks/files/sks-recon.service
+++ b/net-misc/sks/files/sks-recon.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=SKS key reconnaissance thread
-After=network.target
+After=network.target sks-db.service
 
 [Service]
-ExecStart=/usr/bin/sks recon
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS}
 User=sks
+# WorkingDirectory cannot use a variable
 WorkingDirectory=/var/lib/sks
 
 [Install]
diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild
index 133ea06cb8e7..133ea06cb8e7 100644
--- a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild
+++ b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild