Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/streamlink/
Date: Sun, 09 Feb 2020 16:47:10
Message-Id: 1581266803.268e7267b6975aaefad9af9c93eda3e296cbeddf.mgorny@gentoo
1 commit: 268e7267b6975aaefad9af9c93eda3e296cbeddf
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 8 06:52:20 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 16:46:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268e7267
7
8 net-misc/streamlink: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 ...ink-1.3.0.ebuild => streamlink-1.3.0-r1.ebuild} | 42 ++++++++++++----------
13 net-misc/streamlink/streamlink-9999.ebuild | 42 ++++++++++++----------
14 2 files changed, 46 insertions(+), 38 deletions(-)
15
16 diff --git a/net-misc/streamlink/streamlink-1.3.0.ebuild b/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
17 similarity index 61%
18 rename from net-misc/streamlink/streamlink-1.3.0.ebuild
19 rename to net-misc/streamlink/streamlink-1.3.0-r1.ebuild
20 index 04417d2b4e7..28994a6a0f8 100644
21 --- a/net-misc/streamlink/streamlink-1.3.0.ebuild
22 +++ b/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
23 @@ -30,31 +30,35 @@ RESTRICT="!test? ( test )"
24
25 # >=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
26 DEPEND="
27 - virtual/python-futures[${PYTHON_USEDEP}]
28 - virtual/python-singledispatch[${PYTHON_USEDEP}]
29 - >dev-python/requests-2.21.0[${PYTHON_USEDEP}]
30 - >=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
31 - dev-python/isodate[${PYTHON_USEDEP}]
32 - dev-python/websocket-client[${PYTHON_USEDEP}]
33 - dev-python/pycountry[${PYTHON_USEDEP}]
34 - >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
35 + $(python_gen_cond_dep '
36 + virtual/python-futures[${PYTHON_MULTI_USEDEP}]
37 + virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}]
38 + >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
39 + >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
40 + dev-python/isodate[${PYTHON_MULTI_USEDEP}]
41 + dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
42 + dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
43 + >=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
44 + ')
45 "
46 RDEPEND="${DEPEND}
47 media-video/rtmpdump
48 virtual/ffmpeg
49 "
50 BDEPEND="
51 - doc? (
52 - dev-python/sphinx[${PYTHON_USEDEP}]
53 - dev-python/docutils[${PYTHON_USEDEP}]
54 - dev-python/recommonmark[${PYTHON_USEDEP}]
55 - )
56 - test? (
57 - dev-python/mock[${PYTHON_USEDEP}]
58 - dev-python/requests-mock[${PYTHON_USEDEP}]
59 - dev-python/pytest[${PYTHON_USEDEP}]
60 - dev-python/freezegun[${PYTHON_USEDEP}]
61 - )"
62 + $(python_gen_cond_dep '
63 + doc? (
64 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
65 + dev-python/docutils[${PYTHON_MULTI_USEDEP}]
66 + dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
67 + )
68 + test? (
69 + dev-python/mock[${PYTHON_MULTI_USEDEP}]
70 + dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
71 + dev-python/pytest[${PYTHON_MULTI_USEDEP}]
72 + dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
73 + )
74 + ')"
75
76 python_configure_all() {
77 # Avoid iso-639, iso3166 dependencies since we use pycountry.
78
79 diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
80 index 04417d2b4e7..28994a6a0f8 100644
81 --- a/net-misc/streamlink/streamlink-9999.ebuild
82 +++ b/net-misc/streamlink/streamlink-9999.ebuild
83 @@ -30,31 +30,35 @@ RESTRICT="!test? ( test )"
84
85 # >=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
86 DEPEND="
87 - virtual/python-futures[${PYTHON_USEDEP}]
88 - virtual/python-singledispatch[${PYTHON_USEDEP}]
89 - >dev-python/requests-2.21.0[${PYTHON_USEDEP}]
90 - >=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
91 - dev-python/isodate[${PYTHON_USEDEP}]
92 - dev-python/websocket-client[${PYTHON_USEDEP}]
93 - dev-python/pycountry[${PYTHON_USEDEP}]
94 - >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
95 + $(python_gen_cond_dep '
96 + virtual/python-futures[${PYTHON_MULTI_USEDEP}]
97 + virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}]
98 + >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
99 + >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
100 + dev-python/isodate[${PYTHON_MULTI_USEDEP}]
101 + dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
102 + dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
103 + >=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
104 + ')
105 "
106 RDEPEND="${DEPEND}
107 media-video/rtmpdump
108 virtual/ffmpeg
109 "
110 BDEPEND="
111 - doc? (
112 - dev-python/sphinx[${PYTHON_USEDEP}]
113 - dev-python/docutils[${PYTHON_USEDEP}]
114 - dev-python/recommonmark[${PYTHON_USEDEP}]
115 - )
116 - test? (
117 - dev-python/mock[${PYTHON_USEDEP}]
118 - dev-python/requests-mock[${PYTHON_USEDEP}]
119 - dev-python/pytest[${PYTHON_USEDEP}]
120 - dev-python/freezegun[${PYTHON_USEDEP}]
121 - )"
122 + $(python_gen_cond_dep '
123 + doc? (
124 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
125 + dev-python/docutils[${PYTHON_MULTI_USEDEP}]
126 + dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
127 + )
128 + test? (
129 + dev-python/mock[${PYTHON_MULTI_USEDEP}]
130 + dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
131 + dev-python/pytest[${PYTHON_MULTI_USEDEP}]
132 + dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
133 + )
134 + ')"
135
136 python_configure_all() {
137 # Avoid iso-639, iso3166 dependencies since we use pycountry.
Report Message
Find on MARC Find on Google Groups