gentoo auto-resync : 20:11:2023 - 11:14:01

5 files changed, 2 insertions, 149 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 34143dbcf183..0492782bb65c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 1b87639b5165..c4945ce320d8 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,8 +1,4 @@
-DIST yt-dlp-2023.10.13.tar.gz 5525233 BLAKE2B 424ff7d1b3254e5ca1e86d38d08da351e53da040be5b4d6bc6cae502595af886d99d11f495365d66d87fcf4fa665d19dd42628c5115a622b85ccc1a9d8a617bc SHA512 b1f00fa3bb073a18e76478097712247c94ade588159bddb2472b8f210ffe4d9e72be529cd0990948219ab6df33d312426fb73e074b15013e098bafb737960311
-DIST yt-dlp-2023.11.14.tar.gz 5566962 BLAKE2B 6e5ae0f492a28770e89396259aef680b3cb32994691499e95996ddb8b85ec83721726aadff033f147270204fdf7aa5cea216a7319ac2cc0ced93297822c97d9a SHA512 b83e6daad748524f6a2437684bad14a4bfdc33dc559c89c30b3cf41eb671ef3aac90d08d4c5429cff1bc3fea17f2dc8d7a28969d030870a45d0b1b650b69b52d
 DIST yt-dlp-2023.11.16.tar.gz 5568397 BLAKE2B 9747ccbb032776df3de78c22084c67cca7913af6b29de9baedb7fe9048feb3e85db1cc1e694fcc563fecb674bad094193ff0a9cab081de9cbb006bce546c8753 SHA512 0d4219d5c2c883a2f10e43b5d93a807f84121f43f781cf494b30000c37d105facce9226bb60367c563e86cf17c4cbb2550ba31cfed6c3b1abb337cd1fb39e414
-EBUILD yt-dlp-2023.10.13.ebuild 2060 BLAKE2B 393bbe4b097e12422898f75d09b23ef2ff3803b25073038372aaf11a74e99ac94cc6364372d9eb8ac023245ed33447eb92cdea6278dfd6487619f475531c987a SHA512 31015187f4135e81ff1cfa5dbf31b0c23e8c315c2d86786bfe3294e6016cba0f0ac4784f5c0f34d3a755cf94ed8c71452381bb40413c8ae117e8e3a4d65055d7
-EBUILD yt-dlp-2023.11.14.ebuild 2183 BLAKE2B 1fbd1a9d414c819e17f4c7dffe064a3a859dda6bdce0b36ce2a4f021730e3a0e9e32162ba45fd1aa04fbe873ae4aad3943473c335c8deffc80f46bb764ba6060 SHA512 72738558e697a165c8f47d9f8c951c5e3d93425e8553fcc99a73e7c84e07e283e1a841c0dd269499f2476376a11657d43703e6c587ed474f172fad2786e13e6a
-EBUILD yt-dlp-2023.11.16.ebuild 2169 BLAKE2B f6c434c47555eaeac51003776349a04fab4ada223baff29eef09da381798b97f387de0d088f92e20e232789a1a6112d60f1e81953eae2ab5ad7a1ffd7dedef52 SHA512 6600f7b348202b5c4dffc207d090241116782fa9a986443e5fb95da501a8784f862ad5d51aaa0f602993f0ccaff026ece2a6d013c0e7c71ae8dce2a36feec48a
+EBUILD yt-dlp-2023.11.16.ebuild 2164 BLAKE2B db4c6e2eb5967fca73cbed49887352bd456f08faf871aa68ea9f788fd197f1f407b71b958dfb3ce9fb5f08ab04f4eaaa7302b8954e16089d57c2a384a24d44ec SHA512 eddd6324ec7cddbfbd38f41292255b1074bc8d0d25c26989977688a0ad5fa16bc61b91ff77949a23ff22fbf3ec8173ef7a9d7b9b9e0307794e26e75962982726
 EBUILD yt-dlp-9999.ebuild 2331 BLAKE2B 797949c4405a2fd985f564028b5be2bc7b35e999fe6fd1f8450cfb3616d93dd7b4b24007fe0f15c01075bc55e0dccc9fee1d0363d4f65724a2bbf3e14a413705 SHA512 ddee7547b44d746dda74f7e0e9c3511bbff3c70052be79525297b184ed14912ad3f965b36421ba45884e55bab132ba0298c3a195f42547228649bb885d4e2aee
 MISC metadata.xml 392 BLAKE2B d2aa6fc43f7f9038d320197a18107f15e56ed5e242e6c3cdc1b7111184580ab14fae8cbd16776794d207dd39ea0ca65975c08a54449f4cf90370ea95a66083d9 SHA512 867c61c1e41d7594decd5e10a2b45d934313cb751ba22356fc1ab61e0a40b2543847b195d20c7a39ba92370d8b3908e6f90d690915579b55808872efe8d3cebe
diff --git a/net-misc/yt-dlp/yt-dlp-2023.10.13.ebuild b/net-misc/yt-dlp/yt-dlp-2023.10.13.ebuild
deleted file mode 100644
index 1762c313c8eb..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2023.10.13.ebuild
+++ /dev/null
@@ -1,71 +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_{10..12} )
-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="https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~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() {
-	local EPYTEST_DESELECT=(
-		# fails with FEATURES=distcc, bug #915614
-		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
-	)
-
-	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
-}
diff --git a/net-misc/yt-dlp/yt-dlp-2023.11.14.ebuild b/net-misc/yt-dlp/yt-dlp-2023.11.14.ebuild
deleted file mode 100644
index 3a877d8e222b..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2023.11.14.ebuild
+++ /dev/null
@@ -1,72 +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_{10..12} )
-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="https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~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|requests|secretstorage|urllib3|websockets)/d" || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fails with FEATURES=distcc, bug #915614
-		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
-	)
-
-	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
-	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
-
-	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
-}
diff --git a/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild b/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild
index d65bb299c48a..59f937372adc 100644
--- a/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]