Cross-compile fixes for dbus-glib:

    - check if a callable dbus-binding-tool is install on the host
    - use the host version of the dbus-binding-tool in the PATH

2 files changed, 79 insertions, 0 deletions

diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index b918c46..1bb61cf 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -3,4 +3,6 @@ AUX dbus-glib-configurable-examples.patch 2117 RMD160 cd51f89e777bb8d39e3a96aafa
 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.80.tar.gz 688789 RMD160 802dcdc4b7c7a8805b051b7bedf44022fece27d2 SHA1 927e43f2d429cff5472ab726882347ec06e53f6b SHA256 b5330b91b3131757103da2b3147e211e71214475f5d77640022ea9bb587f645b
+DIST dbus-glib-0.82.tar.gz 674953 RMD160 570664552de2d455ca4aa27144243be3974e7d77 SHA1 8ad09cf13810382048a685bcafc72f252b2539a8 SHA256 ddfb062797341b5c5a22555ffe80138953cc61a67ba805647b2746f519bfbde1
 EBUILD dbus-glib-0.80.ebuild 1872 RMD160 58a4b10a02e9722deff893c8029eaf7d51dcc8f1 SHA1 6370f9a5be934a1c1bc39eb3475edb36e198e79c SHA256 90ac0d9d62ac0a39e0671319548218a4a67c0c2196b4c5a84b4724b150406fde
+EBUILD dbus-glib-0.82.ebuild 2178 RMD160 80c91d699f4c4459909a831e228181f4be3ec6ab SHA1 4814bdada02e8dddfaed7fd2f3682f48fee7d016 SHA256 23f39145c238c3ec24575fa72d6008fc10f73f31f93fec68c0018add612ef984
diff --git a/dev-libs/dbus-glib/dbus-glib-0.82.ebuild b/dev-libs/dbus-glib/dbus-glib-0.82.ebuild
new file mode 100644
index 0000000..9e63436
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.82.ebuild
@@ -0,0 +1,77 @@
+# 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.82.ebuild,v 1.1 2009/11/07 20:00:54 eva Exp $
+
+EAPI="2"
+
+inherit eutils 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
+	>=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 )"
+
+BASH_COMPLETION_NAME="dbus"
+
+pkg_setup() {
+	# We need a dbus-binding-tool installed on the host for cross-compilation.
+	# So check if we have it in the path and can call it right at the beginning...
+	if tc-is-cross-compiler ; then
+		dbus-binding-tool --version >/dev/null 2>&1
+		[[ "$?" != "0" ]] && die "Cross-compilation requires a dbus-binding-tool on the host. Please emerge dbus-glib to your host!"
+	fi
+}
+
+src_prepare() {
+	# description ?
+	epatch "${FILESDIR}"/${PN}-introspection.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	# For cross-compilation we need the host dbus-binding-tool
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} \
+				--with-dbus-binding-tool=dbus-binding-tool"
+	fi
+
+	econf \
+		--localstatedir=/var \
+		$(use_enable bash-completion) \
+		$(use_enable debug verbose-mode) \
+		$(use_enable debug checks) \
+		$(use_enable debug asserts) \
+		$(use_enable doc doxygen-docs) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable test tests) \
+		$(use_with test test-socket-dir "${T}"/dbus-test-socket) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README || die "dodoc failed."
+
+	# FIXME: We need --with-bash-completion-dir
+	if use bash-completion ; then
+		dobashcompletion "${D}"/etc/bash_completion.d/dbus-bash-completion.sh
+		rm -rf "${D}"/etc/bash_completion.d || die "rm failed"
+	fi
+}