remove old and vulnerable versions

Package-Manager: portage-2.1.4.4

10 files changed, 16 insertions, 471 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index b7abdd6e2a34..6dcb645a0b52 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.84 2008/02/11 00:12:18 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.85 2008/02/17 19:24:47 aballier Exp $
+
+  17 Feb 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/audacity-1.3.2+flac-1.1.3.patch,
+  -files/audacity-1.3.2-desktopentry.patch,
+  -files/audacity-1.3.2-disable-optimization.patch,
+  -files/audacity-1.3.2-gentoo.patch,
+  -files/audacity-1.3.2-libnyquistp.patch,
+  -files/audacity-1.3.2-no-msse.patch, -audacity-1.3.2-r1.ebuild,
+  -audacity-1.3.4.ebuild:
+  remove old and vulnerable versions
 
   11 Feb 2008; Olivier Crête <tester@gentoo.org> audacity-1.3.4-r1.ebuild:
   Stable on amd64, security bug #199751
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 10dabfe363d0..40f74f3b1e28 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -2,24 +2,15 @@
 Hash: SHA1
 
 AUX CVE-2007-6061.patch 990 RMD160 65c960ffbad4ed21b56064fc44672da15a3a9a84 SHA1 4519a1b819feb77d6d49e22db1699dbad14a73f3 SHA256 45ef372a604d900ff9f40e7070525506fe63073cc4dd4edaf0fe7078d37df24d
-AUX audacity-1.3.2+flac-1.1.3.patch 4143 RMD160 5e154be7cee78c206716509d71a8ed883066a114 SHA1 1e38825cb8ba0a5ffa74cd4086ca3a04aaa1264c SHA256 efce32ae9bc0085e2c058ddb4a2436547901bb22f5b2c9a4804dc5b088392eac
-AUX audacity-1.3.2-desktopentry.patch 322 RMD160 008a167edbaefdfb400b7b7c443fda51952e3b43 SHA1 7dca6289652dd70aca3534304525dc059502e130 SHA256 2418e374875a9c9f8297d13ec1bb0fbd45e8bf16f2415a7ea45dab3acf6c3b5f
-AUX audacity-1.3.2-disable-optimization.patch 728 RMD160 263c163c26b26851e7ebb6967c8ee20f3346744a SHA1 e127caf717baab7ff184bae78d646bb93dcf8c43 SHA256 312feb7a326bbfb167673976122ddc3d1283e6fde7cd93ae248a6b9a93401246
-AUX audacity-1.3.2-gentoo.patch 2622 RMD160 a20d0f882f74f60a8ef7b684baa3df07f1ffab11 SHA1 4a3f3aa0da30cb295a4551d72622975ec34f7367 SHA256 f70e26e8210d45eb0be48fbe5f683beec03bfda4620792c49ceff630d8ac8259
-AUX audacity-1.3.2-libnyquistp.patch 1606 RMD160 4a85891d1f6578332e75c2b9e1fe62fd3cff1269 SHA1 0a156f5ec7fe85453e6789aa33eece49ce56fd73 SHA256 dc09a0e2ea10f93d9b561843f4b90ea5809ad2bfe4cf51177d980add96e167e3
-AUX audacity-1.3.2-no-msse.patch 436 RMD160 1115be038ed96c9cbac0f33d248c6794dd982268 SHA1 cca61374754e9153b4d123e1693737fd5d56f690 SHA256 ffa5c3d0514d933f613804dcc0e8eb6d3510d1f3ed7cf450306327fedcd4e561
 AUX audacity-1.3.4-nolibfailure.patch 1565 RMD160 7d09b05176eee4ac0bee6f6832e472728ba890dd SHA1 18ebf966afa3569f34da8af53605fc4cf51d833f SHA256 25fce83269210c1ce446b01969fd65e980ddcfd3b489218a3e9e3d16d4025e62
-DIST audacity-src-1.3.2.tar.gz 6683449 RMD160 b61747103675881bdf32762deea7635a2827b0de SHA1 87690806763b7de26a8e2df1f0d4c3a7e6d1a404 SHA256 aa37c00014ee79516fb5dce4c56e1038a7eaf5ad22a10743f0609ed186baf621
 DIST audacity-src-1.3.4.tar.bz2 4349381 RMD160 754d81fb0e660d697e7c315c41f28584917e0a9e SHA1 50ab6cf19545f8cb38226b96252dbd958e7d88c4 SHA256 102d60e48e1928f3fd995a214ed9ba872929c6365cf5f784f107f351b42499f9
-EBUILD audacity-1.3.2-r1.ebuild 2541 RMD160 9ba9e8655292519ca4a57cfeba5a61448561ca44 SHA1 51fa12dfc3b7c543522d91d7d1f8cf34853f491e SHA256 7878a68ecd47f6a7d32960f4af26acfa5a0d1f4ec755fea6e45ff1fb2ac5513f
 EBUILD audacity-1.3.4-r1.ebuild 2430 RMD160 6880db35dd7672a09ddf892631b6af54828e2ebe SHA1 d5484151699fc6293b3c3d2a8f71a6961d7e0047 SHA256 5ba208a887eed7e9e00389bbc66b72416e6c418c6876980de951ef9e3f736227
-EBUILD audacity-1.3.4.ebuild 2099 RMD160 9dbcfaf76693eaa816dba164b29a524b79fa68c4 SHA1 379d01f6a8ff7521adf6e9e9e2b3c68fc9208668 SHA256 863375c05ae9ab8d837a0d4a2ef44de074cad3fe509abfb7b13db23ffffd496d
-MISC ChangeLog 14897 RMD160 3cc7e6759c84e1a7cd0c58522cb0e725787d3ab7 SHA1 06801551823bd0b43d6b72ab4f7526c928700e26 SHA256 64cd6c89f573efb11ed5a11385691f0b734b3ab3246f98a0acdf6e4dc30f911d
+MISC ChangeLog 15300 RMD160 ec5c61bf3f261eb33c3c301e419e3fc805e095ff SHA1 f14c02179a4f2a298a11f7267949743dc1711d65 SHA256 c4ec839a75fbb47df15b640dc90d1bfba6950fa38c1bb1b134624c9af4149e6a
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHr5LomOfEJZHYOKcRAkQ9AKDimiUky3PcYGi8d8TWBArLBT8hNACeIvFJ
-XauuQ92wgMNPGwPqQQYAQl4=
-=2hCS
+iD8DBQFHuIogvFcC4BYPU0oRAmjiAKC7S8a89Hl7jU6eDZipu54l1Pr6lgCgvgyz
+QkX6FbKUseMlsMSGN4a/qBU=
+=e3Ix
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.2-r1.ebuild b/media-sound/audacity/audacity-1.3.2-r1.ebuild
deleted file mode 100644
index 71287ccff125..000000000000
--- a/media-sound/audacity/audacity-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,104 +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/audacity/audacity-1.3.2-r1.ebuild,v 1.13 2008/01/13 19:34:46 aballier Exp $
-
-inherit eutils autotools wxwidgets
-
-IUSE="flac ladspa libsamplerate mp3 sse unicode vorbis"
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-RESTRICT="test"
-
-COMMON_DEPEND="=x11-libs/wxGTK-2.6*
-	>=app-arch/zip-2.3
-	dev-libs/expat
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b
-		media-libs/libid3tag )
-	flac? ( media-libs/flac )
-	>=media-libs/libsndfile-1.0.0
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )"
-RDEPEND="${COMMON_DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}-beta"
-
-pkg_setup() {
-	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
-		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
-		eerror "Please enable the cxx USE flag for media-libs/flac"
-		die "Missing FLAC C++ bindings."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	if ! use sse ; then
-		epatch "${FILESDIR}"/${P}-no-msse.patch
-		epatch "${FILESDIR}"/${P}-disable-optimization.patch
-	fi
-	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
-	epatch "${FILESDIR}/${P}-libnyquistp.patch"
-	epatch "${FILESDIR}/${P}-desktopentry.patch"
-
-	eautoreconf || die
-	pushd "${S}"/lib-src/soundtouch
-	eautoreconf
-	popd
-}
-
-src_compile() {
-	local myconf
-	WX_GTK_VER="2.6"
-
-	if use unicode; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets gtk2
-	fi
-
-	myconf="${myconf} --with-libsndfile=system"
-	myconf="${myconf} --with-libexpat=system"
-
-	if use libsamplerate ; then
-		myconf="${myconf} --with-libsamplerate=system --without-libresample"
-	else
-		myconf="${myconf} --without-libsamplerate" # --with-libresample=local
-	fi
-
-	econf \
-		$(use_enable unicode) \
-		$(use_with ladspa) \
-		$(use_with vorbis vorbis system) \
-		$(use_with mp3 libmad system) \
-		$(use_with mp3 id3tag system) \
-		$(use_with flac flac system) \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# Remove bad doc install
-	rm -rf "${D}"/usr/share/doc
-
-	# Install our docs
-	dodoc README.txt
-
-	insinto /usr/share/audacity/
-	newins images/AudacityLogo48x48.xpm audacity.xpm
-}
diff --git a/media-sound/audacity/audacity-1.3.4.ebuild b/media-sound/audacity/audacity-1.3.4.ebuild
deleted file mode 100644
index 586688f4325f..000000000000
--- a/media-sound/audacity/audacity-1.3.4.ebuild
+++ /dev/null
@@ -1,88 +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/audacity/audacity-1.3.4.ebuild,v 1.9 2008/01/13 19:34:46 aballier Exp $
-
-inherit eutils wxwidgets
-
-IUSE="flac id3tag ladspa libsamplerate mp3 soundtouch twolame unicode vamp vorbis"
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RESTRICT="test"
-
-COMMON_DEPEND="=x11-libs/wxGTK-2.6*
-	>=app-arch/zip-2.3
-	dev-libs/expat
-	>=media-libs/libsndfile-1.0.0
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b )
-	id3tag? ( media-libs/libid3tag )
-	flac? ( media-libs/flac )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	vamp? ( media-libs/vamp-plugin-sdk )
-	twolame? ( media-sound/twolame )"
-RDEPEND="${COMMON_DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}-beta"
-
-pkg_setup() {
-	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
-		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
-		eerror "Please enable the cxx USE flag for media-libs/flac"
-		die "Missing FLAC C++ bindings."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-nolibfailure.patch"
-}
-
-src_compile() {
-	WX_GTK_VER="2.6"
-
-	if use unicode; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets gtk2
-	fi
-
-	econf \
-		--with-libexpat=system \
-		$(use_enable unicode) \
-		$(use_with ladspa) \
-		$(use_with vorbis) \
-		$(use_with mp3 libmad) \
-		$(use_with id3tag) \
-		$(use_with flac libflac) \
-		$(use_enable vamp) \
-		$(use_with twolame libtwolame) \
-		$(use_with soundtouch) \
-		$(use_with libsamplerate) \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# Remove bad doc install
-	rm -rf "${D}"/usr/share/doc
-
-	# Install our docs
-	dodoc README.txt
-}
diff --git a/media-sound/audacity/files/audacity-1.3.2+flac-1.1.3.patch b/media-sound/audacity/files/audacity-1.3.2+flac-1.1.3.patch
deleted file mode 100644
index e00cc6d7cee5..000000000000
--- a/media-sound/audacity/files/audacity-1.3.2+flac-1.1.3.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-? src/export/2
-? src/export/makefile
-? src/import/2
-? src/import/makefile
-Index: acinclude.m4
-===================================================================
-RCS file: /cvsroot/audacity/audacity-src/acinclude.m4,v
-retrieving revision 1.17
-diff -u -r1.17 acinclude.m4
---- acinclude.m4	20 Oct 2006 10:31:59 -0000	1.17
-+++ acinclude.m4	20 Oct 2006 22:46:26 -0000
-@@ -463,7 +463,7 @@
-    dnl See if FLAC is installed in the system
- 
-    AC_CHECK_LIB(FLAC,
--                FLAC__file_decoder_new,
-+                FLAC__stream_decoder_new,
-                 lib_found="yes",
-                 lib_found="no",
-                 -lFLAC++ -lFLAC)
-Index: src/export/ExportFLAC.cpp
-===================================================================
-RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFLAC.cpp,v
-retrieving revision 1.9
-diff -u -r1.9 ExportFLAC.cpp
---- src/export/ExportFLAC.cpp	23 Sep 2006 02:26:41 -0000	1.9
-+++ src/export/ExportFLAC.cpp	20 Oct 2006 22:46:32 -0000
-@@ -41,6 +41,13 @@
- 
- #define SAMPLES_PER_RUN 8192
- 
-+/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
-+#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- bool ExportFLAC(AudacityProject *project,
-                 int numChannels, wxString fName,
-                 bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec)
-@@ -58,7 +65,9 @@
-       gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
-    
-    FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
-+#ifdef LEGACY_FLAC
-    encoder->set_filename(OSFILENAME(fName));
-+#endif
-    encoder->set_channels(numChannels);
-    encoder->set_sample_rate(int(rate + 0.5));
- 
-@@ -72,7 +81,11 @@
-     	format=int16Sample;
-    	encoder->set_bits_per_sample(16);
-    }
--   encoder->init();
-+#ifdef LEGACY_FLAC
-+   encoder->init(); // really should check the return value here...
-+#else
-+   encoder->init(OSFILENAME(fName)); // really should check the return value here...
-+#endif
-    
-    int numWaveTracks;
-    WaveTrack **waveTracks;
-@@ -129,7 +142,7 @@
-    return !cancelling;
- }
- 
--#endif // USE_LIBVORBIS
-+#endif // USE_LIBFLAC
- 
- 
- // Indentation settings for Vim and Emacs and unique identifier for Arch, a
-Index: src/import/ImportFLAC.cpp
-===================================================================
-RCS file: /cvsroot/audacity/audacity-src/src/import/ImportFLAC.cpp,v
-retrieving revision 1.16
-diff -u -r1.16 ImportFLAC.cpp
---- src/import/ImportFLAC.cpp	23 Sep 2006 02:26:55 -0000	1.16
-+++ src/import/ImportFLAC.cpp	20 Oct 2006 22:46:32 -0000
-@@ -63,6 +63,13 @@
- #include "../WaveTrack.h"
- #include "ImportPlugin.h"
- 
-+/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
-+#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- class FLACImportFileHandle;
- 
- class MyFLACFile : public FLAC::Decoder::File
-@@ -264,6 +271,7 @@
- 
- bool FLACImportFileHandle::Init()
- {
-+#ifdef LEGACY_FLAC
-    bool success = mFile->set_filename(OSFILENAME(mName));
-    if (!success) {
-       return false;
-@@ -272,11 +280,23 @@
-    if (state != FLAC__FILE_DECODER_OK) {
-       return false;
-    }
-+#else
-+   if (mFile->init(OSFILENAME(mName)) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+      return false;
-+   }
-+#endif
-    mFile->process_until_end_of_metadata();
-+#ifdef LEGACY_FLAC
-    state = mFile->get_state();
-    if (state != FLAC__FILE_DECODER_OK) {
-       return false;
-    }
-+#else
-+   // not necessary to check state, error callback will catch errors, but here's how:
-+   if (mFile->get_state() > FLAC__STREAM_DECODER_READ_FRAME) {
-+      return false;
-+   }
-+#endif
-    if (!mFile->is_valid() || mFile->get_was_error())
-    {
-       // This probably is not a FLAC file at all
-@@ -340,7 +360,11 @@
-       mChannels[1]->SetTeamed(true);
-    }
- 
-+#ifdef LEGACY_FLAC
-    mFile->process_until_end_of_file();
-+#else
-+   mFile->process_until_end_of_stream();
-+#endif
-    
-    *outTracks = new Track *[*outNumTracks];
-    for(c = 0; c < *outNumTracks; c++) {
diff --git a/media-sound/audacity/files/audacity-1.3.2-desktopentry.patch b/media-sound/audacity/files/audacity-1.3.2-desktopentry.patch
deleted file mode 100644
index fe5f95dfca42..000000000000
--- a/media-sound/audacity/files/audacity-1.3.2-desktopentry.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: audacity-src-1.3.2-beta/src/audacity.desktop
-===================================================================
---- audacity-src-1.3.2-beta.orig/src/audacity.desktop
-+++ audacity-src-1.3.2-beta/src/audacity.desktop
-@@ -1,4 +1,4 @@
--[Desktop Entry]
-+[Desktop Entry]
- Encoding=UTF-8
- 
- Name=Audacity Sound Editor
diff --git a/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch b/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch
deleted file mode 100644
index 98583ce74db0..000000000000
--- a/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur audacity-src-1.3.2-beta.orig/lib-src/soundtouch/include/STTypes.h audacity-src-1.3.2-beta/lib-src/soundtouch/include/STTypes.h
---- audacity-src-1.3.2-beta.orig/lib-src/soundtouch/include/STTypes.h	2006-10-29 08:06:01.000000000 +0900
-+++ audacity-src-1.3.2-beta/lib-src/soundtouch/include/STTypes.h	2006-11-17 01:27:15.000000000 +0900
-@@ -92,7 +92,6 @@
-     /// However, if you're having difficulties getting the optimized routines
-     /// compiled with your compler (e.g. some gcc compiler versions may be picky),
-     /// you may wish to disable the optimizations to make the library compile.
--    #define ALLOW_OPTIMIZATIONS     1
- 
- 
-     // If defined, allows the SIMD-optimized routines to take minor shortcuts
diff --git a/media-sound/audacity/files/audacity-1.3.2-gentoo.patch b/media-sound/audacity/files/audacity-1.3.2-gentoo.patch
deleted file mode 100644
index 7ae4589fbc69..000000000000
--- a/media-sound/audacity/files/audacity-1.3.2-gentoo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur audacity-src-1.3.2-beta.orig/configure audacity-src-1.3.2-beta/configure
---- audacity-src-1.3.2-beta.orig/configure	2006-10-29 08:05:36.000000000 +0900
-+++ audacity-src-1.3.2-beta/configure	2006-10-31 16:12:48.000000000 +0900
-@@ -7027,8 +7027,8 @@
-    fi
- 
- 
--# Extract the first word of "wx-config", so it can be a program name with args.
--set dummy wx-config; ac_word=$2
-+# Extract the first word of "wx-config-2.6", so it can be a program name with args.
-+set dummy wx-config-2.6; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_WX_CONFIG+set}" = set; then
-@@ -7070,8 +7070,8 @@
- 
- 
- if [ "$WX_CONFIG" = "no" ] ; then
--   { { echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path?\"" >&5
--echo "$as_me: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path?\"" >&2;}
-+   { { echo "$as_me:$LINENO: error: \"Could not find wx-config-2.6: is wxWindows installed? is wx-config-2.6 in your path?\"" >&5
-+echo "$as_me: error: \"Could not find wx-config-2.6: is wxWindows installed? is wx-config-2.6 in your path?\"" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-diff -Naur audacity-src-1.3.2-beta.orig/configure.in audacity-src-1.3.2-beta/configure.in
---- audacity-src-1.3.2-beta.orig/configure.in	2006-10-29 08:06:01.000000000 +0900
-+++ audacity-src-1.3.2-beta/configure.in	2006-10-31 16:12:21.000000000 +0900
-@@ -310,10 +310,10 @@
- 
- dnl --- check for required libraries ---
- 
--dnl wxWindows -- we assume that if wx-config is found, wxWindows is successfully installed.
--AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin )
-+dnl wxWindows -- we assume that if wx-config-2.6 is found, wxWindows is successfully installed.
-+AC_PATH_PROG(WX_CONFIG, wx-config-2.6, no, $PATH:/usr/local/bin )
- if [[ "$WX_CONFIG" = "no" ]] ; then
--   AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is wx-config in your path?")
-+   AC_MSG_ERROR("Could not find wx-config-2.6: is wxWindows installed? is wx-config-2.6 in your path?")
- fi
- 
- dnl Check that the wx version is 2.6.x
-diff -Naur audacity-src-1.3.2-beta.orig/locale/Makefile.in audacity-src-1.3.2-beta/locale/Makefile.in
---- audacity-src-1.3.2-beta.orig/locale/Makefile.in	2006-10-29 08:06:04.000000000 +0900
-+++ audacity-src-1.3.2-beta/locale/Makefile.in	2006-11-01 00:06:00.000000000 +0900
-@@ -17,7 +17,7 @@
- INSTALL=@INSTALL@
- AUDACITY_NAME=@AUDACITY_NAME@
- ifdef DESTDIR
--   INSTALL_PATH=$(top_srcdir)/$(DESTDIR)
-+   INSTALL_PATH=$(DESTDIR)
- else
-    INSTALL_PATH=
- endif
diff --git a/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch b/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch
deleted file mode 100644
index b2f4e4affd2e..000000000000
--- a/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urd /tmp/audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in
---- /tmp/audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in	2006-10-29 01:05:50.000000000 +0200
-+++ audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in	2006-11-17 19:14:04.430148792 +0100
-@@ -338,16 +338,16 @@
- 	$(CC) -c tran/pluck.c -o tran/pluck.o $(CFLAGS)
- 
- tran/abs.o: tran/abs.c tran/abs.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
--	cc -c tran/abs.c -o tran/abs.o $(CFLAGS)
-+	$(CC) -c tran/abs.c -o tran/abs.o $(CFLAGS)
- 
- tran/sqrt.o: tran/sqrt.c tran/sqrt.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
--	cc -c tran/sqrt.c -o tran/sqrt.o $(CFLAGS)
-+	$(CC) -c tran/sqrt.c -o tran/sqrt.o $(CFLAGS)
- 
- tran/alpasscv.o: tran/alpasscv.c tran/alpasscv.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
--	cc -c tran/alpasscv.c -o tran/alpasscv.o $(CFLAGS)
-+	$(CC) -c tran/alpasscv.c -o tran/alpasscv.o $(CFLAGS)
- 
- tran/alpassvc.o: tran/alpassvc.c tran/alpassvc.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
--	cc -c tran/alpassvc.c -o tran/alpassvc.o $(CFLAGS)
-+	$(CC) -c tran/alpassvc.c -o tran/alpassvc.o $(CFLAGS)
- 
- nyqsrc/sndfnint.o: nyqsrc/sndfnint.c 
- 	$(CC) -c nyqsrc/sndfnint.c -o nyqsrc/sndfnint.o $(CFLAGS)
-@@ -493,6 +493,14 @@
- nyqsrc/seqfnintptrs.h: $(CMTHDRS) misc/intgen
- 	$(INTGEN) nyqsrc/seqfnint $(CMTHDRS)
- 
-+nyqsrc/sndfnintdefs.h : nyqsrc/sndfnintptrs.h
-+
-+nyqsrc/seqfnintdefs.h : nyqsrc/seqfnintptrs.h
-+
-+nyqsrc/sndfnint.c : nyqsrc/sndfnintptrs.h
-+
-+nyqsrc/seqfnint.c : nyqsrc/seqfnintptrs.h
-+
- clean:
- 	rm -f libnyquist.a
- 	cd misc; $(MAKE) clean
-
diff --git a/media-sound/audacity/files/audacity-1.3.2-no-msse.patch b/media-sound/audacity/files/audacity-1.3.2-no-msse.patch
deleted file mode 100644
index ecbec1450fc7..000000000000
--- a/media-sound/audacity/files/audacity-1.3.2-no-msse.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/soundtouch/source/SoundTouch/Makefile.am.old	2006-11-02 13:30:00.000000000 +0900
-+++ lib-src/soundtouch/source/SoundTouch/Makefile.am	2006-11-02 13:30:12.000000000 +0900
-@@ -35,7 +35,7 @@
- 

- # ??? test for -fcheck-new in configure.ac

- # other compiler flags to add

--AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include

-+AM_CXXFLAGS=-fcheck-new -I../../include

- 

- # other linking flags to add

- #libSoundTouch_la_LIBADD=