1 |
commit: 7c80d211d038384f741f0b5de6372a09f6dac225 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 27 18:52:12 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 27 18:52:12 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c80d211 |
7 |
|
8 |
dev-python/Kivy: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
dev-python/Kivy/Kivy-1.10.0.ebuild | 76 ---------------------- |
14 |
dev-python/Kivy/Kivy-1.9.1-r1.ebuild | 72 --------------------- |
15 |
dev-python/Kivy/Kivy-1.9.1.ebuild | 69 -------------------- |
16 |
dev-python/Kivy/Manifest | 2 - |
17 |
dev-python/Kivy/files/modplug-fix.patch | 109 -------------------------------- |
18 |
5 files changed, 328 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/Kivy/Kivy-1.10.0.ebuild b/dev-python/Kivy/Kivy-1.10.0.ebuild |
21 |
deleted file mode 100644 |
22 |
index ccdd94cab72..00000000000 |
23 |
--- a/dev-python/Kivy/Kivy-1.10.0.ebuild |
24 |
+++ /dev/null |
25 |
@@ -1,76 +0,0 @@ |
26 |
-# Copyright 1999-2019 Gentoo Authors |
27 |
-# Distributed under the terms of the GNU General Public License v2 |
28 |
- |
29 |
-EAPI=6 |
30 |
- |
31 |
-PYTHON_COMPAT=( python{2_7,3_5} ) |
32 |
- |
33 |
-inherit distutils-r1 |
34 |
- |
35 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
36 |
- |
37 |
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications" |
38 |
-HOMEPAGE="https://kivy.org/" |
39 |
-SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
40 |
- |
41 |
-LICENSE="MIT" |
42 |
-SLOT="0" |
43 |
-KEYWORDS="~amd64 ~x86" |
44 |
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test" |
45 |
-RESTRICT="!test? ( test )" |
46 |
- |
47 |
-RDEPEND=" |
48 |
- dev-python/pillow[${PYTHON_USEDEP}] |
49 |
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] ) |
50 |
- camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] ) |
51 |
- garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] ) |
52 |
- gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) |
53 |
- sdl? ( media-libs/libsdl2 |
54 |
- media-libs/sdl2-ttf |
55 |
- media-libs/sdl2-image |
56 |
- media-libs/sdl2-mixer ) |
57 |
- !sdl? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
58 |
- spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )" |
59 |
-DEPEND="${RDEPEND} |
60 |
- dev-python/cython[${PYTHON_USEDEP}] |
61 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
62 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
63 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
64 |
- |
65 |
-S="${WORKDIR}/${P,,}" |
66 |
- |
67 |
-PATCHES=( |
68 |
- "${FILESDIR}/modplug-fix.patch" |
69 |
-) |
70 |
- |
71 |
-python_prepare_all() { |
72 |
-# sed -e '/data_files=/d' -i "${S}/setup.py" || die |
73 |
-# sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die |
74 |
- |
75 |
- export USE_SDL2=$(usex sdl 1 0) |
76 |
- export USE_GSTREAMER=$(usex gstreamer 1 0) |
77 |
- export KIVY_USE_SETUPTOOLS=1 |
78 |
- distutils-r1_python_prepare_all |
79 |
-} |
80 |
- |
81 |
-python_compile() { |
82 |
- esetup.py build_ext --inplace |
83 |
- esetup.py build |
84 |
-} |
85 |
- |
86 |
-python_compile_all() { |
87 |
- use doc && emake html |
88 |
-} |
89 |
- |
90 |
-python_test() { |
91 |
- emake test PYTHON="${PYTHON}" |
92 |
-} |
93 |
- |
94 |
-python_install_all() { |
95 |
- use doc && HTML_DOCS=( doc/build/html/. ) |
96 |
- if use examples; then |
97 |
- insinto "/usr/share/doc/${PF}/examples/${f}/" |
98 |
- doins "${S}/examples"/* "${S}/examples"/*/* |
99 |
- fi |
100 |
- distutils-r1_python_install_all |
101 |
-} |
102 |
|
103 |
diff --git a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild b/dev-python/Kivy/Kivy-1.9.1-r1.ebuild |
104 |
deleted file mode 100644 |
105 |
index de15acb2050..00000000000 |
106 |
--- a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild |
107 |
+++ /dev/null |
108 |
@@ -1,72 +0,0 @@ |
109 |
-# Copyright 1999-2019 Gentoo Authors |
110 |
-# Distributed under the terms of the GNU General Public License v2 |
111 |
- |
112 |
-EAPI=6 |
113 |
- |
114 |
-PYTHON_COMPAT=( python{2_7,3_5} ) |
115 |
- |
116 |
-inherit distutils-r1 |
117 |
- |
118 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
119 |
- |
120 |
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications" |
121 |
-HOMEPAGE="https://kivy.org/" |
122 |
-SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz" |
123 |
- |
124 |
-LICENSE="MIT" |
125 |
-SLOT="0" |
126 |
-KEYWORDS="~amd64 ~x86" |
127 |
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test" |
128 |
-RESTRICT="!test? ( test )" |
129 |
- |
130 |
-RDEPEND=" |
131 |
- dev-python/pillow[${PYTHON_USEDEP}] |
132 |
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] ) |
133 |
- camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] ) |
134 |
- garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] ) |
135 |
- gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) |
136 |
- sdl? ( media-libs/libsdl2 |
137 |
- media-libs/sdl2-ttf |
138 |
- media-libs/sdl2-image |
139 |
- media-libs/sdl2-mixer ) |
140 |
- !sdl? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
141 |
- spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )" |
142 |
-DEPEND="${RDEPEND} |
143 |
- dev-python/cython[${PYTHON_USEDEP}] |
144 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
145 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
146 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
147 |
- |
148 |
-S="${WORKDIR}/${P,,}" |
149 |
- |
150 |
-python_prepare_all() { |
151 |
- sed -e '/data_files=/d' -i "${S}/setup.py" || die |
152 |
- sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die |
153 |
- |
154 |
- export USE_SDL2=$(usex sdl 1 0) |
155 |
- export USE_GSTREAMER=$(usex gstreamer 1 0) |
156 |
- export KIVY_USE_SETUPTOOLS=1 |
157 |
- distutils-r1_python_prepare_all |
158 |
-} |
159 |
- |
160 |
-python_compile() { |
161 |
- esetup.py build_ext --inplace |
162 |
- esetup.py build |
163 |
-} |
164 |
- |
165 |
-python_compile_all() { |
166 |
- use doc && emake html |
167 |
-} |
168 |
- |
169 |
-python_test() { |
170 |
- emake test PYTHON="${PYTHON}" |
171 |
-} |
172 |
- |
173 |
-python_install_all() { |
174 |
- use doc && HTML_DOCS=( doc/build/html/. ) |
175 |
- if use examples; then |
176 |
- insinto "/usr/share/doc/${PF}/examples/${f}/" |
177 |
- doins "${S}/examples"/* "${S}/examples"/*/* |
178 |
- fi |
179 |
- distutils-r1_python_install_all |
180 |
-} |
181 |
|
182 |
diff --git a/dev-python/Kivy/Kivy-1.9.1.ebuild b/dev-python/Kivy/Kivy-1.9.1.ebuild |
183 |
deleted file mode 100644 |
184 |
index 76675221370..00000000000 |
185 |
--- a/dev-python/Kivy/Kivy-1.9.1.ebuild |
186 |
+++ /dev/null |
187 |
@@ -1,69 +0,0 @@ |
188 |
-# Copyright 1999-2019 Gentoo Authors |
189 |
-# Distributed under the terms of the GNU General Public License v2 |
190 |
- |
191 |
-EAPI=6 |
192 |
- |
193 |
-PYTHON_COMPAT=( python{2_7,3_5} ) |
194 |
- |
195 |
-inherit distutils-r1 |
196 |
- |
197 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
198 |
- |
199 |
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications" |
200 |
-HOMEPAGE="https://kivy.org/" |
201 |
-SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz" |
202 |
- |
203 |
-LICENSE="MIT" |
204 |
-SLOT="0" |
205 |
-KEYWORDS="amd64 x86" |
206 |
-IUSE="cairo camera doc examples garden gstreamer +sdl spell test" |
207 |
-RESTRICT="!test? ( test )" |
208 |
- |
209 |
-RDEPEND=" |
210 |
- dev-python/pillow[${PYTHON_USEDEP}] |
211 |
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] ) |
212 |
- camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] ) |
213 |
- garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] ) |
214 |
- gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) |
215 |
- sdl? ( media-libs/libsdl2 |
216 |
- media-libs/sdl2-ttf |
217 |
- media-libs/sdl2-image |
218 |
- media-libs/sdl2-mixer ) |
219 |
- !sdl? ( dev-python/pygame[${PYTHON_USEDEP}] ) |
220 |
- spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )" |
221 |
-DEPEND="${RDEPEND} |
222 |
- dev-python/cython[${PYTHON_USEDEP}] |
223 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
224 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
225 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
226 |
- |
227 |
-S="${WORKDIR}/${P,,}" |
228 |
- |
229 |
-python_prepare_all() { |
230 |
- sed -e '/data_files=/d' -i "${S}/setup.py" || die |
231 |
- sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die |
232 |
- |
233 |
- export USE_SDL2=$(usex sdl 1 0) |
234 |
- export USE_GSTREAMER=$(usex gstreamer 1 0) |
235 |
- export KIVY_USE_SETUPTOOLS=1 |
236 |
- distutils-r1_python_prepare_all |
237 |
-} |
238 |
- |
239 |
-python_compile() { |
240 |
- esetup.py build_ext --inplace |
241 |
- esetup.py build |
242 |
-} |
243 |
- |
244 |
-python_compile_all() { |
245 |
- use doc && emake html |
246 |
-} |
247 |
- |
248 |
-python_test() { |
249 |
- emake test PYTHON="${PYTHON}" |
250 |
-} |
251 |
- |
252 |
-python_install_all() { |
253 |
- use doc && HTML_DOCS=( doc/build/html/. ) |
254 |
- use examples && EXAMPLES=( examples ) |
255 |
- distutils-r1_python_install_all |
256 |
-} |
257 |
|
258 |
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest |
259 |
index 2956c4e2c16..5fc86976a87 100644 |
260 |
--- a/dev-python/Kivy/Manifest |
261 |
+++ b/dev-python/Kivy/Manifest |
262 |
@@ -1,3 +1 @@ |
263 |
-DIST Kivy-1.10.0.tar.gz 24266702 BLAKE2B 3f1dab7c69e322d5856d1772d0902eaf5d4598957df1573e0c617ca872afa446797266f1ecd4a99da81bc7dcc40a051294d96c11e51a7fe2c505224bf0edaa42 SHA512 8049c92407e464558ecff913ff076c1b8f125b85a35b9eba64af49b35df545402ec2bac907ee545265a368b8cdbb33e02d74429dce13c53dd6feac735ace9cb4 |
264 |
DIST Kivy-1.10.1.tar.gz 24318169 BLAKE2B 3032034717ad580af437eb280ad8474f057e1ab9f797edf3358db1073eda6e65ee8765862e39e77818debdf0a2a972ce3701b305ddfba307d9a8bfe2ce8edbc5 SHA512 2208e1a148dd1a7c507336419e7388de87d2ab340db055e09fce99837d50639e2e38f275e383503e5bdfc4b9d3def8176d758a80bf3455467604a4219c19d642 |
265 |
-DIST kivy-1.9.1.tar.gz 16363833 BLAKE2B 1f81ab0688e9ddc617da5e7d56523568e396f010587c971285996ca5544367a4f63bb6493f279ea66f6606b2808394614c25a96e97018ef0ae1e70d74eb9cd7e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989 |
266 |
|
267 |
diff --git a/dev-python/Kivy/files/modplug-fix.patch b/dev-python/Kivy/files/modplug-fix.patch |
268 |
deleted file mode 100644 |
269 |
index 18abe6e8f80..00000000000 |
270 |
--- a/dev-python/Kivy/files/modplug-fix.patch |
271 |
+++ /dev/null |
272 |
@@ -1,109 +0,0 @@ |
273 |
-From 3b85f3e1c292b3f6c3f226490f52a2ab78251730 Mon Sep 17 00:00:00 2001 |
274 |
-From: Terje Skjaeveland <terje.skjaeveland@×××××.com> |
275 |
-Date: Sun, 29 Oct 2017 12:35:46 +0100 |
276 |
-Subject: [PATCH] audio_sdl2: Update for mixer v2.0.2 support |
277 |
- |
278 |
-Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was |
279 |
-renamed to MIX_INIT_MID. |
280 |
---- |
281 |
- kivy/core/audio/audio_sdl2.pyx | 45 +++++++++++++++++++++++++++++------------- |
282 |
- kivy/lib/sdl2.pxi | 4 ++-- |
283 |
- 2 files changed, 33 insertions(+), 16 deletions(-) |
284 |
- |
285 |
-diff --git a/kivy/core/audio/audio_sdl2.pyx b/kivy/core/audio/audio_sdl2.pyx |
286 |
-index 2ab569fe60..c6f26be5c8 100644 |
287 |
---- a/kivy/core/audio/audio_sdl2.pyx |
288 |
-+++ b/kivy/core/audio/audio_sdl2.pyx |
289 |
-@@ -15,9 +15,23 @@ Depending the compilation of SDL2 mixer and/or installed libraries: |
290 |
- * ogg since 1.9.1 (mixer needs libvorbis/libogg) |
291 |
- * flac since 1.9.1 (mixer needs libflac) |
292 |
- * mp3 since 1.9.1 (mixer needs libsmpeg/libmad; only use mad for GPL apps) |
293 |
-+ * Since 1.10.1 + mixer 2.0.2, mpg123 can also be used |
294 |
- * sequenced formats since 1.9.1 (midi, mod, s3m, etc. Mixer needs |
295 |
- libmodplug or libmikmod) |
296 |
- |
297 |
-+.. Note:: |
298 |
-+ |
299 |
-+ Sequenced format support changed with mixer v2.0.2. If mixer is |
300 |
-+ linked with one of libmodplug or libmikmod, format support for |
301 |
-+ both libraries is assumed. This will work perfectly with formats |
302 |
-+ upported by both libraries, but if you were to try to load an |
303 |
-+ obscure format (like `apun` file with mikmod only), it will fail. |
304 |
-+ |
305 |
-+ * Kivy <= 1.10.0: will fail to build with mixer >= 2.0.2 |
306 |
-+ will report correct format support with < 2.0.2 |
307 |
-+ * Kivy >= 1.10.1: will build with old and new mixer, and |
308 |
-+ will "guesstimate" sequenced format support |
309 |
-+ |
310 |
- .. Warning:: |
311 |
- |
312 |
- Sequenced formats use the SDL2 Mixer music channel, you can only play |
313 |
-@@ -57,8 +71,13 @@ cdef mix_init(): |
314 |
- mix_is_init = -1 |
315 |
- return 0 |
316 |
- |
317 |
-+ # In mixer 2.0.2, MIX_INIT_MODPLUG is now implied by MIX_INIT_MOD, |
318 |
-+ # and MIX_INIT_FLUIDSYNTH was renamed to MIX_INIT_MID. In previous |
319 |
-+ # versions, we requested both _MODPLUG and _MOD + _FLUIDSYNTH. |
320 |
-+ # 0x20 used to be MIX_INIT_FLUIDSYNTH, now MIX_INIT_MID |
321 |
-+ # 0x4 used to be MIX_INIT_MODPLUG before 2.0.2 |
322 |
- want_flags = MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3 |
323 |
-- want_flags |= MIX_INIT_MOD | MIX_INIT_MODPLUG | MIX_INIT_FLUIDSYNTH |
324 |
-+ want_flags |= MIX_INIT_MOD | 0x20 | 0x4 |
325 |
- |
326 |
- mix_flags = Mix_Init(want_flags) |
327 |
- |
328 |
-@@ -244,25 +263,23 @@ class MusicSDL2(Sound): |
329 |
- @staticmethod |
330 |
- def extensions(): |
331 |
- mix_init() |
332 |
-+ # FIXME: this should probably evolve to use the new has_music() |
333 |
-+ # interface to determine format support |
334 |
- |
335 |
- # Assume native midi support (defaults to enabled), but may use |
336 |
- # modplug, fluidsynth or timidity in reality. It may also be |
337 |
- # disabled completely, in which case loading it will fail |
338 |
- extensions = set(['mid', 'midi']) |
339 |
- |
340 |
-- # libmodplug, may be incomplete |
341 |
-- if mix_flags & MIX_INIT_MODPLUG: |
342 |
-- extensions.update(['669', 'abc', 'amf', 'ams', 'dbm', 'dmf', |
343 |
-- 'dsm', 'far', 'it', 'j2b', 'mdl', 'med', |
344 |
-- 'mod', 'mt2', 'mtm', 'okt', 'pat', 'psm', |
345 |
-- 'ptm', 's3m', 'stm', 'ult', 'umx', 'xm']) |
346 |
-- |
347 |
-- # libmikmod, may be incomplete |
348 |
-- if mix_flags & MIX_INIT_MOD: |
349 |
-- extensions.update(['669', 'amf', 'apun', 'dsm', 'far', 'gdm', |
350 |
-- 'gt2', 'it', 'med', 'mod', 'mtm', 'okt', |
351 |
-- 's3m', 'stm', 'stx', 'ult', 'umx', 'uni', |
352 |
-- 'xm']) |
353 |
-+ # libmodplug and libmikmod, may be incomplete. |
354 |
-+ # 0x4 is for mixer < 2.0.2, MIX_INIT_MODPLUG |
355 |
-+ if mix_flags & (MIX_INIT_MOD | 0x4): |
356 |
-+ extensions.update(['669', 'abc', 'amf', 'ams', 'apun', 'dbm', |
357 |
-+ 'dmf', 'dsm', 'far', 'gdm', 'it', 'j2b', |
358 |
-+ 'mdl', 'med', 'mod', 'mt2', 'mtm', 'okt', |
359 |
-+ 'pat', 'psm', 'ptm', 's3m', 'stm', 'stx', |
360 |
-+ 'ult', 'umx', 'uni', 'xm']) |
361 |
-+ |
362 |
- return list(extensions) |
363 |
- |
364 |
- def __init__(self, **kwargs): |
365 |
-diff --git a/kivy/lib/sdl2.pxi b/kivy/lib/sdl2.pxi |
366 |
-index 07d055c903..ad62ce8023 100644 |
367 |
---- a/kivy/lib/sdl2.pxi |
368 |
-+++ b/kivy/lib/sdl2.pxi |
369 |
-@@ -881,10 +881,10 @@ cdef extern from "SDL_mixer.h": |
370 |
- ctypedef enum MIX_InitFlags: |
371 |
- MIX_INIT_FLAC = 0x00000001 |
372 |
- MIX_INIT_MOD = 0x00000002 |
373 |
-- MIX_INIT_MODPLUG = 0x00000004 |
374 |
-+ MIX_INIT_MODPLUG = 0x00000004 # Removed in mixer 2.0.2 |
375 |
- MIX_INIT_MP3 = 0x00000008 |
376 |
- MIX_INIT_OGG = 0x00000010 |
377 |
-- MIX_INIT_FLUIDSYNTH = 0x00000020 |
378 |
-+ MIX_INIT_MID = 0x00000020 # Previously _FLUIDSYNTH |
379 |
- |
380 |
- cdef int MIX_MAX_VOLUME |
381 |
- |