cleanup

7 files changed, 3 insertions, 172 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 590f2d162ae1..206d7daedce9 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,13 +1,9 @@
 MD5 bf3f6434c87df998d331decbd97f2617 ChangeLog 3541
-MD5 2fc85f7413f01d6261941063d5b7cdf6 audacity-1.1.1-r1.ebuild 1394
-MD5 096a267fdcc01acac3c6d0b5a3868e49 audacity-1.1.1.ebuild 863
-MD5 3f868adf5491a5d676cc86ae99602e8f audacity-1.1.3.ebuild 1278
+MD5 5f8d028a16df282d4bef4395296c1ca9 audacity-1.1.3.ebuild 1297
 MD5 c151b63a0eca16e885c23226c03d28f0 files/audacity-1.0.0-gcc31.patch 2153
 MD5 f779279f19d249c6d735b28e72c30c6b files/audacity-src-1.1.0-phonograph.patch 5137
 MD5 f34b93cc26c85c6789d21fb94b213e09 files/audacity-src-1.1.0-timestretch.patch 19316
 MD5 d1064c1800175d5fb3113f74785568f6 files/basecfg-1.1.1 35
-MD5 024df109bab703d496948d08e53f7b8f files/digest-audacity-1.1.1 68
-MD5 766f7e6fa7f5a3253ca220bca4826430 files/digest-audacity-1.1.1-r1 70
 MD5 cb2f75d37538e9688fe397cf178f57ad files/digest-audacity-1.1.3 68
 MD5 21b2333db59cc116a7e3c96563fe9ccd files/id3lib-3.8.0-gcc3.patch 2707
 MD5 8f5051d60b802ecf74497bc2ec4bb32e files/mono_mp3_export.patch 6261
diff --git a/media-sound/audacity/audacity-1.1.1-r1.ebuild b/media-sound/audacity/audacity-1.1.1-r1.ebuild
deleted file mode 100644
index 1fbde538fec1..000000000000
--- a/media-sound/audacity/audacity-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.1-r1.ebuild,v 1.8 2003/09/07 00:06:04 msterret Exp $
-
-inherit eutils
-
-DESCRIPTION="A free, crossplatform audio editor."
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}-3.tgz"
-
-LICENSE="GPL-2"
-IUSE="oggvorbis"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=x11-libs/wxGTK-2.2.9
-	>=app-arch/zip-2.3
-	>=media-sound/mad-0.14
-	>=media-libs/id3lib-3.8.0
-	>=media-libs/libsndfile-1.0.0
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-S="${WORKDIR}/${PN}-src-${PV}-3"
-
-src_unpack() {
-	if [ `use gtk2` ]; then
-		eerror ""
-		eerror "Audacity will not build with wxGTK compiled"
-		eerror "against gtk2.  Make sure you have set"
-		eerror "-gtk2 in use for this program to compile"
-		eerror ""
-		die "Make sure -gtk2 is in USE"
-	fi
-	unpack ${PN}-src-${PV}-3.tgz
-	cd ${S}
-	epatch ${FILESDIR}/mono_mp3_export.patch || die
-}
-
-src_compile() {
-	econf --with-libsndfile=system || die
-	MAKEOPTS=-j1 emake || die
-}
-
-src_install() {
-	make PREFIX="${D}/usr" install || die
-	dodoc LICENSE.txt README.txt
-	insinto /etc/skel
-	newins ${FILESDIR}/basecfg-1.1.1 .Audacity
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you built Audacity against wxGTK-2.4.0 you must..."
-	einfo "cp /etc/skel/.Audacity ~"
-	einfo
-}
diff --git a/media-sound/audacity/audacity-1.1.1.ebuild b/media-sound/audacity/audacity-1.1.1.ebuild
deleted file mode 100644
index c4c965610bed..000000000000
--- a/media-sound/audacity/audacity-1.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.1.ebuild,v 1.3 2003/02/14 08:50:02 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="A free, crossplatform audio editor."
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
-
-LICENSE="GPL-2"
-IUSE="oggvorbis"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=x11-libs/wxGTK-2.4.0
-	oggvorbis? ( media-libs/libvorbis )
-	app-arch/zip
-	media-sound/mad
-	media-libs/id3lib"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-src_unpack() {
-	unpack ${PN}-src-${PV}.tgz
-	cd ${S}
-	epatch ${FILESDIR}/mono_mp3_export.patch || die
-}
-
-src_compile() {
-	econf || die
-	MAKEOPTS=-j1 emake || die
-}
-
-src_install() {
-	make PREFIX="${D}/usr" install || die
-	dodoc LICENSE.txt README.txt
-}
diff --git a/media-sound/audacity/audacity-1.1.3.ebuild b/media-sound/audacity/audacity-1.1.3.ebuild
index 9a407477f4ce..8d760276d929 100644
--- a/media-sound/audacity/audacity-1.1.3.ebuild
+++ b/media-sound/audacity/audacity-1.1.3.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.3.ebuild,v 1.4 2003/09/11 01:21:31 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.3.ebuild,v 1.5 2003/12/18 23:09:17 mholzer Exp $
 
 inherit eutils
 
 DESCRIPTION="A free, crossplatform audio editor."
 HOMEPAGE="http://audacity.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 IUSE="encode oggvorbis"
diff --git a/media-sound/audacity/files/audacity-1.0.0-gcc31.patch b/media-sound/audacity/files/audacity-1.0.0-gcc31.patch
deleted file mode 100644
index 9cf3d3689fba..000000000000
--- a/media-sound/audacity/files/audacity-1.0.0-gcc31.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -u -r audacity-src-1.0.0.old/id3lib/src/tag_file.cpp audacity-src-1.0.0/id3lib/src/tag_file.cpp
---- audacity-src-1.0.0.old/id3lib/src/tag_file.cpp	2002-06-05 09:51:19.000000000 +0200
-+++ audacity-src-1.0.0/id3lib/src/tag_file.cpp	2002-07-26 21:00:16.000000000 +0200
-@@ -281,7 +281,7 @@
-       //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
-     }
- 
--    ofstream tmpOut(fd);
-+    ofstream tmpOut(sTempFile);
-     if (!tmpOut)
-     {
-       tmpOut.close();
-@@ -293,7 +293,7 @@
- 
-     tmpOut.write(tagData, tagSize);
-     file.seekg(tag.GetPrependedBytes(), ios::beg);
--    uchar tmpBuffer[BUFSIZ];
-+    char tmpBuffer[BUFSIZ];
-     while (file)
-     {
-       file.read(tmpBuffer, BUFSIZ);
-diff -u -r audacity-src-1.0.0.old/id3lib/src/utils.cpp audacity-src-1.0.0/id3lib/src/utils.cpp
---- audacity-src-1.0.0.old/id3lib/src/utils.cpp	2002-06-05 09:51:19.000000000 +0200
-+++ audacity-src-1.0.0/id3lib/src/utils.cpp	2002-07-26 21:01:25.000000000 +0200
-@@ -40,7 +40,8 @@
- #define NOCREATE ((std::ios_base::openmode)0)
- #define toascii(X) (X)
- #else
--#define NOCREATE ios::nocreate
-+//#define NOCREATE ios::nocreate
-+#define NOCREATE ios::in
- #endif
- 
- #include "utils.h"
-@@ -106,7 +107,7 @@
-     size_t source_size = source.size();
- //    const char* source_str = source.data();
-     char * source_str = new char[source.length()+1]; 
--    source.copy(source_str, string::npos); 
-+    source.copy(source_str, String::npos); 
-     source_str[source.length()] = 0; 
- 
- #define BUFSIZ 1024
-@@ -242,7 +243,7 @@
-   size_t size = 0;
-   if (file.is_open())
-   {
--    streamoff curpos = file.tellg();
-+    int curpos = file.tellg();
-     file.seekg(0, ios::end);
-     size = file.tellg();
-     file.seekg(curpos);
-@@ -255,7 +256,7 @@
-   size_t size = 0;
-   if (file.is_open())
-   {
--    streamoff curpos = file.tellg();
-+    int curpos = file.tellg();
-     file.seekg(0, ios::end);
-     size = file.tellg();
-     file.seekg(curpos);
-@@ -268,7 +269,7 @@
-   size_t size = 0;
-   if (file.is_open())
-   {
--    streamoff curpos = file.tellp();
-+    int curpos = file.tellp();
-     file.seekp(0, ios::end);
-     size = file.tellp();
-     file.seekp(curpos);
diff --git a/media-sound/audacity/files/digest-audacity-1.1.1 b/media-sound/audacity/files/digest-audacity-1.1.1
deleted file mode 100644
index e2f6eff266dd..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70ffc1f9b076bccd4892148a87a24502 audacity-src-1.1.1.tgz 2310533
diff --git a/media-sound/audacity/files/digest-audacity-1.1.1-r1 b/media-sound/audacity/files/digest-audacity-1.1.1-r1
deleted file mode 100644
index 4880d8bb2f2d..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8fd7fc8ccc06b51ab3244a574dc0f3a9 audacity-src-1.1.1-3.tgz 2310873