From c18398e8c10c222f0daed55f7d69339e3c7885bd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 24 Feb 2023 15:48:26 +0000 Subject: gentoo auto-resync : 24:02:2023 - 15:48:26 --- net-misc/Manifest.gz | Bin 54285 -> 54128 bytes net-misc/youtube-dl/Manifest | 4 -- net-misc/youtube-dl/metadata.xml | 20 ------ .../youtube-dl/youtube-dl-2021.12.17-r1.ebuild | 78 --------------------- net-misc/youtube-dl/youtube-dl-9999.ebuild | 78 --------------------- net-misc/yt-dlp/Manifest | 2 - net-misc/yt-dlp/yt-dlp-2023.1.6.ebuild | 64 ----------------- 7 files changed, 246 deletions(-) delete mode 100644 net-misc/youtube-dl/Manifest delete mode 100644 net-misc/youtube-dl/metadata.xml delete mode 100644 net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-9999.ebuild delete mode 100644 net-misc/yt-dlp/yt-dlp-2023.1.6.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index c843f8eb7507..1a47dcd1becd 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest deleted file mode 100644 index a8867b233e7f..000000000000 --- a/net-misc/youtube-dl/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST youtube-dl-2021.12.17.tar.gz 3332299 BLAKE2B 5c798ad1f54f06cc42fd9a538536310e1084a02ec96969ff8e85ef0c6487ef54f34d58858512ade8b279929d8ebb9dda48175302fa23af9833c2301daa1d49c2 SHA512 bfc8280703b08f66e1108e9ebd9ab4689f064ac7cef03bd3d1fd2bc64928570e4376e389c9bc188eafdbcd74444cfc8aeccc83ee362ad4f478910efef3573ddb -EBUILD youtube-dl-2021.12.17-r1.ebuild 2673 BLAKE2B 539a94d7bfe0bcf446033c2efea2107c15e33d262597441761f25168a0917d0973ebb4dacd40e4088b09daa8b29e99fc62138e3fb4a1b9fa5b5b1766407573dd SHA512 2978cfe118a9e31aca786301ddfb10ff5dea79f2ba653216ab187554883adf08acc91fee45e23dbb747379d0cb14c1bbce61e5c1b6f4f8b8144a549e163538a5 -EBUILD youtube-dl-9999.ebuild 2601 BLAKE2B c474447edb3996a8cbda1366d0b83f39d2be403edc69b8f390c24ba64d52d338ad738c17582c8b5bfe1ed5dc735b3cfd458b983519a697efb415e1da2a159737 SHA512 93df6c5d89920d32ac1ef5054749877bf19d2b4426935438e5654b70ab947ac08e4650e6b583c2d206ddcf1eff0aba99fab7e3a11324fb7c0f4c1109c3b7ebc5 -MISC metadata.xml 641 BLAKE2B 8c5454a12949d798a299501d1874d63bd86523460620ad1e00d918e4066a0970f373d442e2eaf22a59179c7712999050bca9c5b5f823d4fbaf840612bbff270e SHA512 38cee113f60292620e333733d686b304b8d17ca74a904e23e4e4cb85d1cd4089af139d358b1ab6cb315ab6cde6bbc13c9569d31ddeb4ff24a5fb57675079119c diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml deleted file mode 100644 index 1597ae3f0442..000000000000 --- a/net-misc/youtube-dl/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - ionen@gentoo.org - Ionen Wolkens - - - marecki@gentoo.org - Marek Szuba - - - - Use net-misc/yt-dlp to provide the command and only install the python module - - - ytdl-org/youtube-dl - youtube_dl - - diff --git a/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild deleted file mode 100644 index 965112b0ebdd..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) -inherit bash-completion-r1 distutils-r1 optfeature - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -S="${WORKDIR}/${PN}" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="+yt-dlp" -# tests need deprecated nose, and given upstream is still refusing to make new -# releases or modernize anything (wants to support old python more) it will -# likely be last rited along with any revdeps that still can't use yt-dlp -RESTRICT="test" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] - yt-dlp? ( >=net-misc/yt-dlp-2022.2.4-r1 ) - !yt-dlp? ( !net-misc/yt-dlp )" - -#distutils_enable_tests nose - -python_prepare_all() { - distutils-r1_python_prepare_all - - sed -i '/flake8/d' Makefile || die -} - -python_test() { - emake offlinetest -} - -python_install_all() { - dodoc AUTHORS ChangeLog README.md docs/supportedsites.md - 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 - - rm -r "${ED}"/usr/{etc,share/doc/youtube_dl} || die - - # keep man pages / completions either way given they are useful - # for yt-dlp's compatibility wrapper which tries to mimic options - use !yt-dlp || rm -r "${ED}"/usr/{lib/python-exec,bin} || die -} - -pkg_postinst() { - optfeature "converting and merging tracks on some sites" media-video/ffmpeg - optfeature "embedding metadata thumbnails in MP4/M4A files" media-video/atomicparsley - optfeature "downloading videos streamed via RTMP" media-video/rtmpdump - optfeature "downloading videos streamed via MMS/RTSP" media-video/mplayer media-video/mpv - - ewarn "Note that it is preferable to use net-misc/yt-dlp over youtube-dl for" - ewarn "latest features and site support. youtube-dl is only kept maintained for" - ewarn "compatibility with older software (notably its python module, yt-dlp has" - ewarn "a 'bin/youtube-dl' compatibility wrapper but not for the module)." - - if use yt-dlp; then - ewarn - ewarn "USE=yt-dlp is enabled, so said compatibility wrapper will be used. Man pages" - ewarn "and completions for youtube-dl were still installed but may have slight usage" - ewarn "differences and does not read the same configuration files. It is recommended" - ewarn "to use the yt-dlp command directly instead." - fi -} diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild deleted file mode 100644 index 0f35fc1d05b2..000000000000 --- a/net-misc/youtube-dl/youtube-dl-9999.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) -inherit bash-completion-r1 distutils-r1 git-r3 optfeature - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/" -EGIT_REPO_URI="https://github.com/ytdl-org/${PN}.git" - -LICENSE="Unlicense" -SLOT="0" -IUSE="+yt-dlp" -# tests need deprecated nose, and given upstream is still refusing to make new -# releases or modernize anything (wants to support old python more) it will -# likely be last rited along with any revdeps that still can't use yt-dlp -RESTRICT="test" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] - yt-dlp? ( >=net-misc/yt-dlp-2022.2.4-r1 ) - !yt-dlp? ( !net-misc/yt-dlp )" - -#distutils_enable_tests nose - -python_prepare_all() { - distutils-r1_python_prepare_all - - sed -i '/flake8/d' Makefile || die -} - -python_compile_all() { - emake youtube-dl.{bash-completion,fish,zsh} -} - -python_test() { - emake offlinetest -} - -python_install_all() { - dodoc AUTHORS ChangeLog README.md docs/supportedsites.md - #doman youtube-dl.1 # would require pandoc in live ebuild - - 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 - - # keep man pages / completions either way given they are useful - # for yt-dlp's compatibility wrapper which tries to mimic options - use !yt-dlp || rm -r "${ED}"/usr/{lib/python-exec,bin} || die -} - -pkg_postinst() { - optfeature "converting and merging tracks on some sites" media-video/ffmpeg - optfeature "embedding metadata thumbnails in MP4/M4A files" media-video/atomicparsley - optfeature "downloading videos streamed via RTMP" media-video/rtmpdump - optfeature "downloading videos streamed via MMS/RTSP" media-video/mplayer media-video/mpv - - ewarn "Note that it is preferable to use net-misc/yt-dlp over youtube-dl for" - ewarn "latest features and site support. youtube-dl is only kept maintained for" - ewarn "compatibility with older software (notably its python module, yt-dlp has" - ewarn "a 'bin/youtube-dl' compatibility wrapper but not for the module)." - - if use yt-dlp; then - ewarn - ewarn "USE=yt-dlp is enabled, so said compatibility wrapper will be used. Man pages" - ewarn "and completions for youtube-dl were still installed but may have slight usage" - ewarn "differences and does not read the same configuration files. It is recommended" - ewarn "to use the yt-dlp command directly instead." - fi -} diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest index a5ba950fcf3f..21243c64eaca 100644 --- a/net-misc/yt-dlp/Manifest +++ b/net-misc/yt-dlp/Manifest @@ -1,6 +1,4 @@ -DIST yt-dlp-2023.1.6.tar.gz 2529382 BLAKE2B d7682346f6a783e0e7b95fc312bb0fffc2b1053ecdbf9b61b01402a8b6d73e41ca7809876d99a1e29d0bf708443444908e931715197c8c2c42807672a55eae61 SHA512 6817659dfa90bc9eecd60608e995097af381d598b4c094784b0cb467f16794f60ffcd90db89444cff2d86312ab1310f13c438def9fb05e3a2154c2e88af48670 DIST yt-dlp-2023.2.17.tar.gz 2571278 BLAKE2B 74d077f5798e3371c42b5eb76e676619e7650a4003875d08995302c55120af7aa966a1e422cba6b0655cad4dedeed1874c2eb2348242fba9b0df12544d4dcfb3 SHA512 2458358410acb49ffc8fd4c49abddc78a5015ccf48979350fc5f9d4805c2dd8f7b728837ad30d55119cf8fc6842cba36a995ef9291da22af3135ae4a9077a5ba -EBUILD yt-dlp-2023.1.6.ebuild 1799 BLAKE2B c67eeebdc88c8f556892d11ac63be1e8a7c564749284d3e6797b78f8b6ddf709a6cf8f3a43b6a6a9ba501ff4f744afa6c20f683ddbe5d7214236d8939a4fc9bc SHA512 5e057ef308b4916e059ba20d708c6e3ab5742b2d96b20592d7092fe96249d5685ae8359706ea780537774933d3a2bc6a96bb5fbd852f3c8219de88979447c430 EBUILD yt-dlp-2023.2.17.ebuild 1799 BLAKE2B c67eeebdc88c8f556892d11ac63be1e8a7c564749284d3e6797b78f8b6ddf709a6cf8f3a43b6a6a9ba501ff4f744afa6c20f683ddbe5d7214236d8939a4fc9bc SHA512 5e057ef308b4916e059ba20d708c6e3ab5742b2d96b20592d7092fe96249d5685ae8359706ea780537774933d3a2bc6a96bb5fbd852f3c8219de88979447c430 EBUILD yt-dlp-9999.ebuild 2032 BLAKE2B f621518216ab8ac6cac20a2083cce0f6f16133507fd09a2384d38504fa8bde43a7dc56903da889a87c477a4991204b266b02f5488ccc325819fde84c4a188ff6 SHA512 c623116051f3c327ebe130807b91aebf0de62f3593f70d41d7e2b7e4f60112223f8951645b860ce7817fe37acd0612c600a1020b1754cf7d15626927f65aa03f MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734 diff --git a/net-misc/yt-dlp/yt-dlp-2023.1.6.ebuild b/net-misc/yt-dlp/yt-dlp-2023.1.6.ebuild deleted file mode 100644 index 60931d0bd7a5..000000000000 --- a/net-misc/yt-dlp/yt-dlp-2023.1.6.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) -inherit bash-completion-r1 distutils-r1 optfeature pypi wrapper - -DESCRIPTION="youtube-dl fork with additional features and fixes" -HOMEPAGE="https://github.com/yt-dlp/yt-dlp/" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] - !net-misc/youtube-dl[-yt-dlp(-)]" - -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare - - # adjust requires for pycryptodome and optional dependencies (bug #828466) - sed -ri requirements.txt \ - -e "s/^(pycryptodome)x/\1/" \ - -e "/^(brotli.*|certifi|mutagen|websockets)/d" || die -} - -python_test() { - epytest -m 'not download' -} - -python_install_all() { - dodoc README.md Changelog.md supportedsites.md - doman yt-dlp.1 - - dobashcomp completions/bash/yt-dlp - - insinto /usr/share/fish/vendor_completions.d - doins completions/fish/yt-dlp.fish - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_yt-dlp - - rm -r "${ED}"/usr/share/doc/yt_dlp || die - - make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl" -} - -pkg_postinst() { - optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg - has_version media-video/atomicparsley || # allow fallback but don't advertise - optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen - - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' - elog 'as "youtube-dl". This is strictly for compatibility and it is' - elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' - fi -} -- cgit v1.2.3