Fix console warnings with glib-2.32, thanks to rei4dan for reporting.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 236 insertions, 6 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index c439ae8a0ce1..439594022f5d 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,13 @@
 # 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.150 2012/03/28 01:01:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.151 2012/04/13 14:59:21 tetromino Exp $
+
+*pygobject-2.28.6-r52 (13 Apr 2012)
+
+  13 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +pygobject-2.28.6-r52.ebuild, +files/pygobject-2.28.6-gio-types-2.32.patch,
+  +files/pygobject-2.28.6-set_qdata.patch:
+  Fix console warnings with glib-2.32, thanks to rei4dan for reporting.
 
 *pygobject-3.2.0 (28 Mar 2012)
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 8156d0eb8eff..db5a6cebcb94 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -12,6 +12,8 @@ AUX pygobject-2.28.3-disable-failing-tests.patch 1782 RMD160 fbb40f7ef721cd5f7f0
 AUX pygobject-2.28.3-fix-codegen-location.patch 1948 RMD160 be495b6c8fe0123eda3bf4985899e2606b5746f5 SHA1 995170208849e6a8710e3024386f83f9984ba46c SHA256 eb16a71a8e3f45e965797ca99cc5d079b13a0f74dafc7976806d09ccd1f30476
 AUX pygobject-2.28.3-make_check.patch 2705 RMD160 e59fee5df0cbb89c0d64aabdd5eb3033da0f3d80 SHA1 38e945ff7ba5ba1cd59493dfe88f6657317a6c6c SHA256 91ddf8f2d1d767f771b91568c1d669019cf4e302baf1dd2eeed4b41ff7cb75b6
 AUX pygobject-2.28.3-support_multiple_python_versions.patch 3938 RMD160 2cc8e5c1d278ff7285a02b596b2cb285e011cc5a SHA1 8c6a215cc3d5e142db9dae5644fe27ced2da5b52 SHA256 7269f232a9b4ffe1c920c610796cb8f1dc5bcdc5cd5d03ebc7045f45d5f5d089
+AUX pygobject-2.28.6-gio-types-2.32.patch 1231 RMD160 c008a043ffd9161233c1ae2ffd33366edf26640d SHA1 447b460d66a63d9b9b015a32a810cd2617a1501f SHA256 76b8636556b56143eac3afa002c5a8938d87e613668cfce0a73ce1f1e3d6c810
+AUX pygobject-2.28.6-set_qdata.patch 847 RMD160 7c1af2ffe415f65ebceabbd683b93a19be8daecd SHA1 32fee4b0c2ac99647fc4fab5553b4bdcd0c29787 SHA256 1dda085e0aadedf70eb8290e9c12fd27227173d3313a28d40ab923316b35bde3
 AUX pygobject-2.90.1-make_check.patch 2572 RMD160 15fa252864308469a9d84ed3d0195fe38b329127 SHA1 a3daba6e1cd7b15663c6cae862236abd876a50aa SHA256 e665baf786eb565cd095ca1651a696264b112dcbc534593c4fa3da2d4e3b2ddf
 AUX pygobject-3.0.0-support_multiple_python_versions.patch 2794 RMD160 3dd6dfc06063d7eca37c02a08b15c7d3c5615a12 SHA1 56311e3c80ff768d1f88ef635cae34441532cc1e SHA256 ee1e3182dadd4e585179916e4cff3836d2e4464663667a8f5afcf5949d3c000c
 AUX pygobject-3.0.2-disable-new-gi-tests.patch 1078 RMD160 d49ab860e2e3f4ee939ec34b6d69157f6f44cccc SHA1 b8c55b5850373db399a61a3f5ee1b8b38bd4b66c SHA256 00d2ff216da8f26d57c1a9238f308a02fa77f4d9dcfbd931b238cddd9b99bccd
@@ -27,17 +29,18 @@ DIST pygobject-3.2.0.tar.xz 561820 RMD160 5b0f6bf22dc5f6e30b50c26daab12867c96112
 EBUILD pygobject-2.26.0-r1.ebuild 3805 RMD160 f4eda78700dc36db931cee6fa7711c332b09d6dc SHA1 c0693b0ada40802d258c5716107e751a16f48cb3 SHA256 092b3815e0abb0a05f912ed2eafc6fc4b2b3fe937a4f677ced8779a9f81beac4
 EBUILD pygobject-2.28.6-r50.ebuild 4160 RMD160 8e277738db5efdeb4ac41078a43acb199d4baac5 SHA1 b3c79d07a67902f4b7a035b4f3a276c40643c830 SHA256 3c88737baf10c76e6d5cc69d1f2c582657a1c9d0b3c36afab9ec9ef3ae540b66
 EBUILD pygobject-2.28.6-r51.ebuild 4153 RMD160 dc12d5333ff19de4458cb95bc2b692a27e0c7947 SHA1 ab12c26098b81327dabfd1cef57d2f299743bef9 SHA256 4328143400084955d71e4df6320018bb7d56f0d379e8e784a4a72afdaa943496
+EBUILD pygobject-2.28.6-r52.ebuild 4221 RMD160 3f95d4c2e5681738f00eccd7de3789385ff4dd06 SHA1 851f1c8e45fb26a2086ab3550340b359e0719909 SHA256 f65fdc9002e79d588b3a039710f961d8f573aa3fceae28f78462b8761b1090f5
 EBUILD pygobject-2.28.6.ebuild 3829 RMD160 128b944f0d0dae81ddf6d5a65f76528acca91b3c SHA1 d9bfe8b3f03e25ef9507574a765eebcf514e6e9a SHA256 a4720acdc19217c0f7644aaa9d3b1a8ce1e09a25c1b9c36fb198449e807c6078
 EBUILD pygobject-3.0.2.ebuild 3236 RMD160 57928438cb460c5a47df3f922753421585ec4e58 SHA1 6573772f692d9d4ce6c5b5ea59a691f98a573064 SHA256 d4b5cf919f824add343f7e0dfd780ec15e03dcac2f65120a4a67c1480eb1b7c8
 EBUILD pygobject-3.0.3.ebuild 3571 RMD160 a32bd4b55252305ce72675b404cca7cc5f72fdef SHA1 a33ff7cf649e7c3d1bd63c87cce1804dd376fc14 SHA256 befe117f9dc3453c1769fddc1156343d9d68036a5487692346759283ba49ca0e
 EBUILD pygobject-3.0.4.ebuild 3420 RMD160 77bf85312a90d28e8303dd2e38444d6ea6d7391d SHA1 d0b5534d58dfc4816767e8d34b508a4f502aed45 SHA256 1bdac8fbb813ad0e3248bc1c7a681e7120ff062ecb43b523f8b9c826f40040e7
 EBUILD pygobject-3.2.0.ebuild 3033 RMD160 a72deeb34bb6d874ef36c4fef8edb97a39986854 SHA1 376f7f5f6c542f308d984e359c428a52d73cf5fc SHA256 e4192b7ee9740b95b6e2578a279cb28ee1dd46ca26953a118bb75e3e3ab80be5
-MISC ChangeLog 24401 RMD160 072ee03c01f45df3dfce606908ac0c62a76fbf1e SHA1 c94654d429f03452905b29a5e75b0d6e7a9d153d SHA256 b51ed710c534134b7fb3b9426308117b5f10fba09e56d9798d7c32272d4f67e4
+MISC ChangeLog 24691 RMD160 798ffadfae8267089d4cf38d670ed83be406a6ba SHA1 313137b99dc62444f6a53cfc279769cc13974d12 SHA256 7553df9f22892ea01fa8f2cd4e46716d1e482980b34cf3f3a22179567977f79b
 MISC metadata.xml 291 RMD160 2226a820b502bdd20583331e1601bb9cd04f96be SHA1 f5d19f3ae1f337179858f1818fc195a20ad7e4d9 SHA256 5a3c7fa667eaf9da2744f966afc82db0a4a45cc642157b8224104f17bdb4af5c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9yYwMACgkQdjK8w9WeBnCASQEAt7LAcVBPWHD+LkDMzcM9azK4
-ugDfJeExwdtgUxPDEXEA/jmy/2z75Y9oHMkyB4S7QATQ5QWvczFzTfwEht0/qTzK
-=bb30
+iF4EAREIAAYFAk+IP04ACgkQdjK8w9WeBnBsrgEApBhsW5cc2HgeWvvMwd8sUJag
+91LlhazYaMpCFiiddt0BALfQrTykwNnw6JyTMYCMPqVGvHuLfvex7THXelX9d0u1
+=Iu0y
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch b/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch
new file mode 100644
index 000000000000..fa0adf54ad04
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch
@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: [PATCH] gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
++++ b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+1.7.8.5
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch b/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch
new file mode 100644
index 000000000000..55376b59d829
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch
@@ -0,0 +1,28 @@
+From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001
+From: Ivan Stankovic <ivan.stankovic@avl.com>
+Date: Tue, 21 Feb 2012 12:24:58 +0100
+Subject: [PATCH] Fix set_qdata warning on accessing NULL gobject property
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661155
+---
+ gobject/pygobject.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/gobject/pygobject.c b/gobject/pygobject.c
+index 6c2f06c..70dc89a 100644
+--- a/gobject/pygobject.c
++++ b/gobject/pygobject.c
+@@ -991,7 +991,9 @@ pygobject_new(GObject *obj)
+ PyObject *
+ pygobject_new_sunk(GObject *obj)
+ {
+-    g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
++    if (obj)
++       g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
++       
+     return pygobject_new_full(obj, TRUE, NULL);
+ }
+ 
+-- 
+1.7.8.5
+
diff --git a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild b/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
new file mode 100644
index 000000000000..6395785ae250
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
@@ -0,0 +1,142 @@
+# 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.1 2012/04/13 14:59:21 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+SUPPORT_PYTHON_ABIS="1"
+# pygobject is partially incompatible with Python 3.
+# PYTHON_DEPEND="2:2.6 3:3.1"
+# RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
+PYTHON_DEPEND="2:2.6"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
+
+# XXX: Is the alternatives stuff needed anymore?
+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 ~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"
+# FIXME: tests require introspection support, but we can't enable introspection,
+# or we get file collisions with slot 3 :/
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
+	libffi? ( virtual/libffi )"
+DEPEND="${COMMON_DEPEND}
+	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"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13"
+# Use slot 3 for introspection support per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9);
+# keep introspection USE flag in slot 2 for backward compatibility for now.
+PDEPEND="introspection? ( dev-python/pygobject:3 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+	# --disable-introspection and --disable-cairo because we use pygobject:3
+	# for introspection support
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-introspection
+		--disable-cairo
+		$(use_enable doc docs)
+		$(use_with libffi ffi)"
+	python_pkg_setup
+}
+
+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}/${PN}-2.28.3-disable-failing-tests.patch"
+
+	# Fix warning spam
+	epatch "${FILESDIR}/${P}-set_qdata.patch"
+	epatch "${FILESDIR}/${P}-gio-types-2.32.patch"
+
+	python_clean_py-compile_files
+
+	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() {
+	[[ -z ${ED} ]] && local ED="${D}"
+	installation() {
+		gnome2_src_install
+		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
+		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
+	}
+	python_execute_function -s installation
+
+	python_clean_installation_image
+
+	sed "s:/usr/bin/python:/usr/bin/python2:" \
+		-i "${ED}"/usr/bin/pygobject-codegen-2.0 \
+		|| die "Fix usage of python interpreter"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+
+	python_mod_optimize glib gobject gtk-2.0 pygtk.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup glib gobject gtk-2.0 pygtk.py
+
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+}