summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-04-26 07:14:31 +0000
committerPacho Ramos <pacho@gentoo.org>2014-04-26 07:14:31 +0000
commit75218c079e32276680c18ccc9d2bed2374735399 (patch)
tree9f26bdb48cbe81778338f2eb97861a405d284796 /dev-python
parentdrop old (diff)
downloadgentoo-2-75218c079e32276680c18ccc9d2bed2374735399.tar.gz
gentoo-2-75218c079e32276680c18ccc9d2bed2374735399.tar.bz2
gentoo-2-75218c079e32276680c18ccc9d2bed2374735399.zip
drop old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/pygobject/ChangeLog13
-rw-r--r--dev-python/pygobject/files/pygobject-3.2.2-cairo-gobject.patch26
-rw-r--r--dev-python/pygobject/files/pygobject-3.2.2-cairo-tests.patch81
-rw-r--r--dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch84
-rw-r--r--dev-python/pygobject/files/pygobject-3.4.2-run-tests-with-old-python.patch197
-rwxr-xr-xdev-python/pygobject/files/pygobject-3.7.90-make_check.patch86
-rw-r--r--dev-python/pygobject/files/pygobject-3.8.0-stack-corruption.patch32
-rw-r--r--dev-python/pygobject/pygobject-2.28.6-r53.ebuild158
-rw-r--r--dev-python/pygobject/pygobject-3.2.2-r1.ebuild106
-rw-r--r--dev-python/pygobject/pygobject-3.4.2-r1.ebuild116
-rw-r--r--dev-python/pygobject/pygobject-3.8.3.ebuild106
11 files changed, 12 insertions, 993 deletions
diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index c72d826285b6..a86c412aa1eb 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for dev-python/pygobject
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.246 2014/04/21 10:28:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.247 2014/04/26 07:14:30 pacho Exp $
+
+ 26 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+ -files/pygobject-3.2.2-cairo-gobject.patch,
+ -files/pygobject-3.2.2-cairo-tests.patch,
+ -files/pygobject-3.4.1.1-make_check.patch,
+ -files/pygobject-3.4.2-run-tests-with-old-python.patch,
+ -files/pygobject-3.7.90-make_check.patch,
+ -files/pygobject-3.8.0-stack-corruption.patch, -pygobject-2.28.6-r53.ebuild,
+ -pygobject-3.2.2-r1.ebuild, -pygobject-3.4.2-r1.ebuild,
+ -pygobject-3.8.3.ebuild:
+ drop old
21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> pygobject-2.28.6-r55.ebuild,
pygobject-3.10.2.ebuild:
diff --git a/dev-python/pygobject/files/pygobject-3.2.2-cairo-gobject.patch b/dev-python/pygobject/files/pygobject-3.2.2-cairo-gobject.patch
deleted file mode 100644
index dd6fc277017a..000000000000
--- a/dev-python/pygobject/files/pygobject-3.2.2-cairo-gobject.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 62c2e962a225ec2527aa3d7406aa0dae232a0886 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Fri, 25 May 2012 17:09:55 -0400
-Subject: [PATCH] Fix build
-
-libregress now needs cairo-gobject
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4210730..08d6a9c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -185,7 +185,7 @@ dnl gio
- PKG_CHECK_MODULES(GIO, gio-2.0 >= gio_required_version)
-
- # we always need cairo (not pycairo) for building the tests
--PKG_CHECK_MODULES(CAIRO, cairo)
-+PKG_CHECK_MODULES(CAIRO, cairo cairo-gobject)
-
- AC_ARG_ENABLE(cairo,
- AC_HELP_STRING([--enable-cairo], [Enable Cairo bindings using introspection information]),
---
-1.8.0.2
-
diff --git a/dev-python/pygobject/files/pygobject-3.2.2-cairo-tests.patch b/dev-python/pygobject/files/pygobject-3.2.2-cairo-tests.patch
deleted file mode 100644
index 73865349bef9..000000000000
--- a/dev-python/pygobject/files/pygobject-3.2.2-cairo-tests.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From fd7f8eefbe8aba0b29d80e3eb9d985d33a268c8a Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Thu, 3 May 2012 09:38:56 +0200
-Subject: [PATCH] Fix building with --disable-cairo
-
-Build gobject-introspection's regress.c against cairo, not pycairo/py3cairo. We
-always need cairo to build, so unconditionally check for this in configure.ac.
-
-In test_everything.py, gracefully handle the absence of the "cairo" Python
-module, which we do not have when building without cairo support.
----
- configure.ac | 3 +++
- tests/Makefile.am | 4 ++--
- tests/test_everything.py | 8 +++++++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8606bbd..ef5d7b6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -184,6 +184,9 @@ AC_SUBST(LIBFFI_PC)
- dnl gio
- PKG_CHECK_MODULES(GIO, gio-2.0 >= gio_required_version)
-
-+# we always need cairo (not pycairo) for building the tests
-+PKG_CHECK_MODULES(CAIRO, cairo)
-+
- AC_ARG_ENABLE(cairo,
- AC_HELP_STRING([--enable-cairo], [Enable Cairo bindings using introspection information]),
- enable_cairo=$enableval,
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index fa9ab8c..a54bed8 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -2,8 +2,8 @@ CLEANFILES =
- noinst_LTLIBRARIES = libregress.la libgimarshallingtests.la
-
- nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
--libregress_la_CFLAGS = $(GIO_CFLAGS) $(PYCAIRO_CFLAGS)
--libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(PYCAIRO_LIBS)
-+libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
-+libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
- nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
- libgimarshallingtests_la_CFLAGS = $(GLIB_CFLAGS)
- libgimarshallingtests_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
-diff --git a/tests/test_everything.py b/tests/test_everything.py
-index 47408d4..dfe6eea 100644
---- a/tests/test_everything.py
-+++ b/tests/test_everything.py
-@@ -9,7 +9,11 @@ sys.path.insert(0, "../")
- from sys import getrefcount
-
- import copy
--import cairo
-+try:
-+ import cairo
-+ has_cairo = True
-+except ImportError:
-+ has_cairo = False
-
- from gi.repository import GObject
- from gi.repository import GLib
-@@ -25,6 +29,7 @@ else:
-
- class TestEverything(unittest.TestCase):
-
-+ @unittest.skipUnless(has_cairo, 'built without cairo support')
- def test_cairo_context(self):
- context = Everything.test_cairo_context_full_return()
- self.assertTrue(isinstance(context, cairo.Context))
-@@ -33,6 +38,7 @@ class TestEverything(unittest.TestCase):
- context = cairo.Context(surface)
- Everything.test_cairo_context_none_in(context)
-
-+ @unittest.skipUnless(has_cairo, 'built without cairo support')
- def test_cairo_surface(self):
- surface = Everything.test_cairo_surface_none_return()
- self.assertTrue(isinstance(surface, cairo.ImageSurface))
---
-1.8.0.2
-
diff --git a/dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch b/dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch
deleted file mode 100644
index 7aa7058160e6..000000000000
--- a/dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From d0885d5757f02f53dbc8036054a1ced7f727eb08 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 5 Nov 2010 23:39:08 +0100
-Subject: [PATCH] Do not build tests unless needed
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: port to 2.90.1]
----
- tests/Makefile.am | 12 ++++++------
- tests/runtests.py | 3 +++
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7a619bf..a3cbf57 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,5 +1,5 @@
- CLEANFILES =
--noinst_LTLIBRARIES = libgimarshallingtests.la
-+check_LTLIBRARIES = libgimarshallingtests.la
- test_typelibs = GIMarshallingTests-1.0.typelib
-
- nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
-@@ -23,7 +23,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
-
- # regress.c needs cairo
- if ENABLE_CAIRO
--noinst_LTLIBRARIES += libregress.la
-+check_LTLIBRARIES += libregress.la
- test_typelibs += Regress-1.0.typelib
- nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
- libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
-@@ -52,7 +52,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
-
- CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
-
--noinst_LTLIBRARIES += testhelper.la
-+check_LTLIBRARIES += testhelper.la
-
- testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
- testhelper_la_LDFLAGS = -module -avoid-version
-@@ -72,7 +72,7 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- test -L $@ || $(LN_S) .libs/$@ $@
-
-
--all: $(LTLIBRARIES:.la=.so)
-+all: $(check_LTLIBRARIES:.la=.so)
-
- EXTRA_DIST = \
- compathelper.py \
-@@ -112,7 +112,7 @@ EXTRA_DIST = \
- $(NULL)
-
- clean-local:
-- rm -f $(LTLIBRARIES:.la=.so) file.txt~
-+ rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
-
- DBUS_LAUNCH=$(shell which dbus-launch)
- RUN_TESTS_ENV_VARS= \
-@@ -123,7 +123,7 @@ RUN_TESTS_ENV_VARS= \
- MALLOC_PERTURB_=85 \
- TESTS_BUILDDIR=$(builddir)
-
--check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
-+check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
- @echo " CHECK Pyflakes"
- @if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
- @echo " CHECK PEP8"
-diff --git a/tests/runtests.py b/tests/runtests.py
-index c518fcc..35bb5c4 100755
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -34,6 +34,9 @@ if sys.version_info[:2] == (2, 6):
- unittest.TestCase.assertGreater = assertGreater
- unittest.TestCase.assertIsInstance = assertIsInstance
-
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-+
- if '--help' in sys.argv:
- print("Usage: ./runtests.py <testfiles>")
- sys.exit(0)
---
-1.7.12.4
-
diff --git a/dev-python/pygobject/files/pygobject-3.4.2-run-tests-with-old-python.patch b/dev-python/pygobject/files/pygobject-3.4.2-run-tests-with-old-python.patch
deleted file mode 100644
index c7173bbce3e6..000000000000
--- a/dev-python/pygobject/files/pygobject-3.4.2-run-tests-with-old-python.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 9929494d3d1c4f4a99b1a1633ae0874f6b0ae445 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 13 Jan 2013 11:26:11 +0100
-Subject: [PATCH] Allow tests to run with <python2.7
-
-runtests.py trick does not seem to work that well.
-At the very least it misses assertLessEqual so just use unittest2 when
-necessary and be done with hacks.
----
- tests/runtests.py | 30 +++---------------------------
- tests/test_atoms.py | 3 +++
- tests/test_everything.py | 4 ++++
- tests/test_gi.py | 6 +++++-
- tests/test_iochannel.py | 4 ++++
- tests/test_overrides.py | 3 +++
- tests/test_overrides_gdk.py | 3 +++
- tests/test_overrides_gtk.py | 4 ++++
- tests/test_overrides_pango.py | 3 +++
- tests/test_pygtkcompat.py | 3 +++
- 10 files changed, 35 insertions(+), 28 deletions(-)
-
-diff --git a/tests/runtests.py b/tests/runtests.py
-index c518fcc..f0a6750 100755
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -5,34 +5,10 @@ import os
- import glob
- import sys
-
--import unittest
--
--# provide missing unittest decorators and API for python 2.6; these decorators
--# do not actually work, just avoid the syntax failure
- if sys.version_info[:2] == (2, 6):
-- def skipUnless(condition, reason):
-- if not condition:
-- sys.stderr.write('[expected failure] ')
-- return lambda obj: obj
--
-- unittest.skipUnless = skipUnless
-- unittest.expectedFailure = lambda obj: obj
--
-- def assertGreater(self, a, b, msg=None):
-- if not a > b:
-- self.fail('%s not greater than %s' % (repr(a), repr(b)))
--
-- def assertGreaterEqual(self, a, b, msg=None):
-- if not a >= b:
-- self.fail('%s not greater than or equal to %s' % (repr(a), repr(b)))
--
-- def assertIsInstance(self, obj, cls, msg=None):
-- if not isinstance(obj, cls):
-- self.fail('%s is not an instance of %r' % (repr(obj), cls))
--
-- unittest.TestCase.assertGreaterEqual = assertGreaterEqual
-- unittest.TestCase.assertGreater = assertGreater
-- unittest.TestCase.assertIsInstance = assertIsInstance
-+ import unittest2 as unittest
-+else:
-+ import unittest
-
- if '--help' in sys.argv:
- print("Usage: ./runtests.py <testfiles>")
-diff --git a/tests/test_atoms.py b/tests/test_atoms.py
-index a59d15a..ff3d9fb 100644
---- a/tests/test_atoms.py
-+++ b/tests/test_atoms.py
-@@ -1,5 +1,8 @@
- import unittest
-
-+if not hasattr(unittest, 'skipUnless'):
-+ import unittest2 as unittest
-+
- try:
- from gi.repository import Atk, Gdk, Gtk
- (Atk, Gdk) # pyflakes
-diff --git a/tests/test_everything.py b/tests/test_everything.py
-index 600edbf..744178f 100644
---- a/tests/test_everything.py
-+++ b/tests/test_everything.py
-@@ -3,6 +3,10 @@
- # vim: tabstop=4 shiftwidth=4 expandtab
-
- import unittest
-+
-+if not hasattr(unittest, 'skipUnless'):
-+ import unittest2 as unittest
-+
- import traceback
- import warnings
- import gc
-diff --git a/tests/test_gi.py b/tests/test_gi.py
-index 315867a..d74a095 100644
---- a/tests/test_gi.py
-+++ b/tests/test_gi.py
-@@ -4,7 +4,11 @@
-
- import sys
-
--import unittest
-+if sys.version_info[:2] == (2, 6):
-+ import unittest2 as unittest
-+else:
-+ import unittest
-+
- import tempfile
- import shutil
- import os
-diff --git a/tests/test_iochannel.py b/tests/test_iochannel.py
-index 8c035e9..a28e7ff 100644
---- a/tests/test_iochannel.py
-+++ b/tests/test_iochannel.py
-@@ -2,6 +2,10 @@
- # encoding: UTF-8
-
- import unittest
-+
-+if not hasattr(unittest.TestCase, 'assertLessEqual'):
-+ import unittest2 as unittest
-+
- import tempfile
- import os.path
- import fcntl
-diff --git a/tests/test_overrides.py b/tests/test_overrides.py
-index dd2aa6a..c72e5b6 100644
---- a/tests/test_overrides.py
-+++ b/tests/test_overrides.py
-@@ -3,6 +3,9 @@
-
- import unittest
-
-+if not hasattr(unittest, 'skipUnless'):
-+ import unittest2 as unittest
-+
- import gi.overrides
- try:
- from gi.repository import Regress
-diff --git a/tests/test_overrides_gdk.py b/tests/test_overrides_gdk.py
-index 070acb8..16d976f 100644
---- a/tests/test_overrides_gdk.py
-+++ b/tests/test_overrides_gdk.py
-@@ -3,6 +3,9 @@
-
- import unittest
-
-+if not hasattr(unittest, 'skipUnless'):
-+ import unittest2 as unittest
-+
- import gi.overrides
-
- try:
-diff --git a/tests/test_overrides_gtk.py b/tests/test_overrides_gtk.py
-index ee41457..c1dbc8f 100644
---- a/tests/test_overrides_gtk.py
-+++ b/tests/test_overrides_gtk.py
-@@ -2,6 +2,10 @@
- # vim: tabstop=4 shiftwidth=4 expandtab
-
- import unittest
-+
-+if not hasattr(unittest, 'skipUnless'):
-+ import unittest2 as unittest
-+
- import ctypes
- import sys
-
-diff --git a/tests/test_overrides_pango.py b/tests/test_overrides_pango.py
-index 51f4f6a..7468fbb 100644
---- a/tests/test_overrides_pango.py
-+++ b/tests/test_overrides_pango.py
-@@ -3,6 +3,9 @@
-
- import unittest
-
-+if not hasattr(unittest, 'skipUnless'):
-+ import unittest2 as unittest
-+
- try:
- from gi.repository import Pango
- Pango
-diff --git a/tests/test_pygtkcompat.py b/tests/test_pygtkcompat.py
-index 5fabf2a..b5ddf89 100644
---- a/tests/test_pygtkcompat.py
-+++ b/tests/test_pygtkcompat.py
-@@ -3,6 +3,9 @@
-
- import unittest
-
-+if not hasattr(unittest, 'skipUnless'):
-+ import unittest2 as unittest
-+
- from gi.repository import GLib
-
- try:
---
-1.8.1
-
diff --git a/dev-python/pygobject/files/pygobject-3.7.90-make_check.patch b/dev-python/pygobject/files/pygobject-3.7.90-make_check.patch
deleted file mode 100755
index 74db7757f735..000000000000
--- a/dev-python/pygobject/files/pygobject-3.7.90-make_check.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 319d6d68a398d326ef95e39f494da7c514facf81 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Fri, 8 Mar 2013 08:25:58 +0330
-Subject: [PATCH] pygobject-3.7.90-make check
-
-originaly by [Alexandre Rostovtsev <tetromino@gmail.com>
-don't build tests unless it's needed
-
----
- tests/Makefile.am | 12 ++++++------
- tests/runtests.py | 3 +++
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 287542d..2cc0da9 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,5 +1,5 @@
- CLEANFILES =
--noinst_LTLIBRARIES = libgimarshallingtests.la
-+check_LTLIBRARIES = libgimarshallingtests.la
- test_typelibs = GIMarshallingTests-1.0.typelib
-
- nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
-@@ -23,7 +23,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
-
- # regress.c needs cairo
- if ENABLE_CAIRO
--noinst_LTLIBRARIES += libregress.la
-+check_LTLIBRARIES += libregress.la
- test_typelibs += Regress-1.0.typelib
- nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
- libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
-@@ -52,7 +52,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
-
- CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
-
--noinst_LTLIBRARIES += testhelper.la
-+check_LTLIBRARIES += testhelper.la
-
- testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
- testhelper_la_LDFLAGS = -module -avoid-version
-@@ -72,7 +72,7 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- test -L $@ || $(LN_S) .libs/$@ $@
-
-
--all: $(LTLIBRARIES:.la=.so)
-+all: $(check_LTLIBRARIES:.la=.so)
-
- EXTRA_DIST = \
- compathelper.py \
-@@ -116,7 +116,7 @@ EXTRA_DIST = \
- $(NULL)
-
- clean-local:
-- rm -f $(LTLIBRARIES:.la=.so) file.txt~
-+ rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
-
- DBUS_LAUNCH=$(shell which dbus-launch)
- RUN_TESTS_ENV_VARS= \
-@@ -130,7 +130,7 @@ RUN_TESTS_ENV_VARS= \
-
- # pygtkcompat tests need to be run in a separate process as they
- # clobber global name space
--check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
-+check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
- @echo " CHECK Pyflakes"
- @if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
- @if test -z "$$SKIP_PEP8"; then \
-diff --git a/tests/runtests.py b/tests/runtests.py
-index d3a4f47..5a53d3f 100755
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -54,6 +54,9 @@ if sys.version_info[:2] == (2, 6):
- if sys.version_info[:2] == (2, 7):
- unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-+
- if '--help' in sys.argv:
- print("Usage: ./runtests.py <testfiles>")
- sys.exit(0)
---
-1.8.1.2
-
diff --git a/dev-python/pygobject/files/pygobject-3.8.0-stack-corruption.patch b/dev-python/pygobject/files/pygobject-3.8.0-stack-corruption.patch
deleted file mode 100644
index 046ca4ff9806..000000000000
--- a/dev-python/pygobject/files/pygobject-3.8.0-stack-corruption.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c1fb6516031d3c32abd640f09a4814ae4363f979 Mon Sep 17 00:00:00 2001
-From: Simon Feltman <sfeltman@src.gnome.org>
-Date: Sun, 31 Mar 2013 08:32:34 +0000
-Subject: Fix stack corruption due to incorrect format for argument parser
-
-Fix call to PyArg_ParseTupleAndKeywords that used a format parser
-of "l" meaning long (8 bytes) in combination with an output pointer
-of guint (4 bytes). Change to use gulong with a format of "k".
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696892
----
-diff --git a/gi/_gobject/pygflags.c b/gi/_gobject/pygflags.c
-index 83aa4dc..bdeaae7 100644
---- a/gi/_gobject/pygflags.c
-+++ b/gi/_gobject/pygflags.c
-@@ -129,12 +129,12 @@ static PyObject *
- pyg_flags_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
- {
- static char *kwlist[] = { "value", NULL };
-- guint value;
-+ gulong value;
- PyObject *pytc, *values, *ret, *pyint;
- GType gtype;
- GFlagsClass *eclass;
-
-- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "l", kwlist, &value))
-+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "k", kwlist, &value))
- return NULL;
-
- pytc = PyObject_GetAttrString((PyObject *)type, "__gtype__");
---
-cgit v0.9.1
diff --git a/dev-python/pygobject/pygobject-2.28.6-r53.ebuild b/dev-python/pygobject/pygobject-2.28.6-r53.ebuild
deleted file mode 100644
index dfad8c1aa2ce..000000000000
--- a/dev-python/pygobject/pygobject-2.28.6-r53.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r53.ebuild,v 1.17 2013/10/31 13:48:14 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples libffi test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
- libffi? ( virtual/libffi:= )
- ${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
- dev-lang/python-exec:0
- dev-util/gtk-doc-am
- virtual/pkgconfig
- test? (
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc )
-"
-RDEPEND="${COMMON_DEPEND}
- !<dev-python/pygtk-2.23"
-
-# disable python-exec:2 support, bug #484406
-_PYTHON_WANT_PYTHON_EXEC2=0
-
-src_prepare() {
- # Fix FHS compliance, see upstream bug #535524
- epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
-
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
-
- # Support installation for multiple Python versions, upstream bug #648292
- epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
-
- # Disable tests that fail
- epatch "${FILESDIR}/${P}-disable-failing-tests.patch"
-
- # Disable introspection tests when we build with --disable-introspection
- epatch "${FILESDIR}/${P}-tests-no-introspection.patch"
-
- # Fix warning spam
- epatch "${FILESDIR}/${P}-set_qdata.patch"
- epatch "${FILESDIR}/${P}-gio-types-2.32.patch"
-
- sed -i \
- -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
- configure.ac || die
-
- eautoreconf
- gnome2_src_prepare
-
- python_copy_sources
-
- prepare_shebangs() {
- # Make a backup with unconverted shebangs to keep python_doscript happy
- cp codegen/codegen.py pygobject-codegen-2.0
- sed -e "s%#! \?/usr/bin/env python%#!${PYTHON}%" \
- -i codegen/*.py || die "shebang convertion failed"
- }
- python_foreach_impl run_in_build_dir prepare_shebangs
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- # --disable-introspection and --disable-cairo because we use pygobject:3
- # for introspection support
- G2CONF="${G2CONF}
- --disable-introspection
- --disable-cairo
- $(use_with libffi ffi)"
-
- python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-
- testing() {
- export XDG_CACHE_HOME="${T}/${EPYTHON}"
- run_in_build_dir Xemake -j1 check
- unset XDG_CACHE_HOME
- }
- python_foreach_impl testing
- unset GIO_USE_VFS
-}
-
-src_install() {
- installing() {
- local f prefixed_sitedir
-
- gnome2_src_install
-
- python_doscript pygobject-codegen-2.0
-
- # Don't keep multiple copies of pygobject-codegen-2.0 script
- prefixed_sitedir=$(python_get_sitedir)
- dosym "${prefixed_sitedir#${EPREFIX}}/gtk-2.0/codegen/codegen.py" /usr/bin/pygobject-codegen-2.0-${EPYTHON}
-
- # Workaround to avoid triggering collision protect with long-useless
- # alternatives symlinks generated by older versions of pygobject:2.
- # Need to temporarily rename installed files in src_install because
- # portage runs a collision protect check *before* pkg_preinst.
- for f in "${prefixed_sitedir}/pygtk."{pth,py}; do
- # $ROOT and $D, not $EROOT and $ED; $(python_get_sitedir) includes $EPREFIX
- if [[ -h "${ROOT}${f}" ]]; then
- unprotect_symlinks=( "${unprotect_symlinks[@]}" "${f}" )
- mv "${D}${f}" "${D}${f}-${PVR}" || die
- fi
- done
- }
- unprotect_symlinks=( )
- python_foreach_impl run_in_build_dir installing
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
-
-pkg_preinst() {
- local f
-
- gnome2_pkg_preinst
-
- for f in ${unprotect_symlinks[@]}; do
- # $ROOT and $D, not $EROOT and $ED; $(python_get_sitedir) includes $EPREFIX
- einfo "Removing obsolete ${f} symlink"
- rm "${ROOT}${f}"
- mv "${D}${f}-${PVR}" "${D}${f}" || die
- done
-}
-
-run_in_build_dir() {
- pushd "${BUILD_DIR}" > /dev/null || die
- "$@"
- popd > /dev/null
-}
diff --git a/dev-python/pygobject/pygobject-3.2.2-r1.ebuild b/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
deleted file mode 100644
index 2a257c69720b..000000000000
--- a/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2-r1.ebuild,v 1.14 2014/03/11 02:52:27 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
-
-inherit autotools eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test +threads"
-
-REQUIRED_USE="test? ( cairo )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
- >=dev-libs/gobject-introspection-1.31.20
- virtual/libffi:=
- cairo? (
- >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
- x11-libs/cairo )
- ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- test? (
- dev-libs/atk[introspection]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )"
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
- !<dev-python/pygtk-2.13
- !<dev-python/pygobject-2.28.6-r50:2[introspection]"
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- # docs disabled by upstream default since they are very out of date
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- --with-ffi
- $(use_enable cairo)
- $(use_enable threads thread)"
-
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
-
- # Fix cairo-using tests; in 3.4
- epatch "${FILESDIR}/${P}-cairo-tests.patch"
- epatch "${FILESDIR}/${P}-cairo-gobject.patch"
-
- eautoreconf
- gnome2_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-
- testing() {
- export XDG_CACHE_HOME="${T}/${EPYTHON}"
- run_in_build_dir Xemake check
- unset XDG_CACHE_HOME
- }
- python_foreach_impl testing
- unset GIO_USE_VFS
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir gnome2_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
-
-run_in_build_dir() {
- pushd "${BUILD_DIR}" > /dev/null || die
- "$@"
- popd > /dev/null
-}
diff --git a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
deleted file mode 100644
index e7064dc9f1e9..000000000000
--- a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.14 2014/03/11 02:52:27 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit autotools eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test +threads"
-
-REQUIRED_USE="test? ( cairo )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
- >=dev-libs/gobject-introspection-1.34.1.1
- virtual/libffi:=
- cairo? (
- >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
- x11-libs/cairo )
- ${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- cairo? ( x11-libs/cairo[glib] )
- test? (
- dev-libs/atk[introspection]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- virtual/python-unittest2[${PYTHON_USEDEP}]
- x11-libs/cairo[glib]
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )
-"
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
- !<dev-python/pygtk-2.13
- !<dev-python/pygobject-2.28.6-r50:2[introspection]"
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- # docs disabled by upstream default since they are very out of date
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- --with-ffi
- $(use_enable cairo)
- $(use_enable threads thread)"
-
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-3.4.1.1-make_check.patch"
-
- # Run tests with older python too
- epatch "${FILESDIR}/${PN}-3.4.2-run-tests-with-old-python.patch"
-
- sed -i \
- -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
- configure.ac || die
-
- eautoreconf
- gnome2_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
- export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
- testing() {
- export XDG_CACHE_HOME="${T}/${EPYTHON}"
- run_in_build_dir Xemake check
- unset XDG_CACHE_HOME
- }
- python_foreach_impl testing
- unset GIO_USE_VFS
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir gnome2_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
-
-run_in_build_dir() {
- pushd "${BUILD_DIR}" > /dev/null || die
- "$@"
- popd > /dev/null
-}
diff --git a/dev-python/pygobject/pygobject-3.8.3.ebuild b/dev-python/pygobject/pygobject-3.8.3.ebuild
deleted file mode 100644
index d2a42bd5416b..000000000000
--- a/dev-python/pygobject/pygobject-3.8.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.8.3.ebuild,v 1.12 2014/03/11 02:52:27 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit autotools eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test +threads"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- test? ( cairo )
-"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.34.2:2
- >=dev-libs/gobject-introspection-1.34.2
- virtual/libffi:=
- cairo? (
- >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
- x11-libs/cairo )
- ${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- cairo? ( x11-libs/cairo[glib] )
- test? (
- dev-libs/atk[introspection]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- virtual/python-unittest2[${PYTHON_USEDEP}]
- x11-libs/cairo[glib]
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )
- gnome-base/gnome-common
-"
-# gnome-base/gnome-common required by eautoreconf
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
- !<dev-python/pygtk-2.13
- !<dev-python/pygobject-2.28.6-r50:2[introspection]"
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog* NEWS README"
-
- # Do not build tests if unneeded, bug #226345, upstream bug #698444
- epatch "${FILESDIR}/${PN}-3.7.90-make_check.patch"
-
- eautoreconf
- gnome2_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- # docs disabled by upstream default since they are very out of date
- python_foreach_impl run_in_build_dir \
- gnome2_src_configure \
- --with-ffi \
- $(use_enable cairo) \
- $(use_enable threads thread)
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
- export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
- testing() {
- export XDG_CACHE_HOME="${T}/${EPYTHON}"
- run_in_build_dir Xemake check
- unset XDG_CACHE_HOME
- }
- python_foreach_impl testing
- unset GIO_USE_VFS
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir gnome2_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}