Version bump and cleanup closes bug #69538.

12 files changed, 15 insertions, 446 deletions

diff --git a/media-plugins/xmms-musepack/ChangeLog b/media-plugins/xmms-musepack/ChangeLog
index e5b1f88ab5a6..ae7795ebf46f 100644
--- a/media-plugins/xmms-musepack/ChangeLog
+++ b/media-plugins/xmms-musepack/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/xmms-musepack
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.21 2004/09/24 10:14:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.22 2004/10/31 09:45:50 eradicator Exp $
+
+*xmms-musepack-1.1_alpha10 (31 Oct 2004)
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/xmms-musepack-0.98-bad-makefile.patch,
+  -files/xmms-musepack-0.98-titles.patch,
+  -files/xmms-musepack-0.99-bad-makefile.patch,
+  -xmms-musepack-0.98-r2.ebuild, -xmms-musepack-0.99.ebuild,
+  +xmms-musepack-1.1_alpha10.ebuild, -xmms-musepack-1.1_alpha9.ebuild:
+  Version bump and cleanup closes bug #69538.
 
 *xmms-musepack-1.1_alpha9 (24 Sep 2004)
 
diff --git a/media-plugins/xmms-musepack/Manifest b/media-plugins/xmms-musepack/Manifest
index 4d115aabdded..7e4735e32a7c 100644
--- a/media-plugins/xmms-musepack/Manifest
+++ b/media-plugins/xmms-musepack/Manifest
@@ -3,6 +3,7 @@ MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 d673272e5de86a0af98cb1cd2ce6e5ff xmms-musepack-0.98-r2.ebuild 1675
 MD5 a02ba4392ce3f286cb4a696fbed734e0 xmms-musepack-0.99.ebuild 1609
 MD5 f309aa5390313a477b701fce2e78b508 xmms-musepack-1.00.ebuild 1593
+MD5 5254cad2bd11b6e5e092d25d47b61dd2 xmms-musepack-1.1_alpha10.ebuild 865
 MD5 5254cad2bd11b6e5e092d25d47b61dd2 xmms-musepack-1.1_alpha9.ebuild 865
 MD5 eb1357b5fbaa2b86c3267d732568201d files/digest-xmms-musepack-0.98-r2 58
 MD5 8432487239eef2afaf83861bc698f68b files/digest-xmms-musepack-0.99 71
@@ -11,4 +12,5 @@ MD5 db7221c06a0b86abf3ea066cc66a3b52 files/xmms-musepack-0.98-titles.patch 8955
 MD5 4ae2eb59b8a6af5faa84ec00fa3b6118 files/xmms-musepack-0.99-bad-makefile.patch 1681
 MD5 4e97b5144a2c0a49cb7e1ef0ef9e33c3 files/digest-xmms-musepack-1.00 70
 MD5 9fd390603c336d139e7a8a2ec1ffb183 files/xmms-musepack-1.00-bad-makefile.patch 1796
+MD5 9d46cbe1864fca838f0495343d7edf95 files/digest-xmms-musepack-1.1_alpha10 77
 MD5 4f4819ff1f701c8a3c1616f6211e6767 files/digest-xmms-musepack-1.1_alpha9 76
diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.98-r2 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.98-r2
deleted file mode 100644
index ab685c46cd34..000000000000
--- a/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.98-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b56f9aef8c5cec19addd5b7f9ffddc2e xmms-0.98.zip 124396
diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.99 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.99
deleted file mode 100644
index fc0f0c77feca..000000000000
--- a/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a85df4dc78f4251643ccea9be5775144 xmms-musepack-0.99.tar.bz2 200455
diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1_alpha10 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1_alpha10
new file mode 100644
index 000000000000..5d4a1539c4f4
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1_alpha10
@@ -0,0 +1 @@
+MD5 5e023d798a3366bd6ef3d2a80bcc1b47 xmms-musepack-1.1-alpha10.tar.bz2 14821
diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1_alpha9 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1_alpha9
deleted file mode 100644
index cf28c347a87f..000000000000
--- a/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1_alpha9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd83fe9afb7d7b11cc3e9b9cb6ec6c5d xmms-musepack-1.1-alpha9.tar.bz2 12456
diff --git a/media-plugins/xmms-musepack/files/xmms-musepack-0.98-bad-makefile.patch b/media-plugins/xmms-musepack/files/xmms-musepack-0.98-bad-makefile.patch
deleted file mode 100644
index 41a03dcd8ae4..000000000000
--- a/media-plugins/xmms-musepack/files/xmms-musepack-0.98-bad-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.orig	2004-02-04 13:54:09.721138744 +0000
-+++ Makefile	2004-02-04 13:56:24.944581656 +0000
-@@ -1,8 +1,8 @@
- VERSION = 0.98
--OPTIONS = -Wall -shared -O3 -march=pentiumpro -mpentium --fast-math -DPOSIX -D_REENTRANT -DREENTRANT -I.. -DMPP_ENCODER
-+OPTIONS = -Wall -shared $(ARCH) -DPOSIX -D_REENTRANT -DREENTRANT -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
-+SOURCE  = in_mpc.c bitstream.c huffsv46.c huffsv7.c requant.c synth_filter.c mpc_dec.c equalizer.c equal.c tags.c
- HEADER  =          bitstream.h huffsv46.h huffsv7.h requant.h synth_filter.h mpc_dec.h equalizer.h equal.h        minimax.h
- EQUAL   = akg_k141.h akg_k401.h akg_k501.h sh_hd580.h sh_hd600.h sf_amati.h
- 
-@@ -12,28 +12,28 @@
- 
- 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
- 
- 
- send:
diff --git a/media-plugins/xmms-musepack/files/xmms-musepack-0.98-titles.patch b/media-plugins/xmms-musepack/files/xmms-musepack-0.98-titles.patch
deleted file mode 100644
index c5825b048b88..000000000000
--- a/media-plugins/xmms-musepack/files/xmms-musepack-0.98-titles.patch
+++ /dev/null
@@ -1,241 +0,0 @@
---- in_mpc.c	2003-01-16 23:17:01.000000000 +0100
-+++ in_mpc.c	2004-02-19 16:35:48.667521040 +0100
-@@ -33,6 +33,8 @@
- #include "mpc_dec.h"
- #include "mpplus_blue.xpm"
- 
-+#include <xmms/titlestring.h>
-+
- #ifndef M_LN10
- # define M_LN10   2.3025850929940456840179914546843642
- #endif
-@@ -50,6 +52,7 @@
-     unsigned int  ByteLength;
-     unsigned int  Profile;
-     unsigned int  EncVersion;
-+    unsigned int  SampleRate;
- } StreamInfo;
- 
- int                TrueGapless      = 0;
-@@ -110,6 +113,7 @@
- static void     play               ( char* );
- static void     setvolume          ( const int, const int );
- static void     infoDlg            ( char* );
-+static gchar    *get_title(gchar *filename);
- static void     getfileinfo        ( char*, char**, int* );
- static void     config             ( void );
- static void     about              ( void );
-@@ -124,7 +128,7 @@
- static void     Equalizer_Setup    ( int on, float preamp_ctrl, float* eq_ctrl );
- 
- 
--char               displayed_info [512];
-+/*char               displayed_info [512];*/
- static GtkWidget*  mp_info = NULL;
- static GtkWidget*  mp_conf = NULL;
- static GtkWidget*  g_bitrate;
-@@ -355,6 +359,8 @@
-         Info -> Frames        =  HeaderData [1];
-         Info -> MS            = (HeaderData [2] << 1) >> 31;
-         Info -> Profile       = (HeaderData [2] >> 20) & 15;
-+    	static const unsigned short sftable [4] = { 44100, 48000, 37800, 32000 };
-+        Info->SampleRate = sftable [ HeaderData[2] >> 22 & 2 ];
-         Info -> EncVersion    =  HeaderData [6] >> 24;
-     }
-     else {
-@@ -366,6 +372,7 @@
-             Info -> Frames  >>= 16;
-         if ( Info -> StreamVersion < 6 )    // Bugfix: last frame was invalid for up to SV5
-             Info -> Frames--;
-+        Info->SampleRate = 44100;
-     }
- 
-     return 0;
-@@ -412,8 +419,6 @@
-     if ( GTK_TOGGLE_BUTTON (g_displaytaginfo) -> active ) {
-         i_displaytaginfo = 1;
-         strcpy ( TitleFormat, gtk_entry_get_text(GTK_ENTRY(titleformat_entry)) );
--        if ( *lastfilename != '\0' )
--            get_tags ( lastfilename );
-     }
-     else {
-         i_displaytaginfo = 0;
-@@ -437,8 +442,6 @@
- 
-     if ( i_displaytaginfo ) {
-         strcpy ( TitleFormat, gtk_entry_get_text ( GTK_ENTRY (titleformat_entry) ) );
--        if ( *lastfilename != '\0' )
--            get_tags ( lastfilename );
-     }
- 
-     write_cfg_file ();
-@@ -534,8 +537,8 @@
-         gtk_entry_set_text         ( GTK_ENTRY (titleformat_entry), TitleFormat );
-         gtk_widget_set_sensitive   ( titleformat_entry, i_displaytaginfo );
-         gtk_box_pack_start         ( GTK_BOX (title_box), titleformat_entry, TRUE, TRUE, 0 );
--        gtk_widget_show            ( titleformat_entry );
--        gtk_widget_show            ( title_box );
-+//        gtk_widget_show            ( titleformat_entry );
-+//        gtk_widget_show            ( title_box );
- 
-         format_box = gtk_hbox_new  ( FALSE, 5 );
-         gtk_box_pack_start         ( GTK_BOX (vbox), format_box, FALSE, FALSE, 0 );
-@@ -548,8 +551,8 @@
-         gtk_misc_set_alignment     ( GTK_MISC  (tag_description_label2), 0, 0 );
-         gtk_label_set_justify      ( GTK_LABEL (tag_description_label2), GTK_JUSTIFY_LEFT );
-         gtk_box_pack_start         ( GTK_BOX (format_box), tag_description_label2, TRUE, TRUE, 0 );
--        gtk_widget_show            ( tag_description_label2 );
--        gtk_widget_show            ( format_box );
-+//        gtk_widget_show            ( tag_description_label2 );
-+//        gtk_widget_show            ( format_box );
- 
-         // The OK & Cancel buttons are separated from the config stuff
-         separator = gtk_hseparator_new ();
-@@ -846,17 +849,17 @@
-     Init_Tags ();
-     CopyTags  ( filename );
- 
--                                                 printf ("Filename=%s\n", filename);
--    gettag ("Artist" , artist , sizeof artist ); printf ("Artist  =%s\n", artist  );
--    gettag ("Album"  , album  , sizeof album  ); printf ("Album   =%s\n", album   );
--    gettag ("Title"  , title  , sizeof title  ); printf ("Title   =%s\n", title   );
--    gettag ("Comment", comment, sizeof comment); printf ("Comment =%s\n", comment );
--    gettag ("Genre"  , genre  , sizeof genre  ); printf ("Genre   =%s\n", genre   );
--    gettag ("Year"   , year   , sizeof year   ); printf ("Year    =%s\n", year    );
--    gettag ("Track"  , track  , sizeof track  ); printf ("Track   =%s\n", track   );
-+                                                // printf ("Filename=%s\n", filename);
-+    gettag ("Artist" , artist , sizeof artist );// printf ("Artist  =%s\n", artist  );
-+    gettag ("Album"  , album  , sizeof album  );// printf ("Album   =%s\n", album   );
-+    gettag ("Title"  , title  , sizeof title  );// printf ("Title   =%s\n", title   );
-+    gettag ("Comment", comment, sizeof comment);// printf ("Comment =%s\n", comment );
-+    gettag ("Genre"  , genre  , sizeof genre  );// printf ("Genre   =%s\n", genre   );
-+    gettag ("Year"   , year   , sizeof year   );// printf ("Year    =%s\n", year    );
-+    gettag ("Track"  , track  , sizeof track  );// printf ("Track   =%s\n", track   );
- 
-     tag_found = *artist  &&  *album  &&  (*title || !*track);
--    strcpy ( displayed_info, eval_tag_format ( filename, artist, album, title, year, comment, genre, track ) );
-+/*    strcpy ( displayed_info, eval_tag_format ( filename, artist, album, title, year, comment, genre, track ) );*/
- }
- 
- 
-@@ -1354,8 +1357,6 @@
-     decode_pos_ms = 0;
-     seek_needed   =-1;
- 
--    get_tags ( lastfilename );
--
-     // opening sound-device
-     maxlatency = mod.output -> open_audio ( FMT_S16_LE, SAMPLERATE, NCH );
-     if ( maxlatency < 0 ) {             // cannot open sound device
-@@ -1379,7 +1380,9 @@
-         VBR_Bitrate = 0;
-     }
- 
--    mod.set_info ( i_displaytaginfo  &&  tag_found  ?  displayed_info  :  NULL,
-+    char *title = get_title(filename);
-+
-+    mod.set_info ( title,
-                    getlength (),
-                    VBR_Bitrate,
-                    SAMPLERATE / 1000,
-@@ -1587,12 +1590,57 @@
-     return;
- }
- 
-+static gchar *get_title(gchar *filename)
-+{
-+	TitleInput *input;
-+	gchar *temp, *ext, *_title, *path, *temp2;
-+
-+	XMMS_NEW_TITLEINPUT(input);
-+
-+	path = g_strdup(filename);
-+	temp = g_strdup(filename);
-+	ext = strrchr(temp, '.');
-+	if (ext)
-+		*ext = '\0';
-+	temp2 = strrchr(path, '/');
-+	if (temp2)
-+		*temp2 = '\0';
-+
-+	input->file_name = g_basename(filename);
-+	input->file_ext = ext ? ext+1 : NULL;
-+	input->file_path = g_strdup_printf("%s/", path);
-+
-+	if(i_displaytaginfo)
-+	{
-+		get_tags(filename);
-+		if(tag_found)
-+		{
-+			input->track_name = title;
-+			input->performer = artist;
-+			input->album_name = album;
-+			input->track_number = atoi(track);
-+			input->date = year;
-+			input->genre = genre;
-+			input->comment = comment;
-+		}
-+	}
-+
-+	_title = xmms_get_titlestring(xmms_get_gentitle_format(), input);
-+	if ( _title == NULL )
-+		_title = g_strdup(input->file_name);
-+
-+	g_free(temp);
-+	g_free(path);
-+	g_free(input);
-+
-+	return _title;
-+}
- 
- static void
- getfileinfo ( char* filename, char** _title, int* length_in_ms )
- {
-     StreamInfo    Info;
--    unsigned int  tmpFrames;
-+    *_title = get_title(filename);
- 
-     if ( filename == NULL  ||  filename[0] == '\0' ) {  // currently playing file
-         if ( length_in_ms != NULL )
-@@ -1603,8 +1651,7 @@
-         if ( length_in_ms != NULL ) {
-             if ( ReadFileHeader ( filename, &Info) )
-                 return;
--            tmpFrames     = Info.Frames;
--            *length_in_ms = (int) ( tmpFrames * 1152.e3 / SAMPLERATE + 0.5f );
-+            *length_in_ms = (int) ( Info.Frames * 1152.e3 / Info.SampleRate + 0.5f );
-         }
-     }
- }
-@@ -1751,14 +1798,14 @@
-                 xmms_usleep ( 25000 );
- 
-             // does not jump back to file in playlist, sets "green" on idle or out of snyc
--            if ( i_bitrate ) {
-+/*            if ( i_bitrate ) {
-                 mod.set_info ( i_displaytaginfo  &&  tag_found  ?  displayed_info  :  NULL,
-                                getlength (),
-                                avg_bitrate,
-                                SAMPLERATE / 1000,
-                                NCH );
-             }
--
-+*/
-             killDecodeThread = 1;
-             pthread_exit (NULL);
-             return 0;
-@@ -1803,12 +1850,12 @@
-             Frames++;
-             if ( i_bitrate  &&  Frames % i_bitrate == 0 ) {
-                 avg_bitrate = 1000 * (int) ( (BitsRead()-BitCounter) * SAMPLERATE / 1152.e3 / i_bitrate );
--                mod.set_info ( i_displaytaginfo  &&  tag_found  ?  displayed_info  :  NULL,
-+/*                mod.set_info ( i_displaytaginfo  &&  tag_found  ?  displayed_info  :  NULL,
-                                getlength (),
-                                avg_bitrate,
-                                SAMPLERATE / 1000,
-                                NCH );
--
-+*/
-                 BitCounter = BitsRead ();
-             }
- 
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
deleted file mode 100644
index a563d71b928d..000000000000
--- a/media-plugins/xmms-musepack/files/xmms-musepack-0.99-bad-makefile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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.98-r2.ebuild b/media-plugins/xmms-musepack/xmms-musepack-0.98-r2.ebuild
deleted file mode 100644
index 9cdfa70f904a..000000000000
--- a/media-plugins/xmms-musepack/xmms-musepack-0.98-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-0.98-r2.ebuild,v 1.4 2004/06/24 23:43:44 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-# Enabling -mfpath=sse can cause high-pitched whine, at least on Pentiums.
-# This drops the entire flag for safety. Reports of success with any variations
-# would be welcomed, but mind those eardrums!
-# This seems to be fixed for the 0.98 release (see bug #32327)
-# filter-mfpmath "sse"
-
-DESCRIPTION="XMMS plugin to play audio files encoded with Andree Buschmann's encoder Musepack (mpc, mp+, mpp)"
-HOMEPAGE="http://sourceforge.net/projects/mpegplus/ http://www.personal.uni-jena.de/~pfk/MPP/index2.html"
-SRC_URI="http://www.personal.uni-jena.de/~pfk/MPP/src/xmms-${PV}.zip"
-#SRC_URI="mirror://sourceforge/mpegplus/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="esd"
-
-RDEPEND="media-sound/xmms
-	esd? ( media-sound/esound )"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-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() {
-	mkdir ${S}
-	cd ${S}
-
-	unpack ${A}
-	# Fix up the atrocious Makefile.
-	epatch ${FILESDIR}/${P}-bad-makefile.patch
-	epatch ${FILESDIR}/${P}-titles.patch
-
-	if ! use esd; then
-		sed -i 's:#define USE_ESD_AUDIO:#undef USE_ESD_AUDIO:' mpp.h
-	fi
-}
-
-src_compile() {
-	# Makefile will use ARCH when calling gcc
-	emake ARCH="${CFLAGS}" || die
-}
-
-src_install() {
-	exeinto `xmms-config --input-plugin-dir`
-	doexe ${P}.so
-	dodoc ${DOCS}
-}
diff --git a/media-plugins/xmms-musepack/xmms-musepack-0.99.ebuild b/media-plugins/xmms-musepack/xmms-musepack-0.99.ebuild
deleted file mode 100644
index aa93b95eec29..000000000000
--- a/media-plugins/xmms-musepack/xmms-musepack-0.99.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.4 2004/06/24 23:43:44 agriffis 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 ~amd64"
-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
-
-#	Not 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
-
-	# Actually, it looks for esd.h which is stupid because this is an input plugin.
-	# See bug #40970
-	sed -i -e 's:#define USE_ESD_AUDIO:#undef USE_ESD_AUDIO:' \
-	       -e '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}
-}
diff --git a/media-plugins/xmms-musepack/xmms-musepack-1.1_alpha9.ebuild b/media-plugins/xmms-musepack/xmms-musepack-1.1_alpha10.ebuild
index 3d6f323a3204..d17c422f592d 100644
--- a/media-plugins/xmms-musepack/xmms-musepack-1.1_alpha9.ebuild
+++ b/media-plugins/xmms-musepack/xmms-musepack-1.1_alpha10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-1.1_alpha9.ebuild,v 1.1 2004/09/24 10:14:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-1.1_alpha10.ebuild,v 1.1 2004/10/31 09:45:50 eradicator Exp $
 
 IUSE=""