Remove old.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

11 files changed, 19 insertions, 532 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 06ce2e663c8c..1d30977fc914 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.160 2011/08/07 16:59:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.161 2011/08/07 17:08:16 radhermit Exp $
+
+  07 Aug 2011; Tim Harder <radhermit@gentoo.org> -audacity-1.3.8.ebuild,
+  -files/audacity-1.3.8-automagic.patch,
+  -files/audacity-1.3.8-gsocket-conflict.patch, -audacity-1.3.12.ebuild,
+  -files/audacity-1.3.12-automagic.patch, -files/audacity-1.3.12-ffmpeg.patch,
+  -files/audacity-1.3.12-gcc45.patch,
+  -files/audacity-1.3.12-portaudio-shell.patch,
+  -files/audacity-1.3.12-widget-extra-only-needed-cflags.patch:
+  Remove old.
 
   07 Aug 2011; Raúl Porcel <armin76@gentoo.org> audacity-1.3.8.ebuild,
   audacity-1.3.12.ebuild, audacity-1.3.13.ebuild:
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 5d1729afd3b0..e53b16c7166a 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,27 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX audacity-1.3.12-automagic.patch 2227 RMD160 be4438ab70efa46b638e8bcc29d9c6fa6de2998c SHA1 280564911fd67b19ca79c01af10cf396ce6fe405 SHA256 f1f106f0f1e57d91f74dd0a4466edc6efd861bff7909caa4cf0e596aea38b850
-AUX audacity-1.3.12-ffmpeg.patch 2247 RMD160 278ecc43b796dc272be6d70cd4d233d5e5704ddd SHA1 601b893304d359596919acd1429764910035692d SHA256 07d325b3a3aacb2b264327c4d57d5769dbab3dce13f32c91cafe8c64db7e8a08
-AUX audacity-1.3.12-gcc45.patch 3166 RMD160 173af2b6202e195b18b378855d5124b72b33b4c9 SHA1 415080721c40d871f4c3f4160c578e854ab8641c SHA256 31b220b43f611773d80af756323317f23c9d9009e10bcd1696d1fb9a26ece896
-AUX audacity-1.3.12-portaudio-shell.patch 372 RMD160 6c53e1a94b82c41691adf18a9933bb9ac483d263 SHA1 53e0db1b0db818f27a8563d1ae402d5bda24e298 SHA256 0d89f40ebc9a73a656319b009828ea50b0e3e15d220493c313f6ad02f8321974
-AUX audacity-1.3.12-widget-extra-only-needed-cflags.patch 944 RMD160 8aa031e43d7c2ec19c02840d21bb341dc9d0a686 SHA1 df5834728ed26f414ca0aa2904aac3f88e0b4afb SHA256 e8765b9d8abe0b4fb5e1b83a3c2dfdabd48c808795220db9e893c83a0e8fcd3f
 AUX audacity-1.3.13-automagic.patch 2306 RMD160 1b5177bdeee1acd55f09b8c428114d0a7e8fc719 SHA1 7ea05df2066602d080308f33813518cde5878bf6 SHA256 5ed3dddb9e095b7f17437ea0d62f357e14cef7e64987b393aa47589541cccbb2
 AUX audacity-1.3.13-ffmpeg.patch 7127 RMD160 6704ed714e88776a3a1ab9d5916619eedf31681c SHA1 26c2ad8e611705b2762a318e66312169f59cc218 SHA256 004c0b8ad34ab5dc0c3da4c07d8b61a3f6c8249a5b4325a6994b91f978661a00
-AUX audacity-1.3.8-automagic.patch 2625 RMD160 af4edacf4d9d331b7daa56d20ee55da5ae7759dc SHA1 4e91de0cecde8a75f14830e9446d6fbb0fc3036a SHA256 a7cc0fd0566877d50d5c8d0568a26dc163f2db1b74314791ff0b4060dafdae81
-AUX audacity-1.3.8-gsocket-conflict.patch 410 RMD160 c5e2716c4a7e9df8d4ebf05a3f226c719c1715e0 SHA1 fe9a1c08399bad5d34839c78c023bd9fea9228fd SHA256 2b77e18c378696392d04e5e1e14285433ee9e904bc95bdd1ec245edfd31efb20
-DIST audacity-minsrc-1.3.12-beta.tar.bz2 6087920 RMD160 47dd021c24fb6ed05a845604db28056d981c28d3 SHA1 3df2187c9e869be6745fb1e1396586b9b0486485 SHA256 f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768
 DIST audacity-minsrc-1.3.13-beta.tar.bz2 6450901 RMD160 36c7e8b6dbd5dbfd265afe00fd7ea6e34894a29e SHA1 47a1340699958c8e1804f374209835be865d7027 SHA256 4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83
-DIST audacity-minsrc-1.3.8.tar.bz2 6734200 RMD160 3ae7ed409520b62f40e4c9fcd49ea5a25827b8a3 SHA1 8b8e5dbbf38546c08eb77005f77648d28836dfd4 SHA256 50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf
-EBUILD audacity-1.3.12.ebuild 2758 RMD160 e91bf0eedd147fa37a853d2aca5fd9c712b7a643 SHA1 729b37c382d777d03b8bbe4098790c4b18b52cf4 SHA256 9445c8eecac0b15d0d3fbd4c01508742e4fb2016c6f3896c51029e57d6a0ff77
 EBUILD audacity-1.3.13.ebuild 2629 RMD160 832b0904089708f09639d936a634f593e20ccf20 SHA1 a91d7fe8a9aa5d5d427f788f96fac372a0265c99 SHA256 dc6632e356fd109475b521273a30bd8552d21580867c681b64837cc3ce00d65e
-EBUILD audacity-1.3.8.ebuild 2665 RMD160 4ecbd6e593c6364a038753fb88af18e39598260e SHA1 2ba48b53bf53efda6d991f6f9e38cc130aad2842 SHA256 d936f0f4926dedd196f2e8c7f7652c5a64c1fcb4ec0949fd7f28537bf6e48fa9
-MISC ChangeLog 26542 RMD160 01668f5044b0774e7af70ea69c99c62d1a991d86 SHA1 7477d719dc32d68d75795d95a9a5e6603dd929d1 SHA256 3ec0dd93fbe7191f3b1772e45e1ded4cad32f2b63e2b10d38693142ab53bdd20
+MISC ChangeLog 26975 RMD160 5b48fb5a2b83d0f50a34dbc09d8543ce8ca20364 SHA1 e7004c73cf95ca6cb9be6b4f4668b3efebe84aa0 SHA256 c0b7bafa1d649e8a28b857bf0bc5a8db7ef40bacf7f5c9138e9d5c2acfac7ae6
 MISC metadata.xml 727 RMD160 3306c64d261828fe7ef77a6b10b86bdef95a7e90 SHA1 037f78e7a8bcd2a9691ea7a09078941b385b6737 SHA256 43d8778afc3c468b262cddd50200c8b0c54674fda12b8d8e55b0ce0f8f1a6e85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4+xI8ACgkQuQc30/atMkCiNQCdFXDsFEWHCGjZVk9ty8II8Kef
-U5YAn1bGU63H6JbbquFqHMGHAWgdBA24
-=UwLi
+iQEcBAEBCgAGBQJOPsaJAAoJEEqz6FtPBkyjEHQH/2vCrtVILfj2ZWWOKopcBmMt
+/OZKrJ7gnMfQZgE7S4on7+fzI7DmFFzHSifL32REknZqZGsIFeTLSs56fgMjGPy5
+tjGr1g2ncXDHOkR3enJ4Sp1TWpz2qDLWZFL2uKYVVpjxomD34WH5HHzMTEJxzlF0
+CFFFwoMxkP7HwpIfFtXZIJLun7+y5YWrXQuK/ziVi8620Qd/OG36RX8/KkppUhb/
+lFT7RSycpBC/cFnN1jscaRtc5okqmQUSYX+yd7M/Mtue+yEhKn9nItm9ahMM9LUi
+KqtACM+WVdyugbAkgQPleZlG0278SN3D8ANww/GTCxG7y7jpLA6XwXgkEy/aeDc=
+=txGM
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.12.ebuild b/media-sound/audacity/audacity-1.3.12.ebuild
deleted file mode 100644
index 800ba386f370..000000000000
--- a/media-sound/audacity/audacity-1.3.12.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.13 2011/08/07 16:59:52 armin76 Exp $
-
-EAPI=2
-
-inherit eutils wxwidgets autotools versionator
-
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}-beta"
-MY_T="${PN}-minsrc-${MY_PV}-beta"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_T}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-RESTRICT="test"
-
-COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
-	>=app-arch/zip-2.3
-	>=media-libs/libsndfile-1.0.0
-	dev-libs/expat
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b )
-	flac? ( >=media-libs/flac-1.2.0[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	twolame? ( media-sound/twolame )
-	ffmpeg? ( virtual/ffmpeg )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
-# Crashes at  startup here...
-#	lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-automagic.patch"
-	epatch "${FILESDIR}/${P}-gcc45.patch"
-	epatch "${FILESDIR}/${P}-ffmpeg.patch"
-	epatch "${FILESDIR}/${P}-portaudio-shell.patch"
-	epatch "${FILESDIR}/${P}-widget-extra-only-needed-cflags.patch"
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
-	WX_GTK_VER="2.8"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	# * if libsamplerate not requested, use libresample instead.
-	econf \
-		--enable-unicode \
-		--enable-nyquist \
-		$(use_enable ladspa) \
-		--with-libsndfile=system \
-		--with-expat=system \
-		$(use_with libsamplerate) \
-		$(use_with !libsamplerate libresample) \
-		$(use_with vorbis libvorbis) \
-		$(use_with mp3 libmad) \
-		$(use_with flac libflac) \
-		$(use_with id3tag libid3tag) \
-		$(use_with soundtouch) \
-		$(use_with vamp libvamp) \
-		$(use_with twolame libtwolame) \
-		$(use_with ffmpeg) \
-		$(use_with midi) \
-		$(use_with alsa) \
-		$(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-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/audacity-1.3.8.ebuild b/media-sound/audacity/audacity-1.3.8.ebuild
deleted file mode 100644
index 42ff4edaa57e..000000000000
--- a/media-sound/audacity/audacity-1.3.8.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.8.ebuild,v 1.11 2011/08/07 16:59:52 armin76 Exp $
-
-EAPI=2
-
-inherit eutils wxwidgets autotools versionator
-
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_T}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-RESTRICT="test"
-
-COMMON_DEPEND="=x11-libs/wxGTK-2.8*
-	>=app-arch/zip-2.3
-	>=media-libs/libsndfile-1.0.0
-	dev-libs/expat
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b )
-	flac? ( >=media-libs/flac-1.2.0[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	twolame? ( media-sound/twolame )
-	ffmpeg? ( virtual/ffmpeg )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
-# Crashes at  startup here...
-#	lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-automagic.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-gsocket-conflict.patch"
-	epatch "${FILESDIR}/${PN}-1.3.12-ffmpeg.patch"
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
-	WX_GTK_VER="2.8"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	# * if libsamplerate not requested, use libresample instead.
-	econf \
-		--enable-unicode \
-		--enable-nyquist \
-		$(use_enable ladspa) \
-		--with-libsndfile=system \
-		--with-expat=system \
-		$(use_with libsamplerate) \
-		$(use_with !libsamplerate libresample) \
-		$(use_with vorbis libvorbis) \
-		$(use_with mp3 libmad) \
-		$(use_with flac libflac) \
-		$(use_with id3tag libid3tag) \
-		$(use_with soundtouch) \
-		$(use_with vamp libvamp) \
-		$(use_with twolame libtwolame) \
-		$(use_with ffmpeg) \
-		$(use_with midi) \
-		$(use_with alsa) \
-		$(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-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.12-automagic.patch b/media-sound/audacity/files/audacity-1.3.12-automagic.patch
deleted file mode 100644
index 92405e9413ae..000000000000
--- a/media-sound/audacity/files/audacity-1.3.12-automagic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -559,6 +559,8 @@ case "${host_os}" in
- esac
- 
- dnl PortAudio configuration
-+AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
-+AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
- 
- LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
- EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
-@@ -575,13 +577,21 @@ case "${host_os}" in
-       ;;
-    *)
-       dnl Unix
--      AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
--      if [[ $have_alsa = "yes" ]] ; then
--         LIBS="$LIBS -lasound"
--      fi
--      PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
--      if [[ $have_jack = "yes" ]] ; then
--         LIBS="$LIBS $JACK_LIBS"
-+      if test "x$with_alsa" != "xno"; then
-+         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
-+         if [[ $have_alsa = "yes" ]] ; then
-+            LIBS="$LIBS -lasound"
-+        else
-+            AC_MSG_WARN([Support for alsa not available])
-+         fi
-+      fi        
-+      if test "x$with_jack" != "xno"; then
-+         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-+         if [[ $have_jack = "yes" ]] ; then
-+            LIBS="$LIBS $JACK_LIBS"
-+        else
-+            AC_MSG_WARN([Support for jack not available])
-+         fi
-       fi
-       AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
-       if [[ $have_asihpi = "yes" ]] ; then
---- a/lib-src/portmixer/configure.ac
-+++ b/lib-src/portmixer/configure.ac
-@@ -31,6 +31,8 @@ AC_ARG_ENABLE([debug],
-   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
-   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
- 
-+AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
-+
- #
- # Check for portaudio path
- #
-@@ -107,7 +109,7 @@ if [[ $have_oss = "yes" ]] ; then
-    objects="$objects px_unix_oss.o"
- fi
- 
--if [[ $have_alsa = "yes" ]] ; then
-+if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
-    AC_MSG_NOTICE(Including support for ALSA);
-    AC_DEFINE(PX_USE_LINUX_ALSA)
-    objects="$objects px_linux_alsa.o"
diff --git a/media-sound/audacity/files/audacity-1.3.12-ffmpeg.patch b/media-sound/audacity/files/audacity-1.3.12-ffmpeg.patch
deleted file mode 100644
index 22146bb1bbff..000000000000
--- a/media-sound/audacity/files/audacity-1.3.12-ffmpeg.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- audacity-src-1.3.12-beta.orig/src/FFmpeg.cpp	2010-03-30 04:28:54.000000000 -0700
-+++ audacity-src-1.3.12-beta/src/FFmpeg.cpp	2010-10-26 12:22:02.145695409 -0700
-@@ -204,7 +204,11 @@
-    return ret;
- }
- 
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0)
-+static int ufile_write(URLContext *h, const unsigned char *buf, int size)
-+#else
- static int ufile_write(URLContext *h, unsigned char *buf, int size)
-+#endif
- {
-    return (int) ((wxFile *) h->priv_data)->Write(buf, size);
- }
-@@ -356,7 +360,11 @@
-          }
-          // Otherwize, resort to extension matching if available
-          else if (fmt1->extensions) {
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
-+            if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) {
-+#else
-             if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) {
-+#endif
-                score = 50;
-             }
-          }
-@@ -829,7 +837,11 @@
-    INITDYN(avformat,av_open_input_file);
-    INITDYN(avformat,av_open_input_stream);
-    INITDYN(avformat,get_buffer);
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
-+   INITDYN(avformat,av_match_ext);
-+#else
-    INITDYN(avformat,match_ext);
-+#endif
- 
- #if FFMPEG_STABLE
-    INITDYN(avformat,av_init_packet);
---- audacity-src-1.3.12-beta.orig/src/FFmpeg.h	2010-03-30 04:28:54.000000000 -0700
-+++ audacity-src-1.3.12-beta/src/FFmpeg.h	2010-10-26 12:23:02.618168997 -0700
-@@ -224,7 +224,11 @@
-    AVStream*         (*av_new_stream)                 (AVFormatContext *s, int id);
-    AVFormatContext*  (*av_alloc_format_context)       (void);
-    AVOutputFormat*   (*guess_format)                  (const char *short_name, const char *filename, const char *mime_type);
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
-+   int               (*av_match_ext)                  (const char *filename, const char *extensions);
-+#else
-    int               (*match_ext)                     (const char *filename, const char *extensions);
-+#endif
-    int               (*av_write_trailer)              (AVFormatContext *s);
-    int               (*av_interleaved_write_frame)    (AVFormatContext *s, AVPacket *pkt);
-    int               (*av_write_frame)                (AVFormatContext *s, AVPacket *pkt);
diff --git a/media-sound/audacity/files/audacity-1.3.12-gcc45.patch b/media-sound/audacity/files/audacity-1.3.12-gcc45.patch
deleted file mode 100644
index 198873c57f90..000000000000
--- a/media-sound/audacity/files/audacity-1.3.12-gcc45.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-https://bugs.gentoo.org/322145
-http://bugzilla.audacityteam.org/show_bug.cgi?id=221
-
---- lib-src/portmixer/configure.ac
-+++ lib-src/portmixer/configure.ac
-@@ -49,34 +49,57 @@
- fi
- 
- #
-+# Check which APIs are available
-+#
-+
-+have_oss=no
-+AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
-+
-+AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no)
-+AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
-+AC_CHECK_HEADER(windows.h, have_windows=yes, have_windows=no)
-+
-+#
- # Make sure the support is there
- #
- have_support=yes
--AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
--		AC_MSG_WARN("Missing support in pa_win_ds.h");
--fi
--AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
-+
-+if [[ $have_alsa = "yes" ]] ; then
-+	AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
- 		AC_MSG_WARN("Missing support in pa_linux_alsa.h");
-+	fi
- fi
--AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
--		AC_MSG_WARN("Missing support in pa_win_wmme.h");
--fi
--AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
-+
-+if [[ $have_coreaudio = "yes" ]] ; then
-+	AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
- 		AC_MSG_WARN("Missing support in pa_mac_core.h");
-+	fi
- fi
--AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
-+
-+if [[ $have_oss = "yes" ]] ; then
-+	AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
- 		AC_MSG_WARN("Missing support in pa_unix_oss.h");
-+	fi
- fi
-+
-+if [[ $have_windows = "yes" ]] ; then
-+	AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
-+		AC_MSG_WARN("Missing support in pa_win_ds.h");
-+	fi
-+	AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
-+		AC_MSG_WARN("Missing support in pa_win_wmme.h");
-+	fi
-+fi
-+
- AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h], , [have_support=no])
- if [[ $have_support = "no" ]] ; then
- 		AC_MSG_WARN("Missing support in portaudio.h");
- fi
--
- if [[ $have_support = "no" ]] ; then
-    AC_MSG_ERROR("Your version of portaudio does not include required functions"); 
- fi
-@@ -88,16 +111,6 @@
- AC_SUBST( objects, [px_mixer.o] )
- 
- #
--# Check which APIs are available
--#
--
--have_oss=no
--AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
--
--AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
--AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
--
--#
- # Set up to use the identified ones
- #
- AC_MSG_NOTICE(---------------------------------------);
diff --git a/media-sound/audacity/files/audacity-1.3.12-portaudio-shell.patch b/media-sound/audacity/files/audacity-1.3.12-portaudio-shell.patch
deleted file mode 100644
index f24daf7cea6b..000000000000
--- a/media-sound/audacity/files/audacity-1.3.12-portaudio-shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lib-src/portaudio-v19/Makefile.in
-===================================================================
---- lib-src/portaudio-v19/Makefile.in	(revision 10742)
-+++ lib-src/portaudio-v19/Makefile.in	(revision 10743)
-@@ -22,6 +22,7 @@
- LIBS = @LIBS@
- AR = @AR@
- RANLIB = @RANLIB@
-+SHELL = @SHELL@
- LIBTOOL = @LIBTOOL@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
diff --git a/media-sound/audacity/files/audacity-1.3.12-widget-extra-only-needed-cflags.patch b/media-sound/audacity/files/audacity-1.3.12-widget-extra-only-needed-cflags.patch
deleted file mode 100644
index bbc4745d1cd9..000000000000
--- a/media-sound/audacity/files/audacity-1.3.12-widget-extra-only-needed-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: lib-src/lib-widget-extra/libwidgetextra-uninstalled.pc.in
-===================================================================
---- lib-src/lib-widget-extra/libwidgetextra-uninstalled.pc.in	(revision 10804)
-+++ lib-src/lib-widget-extra/libwidgetextra-uninstalled.pc.in	(working copy)
-@@ -12,5 +12,6 @@
- Requires: 
- Version: 1
- 
--Libs: -L${libdir} -lwidgetextra @LIBS@
--Cflags: -I${includedir} @CXXFLAGS@
-+Libs: -L${libdir} -lwidgetextra
-+Libs.private: @LIBS@ 
-+Cflags: -I${includedir}
-Index: lib-src/lib-widget-extra/libwidgetextra.pc.in
-===================================================================
---- lib-src/lib-widget-extra/libwidgetextra.pc.in	(revision 10804)
-+++ lib-src/lib-widget-extra/libwidgetextra.pc.in	(working copy)
-@@ -6,5 +6,6 @@
- Requires: 
- Version: 1
- 
--Libs: -L${libdir} -lwidgetextra @LIBS@
--Cflags: -I${includedir} @CXXFLAGS@
-+Libs: -L${libdir} -lwidgetextra 
-+Libs.private: @LIBS@ 
-+Cflags: -I${includedir} 
diff --git a/media-sound/audacity/files/audacity-1.3.8-automagic.patch b/media-sound/audacity/files/audacity-1.3.8-automagic.patch
deleted file mode 100644
index fc20fbdf07c6..000000000000
--- a/media-sound/audacity/files/audacity-1.3.8-automagic.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: audacity-src-1.3.8/configure.in
-===================================================================
---- audacity-src-1.3.8.orig/configure.in   2009-07-19 17:58:46.000000000 +0400
-+++ audacity-src-1.3.8/configure.in        2009-07-19 18:02:49.000000000 +0400
-@@ -551,6 +551,8 @@
- esac
- 
- dnl PortAudio configuration
-+AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
-+AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
- 
- LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
- EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
-@@ -567,13 +569,21 @@
-       ;;
-    *) 
-       dnl Unix
--      AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
--      if [[ $have_alsa = "yes" ]] ; then
--         LIBS="$LIBS -lasound"
--      fi
--      PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
--      if [[ $have_jack = "yes" ]] ; then
--         LIBS="$LIBS $JACK_LIBS"
-+      if test "x$with_alsa" != "xno"; then
-+         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
-+         if [[ $have_alsa = "yes" ]] ; then
-+            LIBS="$LIBS -lasound"
-+        else
-+            AC_MSG_WARN([Support for alsa not available])
-+         fi
-+      fi        
-+      if test "x$with_jack" != "xno"; then
-+         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-+         if [[ $have_jack = "yes" ]] ; then
-+            LIBS="$LIBS $JACK_LIBS"
-+        else
-+            AC_MSG_WARN([Support for jack not available])
-+         fi
-       fi
-       AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
-       if [[ $have_asihpi = "yes" ]] ; then
-Index: audacity-src-1.3.8/lib-src/portmixer/configure.ac
-===================================================================
---- audacity-src-1.3.8.orig/lib-src/portmixer/configure.ac
-+++ audacity-src-1.3.8/lib-src/portmixer/configure.ac
-@@ -94,6 +94,7 @@ AC_CHECK_HEADER(linux/soundcard.h, have_
- AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
- AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
- 
-+AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
- #
- # Set up to use the identified ones
- #
-@@ -104,7 +105,7 @@ if [[ $have_oss = "yes" ]] ; then
-    objects="$objects px_unix_oss.o"
- fi
- 
--if [[ $have_alsa = "yes" ]] ; then
-+if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
-    AC_MSG_NOTICE(Including support for ALSA);
-    AC_DEFINE(PX_USE_LINUX_ALSA)
-    objects="$objects px_linux_alsa.o"
diff --git a/media-sound/audacity/files/audacity-1.3.8-gsocket-conflict.patch b/media-sound/audacity/files/audacity-1.3.8-gsocket-conflict.patch
deleted file mode 100644
index 45415e76ab6d..000000000000
--- a/media-sound/audacity/files/audacity-1.3.8-gsocket-conflict.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- audacity-src-1.3.8-orig/src/AudacityApp.cpp
-+++ audacity-src-1.3.8/src/AudacityApp.cpp
-@@ -331,7 +331,9 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- #include <dlfcn.h>
--#include <gtk/gtk.h>
-+/*#include <gtk/gtk.h>*/
-+#include <glib/gtypes.h>
-+#include <glib-object.h>
- 
- typedef struct _GnomeProgram GnomeProgram;
- typedef struct _GnomeModuleInfo GnomeModuleInfo;