gentoo Easter resync : 12.04.2020

4 files changed, 5 insertions, 91 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 660f7040f5e2..8609c57c7e5c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2020.01.24.tar.gz 3159926 BLAKE2B 0b1be74f74eb0be6cb0a41faf0538110bfc5d1a213fa1c456a6a358096f16ac8768ebd3d4673e523251fd0721a4a0990f061713d32b13c11077e79f8f02989e1 SHA512 8f85a218395d2932b26c7b76d5b03cbdf9a7c541415c8d1b805239b6ab1ca74b94fc497f32052a1d93fe20ac760994975a13551dd8c5319f0549af20b70a1a78
-DIST youtube-dl-2020.02.16.tar.gz 3161956 BLAKE2B 36cd189b162d98f986d669c4439070efbf344aa05f821b9e35a58fcef8db839ad0e079836e7a84cd17b04afdb113559695ad500f4b0183c7dcefa1694bdccf62 SHA512 1164ad9f875d67844ddc7bf8214bcc06cb384d7f2a5661c1f419f2ce5950b1cfcbf90c558e143b76948d9d7cf57cf3843c8d6392fc6ef77f89319375610f01a2
-EBUILD youtube-dl-2020.01.24.ebuild 2260 BLAKE2B a48928c4a0252d63ca1298ada873980ddf65232bd3e701b967d897cc27164ac984db30d6751e993690c90b508f6578f0de616edb89a0bc86afea52b7222d770a SHA512 1a46d92d493004b2341d429c83d20b39815682e9163525132acbe5ca7ecce3b02555d0723695f83abd5443204083a5a23d0510a82340c441e67d360a24c4d300
-EBUILD youtube-dl-2020.02.16.ebuild 2266 BLAKE2B fe492271e4383198eb2654a2085c297120dc09f9ae6242cc65bacb2b98422ddb371e5ff68f3620370faedaab9566e786c46e740c93fa7538c742188c4959e329 SHA512 a3cfd6f92f2b66ed7ed90feaa3563402fbca898f1918d7b0804512da81fa47db69cbad7e8cef06178e4f5f7ac1db5889ab75d8b0abe501c6d5b94d521466f4cc
-EBUILD youtube-dl-99999999.ebuild 2163 BLAKE2B 29e69318bbbb79c7e311867c0be98bff4f3958c8df7723c28b0917b8cb3c8f8a922dd1cd1f83853423a19b3f62e4e26255e8a26a5e6e0c55ec8b44fd5dd6157b SHA512 096da09988640a41943c7af34f52a4953e9e175452b390b5956c324f61a6161db5004cf8d70f8ff34d83b29513eee7709df8335aff82b5a3413ed48c4af6f76c
+DIST youtube-dl-2020.03.24.tar.gz 3165706 BLAKE2B 817cd8762f496255e58f909ab04f5fec3627918b4d9b58a9ab12c8bd56a12f672067c1dfe0808d76a96bc97fc7bc9a9e661c4f176577c0257f45d5cf6d0c7b92 SHA512 421c0ae412977cdf94d079aa7982360ffdfc4271bb7af27a598adbdb8454c2044e5c44ff3a9f339e9b0989c1264223ca83bba6a9151d01052f8f72c076d9e369
+EBUILD youtube-dl-2020.03.24.ebuild 2210 BLAKE2B 323d2ab1445d2a1333f4c23e561b302b95a6731657092e1a5085bda7c6b0605f07026079a7af5bd15a8b1fe91baf16e0d43856768473539812d2167be6e9e20b SHA512 f6378774bcadcca2dbd9ea55aa4eb003f7417188fa496fdd056ad66bf5d1a1da90ed98e696d4238340bc0f2a2d080a8e94c3ba33822c9566981faa8c92077c8b
+EBUILD youtube-dl-99999999.ebuild 2113 BLAKE2B b92cf80b267e39b08b11a488127b19cfb22387ee95c7a5ccd28de5aa15c81df32f6b55fcbbde65e64ec26018b2b0c105eb811620873963ca3494ba387df87596 SHA512 cfdcbb7a37cf355233fa191197ccd38a113b3bc7ab3391f42587614d129b8a310ec5896c4f069d2c3f6e9fc4e38b4141a721bc373b313961a93b72dd28458ae1
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild b/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild
deleted file mode 100644
index cc4f38a726e5..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_{6,7,8})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild b/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild
index b90fc3a70b10..1f7d1a6c1729 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild
@@ -15,11 +15,8 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 3135d5cb48e0..e469e49163c2 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -15,11 +15,8 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
 "
 DEPEND="
 	${RDEPEND}