Skip to content

Commit 81b81df

Browse files
committed
media-sound/yewtube: fix import from pip._vendor
Closes: https://bugs.gentoo.org/939186 Signed-off-by: Takuya Wakazono <[email protected]>
1 parent e5bb43b commit 81b81df

File tree

3 files changed

+26
-10
lines changed

3 files changed

+26
-10
lines changed

media-sound/yewtube/metadata.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<name>Gonçalo Negrier Duarte</name>
77
</maintainer>
88
<upstream>
9-
<remote-id type="pypi">mps-youtube</remote-id>
10-
<remote-id type="github">mps-youtube/mps-youtube</remote-id>
9+
<remote-id type="pypi">yewtube</remote-id>
10+
<remote-id type="github">mps-youtube/yewtube</remote-id>
1111
</upstream>
1212
</pkgmetadata>

media-sound/yewtube/yewtube-2.10.5.ebuild media-sound/yewtube/yewtube-2.10.5-r1.ebuild

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2023 Gentoo Authors
1+
# Copyright 1999-2024 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=8
@@ -17,7 +17,7 @@ else
1717
KEYWORDS="~amd64"
1818
fi
1919

20-
LICENSE="GPL-3"
20+
LICENSE="GPL-3+"
2121
SLOT="0"
2222

2323
IUSE="test"
@@ -27,11 +27,12 @@ RDEPEND="
2727
media-video/ffmpeg
2828
dev-python/requests[${PYTHON_USEDEP}]
2929
dev-python/pyperclip[${PYTHON_USEDEP}]
30-
net-misc/yt-dlp
31-
dev-python/youtube-search-python
30+
net-misc/yt-dlp[${PYTHON_USEDEP}]
31+
dev-python/youtube-search-python[${PYTHON_USEDEP}]
3232
dev-python/pylast[${PYTHON_USEDEP}]
3333
dev-python/pip[${PYTHON_USEDEP}]
3434
dev-python/pipenv[${PYTHON_USEDEP}]
35+
dev-python/setuptools[${PYTHON_USEDEP}]
3536
|| ( media-video/mplayer media-video/mpv )
3637
"
3738

@@ -44,6 +45,13 @@ DEPEND="
4445

4546
distutils_enable_tests pytest
4647

48+
src_prepare() {
49+
# bug #939186
50+
sed -i 's/from pip\._vendor //' mps_youtube/__init__.py || die
51+
52+
distutils-r1_src_prepare
53+
}
54+
4755
src_compile() {
4856
distutils-r1_src_compile --build-dir "${WORKDIR}/${P}"
4957
}

media-sound/yewtube/yewtube-9999.ebuild

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2023 Gentoo Authors
1+
# Copyright 1999-2024 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=8
@@ -17,7 +17,7 @@ else
1717
KEYWORDS="~amd64"
1818
fi
1919

20-
LICENSE="GPL-3"
20+
LICENSE="GPL-3+"
2121
SLOT="0"
2222

2323
IUSE="test"
@@ -27,11 +27,12 @@ RDEPEND="
2727
media-video/ffmpeg
2828
dev-python/requests[${PYTHON_USEDEP}]
2929
dev-python/pyperclip[${PYTHON_USEDEP}]
30-
net-misc/yt-dlp
31-
dev-python/youtube-search-python
30+
net-misc/yt-dlp[${PYTHON_USEDEP}]
31+
dev-python/youtube-search-python[${PYTHON_USEDEP}]
3232
dev-python/pylast[${PYTHON_USEDEP}]
3333
dev-python/pip[${PYTHON_USEDEP}]
3434
dev-python/pipenv[${PYTHON_USEDEP}]
35+
dev-python/setuptools[${PYTHON_USEDEP}]
3536
|| ( media-video/mplayer media-video/mpv )
3637
"
3738

@@ -44,6 +45,13 @@ DEPEND="
4445

4546
distutils_enable_tests pytest
4647

48+
src_prepare() {
49+
# bug #939186
50+
sed -i 's/from pip\._vendor //' mps_youtube/__init__.py || die
51+
52+
distutils-r1_src_prepare
53+
}
54+
4755
src_compile() {
4856
distutils-r1_src_compile --build-dir "${WORKDIR}/${P}"
4957
}

0 commit comments

Comments
 (0)