gentoo resync : 13.11.2021

3 files changed, 67 insertions, 7 deletions

diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 1bfdc4ad93b9..f654e52eeb6b 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,4 +1,6 @@
 DIST yt-dlp-2021.10.22.tar.gz 2010916 BLAKE2B fb8f789c74df06dcd672d00ac16eb7cbf466755c3fa607acdd21dd9a9ef2af158a5272f88656133078bd50585506b65cf3b3c03236726de954ccfa0b6c1195fc SHA512 2b590703f8d4f9454b50983019aca8046205234bd98cac4da73a6688eae177a19ef641e486aea92d86197ee7ad6c564c65f9b9496d623c00bdcc349817d5b1f8
-EBUILD yt-dlp-2021.10.22-r2.ebuild 1478 BLAKE2B 7c8c55fd7b8c1b523334bbef77182929dbb0f631191371772ed22df89dbee94553f9c97536bf04beb826cbfe69b533392d26c82be0806f20b317f13384693c92 SHA512 9fb7ead0738e5885cfca80673c08de140380a58d477f797d85f592d198aebab2ac936d5b03d2522401c89ec211053128f16742b675d67418224c1a7f7a2d0b39
+DIST yt-dlp-2021.11.10.1.tar.gz 2042241 BLAKE2B c4542edce26931a8753002a5cf0fda46549dd9b79709fc595c0c807837b07242d5d7a7fa19cc4f64cf7b7fc5803c4937185d68f4593250f9fa21155d5a24ee92 SHA512 54a371d70b7b82349a184b26201fca12fabbc9a107dc199347c412062776d63879d22955d76726df61bc40ec594a7179a997e4679c683673c8c0dd41f62b16f6
+EBUILD yt-dlp-2021.10.22-r3.ebuild 1610 BLAKE2B 2713e981200c642a3a3fbe582d73a48a69425724c878e504b4494ea2b95eb28449220622504420d45badc3fa80025e7e569a7d4fecaa6fed72065d105906a2e3 SHA512 a3a342f9426f11250a7b57045480db6243f27457e1427dd45843cef024cf61be89e1129aaf0ed27e4db14309ce7f3f27def2f24ace7a8263dcb51173fb69cfe9
 EBUILD yt-dlp-2021.10.22.ebuild 999 BLAKE2B 36e72cb572e5640d596036634b3ecd7d02945eb63dfe9ed63af6a73283fb9161334a99bac7d879089ff2b02552726ad171b3f0758f0e8d5f15da3d386699bae8 SHA512 54552a9a36c3e335ade68c5c20f905069c17cd8c8c47f41ba8396cce2613a4b9c6e730f4d8a100b5e567c202dfe002903b28c4ced340e76f48e584bf095d1341
+EBUILD yt-dlp-2021.11.10.1.ebuild 1610 BLAKE2B 2713e981200c642a3a3fbe582d73a48a69425724c878e504b4494ea2b95eb28449220622504420d45badc3fa80025e7e569a7d4fecaa6fed72065d105906a2e3 SHA512 a3a342f9426f11250a7b57045480db6243f27457e1427dd45843cef024cf61be89e1129aaf0ed27e4db14309ce7f3f27def2f24ace7a8263dcb51173fb69cfe9
 MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.22-r3.ebuild
index 9a121884d749..1aa701367fef 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.10.22-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1
+inherit bash-completion-r1 distutils-r1 optfeature
 
 DESCRIPTION="youtube-dl fork with additional features and fixes"
 HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
@@ -12,14 +12,10 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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
 	!net-misc/youtube-dl"
 
 distutils_enable_tests pytest
@@ -49,6 +45,10 @@ python_install_all() {
 }
 
 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} ]] ||
 		ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; then
 		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
diff --git a/net-misc/yt-dlp/yt-dlp-2021.11.10.1.ebuild b/net-misc/yt-dlp/yt-dlp-2021.11.10.1.ebuild
new file mode 100644
index 000000000000..1aa701367fef
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2021.11.10.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1 optfeature
+
+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 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl"
+
+distutils_enable_tests pytest
+
+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
+
+	newbin - youtube-dl <<-EOF
+		#!/usr/bin/env sh
+		exec yt-dlp --compat-options youtube-dl "\${@}"
+	EOF
+}
+
+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} ]] ||
+		ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; 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
+}