Add variant fixes, needed for pygobject-2.28.4

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 112 insertions, 15 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index 5030b1fab236..929ab06bea16 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/gobject-introspection
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.25 2011/04/04 20:48:55 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.26 2011/04/19 08:52:22 nirbheek Exp $
+
+*gobject-introspection-0.10.7-r1 (19 Apr 2011)
+
+  19 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gobject-introspection-0.10.7-r1.ebuild,
+  +files/gobject-introspection-0.10.7-fix-g-variant-new.patch:
+  Add variant fixes, needed for pygobject-2.28.4
 
 *gobject-introspection-0.10.7 (04 Apr 2011)
 
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index f95b97623e72..9606438db83d 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gobject-introspection-0.10.7-fix-g-variant-new.patch 648 RMD160 2e36dbf225c69eaa85849b008be154e8ec9c4bdb SHA1 238d967082a3f8ea6d6ca061fe8fbd8d01502086 SHA256 42669c4c7ff188c5aa38fc9f38a7004e9bfb3d6f8cdd67b453008fe51a57639f
 DIST gobject-introspection-0.10.2.tar.bz2 1080055 RMD160 6bc96538b6001984f86171f7c0b9f6fd5ec3b017 SHA1 8397ee1beefdb088423e04456be4c8f7f4ec646a SHA256 5b98baef0823e0d0cf9fa008047d76303aa5582c0ae89d86346b4598c636b1a1
 DIST gobject-introspection-0.10.6.tar.bz2 1103790 RMD160 16e6325ea27a49b9adcd635da62bc5aaf1de43e4 SHA1 df724aaa40f945c2519099a5594c66c91085e150 SHA256 5a72ec875c5d6e9714912bdfed2761903f994e9c5dae841add755b449e014583
 DIST gobject-introspection-0.10.7.tar.bz2 1146112 RMD160 73e7e3f51cabbc6525eeceeeaf757386a7add6cd SHA1 9b0feea4db5318a6f6b954180f20635149757993 SHA256 a20a0e28f4dfb770f05718eb25d20055c853f2b041f03802008bd2040d13cb57
 EBUILD gobject-introspection-0.10.2.ebuild 1437 RMD160 16696977ccabf54d718a32f3b01b4d98ac074b81 SHA1 9e5b43b65f5d459830e84d7a1c6c2d9feb533c46 SHA256 b5b523e670280348e08aab493949189a8cb77e82ad0870d835cf13739751afa5
 EBUILD gobject-introspection-0.10.6.ebuild 1449 RMD160 2ba27d59698ed5c75195ad9770ce7f2fd9219993 SHA1 c93b63ea61b70dbbcdeb70787ed0e16fa51b9a84 SHA256 daff3050e78883bace2c98be9eaa7a495b880b6ad9bc2590c50cf9d180afe3c2
+EBUILD gobject-introspection-0.10.7-r1.ebuild 1615 RMD160 317acc036764edd7f73a2832969b6f077c859ad3 SHA1 6237fa0dbf708ffc049adfca054c8035fa971637 SHA256 0d8ead3e8088425b497f6c48ce16401a22943d51e58514778b7b20775b1f7405
 EBUILD gobject-introspection-0.10.7.ebuild 1449 RMD160 61d740d90a15aa256319ad1ff7c0aec7f142a385 SHA1 988f0526f0d4eb2ce890458bc9c0229451bd4231 SHA256 0d4c28bc31763ba5470c58a8bb3575160c895eca18d5682f4b3508b428659f91
-MISC ChangeLog 5220 RMD160 a102445d5517100fa36f888f13e0ad2bf9cc32b5 SHA1 f788dea0e017181b513ebf4fa41b62dc9234230c SHA256 b8fd22ac11decc587f7595ec6ebdc6ea2437e250a25ff83362bc67ecf6112ec7
+MISC ChangeLog 5478 RMD160 4801aea141f386cbb6b224ffcec8c5cae2fddce9 SHA1 c6572d5e9429b21b4a2995eebb077d8740fdd680 SHA256 8f4609d9ad2fb72510351d04b4e3665fd647f7f9562213f69f5327b36de6ea9c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNmi6zAAoJEO/kOhxWD91k0fwQAJQm3Z9cvBZc6WFMBXhZDYVo
-AZWa+Rv12D0XZ1aPiYGQHlO5LXw5A9HNVuHwnjebdtsxS+DmPkxkLeqdZTiY/1R6
-e+5Na9aKRLeXGcD5axPXcXw6vaKIpaj6FNt/z4h1gHEZYUu8lLi55St2Vt6jqg04
-koj42nxy0uYe8zEzq0OzIFgcqtgrFB+pIenYuDH7/IRrq6nAAs+Boi3H0UlUbOlw
-Rj7N5Mw/WEw0q0jKxrYL2bBOC62wOwaSoudyzb47sE+4vccTYc4wj/9DEPQOtMum
-Lj372wdJmoSeW3piosA49zZYfN6vTQq9GKI3LW1Ol3mp6eDNs2aDRlevJfabYmlz
-Y0d5yv9NiaOjzcyHjY+A0k86MO6wBc2jXJ8KoVWits3MdMuKQPqJt6H9dGJKKOWK
-DkXnGi/QaVgkK0PSZ3c6qzLsRT0wf7g0DlDPARVFyV5V2pqiZ49Nsr4wI+p8ZCGJ
-Ee2m3yMBPGmIYNixd4fT9lJSwxOd18j7XaoiHyXlcPJoaE71xNbETqWw8ClityZ7
-88azs5n4tAyI6jsiARdOxkB8DwUL8bYF8Y8RO9QlzauPaGBq13/2TIWvPV/YnRdB
-OLUJJnbkQtS7MTT0kTYsu5ue+CN5a4tTJ+H+3S1m78EHIvITq7TaI7CtrH8GYbjy
-1YC3ASKNb7zyL7RH+ikI
-=oBYg
+iQIcBAEBAgAGBQJNrU1MAAoJEO/kOhxWD91kmtAP/0Y5c7YkR6u4XQNbC4HtR44R
+CibkPyDCVWux1z9mkmuioLmK2LjSeXyT01C3+VRjMscrrvRfOs2lpIU/MOPlEfkb
+OxYwqvWHB2lrRKtp0Ilq9/KGO6lPpDOjD7+iXkIFwORYxz80/Fh1oyuM0LTmKFIY
+Oxd0DX3+JEpPYlaNezAxzQphLu31Pn07ecHZpm/e/O32jBvbW3SQuxE5smDj/SGH
+KeT6dEPlssH42hY4QHP/YUZiTgdsOsGiCBRiFGNJ0b2kcJfKbaQvPiRe2lIkTOc6
+WtNTUnLZyUf4fYkq8DbSPO88SlkDEwpxdrW0G7AwSQOTgdedoTOnOwkrljVZamHK
+xQ7DQpRkgPBawy9/0esKy2bdEs21htSAxt5Z+5P6cnxRd95SKo1W3pir78Mp0z2I
+8wraeHYTJU34McqjXu0/nkFlFnFxDquxsTfhw8f+mHI9pRZbvnaKhVmSiI7uILMB
+NEMJDcpDbfKUkAD9HLelXD3D6ytAZ9whoorY4holVlMZicW9Pzi9ZJe8/ffeOrsG
+hdrpmpLU3uHPtDQCJMiNYk2JpvO0vz140UoPBeh3ryRf3NJtw6/+XDooIr4bA+6+
+fmztODI/tTa2rYDBR7DOVAA7P7Qc7OY5uTw4c2mOFTMilJhxT7YfAFKRk5gW8uAs
+Ta5pjYa4LI36/Lym0l4N
+=dil7
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-0.10.7-fix-g-variant-new.patch b/dev-libs/gobject-introspection/files/gobject-introspection-0.10.7-fix-g-variant-new.patch
new file mode 100644
index 000000000000..b05f8ce79cb3
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-0.10.7-fix-g-variant-new.patch
@@ -0,0 +1,26 @@
+From 29612b2d322ee5d04118e23a67fa2d2c9f0389a7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pölsterl <sebp@k-d-w.org>
+Date: Thu, 14 Apr 2011 17:12:42 +0000
+Subject: glib-2.0.c: Added annotation for g_variant_new_variant to mark it as constructor
+
+https://bugzilla.gnome.org/show_bug.cgi?id=647796
+---
+diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
+index 3782db3..f8f4234 100644
+--- a/gir/glib-2.0.c
++++ b/gir/glib-2.0.c
+@@ -211,6 +211,12 @@
+  */
+ 
+ /**
++ * g_variant_new_variant: (constructor)
++ * @value:
++ * @returns:
++ */
++
++/**
+  * g_variant_get_strv:
+  * @length: (allow-none):
+  * @returns: (array length=length) (transfer container):
+--
+cgit v0.9
diff --git a/dev-libs/gobject-introspection/gobject-introspection-0.10.7-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-0.10.7-r1.ebuild
new file mode 100644
index 000000000000..f6f97bbb0585
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-0.10.7-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-0.10.7-r1.ebuild,v 1.1 2011/04/19 08:52:22 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.5"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="Introspection infrastructure for gobject library bindings"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/glib-2.24:2
+	virtual/libffi"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/flex
+	doc? ( >=dev-util/gtk-doc-1.12 )
+	test? ( x11-libs/cairo )"
+
+pkg_setup() {
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable test tests)"
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# FIXME: Parallel compilation failure with USE=doc
+	use doc && MAKEOPTS="-j1"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=647796
+	# Taken from upstream master, remove next release
+	epatch "${FILESDIR}/${P}-fix-g-variant-new.patch"
+
+	# Don't pre-compile .py
+	ln -sf $(type -P true) py-compile
+}
+
+src_install() {
+	gnome2_src_install
+	python_convert_shebangs 2 "${ED}"usr/bin/g-ir-scanner
+	python_convert_shebangs 2 "${ED}"usr/bin/g-ir-annotation-tool
+	find "${ED}" -name "*.la" -delete || die "la files removal failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/${PN}/giscanner
+	python_need_rebuild
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib*/${PN}/giscanner
+}