[gentoo-commits] proj/gnome:master commit in: dev-libs/gobject-introspection/files/, dev-libs/gobject-introspection/, ...

[Nirbheek Chauhan]

commit:     9157c2fd3385e3a7d95af29a830428d583e655aa
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 17:02:58 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 17:02:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9157c2fd

dev-libs/gobject-introspection: new version released in the tree

* Bump networkmanager's dependency on gobject-introspection

---
 ...on-0.10.2-fix-lookup-of-cached-type-nodes.patch |   82 --------------------
 .../gobject-introspection-0.10.2-r1.ebuild         |   62 ---------------
 net-misc/networkmanager/networkmanager-9999.ebuild |    4 +-
 3 files changed, 2 insertions(+), 146 deletions(-)

diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-0.10.2-fix-lookup-of-cached-type-nodes.patch b/dev-libs/gobject-introspection/files/gobject-introspection-0.10.2-fix-lookup-of-cached-type-nodes.patch
deleted file mode 100644
index b828a12..0000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-0.10.2-fix-lookup-of-cached-type-nodes.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7829831776c921891122d29e2461fbc1f11f71f1 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@×××××××××.org>
-Date: Fri, 18 Feb 2011 18:14:25 +0100
-Subject: [PATCH] GIrNode: fix lookup of cached type nodes
-
-Different types of array have different type nodes, so they should
-produce different keys in the cache of already seen type nodes, to
-avoid turning a GByteArray into a reference to a GPtrArray.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=642300
----
- girepository/girnode.c |   45 ++++++++++++++++++++++++++++++++++-----------
- 1 files changed, 34 insertions(+), 11 deletions(-)
-
-diff --git a/girepository/girnode.c b/girepository/girnode.c
-index fe45503..fe10e54 100644
---- a/girepository/girnode.c
-+++ b/girepository/girnode.c
-@@ -1227,19 +1227,42 @@ serialize_type (GIrTypelibBuild    *build,
-     }
-   else if (node->tag == GI_TYPE_TAG_ARRAY)
-     {
--      serialize_type (build, node->parameter_type1, str);
--      g_string_append (str, "[");
-+      if (node->array_type == GI_ARRAY_TYPE_C)
-+	{
-+	  serialize_type (build, node->parameter_type1, str);
-+	  g_string_append (str, "[");
- 
--      if (node->has_length)
--	g_string_append_printf (str, "length=%d", node->length);
--      else if (node->has_size)
--        g_string_append_printf (str, "fixed-size=%d", node->size);
-+	  if (node->has_length)
-+	    g_string_append_printf (str, "length=%d", node->length);
-+	  else if (node->has_size)
-+	    g_string_append_printf (str, "fixed-size=%d", node->size);
- 
--      if (node->zero_terminated)
--	g_string_append_printf (str, "%szero-terminated=1",
--				node->has_length ? "," : "");
-+	  if (node->zero_terminated)
-+	    g_string_append_printf (str, "%szero-terminated=1",
-+				    node->has_length ? "," : "");
- 
--      g_string_append (str, "]");
-+	  g_string_append (str, "]");
-+	}
-+      else if (node->array_type == GI_ARRAY_TYPE_BYTE_ARRAY)
-+	{
-+	  /* We on purpose skip serializing parameter_type1, which should
-+	     always be void*
-+	  */
-+	  g_string_append (str, "GByteArray");
-+	}
-+      else
-+	{
-+	  if (node->array_type == GI_ARRAY_TYPE_ARRAY)
-+	    g_string_append (str, "GArray");
-+	  else
-+	    g_string_append (str, "GPtrArray");
-+	  if (node->parameter_type1)
-+	    {
-+	      g_string_append (str, "<");
-+	      serialize_type (build, node->parameter_type1, str);
-+	      g_string_append (str, ">");
-+	    }
-+	}
-     }
-   else if (node->tag == GI_TYPE_TAG_INTERFACE)
-     {
-@@ -1284,7 +1307,7 @@ serialize_type (GIrTypelibBuild    *build,
-     }
-   else if (node->tag == GI_TYPE_TAG_GHASH)
-     {
--      g_string_append (str, "GHashTable<");
-+      g_string_append (str, "GHashTable");
-       if (node->parameter_type1)
- 	{
- 	  g_string_append (str, "<");
--- 
-1.7.4
\ No newline at end of file

diff --git a/dev-libs/gobject-introspection/gobject-introspection-0.10.2-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-0.10.2-r1.ebuild
deleted file mode 100644
index 7d016d5..0000000
--- a/dev-libs/gobject-introspection/gobject-introspection-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.2.ebuild,v 1.1 2011/02/08 09:54:03 pacho 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"
-
-	# Don't pre-compile .py
-	ln -sf $(type -P true) py-compile
-
-	# Fix https://bugzilla.gnome.org/show_bug.cgi?id=642300
-	# causes problems with binding NMConnection from latest NM trunk
-	epatch "${FILESDIR}/${P}-fix-lookup-of-cached-type-nodes.patch"
-}
-
-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
-}

diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild
index 686bad1..eed1a6a 100644
--- a/net-misc/networkmanager/networkmanager-9999.ebuild
+++ b/net-misc/networkmanager/networkmanager-9999.ebuild
@@ -27,7 +27,7 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
-# gobject-introspection-0.10.2-r1 is needed due to gnome bug 642300
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
 RDEPEND=">=sys-apps/dbus-1.2
 	>=dev-libs/dbus-glib-0.75
 	>=net-wireless/wireless-tools-28_pre9
@@ -49,7 +49,7 @@ RDEPEND=">=sys-apps/dbus-1.2
 		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
 		!dhcpcd? ( net-misc/dhcp ) )
 	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.2-r1 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
 	resolvconf? ( net-dns/openresolv )
 	connection-sharing? (
 		net-dns/dnsmasq