Migrate to multilib: Build only libmpg123 for non native ABIs, skip the output modules only used by the mpg123 binary. Slat if for soundlibs-r10.

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

3 files changed, 109 insertions, 5 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index e1afed940f2a..ebf6c76a7848 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.289 2013/07/28 19:40:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.290 2013/07/30 12:11:55 aballier Exp $
+
+*mpg123-1.15.4-r1 (30 Jul 2013)
+
+  30 Jul 2013; Alexis Ballier <aballier@gentoo.org> +mpg123-1.15.4-r1.ebuild:
+  Migrate to multilib: Build only libmpg123 for non native ABIs, skip the
+  output modules only used by the mpg123 binary. Slat if for soundlibs-r10.
 
   28 Jul 2013; Alexis Ballier <aballier@gentoo.org> mpg123-1.15.4.ebuild:
   keyword ~amd64-fbsd, bug #477750
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index d43231c2158d..dded07c7d17e 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -9,13 +9,14 @@ EBUILD mpg123-1.14.4-r1.ebuild 2343 SHA256 0db5c2e923dee9ed11409294e635bfc1e018b
 EBUILD mpg123-1.14.4.ebuild 2154 SHA256 8b47dc5ff937b9b59bcc6fe68fa99bdc3be05bb03787160e1cd226ec3efa961d SHA512 19eb959c46e2cea5f03b10e77ecdaa05b61f1287b5393a3c96be7e5ef2ad068e86767d3562a7245ea795aaf2cb3d76a5d0949606f1114b169d0cb77ca59c6d57 WHIRLPOOL 5315b805e7ff1b06718f122538930aec3e521c074695e83a6a7bc47b75a21b492c62b4e371f465eeb3c2fd5aed0228156caa5e7bb9193ca341eb460f34715e7e
 EBUILD mpg123-1.15.1.ebuild 2340 SHA256 fd69e46d60160349da1e94f5c5d94a8422d25c8955fe1e447b76a2f4553372b7 SHA512 fd0b279901373251be8535aeeb5315dec0d58160b454f5cd681bbb568324786577f3422446cb495b2865d9c8e6d58bf5dab093758d47a9fa2ba8051582f6917c WHIRLPOOL 609335ebad1e016fd050f4725c053d5dd2d9ac42a50fc7b7394c7aeace5995482eb2ae276a91a2f893ca561c798fa8a3d293a0f57ce94069896d3ea876a7f8c1
 EBUILD mpg123-1.15.3.ebuild 2340 SHA256 ce8fa5910dbef8991c4254cee7e0a98c07a3717f051f2e8c7f281fdce94836a9 SHA512 0406cacd16f0542c1598c8e18b4f0dd64741d32fbdb205b8dddeebdbe577e0b05b925e7bb663b2950f0c3fc93ceb1b53531b4c0d98c84a5947298be1f39b1e7f WHIRLPOOL 27ba8e50c99b005cf2789cb55933d0b31d1d97198fb5561ab7a5d83f4479bb8a12d842a57e1892e76f58a461737459339fc604960fb6192b88fc45f17d37993e
+EBUILD mpg123-1.15.4-r1.ebuild 2848 SHA256 80503d450b24cb61319072e377a7d2f1e220fe36300939f3726134836573cd20 SHA512 075485fd78ffa0020c0f646a9401f6a73c3a75329d64484daa7a94ead20e8428f0f1c2b489f193ec652ffc62c2693287de1259f287b61b825babc7a1b19e915e WHIRLPOOL 3e8ab61f033466ee4fb80bc1ae2e5923a4e4386e26e5b648b50e4ac6f14e0b108cd02c1ebef6bf852cd11dca22eee69374c23e72871eb6292d393417d1268b10
 EBUILD mpg123-1.15.4.ebuild 2339 SHA256 0892e31d854c2f29f23ea3ccccfffae2599e4ca063f2a88d47785d0059a60e5f SHA512 87bf61716516916953f15cc1bb564a51d739b1da95ab612a2d29a1c74569f8b30cc4fe444ac389c43fdb634e0261d6c2d503950ff1d362723fe9f4ac09d5246b WHIRLPOOL c3730d57c77bbddcacbd687d761b4a2989e3ca5ec7e0fdc2b7f1a2169e6a0b6ceabe3df2533a176f7816b05c2ee355055b0a6f04166aaba609173c9400e5c89f
-MISC ChangeLog 38844 SHA256 f3c05d5b8866c08b216f36ebefa9e7b2256144bfa7439b742fba5f0f32e42eb1 SHA512 4f8edda48119a9da49b7299ce4b952ecca272b72a73fd2700a8210c9f59eb7e4db3e839c47fea53affa67133628cedcfe49f6ad1062c9313c5aec94156fff035 WHIRLPOOL d324384fa76a412bba5dc6cd1d70ea868a3efd89a6a5f2ee1389077fd7830839fdda351f82bcc752623db4ad23fd68f86236d0ef7aaa96c01a6c64bc7fd56982
+MISC ChangeLog 39106 SHA256 11e8e8f30cd1e3b55c070b98283335fd507fe2c1e8dd3179327e497020b28463 SHA512 7f7df39dc4c59575a9a880a5c3dd0ac5e50a756ef43b767a9cf363957f08bf83cfdda3a8de1330f15e634c8bfdae74e227d9ff858288554862adbe78365b732e WHIRLPOOL 66ea37ad713a1453e49cc33f6116a611e86038b76dea5dcc76f6e1c277854f765f1f6713c1cb7ba7f51fbcce58723bc5db4b557072efe8b200abd9fac0dfb6a7
 MISC metadata.xml 492 SHA256 ec073d0ca010ed50d6b671f13cc98a6ee6f221526e56886b469d436c25a6042e SHA512 0cb2796ed7f5eb2696d374b45f83a371944257d177d6c73df0495178dd9e43a56efe947ccdf09dcb306c051f4e00c1af3f95201a32b93ae7eef449fe2acbe7dc WHIRLPOOL 7b1da43b004d4cf690fd16915d0af64207e4ccbf391f8ae1253d14f916a44c92ecfdbe80473c8a0fdff9aa82a7366f42348c97525057ccf1195a8722ff5c67a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH1c7MACgkQvFcC4BYPU0pI0ACfYRC8yh7RgV8St+ep+Mx3xKrE
-RIEAn2ex3Hy1g1uC+ofjJg+3+5zQ0DbI
-=InpM
+iEYEAREIAAYFAlH3rY0ACgkQvFcC4BYPU0o3iQCeOALoKdmwgEE7HhCEJOTB6Eg2
+zI8AoLazE52X3Une0ZsZ70puhmk1vcWk
+=+nHH
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/mpg123-1.15.4-r1.ebuild b/media-sound/mpg123/mpg123-1.15.4-r1.ebuild
new file mode 100644
index 000000000000..353f26caff68
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.15.4-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.15.4-r1.ebuild,v 1.1 2013/07/30 12:11:55 aballier Exp $
+
+EAPI=5
+inherit toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="app-admin/eselect-mpg123
+	>=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio="${_audio} ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use mmx && _cpu=mmx
+		use 3dnow && _cpu=3dnow
+		use sse && _cpu=x86
+		use 3dnowext && _cpu=x86
+	fi
+
+	local myconf=""
+	multilib_is_native_abi || myconf="${myconf} --disable-modules"
+
+	ECONF_SOURCE="${S}" econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality) \
+		${myconf}
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}