Version bump (Bug #35658). Fixed fftw DEP (Bug #34010). Updated ebuild to correctly use USE flags. Now die only if wxGTK was compiled with unicode support (Bug #32753).

7 files changed, 166 insertions, 26 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index dac6752ef8f3..536b8062748e 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/audacity
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.14 2003/07/19 19:39:02 raker Exp $
+# 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 $
+
+*audacity-1.2.0_pre3 (07 Feb 2004)
+
+  07 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.1.3.ebuild, audacity-1.2.0_pre3.ebuild, metadata.xml,
+  files/basecfg-1.1.1:
+  Version bump (Bug #35658). Fixed fftw DEP (Bug #34010). Updated ebuild to
+  correctly use USE flags. Now die only if wxGTK was compiled with unicode
+  support (Bug #32753).
 
   19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
   Reverted to previous version
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index f26630efac3d..7c6ac3c63bbf 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,7 +1,6 @@
-MD5 1d6c59766ad16a10bf00f4186525c1b3 audacity-1.1.3.ebuild 1279
-MD5 0e4d28f1d70dbe463853499f708dfc7f audacity-1.2.0_pre3.ebuild 1243
-MD5 3b9426046914b2d1e263475aa4a3c03d ChangeLog 3762
+MD5 e9483396a802f02f718054c386d90cea audacity-1.1.3.ebuild 2090
+MD5 df0cf8fc6b95f4916e7b2b5427919656 audacity-1.2.0_pre3.ebuild 2013
+MD5 83c2e78e9135f87ae37fdd5df6555b55 ChangeLog 3905
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 116eddddc2e3e107810170f09cfa1124 files/digest-audacity-1.2.0_pre3 77
 MD5 cb2f75d37538e9688fe397cf178f57ad files/digest-audacity-1.1.3 68
-MD5 d1064c1800175d5fb3113f74785568f6 files/basecfg-1.1.1 35
diff --git a/media-sound/audacity/audacity-1.1.3.ebuild b/media-sound/audacity/audacity-1.1.3.ebuild
index 8d760276d929..b881ae02fa8d 100644
--- a/media-sound/audacity/audacity-1.1.3.ebuild
+++ b/media-sound/audacity/audacity-1.1.3.ebuild
@@ -1,50 +1,91 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.5 2003/12/18 23:09:17 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.3.ebuild,v 1.6 2004/02/07 10:26:03 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}/${PN}-src-${PV}.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 RESTRICT="nomirror"
 
 LICENSE="GPL-2"
-IUSE="encode oggvorbis"
+IUSE="encode flac mad 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/libid3tag
 	>=media-libs/libsndfile-1.0.0
 	>=media-libs/libsamplerate-0.0.14
-	>=dev-libs/fftw-2.1.3
+	=dev-libs/fftw-2*
 	>=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}/${PN}-src-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DOC="LICENSE.txt README.txt audacity-1.2-help.htb"
+
+# Disable UNICODE
+CFLAGS="${CFLAGS} -DwxUSE_UNICODE=0"
 
 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"
+	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
-	unpack ${PN}-src-${PV}.tgz
+	unpack ${A}
 }
 
 src_compile() {
-	econf --with-libsndfile=system --without-libflac || die
-	MAKEOPTS=-j1 emake || die
+	local myconf;
+
+	myconf="--with-libsndfile=system --with-id3tag=system --with-help"
+
+	# 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
-	dodoc LICENSE.txt README.txt
+
+	# Install our docs
+	dodoc ${DOC}
+
+	# Remove bad doc install
+	rm -rf ${D}/share/doc
 }
diff --git a/media-sound/audacity/audacity-1.2.0_pre3.ebuild b/media-sound/audacity/audacity-1.2.0_pre3.ebuild
new file mode 100644
index 000000000000..81cea6840dcc
--- /dev/null
+++ b/media-sound/audacity/audacity-1.2.0_pre3.ebuild
@@ -0,0 +1,87 @@
+# 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 $
+
+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"
+
+src_unpack() {
+	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
+	unpack ${A}
+}
+
+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/basecfg-1.1.1 b/media-sound/audacity/files/basecfg-1.1.1
deleted file mode 100644
index 5a93eecbaa45..000000000000
--- a/media-sound/audacity/files/basecfg-1.1.1
+++ /dev/null
@@ -1,2 +0,0 @@
-Version=1.1.1
-PrefsVersion=1.1.1r1
diff --git a/media-sound/audacity/files/digest-audacity-1.2.0_pre3 b/media-sound/audacity/files/digest-audacity-1.2.0_pre3
new file mode 100644
index 000000000000..2c71c0e2d34c
--- /dev/null
+++ b/media-sound/audacity/files/digest-audacity-1.2.0_pre3
@@ -0,0 +1 @@
+MD5 a7efddd64e2ce3e380614796d689e11f audacity-src-1.2.0-pre3.tar.bz2 2779222
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/audacity/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>