gnome-base/orbit: multilib-utize

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

2 files changed, 17 insertions, 13 deletions

diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index 1dfa70f..7eab98b 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -2,6 +2,6 @@ AUX orbit-2.14.19-automake-1.13.patch 674 SHA256 ed3c966dd4b862a22e814bc6a710993
 AUX orbit-2.14.19-fPIC.patch 1650 SHA256 73eeeb598b1cd18f1d888a0f62f59b971ea1367995a3d7016a4e217968ca4923 SHA512 31915edd0998b4738a5c97a74b4e4f84ac80a7db5a04e1f205ff2a2ea181df9bf471a839f75bef8bc96644c0e3c731e3cf6c47bedbccd07ab7b10f27e8e19da8 WHIRLPOOL ef8eaea7640669aedb8b68fd397f7aced0165685969ba4c96bd78ab17b78611828fee7f7dc54ab4db8168de1fdbcb2566fbf2fc24901421136dde33f6cc1202c
 AUX orbit-2.14.19-link_protocol_is_local.patch 1006 SHA256 d173885258c5dfb2ddbc6238f239535a49955bbd633b0acf58efcb503af33c97 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8 WHIRLPOOL 4231e42249a9a29a3a6ad51514ebb0585a112ac894aeae416e2540972b887264410e88a39dfaf9154bc059609c9c81f4b3d7ce566f97d8cced802aaf7f8e8c02
 DIST ORBit2-2.14.19.tar.bz2 764820 SHA256 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e WHIRLPOOL ed9dffba86ab5a5409fbdfcbe8017ae3251ca261aa57b3ee1089ddfad0422f73e848ed72d3881d664ffe88a3582a8c4652394517ab814c4f0983d446891a1306
-EBUILD orbit-2.14.19-r4.ebuild 2385 SHA256 e7752857331d08306f1cc2b9f42f2487bbeb61061a183f5808ce3b5fbeeb3ebd SHA512 ff13375548c6a478d8c689b48f753ab4a2ffbc6f4a719f34ef5774b7006b794fcd832d3b3e8992ff38cd102a7f93d46dbfe27068eb5f090fa0f88a0e148bd9ce WHIRLPOOL 570fd4932b7f5ebfc3d5658772c8fb44808c8a8ee8c435d122d5f9cd8c5a167a9e47dd227caa5e980dbb48ea9629add786aa5fcf13d876b23c6444df72c5cb3c
+EBUILD orbit-2.14.19-r4.ebuild 2727 SHA256 fb2f116ba64a935ad5cbf865cab15e407301160b7f634c4a94cf51ae2f5d8322 SHA512 a6babfc43342cba7900f5acf72eba0a6b01102e7a157bc70b8c5a40703645d2db9a89c850483a96d679d9e7680b0da37d78fe44427cdff7ffe93786fa83eeba5 WHIRLPOOL 3478495956b6b3eff2478111fe6bc86f2aef79c1d9c1ea4ecd6edacc582a68d742626ccfe6619df9e8dbc777d56a1aba96b9b90699ac8cd94164a619063cb518
 MISC ChangeLog 25994 SHA256 73177e7957a5656d25cc5bc4d3823bbcab22979381f3420a383f94dd196a1f18 SHA512 a1ff35dd354198c44631bd0c488d730d87033839e1d033a8c53d3ebfdfe40865ed963b6148d0bae3af72d403a0ca69c33266ed564d20ad928c8708a762c3c412 WHIRLPOOL 8c7a04b1715e9428107244eddc153b3665b13c37fdff1b65f8a1609717c5f7d4fa913f1afa69059a0a01852eecd95f3a3154a15f0a7527e35c83fb1d75a801e9
 MISC metadata.xml 268 SHA256 49ba5aa4b4333b8056ead3fe610227e35114c61de761219361f4dbc3fc456e86 SHA512 0ee7a4fc951265814f32b99410ee92a4d63c2c0bc769ca5bbfb737d3951fef02352c0e9a4ab2ae04e9fbb1885b4b5b3d64c14c8d2b45c614bf2a07d741fcf48e WHIRLPOOL 0f5a33c5e0c8a4f725982d8800a0b654a2ea3e82db4323da714e04abc4d8459dc1e0a6a5e5dfba688cffb458f223cb5136e5f1da238f15daae12d13ed70042eb
diff --git a/gnome-base/orbit/orbit-2.14.19-r4.ebuild b/gnome-base/orbit/orbit-2.14.19-r4.ebuild
index e41c81f..874fa05 100644
--- a/gnome-base/orbit/orbit-2.14.19-r4.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r3.ebuild,v 1.9 2013/09/10 20:24:47 maekke Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -8,7 +8,7 @@ GNOME_ORG_MODULE="ORBit2"
 GNOME_TARBALL_SUFFIX="bz2"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 toolchain-funcs autotools
+inherit eutils gnome2-multilib toolchain-funcs autotools
 
 DESCRIPTION="ORBit2 is a high-performance CORBA ORB"
 HOMEPAGE="http://projects.gnome.org/ORBit2/"
@@ -19,14 +19,17 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fb
 IUSE="pic static-libs test"
 REQUIRED_USE="test? ( debug )"
 
-RDEPEND=">=dev-libs/glib-2.8:2
-	>=dev-libs/libIDL-0.8.2
+RDEPEND=">=dev-libs/glib-2.8:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libIDL-0.8.2[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
 
+DOCS=(AUTHORS ChangeLog HACKING MAINTAINERS NEWS TODO README README.win32)
+MULTILIB_WRAPPED_HEADERS=(usr/include/orbit-2.0/orbit/orbit-config.h)
+
 src_prepare() {
 	# Fix wrong process kill, bug #268142
 	sed "s:killall lt-timeout-server:killall timeout-server:" \
@@ -51,12 +54,11 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-automake-1.13.patch
 
-	eautoreconf
-	gnome2_src_prepare
+	AUTOTOOLS_AUTORECONF=yes
+	gnome2-multilib_src_prepare
 }
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
 
 	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
 	# files to be not found by autotools when compiling ORBit.  See bug #58540
@@ -67,9 +69,9 @@ src_configure() {
 	if tc-is-cross-compiler; then
 		# check that host version is present and executable
 		[ -x /usr/bin/orbit-idl-2 ] || die "Please emerge ~${CATEGORY}/${P} on the host system first"
-		G2CONF="${G2CONF} --with-idl-compiler=/usr/bin/orbit-idl-2"
+		G2CONF+=("--with-idl-compiler=/usr/bin/orbit-idl-2")
 	fi
-	gnome2_src_configure \
+	gnome2-multilib_src_configure \
 		$(use_enable pic libname-server-pic) \
 		$(use_enable static-libs static)
 }
@@ -77,10 +79,12 @@ src_configure() {
 src_compile() {
 	# Parallel build fails from time to time, bug #273031
 	MAKEOPTS="${MAKEOPTS} -j1"
-	gnome2_src_compile
+	gnome2-multilib_src_compile
 }
 
-src_test() {
+ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test
+my_abi_pre_test() {
 	# can fail in parallel, see bug #235994
 	emake -j1 check
+	return 1
 }