Version bump.

6 files changed, 103 insertions, 10 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 536b8062748e..b51cfd219a38 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.15 2004/02/07 10:26:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.16 2004/02/28 19:31:32 eradicator Exp $
+
+*audacity-1.2.0_pre4 (28 Feb 2004)
+
+  28 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0_pre4.ebuild:
+  Version bump.
 
 *audacity-1.2.0_pre3 (07 Feb 2004)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 7c6ac3c63bbf..931b7fb20212 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,8 @@
-MD5 e9483396a802f02f718054c386d90cea audacity-1.1.3.ebuild 2090
-MD5 df0cf8fc6b95f4916e7b2b5427919656 audacity-1.2.0_pre3.ebuild 2013
-MD5 83c2e78e9135f87ae37fdd5df6555b55 ChangeLog 3905
+MD5 78a5570d04b3318d6231c78960125a4b audacity-1.1.3.ebuild 2076
+MD5 288e24cda5740e8d887e152e4fd18c7d audacity-1.2.0_pre3.ebuild 1999
+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
diff --git a/media-sound/audacity/audacity-1.1.3.ebuild b/media-sound/audacity/audacity-1.1.3.ebuild
index b881ae02fa8d..b39ba66209a2 100644
--- a/media-sound/audacity/audacity-1.1.3.ebuild
+++ b/media-sound/audacity/audacity-1.1.3.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.1.3.ebuild,v 1.6 2004/02/07 10:26:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.3.ebuild,v 1.7 2004/02/28 19:31:32 eradicator Exp $
 
 inherit eutils
 
@@ -37,7 +37,7 @@ DOC="LICENSE.txt README.txt audacity-1.2-help.htb"
 # Disable UNICODE
 CFLAGS="${CFLAGS} -DwxUSE_UNICODE=0"
 
-src_unpack() {
+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"
@@ -45,7 +45,6 @@ src_unpack() {
 		einfo "you must set USE=-unicode."
 		die "wxGTK must be re-emerged without unicode suport"
 	fi
-	unpack ${A}
 }
 
 src_compile() {
diff --git a/media-sound/audacity/audacity-1.2.0_pre3.ebuild b/media-sound/audacity/audacity-1.2.0_pre3.ebuild
index 81cea6840dcc..ef7e10bfff0d 100644
--- a/media-sound/audacity/audacity-1.2.0_pre3.ebuild
+++ b/media-sound/audacity/audacity-1.2.0_pre3.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_pre3.ebuild,v 1.1 2004/02/07 10:26:03 eradicator Exp $
+# $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
 
@@ -33,7 +33,7 @@ S="${WORKDIR}/${MY_P}"
 
 DOC="LICENSE.txt README.txt audacity-1.2-help.htb"
 
-src_unpack() {
+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"
@@ -41,7 +41,6 @@ src_unpack() {
 		einfo "you must set USE=-unicode."
 		die "wxGTK must be re-emerged without unicode suport"
 	fi
-	unpack ${A}
 }
 
 src_compile() {
diff --git a/media-sound/audacity/audacity-1.2.0_pre4.ebuild b/media-sound/audacity/audacity-1.2.0_pre4.ebuild
new file mode 100644
index 000000000000..a430e1d238b7
--- /dev/null
+++ b/media-sound/audacity/audacity-1.2.0_pre4.ebuild
@@ -0,0 +1,86 @@
+# 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 $
+
+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.gz"
+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_pre4 b/media-sound/audacity/files/digest-audacity-1.2.0_pre4
new file mode 100644
index 000000000000..d6987edca7e9
--- /dev/null
+++ b/media-sound/audacity/files/digest-audacity-1.2.0_pre4
@@ -0,0 +1 @@
+MD5 9ecfad1a423a61128a11fabcc37a4f04 audacity-src-1.2.0-pre4.tar.gz 3364771