Version bump. Bug #43577. 1.2 works fine with wxGTK unicode.

7 files changed, 13 insertions, 102 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index b51cfd219a38..b64ee407121d 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.16 2004/02/28 19:31:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.17 2004/03/03 11:40:31 eradicator Exp $
+
+*audacity-1.2.0 (03 Mar 2004)
+
+  03 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0.ebuild:
+  Version bump.  Bug #43577. 1.2 works fine with wxGTK unicode.
 
 *audacity-1.2.0_pre4 (28 Feb 2004)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 931b7fb20212..cea9ae6149f0 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,8 +1,10 @@
 MD5 78a5570d04b3318d6231c78960125a4b audacity-1.1.3.ebuild 2076
 MD5 288e24cda5740e8d887e152e4fd18c7d audacity-1.2.0_pre3.ebuild 1999
+MD5 dc9994a0ea1ae17ccd88b598c85ed3b5 audacity-1.2.0.ebuild 1998
 MD5 c9a385ad8fbf7c7ae85dad2d587ce85b ChangeLog 4045
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 dc9994a0ea1ae17ccd88b598c85ed3b5 audacity-1.2.0_pre4.ebuild 1998
 MD5 116eddddc2e3e107810170f09cfa1124 files/digest-audacity-1.2.0_pre3 77
 MD5 f7f442550ccd82a8882c3310d25e77e0 files/digest-audacity-1.2.0_pre4 76
 MD5 cb2f75d37538e9688fe397cf178f57ad files/digest-audacity-1.1.3 68
+MD5 3997cded5596ed884d44484d5a650a5b files/digest-audacity-1.2.0 71
diff --git a/media-sound/audacity/audacity-1.2.0_pre4.ebuild b/media-sound/audacity/audacity-1.2.0.ebuild
index a430e1d238b7..0b0e4d388a5e 100644
--- a/media-sound/audacity/audacity-1.2.0_pre4.ebuild
+++ b/media-sound/audacity/audacity-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0_pre4.ebuild,v 1.1 2004/02/28 19:31:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0.ebuild,v 1.1 2004/03/03 11:40:31 eradicator Exp $
 
 inherit eutils
 
@@ -33,16 +33,6 @@ S="${WORKDIR}/${MY_P}"
 
 DOC="LICENSE.txt README.txt audacity-1.2-help.htb"
 
-pkg_setup() {
-	if wx-config --cppflags | grep gtk2u >& /dev/null; then
-		einfo "Audacity will not build if wxGTK was compiled"
-		einfo "with unicode support.  If you are using a version of"
-		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
-		einfo "you must set USE=-unicode."
-		die "wxGTK must be re-emerged without unicode suport"
-	fi
-}
-
 src_compile() {
 	local myconf;
 
@@ -71,8 +61,8 @@ src_compile() {
 
 	econf ${myconf} || die
 
-	# emake b0rks 
-	make || die
+	# parallel borks 
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/media-sound/audacity/audacity-1.2.0_pre3.ebuild b/media-sound/audacity/audacity-1.2.0_pre3.ebuild
deleted file mode 100644
index ef7e10bfff0d..000000000000
--- a/media-sound/audacity/audacity-1.2.0_pre3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0_pre3.ebuild,v 1.2 2004/02/28 19:31:32 eradicator Exp $
-
-inherit eutils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-src-${MY_PV}"
-
-DESCRIPTION="A free, crossplatform audio editor."
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-IUSE="encode flac mad oggvorbis"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND=">=x11-libs/wxGTK-2.2.9
-	>=app-arch/zip-2.3
-	>=media-libs/id3lib-3.8.0
-	media-libs/libid3tag
-	>=media-libs/libsndfile-1.0.0
-	>=media-libs/libsamplerate-0.0.14
-	>=media-libs/ladspa-sdk-1.12
-	flac? ( media-libs/flac )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	mad? ( >=media-sound/mad-0.14 )
-	encode? ( >=media-sound/lame-3.92 )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOC="LICENSE.txt README.txt audacity-1.2-help.htb"
-
-pkg_setup() {
-	if wx-config --cppflags | grep gtk2u >& /dev/null; then
-		einfo "Audacity will not build if wxGTK was compiled"
-		einfo "with unicode support.  If you are using a version of"
-		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
-		einfo "you must set USE=-unicode."
-		die "wxGTK must be re-emerged without unicode suport"
-	fi
-}
-
-src_compile() {
-	local myconf;
-
-	myconf="--with-libsndfile=system --with-id3tag=system"
-
-	# MAD support
-	if use mad; then
-		myconf="${myconf} --with-libmad=system"
-	else
-		myconf="${myconf} --with-libmad=none"
-	fi
-
-	# FLAC support
-	if use flac; then
-		myconf="${myconf} --with-libflac=system"
-	else
-		myconf="${myconf} --with-libflac=none"
-	fi
-
-	# Ogg Vorbis support
-	if use oggvorbis; then
-		myconf="${myconf} --with-vorbis=system"
-	else
-		myconf="${myconf} --with-vorbis=none"
-	fi
-
-	econf ${myconf} || die
-
-	# emake b0rks 
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Install our docs
-	dodoc ${DOC}
-
-	# Remove bad doc install
-	rm -rf ${D}/share/doc
-}
diff --git a/media-sound/audacity/files/digest-audacity-1.2.0 b/media-sound/audacity/files/digest-audacity-1.2.0
new file mode 100644
index 000000000000..71653f4e9403
--- /dev/null
+++ b/media-sound/audacity/files/digest-audacity-1.2.0
@@ -0,0 +1 @@
+MD5 2cc3dca5327954b876f47124ab6f3586 audacity-src-1.2.0.tar.gz 3341562
diff --git a/media-sound/audacity/files/digest-audacity-1.2.0_pre3 b/media-sound/audacity/files/digest-audacity-1.2.0_pre3
deleted file mode 100644
index 2c71c0e2d34c..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.2.0_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7efddd64e2ce3e380614796d689e11f audacity-src-1.2.0-pre3.tar.bz2 2779222
diff --git a/media-sound/audacity/files/digest-audacity-1.2.0_pre4 b/media-sound/audacity/files/digest-audacity-1.2.0_pre4
deleted file mode 100644
index d6987edca7e9..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.2.0_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ecfad1a423a61128a11fabcc37a4f04 audacity-src-1.2.0-pre4.tar.gz 3364771