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: app-text/calibre/
Date: Sun, 09 Feb 2020 16:47:16
Message-Id: 1581266815.b2bd989f82e00373e933f663ad8a91736d43d296.mgorny@gentoo
1 commit: b2bd989f82e00373e933f663ad8a91736d43d296
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 8 07:18:49 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 16:46:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bd989f
7
8 app-text/calibre: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 ...e-3.48.0-r1.ebuild => calibre-3.48.0-r2.ebuild} | 48 +++++++++++---------
13 ...ibre-4.10.1.ebuild => calibre-4.10.1-r1.ebuild} | 52 ++++++++++++----------
14 app-text/calibre/calibre-4.9.1-r1.ebuild | 52 ++++++++++++----------
15 3 files changed, 82 insertions(+), 70 deletions(-)
16
17 diff --git a/app-text/calibre/calibre-3.48.0-r1.ebuild b/app-text/calibre/calibre-3.48.0-r2.ebuild
18 similarity index 84%
19 rename from app-text/calibre/calibre-3.48.0-r1.ebuild
20 rename to app-text/calibre/calibre-3.48.0-r2.ebuild
21 index 750bc132087..4aac7817f18 100644
22 --- a/app-text/calibre/calibre-3.48.0-r1.ebuild
23 +++ b/app-text/calibre/calibre-3.48.0-r2.ebuild
24 @@ -44,28 +44,30 @@ COMMON_DEPEND="${PYTHON_DEPS}
25 dev-libs/glib:2=
26 >=dev-libs/icu-57.1:=
27 dev-libs/libinput:=
28 - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
29 - dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
30 - >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
31 - >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
32 - >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
33 - >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
34 >=dev-libs/dbus-glib-0.106
35 >=sys-apps/dbus-1.10.8
36 - dev-python/dnspython[${PYTHON_USEDEP}]
37 - >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
38 - >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
39 - >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
40 - >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
41 - >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
42 - >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
43 - >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
44 - >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
45 - >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
46 - >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
47 - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
48 - >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
49 - dev-python/regex[${PYTHON_USEDEP}]
50 + $(python_gen_cond_dep '
51 + >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
52 + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
53 + >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
54 + >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
55 + >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
56 + >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
57 + dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
58 + >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
59 + >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
60 + >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
61 + >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
62 + >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
63 + >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
64 + >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
65 + >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
66 + >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
67 + >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
68 + >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
69 + >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
70 + dev-python/regex[${PYTHON_MULTI_USEDEP}]
71 + ')
72 dev-qt/qtcore:5=
73 dev-qt/qtdbus:5=
74 dev-qt/qtgui:5=
75 @@ -94,8 +96,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
76 RDEPEND="${COMMON_DEPEND}
77 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
78 DEPEND="${COMMON_DEPEND}
79 - >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
80 - dev-python/sip[${PYTHON_USEDEP}]
81 + $(python_gen_cond_dep '
82 + >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
83 + dev-python/sip[${PYTHON_MULTI_USEDEP}]
84 + ')
85 >=virtual/podofo-build-0.9.6_pre20171027
86 virtual/pkgconfig"
87
88
89 diff --git a/app-text/calibre/calibre-4.10.1.ebuild b/app-text/calibre/calibre-4.10.1-r1.ebuild
90 similarity index 83%
91 rename from app-text/calibre/calibre-4.10.1.ebuild
92 rename to app-text/calibre/calibre-4.10.1-r1.ebuild
93 index 96f088d7781..87653101234 100644
94 --- a/app-text/calibre/calibre-4.10.1.ebuild
95 +++ b/app-text/calibre/calibre-4.10.1-r1.ebuild
96 @@ -46,30 +46,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
97 dev-libs/hyphen:=
98 >=dev-libs/icu-57.1:=
99 dev-libs/libinput:=
100 - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
101 - dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
102 - >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
103 - >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
104 - >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
105 - >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
106 >=dev-libs/dbus-glib-0.106
107 >=sys-apps/dbus-1.10.8
108 - dev-python/dnspython[${PYTHON_USEDEP}]
109 - >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
110 - >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
111 - >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
112 - >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
113 - >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
114 - >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
115 - >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
116 - >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
117 - >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
118 - >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
119 - >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
120 - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
121 - >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
122 - >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
123 - dev-python/regex[${PYTHON_USEDEP}]
124 + $(python_gen_cond_dep '
125 + >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
126 + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
127 + >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
128 + >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
129 + >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
130 + >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
131 + dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
132 + >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
133 + >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
134 + >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
135 + >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
136 + >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
137 + >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
138 + >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
139 + >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
140 + >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
141 + >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
142 + >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
143 + >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
144 + >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
145 + >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
146 + dev-python/regex[${PYTHON_MULTI_USEDEP}]
147 + ')
148 dev-qt/qtcore:5=
149 dev-qt/qtdbus:5=
150 dev-qt/qtgui:5=
151 @@ -99,8 +101,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
152 RDEPEND="${COMMON_DEPEND}
153 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
154 DEPEND="${COMMON_DEPEND}
155 - >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
156 - dev-python/sip[${PYTHON_USEDEP}]
157 + $(python_gen_cond_dep '
158 + >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
159 + dev-python/sip[${PYTHON_MULTI_USEDEP}]
160 + ')
161 >=virtual/podofo-build-0.9.6_pre20171027
162 virtual/pkgconfig"
163
164
165 diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.9.1-r1.ebuild
166 index a1cc4a33f5d..10509962f2e 100644
167 --- a/app-text/calibre/calibre-4.9.1-r1.ebuild
168 +++ b/app-text/calibre/calibre-4.9.1-r1.ebuild
169 @@ -46,30 +46,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
170 dev-libs/hyphen:=
171 >=dev-libs/icu-57.1:=
172 dev-libs/libinput:=
173 - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
174 - dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
175 - >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
176 - >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
177 - >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
178 - >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
179 >=dev-libs/dbus-glib-0.106
180 >=sys-apps/dbus-1.10.8
181 - dev-python/dnspython[${PYTHON_USEDEP}]
182 - >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
183 - >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
184 - >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
185 - >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
186 - >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
187 - >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
188 - >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
189 - >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
190 - >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
191 - >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
192 - >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
193 - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
194 - >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
195 - >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
196 - dev-python/regex[${PYTHON_USEDEP}]
197 + $(python_gen_cond_dep '
198 + >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
199 + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
200 + >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
201 + >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
202 + >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
203 + >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
204 + dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
205 + >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
206 + >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
207 + >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
208 + >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
209 + >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
210 + >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
211 + >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
212 + >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
213 + >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
214 + >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
215 + >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
216 + >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
217 + >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
218 + >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
219 + dev-python/regex[${PYTHON_MULTI_USEDEP}]
220 + ')
221 dev-qt/qtcore:5=
222 dev-qt/qtdbus:5=
223 dev-qt/qtgui:5=
224 @@ -99,8 +101,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
225 RDEPEND="${COMMON_DEPEND}
226 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
227 DEPEND="${COMMON_DEPEND}
228 - >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
229 - dev-python/sip[${PYTHON_USEDEP}]
230 + $(python_gen_cond_dep '
231 + >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
232 + dev-python/sip[${PYTHON_MULTI_USEDEP}]
233 + ')
234 >=virtual/podofo-build-0.9.6_pre20171027
235 virtual/pkgconfig"
Report Message
Find on MARC Find on Google Groups