Remove old versions (and old patches); fix quoting of patches names; block media-sound/mppenc (the software replacing musepack-tools upstream, coming soon).

(Portage version: 2.1.2_rc4-r1)
 (Signed Manifest commit)

13 files changed, 12 insertions, 531 deletions

diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index d3b0980e6f5a..ccdad1bd91a0 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,30 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX musepack-tools-1.15r-r1-Makefile.patch 3748 RMD160 b507a50b9c80376cfd92c2dc4bf6a2a00e060d89 SHA1 b77a657cb12c75637ef2c2dd21ee156d2f6e0c98 SHA256 0ef0546982088cc4b42cff05444fe56642cd12230a1a2bf115130c9896e39044
-MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
-RMD160 b507a50b9c80376cfd92c2dc4bf6a2a00e060d89 files/musepack-tools-1.15r-r1-Makefile.patch 3748
-SHA256 0ef0546982088cc4b42cff05444fe56642cd12230a1a2bf115130c9896e39044 files/musepack-tools-1.15r-r1-Makefile.patch 3748
-AUX musepack-tools-1.15s-Makefile.patch 2893 RMD160 19aa0f779c3dfa80a9a8e22cf962fe7430d3ea5b SHA1 1c79a9c3febdb0955e373d7de90eae9ef174f31d SHA256 3999d79c41a915d9d9ec6f80acd608ff1fc2db9b0066359d17c94f4de15f2047
-MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
-RMD160 19aa0f779c3dfa80a9a8e22cf962fe7430d3ea5b files/musepack-tools-1.15s-Makefile.patch 2893
-SHA256 3999d79c41a915d9d9ec6f80acd608ff1fc2db9b0066359d17c94f4de15f2047 files/musepack-tools-1.15s-Makefile.patch 2893
-AUX musepack-tools-1.15t-Makefile.patch 750 RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 SHA1 ab36cf5f814ba043dcc1bc85babf95907602800f SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89
-MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750
-RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 files/musepack-tools-1.15t-Makefile.patch 750
-SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89 files/musepack-tools-1.15t-Makefile.patch 750
-AUX musepack-tools-1.15t-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff
-MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15t-gcc4.patch 288
-RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15t-gcc4.patch 288
-SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15t-gcc4.patch 288
-AUX musepack-tools-1.15u-Makefile.patch 750 RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 SHA1 ab36cf5f814ba043dcc1bc85babf95907602800f SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89
-MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15u-Makefile.patch 750
-RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 files/musepack-tools-1.15u-Makefile.patch 750
-SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89 files/musepack-tools-1.15u-Makefile.patch 750
-AUX musepack-tools-1.15u-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff
-MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288
-RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15u-gcc4.patch 288
-SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15u-gcc4.patch 288
 AUX musepack-tools-1.15v-Makefile.patch 572 RMD160 c8402ba8d07c2381759ecb2eda1a38b153b28d94 SHA1 87962aec7e82dbe7e06c897afe9c34f7999b0267 SHA256 12d9fe1a1980d3172128aae22f1c5919730e28925dd0aa12fceca4dfcb3db434
 MD5 22a0f1804346128859f9a99ff9305cf4 files/musepack-tools-1.15v-Makefile.patch 572
 RMD160 c8402ba8d07c2381759ecb2eda1a38b153b28d94 files/musepack-tools-1.15v-Makefile.patch 572
@@ -41,50 +17,26 @@ AUX musepack-tools-1.15v-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15v-gcc4.patch 288
 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15v-gcc4.patch 288
 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15v-gcc4.patch 288
-DIST mpcsv7-src-1.15s.tar.gz 501116
-DIST mpcsv7-src-1.15t.tar.bz2 463474
-DIST mpcsv7-src-1.15u.tar.bz2 465073
 DIST mpcsv7-src-1.15v.tar.bz2 416868 RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 SHA1 4fb6b1a45858638eb6b854b910038baa1b410146 SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd
-EBUILD musepack-tools-1.15s-r2.ebuild 1588 RMD160 c6b1c88a345e73c87ea463e605811c31f96445b2 SHA1 f4e18ddf3d0e5bca0bfeb4dbd9ca3a4adcf9c9c0 SHA256 3e1973e6fddf320b0a44c5d6e7b6b4549429c53705c33f9207aee6db20fa66c4
-MD5 1bae02184cdfee099296b98e4f09a0ba musepack-tools-1.15s-r2.ebuild 1588
-RMD160 c6b1c88a345e73c87ea463e605811c31f96445b2 musepack-tools-1.15s-r2.ebuild 1588
-SHA256 3e1973e6fddf320b0a44c5d6e7b6b4549429c53705c33f9207aee6db20fa66c4 musepack-tools-1.15s-r2.ebuild 1588
-EBUILD musepack-tools-1.15t.ebuild 1427 RMD160 f446999c9a691fcdb4d9573bf03bb50d739169e7 SHA1 579145c72f9c8f06e452a9c024c5cbb3f539e100 SHA256 72865c726b13ceb9244b3b614ceaa2b1987631bf6f90425ccd7bb9d4d26f51bf
-MD5 2c6f59eed8f1893c3be3699b0d7e19e9 musepack-tools-1.15t.ebuild 1427
-RMD160 f446999c9a691fcdb4d9573bf03bb50d739169e7 musepack-tools-1.15t.ebuild 1427
-SHA256 72865c726b13ceb9244b3b614ceaa2b1987631bf6f90425ccd7bb9d4d26f51bf musepack-tools-1.15t.ebuild 1427
-EBUILD musepack-tools-1.15u.ebuild 1506 RMD160 003d1b32f4c7c385adf9fa5f2672e7e717fcc7a8 SHA1 14099bd34b673d844153b8616148f0c3dc0daac7 SHA256 6f2fa46e61b27039648f8493094b43c56ccc8b3928a4bba6de61547b9bce594d
-MD5 c6772fd586092e9a311f2b643eafbf3f musepack-tools-1.15u.ebuild 1506
-RMD160 003d1b32f4c7c385adf9fa5f2672e7e717fcc7a8 musepack-tools-1.15u.ebuild 1506
-SHA256 6f2fa46e61b27039648f8493094b43c56ccc8b3928a4bba6de61547b9bce594d musepack-tools-1.15u.ebuild 1506
-EBUILD musepack-tools-1.15v.ebuild 1781 RMD160 8fb75a2f6cc360712999ca98d579c3132224c251 SHA1 e35246e18663de013c638f030a47041958d0eb5f SHA256 72fafa893aa5b857400f7ccc1c9600b555b2f9bbd16910980bf753ba5b6a75a7
-MD5 85b39f69cbd62ab00fea65eef881f2a2 musepack-tools-1.15v.ebuild 1781
-RMD160 8fb75a2f6cc360712999ca98d579c3132224c251 musepack-tools-1.15v.ebuild 1781
-SHA256 72fafa893aa5b857400f7ccc1c9600b555b2f9bbd16910980bf753ba5b6a75a7 musepack-tools-1.15v.ebuild 1781
-MISC ChangeLog 5674 RMD160 9c0f4bcc6f9029b3f36cb7d7ac3a83207f65a1c8 SHA1 747aa27301e42a7d1f384115039df3fd4d38cc1a SHA256 705ae2eed186067fedee9abdde52abb970874538b3cae419f8bc59b33731f117
-MD5 e3b717c8c52f1aea08e4382bc1901d48 ChangeLog 5674
-RMD160 9c0f4bcc6f9029b3f36cb7d7ac3a83207f65a1c8 ChangeLog 5674
-SHA256 705ae2eed186067fedee9abdde52abb970874538b3cae419f8bc59b33731f117 ChangeLog 5674
+EBUILD musepack-tools-1.15v.ebuild 1809 RMD160 69820ea8b2700c94b33ad4b2c43d60e43cf5a579 SHA1 bb1ef8e143dec042fa0b32caa50e535d91092ac6 SHA256 5495da2fdef82ff7eabb5ac30eefa2a1d72a41b0e44444a80880ba6e93934431
+MD5 cff58f5c5d1db56f7c4e95137d160f96 musepack-tools-1.15v.ebuild 1809
+RMD160 69820ea8b2700c94b33ad4b2c43d60e43cf5a579 musepack-tools-1.15v.ebuild 1809
+SHA256 5495da2fdef82ff7eabb5ac30eefa2a1d72a41b0e44444a80880ba6e93934431 musepack-tools-1.15v.ebuild 1809
+MISC ChangeLog 6289 RMD160 b3dff808dd2d09271c3069395c1f5f37d2878a5b SHA1 29e09c7e428b888452f07c0dda266fd5d03b5d3b SHA256 812b845194d7658f8de7fb029983769f072b94b9236de94689bd31d109b8ee6e
+MD5 2c19da01779fa898e2b0152922ee22ee ChangeLog 6289
+RMD160 b3dff808dd2d09271c3069395c1f5f37d2878a5b ChangeLog 6289
+SHA256 812b845194d7658f8de7fb029983769f072b94b9236de94689bd31d109b8ee6e ChangeLog 6289
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
-RMD160 732231111efb0ae8b80753df1c83fc0f57f9c41c files/digest-musepack-tools-1.15s-r2 68
-SHA256 9bc7062b9664f9f81a4188999a01405448a153eeace17db4fc7db7461808c439 files/digest-musepack-tools-1.15s-r2 68
-MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69
-RMD160 404eb884ce9dd492da692590de6d9e73b5534124 files/digest-musepack-tools-1.15t 69
-SHA256 6657cd0f0f8f95104f9e71e0fde424c281ed725d33e802859831cf8dbb4080e7 files/digest-musepack-tools-1.15t 69
-MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69
-RMD160 9387caf189d0846e35af280998e4ff8cfd9b6c9e files/digest-musepack-tools-1.15u 69
-SHA256 f0b2a69b2b0b26c64af9fdda6ce94a99ca7970cbbc9a48c9031099a4b0c7f7cd files/digest-musepack-tools-1.15u 69
 MD5 a696d3da9a4f97f07e79448f2648b1ba files/digest-musepack-tools-1.15v 253
 RMD160 cdcbcca7b08c218ae8ea7ded3f44f15902d442b0 files/digest-musepack-tools-1.15v 253
 SHA256 12fb95ca0b94444034a2392cbf747ff40ec5c1da72445138e2d76430053fd2a4 files/digest-musepack-tools-1.15v 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFEiN3CwUpWvClEHQoRAvldAJ44cweSH4akZ9O9QooTTMTgZdz4/ACffSxM
-nGxURvzpJlR0czKiPPwqrB4=
-=OE8r
+iD8DBQFFkWPVAiZjviIA2XgRAqalAKDOR/RClzn7oBBWaa+WWsx41t1AfwCgolRz
+fLwt1V5WivUbGFyBdKDaZR0=
+=BlNo
 -----END PGP SIGNATURE-----
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r2 b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r2
deleted file mode 100644
index 8fd08627a75f..000000000000
--- a/media-sound/musepack-tools/files/digest-musepack-tools-1.15s-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b2aa799490a306efbd6642c2623a793 mpcsv7-src-1.15s.tar.gz 501116
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15t b/media-sound/musepack-tools/files/digest-musepack-tools-1.15t
deleted file mode 100644
index 5ca320c344e9..000000000000
--- a/media-sound/musepack-tools/files/digest-musepack-tools-1.15t
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c882d37f08e74224160881214da8236f mpcsv7-src-1.15t.tar.bz2 463474
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15u b/media-sound/musepack-tools/files/digest-musepack-tools-1.15u
deleted file mode 100644
index c38fe6553ab9..000000000000
--- a/media-sound/musepack-tools/files/digest-musepack-tools-1.15u
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5bc6850ad68d731f4cb91a8c5986e65f mpcsv7-src-1.15u.tar.bz2 465073
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15r-r1-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15r-r1-Makefile.patch
deleted file mode 100644
index 2ba44b92d924..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15r-r1-Makefile.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- Makefile.orig	2004-06-18 23:27:10.227221536 +0300
-+++ Makefile	2004-06-18 23:29:28.279234440 +0300
-@@ -12,7 +12,7 @@
- 
- # Select the compiler. Normally gcc is used.
- 
--CC       = cc   -pipe -L/lib
-+CC       = gcc   -pipe -L/lib
- CC3      = gcc3 -pipe -L/lib
- 
- 
-@@ -20,8 +20,7 @@
- # If unset Intel 386 with optimization for Pentium is selected.
- 
- ifdef ARCH
--else
--ARCH     = -march=i586 -mcpu=i386
-+ARCH     = #-march=i586 -mcpu=i386
- endif
- 
- 
-@@ -80,7 +79,7 @@
- # Name of libraries you need for linking
- 
- LDADD    = -lm
--LDADD   += -lesd
-+LDADD   += `esd-config --libs`
- #LDADD  += -lossaudio
- #LDADD  += -lrt
- #LDADD  += -lsocket -lnsl
-@@ -100,7 +99,7 @@
- # Warning options, unset if the compiler makes trouble because of unknown
- # options
- 
--WARN  = \
-+WARN  = #\
- 	-Wall                   \
- 	-pedantic               \
- 	-W                      \
-@@ -143,7 +142,7 @@
- 	-fstrength-reduce       \
- 	-fexpensive-optimizations \
- 	-funroll-all-loops -fmove-all-movables -fstrength-reduce \
--	-mpreferred-stack-boundary=2 -malign-jumps=5 -malign-loops=0 -malign-functions=5
-+	-mpreferred-stack-boundary=2 -falign-jumps=5 -falign-loops=0 -falign-functions=5
- 
- # -fcse-follow-jumps \
- 
-@@ -156,7 +155,7 @@
- 	-frerun-loop-opt        \
- 	-fstrength-reduce       \
- 	-fmove-all-movables -fstrength-reduce -fcse-follow-jumps \
--	-mpreferred-stack-boundary=2 -malign-jumps=5 -malign-loops=0 -malign-functions=5
-+	-mpreferred-stack-boundary=2 -falign-jumps=5 -falign-loops=0 -falign-functions=5
- 
- # Options to generate Assembly code for inspecting
- 
-@@ -189,7 +188,7 @@
- 
- # Merge all options together for CFLAGS and CFLAG_SIZE
- 
--CFLAGS        = $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
-+CFLAGS       += $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
- CFLAGS       += -I$(XINCLDIR) -L$(XLIBDIR)
- #CFLAGS      += $(ASSEM)
- CFLAGS_SIZE   = $(CFLAGS) $(OPTIM_SIZE)
-@@ -275,10 +274,13 @@
- 
- 
- $(MPPDEC_TARGET): $(MPPDEC_OBJ)
-+ifndef BLDSTATIC
- 	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD)
--	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
--	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD)
--	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)-static
-+#	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
-+else
-+	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET) $(LDADD)
-+#	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
-+endif
- 
- 
- $(MPPDEC_TARGET)16: $(MPPDEC_OBJ)
-@@ -303,10 +305,13 @@
- 
- 
- $(MPPENC_TARGET): $(MPPENC_OBJ)
-+ifndef BLDSTATIC
- 	$(CC)         $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)        $(LDADD)
--	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
--	$(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)-static $(LDADD)
--	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)-static
-+#	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
-+else
-+	$(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET) $(LDADD)
-+#	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
-+endif
- 
- 
- $(MPPDEC_TARGET)-profiling: $(MPPDEC_OBJ)
-@@ -336,12 +341,12 @@
- 
- $(REPLAY_TARGET): $(REPLAY_OBJ) mpp.h config.c
- 	$(CC) $(CFLAGS) $(REPLAY_OBJ) -o $(REPLAY_TARGET)      $(LDADD)
--	-$(STRIP)     $(STRIPOPT)           $(REPLAY_TARGET)
-+#	-$(STRIP)     $(STRIPOPT)           $(REPLAY_TARGET)
- 
- 
- $(TAGGER_TARGET):
- 	$(CC) -DMPP_DECODER $(CFLAGS) -o $(TAGGER_TARGET) $(TAGGER_TARGET).c
--	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)
-+#	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)
- 
- 
- $(CLIPSTAT_TARGET):
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15s-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15s-Makefile.patch
deleted file mode 100644
index 76799512c368..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15s-Makefile.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- Makefile.orig	2004-06-18 23:27:10.227221536 +0300
-+++ Makefile	2004-06-18 23:29:28.279234440 +0300
-@@ -20,8 +20,7 @@
- # If unset Intel 386 with optimization for Pentium is selected.
- 
- ifdef ARCH
--else
--ARCH     = -march=i586 -mcpu=i386
-+ARCH     = #-march=i586 -mcpu=i386
- endif
- 
- 
-@@ -80,7 +79,7 @@
- # Name of libraries you need for linking
- 
- LDADD    = -lm
--LDADD   += -lesd
-+LDADD   += `esd-config --libs`
- #LDADD  += -lossaudio
- #LDADD  += -lrt
- #LDADD  += -lsocket -lnsl
-@@ -100,7 +99,7 @@
- # Warning options, unset if the compiler makes trouble because of unknown
- # options
- 
--WARN  = \
-+WARN  = #\
- 	-Wall                   \
- 	-pedantic               \
- 	-W                      \
-@@ -189,7 +188,7 @@
- 
- # Merge all options together for CFLAGS and CFLAG_SIZE
- 
--CFLAGS        = $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
-+CFLAGS       += $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
- CFLAGS       += -I$(XINCLDIR) -L$(XLIBDIR)
- #CFLAGS      += $(ASSEM)
- CFLAGS_SIZE   = $(CFLAGS) $(OPTIM_SIZE)
-@@ -275,10 +274,13 @@
- 
- 
- $(MPPDEC_TARGET): $(MPPDEC_OBJ)
-+ifndef BLDSTATIC
- 	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD)
--	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
--	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD)
--	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)-static
-+#	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
-+else
-+	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET) $(LDADD)
-+#	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
-+endif
- 
- 
- $(MPPDEC_TARGET)16: $(MPPDEC_OBJ)
-@@ -303,10 +305,13 @@
- 
- 
- $(MPPENC_TARGET): $(MPPENC_OBJ)
-+ifndef BLDSTATIC
- 	$(CC)         $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)        $(LDADD)
--	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
--	$(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)-static $(LDADD)
--	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)-static
-+#	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
-+else
-+	$(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET) $(LDADD)
-+#	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
-+endif
- 
- 
- $(MPPDEC_TARGET)-profiling: $(MPPDEC_OBJ)
-@@ -336,12 +341,12 @@
- 
- $(REPLAY_TARGET): $(REPLAY_OBJ) mpp.h config.c
- 	$(CC) $(CFLAGS) $(REPLAY_OBJ) -o $(REPLAY_TARGET)      $(LDADD)
--	-$(STRIP)     $(STRIPOPT)           $(REPLAY_TARGET)
-+#	-$(STRIP)     $(STRIPOPT)           $(REPLAY_TARGET)
- 
- 
- $(TAGGER_TARGET):
- 	$(CC) -DMPP_DECODER $(CFLAGS) -o $(TAGGER_TARGET) $(TAGGER_TARGET).c
--	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)
-+#	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)
- 
- 
- $(CLIPSTAT_TARGET):
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15t-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15t-Makefile.patch
deleted file mode 100644
index 4011fdc02959..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15t-Makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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.15t-gcc4.patch b/media-sound/musepack-tools/files/musepack-tools-1.15t-gcc4.patch
deleted file mode 100644
index ddae02c56828..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15t-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/musepack-tools-1.15u-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15u-Makefile.patch
deleted file mode 100644
index 4011fdc02959..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15u-Makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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.15u-gcc4.patch b/media-sound/musepack-tools/files/musepack-tools-1.15u-gcc4.patch
deleted file mode 100644
index ddae02c56828..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15u-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 6008b4f89ac4..000000000000
--- a/media-sound/musepack-tools/musepack-tools-1.15s-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.5 2005/09/04 10:39:42 flameeyes Exp $
-
-IUSE="static 16bit"
-
-inherit eutils flag-o-matic
-
-S="${WORKDIR}/sv7"
-
-DESCRIPTION="Musepack audio compression tools"
-HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://www.saunalahti.fi/grimmel/musepack.net/source/mpcsv7-src-${PV}.tar.gz"
-
-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}
-
-	# Cosmetic changes mainly to allow using of custom CFLAGS
-	epatch ${FILESDIR}/${P}-Makefile.patch
-
-	# Get rid of -mpreferred-stack-boundary=2 as it breaks amd64
-	sed -i 's:-mpreferred-stack-boundary=2::' Makefile
-
-	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
-		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 BLDSTATIC=1
-	emake mppenc mppdec replaygain tagger || die
-}
-
-src_install() {
-	dobin mppenc mppdec replaygain tagger
-	dodoc README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
-}
diff --git a/media-sound/musepack-tools/musepack-tools-1.15t.ebuild b/media-sound/musepack-tools/musepack-tools-1.15t.ebuild
deleted file mode 100644
index c787cffa8244..000000000000
--- a/media-sound/musepack-tools/musepack-tools-1.15t.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.6 2005/09/04 10:39:42 flameeyes Exp $
-
-IUSE="static 16bit"
-
-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 README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
-}
diff --git a/media-sound/musepack-tools/musepack-tools-1.15u.ebuild b/media-sound/musepack-tools/musepack-tools-1.15u.ebuild
deleted file mode 100644
index fffabe0bcd5b..000000000000
--- a/media-sound/musepack-tools/musepack-tools-1.15u.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.3 2005/09/04 10:39:42 flameeyes Exp $
-
-IUSE="static 16bit"
-
-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
-
-	# Replace 1.15t with 1.15u
-	sed -i 's/\(MPP..._VERSION=1.15\)t/\1u/' version
-
-	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 README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
-}