4 files changed, 6 insertions, 101 deletions
diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index a68583456a0c..50afd8b840c3 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sox
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.105 2009/03/10 21:18:03 beandog Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.106 2009/06/22 08:51:06 aballier Exp $
+
+  22 Jun 2009; Alexis Ballier <aballier@gentoo.org> -sox-14.1.0.ebuild,
+  -files/sox-14.1.0-lavc.patch, -files/sox-14.1.0-runsox.patch:
+  remove old
 
 *sox-14.2.0-r1 (10 Mar 2009)
 
diff --git a/media-sound/sox/files/sox-14.1.0-lavc.patch b/media-sound/sox/files/sox-14.1.0-lavc.patch
deleted file mode 100644
index e9359fc11860..000000000000
--- a/media-sound/sox/files/sox-14.1.0-lavc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sox-14.1.0/src/ffmpeg.c
-===================================================================
---- sox-14.1.0.orig/src/ffmpeg.c
-+++ sox-14.1.0/src/ffmpeg.c
-@@ -86,7 +86,11 @@ static int stream_component_open(priv_t 
- 
-   codec = avcodec_find_decoder(enc->codec_id);
-   enc->workaround_bugs = 1;
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   enc->error_resilience = 1;
-+#else
-+  enc->error_recognition = 1;
-+#endif
-   if (!codec || avcodec_open(enc, codec) < 0)
-     return -1;
-   if (enc->codec_type != CODEC_TYPE_AUDIO) {
diff --git a/media-sound/sox/files/sox-14.1.0-runsox.patch b/media-sound/sox/files/sox-14.1.0-runsox.patch
deleted file mode 100644
index 8a959a701ede..000000000000
--- a/media-sound/sox/files/sox-14.1.0-runsox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: sox-14.1.0/src/Makefile.in
-===================================================================
---- sox-14.1.0.orig/src/Makefile.in
-+++ sox-14.1.0/src/Makefile.in
-@@ -2899,7 +2899,6 @@ uninstall-am: uninstall-binPROGRAMS unin
- all: sox$(EXEEXT) play rec soxi sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT)
- 
- play rec soxi: sox$(EXEEXT)
--	./sox --help > /dev/null
- 	test -f .libs/lt-sox && ( $(RM) $@ && $(LN_S) .libs/lt-sox $@ ) || $(LN_S) sox$(EXEEXT) $@
- 
- install-exec-hook:
diff --git a/media-sound/sox/sox-14.1.0.ebuild b/media-sound/sox/sox-14.1.0.ebuild
deleted file mode 100644
index e7c76a5b184f..000000000000
--- a/media-sound/sox/sox-14.1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.1.0.ebuild,v 1.9 2008/11/26 16:58:03 ranger Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa amrnb amrwb ao debug encode ffmpeg flac id3tag ladspa mad libsamplerate ogg oss png sndfile wavpack"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	encode? ( media-sound/lame )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	libsamplerate? ( media-libs/libsamplerate )
-	ogg? ( media-libs/libvorbis	media-libs/libogg )
-	ao? ( media-libs/libao )
-	ffmpeg? ( media-video/ffmpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	>=media-sound/gsm-1.0.12-r1
-	id3tag? ( media-libs/libid3tag )
-	amrnb? ( media-libs/amrnb )
-	amrwb? ( media-libs/amrwb )
-	png? ( media-libs/libpng )
-	wavpack? ( media-sound/wavpack )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-lavc.patch"
-	epatch "${FILESDIR}/${P}-runsox.patch"
-}
-
-src_compile () {
-	# Fixes wav segfaults. See Bug #35745.
-	append-flags -fsigned-char
-
-	econf $(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable ao libao) \
-		$(use_enable oss) \
-		$(use_with encode lame) \
-		$(use_with mad) \
-		$(use_with sndfile) \
-		$(use_with flac) \
-		$(use_with ogg) \
-		$(use_with libsamplerate samplerate) \
-		$(use_with ffmpeg) \
-		$(use_with ladspa) \
-		$(use_with id3tag) \
-		$(use_with amrwb amr-wb) \
-		$(use_with amrnb amr-nb) \
-		$(use_with png) \
-		$(use_with wavpack) \
-		--enable-fast-ulaw \
-		--enable-fast-alaw \
-		|| die "configure failed"
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc NEWS ChangeLog README AUTHORS
-}