commit: a91f98e856723f42c8636180f2f3a5bf829ff899 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Feb 24 09:14:08 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Feb 24 09:26:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91f98e8
net-misc/youtube-dl: treeclean Closes: https://bugs.gentoo.org/798237 Closes: https://bugs.gentoo.org/891917 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> net-misc/youtube-dl/Manifest | 1 - 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 ---------------------- profiles/package.mask | 16 ----- 5 files changed, 193 deletions(-) diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest deleted file mode 100644 index a0a1ab7aa284..000000000000 --- a/net-misc/youtube-dl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST youtube-dl-2021.12.17.tar.gz 3332299 BLAKE2B 5c798ad1f54f06cc42fd9a538536310e1084a02ec96969ff8e85ef0c6487ef54f34d58858512ade8b279929d8ebb9dda48175302fa23af9833c2301daa1d49c2 SHA512 bfc8280703b08f66e1108e9ebd9ab4689f064ac7cef03bd3d1fd2bc64928570e4376e389c9bc188eafdbcd74444cfc8aeccc83ee362ad4f478910efef3573ddb 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Ionen Wolkens</name> - </maintainer> - <maintainer type="person"> - <email>[email protected]</email> - <name>Marek Szuba</name> - </maintainer> - <stabilize-allarches/> - <use> - <flag name="yt-dlp">Use <pkg>net-misc/yt-dlp</pkg> to provide the command and only install the python module</flag> - </use> - <upstream> - <remote-id type="github">ytdl-org/youtube-dl</remote-id> - <remote-id type="pypi">youtube_dl</remote-id> - </upstream> -</pkgmetadata> 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/profiles/package.mask b/profiles/package.mask index 9c594018b6e4..2382cc754f56 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -690,22 +690,6 @@ app-text/sword-modules # Removal on 2023-02-24. Bug #837611. sys-cluster/wulfware -# Ionen Wolkens <[email protected]> (2023-01-24) -# Mostly obsoleted by the better maintained net-misc/yt-dlp, please -# migrate. If had USE=yt-dlp enabled (default) then was likely already -# using through its youtube-dl compatibility wrapper and this will -# change nothing beside needing to ensure that it is not depcleaned. -# -# Upstream is mostly focusing on compatibility and old python support, -# still uses deprecated Nose for tests, and has not seen a new release -# to deploy fixes in a long time despite major issues (e.g. throttling). -# -# Been kept due to some packages lacking compatibility with yt-dlp's -# python modules, but none are left in tree. Those that call the command -# rather than modules will often work as-is with yt-dlp's wrapper. -# Removal: 2023-02-23. Bug #891917 -net-misc/youtube-dl - # David Seifert <[email protected]> (2023-01-23) # EOL branch, switch to mariadb-10.4/galera-26.4, removal on 2023-02-22. <dev-db/mariadb-10.4
