Bump revision of dbus-glib

4 files changed, 144 insertions, 0 deletions

diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 673a751..8346f1b 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,5 +1,9 @@
+AUX dbus-glib-0.78-as-needed.patch 679 RMD160 1b7b79ee9d8b1cf523347fd2f8ba9eb3422483eb SHA1 ed3e11ae9b408251cd7278e920f2b8f33a5bb184 SHA256 24a4da61345087c93bf7d30599636caaed071ea9718e664a4ddffb68eb4ab475
+AUX dbus-glib-0.78-fix-building-tests.patch 2147 RMD160 687c46cfdb0fe0962092bd59b3847683e67a741f SHA1 28cb30a61eb7e3fe34ab41254e72ac735bd6fc2f SHA256 332fc34bb08e6a42216126a5cbe9d0e1af61d98b418c89116f2868fb7b1042fb
 AUX dbus-glib-configurable-examples.patch 2117 RMD160 cd51f89e777bb8d39e3a96aafa7262211dc1c743 SHA1 3f35b4d59d1eca660607fa703185e1e63760a103 SHA256 0267eca8112680b3751b4a213c6c57038ec413e44e35c259d77a3ee35581575d
 AUX dbus-glib-crosscompile-dbus-binding-tool.patch 3731 RMD160 ec06673e07c29fb08e524e07724ffb705dd2857c SHA1 0af80b48f8da83ad20e83fb60f82f97c57ee7bcd SHA256 da0f54ee267d962ec3011bc20a5a9bad02b32d8dabbe9b368a41fa795b78e947
 AUX dbus-glib-introspection.patch 2572 RMD160 38798ef61f4145d48e16be64888c3bfb14cadf35 SHA1 8a6e76045ffc94b269b496df60988ed3b0b61849 SHA256 3c24232d968a1f60f26bf364a5f5ff140c82307f8696877996c8602a48c7984d
 DIST dbus-glib-0.76.tar.gz 667547 RMD160 d01b5ef85c3e2717495849fdf8378bcf16c07f31 SHA1 f7bfe7c394559bee12f0adfffd333304d471779a SHA256 8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3
+DIST dbus-glib-0.78.tar.gz 683454 RMD160 e63a4365b4ce4b2b4e00b63b616ea537412d1cfc SHA1 c9d74023f00642dd1040c2e6cc7fdfe91a0c593e SHA256 ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21
 EBUILD dbus-glib-0.76.ebuild 2098 RMD160 174d735a504786e8ee569ff1ef06b210e26071d7 SHA1 2c2d13e76e83d3e7e0fda67e97fe62734a4e5dbb SHA256 15751c40b754ac71ddb3a51a597f241afc0cf1126a8c78c82a673813f0ffb712
+EBUILD dbus-glib-0.78.ebuild 1814 RMD160 cfb058cf51f14974df45510cedf2a5ab6328e093 SHA1 a5872e8d0f4af189cdea333c564c84f36cff9c8c SHA256 9161a443319cff81232893b716ccede0ad052e84d751d56912b35e17b4fd45f0
diff --git a/dev-libs/dbus-glib/dbus-glib-0.78.ebuild b/dev-libs/dbus-glib/dbus-glib-0.78.ebuild
new file mode 100644
index 0000000..8a96b8c
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.78.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 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.78.ebuild,v 1.4 2009/01/18 20:34:47 eva Exp $
+
+inherit eutils multilib autotools bash-completion
+
+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="bash-completion debug doc test"
+
+RDEPEND=">=sys-apps/dbus-1.1.0
+	>=dev-libs/glib-2.10
+	>=dev-libs/expat-1.95.8"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext
+	doc? (
+		app-doc/doxygen
+		app-text/xmlto
+		>=dev-util/gtk-doc-1.4 )
+	dev-util/gtk-doc-am"
+
+BASH_COMPLETION_NAME="dbus"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-introspection.patch
+
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	# submitted upstream to bug #19325
+	epatch "${FILESDIR}"/${P}-fix-building-tests.patch
+
+	epatch "${FILESDIR}/${PN}-crosscompile-dbus-binding-tool.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable bash-completion) \
+		$(use_enable debug verbose-mode) \
+		$(use_enable debug checks) \
+		$(use_enable debug asserts) \
+		$(use_enable test tests) \
+		$(use_with test test-socket-dir "${T}"/dbus-test-socket) \
+		--localstatedir=/var \
+		$(use_enable doc doxygen-docs) \
+		$(use_enable doc gtk-doc)
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README
+
+	#FIXME: We need --with-bash-completion-dir
+	if use bash-completion ; then
+		dobashcompletion "${D}"/etc/profile.d/dbus-bash-completion.sh
+		rm -rf "${D}"/etc/profile.d
+	fi
+}
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch b/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch
new file mode 100644
index 0000000..b7b2408
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.78-as-needed.patch
@@ -0,0 +1,12 @@
+diff -ur dbus-glib-0.78.orig/dbus/Makefile.am dbus-glib-0.78/dbus/Makefile.am
+--- dbus-glib-0.78.orig/dbus/Makefile.am	2008-12-23 15:55:22.000000000 +0100
++++ dbus-glib-0.78/dbus/Makefile.am	2008-12-23 15:55:57.000000000 +0100
+@@ -104,7 +104,7 @@
+ 
+ dbus_bash_completion_helper_SOURCES =                 	\
+ 	dbus-bash-completion-helper.c
+-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la
++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la -lexpat libdbus-glib-1.la
+ 
+ 
+ EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch b/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch
new file mode 100644
index 0000000..081c9da
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch
@@ -0,0 +1,58 @@
+From 0cec05aa65a4803b0217f35af539ee2369903364 Mon Sep 17 00:00:00 2001
+From: Doug Goldstein <cardoe@gentoo.org>
+Date: Tue, 30 Dec 2008 14:10:15 -0500
+Subject: [PATCH] fix building of tests
+
+Fix parallel make issues when building tests. Additionally fixes
+potential cases where the test can be built against the system copy
+instead of the currently building copy of libdbus-glib. Fix convenience
+library linking against expat so it builds.
+
+Signed-off-by: Doug Goldstein <cardoe@gentoo.org>
+---
+ dbus/Makefile.am |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index 5998587..c6c9ebf 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -72,7 +72,7 @@ libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \
+ 	dbus-gparser.c				\
+ 	dbus-gparser.h
+ 
+-libdbus_gtool_la_LIBADD = $(DBUS_LIBS) 
++libdbus_gtool_la_LIBADD = $(DBUS_LIBS) -lexpat
+ 
+ bin_PROGRAMS=dbus-binding-tool
+ 
+@@ -82,7 +82,7 @@ dbus_binding_tool_SOURCES =			\
+ 	dbus-glib-tool.h			\
+ 	dbus-glib-tool.c
+ 
+-dbus_binding_tool_LDADD= libdbus-gtool.la libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat
++dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat
+ 
+ ## we just rebuilt these manually and check them into cvs; easier than
+ ## convincing automake/make to do this properly
+@@ -104,7 +104,7 @@ CLEANFILES += dbus-bash-completion.sh
+ 
+ dbus_bash_completion_helper_SOURCES =                 	\
+ 	dbus-bash-completion-helper.c
+-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la -lexpat libdbus-glib-1.la
++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la
+ 
+ 
+ EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
+@@ -126,7 +126,7 @@ TESTS=dbus-glib-test
+ dbus_glib_test_SOURCES=			\
+ 	dbus-gtest-main.c
+ 
+-dbus_glib_test_LDADD= $(top_builddir)/dbus/libdbus-glib-1.la
++dbus_glib_test_LDADD= $(builddir)/libdbus-glib-1.la
+ 
+ else
+ ### not building tests
+-- 
+1.6.0.6
+