Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pygobject/, dev-python/pygobject/files/
Date: Sat, 29 Dec 2018 20:43:11
Message-Id: 1546115987.e5e599b190b06e3598f238324bf165f8f930de44.leio@gentoo
1 commit: e5e599b190b06e3598f238324bf165f8f930de44
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 20:37:43 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 20:39:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e599b1
7
8 dev-python/pygobject: remove old
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 dev-python/pygobject/Manifest | 2 -
14 .../pygobject/files/pygobject-3.24.1-py37.patch | 255 ---------------------
15 dev-python/pygobject/pygobject-3.22.0.ebuild | 105 ---------
16 dev-python/pygobject/pygobject-3.24.1-r1.ebuild | 112 ---------
17 dev-python/pygobject/pygobject-3.24.1.ebuild | 108 ---------
18 5 files changed, 582 deletions(-)
19
20 diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
21 index a02014a3b8b..842c7784d53 100644
22 --- a/dev-python/pygobject/Manifest
23 +++ b/dev-python/pygobject/Manifest
24 @@ -1,4 +1,2 @@
25 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
26 -DIST pygobject-3.22.0.tar.xz 756820 BLAKE2B 2030b9106c082bbec4418c97945df68e20f49005341ad1d7c6d390b894ac88e13f2619215df4c02587b5ccce606083906609d89c559b790777092e991afbf367 SHA512 1f6f0ea8014b35d7828a6bebc0fe2cf6519016ca5ad3819dc6b7879154d8e27fdd2971620955c8fc4904625814833c8bc8ec0599152720649864262d3b6e33e4
27 -DIST pygobject-3.24.1.tar.xz 758648 BLAKE2B 95e3bc6d022b70053549f8a780aa372d8964477e881b825299ca82a7328bbdab58b037a92d36578915ac622b7c223d47cc1c35fccd3ea70d7840841eaec6860d SHA512 f35968ab12b872c85af6b2410cadedcf9fa7e17352a40f3dc557c86203aa1c38753710aab9ce55e986ee2c98b64e14123c65083655445e993d0b53431db6dc93
28 DIST pygobject-3.28.3.tar.xz 1005368 BLAKE2B 5c24fd25fa20dbdbd3ad18d7e2eafd8f47f5e28903d9f8dab6110f09ccfc13f865149f0d4bd84bc755bc6e4191b903646930e818d85382dfaf4e05f7107b3ecf SHA512 0abda393dd774f9cea04f883eab53f5ebde81d2439ed18cfe08ef39a1996054ab34bf4e770f70116a4485fb4f9970464b9a950ffa4af76cfa21ecc8d4dff968d
29
30 diff --git a/dev-python/pygobject/files/pygobject-3.24.1-py37.patch b/dev-python/pygobject/files/pygobject-3.24.1-py37.patch
31 deleted file mode 100644
32 index 31250e3561c..00000000000
33 --- a/dev-python/pygobject/files/pygobject-3.24.1-py37.patch
34 +++ /dev/null
35 @@ -1,255 +0,0 @@
36 -From c60ef6a2bcc05010a89328d5fc2704d1aa505e2a Mon Sep 17 00:00:00 2001
37 -From: Christoph Reiter <reiter.christoph@×××××.com>
38 -Date: Sat, 10 Mar 2018 18:04:14 +0100
39 -Subject: [PATCH 1/4] tests_gi: Use capture_output() context manager instead of
40 - manually mocking stdout
41 -
42 ----
43 - tests/helper.py | 2 +-
44 - tests/test_gi.py | 14 +++-----------
45 - 2 files changed, 4 insertions(+), 12 deletions(-)
46 -
47 -diff --git a/tests/helper.py b/tests/helper.py
48 -index c4308fee..892cb740 100644
49 ---- a/tests/helper.py
50 -+++ b/tests/helper.py
51 -@@ -113,7 +113,7 @@ def capture_glib_deprecation_warnings():
52 - @contextlib.contextmanager
53 - def capture_output():
54 - """
55 -- with capture_output as (stdout, stderr):
56 -+ with capture_output() as (stdout, stderr):
57 - some_action()
58 - print(stdout.getvalue(), stderr.getvalue())
59 - """
60 -diff --git a/tests/test_gi.py b/tests/test_gi.py
61 -index d0c72b64..3b77ff2d 100644
62 ---- a/tests/test_gi.py
63 -+++ b/tests/test_gi.py
64 -@@ -13,7 +13,6 @@ import subprocess
65 - import gc
66 - import weakref
67 - import warnings
68 --from io import StringIO, BytesIO
69 -
70 - import gi
71 - import gi.overrides
72 -@@ -24,7 +23,7 @@ from gi.repository import GObject, GLib, Gio
73 - from gi.repository import GIMarshallingTests
74 -
75 - from compathelper import _bytes, _unicode
76 --from helper import capture_exceptions
77 -+from helper import capture_exceptions, capture_output
78 -
79 - if sys.version_info < (3, 0):
80 - CONSTANT_UTF8 = "const \xe2\x99\xa5 utf8"
81 -@@ -2836,16 +2835,9 @@ class TestModule(unittest.TestCase):
82 - self.assertTrue(hasattr(item, '__class__'))
83 -
84 - def test_help(self):
85 -- orig_stdout = sys.stdout
86 -- try:
87 -- if sys.version_info < (3, 0):
88 -- sys.stdout = BytesIO()
89 -- else:
90 -- sys.stdout = StringIO()
91 -+ with capture_output() as (stdout, stderr):
92 - help(GIMarshallingTests)
93 -- output = sys.stdout.getvalue()
94 -- finally:
95 -- sys.stdout = orig_stdout
96 -+ output = stdout.getvalue()
97 -
98 - self.assertTrue('SimpleStruct' in output, output)
99 - self.assertTrue('Interface2' in output, output)
100 ---
101 -2.18.0
102 -
103 -From 1826e41cd317ba3c19cf8767b1ef8752f1865aac Mon Sep 17 00:00:00 2001
104 -From: Christoph Reiter <reiter.christoph@×××××.com>
105 -Date: Sat, 10 Mar 2018 18:54:28 +0100
106 -Subject: [PATCH 2/4] IntrospectionModule: __path__ should be List[str] and not
107 - str
108 -
109 -This fixes a crash when calling help() on the module which got stricter with
110 -Python 3.7.
111 -
112 -It's a bit questionable why the type has __path__ in the first place as
113 -that's only meant for packages. But let's leave that for now.
114 ----
115 - gi/module.py | 5 +++--
116 - tests/test_gi.py | 6 ++++--
117 - 2 files changed, 7 insertions(+), 4 deletions(-)
118 -
119 -diff --git a/gi/module.py b/gi/module.py
120 -index fd8f5080..9e8b5256 100644
121 ---- a/gi/module.py
122 -+++ b/gi/module.py
123 -@@ -124,10 +124,11 @@ class IntrospectionModule(object):
124 - self._version = version
125 - self.__name__ = 'gi.repository.' + namespace
126 -
127 -- self.__path__ = repository.get_typelib_path(self._namespace)
128 -+ path = repository.get_typelib_path(self._namespace)
129 -+ self.__path__ = [path]
130 - if _have_py3:
131 - # get_typelib_path() delivers bytes, not a string
132 -- self.__path__ = self.__path__.decode('UTF-8')
133 -+ self.__path__ = [path.decode('UTF-8')]
134 -
135 - if self._version is None:
136 - self._version = repository.get_version(self._namespace)
137 -diff --git a/tests/test_gi.py b/tests/test_gi.py
138 -index 3b77ff2d..2fa0423d 100644
139 ---- a/tests/test_gi.py
140 -+++ b/tests/test_gi.py
141 -@@ -2813,8 +2813,10 @@ class TestKeywords(unittest.TestCase):
142 -
143 - class TestModule(unittest.TestCase):
144 - def test_path(self):
145 -- self.assertTrue(GIMarshallingTests.__path__.endswith('GIMarshallingTests-1.0.typelib'),
146 -- GIMarshallingTests.__path__)
147 -+ path = GIMarshallingTests.__path__
148 -+ assert isinstance(path, list)
149 -+ assert len(path) == 1
150 -+ assert path[0].endswith('GIMarshallingTests-1.0.typelib')
151 -
152 - def test_str(self):
153 - self.assertTrue("'GIMarshallingTests' from '" in str(GIMarshallingTests),
154 ---
155 -2.18.0
156 -
157 -From 8adc8be0a2ab17e5215a4bc6f63a9ee391237596 Mon Sep 17 00:00:00 2001
158 -From: Christoph Reiter <reiter.christoph@×××××.com>
159 -Date: Sun, 11 Mar 2018 13:13:30 +0100
160 -Subject: [PATCH 3/4] _struct_dealloc: handle being called with an error set
161 -
162 -With Python 3.7 it gets called with an error set and tp_dealloc
163 -implementations need to handle that.
164 -Fix by saving and restoring the error.
165 ----
166 - gi/pygi-struct.c | 12 +++++++++++-
167 - 1 file changed, 11 insertions(+), 1 deletion(-)
168 -
169 -diff --git a/gi/pygi-struct.c b/gi/pygi-struct.c
170 -index 4d5b5411..e2906e0a 100644
171 ---- a/gi/pygi-struct.c
172 -+++ b/gi/pygi-struct.c
173 -@@ -61,7 +61,14 @@ out:
174 - static void
175 - _struct_dealloc (PyGIStruct *self)
176 - {
177 -- GIBaseInfo *info = _struct_get_info ( (PyObject *) self );
178 -+ GIBaseInfo *info;
179 -+ PyObject *error_type, *error_value, *error_traceback;
180 -+ gboolean have_error = !!PyErr_Occurred ();
181 -+
182 -+ if (have_error)
183 -+ PyErr_Fetch (&error_type, &error_value, &error_traceback);
184 -+
185 -+ info = _struct_get_info ( (PyObject *) self );
186 -
187 - if (info != NULL && g_struct_info_is_foreign ( (GIStructInfo *) info)) {
188 - pygi_struct_foreign_release (info, pyg_pointer_get_ptr (self));
189 -@@ -73,6 +80,9 @@ _struct_dealloc (PyGIStruct *self)
190 - g_base_info_unref (info);
191 - }
192 -
193 -+ if (have_error)
194 -+ PyErr_Restore (error_type, error_value, error_traceback);
195 -+
196 - Py_TYPE (self)->tp_free ((PyObject *)self);
197 - }
198 -
199 ---
200 -2.18.0
201 -
202 -From 2299d46e7a57a74f734844ae28bfd536e89e5254 Mon Sep 17 00:00:00 2001
203 -From: Christoph Reiter <reiter.christoph@×××××.com>
204 -Date: Sat, 10 Mar 2018 20:03:33 +0100
205 -Subject: [PATCH 4/4] marshal-cleanup: save and restore exception around
206 - cleanup
207 -
208 -With Python 3.7 some Python API in the cleanup path clears exceptions
209 -which makes us return NULL in the end without an error set.
210 -
211 -Make if safe to call the cleanup functions with an error set by
212 -saving and restoring exceptions.
213 ----
214 - gi/pygi-marshal-cleanup.c | 25 +++++++++++++++++++++++++
215 - 1 file changed, 25 insertions(+)
216 -
217 -diff --git a/gi/pygi-marshal-cleanup.c b/gi/pygi-marshal-cleanup.c
218 -index b4d04bc5..0e4eda3f 100644
219 ---- a/gi/pygi-marshal-cleanup.c
220 -+++ b/gi/pygi-marshal-cleanup.c
221 -@@ -93,6 +93,11 @@ pygi_marshal_cleanup_args_from_py_marshal_success (PyGIInvokeState *state,
222 - PyGICallableCache *cache)
223 - {
224 - gssize i;
225 -+ PyObject *error_type, *error_value, *error_traceback;
226 -+ gboolean have_error = !!PyErr_Occurred ();
227 -+
228 -+ if (have_error)
229 -+ PyErr_Fetch (&error_type, &error_value, &error_traceback);
230 -
231 - for (i = 0; i < _pygi_callable_cache_args_len (cache); i++) {
232 - PyGIArgCache *arg_cache = _pygi_callable_cache_get_arg (cache, i);
233 -@@ -112,6 +117,9 @@ pygi_marshal_cleanup_args_from_py_marshal_success (PyGIInvokeState *state,
234 - state->args[i].arg_cleanup_data = NULL;
235 - }
236 - }
237 -+
238 -+ if (have_error)
239 -+ PyErr_Restore (error_type, error_value, error_traceback);
240 - }
241 -
242 - void
243 -@@ -119,6 +127,12 @@ pygi_marshal_cleanup_args_to_py_marshal_success (PyGIInvokeState *state,
244 - PyGICallableCache *cache)
245 - {
246 - GSList *cache_item;
247 -+ PyObject *error_type, *error_value, *error_traceback;
248 -+ gboolean have_error = !!PyErr_Occurred ();
249 -+
250 -+ if (have_error)
251 -+ PyErr_Fetch (&error_type, &error_value, &error_traceback);
252 -+
253 - /* clean up the return if available */
254 - if (cache->return_cache != NULL) {
255 - PyGIMarshalCleanupFunc cleanup_func = cache->return_cache->to_py_cleanup;
256 -@@ -153,6 +167,9 @@ pygi_marshal_cleanup_args_to_py_marshal_success (PyGIInvokeState *state,
257 -
258 - cache_item = cache_item->next;
259 - }
260 -+
261 -+ if (have_error)
262 -+ PyErr_Restore (error_type, error_value, error_traceback);
263 - }
264 -
265 - void
266 -@@ -161,6 +178,11 @@ pygi_marshal_cleanup_args_from_py_parameter_fail (PyGIInvokeState *state,
267 - gssize failed_arg_index)
268 - {
269 - gssize i;
270 -+ PyObject *error_type, *error_value, *error_traceback;
271 -+ gboolean have_error = !!PyErr_Occurred ();
272 -+
273 -+ if (have_error)
274 -+ PyErr_Fetch (&error_type, &error_value, &error_traceback);
275 -
276 - state->failed = TRUE;
277 -
278 -@@ -192,6 +214,9 @@ pygi_marshal_cleanup_args_from_py_parameter_fail (PyGIInvokeState *state,
279 - }
280 - state->args[i].arg_cleanup_data = NULL;
281 - }
282 -+
283 -+ if (have_error)
284 -+ PyErr_Restore (error_type, error_value, error_traceback);
285 - }
286 -
287 - void
288 ---
289 -2.18.0
290 -
291
292 diff --git a/dev-python/pygobject/pygobject-3.22.0.ebuild b/dev-python/pygobject/pygobject-3.22.0.ebuild
293 deleted file mode 100644
294 index 0ad561ad3c4..00000000000
295 --- a/dev-python/pygobject/pygobject-3.22.0.ebuild
296 +++ /dev/null
297 @@ -1,105 +0,0 @@
298 -# Copyright 1999-2017 Gentoo Foundation
299 -# Distributed under the terms of the GNU General Public License v2
300 -
301 -EAPI=6
302 -GNOME2_LA_PUNT="yes"
303 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
304 -
305 -inherit eutils gnome2 python-r1 virtualx
306 -
307 -DESCRIPTION="GLib's GObject library bindings for Python"
308 -HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
309 -
310 -LICENSE="LGPL-2.1+"
311 -SLOT="3"
312 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
313 -IUSE="+cairo examples test +threads"
314 -
315 -REQUIRED_USE="
316 - ${PYTHON_REQUIRED_USE}
317 - test? ( cairo )
318 -"
319 -
320 -COMMON_DEPEND="${PYTHON_DEPS}
321 - >=dev-libs/glib-2.38:2
322 - >=dev-libs/gobject-introspection-1.46.0:=
323 - virtual/libffi:=
324 - cairo? (
325 - >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
326 - x11-libs/cairo )
327 -"
328 -DEPEND="${COMMON_DEPEND}
329 - virtual/pkgconfig
330 - cairo? ( x11-libs/cairo[glib] )
331 - test? (
332 - dev-libs/atk[introspection]
333 - media-fonts/font-cursor-misc
334 - media-fonts/font-misc-misc
335 - x11-libs/cairo[glib]
336 - x11-libs/gdk-pixbuf:2[introspection]
337 - x11-libs/gtk+:3[introspection]
338 - x11-libs/pango[introspection]
339 - python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
340 -"
341 -# gnome-base/gnome-common required by eautoreconf
342 -
343 -# We now disable introspection support in slot 2 per upstream recommendation
344 -# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
345 -# older versions of slot 2 installed their own site-packages/gi, and
346 -# slot 3 will collide with them.
347 -RDEPEND="${COMMON_DEPEND}
348 - !<dev-python/pygtk-2.13
349 - !<dev-python/pygobject-2.28.6-r50:2[introspection]
350 -"
351 -
352 -src_prepare() {
353 - # Test fail with xvfb but not X
354 - sed -e 's/^.*TEST_NAMES=compat_test_pygtk .*;/echo "Test disabled";/' \
355 - -i tests/Makefile.{am,in} || die
356 -
357 - gnome2_src_prepare
358 - python_copy_sources
359 -}
360 -
361 -src_configure() {
362 - # Hard-enable libffi support since both gobject-introspection and
363 - # glib-2.29.x rdepend on it anyway
364 - # docs disabled by upstream default since they are very out of date
365 - configuring() {
366 - gnome2_src_configure \
367 - $(use_enable cairo) \
368 - $(use_enable threads thread)
369 -
370 - # Pyflakes tests work only in python2, bug #516744
371 - if use test && [[ ${EPYTHON} != python2.7 ]]; then
372 - sed -e 's/if type pyflakes/if false/' \
373 - -i Makefile || die "sed failed"
374 - fi
375 - }
376 -
377 - python_foreach_impl run_in_build_dir configuring
378 -}
379 -
380 -src_compile() {
381 - python_foreach_impl run_in_build_dir gnome2_src_compile
382 -}
383 -
384 -src_test() {
385 - export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
386 - export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
387 - export SKIP_PEP8="yes"
388 -
389 - testing() {
390 - export XDG_CACHE_HOME="${T}/${EPYTHON}"
391 - run_in_build_dir virtx emake check
392 - unset XDG_CACHE_HOME
393 - }
394 - python_foreach_impl testing
395 - unset GIO_USE_VFS
396 -}
397 -
398 -src_install() {
399 - python_foreach_impl run_in_build_dir gnome2_src_install
400 -
401 - dodoc -r examples
402 -}
403
404 diff --git a/dev-python/pygobject/pygobject-3.24.1-r1.ebuild b/dev-python/pygobject/pygobject-3.24.1-r1.ebuild
405 deleted file mode 100644
406 index 71ec333741c..00000000000
407 --- a/dev-python/pygobject/pygobject-3.24.1-r1.ebuild
408 +++ /dev/null
409 @@ -1,112 +0,0 @@
410 -# Copyright 1999-2018 Gentoo Foundation
411 -# Distributed under the terms of the GNU General Public License v2
412 -
413 -EAPI=6
414 -GNOME2_LA_PUNT="yes"
415 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
416 -
417 -inherit eutils gnome2 python-r1 virtualx
418 -
419 -DESCRIPTION="GLib's GObject library bindings for Python"
420 -HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
421 -
422 -LICENSE="LGPL-2.1+"
423 -SLOT="3"
424 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
425 -IUSE="+cairo examples test +threads"
426 -
427 -REQUIRED_USE="
428 - ${PYTHON_REQUIRED_USE}
429 - test? ( cairo )
430 -"
431 -
432 -COMMON_DEPEND="${PYTHON_DEPS}
433 - >=dev-libs/glib-2.38:2
434 - >=dev-libs/gobject-introspection-1.46.0:=
435 - virtual/libffi:=
436 - cairo? (
437 - >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
438 - x11-libs/cairo )
439 -"
440 -DEPEND="${COMMON_DEPEND}
441 - virtual/pkgconfig
442 - cairo? ( x11-libs/cairo[glib] )
443 - test? (
444 - dev-libs/atk[introspection]
445 - media-fonts/font-cursor-misc
446 - media-fonts/font-misc-misc
447 - x11-libs/cairo[glib]
448 - x11-libs/gdk-pixbuf:2[introspection,jpeg]
449 - x11-libs/gtk+:3[introspection]
450 - x11-libs/pango[introspection]
451 - python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
452 -"
453 -# gnome-base/gnome-common required by eautoreconf
454 -
455 -# We now disable introspection support in slot 2 per upstream recommendation
456 -# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
457 -# older versions of slot 2 installed their own site-packages/gi, and
458 -# slot 3 will collide with them.
459 -RDEPEND="${COMMON_DEPEND}
460 - !<dev-python/pygtk-2.13
461 - !<dev-python/pygobject-2.28.6-r50:2[introspection]
462 -"
463 -
464 -PATCHES=(
465 - "${FILESDIR}"/pygobject-3.24.1-py37.patch
466 -)
467 -
468 -src_prepare() {
469 - # Test fail with xvfb but not X
470 - sed -e 's/^.*TEST_NAMES=compat_test_pygtk .*;/echo "Test disabled";/' \
471 - -i tests/Makefile.{am,in} || die
472 -
473 - # FAIL: test_cairo_font_options (test_cairo.TestPango)
474 - # AssertionError: <type 'cairo.SubpixelOrder'> != <type 'int'>
475 - sed -e 's/^.*type(font_opts.get_subpixel_order()), int.*/#/' \
476 - -i tests/test_cairo.py || die
477 -
478 - gnome2_src_prepare
479 - python_copy_sources
480 -}
481 -
482 -src_configure() {
483 - # Hard-enable libffi support since both gobject-introspection and
484 - # glib-2.29.x rdepend on it anyway
485 - # docs disabled by upstream default since they are very out of date
486 - configuring() {
487 - gnome2_src_configure \
488 - $(use_enable cairo) \
489 - $(use_enable threads thread)
490 -
491 - # Pyflakes tests work only in python2, bug #516744
492 - if use test && [[ ${EPYTHON} != python2.7 ]]; then
493 - sed -e 's/if type pyflakes/if false/' \
494 - -i Makefile || die "sed failed"
495 - fi
496 - }
497 -
498 - python_foreach_impl run_in_build_dir configuring
499 -}
500 -
501 -src_compile() {
502 - python_foreach_impl run_in_build_dir gnome2_src_compile
503 -}
504 -
505 -src_test() {
506 - local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
507 - local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
508 - local -x SKIP_PEP8="yes"
509 -
510 - testing() {
511 - local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
512 - emake -C "${BUILD_DIR}" check
513 - }
514 - virtx python_foreach_impl testing
515 -}
516 -
517 -src_install() {
518 - python_foreach_impl run_in_build_dir gnome2_src_install
519 -
520 - dodoc -r examples
521 -}
522
523 diff --git a/dev-python/pygobject/pygobject-3.24.1.ebuild b/dev-python/pygobject/pygobject-3.24.1.ebuild
524 deleted file mode 100644
525 index 3b888f3969b..00000000000
526 --- a/dev-python/pygobject/pygobject-3.24.1.ebuild
527 +++ /dev/null
528 @@ -1,108 +0,0 @@
529 -# Copyright 1999-2018 Gentoo Foundation
530 -# Distributed under the terms of the GNU General Public License v2
531 -
532 -EAPI=6
533 -GNOME2_LA_PUNT="yes"
534 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
535 -
536 -inherit eutils gnome2 python-r1 virtualx
537 -
538 -DESCRIPTION="GLib's GObject library bindings for Python"
539 -HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
540 -
541 -LICENSE="LGPL-2.1+"
542 -SLOT="3"
543 -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
544 -IUSE="+cairo examples test +threads"
545 -
546 -REQUIRED_USE="
547 - ${PYTHON_REQUIRED_USE}
548 - test? ( cairo )
549 -"
550 -
551 -COMMON_DEPEND="${PYTHON_DEPS}
552 - >=dev-libs/glib-2.38:2
553 - >=dev-libs/gobject-introspection-1.46.0:=
554 - virtual/libffi:=
555 - cairo? (
556 - >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
557 - x11-libs/cairo )
558 -"
559 -DEPEND="${COMMON_DEPEND}
560 - virtual/pkgconfig
561 - cairo? ( x11-libs/cairo[glib] )
562 - test? (
563 - dev-libs/atk[introspection]
564 - media-fonts/font-cursor-misc
565 - media-fonts/font-misc-misc
566 - x11-libs/cairo[glib]
567 - x11-libs/gdk-pixbuf:2[introspection,jpeg]
568 - x11-libs/gtk+:3[introspection]
569 - x11-libs/pango[introspection]
570 - python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
571 -"
572 -# gnome-base/gnome-common required by eautoreconf
573 -
574 -# We now disable introspection support in slot 2 per upstream recommendation
575 -# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
576 -# older versions of slot 2 installed their own site-packages/gi, and
577 -# slot 3 will collide with them.
578 -RDEPEND="${COMMON_DEPEND}
579 - !<dev-python/pygtk-2.13
580 - !<dev-python/pygobject-2.28.6-r50:2[introspection]
581 -"
582 -
583 -src_prepare() {
584 - # Test fail with xvfb but not X
585 - sed -e 's/^.*TEST_NAMES=compat_test_pygtk .*;/echo "Test disabled";/' \
586 - -i tests/Makefile.{am,in} || die
587 -
588 - # FAIL: test_cairo_font_options (test_cairo.TestPango)
589 - # AssertionError: <type 'cairo.SubpixelOrder'> != <type 'int'>
590 - sed -e 's/^.*type(font_opts.get_subpixel_order()), int.*/#/' \
591 - -i tests/test_cairo.py || die
592 -
593 - gnome2_src_prepare
594 - python_copy_sources
595 -}
596 -
597 -src_configure() {
598 - # Hard-enable libffi support since both gobject-introspection and
599 - # glib-2.29.x rdepend on it anyway
600 - # docs disabled by upstream default since they are very out of date
601 - configuring() {
602 - gnome2_src_configure \
603 - $(use_enable cairo) \
604 - $(use_enable threads thread)
605 -
606 - # Pyflakes tests work only in python2, bug #516744
607 - if use test && [[ ${EPYTHON} != python2.7 ]]; then
608 - sed -e 's/if type pyflakes/if false/' \
609 - -i Makefile || die "sed failed"
610 - fi
611 - }
612 -
613 - python_foreach_impl run_in_build_dir configuring
614 -}
615 -
616 -src_compile() {
617 - python_foreach_impl run_in_build_dir gnome2_src_compile
618 -}
619 -
620 -src_test() {
621 - local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
622 - local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
623 - local -x SKIP_PEP8="yes"
624 -
625 - testing() {
626 - local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
627 - emake -C "${BUILD_DIR}" check
628 - }
629 - virtx python_foreach_impl testing
630 -}
631 -
632 -src_install() {
633 - python_foreach_impl run_in_build_dir gnome2_src_install
634 -
635 - dodoc -r examples
636 -}