remove unused version

Package-Manager: portage-2.1.4

6 files changed, 21 insertions, 244 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 8a500990ad31..9ac9a27d233c 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacity
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.76 2007/12/04 17:40:02 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.77 2008/01/13 19:30:50 aballier Exp $
+
+  13 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/audacity-1.3.3+flac-1.1.3.patch,
+  -files/audacity-1.3.3-gentoo.patch, -audacity-1.3.3.ebuild:
+  remove unused version
 
   04 Dec 2007; Raúl Porcel <armin76@gentoo.org> audacity-1.3.4.ebuild:
   Re-add ~sparc wrt #199390
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 50ad5c2ebbfb..89eb73ca087c 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX audacity-1.3.2+flac-1.1.3.patch 4143 RMD160 5e154be7cee78c206716509d71a8ed883066a114 SHA1 1e38825cb8ba0a5ffa74cd4086ca3a04aaa1264c SHA256 efce32ae9bc0085e2c058ddb4a2436547901bb22f5b2c9a4804dc5b088392eac
 MD5 9a8818667ff40745e903ead0821b6d68 files/audacity-1.3.2+flac-1.1.3.patch 4143
 RMD160 5e154be7cee78c206716509d71a8ed883066a114 files/audacity-1.3.2+flac-1.1.3.patch 4143
@@ -22,37 +25,24 @@ AUX audacity-1.3.2-no-msse.patch 436 RMD160 1115be038ed96c9cbac0f33d248c6794dd98
 MD5 02554130e92dcceb574954c71fcc7be9 files/audacity-1.3.2-no-msse.patch 436
 RMD160 1115be038ed96c9cbac0f33d248c6794dd982268 files/audacity-1.3.2-no-msse.patch 436
 SHA256 ffa5c3d0514d933f613804dcc0e8eb6d3510d1f3ed7cf450306327fedcd4e561 files/audacity-1.3.2-no-msse.patch 436
-AUX audacity-1.3.3+flac-1.1.3.patch 3880 RMD160 36b3a663f6176f3453f078dde4756f26979f9e3b SHA1 f845c8337e8287da8df608df42cdbfaf4862980c SHA256 011535131d13dc212dc3876b37fd1c3f2bd844a4c7a00ccd826f4f471319305c
-MD5 a0f597abfd605b0e8c2d0e683c93cd66 files/audacity-1.3.3+flac-1.1.3.patch 3880
-RMD160 36b3a663f6176f3453f078dde4756f26979f9e3b files/audacity-1.3.3+flac-1.1.3.patch 3880
-SHA256 011535131d13dc212dc3876b37fd1c3f2bd844a4c7a00ccd826f4f471319305c files/audacity-1.3.3+flac-1.1.3.patch 3880
-AUX audacity-1.3.3-gentoo.patch 18178 RMD160 7f1d68a4222fd55bf8e0f52025725e6d5bbb3213 SHA1 872a8d48bbd68ab64d09c064763340aa8a44db1e SHA256 2f54013d5b72acf66da55300c91a458237b2a58befde0ee65624552f84d69655
-MD5 94694bfad9670ec1d71672b5e7bbbf2b files/audacity-1.3.3-gentoo.patch 18178
-RMD160 7f1d68a4222fd55bf8e0f52025725e6d5bbb3213 files/audacity-1.3.3-gentoo.patch 18178
-SHA256 2f54013d5b72acf66da55300c91a458237b2a58befde0ee65624552f84d69655 files/audacity-1.3.3-gentoo.patch 18178
 AUX audacity-1.3.4-nolibfailure.patch 1565 RMD160 7d09b05176eee4ac0bee6f6832e472728ba890dd SHA1 18ebf966afa3569f34da8af53605fc4cf51d833f SHA256 25fce83269210c1ce446b01969fd65e980ddcfd3b489218a3e9e3d16d4025e62
 MD5 d834f4848a4dcf4a167dd7460a8a7f2b files/audacity-1.3.4-nolibfailure.patch 1565
 RMD160 7d09b05176eee4ac0bee6f6832e472728ba890dd files/audacity-1.3.4-nolibfailure.patch 1565
 SHA256 25fce83269210c1ce446b01969fd65e980ddcfd3b489218a3e9e3d16d4025e62 files/audacity-1.3.4-nolibfailure.patch 1565
 DIST audacity-src-1.3.2.tar.gz 6683449 RMD160 b61747103675881bdf32762deea7635a2827b0de SHA1 87690806763b7de26a8e2df1f0d4c3a7e6d1a404 SHA256 aa37c00014ee79516fb5dce4c56e1038a7eaf5ad22a10743f0609ed186baf621
-DIST audacity-src-1.3.3.tar.gz 6649291 RMD160 ca0099bd00af8c863834b56b64c26b6a54a9e8b0 SHA1 1b52f0de736cb5903df3e4776530839bee26f567 SHA256 9a3e58c3ce04e5b1d743891bc7af6a2a22f01e846111af560def6a6cb360729d
 DIST audacity-src-1.3.4.tar.bz2 4349381 RMD160 754d81fb0e660d697e7c315c41f28584917e0a9e SHA1 50ab6cf19545f8cb38226b96252dbd958e7d88c4 SHA256 102d60e48e1928f3fd995a214ed9ba872929c6365cf5f784f107f351b42499f9
 EBUILD audacity-1.3.2-r1.ebuild 2481 RMD160 cfc039922a6eebf16b3b1266743659890f8515b7 SHA1 cc8d600c68ada664cfb92ef83defe64c79a4dc62 SHA256 1fac1916fc9679bf642a921dd71e799b73be8fdd63d3518d7716d1a399e084a2
 MD5 e150919756ac90b2e099ae313e2f52a3 audacity-1.3.2-r1.ebuild 2481
 RMD160 cfc039922a6eebf16b3b1266743659890f8515b7 audacity-1.3.2-r1.ebuild 2481
 SHA256 1fac1916fc9679bf642a921dd71e799b73be8fdd63d3518d7716d1a399e084a2 audacity-1.3.2-r1.ebuild 2481
-EBUILD audacity-1.3.3.ebuild 2338 RMD160 47a0fa9a519e16a5eee53a054330425e827168a1 SHA1 722c891a6f4373c81730bcc058d5e399162b4814 SHA256 68bc09d6ada34ee464dcd779a56608de38e1cae15683f506140670f0388515da
-MD5 15588368f1919f3177f2b39108f22f3a audacity-1.3.3.ebuild 2338
-RMD160 47a0fa9a519e16a5eee53a054330425e827168a1 audacity-1.3.3.ebuild 2338
-SHA256 68bc09d6ada34ee464dcd779a56608de38e1cae15683f506140670f0388515da audacity-1.3.3.ebuild 2338
 EBUILD audacity-1.3.4.ebuild 2038 RMD160 7f14d49f7655e297287ef424a1b592f0447241d4 SHA1 1fc8d0571b2ccdb0e3f92a6e3ea0267e833b855d SHA256 d160f6fc2f5c1db747280a5fca6f74f07c98a59d0eb781ea9caa2e91cf35f90b
 MD5 523faec5184540d2e708bcb001d63bbb audacity-1.3.4.ebuild 2038
 RMD160 7f14d49f7655e297287ef424a1b592f0447241d4 audacity-1.3.4.ebuild 2038
 SHA256 d160f6fc2f5c1db747280a5fca6f74f07c98a59d0eb781ea9caa2e91cf35f90b audacity-1.3.4.ebuild 2038
-MISC ChangeLog 13665 RMD160 579e5be684cb5206d3a099dcc438053fc817c791 SHA1 b155f88b32fc74c4e9fd223dc0ac7c005f9fa0f3 SHA256 3d07bd28ca939aed1fb5b9e9c0e9c0e8b841e17e5cabd59404d8f675de8a1cd1
-MD5 1915b9daf4901259a4e2b1d71ff8a9fa ChangeLog 13665
-RMD160 579e5be684cb5206d3a099dcc438053fc817c791 ChangeLog 13665
-SHA256 3d07bd28ca939aed1fb5b9e9c0e9c0e8b841e17e5cabd59404d8f675de8a1cd1 ChangeLog 13665
+MISC ChangeLog 13847 RMD160 5812db396ded6539328e5ced6623eae0d53e8c06 SHA1 001cdaeea1a0db3fcd7ae44107a680d82130ac03 SHA256 29cfde71bd554370613357f1699f8251c102b03e60106639758e93019e15701d
+MD5 194bd8be890d8b269a23392bf9e405dd ChangeLog 13847
+RMD160 5812db396ded6539328e5ced6623eae0d53e8c06 ChangeLog 13847
+SHA256 29cfde71bd554370613357f1699f8251c102b03e60106639758e93019e15701d ChangeLog 13847
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 MD5 f62f5a9cf5fe86389cf2bf4d85244ef5 metadata.xml 161
 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 metadata.xml 161
@@ -60,9 +50,13 @@ SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e metadata
 MD5 e4cb0c698f065ef88bab1eba174707aa files/digest-audacity-1.3.2-r1 259
 RMD160 8c96101c6f992bb514996875537ada9adde0edab files/digest-audacity-1.3.2-r1 259
 SHA256 707a1fdb467f1d843eb4978eac90c42d2a428918549578c186d6c568808aaaa5 files/digest-audacity-1.3.2-r1 259
-MD5 7a0750f94509a9ef07772543a2c71089 files/digest-audacity-1.3.3 259
-RMD160 a4f1cfe7be858792cd5246836b42ea01208b13d1 files/digest-audacity-1.3.3 259
-SHA256 b0009aac878b85fbc30afa099b93662d12c126e5a614114ae5de70d0717141fa files/digest-audacity-1.3.3 259
 MD5 a17807e49f06d99579c8200aa7693838 files/digest-audacity-1.3.4 262
 RMD160 89756e4630786a8e678b6d0a335931f9b7fab652 files/digest-audacity-1.3.4 262
 SHA256 907f29bacd1611ceede8e1c1fcb84fe623e30c25e7db82d5bb17636983be429b files/digest-audacity-1.3.4 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHimdGvFcC4BYPU0oRAoYTAJ44mWYAHkZDRZpyhOuW+4fl43ElLgCfck59
+9f6Qrs44t6cIpuSF8sNaVVM=
+=05yA
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.3.ebuild b/media-sound/audacity/audacity-1.3.3.ebuild
deleted file mode 100644
index 8022c3bd779a..000000000000
--- a/media-sound/audacity/audacity-1.3.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.3.ebuild,v 1.5 2007/11/18 20:28:32 aballier Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit eutils autotools wxwidgets
-
-IUSE="flac ladspa libsamplerate mp3 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"
-
-DEPEND="=x11-libs/wxGTK-2.6*
-	>=app-arch/zip-2.3
-	dev-libs/expat
-	>=media-libs/libsndfile-1.0.0
-	>=media-libs/libsoundtouch-1.3.1
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b
-		media-libs/libid3tag )
-	flac? ( media-libs/flac )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )"
-RDEPEND="${DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-
-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"
-	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
-
-	eautoreconf || die
-}
-
-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"
-	myconf="${myconf} --with-libsoundtouch=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/files/audacity-1.3.3+flac-1.1.3.patch b/media-sound/audacity/files/audacity-1.3.3+flac-1.1.3.patch
deleted file mode 100644
index 11b1128c6cc8..000000000000
--- a/media-sound/audacity/files/audacity-1.3.3+flac-1.1.3.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Naur audacity-src-1.3.3-beta.orig/acinclude.m4 audacity-src-1.3.3-beta/acinclude.m4
---- audacity-src-1.3.3-beta.orig/acinclude.m4	2007-05-18 13:56:02.000000000 +0900
-+++ audacity-src-1.3.3-beta/acinclude.m4	2007-05-19 13:37:01.000000000 +0900
-@@ -479,7 +479,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)
-diff -Naur audacity-src-1.3.3-beta.orig/src/export/ExportFLAC.cpp audacity-src-1.3.3-beta/src/export/ExportFLAC.cpp
---- audacity-src-1.3.3-beta.orig/src/export/ExportFLAC.cpp	2007-05-18 13:55:50.000000000 +0900
-+++ audacity-src-1.3.3-beta/src/export/ExportFLAC.cpp	2007-05-19 13:41:16.000000000 +0900
-@@ -145,6 +145,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
-+
- static struct
- {
-    bool        do_exhaustive_model_search;
-@@ -229,7 +236,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));
- 
-@@ -264,7 +273,11 @@
-    encoder->set_rice_parameter_search_dist(flacLevels[levelPref].rice_parameter_search_dist);
-    encoder->set_max_lpc_order(flacLevels[levelPref].max_lpc_order);
- 
-+#ifdef LEGACY_FLAC
-    encoder->init();
-+#else
-+   encoder->init(OSFILENAME(fName));
-+#endif
- 
-    int numWaveTracks;
-    WaveTrack **waveTracks;
-@@ -343,7 +356,7 @@
-    return new ExportFLAC();
- }
- 
--#endif // USE_LIBVORBIS
-+#endif // USE_LIBFLAC
- 
- // Indentation settings for Vim and Emacs and unique identifier for Arch, a
- // version control system. Please do not modify past this point.
-diff -Naur audacity-src-1.3.3-beta.orig/src/import/ImportFLAC.cpp audacity-src-1.3.3-beta/src/import/ImportFLAC.cpp
---- audacity-src-1.3.3-beta.orig/src/import/ImportFLAC.cpp	2007-05-18 13:55:53.000000000 +0900
-+++ audacity-src-1.3.3-beta/src/import/ImportFLAC.cpp	2007-05-19 13:37:01.000000000 +0900
-@@ -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
-@@ -273,6 +280,7 @@
- 
- bool FLACImportFileHandle::Init()
- {
-+#ifdef LEGACY_FLAC
-    bool success = mFile->set_filename(OSFILENAME(mName));
-    if (!success) {
-       return false;
-@@ -281,11 +289,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
-@@ -349,7 +369,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.3-gentoo.patch b/media-sound/audacity/files/audacity-1.3.3-gentoo.patch
deleted file mode 100644
index 76aa5684be9b..000000000000
--- a/media-sound/audacity/files/audacity-1.3.3-gentoo.patch
+++ /dev/null
diff --git a/media-sound/audacity/files/digest-audacity-1.3.3 b/media-sound/audacity/files/digest-audacity-1.3.3
deleted file mode 100644
index 061f5cb2cc0e..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72a9e3239f3b5af63030a1e1b07e40e7 audacity-src-1.3.3.tar.gz 6649291
-RMD160 ca0099bd00af8c863834b56b64c26b6a54a9e8b0 audacity-src-1.3.3.tar.gz 6649291
-SHA256 9a3e58c3ce04e5b1d743891bc7af6a2a22f01e846111af560def6a6cb360729d audacity-src-1.3.3.tar.gz 6649291