16bit local USE-flag, closes bug #72500. Also made oss dependency explicit as to never break emerge world.

4 files changed, 18 insertions, 23 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index 88bf90285785..d35b6e45aff7 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/musepack-tools
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.10 2004/11/26 23:03:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.11 2004/11/27 20:18:01 chainsaw Exp $
+
+*musepack-tools-1.15s-r1 (27 Nov 2004)
+
+  27 Nov 2004; Tony Vroon <chainsaw@gentoo.org>
+  +musepack-tools-1.15s-r1.ebuild, -musepack-tools-1.15s.ebuild:
+  Add 16bit local USE-flag, closes bug #72500. Made oss dependency explicit as
+  to never break emerge world.
 
 *musepack-tools-1.15s (26 Nov 2004)
 
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index b425355ef6b9..503c45cef643 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5433f0ef1d7bade38754ae9f1b14d6e0 ChangeLog 1878
+MD5 c4cd4c43eb5bb46b631f7bbc3c1ef848 musepack-tools-1.15s-r1.ebuild 1691
+MD5 f7dac60759ae34236cbd69526fd6fa1c ChangeLog 2142
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 fd2147daafd30e321b336c1200160930 musepack-tools-1.15s.ebuild 1831
 MD5 582859ba29730bd84422391062b5929b musepack-tools-1.15r-r2.ebuild 1747
-MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s 68
-MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
 MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
 MD5 da322e6de9051b732f4d858efb9656e5 files/digest-musepack-tools-1.15r-r2 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBp7aKArHZZzCEUG0RAjLpAJoDrvdp5WIlyHn0z/jxmwy1kq4OigCeP4kD
-NWBIuPUBFEK7oakS0xzUV4M=
-=TJcs
------END PGP SIGNATURE-----
+MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r1 68
+MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s 68
+MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r1 b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r1
new file mode 100644
index 000000000000..8fd08627a75f
--- /dev/null
+++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r1
@@ -0,0 +1 @@
+MD5 7b2aa799490a306efbd6642c2623a793 mpcsv7-src-1.15s.tar.gz 501116
diff --git a/media-sound/musepack-tools/musepack-tools-1.15s.ebuild b/media-sound/musepack-tools/musepack-tools-1.15s-r1.ebuild
index 9c8df4288af9..03cd7e893aef 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15s.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15s-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15s.ebuild,v 1.1 2004/11/26 23:03:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15s-r1.ebuild,v 1.1 2004/11/27 20:18:01 chainsaw Exp $
 
-IUSE="static esd oss"
+IUSE="static esd 16bit"
 
 inherit eutils flag-o-matic
 
@@ -24,10 +24,6 @@ DEPEND="${RDEPEND}
 	amd64? ( dev-lang/nasm )"
 
 src_unpack() {
-	if (! use esd && ! use oss); then
-		die "You must have either oss or esd active in your USE flags for xmms-musepack to work properly."
-	fi
-
 	unpack ${A}
 	cd ${S}
 
@@ -37,8 +33,6 @@ src_unpack() {
 	# Get rid of -mpreferred-stack-boundary=2 as it breaks amd64
 	sed -i 's:-mpreferred-stack-boundary=2::' Makefile
 
-	use oss || sed -i 's/#define USE_OSS_AUDIO/#undef USE_OSS_AUDIO/' mpp.h
-
 	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
 
 	if ! use esd ; then
@@ -49,6 +43,8 @@ src_unpack() {
 	if ! ( use x86 || use amd64 ); then
 		sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
 	fi
+
+	use 16bit && sed -i 's|//#define MAKE_16BIT|#define MAKE_16BIT|' mpp.h
 }
 
 src_compile() {