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.

Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 51 insertions, 40 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/Manifest b/media-libs/libsndfile/Manifest
index abd7642a39d8..c5a9559db7c1 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -3,26 +3,14 @@ Hash: SHA256
 
 AUX libsndfile-1.0.17-regtests-need-sqlite.patch 894 SHA256 c53026864c6a05b1ccc8b12e7af895f5d0e2d3a00335fd9f49ed7cc9aecece73 SHA512 1c914a1e51b15149bdba7d242f1ce6979d36cee7e6a6771c6b301d309805e1d5c9db28d4ab968b573504b88a9531c1a3b67af8d92d69f59c047ba692746ce5ed WHIRLPOOL efdf9e09c71f4c3701ebdcc9f300490abed19b096495d0b9a45352f6b996fa1856457e7f5a022ea0f4a559d62e4453899b1239b902f19dace5b9569825dcb8f7
 DIST libsndfile-1.0.25.tar.gz 1060692 SHA256 59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882 SHA512 4ca9780ed0a915aca8a10ef91bf4bf48b05ecb85285c2c3fe7eef1d46d3e0747e61416b6bddbef369bd69adf4b796ff5f61380e0bc998906b170a93341ba6f78 WHIRLPOOL 37ef0a66f11d3f60741fe40bce2b255f44284cf78f7c762542def2aab0eefed1360181bb7f29b9850c11e8672a78bc5a687bc04f2cc349e45dfd24721bea8f29
-EBUILD libsndfile-1.0.25-r1.ebuild 2418 SHA256 bc281308ae39c961d92f2c51ed5efbec5ba45907945bb61933d65e04a7465da1 SHA512 2859e8a5ab7a77c75ea7ecb031d6725fe3e250f77272639dfebec757d24890b902c347b0bcc4185876478ab76df14017319b6f584ea6b15e0568d42103e3da7b WHIRLPOOL bcbb7cbdf630c1b88b2795bba3287ff158e6c1c70768a7d8bfb5a09b6c3d506e6045e4e78461fdcb68d988ba14d6a467544f0b4e920841cbe443404ae36f4dc4
+EBUILD libsndfile-1.0.25-r1.ebuild 2795 SHA256 76e2500b3bf382dc264c4d06ccc96fd001bc800091b9ea8f2d77fc0bfdf65423 SHA512 8488518d90b1aab2ef5f03cc3acd66b26700651ad3caaa96b537abf6daee8f12b0562d77fc5d10253a9cc51081bd36cd90621798e829b5a6fbbec4fef53da1b4 WHIRLPOOL 1099556240965e5ed6048c0f0efe2b6390673ade8d0540fab16a11b8da1e23ebb59dbe9329fe21c4f409b8ce0b5f2284ee87d84ed3d889183be7cbf189fad6b9
 EBUILD libsndfile-1.0.25.ebuild 1904 SHA256 f784035e9140cabc2e9da3e2f4287fbaedddbdb0e1953cf8663fe7e16b23e5fa SHA512 5c4abd50566e953b939905d58f3726a776c42138dee2750eed1bc6ae2c531c9ef02421d2e58f35c598dfb5630be60b153b1851828bfef738f0ff3900ff3e800a WHIRLPOOL 0e4c5dd1742754907abcd3a011bbd3423844182afb897a6732cf1df4533112b56b0c8bcc564eec8200499dceab0e097465f155a01d69ab4b381fd40afa253723
-MISC ChangeLog 19855 SHA256 5f6b9dca66d720b1d5d689027228dcbc7db97d24881ebec1aa31dfeb0ca538d6 SHA512 f31b775e0239676816451117cb4b9ceed6b4c0a8137d6e38d1f28f3969d4c9d8d1c1c182831c49f9b885c1bc6e08a1ff618d62ec64473daeec83a88d81cb99c9 WHIRLPOOL ae690e85e0fe8a37e21b700b7a4d8ebb7edfd86408526fca13c88e4e8a6449db9e2de66cd9e34c305b5a98d1b27a15b6ff62c3a3c436de7077549e1b3c014a1e
+MISC ChangeLog 20218 SHA256 63f42a2d6c62f33ccb1336b204538fb2b3cf5ffe4f63eeb7e065cb49278d6eac SHA512 cb8f2c9bca2742f1045ece997e835fc85991a085dbaccd3715c9c0a054e099d559906a0c5927b22f13c769392a57920734bec3de92588dc6b53d2eb88b60d4ba WHIRLPOOL 85151c9281ab8575fc388e5518124c9280bb7260cc87de1f284570eddbb9528b541200a6800f26c3268d957f2ea8913b18edbce9e02ad9c5f06d94de8710af5e
 MISC metadata.xml 159 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 SHA512 a77b80f2ab1799aab052edd575ad80daae01c717af7bd5bf3dcda15714b9afd2e9fd6553cc20b000bc3157915b7082641a92fda56de3a9b8362ae2488925e4b1 WHIRLPOOL 913c53cb00341537eff621357b1c5b8379bb63df52d18b88fdef0173cdfd7c60f6d1ece1d42b5d0fcda69ed73ab4138f4268c6394851b07a9411a8306fef9173
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRhhKGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDZjIP/2zwKgHUGX/J2TdaPXyshGNo
-dzmUjClU5Da1Arsc1jgG5WTgg7qfGwemjMAse4w6ENR6lSb6OGcPpknIXpg95rnA
-LEUmPB5KL1waMwXWkXuUIrcU9a7me5Jbcvn0/rzvaGTdECIocHjtr0P/mIfQqLZy
-8RxxFMpVtmliRz0X8MEV1dLCrwy5Z3NWNtj7cigNSwprCssJqMA8l77JZpZoyJmq
-T3anRhDaZyMoB4y1DiAxIEFKGnu7jmUC+x7KQ8sJTgHaaQi38kPrjR7MntsMGlD8
-Y8jumVQkIGTsRHuEAwjkLMcd6QGjV5Zt/DTanww8gsLa9TMZzfmLpuMT75tBxLjm
-kQxEdD0TxEa3t4WJDgyrcnxFQveyMbyg17st6LAYEcqiXbb5vRIh+6PKl1Xgc4bd
-9R3+e2hRWWgqAvSIWsIk1iVSqd1LXYVg3ZUBC4clz/G7yKitwwKaXyujtaoCEQyr
-rp4NYw3IRJU89s1g6Fgp2PNyVHbMZMKT4h01CWtbwCy0pirwgvEVucv5/wiJovsw
-FGvLgYaIA7hbxdAB//tS2VaWYdhaw3ugiPrXtwDo7q0gpZriCpd5GhimBj3f1A0a
-wpXfI29ygSFiheB8bY47ccXJzDf8XyO44fljNhD9Afad4ARld6U0xyRCnbOUxoDQ
-1UW+JCoRLnRra4lOCSAT
-=mjT8
+iEYEAREIAAYFAlH25yMACgkQvFcC4BYPU0qJoQCfUhFBwGGZCrd3txbFQj6RnsrW
+tnoAn3PykqlOGhuudT0actgzU9CjtZMP
+=4nw8
 -----END PGP SIGNATURE-----
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() {