Add a python-r1-ized revision of pygobject-3.2.2. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 107 insertions, 182 deletions

diff --git a/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch
deleted file mode 100644
index f0fab7f7ba7f..000000000000
--- a/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 228ce7f0f99d2f5fa7d4ac86784d4e81032f9a3a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 8 Apr 2011 15:43:39 +0200
-Subject: [PATCH 2/3] Enable support to build against multiple version of
- python
-
----
- gi/Makefile.am          |    2 +-
- gi/_glib/Makefile.am    |   14 +++++++-------
- gi/_gobject/Makefile.am |    2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/gi/Makefile.am b/gi/Makefile.am
-index 0584cc9..9abb61d 100644
---- a/gi/Makefile.am
-+++ b/gi/Makefile.am
-@@ -83,7 +83,7 @@ _gi_la_CPPFLAGS = \
- _gi_la_LIBADD = \
- 	$(extension_libadd) \
- 	$(GI_LIBS) \
--	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gi_la_LDFLAGS = \
- 	$(extension_ldflags) \
- 	-export-symbols-regex "init_gi|PyInit__gi"
-diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am
-index 3cf2593..eaa0ce9 100644
---- a/gi/_glib/Makefile.am
-+++ b/gi/_glib/Makefile.am
-@@ -27,24 +27,24 @@ pyglib_PYTHON = \
- 	__init__.py \
- 	option.py
- 
--lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- 
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = \
- 	pyglib.c \
- 	pyglib.h \
- 	pyglib-private.h \
- 	pyglib-python-compat.h
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CPPFLAGS = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CPPFLAGS = \
- 	$(extension_cppflags)
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CFLAGS = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = \
- 	$(GLIB_CFLAGS)
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LIBADD = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = \
- 	$(extension_libadd) \
- 	$(FFI_LIBS) \
- 	$(GLIB_LIBS)
- 
- if OS_WIN32
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LDFLAGS = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LDFLAGS = \
- 	-no-undefined
- endif
- 
-@@ -73,7 +73,7 @@ _glib_la_CPPFLAGS = \
- _glib_la_LIBADD = \
- 	$(extension_libadd) \
- 	$(GLIB_LIBS) \
--	libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+	libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _glib_la_LDFLAGS = \
- 	$(extension_ldflags) \
- 	-export-symbols-regex "_glib|PyInit__glib"
-diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am
-index 6bddcf7..023907f 100644
---- a/gi/_gobject/Makefile.am
-+++ b/gi/_gobject/Makefile.am
-@@ -65,7 +65,7 @@ _gobject_la_LIBADD = \
- 	$(extension_libadd) \
- 	$(GLIB_LIBS) \
- 	$(FFI_LIBS) \
--	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+	$(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gobject_la_LDFLAGS = \
- 	$(extension_ldflags) \
- 	-export-symbols-regex "_gobject|PyInit__gobject"
--- 
-1.7.6.1
-
diff --git a/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch b/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch
deleted file mode 100644
index a445374213ab..000000000000
--- a/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Disable tests requiring >=gobject-introspection-1.31
-
-diff --git a/tests/test_everything.py b/tests/test_everything.py
-index 43735e5..ecfdef4 100644
---- a/tests/test_everything.py
-+++ b/tests/test_everything.py
-@@ -507,22 +507,3 @@ class TestAdvancedInterfaces(unittest.TestCase):
-         self.assertEquals(ret[0], 51);
-         self.assertEquals(ret[1], 61);
-         self.assertEquals(ret[2], 32);
--
--    def test_obj_skip_return_val_no_out(self):
--        obj = Everything.TestObj();
--        # raises an error for 0, succeeds for any other value
--        self.assertRaises(GLib.GError, obj.skip_return_val_no_out, 0)
--
--        ret = obj.skip_return_val_no_out(1)
--        self.assertEquals(ret, None)
--
--class TestSignals(unittest.TestCase):
--    def test_object_param_signal(self):
--        obj = Everything.TestObj();
--
--        def callback (obj_param):
--            self.assertEquals(obj_param.props.int, 3)
--            self.assertEquals(obj_param.__grefcount__, 2)
--
--        obj.connect('sig-with-obj', callback)
--        obj.emit_sig_with_obj()
-diff --git a/tests/test_gi.py b/tests/test_gi.py
-index 0a9b1b2..7e24778 100644
---- a/tests/test_gi.py
-+++ b/tests/test_gi.py
-@@ -770,18 +770,6 @@ class TestArray(unittest.TestCase):
-     def test_gstrv_inout(self):
-         self.assertEquals(['-1', '0', '1', '2'], GIMarshallingTests.gstrv_inout(['0', '1', '2']))
-     
--    def test_array_gvariant_none_in(self):
--        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
--        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--    
--    def test_array_gvariant_container_in(self):
--        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
--        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--    
--    def test_array_gvariant_full_in(self):
--        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
--        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--
-     def test_bytearray_gvariant(self):
-         v = GLib.Variant.new_bytestring("foo")
-         self.assertEquals(v.get_bytestring(), "foo")
-@@ -1651,16 +1639,6 @@ class TestPythonGObject(unittest.TestCase):
-             def do_method_not_a_vfunc(self):
-                 pass
- 
--    def test_subsubobject(self):
--        class SubSubSubObject(GIMarshallingTests.SubSubObject):
--            def do_method_deep_hierarchy(self, num):
--                self.props.int = num * 2
--
--        sub_sub_sub_object = SubSubSubObject()
--        GIMarshallingTests.SubSubObject.do_method_deep_hierarchy(sub_sub_sub_object, 5)
--        self.assertEqual(sub_sub_sub_object.props.int, 5)
--
--
- class TestMultiOutputArgs(unittest.TestCase):
- 
-     def test_int_out_out(self):
diff --git a/dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch b/dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch
deleted file mode 100644
index a8477fa5edcb..000000000000
--- a/dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8d88283688797b8fc70a7cbccd42a71b8518098d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 26 Dec 2011 00:44:56 -0500
-Subject: [PATCH] Fix bytearray test compatibility with python3
-
-https://bugs.gentoo.org/show_bug.cgi?id=321879
----
- tests/test_gi.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_gi.py b/tests/test_gi.py
-index 0a9b1b2..8726187 100644
---- a/tests/test_gi.py
-+++ b/tests/test_gi.py
-@@ -783,8 +783,8 @@ class TestArray(unittest.TestCase):
-         self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
- 
-     def test_bytearray_gvariant(self):
--        v = GLib.Variant.new_bytestring("foo")
--        self.assertEquals(v.get_bytestring(), "foo")
-+        v = GLib.Variant.new_bytestring(b"foo")
-+        self.assertEquals(v.get_bytestring(), b"foo")
- 
- class TestGArray(unittest.TestCase):
- 
--- 
-1.7.8.1
-
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
new file mode 100644
index 000000000000..dd6fc277017a
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.2.2-cairo-gobject.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..73865349bef9
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.2.2-cairo-tests.patch
@@ -0,0 +1,81 @@
+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
+