Version bump and cleanup.

5 files changed, 110 insertions, 10 deletions

diff --git a/media-plugins/xmms-musepack/ChangeLog b/media-plugins/xmms-musepack/ChangeLog
index 9c35ea2d0805..20906c694cc7 100644
--- a/media-plugins/xmms-musepack/ChangeLog
+++ b/media-plugins/xmms-musepack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/xmms-musepack
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.12 2004/03/29 23:33:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.13 2004/04/22 09:06:48 eradicator Exp $
+
+*xmms-musepack-0.99 (22 Apr 2004)
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-musepack-0.99.ebuild, files/xmms-musepack-0.99-bad-makefile.patch:
+  Version bump and cleanup.
 
   30 Mar 2004; David Holm <dholm@gentoo.org> xmms-musepack-0.98-r2.ebuild:
   Added to ~ppc.
diff --git a/media-plugins/xmms-musepack/Manifest b/media-plugins/xmms-musepack/Manifest
index c7e7a8fa8236..a0e83ddaa24c 100644
--- a/media-plugins/xmms-musepack/Manifest
+++ b/media-plugins/xmms-musepack/Manifest
@@ -1,16 +1,18 @@
-MD5 52defa034e7cdd89176e790c291f1e82 ChangeLog 2671
-MD5 ddd8466c451f9570757c8bf706e9239b xmms-musepack-0.94-r1.ebuild 1116
+MD5 cabaa8ad89259c4c24fef7e4a35257e5 xmms-musepack-0.99.ebuild 1298
 MD5 593863779ed74851a5ffdc32966432c9 xmms-musepack-0.94.ebuild 739
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 6d88011b963756aa43b6df79676821e0 xmms-musepack-0.98-r1.ebuild 1644
-MD5 bafe4bde51538da36bf3cd105eed2edc xmms-musepack-0.94-r2.ebuild 1145
 MD5 2d77da7d8b9d35c6c434c9dee12d9032 xmms-musepack-0.98-r2.ebuild 1681
+MD5 bafe4bde51538da36bf3cd105eed2edc xmms-musepack-0.94-r2.ebuild 1145
+MD5 52defa034e7cdd89176e790c291f1e82 ChangeLog 2671
+MD5 6d88011b963756aa43b6df79676821e0 xmms-musepack-0.98-r1.ebuild 1644
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ddd8466c451f9570757c8bf706e9239b xmms-musepack-0.94-r1.ebuild 1116
 MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94 70
-MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94-r1 70
-MD5 ed030d04fa02f984be113732ad39b061 files/xmms-musepack-0.94-bad-makefile.patch 956
-MD5 eb1357b5fbaa2b86c3267d732568201d files/digest-xmms-musepack-0.98-r1 58
+MD5 8432487239eef2afaf83861bc698f68b files/digest-xmms-musepack-0.99 71
 MD5 e4ac40cdcd84c7fa35957450457407ce files/xmms-musepack-0.98-bad-makefile.patch 2005
+MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94-r1 70
 MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94-r2 70
+MD5 eb1357b5fbaa2b86c3267d732568201d files/digest-xmms-musepack-0.98-r1 58
 MD5 eb1357b5fbaa2b86c3267d732568201d files/digest-xmms-musepack-0.98-r2 58
-MD5 fb770d6a178a0327376d76d9b996b20a files/xmms-musepack-0.94-titles.patch 3111
 MD5 db7221c06a0b86abf3ea066cc66a3b52 files/xmms-musepack-0.98-titles.patch 8955
+MD5 ed030d04fa02f984be113732ad39b061 files/xmms-musepack-0.94-bad-makefile.patch 956
+MD5 fb770d6a178a0327376d76d9b996b20a files/xmms-musepack-0.94-titles.patch 3111
diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.99 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.99
new file mode 100644
index 000000000000..fc0f0c77feca
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.99
@@ -0,0 +1 @@
+MD5 a85df4dc78f4251643ccea9be5775144 xmms-musepack-0.99.tar.bz2 200455
diff --git a/media-plugins/xmms-musepack/files/xmms-musepack-0.99-bad-makefile.patch b/media-plugins/xmms-musepack/files/xmms-musepack-0.99-bad-makefile.patch
new file mode 100644
index 000000000000..a563d71b928d
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/xmms-musepack-0.99-bad-makefile.patch
@@ -0,0 +1,43 @@
+--- Makefile.orig	2004-04-22 01:49:59.000000000 -0700
++++ Makefile	2004-04-22 01:51:18.000000000 -0700
+@@ -1,6 +1,6 @@
+ CC      = gcc
+ VERSION = 0.99
+-OPTIONS = -Wall -shared -O3 -march=pentium --fast-math -DPOSIX -D_REENTRANT -DREENTRANT -I.. -DMPP_ENCODER
++OPTIONS = -Wall -shared $(CFLAGS) -DPOSIX -D_REENTRANT -DREENTRANT -I.. -DMPP_ENCODER
+ 
+ 
+ SOURCE  = in_mpc.c bitstream.c huffsv46.c huffsv7.c requant.c synth_filter.c mpc_dec.c equalizer.c equal.c tags.c
+@@ -13,25 +13,25 @@
+ 
+ install-test:   all
+ 	ln -f -s \
+-	  `pwd`/xmms-musepack-`echo $(VERSION)`.so  
+-	  ~/.xmms/Plugins/xmms-musepack-`echo $(VERSION)`.so
++	  `pwd`/xmms-musepack-$(VERSION).so  
++	  ~/.xmms/Plugins/xmms-musepack-$(VERSION).so
+ 
+ 
+ install:        all
+ 	install -g root -o root -m 755 \
+-	  ./xmms-musepack-`echo $(VERSION)`.so \
+-	  `xmms-config --input-plugin-dir`/xmms-musepack-`echo $(VERSION)`.so
++	  ./xmms-musepack-$(VERSION).so \
++	  `xmms-config --input-plugin-dir`/xmms-musepack-$(VERSION).so
+ 
+ 
+ xmms-musepack-$(VERSION).so: $(SOURCE) $(HEADER) $(EQUAL) Makefile
+ 	@echo
+ 	@echo
+-	$(CC) -s -DVERSION=\"$(VERSION)\" $(OPTIONS) `xmms-config --cflags --libs` `gtk-config --cflags --libs` -o xmms-musepack-`echo $(VERSION)`.so $(SOURCE) 2>&1 | grep -v '/usr/'
++	$(CC) -s -DVERSION=\"$(VERSION)\" $(OPTIONS) `xmms-config --cflags --libs` `gtk-config --cflags --libs` -o xmms-musepack-$(VERSION).so $(SOURCE) 2>&1 | grep -v '/usr/'
+ 
+ 
+ clean:
+-	rm -f *.o xmms-musepack-`echo $(VERSION)`.so
++	rm -f *.o xmms-musepack-$(VERSION).so
+ 
+ 
+ uninstall:
+-	rm -f `xmms-config --input-plugin-dir`/xmms-musepack-`echo $(VERSION)`.so
++	rm -f `xmms-config --input-plugin-dir`/xmms-musepack-$(VERSION).so
diff --git a/media-plugins/xmms-musepack/xmms-musepack-0.99.ebuild b/media-plugins/xmms-musepack/xmms-musepack-0.99.ebuild
new file mode 100644
index 000000000000..e31162d02149
--- /dev/null
+++ b/media-plugins/xmms-musepack/xmms-musepack-0.99.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-0.99.ebuild,v 1.1 2004/04/22 09:06:48 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="XMMS plugin to play audio files encoded with Andree Buschmann's encoder Musepack (mpc, mp+, mpp)"
+HOMEPAGE="http://www.uni-jena.de/~pfk/mpp/ http://corecodec.org/projects/mpc/"
+SRC_URI="http://corecodec.org/download.php/195/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND="media-sound/xmms"
+
+DOCS="ChangeLog README_mpc-plugin_english.txt README_mpc-plugin_finnish.txt README_mpc-plugin_german.txt README_mpc-plugin_korean.txt README_mpc-plugin_spanish.txt"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# They forgot to remove the compiled lib.
+	rm -f *.so
+
+	# Fix up the atrocious Makefile.
+	epatch ${FILESDIR}/${P}-bad-makefile.patch
+
+#	Notr needed for the plugin:
+#	if (! use esd && ! use oss); then
+#		eerror "You muse have either oss or esd active in your USE flags for xmms-musepack to work properly
+#	fi
+#
+#	use esd || sed -i 's:#define USE_ESD_AUDIO:#undef USE_ESD_AUDIO:' mpp.h
+#	use oss || sed -i 's:#define USE_OSS_AUDIO:#undef USE_OSS_AUDIO:' mpp.h
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe ${P}.so
+	dodoc ${DOCS}
+}