Add multilib support

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

3 files changed, 64 insertions, 15 deletions

diff --git a/media-sound/gsm/ChangeLog b/media-sound/gsm/ChangeLog
index 105912464ed0..4e420949d6d9 100644
--- a/media-sound/gsm/ChangeLog
+++ b/media-sound/gsm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/gsm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.44 2013/03/03 09:00:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.45 2013/05/08 10:53:42 aballier Exp $
+
+*gsm-1.0.13-r1 (08 May 2013)
+
+  08 May 2013; Alexis Ballier <aballier@gentoo.org> +gsm-1.0.13-r1.ebuild:
+  Add multilib support
 
   03 Mar 2013; Mike Frysinger <vapier@gentoo.org> gsm-1.0.13.ebuild:
   Add s390 love.
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index b95128235f63..5d5990058873 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -5,23 +5,14 @@ AUX gsm-1.0.12-64bit.patch 591 SHA256 1204cf390608e866a7aa06099998a754afdf33095b
 AUX gsm-1.0.12-memcpy.patch 301 SHA256 3d6637db82d739c89cb4127bd28ce9d5b97cee7f27862943952d130a0fb6e9fe SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200 WHIRLPOOL 15832f1206caef42be2a3427327b74b7075da4b23ed32455b78c59f400fb0b61445d1fcf48b132272a025317d914db8c8caea7fa96b4ba910a3f3b3c082a979d
 AUX gsm-1.0.13-shared.patch 3723 SHA256 806dc90827785625e73048f1aa39b8c182c55a466c07a66be8883469be72c0af SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957 WHIRLPOOL 16dc4a348b3f2676ad48012ce2183a5b8cdc1627b466a6aaa5d6e1cde00346fc6a74c4c0ed51f94fb50000a3802e07daa820968265651766baf052de710ba745
 DIST gsm-1.0.13.tar.gz 65318 SHA256 52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa WHIRLPOOL 0beaad0ef45f3b200d98dca208dd9d6fced10e32b7d7db74e0d60fb1009909c270817fe481e4bc42b9c3471f9fd996d44a8d5a07bae9c4187ee12007afe9ca46
+EBUILD gsm-1.0.13-r1.ebuild 1740 SHA256 baf1d6c4acec676dfb0322cdc16022b2211ba29546cf67b95173e874d58f1895 SHA512 569ab73a87ae7130ac04ebacb9af2b406de4af65312a5e07d986c91a34eaf71d796f717f34249972ccab9c57f4f453853ab24065af9ddea420b11a6a2040a927 WHIRLPOOL 75a13d3e003f920b82ec988096992a4d332d1d32b2239d37ded932a8209bcbcffb9ffcbd14fbb7719dcb62d16394c3fc73fba11ce4aebe64080a18132416258b
 EBUILD gsm-1.0.13.ebuild 1568 SHA256 6a1a8ca6bc25d27b6968eb95bf7dc83f577762abd27cb425213038b212d7ec71 SHA512 1ae47f31e69fb360bf5198fca3c340f4ca78e59a2fe03849586c78e37ac3eccc0fe0f71cd0f8fcdc4b8d216eef4b574fccd65d45d59f1f650cbab56dc7d37966 WHIRLPOOL 015bdbedeedbe8d242a558972d9b812e1ffcee00f9215acc13a56f41841b5aa523e0768ddd1d1c41e84927e89f9441ce29b66027864c5758f6c5ba03b0d4b13c
-MISC ChangeLog 5014 SHA256 b162eb666ff35c29dc2b968f099230075653463ac50bf6574e89d016e90e19c8 SHA512 366ae50a88e48102608193b35e4f8c3c36f1b6000e50f993504f96c5f7c332ce8fd8dcec9c109f9547f3813d8a67d80053d5a5fdbb5f171d07a38573c642f74e WHIRLPOOL 730e5c38ede0bdf8a4afe1d47ea2e8eef2b9af9440f5a21d2773e3fe501787e195c7d18ed1f6cd1e7f9d38828c340e057eb35a1fb143f2ae85208ce2980affd4
+MISC ChangeLog 5145 SHA256 1f486435c8faa3f9993b83a214695b71b3056d8723447f1a2e26e56a53d9efc7 SHA512 3db96e8b7a86c813fb709b86c5814a34b35a0dd8334e643a8011a98b43166e49a8179bb20ca3716cd101a117e69844d8b33eb411445e7ec239b148154b272edc WHIRLPOOL 541a18e864c5c4880369a51b293052bb6749e14ec1f2eebba0862b34ed77a4741aec03f3a3ef2502470a2726fe930d62db0136284159294bf0690699fb4e9ea2
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRMxFzAAoJELEHsLL7fEFWkQcP/jiT6cyi20njqdeWs9cmYwjM
-7ZjycLpAMvAYzv+HodC0k3rCFiVR8OyI247yRLIv8vTzD/lNw5+HAMIZ8SbIqKRY
-9ypGpkTf21AqGIS/yaGWSrIYcBZCDtZPIOg3tCtC9rMfU5Xd8HudPwU93vdIMqTS
-ArSH0xVXHTf7HPEj8gvM1ylgFyWRo7ZttF5G3QwDE9B7YKljyamjH7VVXewPewky
-uImzjM/nj97v7xMP15L8MFL3ZPIwe5gRZk3M13pOTD2VoCo9F5N3H0vN5nCHrCsL
-1JckDqr0WaawAxzHHOcHlnSOB1GRjyov++eDlrIf/TVn8w6KmaWVPqyDhjflPDsa
-vOs2lUkRX0RGfu+fUkTeGuqTWNOiifhKGAls75q0J1bVTiAtCbD1yg8BOi9xgg/1
-kPzkNkP9HeySrlGOqAuYAkCgfLKvfZ0SCh/HsBVmeRSXrxL+ww5msczKq8L6P0a9
-FaaNIpEkh4DfrMdW1Q8afUWEAUI8osxC/3OHfRR/mCbI2/GMG3MNNdzSiFVvj/V9
-9x2DtkC+Jzsk1kdBMQ/N5TpwJU0SMcpLeh1/NEGyJHgaCJuOrjvtgRRBYAmtjAoc
-m9Wmp4Yty2XqR8/0GIf03ZCBa5ojEQiy6Bsw58wPcwLirsYDL4yVSmdd7Ap8NqyS
-PyV2+M9cMWg6oMKC5zck
-=AzOK
+iEYEAREIAAYFAlGKLrYACgkQvFcC4BYPU0oPzACfSn9LxdWuKhGxm5EPDSjdc++I
+gzsAn1hHOuaz0zrLz7FlS9Xl21UmEuP/
+=cWJA
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..5793df28e159
--- /dev/null
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.13-r1.ebuild,v 1.1 2013/05/08 10:53:42 aballier Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+DESCRIPTION="Lossy speech compression library and tool."
+HOMEPAGE="http://packages.qa.debian.org/libg/libgsm.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="gsm"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
+
+DOCS=( ChangeLog MACHINES MANIFEST README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-shared.patch \
+		"${FILESDIR}"/${PN}-1.0.12-memcpy.patch \
+		"${FILESDIR}"/${PN}-1.0.12-64bit.patch
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	# From upstream Makefile. Define this if your host multiplies
+	# floats faster than integers, e.g. on a SPARCstation.
+	use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
+
+	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+multilib_src_install() {
+	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
+
+	emake -j1 INSTALL_ROOT="${D}"/usr \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		GSM_INSTALL_LIB="${D}"/usr/$(get_libdir) \
+		GSM_INSTALL_INC="${D}"/usr/include/gsm \
+		GSM_INSTALL_MAN="${D}"/usr/share/man/man3 \
+		TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \
+		install
+
+	dolib lib/libgsm.so*
+
+	dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
+}