gentoo resync : 22.05.2021

4 files changed, 6 insertions, 79 deletions

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index bfb1090bf7eb..9e63888ddea4 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,6 @@
-DIST youtube-dl-2021.04.07.tar.gz 3324661 BLAKE2B c560b6b07bc3ba0c9b7233a634bfae617f604ed5e019e22aefc90e9221a8cd358b937f727b706bba6e9bb6f0a18a8ebd28d5c1f0be383d9dca2c692266cdf222 SHA512 aabf6a1ceefe9101c710bbb45b91e6253a1256343513d841f7901d2be32521a001dac15f5bf13ac94beaf4638dce691f2a157a6172d89047ce2248d06bcafbf8
-DIST youtube-dl-2021.04.17.tar.gz 3331721 BLAKE2B 6b7be0fcb85222d287848cfa40da1dee3f689c59388bbc5d32c335b54cbd0e5ec54c86caf358418641c429d37ae28575858486d4db798d72225a4f5c6e064ac8 SHA512 cb8c76063fc3bd66d07995a669fcf29e5b766c4deb05c9d82fc9795ac3a090a4ae2ee152f150208eae22b93157c286c615044f8f5b0a47798266ab219b49632e
 DIST youtube-dl-2021.04.26.tar.gz 3333530 BLAKE2B cffa09f91a1bbfc5962177133711ec1fce4760ef4a073c01daede2cdc168a10cfd868ca536903127f5a3214aece1c111d1dae23739aac86e765d7ff21903c884 SHA512 d187b537fc71ca8e0c9422404f14bab20f66ee9ea10af40d94e9216a79d6b78c1c535600308d18905c34ede0934dbf4f642f58125e898130ce536bc053aa2a10
-EBUILD youtube-dl-2021.04.07.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
-EBUILD youtube-dl-2021.04.17.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
-EBUILD youtube-dl-2021.04.26.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
+DIST youtube-dl-2021.05.16.tar.gz 3336051 BLAKE2B b73206355187a9f61c51749ce01db40757937f79f988a3b81513a5cbe2c854d1b7f2268d7e02c4a0eb3d46c0852990950dfd400acc09f7616aeccb2e8cba6cf9 SHA512 a78ebfc16cc52458e2a036deb48693110f20c046ca3a509be9adbca76d23429953fcf3cd3aab8390a19af747291950bb9261e5339e5cbb0903b98848216c7aca
+EBUILD youtube-dl-2021.04.26.ebuild 2132 BLAKE2B aca117606444a348e36c1899222b24c091ed717dfa799f48a92de68c4ad07b9671719eaa15e084843d4fead0905d00302884da3ebd56e6e39297da42b446a38b SHA512 9f0f20088a069af5f33ffcab5c4db0bf850e01c34b70bd72279140b9485f838e4f947d48adbe8fc8a30ee064078aae02c08d7c7a5632d42803ae47d39431e99d
+EBUILD youtube-dl-2021.05.16.ebuild 2137 BLAKE2B fe26a208b04301c55e253adfa69189bcaa55624e1e7ac9103634383bb5c04537d1bd15552064d0ae07eb42ab19bd3be3497568d6b4dc74e8bf87748e211c08e1 SHA512 76d1a22b00c0d1625889b5bbd23bbae97a0408642d883127821a16896e3c48a0a809e40496777b65f45b34b6e20b38a7a168d087d781eb1b3e6575ab7fcc3ddc
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild b/net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild
deleted file mode 100644
index d787a3f3be53..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-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() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and 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 youtube-dl 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-2021.04.26.ebuild b/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
index 9b024e43dbba..3d701ad41fa9 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{7..10})
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
index 9b024e43dbba..6ca1748400e4 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{7..10})
 
 DISTUTILS_USE_SETUPTOOLS=rdepend