Introduce USE="nas" for media-libs/nas support thanks to upstream fixing the nas code that was broken for years.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 18 insertions, 10 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 04bb5ce723dd..9ba27ac9bba1 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmikmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.113 2013/12/10 19:43:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.114 2013/12/17 17:10:07 ssuominen Exp $
+
+  17 Dec 2013; Samuli Suominen <ssuominen@gentoo.org> libmikmod-3.3.4.ebuild:
+  Introduce USE="nas" for media-libs/nas support thanks to upstream fixing the
+  nas code that was broken for years.
 
 *libmikmod-3.3.4 (10 Dec 2013)
 
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index ae389e6df53a..c4f63e434d6e 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -19,13 +19,17 @@ EBUILD libmikmod-3.2.0-r1.ebuild 2170 SHA256 0d1fbc2bdab3307f527809ca689389eccdf
 EBUILD libmikmod-3.2.0.ebuild 1680 SHA256 c2a99aa1dda88635078d756acfd538d6bd2226bf08da89c06f2e849b66fa9b74 SHA512 79a577b8f45d834f44132892a2946833850cfcf1e84f8d39808ed5c136086323754532df2e286fbfe798b096c87521f88f0564041a1de9cc0a6b33ca19ab98eb WHIRLPOOL bd5404fe1799a39f7094bc93917c4edab6056c4b9328c426b68870871002ca29e4c1154f5772c9934bda4357c596fb93faf9a6c7c3262f038e387ec688aaed1b
 EBUILD libmikmod-3.3.2.ebuild 1974 SHA256 c2e085849c76fba4eefba5a16a8533f28916917e4d11bdd78b25625a3b950aa1 SHA512 dc008b492dc72ef9e16beb3293cd2b18ae86bdc96a8a109b1a4cafff372e37d456c41783d9f6b1e9ec449f9b1d12f3f494c03ca9edb20b45a7b8e0c4ec5e47d2 WHIRLPOOL 0f2d926d495d150a93a62d3eebc7f9556691277b4f8bd8672f53da323bd5fc7dab3086d5cf09005de7bc294d1c0d822dc4c4d23cd9a9ff966a277659e94172e2
 EBUILD libmikmod-3.3.3.ebuild 1967 SHA256 5380b703575225ca22aa341844919b306393e86697a1036c70ef3bf97516f7cf SHA512 05deb2af00885d2b54041226bd5f665f852deeb730342e9b5fa15cbf5d29e3b81c93e3c5d3a1ed1ed9c739b95855f84efdb9be1c669dc84f3d567c6d570cceb8 WHIRLPOOL 09b1255a8530dd7f30504949a953fa18035d53dcaf7bf082559aa802f945634e41e6981579653c1da0c8faaf28947487fe3d17fd486043ce22f756380db7e7ad
-EBUILD libmikmod-3.3.4.ebuild 1967 SHA256 6cdc57fea77ac81847e3f533bd310fb422e316d730116b148d85ff8e73a67417 SHA512 8c71fc2444cc66c7c39f810313393fbc5052fe1d90107639c165a6828deb26a5e9a0d506b4e85813dd1acb7bf2c6f52302c5979c8a3d1cae1b17288c41bc9520 WHIRLPOOL f1d49a3f07197ead0d86f947d76266997c7e045b991c8f1cce03daba816298b442eb6146ab4520456e25de5a0f9d8052d4231821c941dcdd9e616eb2d444513a
-MISC ChangeLog 17857 SHA256 592be1bbee71a40e000e4d55517283b9f77417ffd1473111765bcff6c1817c78 SHA512 66ba2a127ec11746f715fbc59f0c8b04a4583713c7b245ddee177bac3af6556ae86da87e8a9e7cce7d0bc083fbb780ef10208c884177f598130b170e7c75e7c5 WHIRLPOOL a9d5e5108fe12491a8153abfdcefb0d63921f8024180810243644818d64708ddaccbb0ac24b1e38f7d14fbb3c5b8c385fabcd4d8827cd11c8bca7dcce0598109
+EBUILD libmikmod-3.3.4.ebuild 1957 SHA256 d6d9d7cbe49f5baae141a2c941a82a813b54119cac5e08797e618229739a8aa7 SHA512 06f86f53b6a133b5c0eb6098e6c424124130d737c7e2db4ebc41ed214d90ad3e408eab39153a1c99f4fdc0ad7e64514fd4020e84068e9924eefa30cea1222ddf WHIRLPOOL 8db6d849d02fd962216d53ca19e46f0c365e48ae8ac651a8aa32bd44f795b93f5187efca7072d520e82274e2535edcdc8e96f5f27f1bcdb5629f51ea8df02198
+MISC ChangeLog 18054 SHA256 00152144662c4287339eb294a296a1a07fca877d8df1acf53be07274ebe511c5 SHA512 10f481dcca5c3ab722db0b8854fab13777794fa84a2748b712ef9bbdd092e190b4c67fec169ae1336240e807ef8e2c4ddea698bb9e827a8ce6d690c3f67b1faa WHIRLPOOL 61df1da6e12fa8a2b0d41892fca6adaea06aa7ca7beded455dbf4399f67f5d6982a08e35119c6398125fe5b0ba7746a45f7e112a2b6c9da75aa128e966c19011
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKnbu4ACgkQvFcC4BYPU0o5IwCfXJ3VQJyrtEtzyFf+NN5cqr1h
-LRYAoKe+NMKpOLVfoAh05lPbfMeYXoWe
-=WEKr
+iQEcBAEBCAAGBQJSsIVaAAoJEEdUh39IaPFNJXoIAIvdaEbSUpcetPCtbeunlnt8
+7abPVEBugY82+wkYsBTEpXDuQPvEkDkGNdtDz2RwR0bpHK1R1VFpXUVheRn/iTXG
+vFwXM90ecnX6Un0/zfcCZv6OTgVXd74E7FfaU3eTF7EWkgsuhDjyszDr3eiAqho9
+s8iCTKW2bTd7bGFqSzTVet8GIEh5/r1mVM3ekkpSsxUOkjg7CtldepY8uJ82fwUV
+xftRQwkYY0sUnIR3HI6zBKLQK7uywdGuwwAThyf0vWjA68tgJDPUUpme2KMbClEo
+naaYZmp+5k+n19BfSTp54/hEihyfqgbP789IPtFKBq431SX3s3OS7MQ2cHe4gyQ=
+=imIv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmikmod/libmikmod-3.3.4.ebuild b/media-libs/libmikmod/libmikmod-3.3.4.ebuild
index a9b06bbfdd0b..acd7e347e991 100644
--- a/media-libs/libmikmod/libmikmod-3.3.4.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.3.4.ebuild,v 1.1 2013/12/10 19:43:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.3.4.ebuild,v 1.2 2013/12/17 17:10:06 ssuominen Exp $
 
 EAPI=5
 inherit eutils multilib-minimal
@@ -12,11 +12,12 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug oss sse2 static-libs +threads"
+IUSE="+alsa altivec coreaudio debug nas oss sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa oss coreaudio )"
 
 RDEPEND="alsa? ( media-libs/alsa-lib:=[${MULTILIB_USEDEP}] )
+	nas? ( media-libs/nas:=[${MULTILIB_USEDEP}] )
 	!${CATEGORY}/${PN}:2
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
 					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
@@ -32,12 +33,11 @@ multilib_src_configure() {
 		mysimd="$(use_enable sse2 simd)"
 	fi
 
-	# nas: was disabled in 3.2.0 for being broken, unknown for 3.3.2
 	# sdl, sdl2, openal: missing multilib supported ebuilds, temporarily disabled
 	ECONF_SOURCE=${S} \
 	econf \
 		$(use_enable alsa) \
-		--disable-nas \
+		$(use_enable nas) \
 		--disable-sdl \
 		--disable-sdl2 \
 		--disable-openal \