From e5bb43bc8909ec1602c4c17893bad704cf7ea1ae Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Sat, 14 Sep 2024 10:42:30 +0900 Subject: [PATCH 1/3] dev-build/xmake: add 2.9.5, drop 2.9.3 Signed-off-by: Daichi Yamamoto --- dev-build/xmake/Manifest | 2 +- dev-build/xmake/{xmake-2.9.3.ebuild => xmake-2.9.5.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dev-build/xmake/{xmake-2.9.3.ebuild => xmake-2.9.5.ebuild} (100%) diff --git a/dev-build/xmake/Manifest b/dev-build/xmake/Manifest index ba9c5f7950..c943cc71b6 100644 --- a/dev-build/xmake/Manifest +++ b/dev-build/xmake/Manifest @@ -1 +1 @@ -DIST xmake-v2.9.3.tar.gz 2863683 BLAKE2B 85b5d8f086b3dd887b64ab3e5fba419fd6a0e62d108debd8f1a1c410960e61c38cb39e52ff7bae85d0ab10cb8827e0c11f9f4942436ecdcf8ce3b92b71110510 SHA512 7e1dbeed8947dd7306e4f87254224e4f67c21060bffcc6ce0ec16605acdeb2640f7891003fb675b190c8015388768c5863cad0d381ecb5fd844882315b7abe60 +DIST xmake-v2.9.5.tar.gz 2941522 BLAKE2B bcef6355424af891f053b84ec6682057d791215ac2de0ed7e51b9c26bf0092757b0f19860b2796d6552d0d73e777afefaa2f30e76b7cb687a844cdd14a143b60 SHA512 64553d830924a374be9aeb526e79ef7c91b0de70c5cd336a2eb2c5fcdf413b4cdabd33cf333fedeee0873517a7b3a6867346e48b37fe41590c8fee3805b04800 diff --git a/dev-build/xmake/xmake-2.9.3.ebuild b/dev-build/xmake/xmake-2.9.5.ebuild similarity index 100% rename from dev-build/xmake/xmake-2.9.3.ebuild rename to dev-build/xmake/xmake-2.9.5.ebuild From 81b81df724f078e0a2190d0678ba5ef273e7ba15 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sat, 14 Sep 2024 23:42:09 +0900 Subject: [PATCH 2/3] media-sound/yewtube: fix import from pip._vendor Closes: https://bugs.gentoo.org/939186 Signed-off-by: Takuya Wakazono --- media-sound/yewtube/metadata.xml | 4 ++-- ...be-2.10.5.ebuild => yewtube-2.10.5-r1.ebuild} | 16 ++++++++++++---- media-sound/yewtube/yewtube-9999.ebuild | 16 ++++++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) rename media-sound/yewtube/{yewtube-2.10.5.ebuild => yewtube-2.10.5-r1.ebuild} (78%) diff --git a/media-sound/yewtube/metadata.xml b/media-sound/yewtube/metadata.xml index f9daec08b6..5474646784 100644 --- a/media-sound/yewtube/metadata.xml +++ b/media-sound/yewtube/metadata.xml @@ -6,7 +6,7 @@ Gonçalo Negrier Duarte - mps-youtube - mps-youtube/mps-youtube + yewtube + mps-youtube/yewtube diff --git a/media-sound/yewtube/yewtube-2.10.5.ebuild b/media-sound/yewtube/yewtube-2.10.5-r1.ebuild similarity index 78% rename from media-sound/yewtube/yewtube-2.10.5.ebuild rename to media-sound/yewtube/yewtube-2.10.5-r1.ebuild index 99c3274b9a..c67b7f1cd9 100644 --- a/media-sound/yewtube/yewtube-2.10.5.ebuild +++ b/media-sound/yewtube/yewtube-2.10.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ else KEYWORDS="~amd64" fi -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" IUSE="test" @@ -27,11 +27,12 @@ RDEPEND=" media-video/ffmpeg dev-python/requests[${PYTHON_USEDEP}] dev-python/pyperclip[${PYTHON_USEDEP}] - net-misc/yt-dlp - dev-python/youtube-search-python + net-misc/yt-dlp[${PYTHON_USEDEP}] + dev-python/youtube-search-python[${PYTHON_USEDEP}] dev-python/pylast[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/pipenv[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] || ( media-video/mplayer media-video/mpv ) " @@ -44,6 +45,13 @@ DEPEND=" distutils_enable_tests pytest +src_prepare() { + # bug #939186 + sed -i 's/from pip\._vendor //' mps_youtube/__init__.py || die + + distutils-r1_src_prepare +} + src_compile() { distutils-r1_src_compile --build-dir "${WORKDIR}/${P}" } diff --git a/media-sound/yewtube/yewtube-9999.ebuild b/media-sound/yewtube/yewtube-9999.ebuild index 99c3274b9a..c67b7f1cd9 100644 --- a/media-sound/yewtube/yewtube-9999.ebuild +++ b/media-sound/yewtube/yewtube-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ else KEYWORDS="~amd64" fi -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" IUSE="test" @@ -27,11 +27,12 @@ RDEPEND=" media-video/ffmpeg dev-python/requests[${PYTHON_USEDEP}] dev-python/pyperclip[${PYTHON_USEDEP}] - net-misc/yt-dlp - dev-python/youtube-search-python + net-misc/yt-dlp[${PYTHON_USEDEP}] + dev-python/youtube-search-python[${PYTHON_USEDEP}] dev-python/pylast[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/pipenv[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] || ( media-video/mplayer media-video/mpv ) " @@ -44,6 +45,13 @@ DEPEND=" distutils_enable_tests pytest +src_prepare() { + # bug #939186 + sed -i 's/from pip\._vendor //' mps_youtube/__init__.py || die + + distutils-r1_src_prepare +} + src_compile() { distutils-r1_src_compile --build-dir "${WORKDIR}/${P}" } From 5314936d64318cd3f1af560306dbb77309aefd57 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sat, 14 Sep 2024 23:17:03 +0200 Subject: [PATCH 3/3] gui-apps/hyprshade: RDEPEND on dev-python/click Otherwise it fails to start. Signed-off-by: Johannes Huber Closes: https://github.com/gentoo/guru/pull/242 Signed-off-by: David Roman --- gui-apps/hyprshade/hyprshade-3.2.1.ebuild | 1 + gui-apps/hyprshade/hyprshade-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/gui-apps/hyprshade/hyprshade-3.2.1.ebuild b/gui-apps/hyprshade/hyprshade-3.2.1.ebuild index e71b05a5c2..7a6be8be07 100644 --- a/gui-apps/hyprshade/hyprshade-3.2.1.ebuild +++ b/gui-apps/hyprshade/hyprshade-3.2.1.ebuild @@ -26,6 +26,7 @@ SLOT="0" RDEPEND=" ${PYTHON_DEPS} dev-python/chevron + dev-python/click gui-wm/hyprland " diff --git a/gui-apps/hyprshade/hyprshade-9999.ebuild b/gui-apps/hyprshade/hyprshade-9999.ebuild index e71b05a5c2..7a6be8be07 100644 --- a/gui-apps/hyprshade/hyprshade-9999.ebuild +++ b/gui-apps/hyprshade/hyprshade-9999.ebuild @@ -26,6 +26,7 @@ SLOT="0" RDEPEND=" ${PYTHON_DEPS} dev-python/chevron + dev-python/click gui-wm/hyprland "