From 0cfe92e62b5284f85bf29962d556bb067202e9f9 Mon Sep 17 00:00:00 2001 From: Andreas Billmeier Date: Fri, 25 Oct 2024 23:25:00 +0200 Subject: [PATCH] net-misc/yt-dlp: add 2024.09.27 (from main) Closes: https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/3886 Signed-off-by: Andreas Billmeier --- README.md | 4 +- net-misc/yt-dlp/Manifest | 8 ++-- net-misc/yt-dlp/yt-dlp-2023.10.13.ebuild | 40 ------------------- net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild | 4 +- ....09.24.ebuild => yt-dlp-2024.09.27.ebuild} | 31 +++++++++----- 5 files changed, 29 insertions(+), 58 deletions(-) delete mode 100644 net-misc/yt-dlp/yt-dlp-2023.10.13.ebuild rename net-misc/yt-dlp/{yt-dlp-2023.09.24.ebuild => yt-dlp-2024.09.27.ebuild} (60%) diff --git a/README.md b/README.md index ce1eba78e..b2fdbf956 100644 --- a/README.md +++ b/README.md @@ -606,7 +606,7 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E ## Licenses This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted. -There are 2083 Ebuilds in total, 2072 of them have in total 2099 (42 different) licenses assigned. +There are 2082 Ebuilds in total, 2071 of them have in total 2098 (42 different) licenses assigned. |License| Ebuilds using it| |-------|-----| @@ -620,7 +620,7 @@ There are 2083 Ebuilds in total, 2072 of them have in total 2099 (42 different) |all-rights-reserved|16| |BSD-2|15| |LGPL-3+|14| -|Unlicense|11| +|Unlicense|10| |PSF-2|10| |ISC|6| |MPL-2.0|6| diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest index 1632ef2b4..c6b1e278f 100644 --- a/net-misc/yt-dlp/Manifest +++ b/net-misc/yt-dlp/Manifest @@ -1,7 +1,5 @@ -DIST yt-dlp-2023.09.24.tar.gz 5494731 BLAKE2B 558fc80691951ba33e591a9bf1820e3da45f265f9392d28c6dcab1c2feb9bac84a0143d8034dde8c772f227eb9896c6406974440bd141ac88de0899438f229e0 SHA512 37f1c5c9af9f8cdd66a2fa09771f018042c3efac61a657ea1573a68a77dce2f76fbd8bb7a59ed72942093ddfd80d57573305ec8b60d00e6b0ba50276e3df2dfd -DIST yt-dlp-2023.10.13.tar.gz 2808331 BLAKE2B 6de74efb6ef6dacdc0ad972e17c6d636a13ba442fb514b74ca56d1f3b486c3d7e7c7c597e3eaa165fafe3af802fe2e1fe80b6956ce857f99bfffa488f27da7dc SHA512 60e669fa89e3d989392f11517b845e6df9774fc3d8b53172f489842ca12b74365a0284ae878e40bac58a2b6be26fb4abda50ee65b22ed0507487e132900ce00d DIST yt-dlp-2023.11.16.tar.gz 5568397 BLAKE2B 9747ccbb032776df3de78c22084c67cca7913af6b29de9baedb7fe9048feb3e85db1cc1e694fcc563fecb674bad094193ff0a9cab081de9cbb006bce546c8753 SHA512 0d4219d5c2c883a2f10e43b5d93a807f84121f43f781cf494b30000c37d105facce9226bb60367c563e86cf17c4cbb2550ba31cfed6c3b1abb337cd1fb39e414 -EBUILD yt-dlp-2023.09.24.ebuild 1857 BLAKE2B 280a0973a5e45cac2dd8d79e919173e192b511ec238b48f7f1255a43cc1053747d3fe88a8d076f2e04297d3c286f5fdcef80d174a9b272da40859dd4caf5367f SHA512 ca703668cd3091d90ee828775df7db999986ab3b0b967e2cba80582c679796c487d63feafadd771a432f430e57eb161b3da5667f892f41326e38af817d869986 -EBUILD yt-dlp-2023.10.13.ebuild 1019 BLAKE2B 17c03b491cbc0d22bc30e9977bdf838aeff6dd4b514487161e657ce3a5b1e6c153a6cecb540290963544a28c9800fffe44ac329e9d68c5c1fa1705f52ab056fa SHA512 d222e67a8e253ca11ba5b799dac8665fc133e01bb006b50da24887e3d266197cb63f818044ef5361f7e73acb622d2195e95229bad73fa0d4f2a75d26ed45edbf -EBUILD yt-dlp-2023.11.16.ebuild 2116 BLAKE2B c3c9b03b168a5d7e6c617087af9a8b0a85fe18f5da6c28f8ebd28ec1b5e19cc5e67a463cb28cef3b2b48b31a928b6065f5868854caeda2ac0824c6e7cd757b75 SHA512 0ef11b3b1752adccdf68672700bc69713da020c0ff63d3c846b26e30e5a57461d16f7f58b6c491e71b068deddb975c8174209b6646d89bf152bd0d0fed9b5f2a +DIST yt-dlp-2024.09.27.tar.gz 5750902 BLAKE2B 22c36dc45fd8f0b059542edf721757d50f4f4df640dfb2415ef0143e287e7ae6535e868705faa738ad1be3dd07bede85660ecc47f133c2eba2d13abc40e99c71 SHA512 9440eafd8c68bc4cc9d34edf616dbb34e0810556d21bd2276198359e653d155586cc398ebedc1088fb238dae78f62f2443463e4a63f90b323aec4ca53d3211e1 +EBUILD yt-dlp-2023.11.16.ebuild 2116 BLAKE2B 0dd106f69e716b7f651b25124efea84f48643e860d901dbb756bc11ccde99e12ffbc848ab184de7910fdb48c906373942fbef7670f15625090b94073078f6ede SHA512 a166fecba0426d1d44921f4084949ae6a9d3ef1e880a5fd098192aef01d26e11353840931de29f97ee865e537a4f1a207f2c93d59303ab457751b60d4577ae8d +EBUILD yt-dlp-2024.09.27.ebuild 2369 BLAKE2B 777602125c69c719654a47b3e05427154c8487065cf382f25ae6b83e5cece189afc431f0b6f7b244ccc12fc0690ff6fd682a5799ec3b39d18e7e7e700032bbd5 SHA512 fc1707c2f664f5d12f93a09806ceda7d7e0ce53c10678a09feac1d3267a056137c5c79a25a63b0289c5710aad2469ffd92ca5b07deab98a5dc5c9b5922c1360d MISC metadata.xml 508 BLAKE2B 21d7714827de27566946d208f7aa30b908f1b4dcc85cbe8f8e743f40a58a1be742047139adeedccffa28b6996877543cb11393a77e19f3e473e8420ed09a4d1c SHA512 5995ac642d9c24614b1bb5d9e3d35d886c1cae214fadde19c99a57a8a2953b3abf4d187cb4c527fb4e173bbe67a6b89a259cdc4729437f17b4e1ee9726cf4bc5 diff --git a/net-misc/yt-dlp/yt-dlp-2023.10.13.ebuild b/net-misc/yt-dlp/yt-dlp-2023.10.13.ebuild deleted file mode 100644 index 4507ff116..000000000 --- a/net-misc/yt-dlp/yt-dlp-2023.10.13.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -inherit distutils-r1 pypi - -DESCRIPTION="A youtube-dl fork with additional features and patches" -HOMEPAGE="https://github.com/yt-dlp/yt-dlp https://pypi.org/project/yt-dlp/" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 arm arm64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DOCS="README.md" - -RDEPEND="media-libs/mutagen[${PYTHON_USEDEP}] - dev-python/pycryptodomex[${PYTHON_USEDEP}] - dev-python/websockets[${PYTHON_USEDEP}] - dev-python/brotlipy[${PYTHON_USEDEP}] - dev-python/brotlicffi[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.26.17[${PYTHON_USEDEP}] - >=dev-python/websockets-12.0[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - py.test -v -v || die -} - -distutils_enable_tests pytest diff --git a/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild b/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild index 52a46dea6..410e1584c 100644 --- a/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild +++ b/net-misc/yt-dlp/yt-dlp-2023.11.16.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit bash-completion-r1 distutils-r1 optfeature wrapper DESCRIPTION="youtube-dl fork with additional features and fixes" diff --git a/net-misc/yt-dlp/yt-dlp-2023.09.24.ebuild b/net-misc/yt-dlp/yt-dlp-2024.09.27.ebuild similarity index 60% rename from net-misc/yt-dlp/yt-dlp-2023.09.24.ebuild rename to net-misc/yt-dlp/yt-dlp-2024.09.27.ebuild index c2e40e3e6..7a5262106 100644 --- a/net-misc/yt-dlp/yt-dlp-2023.09.24.ebuild +++ b/net-misc/yt-dlp/yt-dlp-2024.09.27.ebuild @@ -1,19 +1,24 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{11..13} ) inherit bash-completion-r1 distutils-r1 optfeature wrapper DESCRIPTION="youtube-dl fork with additional features and fixes" HOMEPAGE="https://github.com/yt-dlp/yt-dlp/" -SRC_URI="https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}" +SRC_URI=" + https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz + -> ${P}.tar.gz +" +S=${WORKDIR}/${PN} LICENSE="Unlicense" SLOT="0" +# note that yt-dlp bumps are typically done straight-to-stable (unless there +# was major/breaking changes) given website changes breaks it on a whim KEYWORDS="amd64 arm arm64 x86" RDEPEND=" @@ -26,13 +31,20 @@ 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 + # adjust pycryptodome and drop optional dependencies (bug #828466) + sed -Ei pyproject.toml \ + -e 's/("pycryptodome)x/\1/' \ + -e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die } python_test() { + local EPYTEST_DESELECT=( + # fails with FEATURES=network-sandbox + test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout + # fails with FEATURES=distcc, bug #915614 + test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] + ) + epytest -m 'not download' } @@ -57,6 +69,7 @@ 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 + optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage if [[ ! ${REPLACING_VERSIONS} ]]; then elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'