gentoo resync : 20.03.2022

6 files changed, 120 insertions, 191 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 5b8186929b5c..984a503d2658 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
 DIST youtube-dl-2021.12.17.tar.gz 3332299 BLAKE2B 5c798ad1f54f06cc42fd9a538536310e1084a02ec96969ff8e85ef0c6487ef54f34d58858512ade8b279929d8ebb9dda48175302fa23af9833c2301daa1d49c2 SHA512 bfc8280703b08f66e1108e9ebd9ab4689f064ac7cef03bd3d1fd2bc64928570e4376e389c9bc188eafdbcd74444cfc8aeccc83ee362ad4f478910efef3573ddb
-EBUILD youtube-dl-2021.06.06.ebuild 2135 BLAKE2B 9bd1d02f0ad68eb66930fa6095326f06c0cec70d15d37eccbcb02ca11bb92297e81221ded81c3a569461ff15049457a7a59fee7e2f0f11aa09dac2324a3d87b1 SHA512 d1b3e488591accac80bcae305cab64d896efece4c763fa85c7e1a14fc8a63438299581094a4fc3e3b7b06e6913554ce018a6d417e1aa144121986b46f2564cbc
-EBUILD youtube-dl-2021.12.17.ebuild 2141 BLAKE2B 6dd1abc54cbfea6f50eb307182710c6e041becd4ca583c32f01b58d5577dd857bde368a6d97c75ffed3373a510dc07fa66a4f5471d75028e2c6334f68b1e12b1 SHA512 ee9060a1417f5f838d23807f8ec2791c848c67dc4c06a6639f111e2e5419b4076d177b078dfa853cb78e07787bd83442ca56081d44c372651d82172ec7751e58
-EBUILD youtube-dl-9999.ebuild 2133 BLAKE2B 65068df0fabb30083664de67ad5d4416d9cb04595479ca531aa67548314c56920ac0cc7a3b2211a514cf777983115634a68df96ec7e51bed3c1347bd68e03098 SHA512 9dd56361b81ee86ceb5481f8a2d61cc359490702bacd310ae76560df648a920a7a52acfe07c5ab9adc3d77cab256fc71595ba5c8754411c962aead2f4a33457e
-MISC metadata.xml 378 BLAKE2B 2affaeab2530f0780ed78dbdf847c1548038514574435673144e39daf96451dba415cf0d4799ec8c2bbd13d425165ebc98858498cfdf74ba62b22aa91bf9d54e SHA512 c8489d7732f8cada555d40cf91ea20481102639531ca06b22a3b1d330f34df5fd9d8727521b283dd6ca66bae70071eceb8d31426c614d28f38170671dace96ea
+EBUILD youtube-dl-2021.12.17-r1.ebuild 2427 BLAKE2B 80fb9fcb6f3640b5a86ccebae0f94e4d2882c5f370ca95ba3720e327e4d9d15a68d62199dc594af08f1faf6d3cc0adaf4c0f72112f82b8297cbde281ff0eafea SHA512 db8795e72d4e8d71afde1aeab1b86f8aec048223b1de9ee5d41b287ef47aac44eb3aec3dd8e6df0c70cc00d5415950af268f200bf84e3cdf83967318dd59441e
+EBUILD youtube-dl-9999.ebuild 2355 BLAKE2B 22f910febb452f9a8cbdbcc9f47ea1b2290fff7d54816d81728f2d8eaf598414095c90d9f80f4829755aee1a2cb0c2a9cc69852fba55950ebdff6bc4403883ff SHA512 d0ee490003ff8e41ffa244c60155fb4f0ee8e33d2062c341087ecf92039124c8dfb96e0703b842d6f53fef229cce642012f46d291093eeec532660bdac627eb5
+MISC metadata.xml 641 BLAKE2B 8c5454a12949d798a299501d1874d63bd86523460620ad1e00d918e4066a0970f373d442e2eaf22a59179c7712999050bca9c5b5f823d4fbaf840612bbff270e SHA512 38cee113f60292620e333733d686b304b8d17ca74a904e23e4e4cb85d1cd4089af139d358b1ab6cb315ab6cde6bbc13c9569d31ddeb4ff24a5fb57675079119c
diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml
index 3844b2945c05..1597ae3f0442 100644
--- a/net-misc/youtube-dl/metadata.xml
+++ b/net-misc/youtube-dl/metadata.xml
@@ -2,12 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<use>
+		<flag name="yt-dlp">Use <pkg>net-misc/yt-dlp</pkg> to provide the command and only install the python module</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ytdl-org/youtube-dl</remote-id>
+		<remote-id type="pypi">youtube_dl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
deleted file mode 100644
index c397d925fb6d..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 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
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	if ! has_version media-video/ffmpeg; then
-		elog "${PN} works fine on its own on most sites. However, if you want"
-		elog "to convert video/audio, you'll need media-video/ffmpeg."
-		elog "On some sites - most notably YouTube - videos can be retrieved in"
-		elog "a higher quality format without sound. ${PN} will detect whether"
-		elog "ffmpeg is present and automatically pick the best option."
-	fi
-	if ! has_version media-video/rtmpdump; then
-		elog
-		elog "Videos or video formats streamed via RTMP protocol can only be"
-		elog "downloaded when media-video/rtmpdump is installed."
-	fi
-	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
-		elog
-		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
-		elog "or media-video/mpv to be installed."
-	fi
-	if ! has_version media-video/atomicparsley; then
-		elog
-		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
-		elog "from the metadata into the resulting MP4/M4A files."
-	fi
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild
new file mode 100644
index 000000000000..cbae1a3e9ecc
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild
@@ -0,0 +1,74 @@
+# 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
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="+yt-dlp"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	yt-dlp? ( >=net-misc/yt-dlp-2022.2.4-r1 )
+	!yt-dlp? ( !net-misc/yt-dlp )"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -i '/flake8/d' Makefile || die
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	dodoc AUTHORS ChangeLog README.md docs/supportedsites.md
+	doman youtube-dl.1
+
+	newbashcomp youtube-dl.bash-completion youtube-dl
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins youtube-dl.fish
+
+	rm -r "${ED}"/usr/{etc,share/doc/youtube_dl} || die
+
+	# keep man pages / completions either way given they are useful
+	# for yt-dlp's compatibility wrapper which tries to mimic options
+	use !yt-dlp || rm -r "${ED}"/usr/{lib/python-exec,bin} || die
+}
+
+pkg_postinst() {
+	optfeature "converting and merging tracks on some sites" media-video/ffmpeg
+	optfeature "embedding metadata thumbnails in MP4/M4A files" media-video/atomicparsley
+	optfeature "downloading videos streamed via RTMP" media-video/rtmpdump
+	optfeature "downloading videos streamed via MMS/RTSP" media-video/mplayer media-video/mpv
+
+	ewarn "Note that it is preferable to use net-misc/yt-dlp over youtube-dl for"
+	ewarn "latest features and site support. youtube-dl is only kept maintained for"
+	ewarn "compatibility with older software (notably its python module, yt-dlp has"
+	ewarn "a 'bin/youtube-dl' compatibility wrapper but not for the module)."
+
+	if use yt-dlp; then
+		ewarn
+		ewarn "USE=yt-dlp is enabled, so said compatibility wrapper will be used. Man pages"
+		ewarn "and completions for youtube-dl were still installed but may have slight usage"
+		ewarn "differences and does not read the same configuration files. It is recommended"
+		ewarn "to use the yt-dlp command directly instead."
+	fi
+}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild b/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild
deleted file mode 100644
index 140eed0ebc77..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 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
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	if ! has_version media-video/ffmpeg; then
-		elog "${PN} works fine on its own on most sites. However, if you want"
-		elog "to convert video/audio, you'll need media-video/ffmpeg."
-		elog "On some sites - most notably YouTube - videos can be retrieved in"
-		elog "a higher quality format without sound. ${PN} will detect whether"
-		elog "ffmpeg is present and automatically pick the best option."
-	fi
-	if ! has_version media-video/rtmpdump; then
-		elog
-		elog "Videos or video formats streamed via RTMP protocol can only be"
-		elog "downloaded when media-video/rtmpdump is installed."
-	fi
-	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
-		elog
-		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
-		elog "or media-video/mpv to be installed."
-	fi
-	if ! has_version media-video/atomicparsley; then
-		elog
-		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
-		elog "from the metadata into the resulting MP4/M4A files."
-	fi
-}
diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
index 14727bf79b6b..284776e3ee5c 100644
--- a/net-misc/youtube-dl/youtube-dl-9999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
@@ -1,32 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 git-r3
+inherit bash-completion-r1 distutils-r1 git-r3 optfeature
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+HOMEPAGE="https://youtube-dl.org/"
 EGIT_REPO_URI="https://github.com/ytdl-org/${PN}.git"
 
-LICENSE="public-domain"
+LICENSE="Unlicense"
 SLOT="0"
+IUSE="+yt-dlp"
 
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
+	yt-dlp? ( >=net-misc/yt-dlp-2022.2.4-r1 )
+	!yt-dlp? ( !net-misc/yt-dlp )"
 
 distutils_enable_tests nose
 
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
+python_prepare_all() {
+	distutils-r1_python_prepare_all
 
-src_compile() {
-	distutils-r1_src_compile
+	sed -i '/flake8/d' Makefile || die
+}
 
+python_compile_all() {
 	emake youtube-dl.{bash-completion,fish,zsh}
 }
 
@@ -35,7 +37,8 @@ python_test() {
 }
 
 python_install_all() {
-	# no manpage because it requires pandoc to generate
+	dodoc AUTHORS ChangeLog README.md docs/supportedsites.md
+	#doman youtube-dl.1 # would require pandoc in live ebuild
 
 	newbashcomp youtube-dl.bash-completion youtube-dl
 
@@ -45,33 +48,27 @@ python_install_all() {
 	insinto /usr/share/fish/vendor_completions.d
 	doins youtube-dl.fish
 
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+	# keep man pages / completions either way given they are useful
+	# for yt-dlp's compatibility wrapper which tries to mimic options
+	use !yt-dlp || rm -r "${ED}"/usr/{lib/python-exec,bin} || die
 }
 
 pkg_postinst() {
-	if ! has_version media-video/ffmpeg; then
-		elog "${PN} works fine on its own on most sites. However, if you want"
-		elog "to convert video/audio, you'll need media-video/ffmpeg."
-		elog "On some sites - most notably YouTube - videos can be retrieved in"
-		elog "a higher quality format without sound. ${PN} will detect whether"
-		elog "ffmpeg is present and automatically pick the best option."
-	fi
-	if ! has_version media-video/rtmpdump; then
-		elog
-		elog "Videos or video formats streamed via RTMP protocol can only be"
-		elog "downloaded when media-video/rtmpdump is installed."
-	fi
-	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
-		elog
-		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
-		elog "or media-video/mpv to be installed."
-	fi
-	if ! has_version media-video/atomicparsley; then
-		elog
-		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
-		elog "from the metadata into the resulting MP4/M4A files."
+	optfeature "converting and merging tracks on some sites" media-video/ffmpeg
+	optfeature "embedding metadata thumbnails in MP4/M4A files" media-video/atomicparsley
+	optfeature "downloading videos streamed via RTMP" media-video/rtmpdump
+	optfeature "downloading videos streamed via MMS/RTSP" media-video/mplayer media-video/mpv
+
+	ewarn "Note that it is preferable to use net-misc/yt-dlp over youtube-dl for"
+	ewarn "latest features and site support. youtube-dl is only kept maintained for"
+	ewarn "compatibility with older software (notably its python module, yt-dlp has"
+	ewarn "a 'bin/youtube-dl' compatibility wrapper but not for the module)."
+
+	if use yt-dlp; then
+		ewarn
+		ewarn "USE=yt-dlp is enabled, so said compatibility wrapper will be used. Man pages"
+		ewarn "and completions for youtube-dl were still installed but may have slight usage"
+		ewarn "differences and does not read the same configuration files. It is recommended"
+		ewarn "to use the yt-dlp command directly instead."
 	fi
 }