summaryrefslogtreecommitdiff
path: root/net-misc/youtube-dl
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/youtube-dl')
-rw-r--r--net-misc/youtube-dl/Manifest19
-rw-r--r--net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch22
-rw-r--r--net-misc/youtube-dl/metadata.xml1
-rw-r--r--net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild74
-rw-r--r--net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild76
-rw-r--r--net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild71
-rw-r--r--net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild71
-rw-r--r--net-misc/youtube-dl/youtube-dl-2020.12.05.ebuild71
-rw-r--r--net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild2
-rw-r--r--net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild)0
10 files changed, 6 insertions, 401 deletions
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index a30a16532451..d2d7ecf639d5 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,17 +1,6 @@
-AUX youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch 854 BLAKE2B 31c948c2fa82ba431c2b31eab9c29a55cbf5bb59ee2eff7a683c5549d30935bbf96be479cc920196408027c34dff818d409e5aee875855ba56be42aa879f5079 SHA512 7bb9a264dcf4a5691460fe537fcb64e11f7f02a54d29590375e5630489688ae940d66818966690916aa0b6ec8b54be730b0f39efa168554e644a1b68bcba33a6
-DIST youtube-dl-2020.09.20.tar.gz 3188480 BLAKE2B c12ee589d112155207b59da9f710b2c776c07464d5c64a5d8355b963a81765b0dbc65df4f9564504fb963f30d5a11dc7e662c14d58ddf9fe6347352363cf70a5 SHA512 ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
-DIST youtube-dl-2020.11.26.tar.gz 3218922 BLAKE2B 4e8ac926a7cef9d8a9f53de1002464e4d3a632d09c6564e1451a7bc49fe4cdf72e206f98df58a4025d55718f46d84fe4f1f6e23268ef19ad3ebd11725d5a0fcc SHA512 126c299c3db654ad3c88ced44bfc1a34bd73a439d8d3fd64720bb5d06fe84df817182a9e0b38d1def2eb4f1de26c7e2b8b6d3d6b4282f973db548c9868938a41
-DIST youtube-dl-2020.11.29.tar.gz 3222467 BLAKE2B 6b699689f55fb5b24d9a3fa9b500461076d9cac58a111fde5f07f4df45113d40cb2cfbec2b86777b92277fbe16467c1516fdd5bb49e30f8361dd7fe3479eca57 SHA512 e3b4e7e7a776a608d2ee34c5395108445ea43fc999b0364a686eddb5d5977591d2c625b2a97955fd565631da070921f3196cd98ce58cf9aebf4e504636645a3d
-DIST youtube-dl-2020.12.02.tar.gz 3225560 BLAKE2B 953de14c6801a853091625753c0f918e7c6f88b1631ed2d41427fc36cc615830161f860e043ca784b31b1845ecfd0f5a88afcaeca40dc797cd89d36d4762d637 SHA512 5e48e272d957be391cb18960e0b1864b0f2202e26a53491f5c15f6c40bc36e720d80e95955a5a2f889e05f11a999fd311d095b18e5082bb951739c63ffe7565a
-DIST youtube-dl-2020.12.05.tar.gz 3228845 BLAKE2B 6186a7d788bb839a7beceb708ddcc629bf111403ac003baa68422122a77d3793148769b0062f8ca2b1d24348d203ba7cd0b1841c2a16f95e0620423b881a83c2 SHA512 c58baa8a95a9bfc09a8f37299fd3061101d29a0662bd1c35f5b4d3d030ac1f06b47ec2f42fdec1759005556a81c43f7d067e9a43622ba06f8817b1a63c52c4a2
-DIST youtube-dl-2020.12.12.tar.gz 3225195 BLAKE2B da14fb941fd81f0596a590e7690c2f4786a57d9fbe057743ab2a4a4cabad9978df3352ae1389b89e42673c3ea99e43488741f2d22cbb6274f1fadc5cbb923a47 SHA512 388722cadf500cbcd97b8d92b1ae67d091a5fe79e6bdf19e3a3f94476ef926f7ab57b35ee6d14e2d7a7bf1c72db37535de6c9c6affd32f4c1403902b813d5530
DIST youtube-dl-2020.12.14.tar.gz 3229047 BLAKE2B 5a54ce2f7f754640c29c9183495c5933340f6d2b94e4bc958eb6590ada08b12b8333d7c61106e1c00d1ef039a7d203382930833d2734f80bf361cf6858ef09f8 SHA512 8a7d96656ef6803afdff90a2c528cdac5354a10996a631c54c722615ccbf879fd5e89b85f9e369cb9d1fd239fc095db4e232a5c420cdd902f5ffbe76f4e3d1a5
-EBUILD youtube-dl-2020.09.20.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
-EBUILD youtube-dl-2020.11.26.ebuild 2234 BLAKE2B b77ce7a214ccaf5b4512402f406cecf6f770832cb1ac99fb9ad3f7d087b985a0c9d4db1de7e661e9a0bc583d2548286221c6402911d190f8ac77d0ea8065136c SHA512 e7416bca93ff11567f98bf293a1adc66bfcc9dbd6c9be39c6e292b46cdadc96e68ae03710cb42cd521e0893793e19db86e4e90e5376c37ef5172be464226e3cc
-EBUILD youtube-dl-2020.11.29.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
-EBUILD youtube-dl-2020.12.02.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
-EBUILD youtube-dl-2020.12.05.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
-EBUILD youtube-dl-2020.12.12.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
-EBUILD youtube-dl-2020.12.14.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
+DIST youtube-dl-2020.12.22.tar.gz 3238866 BLAKE2B 8f2f07c59b4d64ed9176bdbfcb858c4f90d7acfe97fad02bf98c517e46fca049421deb764a039466557cfda20d3921535e0e0ae0be4c9afe514a2242a18a45b5 SHA512 2acd7256d3479387db25cc85882da77996cb8fe09a6c6400a9580c1c10317ab72ee18b0e1c2429f533992c41e172f2bbd8c9570daed01578aa971b1ba9d3fbc2
+EBUILD youtube-dl-2020.12.14.ebuild 2141 BLAKE2B 5db35465043ec68d3b363c045a0369a07e2bc7c07e8e1d6360b4077cb64aa2f63caa2ee828e1154e6c6ed68750edcd169e89b524a607ab2d58a54c39592f7888 SHA512 fff697c16e91a51e24ae4315b6d7896bf0215414fe71824bd1d5ca6708ab66a051bd3db768c6705e4fbeb828a74c4781f5c6641146258ae7ed72ed11d74f2a84
+EBUILD youtube-dl-2020.12.22.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
-MISC metadata.xml 353 BLAKE2B 53a5a71088d6c6ba1785f245c36c8c7551eb800b308313a053cfb5f292df1adce321383522528a06742aabee8f5d7fe8d2d9805c28632fce1d50f6a938b163a0 SHA512 01570d01232abde7a0d3983e307197cd07ad010f57f5df49048405b45fe2e1f2aeb0594260014bd4d95a6f234885e29ac802111402df3707d41b4b0f75b7457b
+MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch b/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch
deleted file mode 100644
index c48760a4c41c..000000000000
--- a/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 99de2f38d375f794ffdc4f5a110a5227310f3ab0 Mon Sep 17 00:00:00 2001
-From: Remita Amine <remitamine@gmail.com>
-Date: Wed, 25 Nov 2020 21:39:17 +0100
-Subject: [PATCH] [spreaker] fix SpreakerShowIE test URL
-
----
- youtube_dl/extractor/spreaker.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/youtube_dl/extractor/spreaker.py b/youtube_dl/extractor/spreaker.py
-index beee6670c..6c7e40ae4 100644
---- a/youtube_dl/extractor/spreaker.py
-+++ b/youtube_dl/extractor/spreaker.py
-@@ -126,7 +126,7 @@ def _real_extract(self, url):
- class SpreakerShowIE(InfoExtractor):
- _VALID_URL = r'https?://api\.spreaker\.com/show/(?P<id>\d+)'
- _TESTS = [{
-- 'url': 'https://www.spreaker.com/show/3-ninjas-podcast',
-+ 'url': 'https://api.spreaker.com/show/4652058',
- 'info_dict': {
- 'id': '4652058',
- },
diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml
index 5a459dba5f89..5cbaf15f03cc 100644
--- a/net-misc/youtube-dl/metadata.xml
+++ b/net-misc/youtube-dl/metadata.xml
@@ -9,4 +9,5 @@
<email>marecki@gentoo.org</email>
<name>Marek Szuba</name>
</maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild b/net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild
deleted file mode 100644
index 9dc88dfb1591..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild
+++ /dev/null
@@ -1,74 +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/pycryptodome[${PYTHON_USEDEP}]
- dev-python/setuptools[${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 ffmpeg (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."
- 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.11.26.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
deleted file mode 100644
index 82be3f810520..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..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-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
- dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-# Only needed by this specific release, already fixed upstream
-PATCHES=(
- "${FILESDIR}"/${PN}-2020.11.26-fix_spreakershowie_test_url.patch
-)
-
-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 ${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 ffmpeg (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."
- 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.11.29.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
deleted file mode 100644
index 47f8343b521a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..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-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 ${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 ffmpeg (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."
- 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.12.02.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
deleted file mode 100644
index 47f8343b521a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..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-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 ${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 ffmpeg (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."
- 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.12.05.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.05.ebuild
deleted file mode 100644
index 47f8343b521a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.12.05.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..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-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 ${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 ffmpeg (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."
- 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.12.14.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
index 04afa74ada09..b710767233e1 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
@@ -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-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"
RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild
index 04afa74ada09..04afa74ada09 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild