commit: 268e7267b6975aaefad9af9c93eda3e296cbeddf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 06:52:20 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:46:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268e7267
net-misc/streamlink: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...ink-1.3.0.ebuild => streamlink-1.3.0-r1.ebuild} | 42 ++++++++++++----------
net-misc/streamlink/streamlink-9999.ebuild | 42 ++++++++++++----------
2 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/net-misc/streamlink/streamlink-1.3.0.ebuild
b/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
similarity index 61%
rename from net-misc/streamlink/streamlink-1.3.0.ebuild
rename to net-misc/streamlink/streamlink-1.3.0-r1.ebuild
index 04417d2b4e7..28994a6a0f8 100644
--- a/net-misc/streamlink/streamlink-1.3.0.ebuild
+++ b/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
@@ -30,31 +30,35 @@ RESTRICT="!test? ( test )"
# >=urllib3-1.23 only needed for python2, but requests pulls some version
anyways, so we might as well guarantee at least that ver for py3 too
DEPEND="
- virtual/python-futures[${PYTHON_USEDEP}]
- virtual/python-singledispatch[${PYTHON_USEDEP}]
- >dev-python/requests-2.21.0[${PYTHON_USEDEP}]
- >=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
- dev-python/isodate[${PYTHON_USEDEP}]
- dev-python/websocket-client[${PYTHON_USEDEP}]
- dev-python/pycountry[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+ virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}]
+ >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
+ dev-python/isodate[${PYTHON_MULTI_USEDEP}]
+ dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+ ')
"
RDEPEND="${DEPEND}
media-video/rtmpdump
virtual/ffmpeg
"
BDEPEND="
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/recommonmark[${PYTHON_USEDEP}]
- )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/requests-mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/freezegun[${PYTHON_USEDEP}]
- )"
+ $(python_gen_cond_dep '
+ doc? (
+ dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+ dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
+ )
+ test? (
+ dev-python/mock[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
+ dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+ dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+ )
+ ')"
python_configure_all() {
# Avoid iso-639, iso3166 dependencies since we use pycountry.
diff --git a/net-misc/streamlink/streamlink-9999.ebuild
b/net-misc/streamlink/streamlink-9999.ebuild
index 04417d2b4e7..28994a6a0f8 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -30,31 +30,35 @@ RESTRICT="!test? ( test )"
# >=urllib3-1.23 only needed for python2, but requests pulls some version
anyways, so we might as well guarantee at least that ver for py3 too
DEPEND="
- virtual/python-futures[${PYTHON_USEDEP}]
- virtual/python-singledispatch[${PYTHON_USEDEP}]
- >dev-python/requests-2.21.0[${PYTHON_USEDEP}]
- >=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
- dev-python/isodate[${PYTHON_USEDEP}]
- dev-python/websocket-client[${PYTHON_USEDEP}]
- dev-python/pycountry[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+ virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}]
+ >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
+ dev-python/isodate[${PYTHON_MULTI_USEDEP}]
+ dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+ ')
"
RDEPEND="${DEPEND}
media-video/rtmpdump
virtual/ffmpeg
"
BDEPEND="
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/recommonmark[${PYTHON_USEDEP}]
- )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/requests-mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/freezegun[${PYTHON_USEDEP}]
- )"
+ $(python_gen_cond_dep '
+ doc? (
+ dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+ dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
+ )
+ test? (
+ dev-python/mock[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
+ dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+ dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+ )
+ ')"
python_configure_all() {
# Avoid iso-639, iso3166 dependencies since we use pycountry.
