Improve multilib support: alsa and sqlite are actually only needed for installed binaries, hence useless for non native ABIs. Do not build binaries for non native ABIs and drop now uselss MULTILIB_USEDEP on their deps. Slat it for emul-linux-x86-soundlibs-20130224-r7.

(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

2 files changed, 45 insertions, 22 deletions

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index b0b966a66da9..7661f3017dd6 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.135 2013/05/05 08:04:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.136 2013/07/29 22:05:21 aballier Exp $
+
+  29 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+  libsndfile-1.0.25-r1.ebuild:
+  Improve multilib support: alsa and sqlite are actually only needed for
+  installed binaries, hence useless for non native ABIs. Do not build binaries
+  for non native ABIs and drop now uselss MULTILIB_USEDEP on their deps. Slat
+  it for emul-linux-x86-soundlibs-20130224-r7.
 
 *libsndfile-1.0.25-r1 (05 May 2013)
 
diff --git a/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
index 54acddf2d9d4..05ecb84de2bd 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v 1.1 2013/05/05 08:04:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v 1.2 2013/07/29 22:05:21 aballier Exp $
 
 EAPI=5
 
@@ -28,14 +28,10 @@ RDEPEND="
 	!minimal? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}]
 		>=media-libs/libogg-1.1.3[${MULTILIB_USEDEP}]
 		>=media-libs/libvorbis-1.2.3[${MULTILIB_USEDEP}] )
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	sqlite? (
-		>=dev-db/sqlite-3.2
-		amd64? ( abi_x86_32? (
-			app-emulation/emul-linux-x86-baselibs[development]
-		) )
-	)
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+	alsa? ( media-libs/alsa-lib )
+	sqlite? ( >=dev-db/sqlite-3.2 )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( ${PYTHON_DEPS} )"
@@ -58,19 +54,39 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-
-		$(use_enable sqlite)
-		$(use_enable static-libs static)
-		$(use_enable alsa)
-		$(use_enable !minimal external-libs)
-		--disable-octave
-		--disable-gcc-werror
-		--disable-gcc-pipe
-	)
+	my_configure() {
+		local myeconfargs=(
+			--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+			$(use_enable static-libs static)
+			$(use_enable !minimal external-libs)
+			--disable-octave
+			--disable-gcc-werror
+			--disable-gcc-pipe
+			)
+
+		if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
+			myeconfargs+=(
+				$(use_enable alsa)
+				$(use_enable sqlite)
+			)
+		else
+			myeconfargs+=(
+				--disable-alsa
+				--disable-sqlite
+			)
+		fi
+
+		autotools-utils_src_configure
+
+		if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+			# Do not build useless stuff.
+			for i in man doc examples regtest programs ; do
+				sed -i -e "s/ ${i}//" "${BUILD_DIR}/Makefile" || die
+			done
+		fi
+	}
 
-	autotools-multilib_src_configure
+	multilib_parallel_foreach_abi my_configure
 }
 
 src_install() {