5 files changed, 4 insertions, 81 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 70a6ef27760a..1e317a21b5ac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 4c3f6ddec8ec..841f56c12c72 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,7 +8,9 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
 DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c9f8c4112fa7cec6d79e8e96505576c2b7f3dff91317a3f45582322cfdb435535a41bb537b0a0bfec9df6f8d5986f SHA512 4445f383e18ffc53071c13b495c3864978658f4f6f439ab4579dd831fc12ad4850e04e9526954608ae627b0b23a9d6cb327560f02d15abff23e12f5d7c1723b4
 DIST memcached-1.5.20.tar.gz 531035 BLAKE2B fcabbb8deac585f20100855bbdd27616077e0f129a8537c39869ceb251fae8d598c64998846120f63f29a690afdc2a3603f87bb21ecc473e13f5ef9e9c48bbb9 SHA512 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d
+DIST memcached-1.5.21.tar.gz 532631 BLAKE2B eaed8eae81c7874c48dfc6df5611d83d21a69a19c9b79bddbf909d15f1c84b3c03416002bf0beff07a8e6502741ad6f776e1cc86cf4b16840ea83c727db3c80b SHA512 4ade3e15e6821b76f086b4933f5599248f8de7e7b2ae106dc8ecbc8a5073a1966e4c3956413fd57387bb88fca2c0e95b9a3ce7bfce19c42bec584a3268f06998
 EBUILD memcached-1.5.14.ebuild 2930 BLAKE2B 1e47dcee14202eb3f7de51c779c5e6ddb9eea26fd743a362919fb6bf60e4d2333910b8eb1db13491f429eeb19d9451912e6ec1bdb753ee21eb7f2bdf90415864 SHA512 29986b6567a677dc7b9fb514a03966dc9f661ddfcc5e380118eb4e1b12d06601347149a8e4a97bfbdcbec04f6de243c2fd9201725017c562cb73bc407d79578d
 EBUILD memcached-1.5.19.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
 EBUILD memcached-1.5.20.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
+EBUILD memcached-1.5.21.ebuild 2911 BLAKE2B 17edbe4300536002d2f595ab847351baf0157cae5392031eb6d90546c0e7ac36197e73a2497c709d66d2f3fcc530a1d60e6400dc81aa0e569e65a94c7e067832 SHA512 e129d85539cb635e2387830283c2933d9c076478cc5f6896b18825b24931d332f8c9ea640793e65ebd9753fa55c32fd2a4c3216406c6ad719f097c8fe22783ab
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 61f935071d83..868722cc2870 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2020.01.01.tar.gz 3156193 BLAKE2B 0052e8da07d83127a8c2cf3a25ab9733e7f4417473e89cdaf849e11e79285e4c8bdce5003b59f6ff8cbf3980043ce2e992346264f08caecebfa4ee33370203b0 SHA512 035d44aa4989067587d3c5a8d1bb4214bb7bfa16b91562c730fcf93de1578de75ddf12c8a0900643578546a4230da776b8b83f69378525c1480e9e0061f492cf
 DIST youtube-dl-2020.01.15.tar.gz 3159264 BLAKE2B 4f7b527e02e5ce6923f66db322c4ba8695e6e2850b7bcf4353914a27c31c7d5d28980b948326585bd2a25b76f4d7e903e8589fe1f137d905aca9ad30d54818d2 SHA512 1b450feef1d6040726f99e482edb6119b66224a98bdec1983f6921f21b08bd8fceb77cff055326b660fb66742815e5e0238807707547ef82b51b9966fdc82be7
-EBUILD youtube-dl-2020.01.01.ebuild 2239 BLAKE2B b0b08d37700f463c53c955d4396dd98eeaaaccd7573b8db735dd7ca52451fa41b0f24344d73b00e78fbb2a86e068373db8bfead32b1ebfca9a38408315a0bc1d SHA512 c82a5b508a3941afaa771dffbd88ca3fdff8fd1af5e1b13a0087790f76911c7cd98ad2f5d45ea1eb257d796ec302d59120197241e9685e9897f590b8af308886
-EBUILD youtube-dl-2020.01.15.ebuild 2245 BLAKE2B c555a3f395758ae90ad46f0db73dd28c9e98d38dfec4de8929edbc0f0f566847725c6ea4c3bec32bc2cb8ee4cda9e0c10c451d19f1cdcf6cf77e57577519b5dd SHA512 57e369eab168d96c31721ab6eb59021b73ef55e5571f5d4029fd9250907061a38f1aaacc0ccce528d0bfa33365f5b53c76400bdde116d8b50733915591de55f2
+EBUILD youtube-dl-2020.01.15.ebuild 2239 BLAKE2B b0b08d37700f463c53c955d4396dd98eeaaaccd7573b8db735dd7ca52451fa41b0f24344d73b00e78fbb2a86e068373db8bfead32b1ebfca9a38408315a0bc1d SHA512 c82a5b508a3941afaa771dffbd88ca3fdff8fd1af5e1b13a0087790f76911c7cd98ad2f5d45ea1eb257d796ec302d59120197241e9685e9897f590b8af308886
 EBUILD youtube-dl-99999999.ebuild 2142 BLAKE2B 1f9fdb555f7f4fb60cfde00f72e037149e9d12458984127dd72c5fb75c27fb6cb4590dc3b81986d8f42d0beee66aed95f5efd5527de21e2b1be6d0065dd5664a SHA512 572c11fd1428ab7ee83a3e6deadf68c378b3ff4f47dca74dcf8604fb4e82e1d8e6f55e64cb1067d011143f212dfff27f923c739834e46f0b226683bfa2c31f87
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2020.01.01.ebuild b/net-misc/youtube-dl/youtube-dl-2020.01.01.ebuild
deleted file mode 100644
index 41719258e92c..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.01.01.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{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"
-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.15.ebuild b/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild
index faa91ea76c9b..41719258e92c 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 SLOT="0"
 IUSE="test"
 RDEPEND="