[patch] patch against dbus-glib-0.100.2.ebuild

dbus-glib-0.100.2.ebuild.patch (text/plain), 3.03 KB, created by Christoph Junghans (RETIRED) on 2013-12-16 20:31:21 UTC

--- /usr/portage/dev-libs/dbus-glib/dbus-glib-0.100.2.ebuild	2013-03-05 02:31:08.000000000 -0700
+++ dbus-glib-0.100.2-r1.ebuild	2013-12-16 13:12:36.522094270 -0700
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100.2.ebuild,v 1.12 2013/03/05 09:12:15 ago Exp $
 
 EAPI=5
-inherit bash-completion-r1 eutils
+inherit bash-completion-r1 eutils multilib-minimal
 
 DESCRIPTION="D-Bus bindings for glib"
 HOMEPAGE="http://dbus.freedesktop.org/"
@@ -11,20 +11,28 @@
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc static-libs test"
 
-RDEPEND=">=dev-libs/expat-2
-	>=dev-libs/glib-2.26:2
-	>=sys-apps/dbus-1.6.2"
-DEPEND="${RDEPEND}
+CDEPEND=">=dev-libs/expat-2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.4 )"
+RDEPEND="${CDEPEND}
+	 abi_x86_32? (
+	 	!<=app-emulation/emul-linux-x86-baselibs-20131008-r6
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 
 # out of sources build directory
-BD=${WORKDIR}/${P}-build
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
+BUILD_DIR=${WORKDIR}/${P}-build
+
+set_TBD() {
+	# out of sources build dir for make check
+	export TBD="${BUILD_DIR}-tests"
+}
 
 src_prepare() {
 	# Fix testsuite, bug #356699 (fixed in git master)
@@ -34,22 +42,20 @@
 	cp "${FILESDIR}"/${PN}-0.100-dbus-glib-sections.txt doc/reference/dbus-glib-sections.txt || die
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf=(
 		--localstatedir="${EPREFIX}"/var
 		--enable-bash-completion
 		$(use_enable debug verbose-mode)
 		$(use_enable debug asserts)
 		$(use_enable static-libs static)
-		$(use_enable doc gtk-doc)
+		$(multilib_is_native_abi && use_enable doc gtk-doc || echo "--disable-doc")
 		)
 
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 
 	if use test; then
+		set_TBD
 		mkdir "${TBD}"
 		cd "${TBD}"
 		einfo "Running configure in ${TBD}"
@@ -62,29 +68,28 @@
 	fi
 }
 
-src_compile() {
-	cd "${BD}"
-	einfo "Running make in ${BD}"
+multilib_src_compile() {
 	emake
 
 	if use test; then
+		set_TBD
 		cd "${TBD}"
 		einfo "Running make in ${TBD}"
 		emake
 	fi
 }
 
-src_test() {
+multilib_src_test() {
+	set_TBD
 	cd "${TBD}"
 	emake check
 }
 
 src_install() {
 	# NEWS file is obsolete
-	dodoc AUTHORS ChangeLog HACKING README
+	DOCS=( AUTHORS ChangeLog HACKING README )
 
-	cd "${BD}"
-	emake DESTDIR="${D}" install
+	multilib-minimal_src_install
 
 	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus
 	rm -rf "${ED}"/etc/bash_completion.d || die