Bump fixed version of pygobject to 2.18.0. Kudos to pierrearinsal for the patch!

5 files changed, 207 insertions, 0 deletions

diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index dfc82bc..a00131a 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -4,9 +4,14 @@ AUX pygobject-2.14.2-libffi.patch 796 RMD160 0aa01f1d2cdf602ab127658bd838f55a8db
 AUX pygobject-2.14.2-with-precomputed-constants.patch 1251 RMD160 6c3c561e863c7542b30593f75fe69cee94902283 SHA1 d6656b9986c3b89d61f988216a48fa2381c2b1b0 SHA256 86a2fbb0fbc95a1d19d6a806c085cd638286724ff509584147bac259ef951017
 AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
 AUX pygobject-2.16.1-cross-generate-constants.patch 1009 RMD160 0868142e3d482db22083e6eda7be1f79d4352dc2 SHA1 7a0692e0ee76ba8f7e8e10e02d434aac3ff74c01 SHA256 aca83ea148b411652247c6706e10b18b79b5c35ab8bf96db3df4ad4007dce1af
+AUX pygobject-2.18.0-automake111.patch 323 RMD160 182ea96cbb8fe28a93add0ef3dfd7710777615d8 SHA1 96c22e5bb8f07ea117248f4c8ca580474938c7af SHA256 4a94e9ca2a421a923c522ad4132c8988f22e74949f0361e231b6ba0ca813bc57
+AUX pygobject-2.18.0-cross-generate-constants.patch 1014 RMD160 e7e6d6b30d2360975ddc95cb0ec4c5210d95d0c7 SHA1 0f2e48fab527842999228ef96b4e99f3ca58cb7d SHA256 886464993057878252d55c33b8288909c231b636aa6e0d42e3db0bc604fdf11b
+AUX pygobject-2.18.0-make_check.patch 1589 RMD160 a2657fb299055620a745cb704ea3de289cdf8d63 SHA1 64ada13e6ac91845353855ed694ed951f63f583b SHA256 df43cef258567f824753caa0ba3a8d2820f729dac5ecba0d9fbf39a6f4861c4a
 DIST pygobject-2.14.2.tar.bz2 366808 RMD160 c9894695d745a9d859f3edfb9e2946ad8b4fec3d SHA1 e891c3f1ad0d6f737d6c51b9be3eb363f7d11cbc SHA256 79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e
 DIST pygobject-2.15.4.tar.bz2 477302 RMD160 eecbf4a7969a7a81a50cf6e2b52d53d7d72d6b4e SHA1 dfc3f04a27243ac4c386bfd19e4c383dd419d040 SHA256 c746693328bfed7838a1f3bfac41b13d7f39a81ac961559cd0daf700fc677da7
 DIST pygobject-2.16.1.tar.bz2 522347 RMD160 37f4075af9c06aba4fca47e2580c5408dbc28845 SHA1 12ce140438e7ff7e1a26fe4bba9a26b49f80ec0d SHA256 ee229c642759470a242c7f6ce3bd969a7484496f95570a8783859b03d6d79cc5
+DIST pygobject-2.18.0.tar.bz2 639205 RMD160 db454107949b0e797c6c151aa426368ef0f59317 SHA1 f800eda7978fe9813600cfdda973da15c3178bb0 SHA256 b11b840ae31e6e644986806ee3400f4528b803d07b6cee26add45e0f2e5e622b
 EBUILD pygobject-2.14.2.ebuild 3185 RMD160 ea36e9736304d9be634de5208b0c72de867ae461 SHA1 2ffcaef9ccfcb99b5efc342d01cc19604772752c SHA256 d8847b76c42fe28478a548dac658307e2d8851b93a10ad92445f39ebbd458a8f
 EBUILD pygobject-2.15.4.ebuild 3018 RMD160 b21293bf981f46661e0f1d9a92264689c12a4f33 SHA1 3c992e6059571b4ee2564d444c3ec320c6fc8e92 SHA256 f7ad80983af4af764b4761f94cfa7cce3fd78e241eff20c2b2add97b61be0955
 EBUILD pygobject-2.16.1.ebuild 2499 RMD160 d9285e79c3df4f281d64639f830bfb8ba57cea4e SHA1 6af4480d3fb0802175e6f5416b35097a47287988 SHA256 d7d666f209e538cfdad34f636b72893c1bf6de7392e7ff67462f5a9cfaf074d2
+EBUILD pygobject-2.18.0.ebuild 2701 RMD160 054b114f3d5231fe1551e5f4bce133da0e40b4a8 SHA1 41b9c23c70ac601131ad52ae093f49e9eb390670 SHA256 76591d91841e13a259c109434c3c348e3fcb0e59bc2b6425a20f5fa98544e4fb
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch b/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch
new file mode 100644
index 0000000..9e57bb7
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch
@@ -0,0 +1,13 @@
+# Fix build failure due to automake 1.11.
+# defsgen.py was installed twice
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=279813
+--- a/codegen/Makefile.am
++++ b/codegen/Makefile.am
+@@ -18,7 +18,6 @@
+ 	docextract_to_xml.py \
+ 	docgen.py \
+ 	h2def.py \
+-	defsgen.py \
+ 	createdefs.py \
+ 	mergedefs.py \
+ 	missingdefs.py \
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch b/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch
new file mode 100644
index 0000000..19e510d
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch
@@ -0,0 +1,37 @@
+--- configure.ac	2009-02-18 00:20:53.000000000 +0100
++++ configure.ac.new	2009-06-16 22:37:05.000000000 +0200
+@@ -214,6 +214,20 @@
+ 
+ fi
+ 
++dnl Get the host compiler if cross-compiling
++dnl
++AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test "x${CC_FOR_BUILD+set}" != "xset" ; then
++  if test "x$cross_compiling" = "xyes" ; then
++    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++  else
++    CC_FOR_BUILD=${CC}
++  fi
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
+ AC_CONFIG_FILES(
+   Makefile
+   pygobject-2.0.pc
+--- gobject/Makefile.am	2009-06-16 22:58:36.000000000 +0200
++++ gobject/Makefile.am.new	2009-06-16 23:01:55.000000000 +0200
+@@ -71,6 +71,12 @@
+ if PLATFORM_WIN32
+ _gobject_la_CFLAGS += -DPLATFORM_WIN32
+ endif
++
++generate-constants$(EXEEXT): generate-constants.c
++	$(CC) $(generate_constants_CFLAGS) -E -o generate-constants.pre.c generate-constants.c
++	$(CC_FOR_BUILD) -o $@ generate-constants.pre.c
++	rm -f generate-constants.pre.c
++
+
+
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch b/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch
new file mode 100644
index 0000000..f351092
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch
@@ -0,0 +1,57 @@
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -11,7 +11,7 @@
+ 	test-thread.h \
+ 	test-unknown.h
+ 
+-noinst_LTLIBRARIES = testhelper.la
++check_LTLIBRARIES = testhelper.la
+ linked_LIBS = testhelper.la
+ 
+ testhelper_la_LDFLAGS = -module -avoid-version
+@@ -47,6 +47,7 @@
+ 	   cp $(top_srcdir)/gobject/*.py $(top_builddir)/gobject; \
+ 	   cp $(top_srcdir)/gio/*.py $(top_builddir)/gio; \
+ 	fi
++	$(LN_S) .libs/testhelper.so testhelper.so
+ 	@$(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(top_srcdir)
+ 	@if test "$(top_builddir)" != "$(top_srcdir)"; then \
+ 	   rm -f $(top_builddir)/glib/*.py; \
+@@ -58,8 +59,5 @@
+ 	@rm -fr $(top_builddir)/gio/*.pyc
+ 
+ 
+-all: $(LTLIBRARIES:.la=.so)
+ clean-local:
+-	rm -f $(LTLIBRARIES:.la=.so)
+-.la.so:
+-	$(LN_S) .libs/$@ $@ || true
++	rm -f .libs/testhelper.so
+--- tests/runtests.py
++++ tests/runtests.py
+@@ -6,6 +6,9 @@
+ 
+ import common
+ 
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
++
+ program = None
+ if len(sys.argv) == 3:
+     buildDir = sys.argv[1]
+--- tests/test_gio.py
++++ tests/test_gio.py
+@@ -386,9 +386,10 @@
+ 
+     def testQueryWritableNamespaces(self):
+         infolist = self.file.query_writable_namespaces()
+-        for info in infolist:
+-            if info.name == "xattr":
+-                self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
++        if infolist:
++            for info in infolist:
++                if info.name == "xattr":
++                    self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
+ 
+     def testSetAttribute(self):
+         self._f.write("testing attributes")
diff --git a/dev-python/pygobject/pygobject-2.18.0.ebuild b/dev-python/pygobject/pygobject-2.18.0.ebuild
new file mode 100644
index 0000000..6e5fa25
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.18.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0.ebuild,v 1.10 2009/08/19 16:30:10 jer Exp $
+
+inherit alternatives autotools gnome2 python 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 ~x86-fbsd"
+IUSE="doc examples libffi test"
+
+RDEPEND=">=dev-lang/python-2.4.4-r5
+	>=dev-libs/glib-2.16
+	!<dev-python/pygtk-2.13
+	libffi? ( virtual/libffi )"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		$(use_enable doc docs)
+		$(use_with libffi ffi)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix FHS compliance, see upstream bug #535524
+	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}"/${P}-make_check.patch
+
+	# Do not install files twice, bug #279813
+	epatch "${FILESDIR}/${P}-automake111.patch"
+
+	# For cross-compilation we need to compile the constant
+	# generation for the HOST architecture while using the
+	# target headers.
+	if tc-is-cross-compiler ; then
+		epatch "${FILESDIR}/${P}-cross-generate-constants.patch"
+	fi
+
+
+	# needed to build on a libtool-1 system, bug #255542
+	rm m4/lt* m4/libtool.m4 ltmain.sh
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	eautoreconf
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples
+	fi
+
+	python_version
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py-2.0
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth-2.0
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py
+	python_need_rebuild
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}