Convert to multilib, stop installing a52_internal that shouldnt be needed nor used, stack it for medialibs r9

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

3 files changed, 75 insertions, 10 deletions

diff --git a/media-libs/a52dec/ChangeLog b/media-libs/a52dec/ChangeLog
index 7e1ad9634814..463b6b66793d 100644
--- a/media-libs/a52dec/ChangeLog
+++ b/media-libs/a52dec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/a52dec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.67 2013/05/02 04:09:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.68 2013/08/10 19:09:34 aballier Exp $
+
+*a52dec-0.7.4-r7 (10 Aug 2013)
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> +a52dec-0.7.4-r7.ebuild:
+  Convert to multilib, stop installing a52_internal that shouldnt be needed nor
+  used, stack it for medialibs r9
 
   02 May 2013; Samuli Suominen <ssuominen@gentoo.org> a52dec-0.7.4-r6.ebuild:
   Fix automake-1.13 compability wrt #466978 by Alphat-PC and Thomas. Remove
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index 5c7bfbee0f04..f3686a422781 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -7,16 +7,13 @@ AUX a52dec-0.7.4-test-hidden-symbols.patch 637 SHA256 eb49d33c59529a6fb790743f19
 AUX a52dec-0.7.4-tests-optional.patch 299 SHA256 d0dd7ad5d6f070ef385bf76ff48e1d54be7cb9d5ba3d7d71e5b1b4657bdfb9ba SHA512 9f5c0afbfd656287eafeba04eed34070f53a77cb53981d64ff71edb96bef6cc2c0638e0be6647086cbad87ead97aa0215cd6cb413258d0122bc3f45bcf4480b1 WHIRLPOOL b266bec3f0c253f39f58523012157572f1cd4621fc7fda2e2fea7c290956c92e968d7ae8d707e51ba682ecc390c15fb255ecc9536e35ea75715b29fec056a95f
 DIST a52dec-0.7.4.tar.gz 241507 SHA256 a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848 WHIRLPOOL 6dd6454f88ab9c4d80374ac2019d4392765fb3fffc54e0f0367f5c1a7ec31bb38b8b817e05fa195bf4ff83c59adf51872a93e4d61ffcb1e723e13e4a6288bf32
 EBUILD a52dec-0.7.4-r6.ebuild 1550 SHA256 7597c0078099f06aec271eca2f212e0f063e960b36a45e7e9af750844b375976 SHA512 feb592cb849941308928cda215bdaec0a937e2187301925e99cc85840f4812bdba856291e68b26904393cb198f9280d22b4b9bcdf243a8dd200f13daed15c287 WHIRLPOOL 88c14daf294c0d65c93bd71087473634ee9343eef051b4c2eccdecf6e9ad63d4c0b28ffb5a9aef1ab342fe2818ca262d2734bff9450e1bc19d4e069a9c342246
-MISC ChangeLog 9533 SHA256 daeb96a9698d90bc840e6eff2a2c673818c4f744e5f004556264a8a6bfad00cb SHA512 1c50a84ce81c675bf631036904bb25ae0b2cc8d0c6152943b9f0c65aea53e7c8b4152fec66bedab3bbfd57ffc3c54959d27cb84420211db99ac0426503c72463 WHIRLPOOL 92e198636bce8f9ce71f25d4b9094b286c5983a95ad3df4a450884443e87d4cbd3eb5b8b54cb4667330cdb9a7e2faa2cd7f1f3df31bb0f02c5bd8ca19bfbf60c
+EBUILD a52dec-0.7.4-r7.ebuild 1754 SHA256 af7d95d915addc26c6ac059c74e1450b5b28696082392c122c4a08e3ad230b83 SHA512 2aeed2ed1924b3abfe9777c37a7232d585631adaad4c769e3ae3fd5d440a131f95c7c890704799375b63ad4da5ade514a474a87556b35809f3cafe77c44a5f3d WHIRLPOOL 4d71eeb3cc5b10ccb05a1d24b346d026a08b508f786cbddbca9e4ef546f23412b64ad7135d58a9c168235ccd3ef224761221c9f20a3945390c1559f49921971c
+MISC ChangeLog 9756 SHA256 d435f92a3840019b065aebd6c92242f8c1c2fcf6766956d19370fd6948c33176 SHA512 ebd20f43e8114453384d37dcf900c883cbc5200668ba74e0216f0c086c94a2306a970acda32d31e047fed3aef44878ef3f5c8baa90eed793e0ccaf456b2d05d7 WHIRLPOOL 713306a8600fbdf36fa46112cf422f6f1dce9660ef8f434cd39f76088d850fd599d50353e4a8f158f89469f532dd45a336c648c11380575655a347b23e5b83ae
 MISC metadata.xml 263 SHA256 938b5d7b1489d64aa1d2479633cc25916bc5381e6a080dd96a7b339ea7690d24 SHA512 1b3b7febb23df0c26017e20dec60e7f866d494f8a3ec082f8f8e97c5a9637214d2dffe80424509d1815213c3c75e9bf959466d9eb2530e7e1f50b6d07d48f2d4 WHIRLPOOL 01e0f1e1fcddd08f9123af34fa01dba7780a2bdfee481e99c7746e0aa7119f54f339d5d7a236b569fd837a535cbc288b92e9301a9114dd3573edeaca6d34d74e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgeZ3AAoJEEdUh39IaPFNzHIH/3Hh0EIQbx4pHG9GyuMscyTr
-YFIBREE6E1fP8CLMOnZXL2+pimE9G10lXxy/lgWtzp9uJDhotjMgeHPSHmEqLRyw
-lW5f1YykIQTPHFUZBBIM/XOihqlDk1PGnJUKz1zxZFk50xCK3f72ITmwMkYV9MGF
-MBkx8anW15DeE6+t5YUVCBgJ3/d/s6AspU0YHIfhIqXkV1MLnLlvyOHlV1zjXzaY
-+GiWFTdhQ/zlerz9WIA4S4MXMiVdPagbT+q4JohjPTzS2176068y0AHEHBM9J/Av
-KFOwD+tsWzSNnFODFyDGCDNW/I44vZtEAoVljt50TEwoLySTf6LUfo6OvorrX0U=
-=ptBe
+iEYEAREIAAYFAlIGj/AACgkQvFcC4BYPU0pkeQCaAu2q1yzxS7OLPAsOpXGVsNFm
+12EAnAuHr4PWoTop80lp64Bi4JipwS6B
+=QMYA
 -----END PGP SIGNATURE-----
diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
new file mode 100644
index 000000000000..95b1c78b6df4
--- /dev/null
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4-r7.ebuild,v 1.1 2013/08/10 19:09:34 aballier Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="library for decoding ATSC A/52 streams used in DVD"
+HOMEPAGE="http://liba52.sourceforge.net/"
+SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="djbfft oss static-libs"
+
+RDEPEND="djbfft? ( sci-libs/djbfft[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+DOCS=( AUTHORS ChangeLog HISTORY NEWS README TODO doc/liba52.txt )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-freebsd.patch \
+		"${FILESDIR}"/${P}-tests-optional.patch \
+		"${FILESDIR}"/${P}-test-hidden-symbols.patch
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #466978
+
+	eautoreconf
+
+	filter-flags -fprefetch-loop-arrays
+}
+
+multilib_src_configure() {
+	local myconf
+	use oss || myconf="${myconf} --disable-oss"
+
+	ECONF_SOURCE="${S}" econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable djbfft) \
+		${myconf}
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ src//' \
+			-e 's/ libao//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+}