gentoo resync : 20.03.2022

4 files changed, 16 insertions, 29 deletions

diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 2312295f6520..f35357e4dde1 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,5 +1,5 @@
-DIST yt-dlp-2021.12.27.tar.gz 2102852 BLAKE2B 69a3a9c916771ab2e1b8f86bbc43e03d0543801f587708b638348088d4454aff8ac93420fd8bd2ebb4f493c74acdf23f08a9495dbcdad77d840a95cfece4aa6b SHA512 2c687493736fabe131481d6bf8df13afc1959ac1458675bfe3c4273df7bb64218f84e07ea324b664b0a52c3e39b3e10999e81bc907bfc98a71a28c92dca90737
-DIST yt-dlp-2022.1.21.tar.gz 2160713 BLAKE2B 30ed1c7a317318ca6a6ee183ba8e4396420eb090ddacc64ddde2bb4077c7c45b01c00caca90d1b8be501f90c71407e27d6ef847fdbfea8bed488771f9b59bbe1 SHA512 5844d49dbf50842d4d51dbb00c16efea816322888d16a8dbce16f976f0dd1625ec8243fcdc07e721180a2f02cf14ebaa0d83a1437e331b4aa68c404db3f1e9f4
-EBUILD yt-dlp-2021.12.27.ebuild 2008 BLAKE2B 289ee6fd98fd60002e19aa82c706dc67f72a61c26b82fab1ec6cd9bf9d9461f8373473bfaf1c1be6931d0fcf98283c9868522c1b6fa805be3cb159e58985642c SHA512 cdd1d4390e74f2463a37db297b40ea0ba50c7676a364db00292242ea16a2488900d3f87a7db77724fd0d39cadc22c2b165766353d66f85af80d210ef61f817c9
-EBUILD yt-dlp-2022.1.21.ebuild 2008 BLAKE2B 44e2cbc30a11378f587290b6f259ad5dde2bd59e62f7f85e8fa569edeb152bd31f1af78d5d47a33bd87866904f0d71626f1d8c2aeb75ebea97badc21c69ddda9 SHA512 7a44de9098a8e3ac0296b71b28fa90ba81de9318e4750b5acb7aa318d32afbdfb84332ee6fee05554c57068fd8fd18035ebb0a4a64cf675793e5209832b2e57c
-MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
+DIST yt-dlp-2022.2.4.tar.gz 2178642 BLAKE2B 2e6c11bb9fbc30b725dc26db727500c33af944d16fbc46be8fb35a75ab4f5c09ca0c8754f075b9739ca9d47e9b409f8d533c03b417217344f8cac1ec45968b51 SHA512 6bb6bee6f748147a566394bbe0b69781ab415398582cb8e88a49b61a5dd106e666b0429c8f4f6483bc4af0363e88eb95c5159457b7049cc11a2c99a6495c6895
+DIST yt-dlp-2022.3.8.2.tar.gz 2454754 BLAKE2B f07c1eb8d0e1f936298d6516e518f366558107ba9ae65f7c0b52bdcd185b27e501d0d0ffb20e923a94ce5f42c88ae335069876946c411232b9dfc1309ae796ca SHA512 bd6c105f65415e2229781bb1e859167686a5f5f6886e98f9693acc127d4f9124aa2d55f32835f82509f6ab5a82601a5d612ac608063ef9041769fa91e3539c44
+EBUILD yt-dlp-2022.2.4-r1.ebuild 1879 BLAKE2B a4f026c2eb61101e4e14071db83f5e65da5b64dafab6ff9d9e76b8c0be966d772e440f30d976837da4e3956d3ade0de20a87052e85662be3ec7ba35c924498a6 SHA512 3a56e71fdda3e3926acde444a0d0c43184924bf89032c95da92cb1db8d7e6b2d5f6a67a65c6cd958de3a53dfd53ef022a07b9631c43691d451e9be4717a2efdd
+EBUILD yt-dlp-2022.3.8.2.ebuild 1877 BLAKE2B b682b846467304818b83ebadee7a23701f1802a70f2e8e7a3e656dda920c2544e60fbf5b99563bc1011fda1d63c52cc311c9471d35ad5231da822c5fc4e0bc52 SHA512 27e1676e2d53594e8441570bfe0eaaf2faed67c73a430a959da43cf42e39971f592bcdd3d7d09101993511246f02c06424c547fb9b4423444f9a4ccf75d120c5
+MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/metadata.xml b/net-misc/yt-dlp/metadata.xml
index 1fbaa63f2ecb..0d02b5cb9e5f 100644
--- a/net-misc/yt-dlp/metadata.xml
+++ b/net-misc/yt-dlp/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">yt-dlp/yt-dlp</remote-id>
+		<remote-id type="pypi">yt-dlp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/yt-dlp/yt-dlp-2022.1.21.ebuild b/net-misc/yt-dlp/yt-dlp-2022.2.4-r1.ebuild
index a9f9a75ef095..e7e396f5eace 100644
--- a/net-misc/yt-dlp/yt-dlp-2022.1.21.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2022.2.4-r1.ebuild
@@ -12,11 +12,11 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl"
+	!net-misc/youtube-dl[-yt-dlp(-)]"
 
 distutils_enable_tests pytest
 
@@ -33,13 +33,6 @@ python_test() {
 	epytest -m 'not download' -p no:markdown
 }
 
-python_install() {
-	distutils-r1_python_install
-
-	local sitedir=$(python_get_sitedir)
-	dosym yt_dlp "${sitedir#${EPREFIX}}"/youtube_dl
-}
-
 python_install_all() {
 	dodoc README.md Changelog.md supportedsites.md
 	doman yt-dlp.1
diff --git a/net-misc/yt-dlp/yt-dlp-2021.12.27.ebuild b/net-misc/yt-dlp/yt-dlp-2022.3.8.2.ebuild
index f6633c012f81..15fd9ad97135 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.12.27.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2022.3.8.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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..10} )
 inherit bash-completion-r1 distutils-r1 optfeature
 
@@ -12,11 +13,11 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl"
+	!net-misc/youtube-dl[-yt-dlp(-)]"
 
 distutils_enable_tests pytest
 
@@ -24,22 +25,15 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 
 	# adjust requires for pycryptodome and optional dependencies (bug #828466)
-	sed -ri setup.py \
-		-e "s/'(pycryptodome)x'/'\1'/" \
-		-e "s/'(mutagen|websockets)',?//g" || die
+	sed -ri requirements.txt \
+		-e "s/^(pycryptodome)x/\1/" \
+		-e "/^(brotli.*|mutagen|websockets)/d" || die
 }
 
 python_test() {
 	epytest -m 'not download' -p no:markdown
 }
 
-python_install() {
-	distutils-r1_python_install
-
-	local sitedir=$(python_get_sitedir)
-	dosym yt_dlp "${sitedir#${EPREFIX}}"/youtube_dl
-}
-
 python_install_all() {
 	dodoc README.md Changelog.md supportedsites.md
 	doman yt-dlp.1
@@ -65,8 +59,7 @@ pkg_postinst() {
 	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} ]] ||
-		ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; then
+	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.'