1 files changed, 40 insertions, 27 deletions

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild
index 31a1740..5669458 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild
@@ -2,43 +2,44 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="5"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools eutils gnome2 virtualx
+inherit gtk-doc autotools eutils virtualx gnome2-multilib
 
 DESCRIPTION="Gnome Virtual Filesystem"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64"
 IUSE="acl avahi doc fam gnutls ipv6 kerberos samba ssl"
 
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.9.3
-	>=dev-libs/libxml2-2.6
-	app-arch/bzip2
+RDEPEND=">=gnome-base/gconf-2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.9.3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.6[${MULTILIB_USEDEP}]
+	app-arch/bzip2[${MULTILIB_USEDEP}]
 	gnome-base/gnome-mime-data
 	>=x11-misc/shared-mime-info-0.14
-	>=dev-libs/dbus-glib-0.71
+	>=dev-libs/dbus-glib-0.71[${MULTILIB_USEDEP}]
 	acl? (
-		sys-apps/acl
-		sys-apps/attr )
-	avahi? ( >=net-dns/avahi-0.6 )
-	kerberos? ( virtual/krb5 )
-	fam? ( virtual/fam )
-	samba? ( >=net-fs/samba-3 )
+		sys-apps/acl[${MULTILIB_USEDEP}]
+		sys-apps/attr[${MULTILIB_USEDEP}] )
+	avahi? ( >=net-dns/avahi-0.6[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	fam? ( virtual/fam[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3[${MULTILIB_USEDEP}] )
 	ssl? (
 		gnutls?	(
-			net-libs/gnutls
+			net-libs/gnutls[${MULTILIB_USEDEP}]
 			!gnome-extra/gnome-vfs-sftp )
 		!gnutls? (
-			>=dev-libs/openssl-0.9.5
+			>=dev-libs/openssl-0.9.5[${MULTILIB_USEDEP}]
 			!gnome-extra/gnome-vfs-sftp ) )
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	sys-devel/gettext[${MULTILIB_USEDEP}]
 	gnome-base/gnome-common
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
@@ -47,8 +48,12 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_TEST_MAKE=Xemake
+MULTILIB_PARALLEL_PHASES="src_configure src_compile src_test"
+
 pkg_setup() {
-	G2CONF="${G2CONF}
+	G2CONF=(
 		--disable-schemas-install
 		--disable-static
 		--disable-cdda
@@ -61,13 +66,14 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_enable kerberos krb5)
 		$(use_enable samba)
-		$(use_enable ssl openssl)"
+		$(use_enable ssl openssl)
+	)
 		# Useless ? --enable-http-neon
 
 	# this works because of the order of configure parsing
 	# so should always be behind the use_enable options
 	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
+	use gnutls && use ssl && G2CONF+=("--disable-openssl")
 }
 
 src_prepare() {
@@ -118,19 +124,26 @@ src_prepare() {
 
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
 
-	eautoreconf
-
-	gnome2_src_prepare
+	gnome2-multilib_src_prepare
 }
 
-src_test() {
+ehook gnome2-multilib-global-pre_src_test my_global_pre_test
+my_global_pre_test() {
 	unset DISPLAY
 	# Fix bug #285706
 	unset XAUTHORITY
-	Xemake check || die "tests failed"
+	return 0
+}
+
+ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test
+my_abi_pre_test() {
+	# with any luck this wil enable an astute/lucky observer to discern the ABI generating
+	# a given test-result summary, in spite of std. parallel-test tty multiplex cluster-fuck
+	myemaketestargs+=(PACKAGE_STRING="Gnome-VFS (${MULTILIB_BUILD_ABI})")
+	return 0
 }
 
-src_install() {
-	gnome2_src_install
+ehook gnome2-multilib-per-abi-post_src_install my_abi_post_install
+my_abi_post_install() {
 	find "${ED}/usr/$(get_libdir)/gnome-vfs-2.0/modules/" -name "*.la" -delete || die
 }