Add multilib support

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

4 files changed, 72 insertions, 20 deletions

diff --git a/media-libs/vo-amrwbenc/ChangeLog b/media-libs/vo-amrwbenc/ChangeLog
index a2a35a17688d..ed2da487b1fb 100644
--- a/media-libs/vo-amrwbenc/ChangeLog
+++ b/media-libs/vo-amrwbenc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/vo-amrwbenc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/ChangeLog,v 1.25 2012/11/16 19:58:21 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/ChangeLog,v 1.26 2013/05/08 09:09:52 aballier Exp $
+
+*vo-amrwbenc-0.1.2-r1 (08 May 2013)
+
+  08 May 2013; Alexis Ballier <aballier@gentoo.org>
+  +vo-amrwbenc-0.1.2-r1.ebuild, vo-amrwbenc-9999.ebuild:
+  Add multilib support
 
   16 Nov 2012; Agostino Sarubbo <ago@gentoo.org> vo-amrwbenc-0.1.0.ebuild,
   vo-amrwbenc-0.1.1.ebuild, vo-amrwbenc-0.1.2.ebuild:
diff --git a/media-libs/vo-amrwbenc/Manifest b/media-libs/vo-amrwbenc/Manifest
index c7da1d426cbe..0b737fd4d557 100644
--- a/media-libs/vo-amrwbenc/Manifest
+++ b/media-libs/vo-amrwbenc/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST vo-amrwbenc-0.1.0.tar.gz 581544 SHA256 3f1d18e7fc6c1203491520dadf2530efaa40404eb3eb70dea4397582fad9c193 SHA512 a171a5bc8596c1aaee002d182251f71f3f285795d7e40193ae911cab88171f5dfdbc9a523f0b840716c71ba3b5523097a531261455465941d3e7130eb0977105 WHIRLPOOL 9fbfcb50630dde57f8a4bf053ac31882dab3d38f37dcc4841b84e53b2e2d441a598c576e21a865039e6a6decb9b34bf73f0033f2663cbdd777e330d4b5bae694
 DIST vo-amrwbenc-0.1.1.tar.gz 581633 SHA256 ae6fd425ab76b2755801d9aafccb0e60faf4e1897fb1df260d6c8661d3f53719 SHA512 a6eda9dc60479e89dd0a1def713274edaf3ef35a0558b99c1245e291d6e844cda4f20601e2a034d5b01e333a1baeff4c94e385f7bd8b762b21a6ec2a9f7273c3 WHIRLPOOL b1fe9b081d7ee8eb5371725d3ea5f5504189cb522ce0ba302e7fb3b9a24ff1a56d62e94578342a3045797ce44c50f650ecd202dbd1c7defe6f9de8db7bf49ab6
 DIST vo-amrwbenc-0.1.2.tar.gz 598415 SHA256 dd8c33e57bc415754f31fbb1b1536563bf731fc14e55f8182564e4c0fbb26435 SHA512 54be9c63d1b4c66e56dbf85cef2924c4cc564556186692182b44f199a5f72eba02c619b8cfa89f33b88add149fded81a42a392a9b96b6274ad0ad6c1f929a61b WHIRLPOOL bde8f79f722e6e997bbef1e85f279069a722153c58078c39c8dfbb43432ead98661c4107be4777bcd1b5a69407c5648d27fece8d981a47eb358c958f265df214
 EBUILD vo-amrwbenc-0.1.0.ebuild 1268 SHA256 60a4ab11ab86120689d9335bf14b0f979e481d94e21e30d06475b040f395dd81 SHA512 7fd4b83a058a0fdbf1fa4f80c59a0849205aa1ff9ff321361ddc99202412f780e6562208e784a36bf5f7ca863acfff2cb489a0df10993233000e4e411f0499b2 WHIRLPOOL 48ae0af0456c5882fceaf386e59eab1910b5e4f2bbf531fa8c0681b9eec20983b1756040d3de9f1cd2d1bead4dc135a3d3b225f572eb154f1b7b6bb87bb2270e
 EBUILD vo-amrwbenc-0.1.1.ebuild 1302 SHA256 5c6f0447eef31c3023ef6f888cffe47bb5ffc9749287a51abc9f7ca4a0464319 SHA512 fe68a8afee7831041e156477d6b0b90755f29233ec57260ce71cbeca855c0346955c219c525d10124ec9d5d63ebebd3dc17d8becb430c68ffa7aa123dfb204c1 WHIRLPOOL e569057e9e718818ace4f58900469bc9bb997cbff1c0c4ba042ce28d85ae1ef79a0fd76797308b46e5fce7539209c72b96447d28ea6170786771a309ccb76e3b
+EBUILD vo-amrwbenc-0.1.2-r1.ebuild 1123 SHA256 15d08f23d5cb35b41bf57273051bd5593861e524ef1b966bc526be973ee8f6de SHA512 7532b52552d66b1afe602c6b1d5cabd0db778282031d84b57d8d6a0fd05ebd71bcc33d67f5cefcf203e8405174ea06e855ad085cf45590e15c31e6d233be24c0 WHIRLPOOL 485d63984eb4539020c3b29044183805be44fa9bc78fdfca34c253e71b72c95251f07c664dbac691d269395d4b92df35d65a9eeaf3163d2d77e720a2406de2e8
 EBUILD vo-amrwbenc-0.1.2.ebuild 1313 SHA256 2cafebebed662f3d7a26a15c5e54cee1c609ff031ebc69e03a9249c3f8eb731a SHA512 fa0340f7bf7f43debad11e203e7ac85823b3b9088cfe744e2b27f4d856260da25877e9ea4f0f8db2c34657540f2ed758aa8cf0fc31224593750ad86d3518eb95 WHIRLPOOL 806c39e7019652c5ee5817b13b56785b1b3e74295c80d17066135c252d119f059841578837d5317b8c3b542ff74c1b44b4b5df71045b087b6097f20209824e15
-EBUILD vo-amrwbenc-9999.ebuild 1250 SHA256 2dcd20bc7c9e03451298e59ef1e1b2471eecf36e46dfca9c20fef503b72c5893 SHA512 a60057e21699a608c86935c10d9cc621d96ee7be68fda2f92e75b08a3fa65228ef44b6bcec45137ab74fd3e9e5703bf59d5db68bed3e791203759f82090ecd09 WHIRLPOOL 60c8cfc80568eca7390d1abae971c0c22d899c9c0b3ad32e33e24b2d18e3e17986ddf4b8c903675b32ef939610d43136a7a1c8d5931aba8b22d29af05ecb9acd
-MISC ChangeLog 3326 SHA256 c9b782be5af975ec22a74907ad7dbd1d49bcc203de8c8b8a92675a8e30874280 SHA512 6201b80d2cb0795cb25744a2e3f9d278bc7dfd7761f77af85e6a684efca631ab0c6d707098bcdace7db994037e9330a41643c7ef0f280794dd374c3fbe1537de WHIRLPOOL 43788efd0b3a3bcb1da70180abbedc4329d90ebe0ce27b5c19d115ade62103aec0aa11085b4ccad00ea0afcfe6449f159555b9782f54f2bbec6c9766ea63b26d
+EBUILD vo-amrwbenc-9999.ebuild 1119 SHA256 6408b3a6b952672692f9bd804648db09115f48200d2e75c46877c155eb3b938b SHA512 b3ac0fd789754758eee8a6237dfbcd91d755bf1bd8568c35aefb73d3b12cd9843fd09fd6234349117c9ed154672a66b3ad6fd5ae0e8f92a36b2e4f664335b3c0 WHIRLPOOL 8a58f0c244a9c29789b783d4ad64e732dd6ad9d9795c2e0fa11dff6dc8104ba3281898c1e2d4e444e433db49ce8818cc7beedd8d39c6e0ad3739a31398e07ff0
+MISC ChangeLog 3501 SHA256 74631def32cd8bfb3013c40f4e819d620e6fa11eb566b36b093db63ec6ab5306 SHA512 57dabf6b0d3707b94ecedbab995f0f799e13bdf135853d9fd578a1776f218a2c5ddba84861955aec235e99f386a2ebcf63f7fe2a6e12deb4584bfe3499937710 WHIRLPOOL 9725a3508d3b6471e18225222e0ef8a280c3bc77ab1ad7d966082ed3c43f69f07daf26e60e1d0fdeedb43770bd4825f1faba0c25fe690933ca6cfcae5d773e76
 MISC metadata.xml 471 SHA256 98f8b0ba0c3cb0a42e96d6b178f060df80da355686a94f76dfa1f358c11b574d SHA512 fd4981ea84e78445837d8f2449f1673572a21857e30f0ad3255a9d97a55c49ea2dda5b4a7d4548cb9db2cc17bf8ff10ba88fa22fac5360ec740248726a802c7e WHIRLPOOL d2ff7b56bca23e996901bfc9823e9494518a94126adccd82eec40a62a6abed72a4e772f7bae5b91aacc7083a30be751b2f0e1ff2abbb96239287abaedcbab782
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGKFl8ACgkQvFcC4BYPU0oJbQCgpoBTjaakBF5caRAuWeoJPCDh
+ft0AoL7DTzlXiU9B9MX1408vh6v0WrHX
+=gPVI
+-----END PGP SIGNATURE-----
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2-r1.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..22daef84a41c
--- /dev/null
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2-r1.ebuild,v 1.1 2013/05/08 09:09:52 aballier Exp $
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://github.com/mstorsjo/${PN}.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+	AUTOTOOLS_AUTORECONF=1
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="VisualOn AMR-WB encoder library"
+HOMEPAGE="http://sourceforge.net/projects/opencore-amr/"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+else # Official release
+	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE="examples static-libs"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable examples example) \
+	)
+	autotools-multilib_src_configure
+}
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
index 7a83e55de86b..9f0d6a2fcadc 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild,v 1.5 2012/05/15 13:09:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild,v 1.6 2013/05/08 09:09:52 aballier Exp $
 
-EAPI=4
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 
 if [[ ${PV} == *9999 ]] ; then
 	SCM="git-2"
 	EGIT_REPO_URI="git://github.com/mstorsjo/${PN}.git"
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+	AUTOTOOLS_AUTORECONF=1
 fi
 
-inherit eutils multilib autotools ${SCM}
+inherit autotools-multilib ${SCM}
 
 DESCRIPTION="VisualOn AMR-WB encoder library"
 HOMEPAGE="http://sourceforge.net/projects/opencore-amr/"
@@ -30,18 +33,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="examples static-libs"
 
-src_prepare() {
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
 src_configure() {
-	econf \
-		--disable-dependency-tracking \
+	local myeconfargs=(
 		$(use_enable examples example) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${D}"usr/$(get_libdir) -name '*.la' -delete
+	)
+	autotools-multilib_src_configure
 }