[gentoo-commits] repo/proj/guru:master commit in: media-sound/yewtube/

["Haelwenn Monnier" <contact@hacktivis.me>]

commit:     81b81df724f078e0a2190d0678ba5ef273e7ba15
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Sep 14 14:42:09 2024 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sat Sep 14 14:42:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=81b81df7

media-sound/yewtube: fix import from pip._vendor

Closes: https://bugs.gentoo.org/939186
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 media-sound/yewtube/metadata.xml                         |  4 ++--
 .../{yewtube-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(-)

diff --git a/media-sound/yewtube/metadata.xml b/media-sound/yewtube/metadata.xml
index f9daec08b..547464678 100644
--- a/media-sound/yewtube/metadata.xml
+++ b/media-sound/yewtube/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gonçalo Negrier Duarte</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">mps-youtube</remote-id>
-		<remote-id type="github">mps-youtube/mps-youtube</remote-id>
+		<remote-id type="pypi">yewtube</remote-id>
+		<remote-id type="github">mps-youtube/yewtube</remote-id>
 	</upstream>
 </pkgmetadata>

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 99c3274b9..c67b7f1cd 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 99c3274b9..c67b7f1cd 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}"
 }