gentoo auto-resync : 04:10:2022 - 13:17:38

5 files changed, 68 insertions, 2 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1a18114c9ade..8322b05417ba 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 e9380fa51d0f..62710ddd0442 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -5,7 +5,7 @@ DIST gallery-dl-1.23.1.gh.tar.gz 477797 BLAKE2B abb04762755cc941d3fef31ba2cf21ea
 DIST gallery-dl-1.23.2.gh.tar.gz 482620 BLAKE2B 2a537354f93a1d82659669d9a1cdec425e2438127304a5385a871aa7c4f89afa3f0d91326fd731c6ddc48a4cce67d35335270e602a34761726575e525ac19020 SHA512 75defb234faf0467e5a957594a58a02cfc75180d63a4b2c24d84061d326fbb46f08ad3230b72adf525f1ba82621963564c556047d4aa06c16cc5124ecd8c075f
 EBUILD gallery-dl-1.21.2.ebuild 973 BLAKE2B fef69fc7188b2f8714854ab4d98f726553eabb98a022ab8f28da6da7523594addf4549f249ef7dbae09d136669aeb3bb45da4462c052bbe3acf4f59908af3776 SHA512 70a1b88a1982618d4131124c301c1945724aa33b94b35154dd5f6b25ef45756f95572c0841916edc090752f7d868f18fba25b3b12274f136f72427148c667db4
 EBUILD gallery-dl-1.22.4.ebuild 972 BLAKE2B 338fa4a1e74523fdcce0333bbc1d1f342755c797a23c199e1bc10abc8d3b725fcf96c7a77f74716a876bdda021940589bd996e6247291d57241bf917559c5bd1 SHA512 287b64f38b3989d17adb44e5977a4044f78c974dee031372ff9af17d18d0cfd37c34558b90bfd4d516caf69813025a7e4eee5beaac71fd278b9727966ca08b7e
-EBUILD gallery-dl-1.23.0.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
+EBUILD gallery-dl-1.23.0.ebuild 976 BLAKE2B f671f57d2fbd01fcdfffb2c7b85806b5bba8178aad4256738e1c60e941aab2dead52b0234cdf9b37c83292454e35aff3787d07c13f1bc388d70bc5caa109089a SHA512 dffa04390871a723085af520abb69c0e9c46b61e46b377751836d1ef58d2d8e79cf4955f01f2195e0f3c7c7eb59b39d0a0337d64b3dd8913eb05a705162fbf08
 EBUILD gallery-dl-1.23.1.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 EBUILD gallery-dl-1.23.2.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 EBUILD gallery-dl-9999.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
diff --git a/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
index adeefda919ee..38dc948a797b 100644
--- a/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 8b3ab2755766..6c38e6fce5fd 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,3 +1,5 @@
+DIST yt-dlp-2022.10.4.tar.gz 2427017 BLAKE2B b3dfde252217ef7ed9f5b99351e956a1f30bfe7bf545e28bb262db90dc9b9cb5e44af7259a815f84cd4e821c8ae93f6372e9a5108483208cd8dec403cf194790 SHA512 286e219057505e4de2bb8af6dc334b43b4e46e7b998d98437f78e9cfa82294e2ac17432c22f741ad101dfe05fa0d2dc0111904be51f32ab3a002bda7b17a86b7
 DIST yt-dlp-2022.9.1.tar.gz 2387756 BLAKE2B d13f27a4666a967d6bc99a0705cb534b940cf42079eb9d3003c7759542ac8587375b0bf88e0d9c9ddba4f2cace5de00f97f025a624cc15324714e8f3b370737e SHA512 972bc3228ea7800007e56de0c0e182f99fddda76ebee05154827a6d4cf50e056cbaee3ca50d9fc396b2080a65ad5d02cde64de9c26896f33c617346465568355
+EBUILD yt-dlp-2022.10.4.ebuild 1829 BLAKE2B 653c11229a14a5f360e24041cee0610d843fd31127712a2460d9d3096a579ad32afb9b09f6eb69fc4695f839c7503bbec0637fb052b2687e86d7439499dfb268 SHA512 be1ee1cc642fa36d49dc26737e8eba82e63c49b01e864c757923ce0021e07dcda1e6823400eecaadf3cfcd3b4b784d64606bbb801acde5e064ef14b32f02cdeb
 EBUILD yt-dlp-2022.9.1.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild b/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild
new file mode 100644
index 000000000000..775abf17078d
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild
@@ -0,0 +1,64 @@
+# 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_{8..11} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# adjust requires for pycryptodome and optional dependencies (bug #828466)
+	sed -ri requirements.txt \
+		-e "s/^(pycryptodome)x/\1/" \
+		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
+}
+
+python_test() {
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}