gentoo resync : 04.01.2022

4 files changed, 82 insertions, 6 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index b3dfb9411378..5b8186929b5c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
 DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
-EBUILD youtube-dl-2021.06.06.ebuild 2152 BLAKE2B af86d64eaf6fd32e80916fa1b42c4e99742ecab1aef7208a5a8d8c13f81992f7e032fe8ae6c4bb4931061eaa62965b7cb023aae869141730b62659606cdfd6d2 SHA512 35d7f7c29caed0f0cc741d62b665b4d19df036c33143fd31b5e582fb0ada17994c97db8803a0c6f4294af49dff1dbeecb779c1f896ace5a4777e22f37d2606f5
-EBUILD youtube-dl-9999.ebuild 2150 BLAKE2B 845e5d04d4ce84654c07ac59a7d3ee585fd8c514fc26ef6bf6d768c9812e8f72a8be6c41b76c74d995b8e0cef84e5d5e9dc3a4f20d6789c7160bc287cf0a011f SHA512 bc42946c393450632744e8c2e06a2defaa4066322756caccf8010a6d3c9db12d9296f9f366b7e8375283d166655089f06beb4cb3be313c1a7ec2bc74f4d576f0
+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
diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
index f22b67f5220c..c397d925fb6d 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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 readme.gentoo-r1
+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/"
diff --git a/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild b/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild
new file mode 100644
index 000000000000..140eed0ebc77
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild
@@ -0,0 +1,74 @@
+# 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 6ea8ff1593c3..14727bf79b6b 100644
--- a/net-misc/youtube-dl/youtube-dl-9999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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 git-r3 readme.gentoo-r1
+inherit bash-completion-r1 distutils-r1 git-r3
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
 HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"