Clean up.

(Portage version: 2.2_rc38/cvs/Linux x86_64)

8 files changed, 1 insertions, 191 deletions

diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 4157d530f142..7f22678e6aea 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,12 +1,5 @@
-AUX musepack-tools-1.15v-Makefile-esd.patch 639 RMD160 de870cdf6b082954c766bc98fc42cadd4864ff5d SHA1 014764a198d2a8e91cd2f855549be1a8bf1cdf8f SHA256 33b92e1f06bdef80047225eba85308ae1e2c30b1bf1a744db54372e7baab8b21
-AUX musepack-tools-1.15v-Makefile.patch 572 RMD160 c8402ba8d07c2381759ecb2eda1a38b153b28d94 SHA1 87962aec7e82dbe7e06c897afe9c34f7999b0267 SHA256 12d9fe1a1980d3172128aae22f1c5919730e28925dd0aa12fceca4dfcb3db434
-AUX musepack-tools-1.15v-execstack.patch 1256 RMD160 a4d15a6640db2dedf2790e398c2d5309eee1c416 SHA1 25de758e8982ac83aef017cfe1083985c7b3f4d2 SHA256 655b7945855d7e65bbaa5dee6be854c45c14e19036ab73ee207a939d3bd25277
-AUX musepack-tools-1.15v-fbsd.patch 469 RMD160 e969a4896ec14ca7a02a8b36f616f00977e0bd72 SHA1 0ce936e217d51a878450c7570905a8ca43324d72 SHA256 71b17ca4f444ca08685f3e0838b86b1c252cf6374a054884c6cc13c9809200e3
-AUX musepack-tools-1.15v-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff
 AUX musepack-tools-444-gentoo.patch 6615 RMD160 ea228d0fcff63e6abebf002491d72d21206ea84a SHA1 d94cbda61f5de293396bd40ba54f8eb5d83e9e08 SHA256 cf89b7e5b5cfec29ae4d1950462dc205ff273810713207473450165a7a6e4f82
-DIST mpcsv7-src-1.15v.tar.bz2 416868 RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 SHA1 4fb6b1a45858638eb6b854b910038baa1b410146 SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd
 DIST musepack-tools-444.tar.bz2 223636 RMD160 6acb25ff67d0c786b9bd1b5d38a81f025838b25a SHA1 0e25c211daba86640b53c019a6b2b91ca094a291 SHA256 db6c94b3587c8228a08597654dd71b47e8dc52f9722903cac7cc82665fccddbb
-EBUILD musepack-tools-1.15v-r1.ebuild 1963 RMD160 da318d4a95c48e49a1018ff530fec1e67bbdec28 SHA1 06c7ee054f5996dcb31970f4d9e28d56013da550 SHA256 29fb2de8085ceb764b95c7ceea5b955ac8a0d146ac2cd31f31c2b2dbe54fc123
 EBUILD musepack-tools-444.ebuild 1029 RMD160 892c226d48839aeca01db2b0c4bd4ec3e114858c SHA1 277a6212ce036b52ce3064eb9ee463efda4878d5 SHA256 294db3d3c851b2fc4931722f68d66e98a43a935cfddabb8f3a61c295b477b8c7
 MISC ChangeLog 7874 RMD160 f46c58cb109234e0bf0c9e4f57b2ea70f5879042 SHA1 f5c2814ea581ac5fcdf46bda815d1de531f915f2 SHA256 a3c4adf990f97e8c15c4345b20f48f1fcc4409fc0d68a3983ba87854bbde2e6c
-MISC metadata.xml 269 RMD160 62382443b3292829e595043c71f5bd6d4402ad26 SHA1 22bb640da7fa718622c95863ce62f2e67a49191d SHA256 cac43becfa1a17ab8a8fc4250f7c67f7400b00d0651c3c75698ca48f040694bd
+MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile-esd.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile-esd.patch
deleted file mode 100644
index 935d28170592..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile-esd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2007-04-24 09:07:22.000000000 -0700
-+++ Makefile	2007-04-24 09:07:43.000000000 -0700
-@@ -310,10 +310,10 @@
- 
- $(MPPDEC_TARGET): $(MPPDEC_OBJ)
- ifndef BLD_STATIC
--	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD)
-+	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD) -lesd
- #	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
- else
--	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD)
-+	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD) -lesd
- #	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)-static
- endif
- 
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
deleted file mode 100644
index b6e1d16c5293..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch
+++ /dev/null
@@ -1,23 +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
-@@ -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-execstack.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-execstack.patch
deleted file mode 100644
index 075fad3efe5c..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15v-execstack.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: sv7/cpu_feat.nas
-===================================================================
---- sv7.orig/cpu_feat.nas
-+++ sv7/cpu_feat.nas
-@@ -140,3 +140,6 @@ proc    Init_FPU2
- endproc
- 
-         end
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
-Index: sv7/fft4gasm.nas
-===================================================================
---- sv7.orig/fft4gasm.nas
-+++ sv7/fft4gasm.nas
-@@ -422,3 +422,6 @@ lbl5:
- 
- 
- ;##################################################################
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
-Index: sv7/list_korr_asm.nas
-===================================================================
---- sv7.orig/list_korr_asm.nas
-+++ sv7/list_korr_asm.nas
-@@ -98,3 +98,6 @@ lbl2:
-         fstp    tword [eax+ 8]          ; x
-         ret
- ;
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
-Index: sv7/synthasm.nas
-===================================================================
---- sv7.orig/synthasm.nas
-+++ sv7/synthasm.nas
-@@ -2225,3 +2225,6 @@ endproc
- ;
- ; end of synthasm.nas
- ;
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch
deleted file mode 100644
index 1171b5785304..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sv7/mppdec.h
-===================================================================
---- sv7.orig/mppdec.h
-+++ sv7/mppdec.h
-@@ -160,7 +160,7 @@
- # include <sys/time.h>
- # if   defined __linux__        // the standard is that this file is stored somewhere on the hard disk
- #  include <linux/soundcard.h>
--# elif defined __bsdi__
-+# elif defined __bsdi__ || __FreeBSD__ >= 5
- #  include <sys/soundcard.h>
- # elif defined __FreeBSD__
- #  include <machine/soundcard.h>
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
deleted file mode 100644
index ddae02c56828..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-1.15v-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/metadata.xml b/media-sound/musepack-tools/metadata.xml
index dfa48fca8c1a..3bf6bcfeb512 100644
--- a/media-sound/musepack-tools/metadata.xml
+++ b/media-sound/musepack-tools/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>
-  <use>
-    <flag name="16bit">Higher quality sound output using dithering and noise-shaping</flag>
-  </use>
 </pkgmetadata>
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild
deleted file mode 100644
index 645fd37ebc02..000000000000
--- a/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.6 2009/05/14 20:11:37 maekke Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Musepack audio compression tools"
-HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="static 16bit esd"
-
-RDEPEND="esd? ( media-sound/esound )
-	media-libs/id3lib
-	!media-sound/mppenc"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	x86-fbsd? ( dev-lang/nasm )
-	amd64? ( dev-lang/nasm )"
-
-S=${WORKDIR}/sv7
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	use esd && epatch "${FILESDIR}/${P}-Makefile-esd.patch"
-
-	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
-
-	if ! use esd ; then
-		sed -i -e 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
-	else
-		sed -i -e 's/^LDADD	   = -lm$/LDADD	   = $(shell esd-config --libs)/' \
-			Makefile
-	fi
-
-	if [[ $(tc-arch) != "x86" ]] ; then
-		sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
-	fi
-
-	if [[ "$(tc-arch)" == "amd64" ]] ; then
-		sed -i 's/-f elf$/-f elf64/' Makefile
-	fi
-
-	use 16bit && sed -i 's|//#define MAKE_16BIT|#define MAKE_16BIT|' mpp.h
-
-	# Bug #109699; console redirection to /dev/tty makes no sense
-	sed -i -e 's/$(LDADD) &> $(LOGFILE)/$(LDADD)/' Makefile
-
-	epatch "${FILESDIR}/${P}-execstack.patch"
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-}
-
-src_compile() {
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-mfpmath=sse" "-mfpmath=sse,387"
-	replace-flags -O? -O1
-	use static && export BLD_STATIC=1
-
-	append-flags "-I${S}"
-
-	ARCH= emake -j1 CC="$(tc-getCC)" mppenc mppdec replaygain || die
-}
-
-src_install() {
-	dobin mppenc mppdec replaygain
-	dodoc README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
-}