add namespace support

Package-Manager: portage-2.1.5_rc2

4 files changed, 153 insertions, 2 deletions

diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog
index 52f4b407f213..e7082c52efed 100644
--- a/dev-libs/dbus-glib/ChangeLog
+++ b/dev-libs/dbus-glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/dbus-glib
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.35 2008/02/29 05:38:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.36 2008/04/22 02:54:54 compnerd Exp $
+
+*dbus-glib-0.74-r1 (22 Apr 2008)
+
+  22 Apr 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/dbus-glib-0.73-namespaces.patch, +dbus-glib-0.74-r1.ebuild:
+  Add patch for namespace support in dbus-binding-tool
 
   29 Feb 2008; Jeroen Roovers <jer@gentoo.org> dbus-glib-0.74.ebuild:
   Stable for HPPA (bug #208917).
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 194e59adff8e..b89c18c213d9 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,9 +1,11 @@
+AUX dbus-glib-0.73-namespaces.patch 2860 RMD160 09626272912e371370c96918c67917428a8a091c SHA1 f0b6d2daf09e401cae3f43707dd0d9307a6adc26 SHA256 6ee75ddee4a5abfa6f3ca829c5f0bee6709b7817b7a6f34096483bc087421c9d
 AUX dbus-glib-introspection.patch 2572 RMD160 38798ef61f4145d48e16be64888c3bfb14cadf35 SHA1 8a6e76045ffc94b269b496df60988ed3b0b61849 SHA256 3c24232d968a1f60f26bf364a5f5ff140c82307f8696877996c8602a48c7984d
 DIST dbus-glib-0.72.tar.gz 637430 RMD160 0422160eaaece14259f6d465f85da6890dbda751 SHA1 78dc27362df25ec5867a63a3287abda648bd4e82 SHA256 bc80a1933a77fc4cb47716d06aec3c2181976879ba771888af8b644086f24210
 DIST dbus-glib-0.73.tar.gz 644223 RMD160 34e831d24667c776a3ba1c7ab92ffc1eb9a8b654 SHA1 31ad5dc7bed3111c1d21d9e9b53744a25c3e3556 SHA256 d6d7f91039c6b22ebf7ab22cec8c3275490b1f3f45235a333f9560631794cd92
 DIST dbus-glib-0.74.tar.gz 654853 RMD160 0a78b138bfe1dbdfee0d7fbebcbe701c63511a86 SHA1 ea8a1c9269fe6b5f63e6571a2c8a537a558f0211 SHA256 e870d8cd619834eda066e37fe69b441d629f9ad3a871ef2854fbbcd753b3abe2
 EBUILD dbus-glib-0.72.ebuild 1664 RMD160 727632b0686557c2b2e879dfeac73db184644739 SHA1 f044f554f06bf4f811160f463351973535b0b296 SHA256 5fa67e33160bbaa2ebedf5d18799bf912ec516cdf38f7ee9e8d4ba714d3f3f96
 EBUILD dbus-glib-0.73.ebuild 1669 RMD160 5903a001d51f0abb7e21738d4a5d9ab5af78cf2b SHA1 96f73e2dd9477fd2816ae3ae6b7dcc13cabf1482 SHA256 4a02cc38687a57107767e5ea0aeebae7d9f0eb04474181aa8aca52873a793754
+EBUILD dbus-glib-0.74-r1.ebuild 1735 RMD160 703ffca5378fd580275716efca26737ed1f715fc SHA1 afe4b4ab57cb9acfe7d2331bc13c554b53490edc SHA256 6fa753964caf5bc0941527386981cc4bc7eaa1e15b02ac2d2e7e28a38419d3d4
 EBUILD dbus-glib-0.74.ebuild 1669 RMD160 e4c2c5d392b5c26a59e9c9b1a56a6ff5199a2702 SHA1 4a1e07c70efaff4e4a1eacf6005f037924735339 SHA256 72a05ed580d26f7b19f3d25111e513f799b4d66a952137c092ea5642212dbb6e
-MISC ChangeLog 4229 RMD160 f5386a4e8aeae9574a8ddf0cceef938d79364243 SHA1 3aaae8200b2f40069474ae5030963229279aab89 SHA256 0d1aa48d0c45e17745fbaae0a7cc9a784c99c0d5e3f9383a2d63ef01366653b3
+MISC ChangeLog 4449 RMD160 a5ce2ef4c18d119811047912e6f2dbb9c64aeade SHA1 69b6aa7084f4f311bc368e5f5eca3ec9c386acc9 SHA256 d5b19204b8f39185e25bc75e079800b184e6c90d0dc5e831b8c85b0494520145
 MISC metadata.xml 282 RMD160 6780744b78e69d1fae59ae400753ee1cd26dd36e SHA1 695ff9872a5496c7c0f1e33b294578856810f5d7 SHA256 2d2a06940a1d457df1f9d52ddad536246f9d9aad667c1df181eda4ee2554eb2a
diff --git a/dev-libs/dbus-glib/dbus-glib-0.74-r1.ebuild b/dev-libs/dbus-glib/dbus-glib-0.74-r1.ebuild
new file mode 100644
index 000000000000..da467623327c
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.74-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.74-r1.ebuild,v 1.1 2008/04/22 02:54:54 compnerd Exp $
+
+inherit eutils multilib autotools
+
+DESCRIPTION="D-Bus bindings for glib"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc selinux debug"
+
+RDEPEND=">=sys-apps/dbus-0.94
+	>=dev-libs/glib-2.6
+	selinux? ( sys-libs/libselinux )
+	>=dev-libs/libxml2-2.6.21"
+	# expat code now sucks.. libxml2 is the default
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen app-text/xmlto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-introspection.patch
+	epatch "${FILESDIR}/${PN}-0.73-namespaces.patch"
+}
+
+src_compile() {
+	local myconf=""
+
+	econf \
+		$(use_enable selinux) \
+		$(use_enable debug verbose-mode) \
+		$(use_enable debug checks) \
+		$(use_enable debug asserts) \
+		--with-xml=libxml \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-system-socket=/var/run/dbus/system_bus_socket \
+		--with-session-socket-dir=/tmp \
+		--with-dbus-user=messagebus \
+		--localstatedir=/var \
+		$(use_enable doc doxygen-docs) \
+		--disable-xml-docs \
+		${myconf} \
+		|| die "econf failed"
+
+	# after the compile, it uses a selinuxfs interface to
+	# check if the SELinux policy has the right support
+	use selinux && addwrite /selinux/access
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README
+}
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.73-namespaces.patch b/dev-libs/dbus-glib/files/dbus-glib-0.73-namespaces.patch
new file mode 100644
index 000000000000..53bc4eb33e46
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.73-namespaces.patch
@@ -0,0 +1,81 @@
+--- dbus/dbus-gparser.c	2006-09-27 08:27:24.000000000 -0400
++++ dbus/dbus-gparser.c	2008-03-13 08:54:14.000000000 -0400
+@@ -128,13 +128,17 @@ locate_attributes (const char  *element_
+ 
+       if (!found)
+         {
+-          g_set_error (error,
+-                       G_MARKUP_ERROR,
+-                       G_MARKUP_ERROR_PARSE,
+-                       _("Attribute \"%s\" is invalid on <%s> element in this context"),
+-                       attribute_names[i], element_name);
+-          retval = FALSE;
+-          goto out;
++          /* We want to passthrough namespaced XML nodes that we don't know anything about. */
++          if (strchr (attribute_names[i], ':') == NULL)
++            {
++              g_set_error (error,
++                           G_MARKUP_ERROR,
++                           G_MARKUP_ERROR_PARSE,
++                           _("Attribute \"%s\" is invalid on <%s> element in this context"),
++                           attribute_names[i], element_name);
++              retval = FALSE;
++              goto out;
++            }
+         }
+ 
+       ++i;
+@@ -177,6 +181,7 @@ struct Parser
+   PropertyInfo *property;
+   ArgInfo *arg;
+   gboolean in_annotation;
++  guint unknown_namespaced_depth;
+ };
+ 
+ Parser*
+@@ -791,10 +796,14 @@ parser_start_element (Parser      *parse
+     }
+   else
+     {
+-      g_set_error (error, G_MARKUP_ERROR,
+-                   G_MARKUP_ERROR_PARSE,
+-                   _("Element <%s> not recognized"),
+-                   element_name);
++      if (strchr (element_name, ':') != NULL)
++        /* Passthrough XML-namespaced nodes */
++        parser->unknown_namespaced_depth += 1;
++      else if (parser->unknown_namespaced_depth == 0)
++        g_set_error (error, G_MARKUP_ERROR,
++                     G_MARKUP_ERROR_PARSE,
++                     _("Element <%s> not recognized"),
++                     element_name);
+     }
+   
+   return TRUE;
+@@ -844,6 +853,15 @@ parser_end_element (Parser      *parser,
+       if (parser->node_stack == NULL)
+         parser->result = top; /* We are done, store the result */      
+     }
++  else if (strchr (element_name, ':') != NULL)
++    {
++      /* Passthrough XML-namespaced nodes */
++      parser->unknown_namespaced_depth -= 1;
++    }
++  else if (parser->unknown_namespaced_depth > 0)
++    {
++		/* pass through unknown elements underneath a namespace */
++    }
+   else
+     g_assert_not_reached (); /* should have had an error on start_element */
+   
+--- dbus/dbus-glib-tool.c	2008-03-13 08:31:21.000000000 -0400
++++ dbus/dbus-glib-tool.c	2008-03-13 08:32:15.000000000 -0400
+@@ -414,7 +414,7 @@ main (int argc, char **argv)
+                                          &error);
+       if (node == NULL)
+         {
+-	  lose_gerror (_("Unable to load \"%s\""), error);
++	  lose (_("Unable to load \"%s\": %s"), filename, error->message);
+         }
+       else
+ 	{