go multilib and slat it for medialibs -r4

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

3 files changed, 65 insertions, 9 deletions

diff --git a/media-libs/speex/ChangeLog b/media-libs/speex/ChangeLog
index c219869afdb3..8edd8646f51f 100644
--- a/media-libs/speex/ChangeLog
+++ b/media-libs/speex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/speex
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.103 2013/07/06 17:51:03 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/ChangeLog,v 1.104 2013/07/28 22:29:34 aballier Exp $
+
+*speex-1.2_rc1-r2 (28 Jul 2013)
+
+  28 Jul 2013; Alexis Ballier <aballier@gentoo.org> +speex-1.2_rc1-r2.ebuild:
+  go multilib and slat it for medialibs -r4
 
   06 Jul 2013; Christoph Junghans <ottxor@gentoo.org> speex-1.2_rc1-r1.ebuild:
   added prefix support
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 4c3d13ad1676..f270807d6dbf 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -5,17 +5,14 @@ AUX speex-1.2_rc1-configure.patch 874 SHA256 205aa8a4ba729f015535b084f8932c19f5e
 AUX speex-1.2_rc1-r1-configure.patch 1153 SHA256 8dde6cee655d622b31d49bdae09fe77975d993543c35ad6cdbc065210268cdf0 SHA512 4cc6ca75ca85861e37fa4084d5614c941ec31459d2c2770264f024c2143cb305a6c63df1b9fd62a14c9f68e45254cd880cc5dd7094fc593f34378a23d2318f84 WHIRLPOOL 08e555ea40e87c8afbf9152922c261ea6b442809b7e2a32fb9f9b6ab899658a628346289510920f7987c299e52513c49d7f16949f0e01605fd5b78c5155a34a1
 DIST speex-1.2rc1.tar.gz 1061882 SHA256 342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6 SHA512 bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813 WHIRLPOOL c984f04a9c78332509b76ef98ff0eb84b8b4b8755d02890c5de41501325c2055e42243eaed2671e0087c8ca2cdea5967e5113c3d85a53f3704a8d8a3cfc487cb
 EBUILD speex-1.2_rc1-r1.ebuild 1319 SHA256 687159147172a337ff1004ad59b18dcb99292254a93ef45d5b84b1e0d26b6259 SHA512 e8a174da2a57ae6a21929e1ec266c360d7b5b91219fafdf0a828bb859cb4acec871da119fb882f168b71dc446833ae12cbf6941e71503586d27cd2126fbc391a WHIRLPOOL 28810cfa72564625e4f9298e7b6d48bbf60b8d83d2352e4cd1db9834e988bab51d79d702b6ac8e895e62e3072086ad7359793ec8c7fad12e394194636a1f2465
+EBUILD speex-1.2_rc1-r2.ebuild 1574 SHA256 be95af3c9d65cc4739bd2888c5e7a18d3b6ede3e1404b6b625437be4340cca79 SHA512 838178cb3df7ea61ff566dbed56fd670afcea293c4bc6de0ec8967aa3423c0f9bed630a0b7f610c38ba495dc0349b052dc810b12ab493da07146f464e37bebe6 WHIRLPOOL 08524c7d34c54b0859afac7e4fc64c0bee0e21e057ba88d6b15096656d4fb37f70b7ea8c084b9f8ae2837da4685f490048af85f30c1794df8ae5ffcdbb5bdd96
 EBUILD speex-1.2_rc1.ebuild 1179 SHA256 bf51a0961dc2dd46245e9f4b95d6c39a0c564215ac06bb72a05c4011f19d85ef SHA512 cc2bb60ec4a6660d25ba5f4018534bb93952d935602d4870065c337cb1b57b665bae756c19751f2559f83556a8de1901c1d7957a75074a5b17b35a18d007a977 WHIRLPOOL dfe88e578b75f520ab3d5f2e9959638ce94d91a9e6cf9df8d1e3816c540abf703076e964ab2429e891f3d7ec628a6a62ba2d45bfd0bbe90751b7062a522d7553
-MISC ChangeLog 13393 SHA256 4dd703032e85eb065234fee7b52399df2c823c9d45920d431024bb38c13be2d2 SHA512 3e4010ffe30e790ff189418da32c27276f24ae951abee3845920f4251ea85a7e8674238f1568785498f92ae1a699ccf51c89ee215ea9d9c04840ee1e8ebb45ff WHIRLPOOL bb7f226654b90db21b2232831a50acda6ce7212dc445900f57fe3f6e423cf2472a7fb2f5d747e041da4214308918ef96e827ffca899e62b0fdfc57e56d0fd489
+MISC ChangeLog 13551 SHA256 b1a48e3f88d970745c90dcd84bffd58e9e36a7adf9eff8882451a4418e627744 SHA512 67d320e22b326fa524f08ec2eb115d7fc7a7c4d7307fcf45b086d88fce94a51b7c02274bd58ac51258d5ae22621445b9dfcb06764f12ba79d75faf941bc2e004 WHIRLPOOL f68f4c0ddfe462e1723d73a1563beb46e8258fe20f800fcacd1b4d664e8ad17328b01ed51d7699649fc1c4cb84839e0ef19074dfc9c4f316d1cc5d4d4070b578
 MISC metadata.xml 235 SHA256 adcdef35c3985341d05dca7917e54c21bdc022ea809a599359c3d366d2980a04 SHA512 cde79bcf8c88d1dd280d44530ff1869953454167b76eb3bf8ce399733b1aec1e899b2acb8c5baaf56c4e014862309cea035dab97087cf5418032072bb8a35e61 WHIRLPOOL de33255c58d8d64290a406f8f2a89ebbc7c8df04c21b958c8d3e1614d8cb7259860780fff383530c925e88f623f2f7c5127cc4ff6a5f7a12c8d57af80ba7f6c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR2FkIAAoJEOeBhlrCAAWGtzoIAI/Js+d3JhAL15r8VzOelcp0
-GV07MofvoIXDehMjaDSAvxS3ZtyXzR9nWvllm3hcx61fESzHrAu5IGUQZDy3u6WO
-Fsp4YXFyuFYGWJsO6vJo2DoobzBPcmFJ+vO0ve8WWBaz2Q6KckKaoaZL3Q9VUGxr
-GtafwfQeH364pr5KyFgUy0excDcWg2hrW9tyh4MkRXpkuOWROnekWs6dJ3w1CTHx
-zPKXRolsskjN0tsNavV7nTZ00gXUlWuZEynKaQMOj7mDBqGI14XMV8nXQzUgiVyn
-vbTAaqvzEzp3LPPPVbic0FhQarO53w+vWoN+7JnSE+gIKjzLkW/7XDFNq208DdU=
-=rX9J
+iEYEAREIAAYFAlH1m08ACgkQvFcC4BYPU0q9UwCgxMBA8Fv2GoUtypEEEo6jSef0
+Ep4AoLx6K/tQI3TPyHQfULGIC/XYIhkL
+=SLX0
 -----END PGP SIGNATURE-----
diff --git a/media-libs/speex/speex-1.2_rc1-r2.ebuild b/media-libs/speex/speex-1.2_rc1-r2.ebuild
new file mode 100644
index 000000000000..c7a83caf3ce7
--- /dev/null
+++ b/media-libs/speex/speex-1.2_rc1-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1-r2.ebuild,v 1.1 2013/07/28 22:29:34 aballier Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib-minimal
+
+MY_P=${P/_} ; MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech."
+HOMEPAGE="http://www.speex.org/"
+SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+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="ogg sse static-libs"
+
+RDEPEND="ogg? ( media-libs/libogg:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog NEWS README README.TI-DSP README.blackfin README.symbian TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-r1-configure.patch
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467012
+
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		libspeex/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable sse) \
+		$(use_enable ogg)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+
+	prune_libtool_files
+}