Version bump with assorted bugfixes. Drop old. Make license more precise.

(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)

17 files changed, 108 insertions, 755 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index a613d58b04f1..b7ef4efc3439 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.164 2012/08/15 17:51:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.165 2012/09/25 11:53:14 tetromino Exp $
+
+*pygobject-3.4.0 (25 Sep 2012)
+
+  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/pygobject-2.15.4-fix-codegen-location.patch,
+  -files/pygobject-2.18.0-support_multiple_python_versions.patch,
+  -files/pygobject-2.20.0-tmpdir-makefile.patch,
+  -files/pygobject-2.26.0-disable-non-working-tests.patch,
+  -files/pygobject-2.26.0-disabled-threads.patch,
+  -files/pygobject-2.26.0-make_check.patch,
+  -files/pygobject-2.26.0-nocrash.patch, pygobject-2.28.6-r51.ebuild,
+  pygobject-2.28.6-r52.ebuild, -pygobject-3.0.2.ebuild,
+  -files/pygobject-3.0.2-disable-new-gi-tests.patch,
+  -files/pygobject-3.0.3-gobject-property-min-max.patch,
+  pygobject-3.0.4.ebuild, -pygobject-3.2.1.ebuild, pygobject-3.2.2.ebuild,
+  +pygobject-3.4.0.ebuild, +files/pygobject-3.4.0-make_check.patch:
+  Version bump with assorted bugfixes. Drop old. Make license more precise.
 
   15 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   pygobject-3.0.2.ebuild, pygobject-3.0.4.ebuild, pygobject-3.2.1.ebuild,
diff --git a/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch
deleted file mode 100644
index 8882cd079071..000000000000
--- a/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch
+++ /dev/null
@@ -1,50 +0,0 @@
----
- Fix FHS compliance of codegen
-
- codegen/Makefile.am          |    2 +-
- codegen/pygtk-codegen-2.0.in |    3 ++-
- pygtk-2.0.pc.in              |    2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
---- a/codegen/Makefile.am	2007-11-01 12:20:22.000000000 -0400
-+++ b/codegen/Makefile.am	2008-05-28 22:21:04.000000000 -0400
-@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
- 
- bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
- 
--codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
-+codegendir = $(pyexecdir)/gtk-2.0/codegen
- 
- codegen_PYTHON = \
- 	__init__.py \
---- a/codegen/pygobject-codegen-2.0.in	2007-11-01 12:20:22.000000000 -0400
-+++ b/codegen/pygobject-codegen-2.0.in	2008-05-28 22:24:38.000000000 -0400
-@@ -1,9 +1,10 @@
- #!/bin/sh
- 
- prefix=@prefix@
-+exec_prefix=@exec_prefix@
- datarootdir=@datarootdir@
- datadir=@datadir@
--codegendir=${datadir}/pygobject/2.0/codegen
-+codegendir=@pyexecdir@/gtk-2.0/codegen
- 
- PYTHONPATH=$codegendir
- export PYTHONPATH
---- a/pygobject-2.0.pc.in	2007-11-01 12:20:22.000000000 -0400
-+++ b/pygobject-2.0.pc.in	2008-05-28 22:21:04.000000000 -0400
-@@ -4,6 +4,7 @@
- datarootdir=@datarootdir@
- datadir=@datadir@
- libdir=@libdir@
-+pyexecdir=@pyexecdir@
- 
- # you can use the --variable=pygtkincludedir argument to
- # pkg-config to get this value.  You might want to use this to
-@@ -12,5 +12,5 @@
- defsdir=${datadir}/pygobject/2.0/defs
--codegendir=${datadir}/pygobject/2.0/codegen
-+codegendir=${pyexecdir}/gtk-2.0/codegen
- 
- Name: PyGObject
- Description: Python bindings for GObject
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
deleted file mode 100644
index b27d408dfc18..000000000000
--- a/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- codegen/pygobject-codegen-2.0.in
-+++ codegen/pygobject-codegen-2.0.in
-@@ -4,7 +4,7 @@
- exec_prefix=@exec_prefix@
- datarootdir=@datarootdir@
- datadir=@datadir@
--codegendir=@pyexecdir@/gtk-2.0/codegen
-+codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen
- 
- PYTHONPATH=$codegendir
- export PYTHONPATH
---- gio/Makefile.am
-+++ gio/Makefile.am
-@@ -56,7 +56,7 @@
- gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
- _gio_la_CFLAGS = $(GIO_CFLAGS)
- _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
--_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
-+_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gio_la_SOURCES = \
- 	giomodule.c \
- 	pygio-utils.c \
---- glib/Makefile.am
-+++ glib/Makefile.am
-@@ -4,7 +4,7 @@
- pkgincludedir = $(includedir)/pygtk-2.0
- pkginclude_HEADERS = pyglib.h
- 
--lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
-+lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- 
- pkgpyexecdir = $(pyexecdir)/gtk-2.0
- 
-@@ -19,9 +19,9 @@
- common_ldflags += -no-undefined
- endif
- 
--libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
--libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
--libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
-+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = 	\
- 	pyglib.c		\
- 	pyglib.h		\
- 	pyglib-private.h 	\
-@@ -29,7 +29,7 @@
- 
- _glib_la_CFLAGS = $(GLIB_CFLAGS)
- _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
--_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
-+_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _glib_la_SOURCES = 	 	\
- 	glibmodule.c	 	\
- 	pygiochannel.c 	 	\
---- gobject/Makefile.am
-+++ gobject/Makefile.am
-@@ -42,7 +42,7 @@
- _gobject_la_LIBADD = \
- 	$(GLIB_LIBS) \
- 	$(FFI_LIBS) \
--	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
-+	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _gobject_la_SOURCES =           \
-         gobjectmodule.c         \
-         pygboxed.c              \
diff --git a/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch b/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch
deleted file mode 100644
index 11d326e97359..000000000000
--- a/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4e2efa91d101bf755739e1cca8eee41eb0ad20fd Mon Sep 17 00:00:00 2001
-From: Gian Mario Tagliaretti <gianmt@gnome.org>
-Date: Mon, 04 Jan 2010 07:35:14 +0000
-Subject: Bug 605937 - pygobject: Makefile.am sets $TMPDIR, disrupting distcc
-
-Committed a patch from Kevin Pyle
----
-diff --git a/Makefile.am b/Makefile.am
-index 93442af..580b489 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -55,23 +55,22 @@ uninstall-local:
- 	rm -f $(DESTDIR)$(pythondir)/pygtk.pth $(DESTDIR)$(pyexecdir)/pygtk.pth
- 
- EGG_NAME = $(PACKAGE)-$(PACKAGE_VERSION)-py$(PYTHON_VERSION)-$(PLATFORM).egg
--TMPDIR = `pwd`/$(PACKAGE)-$(PACKAGE_VERSION)
- 
-+egg: EGG_TMPDIR:=$(TMPDIR)/$(PACKAGE)-$(PACKAGE_VERSION)
- egg: $(top_srcdir)/gobject/gobject.la PKG-INFO
--	rm -fr $(TMPDIR)
-+	rm -fr $(EGG_TMPDIR)
- 	echo $(EGG_NAME)
--	mkdir -p $(TMPDIR)
--	mkdir -p $(TMPDIR)/EGG-INFO
--	make -C gobject install-pkgpyexecLTLIBRARIES pkgpyexecdir=$(TMPDIR)
--	$(INSTALL) dsextras.py $(TMPDIR)
--	rm -fr $(TMPDIR)/gobject.la
--	$(INSTALL) PKG-INFO $(TMPDIR)/EGG-INFO
--	echo "gobject.so" >> $(TMPDIR)/EGG-INFO/native_libs.txt
--	echo "gobject" >> $(TMPDIR)/EGG-INFO/top_level.txt
--	echo "dsextras.py" >> $(TMPDIR)/EGG-INFO/top_level.txt
--	cd $(TMPDIR) && zip -rq $(EGG_NAME) .
--	mv $(TMPDIR)/$(EGG_NAME) .
--	rm -fr $(TMPDIR)
-+	$(MKDIR_P) $(EGG_TMPDIR)
-+	$(MKDIR_P) $(EGG_TMPDIR)/EGG-INFO
-+	$(MAKE) -C gobject install-pkgpyexecLTLIBRARIES pkgpyexecdir=$(EGG_TMPDIR)
-+	$(INSTALL) dsextras.py $(EGG_TMPDIR)
-+	rm -fr $(EGG_TMPDIR)/gobject.la
-+	$(INSTALL) PKG-INFO $(EGG_TMPDIR)/EGG-INFO
-+	echo "gobject.so" >> $(EGG_TMPDIR)/EGG-INFO/native_libs.txt
-+	( echo "gobject" ; echo "dsextras.py" ) >> $(EGG_TMPDIR)/EGG-INFO/top_level.txt
-+	cd $(EGG_TMPDIR) && zip -rq $(EGG_NAME) .
-+	mv $(EGG_TMPDIR)/$(EGG_NAME) .
-+	rm -fr $(EGG_TMPDIR)
- 
- doc-dist:
- 	mkdir pygobject
---
-cgit v0.8.3.1
diff --git a/dev-python/pygobject/files/pygobject-2.26.0-disable-non-working-tests.patch b/dev-python/pygobject/files/pygobject-2.26.0-disable-non-working-tests.patch
deleted file mode 100644
index a4110cab0705..000000000000
--- a/dev-python/pygobject/files/pygobject-2.26.0-disable-non-working-tests.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From db9817a5da879c8a783beadcf3c88fc8686b937f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 6 Nov 2010 00:47:33 +0100
-Subject: [PATCH] Disable non-working tests
-
----
- tests/test_gio.py       |   15 ------
- tests/test_overrides.py |  126 -----------------------------------------------
- 2 files changed, 0 insertions(+), 141 deletions(-)
-
-diff --git a/tests/test_gio.py b/tests/test_gio.py
-index 7c8251e..e668574 100644
---- a/tests/test_gio.py
-+++ b/tests/test_gio.py
-@@ -1004,21 +1004,6 @@ class TestVfs(unittest.TestCase):
-         result = self.vfs.get_supported_uri_schemes()
-         self.failUnless(type(result), [])
- 
--class TestVolume(unittest.TestCase):
--    def setUp(self):
--        self.monitor = gio.volume_monitor_get()
--    
--    def testVolumeEnumerate(self):
--        volumes = self.monitor.get_volumes()
--        self.failUnless(isinstance(volumes, list))
--        for v in volumes:
--            if v is not None:
--                ids = v.enumerate_identifiers()
--                self.failUnless(isinstance(ids, list))
--                for id in ids:
--                    if id is not None:
--                        self.failUnless(isinstance(id, str))
--
- class TestFileInputStream(unittest.TestCase):
-     def setUp(self):
-         self._f = open("file.txt", "w+")
-diff --git a/tests/test_overrides.py b/tests/test_overrides.py
-index b1e3617..df2897c 100644
---- a/tests/test_overrides.py
-+++ b/tests/test_overrides.py
-@@ -110,87 +110,6 @@ class TestGtk(unittest.TestCase):
-             self.assertEquals(a,cmp)
-             action.activate()
- 
--    def test_builder(self):
--        self.assertEquals(Gtk.Builder, overrides.Gtk.Builder)
--
--        class SignalTest(GObject.GObject):
--            __gtype_name__ = "GIOverrideSignalTest"
--            __gsignals__ = {
--                "test-signal": (GObject.SIGNAL_RUN_FIRST,
--                                GObject.TYPE_NONE,
--                                []),
--            }
--
--
--        class SignalCheck:
--            def __init__(self):
--                self.sentinel = 0
--
--            def on_signal_1(self, *args):
--                self.sentinel += 1
--
--            def on_signal_3(self, *args):
--                self.sentinel += 3
--
--        signal_checker = SignalCheck()
--        builder = Gtk.Builder()
--
--        # add object1 to the builder
--        builder.add_from_string(
--"""
--<interface>
--  <object class="GIOverrideSignalTest" id="object1">
--      <signal name="test-signal" handler="on_signal_1" />
--  </object>
--</interface>
--""")
--
--        # only add object3 to the builder
--        builder.add_objects_from_string(
--"""
--<interface>
--  <object class="GIOverrideSignalTest" id="object2">
--      <signal name="test-signal" handler="on_signal_2" />
--  </object>
--  <object class="GIOverrideSignalTest" id="object3">
--      <signal name="test-signal" handler="on_signal_3" />
--  </object>
--  <object class="GIOverrideSignalTest" id="object4">
--      <signal name="test-signal" handler="on_signal_4" />
--  </object>
--</interface>
--
--""",
--            ['object3'])
--
--        # hook up signals
--        builder.connect_signals(signal_checker)
--
--        # call their notify signals and check sentinel
--        objects = builder.get_objects()
--        self.assertEquals(len(objects), 2)
--        for obj in objects:
--            obj.emit('test-signal')
--
--        self.assertEquals(signal_checker.sentinel, 4)
--
--    def test_dialog(self):
--        self.assertEquals(Gtk.Dialog, overrides.Gtk.Dialog)
--        dialog = Gtk.Dialog (title='Foo',
--                             flags=Gtk.DialogFlags.MODAL,
--                             buttons=('test-button1', 1))
--
--        dialog.add_buttons ('test-button2', 2, Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)
--
--        self.assertEquals('Foo', dialog.get_title())
--        self.assertTrue(dialog.get_modal())
--        button = dialog.get_widget_for_response (1)
--        self.assertEquals('test-button1', button.get_label())
--        button = dialog.get_widget_for_response (2)
--        self.assertEquals('test-button2', button.get_label())
--        button = dialog.get_widget_for_response (Gtk.ResponseType.CLOSE)
--        self.assertEquals(Gtk.STOCK_CLOSE, button.get_label())
--
-     class TestClass(GObject.GObject):
-         __gtype_name__ = "GIOverrideTreeAPITest"
- 
-@@ -237,28 +156,6 @@ class TestGtk(unittest.TestCase):
- 
-         self.assertEquals(i, 99)
- 
--    def test_list_store(self):
--        list_store = Gtk.ListStore(int, str, 'GIOverrideTreeAPITest')
--        for i in range(100):
--            label = 'this is row #%d' % i
--            testobj = TestGtk.TestClass(self, i, label)
--            parent = list_store.append((i, label, testobj))
--
--        self.assertEquals(len(list_store), 100)
--
--        # walk the list to see if the values were stored correctly
--        i = 0
--        (has_more, treeiter) = list_store.get_iter_first()
--
--        while has_more:
--            i = list_store.get_value(treeiter, 0)
--            s = list_store.get_value(treeiter, 1)
--            obj = list_store.get_value(treeiter, 2)
--            obj.check(i, s)
--            has_more = list_store.iter_next(treeiter)
--
--        self.assertEquals(i, 99)
--
-     def test_tree_view_column(self):
-         cell = Gtk.CellRendererText()
-         column = Gtk.TreeViewColumn(title='This is just a test',
-@@ -266,29 +163,6 @@ class TestGtk(unittest.TestCase):
-                                     text=0,
-                                     style=2)
- 
--    def test_text_buffer(self):
--        self.assertEquals(Gtk.TextBuffer, overrides.Gtk.TextBuffer)
--        buffer = Gtk.TextBuffer()
--        tag = buffer.create_tag ('title', font = 'Sans 18')
--
--        self.assertEquals(tag.props.name, 'title')
--        self.assertEquals(tag.props.font, 'Sans 18')
--
--        (start, end) = buffer.get_bounds()
--
--        buffer.insert(end, 'HelloHello')
--        buffer.insert(end, ' Bob')
--
--        cursor_iter = end.copy()
--        cursor_iter.backward_chars(9)
--        buffer.place_cursor(cursor_iter)
--        buffer.insert_at_cursor(' Jane ')
--
--        (start, end) = buffer.get_bounds()
--        text = buffer.get_text(start, end, False)
--
--        self.assertEquals(text, 'Hello Jane Hello Bob')
--
-     def test_buttons(self):
-         self.assertEquals(Gtk.Button, overrides.Gtk.Button)
- 
--- 
-1.7.3.1
-
diff --git a/dev-python/pygobject/files/pygobject-2.26.0-disabled-threads.patch b/dev-python/pygobject/files/pygobject-2.26.0-disabled-threads.patch
deleted file mode 100644
index e9f3a4e09c54..000000000000
--- a/dev-python/pygobject/files/pygobject-2.26.0-disabled-threads.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From a4b210d69c832629894090b7154ae194209b0c60 Mon Sep 17 00:00:00 2001
-From: Arnaud Charlet <charlet@adacore.com>
-Date: Tue, 18 Jan 2011 17:31:29 +0000
-Subject: Disable calls to PyGILState_* when threads are disabled
-
-Since threads may also be disabled in Python too, those symbols may not
-be resolved.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=374603
----
-diff --git a/glib/pyglib.c b/glib/pyglib.c
-index 8163e88..1e024c2 100644
---- a/glib/pyglib.c
-+++ b/glib/pyglib.c
-@@ -94,7 +94,11 @@ pyglib_gil_state_ensure(void)
-     if (!_PyGLib_API->threads_enabled)
- 	return PyGILState_LOCKED;
- 
-+#ifdef DISABLE_THREADING
-+    return PyGILState_LOCKED;
-+#else
-     return PyGILState_Ensure();
-+#endif
- }
- 
- void
-@@ -105,7 +109,9 @@ pyglib_gil_state_release(PyGILState_STATE state)
-     if (!_PyGLib_API->threads_enabled)
- 	return;
- 
-+#ifndef DISABLE_THREADING
-     PyGILState_Release(state);
-+#endif
- }
- 
- /**
-@@ -171,13 +177,19 @@ _pyglib_notify_on_enabling_threads(PyGLibThreadsEnabledFunc callback)
- int
- pyglib_gil_state_ensure_py23 (void)
- {
-+#ifdef DISABLE_THREADING
-+    return 0;
-+#else
-     return PyGILState_Ensure();
-+#endif
- }
- 
- void
- pyglib_gil_state_release_py23 (int flag)
- {
-+#ifndef DISABLE_THREADING
-     PyGILState_Release(flag);
-+#endif
- }
- 
- /**
-diff --git a/gobject/pygobject-private.h b/gobject/pygobject-private.h
-index ae4cfe1..a928cb1 100644
---- a/gobject/pygobject-private.h
-+++ b/gobject/pygobject-private.h
-@@ -32,12 +32,18 @@ extern struct _PyGObject_Functions pygobject_api_functions;
- 
- #define pyg_threads_enabled (pygobject_api_functions.threads_enabled)
- 
-+#ifdef DISABLE_THREADING
-+#define pyg_gil_state_ensure() 0
-+#define pyg_gil_state_release(state) G_STMT_START {     \
-+    } G_STMT_END
- 
-+#else
- #define pyg_gil_state_ensure() (pygobject_api_functions.threads_enabled? (PyGILState_Ensure()) : 0)
- #define pyg_gil_state_release(state) G_STMT_START {     \
-     if (pygobject_api_functions.threads_enabled)        \
-         PyGILState_Release(state);                      \
-     } G_STMT_END
-+#endif
- 
- #define pyg_begin_allow_threads                         \
-     G_STMT_START {                                      \
---
-cgit v0.8.3.1
diff --git a/dev-python/pygobject/files/pygobject-2.26.0-make_check.patch b/dev-python/pygobject/files/pygobject-2.26.0-make_check.patch
deleted file mode 100644
index 37eba722fd79..000000000000
--- a/dev-python/pygobject/files/pygobject-2.26.0-make_check.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 21893ae2b466fcf64645e73173a27200e99c0701 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
-
----
- tests/Makefile.am |   12 +++++-------
- tests/runtests.py |    2 ++
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 77bc020..49416b0 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,7 +1,7 @@
- CLEANFILES =
--noinst_LTLIBRARIES = 
-+check_LTLIBRARIES = 
- if ENABLE_INTROSPECTION
--noinst_LTLIBRARIES += libregress.la libgimarshallingtests.la
-+check_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)
-@@ -43,7 +43,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
- CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib
- endif
- 
--noinst_LTLIBRARIES += testhelper.la
-+check_LTLIBRARIES += testhelper.la
- 
- testhelper_la_CFLAGS = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
- testhelper_la_LDFLAGS = -module -avoid-version
-@@ -63,8 +63,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- 	test -L $@ || $(LN_S) .libs/$@ $@
- 
- 
--all: $(LTLIBRARIES:.la=.so)
--
- TEST_FILES = \
- 	test_gobject.py \
- 	test_interface.py \
-@@ -104,10 +102,10 @@ EXTRA_DIST = \
- EXTRA_DIST += $(TEST_FILES)
- 
- clean-local:
--	rm -f $(LTLIBRARIES:.la=.so) file.txt~
-+	rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
- 
- 
--check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib
-+check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib
- 	TEST_FILES="$(TEST_FILES)" PYTHONPATH=$(top_builddir):$(top_builddir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} LD_LIBRARY_PATH=$(builddir)/.libs:$$LD_LIBRARY_PATH GI_TYPELIB_PATH=$(builddir) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
- 
- check.gdb:
-diff --git a/tests/runtests.py b/tests/runtests.py
-index d99f0cc..89e2084 100644
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -5,6 +5,8 @@ import glob
- 
- import unittest
- 
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
- 
- # Load tests.
- if 'TEST_NAMES' in os.environ:
--- 
-1.7.3.1
-
diff --git a/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch b/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch
deleted file mode 100644
index 8698b7e3a190..000000000000
--- a/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN pygobject-2.26.0.orig/gi/pygi.h pygobject-2.26.0/gi/pygi.h
---- pygobject-2.26.0.orig/gi/pygi.h	2010-09-14 11:53:21.000000000 -0400
-+++ pygobject-2.26.0/gi/pygi.h	2010-11-08 08:16:13.360808932 -0500
-@@ -152,7 +152,7 @@ static inline PyObject *
- pygi_get_property_value (PyGObject *instance,
-                          const gchar *attr_name)
- {
--    return -1;
-+    return NULL;
- }
- 
- static inline gint
diff --git a/dev-python/pygobject/files/pygobject-3.0.2-disable-new-gi-tests.patch b/dev-python/pygobject/files/pygobject-3.0.2-disable-new-gi-tests.patch
deleted file mode 100644
index 8fa2ceed9654..000000000000
--- a/dev-python/pygobject/files/pygobject-3.0.2-disable-new-gi-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Disable tests requiring an unreleased version of gobject-introspection.
-
-diff --git a/tests/test_everything.py b/tests/test_everything.py
-index 19d345b..4a03890 100644
---- a/tests/test_everything.py
-+++ b/tests/test_everything.py
-@@ -483,22 +483,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/dev-python/pygobject/files/pygobject-3.0.3-gobject-property-min-max.patch b/dev-python/pygobject/files/pygobject-3.0.3-gobject-property-min-max.patch
deleted file mode 100644
index a5600bfdac66..000000000000
--- a/dev-python/pygobject/files/pygobject-3.0.3-gobject-property-min-max.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 00030bc6f0fb961c716ed692144cd8e4bb9be7d0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20P=C3=B6lsterl?= <sebp@k-d-w.org>
-Date: Sat, 10 Dec 2011 12:51:45 +0100
-Subject: [PATCH] Fixed bug where GObject.property did not respect minimum and
- maximum values
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664864
----
- gi/_gobject/propertyhelper.py |    2 +-
- tests/test_properties.py      |   31 +++++++++++++++++++++++++++++++
- 2 files changed, 32 insertions(+), 1 deletions(-)
-
-diff --git a/gi/_gobject/propertyhelper.py b/gi/_gobject/propertyhelper.py
-index 4635350..9208a0b 100644
---- a/gi/_gobject/propertyhelper.py
-+++ b/gi/_gobject/propertyhelper.py
-@@ -298,7 +298,7 @@ class property(object):
-         ptype = self.type
-         if ptype in [TYPE_INT, TYPE_UINT, TYPE_LONG, TYPE_ULONG,
-                      TYPE_INT64, TYPE_UINT64, TYPE_FLOAT, TYPE_DOUBLE]:
--            args = self._get_minimum(), self._get_maximum(), self.default
-+            args = self.minimum, self.maximum, self.default
-         elif (ptype == TYPE_STRING or ptype == TYPE_BOOLEAN or
-               ptype.is_a(TYPE_ENUM)):
-             args = (self.default,)
-diff --git a/tests/test_properties.py b/tests/test_properties.py
-index 3521647..75aacff 100644
---- a/tests/test_properties.py
-+++ b/tests/test_properties.py
-@@ -367,6 +367,37 @@ class TestProperty(unittest.TestCase):
-                               GObject.property, type=gtype, minimum=min,
-                               maximum=max+1)
- 
-+    def testMinMax(self):
-+        class C(GObject.GObject):
-+            prop_int = GObject.property(type=int, minimum=1, maximum=100, default=1)
-+            prop_float = GObject.property(type=float, minimum=0.1, maximum=10.5, default=1.1)
-+
-+            def __init__(self):
-+                GObject.GObject.__init__(self)
-+
-+        o = C()
-+        self.assertEqual(o.prop_int, 1)
-+
-+        o.prop_int = 5
-+        self.assertEqual(o.prop_int, 5)
-+
-+        o.prop_int = 0
-+        self.assertEqual(o.prop_int, 5)
-+
-+        o.prop_int = 101
-+        self.assertEqual(o.prop_int, 5)
-+
-+        self.assertEqual(o.prop_float, 1.1)
-+
-+        o.prop_float = 7.75
-+        self.assertEqual(o.prop_float, 7.75)
-+
-+        o.prop_float = 0.09
-+        self.assertEqual(o.prop_float, 7.75)
-+
-+        o.prop_float = 10.51
-+        self.assertEqual(o.prop_float, 7.75)
-+
-     def testMultipleInstances(self):
-         class C(GObject.GObject):
-             prop = GObject.property(type=str, default='default')
--- 
-1.7.8.1
-
diff --git a/dev-python/pygobject/files/pygobject-3.4.0-make_check.patch b/dev-python/pygobject/files/pygobject-3.4.0-make_check.patch
new file mode 100644
index 000000000000..08d8fa39d69a
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.4.0-make_check.patch
@@ -0,0 +1,75 @@
+From 50dd12f2958945626defdf305332f270309cacc0 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 | 10 +++++-----
+ tests/runtests.py |  3 +++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 081028a..ac71575 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,5 +1,5 @@
+ CLEANFILES =
+-noinst_LTLIBRARIES = libregress.la libgimarshallingtests.la
++check_LTLIBRARIES = libregress.la libgimarshallingtests.la
+ 
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+ libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
+@@ -43,7 +43,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
+@@ -63,7 +63,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 \
+@@ -103,7 +103,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= \
+@@ -114,7 +114,7 @@ RUN_TESTS_ENV_VARS= \
+ 	MALLOC_PERTURB_=85 \
+ 	TESTS_BUILDDIR=$(builddir)
+ 
+-check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
++check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib 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
+
diff --git a/dev-python/pygobject/pygobject-2.28.6-r51.ebuild b/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
index 4f435352888b..31ea60cf117b 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r51.ebuild,v 1.15 2012/05/21 18:49:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r51.ebuild,v 1.16 2012/09/25 11:53:14 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -19,7 +19,7 @@ inherit alternatives autotools eutils gnome2 python virtualx
 DESCRIPTION="GLib's GObject library bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +introspection libffi test"
diff --git a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild b/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
index 9a034b64e6cf..7d777f292bc9 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r52.ebuild,v 1.4 2012/05/21 18:49:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r52.ebuild,v 1.5 2012/09/25 11:53:14 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ inherit alternatives autotools eutils gnome2 python virtualx
 DESCRIPTION="GLib's GObject library bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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="doc examples +introspection libffi test"
diff --git a/dev-python/pygobject/pygobject-3.0.2.ebuild b/dev-python/pygobject/pygobject-3.0.2.ebuild
deleted file mode 100644
index a25ec697ddca..000000000000
--- a/dev-python/pygobject/pygobject-3.0.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.0.2.ebuild,v 1.18 2012/08/15 17:51:46 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6 3:3.1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython 2.7-pypy-*"
-
-# XXX: Is the alternatives stuff needed anymore?
-inherit alternatives autotools eutils gnome2 python 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 sh sparc x86 ~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" # doc
-REQUIRED_USE="test? ( cairo )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
-	>=dev-libs/gobject-introspection-1.29
-	virtual/libffi
-	cairo? ( >=dev-python/pycairo-1.10.0 )"
-DEPEND="${COMMON_DEPEND}
-	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] )
-	virtual/pkgconfig"
-# docs disabled for now per upstream default since they are very out of date
-#	doc? (
-#		app-text/docbook-xml-dtd:4.1.2
-#		dev-libs/libxslt
-#		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-
-# 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]"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	# Hard-enable libffi support since both gobject-introspection and
-	# glib-2.29.x rdepend on it anyway
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		--with-ffi
-		$(use_enable cairo)
-		$(use_enable threads thread)"
-
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
-
-	# Support installation for multiple Python versions, upstream bug #648292
-	epatch "${FILESDIR}/${PN}-3.0.0-support_multiple_python_versions.patch"
-
-	# Disable tests that fail
-	#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
-
-	# FIXME: disable tests that require git master of gobject-introspection
-	epatch "${FILESDIR}/${P}-disable-new-gi-tests.patch"
-
-	# disable pyc compiling
-	echo '#!/bin/sh' > py-compile
-
-	eautoreconf
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
-		Xemake check PYTHON=$(PYTHON -a)
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize gi
-}
-
-pkg_postrm() {
-	python_mod_cleanup gi
-}
diff --git a/dev-python/pygobject/pygobject-3.0.4.ebuild b/dev-python/pygobject/pygobject-3.0.4.ebuild
index c31a67865a19..f10d487105cf 100644
--- a/dev-python/pygobject/pygobject-3.0.4.ebuild
+++ b/dev-python/pygobject/pygobject-3.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.0.4.ebuild,v 1.13 2012/08/15 17:51:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.0.4.ebuild,v 1.14 2012/09/25 11:53:14 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ inherit alternatives autotools eutils gnome2 python virtualx
 DESCRIPTION="GLib's GObject library bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~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" # doc
diff --git a/dev-python/pygobject/pygobject-3.2.2.ebuild b/dev-python/pygobject/pygobject-3.2.2.ebuild
index fe945c10fbd7..85dd57df3ef1 100644
--- a/dev-python/pygobject/pygobject-3.2.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.ebuild,v 1.3 2012/08/15 17:51:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2.ebuild,v 1.4 2012/09/25 11:53:14 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ inherit autotools eutils gnome2 python virtualx
 DESCRIPTION="GLib's GObject library bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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" # doc
diff --git a/dev-python/pygobject/pygobject-3.2.1.ebuild b/dev-python/pygobject/pygobject-3.4.0.ebuild
index 1a3b2132f959..9c67581d69e4 100644
--- a/dev-python/pygobject/pygobject-3.2.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.1.ebuild,v 1.4 2012/08/15 17:51:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.0.ebuild,v 1.1 2012/09/25 11:53:14 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,25 +14,26 @@ inherit autotools eutils gnome2 python virtualx
 DESCRIPTION="GLib's GObject library bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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" # doc
 REQUIRED_USE="test? ( cairo )"
 
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
-	>=dev-libs/gobject-introspection-1.31.20
+	>=dev-libs/gobject-introspection-1.33.14
 	virtual/libffi
 	cairo? ( >=dev-python/pycairo-1.10.0 )"
 DEPEND="${COMMON_DEPEND}
+	x11-libs/cairo[glib]
+	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] )
-	virtual/pkgconfig"
+		x11-libs/pango[introspection] )"
 # docs disabled for now per upstream default since they are very out of date
 #	doc? (
 #		app-text/docbook-xml-dtd:4.1.2
@@ -62,7 +63,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
+	epatch "${FILESDIR}/${PN}-3.4.0-make_check.patch"
 
 	# Disable tests that fail
 	#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"