Version bump, closes bug #83365. LICENSE correction.

(Portage version: 2.0.51.19)

9 files changed, 129 insertions, 24 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index 4d083e944b3a..58fc3e23ab27 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/musepack-tools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.21 2005/03/08 18:27:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.22 2005/03/19 14:06:14 chainsaw Exp $
+
+*musepack-tools-1.15v (19 Mar 2005)
+
+  19 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/musepack-tools-1.15v-Makefile.patch,
+  +files/musepack-tools-1.15v-gcc4.patch, musepack-tools-1.15s-r2.ebuild,
+  musepack-tools-1.15t.ebuild, musepack-tools-1.15u.ebuild,
+  +musepack-tools-1.15v.ebuild:
+  Version bump, closes bug #83365. Correct LICENSE in all ebuilds.
 
 *musepack-tools-1.15u (08 Mar 2005)
 
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index fffb7f9c272e..cebdaa744b5e 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,24 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 d62b8149446c56a569563231b9df844f musepack-tools-1.15v.ebuild 1327
 MD5 88c97455ee33b135b090c79deee4c598 musepack-tools-1.15u.ebuild 1521
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 607c6915acce88d9461d45c97807946b musepack-tools-1.15s-r2.ebuild 1603
-MD5 a6e3607df9006c34a4586d2ce1c87bac musepack-tools-1.15t.ebuild 1441
 MD5 141cb18112a07254c958fdf3af456cfe ChangeLog 4010
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15t-gcc4.patch 288
-MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
-MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
+MD5 a6e3607df9006c34a4586d2ce1c87bac musepack-tools-1.15t.ebuild 1441
+MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288
 MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69
+MD5 83959d8ebd21d40ec956ac942fa6b9f1 files/digest-musepack-tools-1.15v 69
+MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15v-Makefile.patch 750
+MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750
 MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69
+MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15v-gcc4.patch 288
+MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15t-gcc4.patch 288
 MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15u-Makefile.patch 750
-MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750
-MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCLe6A06ebR+OMO78RAqEUAJ4oxqi7E3ca799IhjxFtLywNwd9lQCdFo5v
-p+8Exvfg+nvD36JFvV7BQLw=
-=Xgbw
------END PGP SIGNATURE-----
+MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
+MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15v b/media-sound/musepack-tools/files/digest-musepack-tools-1.15v
new file mode 100644
index 000000000000..f1d2d76373a6
--- /dev/null
+++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15v
@@ -0,0 +1 @@
+MD5 eb3e6b64b1f7d68aaeb04e39936d87fb mpcsv7-src-1.15v.tar.bz2 416868
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch
new file mode 100644
index 000000000000..4011fdc02959
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch
@@ -0,0 +1,32 @@
+--- Makefile.orig	2005-02-07 15:56:48.000000000 +0100
++++ Makefile	2005-02-07 23:23:20.422596896 +0100
+@@ -36,7 +36,7 @@
+ # If unset Intel 386 with optimization for Pentium is selected.
+ 
+ ifndef ARCH
+-ARCH     = -march=i586 -m$(TUNE)=i686
++ARCH     = #-march=i586 -m$(TUNE)=i686
+ endif
+ 
+ ifdef MINGW
+@@ -97,7 +97,7 @@
+ # Name of libraries you need for linking
+ 
+ ifndef MINGW
+-LDADD    = -lm
++LDADD    = `esd-config --libs`
+ #LDADD   += -lesd
+ else
+ LDADD    = -lwinmm -lws2_32
+@@ -176,9 +176,9 @@
+ 	-fno-finite-math-only -fno-unsafe-math-optimizations
+ endif
+ 
+-OPTIM_SPEED = -O2 $(FLAGS) $(UNBREAK)
++OPTIM_SPEED = $(UNBREAK)
+ 
+-OPTIM_SIZE = -Os $(FLAGS) $(UNBREAK)
++OPTIM_SIZE = $(UNBREAK)
+ 
+ # Options to generate Assembly code for inspecting
+ 
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-gcc4.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-gcc4.patch
new file mode 100644
index 000000000000..ddae02c56828
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-gcc4.patch
@@ -0,0 +1,11 @@
+--- sv7/mppenc.c~	2005-02-10 04:44:48.944566440 +0100
++++ sv7/mppenc.c	2005-02-10 04:45:04.464207096 +0100
+@@ -1844,7 +1844,7 @@
+ }
+ 
+ 
+-static void
++void
+ OverdriveReport ( void )
+ {
+     if ( Overflows > 0 ) {                                                // report internal clippings
diff --git a/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild b/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild
index 38814c104849..fb3c0dcaabbd 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r2.ebuild,v 1.3 2005/02/09 18:36:41 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild,v 1.4 2005/03/19 14:06:14 chainsaw Exp $
 
 IUSE="static 16bit"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.musepack.net"
 SRC_URI="http://www.saunalahti.fi/grimmel/musepack.net/source/mpcsv7-src-${PV}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86"
 
 RDEPEND="media-sound/esound
diff --git a/media-sound/musepack-tools/musepack-tools-1.15t.ebuild b/media-sound/musepack-tools/musepack-tools-1.15t.ebuild
index 0bec4ad9177e..41c8be7bbbf9 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15t.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15t.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.15t.ebuild,v 1.4 2005/02/11 21:57:08 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15t.ebuild,v 1.5 2005/03/19 14:06:14 chainsaw Exp $
 
 IUSE="static 16bit"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.musepack.net"
 SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86"
 
 RDEPEND="media-sound/esound
diff --git a/media-sound/musepack-tools/musepack-tools-1.15u.ebuild b/media-sound/musepack-tools/musepack-tools-1.15u.ebuild
index ec9f7b87e750..b081104fe55f 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15u.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15u.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.15u.ebuild,v 1.1 2005/03/08 18:27:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15u.ebuild,v 1.2 2005/03/19 14:06:14 chainsaw Exp $
 
 IUSE="static 16bit"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.musepack.net"
 SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86"
 
 RDEPEND="media-sound/esound
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
new file mode 100644
index 000000000000..163fbc5d48c7
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 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.15v.ebuild,v 1.1 2005/03/19 14:06:14 chainsaw Exp $
+
+IUSE="static 16bit esd"
+
+inherit eutils flag-o-matic
+
+S="${WORKDIR}/sv7"
+
+DESCRIPTION="Musepack audio compression tools"
+HOMEPAGE="http://www.musepack.net"
+SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-sound/esound
+	 media-libs/id3lib"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	amd64? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-Makefile.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
+	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
+
+	if ! use esd ; then
+		sed -i 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
+	else
+		sed -i 's/#LDADD   += -lesd/LDADD   += -lesd/' Makefile
+	fi
+
+	if ! use x86 ; 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() {
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-mfpmath=sse" "-mfpmath=sse,387"
+	use static && export BLD_STATIC=1
+	ARCH= emake mppenc mppdec replaygain || die
+}
+
+src_install() {
+	dobin mppenc mppdec replaygain
+	dodoc COPYING* README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
+}