gentoo resync : 30.10.2021

4 files changed, 11 insertions, 55 deletions

diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 2a2acf912add..cfb1a58d5897 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,7 +1,4 @@
-DIST yt-dlp-2021.10.10.tar.gz 1913112 BLAKE2B 05c6f56a633311b99834f077b1dd3be6374144d5cf5dfdcc38cbd7fa246e380f2f8f7b667dde9e83f6f0270bac38e21f4183726c9ced922dc0c3ca96175c15db SHA512 c53cc4458b294dc579de37e9d603cd32bb1890ed921270097bfe04e4e8769b91f6594cd4834e7094c706a7c9f447854438b33ab28ddd7247af585837c5ca76b1
 DIST yt-dlp-2021.10.22.tar.gz 2010916 BLAKE2B fb8f789c74df06dcd672d00ac16eb7cbf466755c3fa607acdd21dd9a9ef2af158a5272f88656133078bd50585506b65cf3b3c03236726de954ccfa0b6c1195fc SHA512 2b590703f8d4f9454b50983019aca8046205234bd98cac4da73a6688eae177a19ef641e486aea92d86197ee7ad6c564c65f9b9496d623c00bdcc349817d5b1f8
-DIST yt-dlp-2021.9.1.tar.gz 1846252 BLAKE2B 2cb056b89d1c3f5dfe442c96e983b2500185ade621c285669ef513d0fe9af9aabea3ad121344d1c521b6c89eddc77bf7698edb48d92f6f5f7b58b8939c80817d SHA512 26f778bf63b9be9e487b96f098e56abf65c7c7a89e9c5754755cf73d55e441638174d7b0e7220e994e40c0740edbd792e1fee28b44946cab8197dfaae2eee26e
-EBUILD yt-dlp-2021.10.10.ebuild 999 BLAKE2B 36e72cb572e5640d596036634b3ecd7d02945eb63dfe9ed63af6a73283fb9161334a99bac7d879089ff2b02552726ad171b3f0758f0e8d5f15da3d386699bae8 SHA512 54552a9a36c3e335ade68c5c20f905069c17cd8c8c47f41ba8396cce2613a4b9c6e730f4d8a100b5e567c202dfe002903b28c4ced340e76f48e584bf095d1341
-EBUILD yt-dlp-2021.10.22.ebuild 1001 BLAKE2B a5baab2dc005b8706279caf49ae749eb463f4e4ae324fc508c5a65c11ba4fe337b660baab0cd657121feaeac84100882347a07f521cd67938067031a0f095c90 SHA512 3de4ddc9959b6a97468843af26a3a01b73fde17a90e1c399dd0dc0617d1fe7c8d1a68738c16f89912ee74b53bd74855f84e1ec09fc5b90af9dad3047a771c2cc
-EBUILD yt-dlp-2021.9.1.ebuild 1131 BLAKE2B 75a09269e874dd723959481fc123ad9116bd2e94633a3b71fd288e405f2536ad2a751c938912928bca8be9011aca18736239d51bc3e19a805154cd8e9fe05091 SHA512 9350dfa756115e0642fc59780f33a3f9472ec3455ee3930e8bb6b0c46d91ada5df059b0363ca98bcefac41f210c5a707079326f385e5922e510adbba59dd07a4
+EBUILD yt-dlp-2021.10.22-r2.ebuild 1127 BLAKE2B d993b8b2e20b9d78415c04875e20d1163979d097dd81b6f5bb62dd84f900bbbe486648d977b82aa6508de39a6056f995860e2c24862cd50b64a05172d984268b SHA512 bf812636fe8236ff1d2414cd1f90acdc030acf2cc7c002130ad9b7e84cc03524ca3aab260b94abb8c8c411e163b23c7fadfbe1be4702d6bc5bd6f8d1766644db
+EBUILD yt-dlp-2021.10.22.ebuild 999 BLAKE2B 36e72cb572e5640d596036634b3ecd7d02945eb63dfe9ed63af6a73283fb9161334a99bac7d879089ff2b02552726ad171b3f0758f0e8d5f15da3d386699bae8 SHA512 54552a9a36c3e335ade68c5c20f905069c17cd8c8c47f41ba8396cce2613a4b9c6e730f4d8a100b5e567c202dfe002903b28c4ced340e76f48e584bf095d1341
 MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
index e4e5268e2804..c9b4d7614b7f 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
@@ -12,14 +12,15 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/websockets[${PYTHON_USEDEP}]
 	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-video/ffmpeg"
+	media-video/ffmpeg
+	!net-misc/youtube-dl"
 
 distutils_enable_tests pytest
 
@@ -40,4 +41,9 @@ python_install_all() {
 	doins completions/zsh/_yt-dlp
 
 	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	newbin - youtube-dl <<-EOF
+		#!/usr/bin/env sh
+		exec yt-dlp --compat-options youtube-dl "\${@}"
+	EOF
 }
diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
index ed4cc85dbe9e..e4e5268e2804 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
diff --git a/net-misc/yt-dlp/yt-dlp-2021.9.1.ebuild b/net-misc/yt-dlp/yt-dlp-2021.9.1.ebuild
deleted file mode 100644
index 8672a05a7221..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2021.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="A youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="public-domain"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	dev-python/websockets[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-
-"
-
-distutils_enable_tests nose
-
-python_test() {
-	# make_lazy_extractors.py tries to rename it out, so fails if it does not exists.
-	mkdir ytdlp_plugins
-	epytest -k 'not download'
-}
-
-python_install_all() {
-	doman yt-dlp.1
-
-	newbashcomp completions/bash/yt-dlp yt-dlp
-
-	insinto /usr/share/zsh/site-functions
-	newins completions/zsh/_yt-dlp _yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}"/usr/share/doc/yt_dlp || die
-}