Removed some use flag, Clean up ebuild. Bug 113948.

(Portage version: 2.0.53)

4 files changed, 84 insertions, 4 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 2457ca77e464..a9647340ae65 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.38 2006/01/01 04:21:00 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.39 2006/01/03 03:11:48 matsuu Exp $
+
+*audacity-1.2.4b-r1 (03 Jan 2006)
+
+  03 Jan 2006; MATSUU Takuto <matsuu@gentoo.org> +audacity-1.2.4b-r1.ebuild:
+  Removed some use flag. Bug 113948.
+  Clean up ebuild.
 
 *audacity-1.2.4b (01 Jan 2006)
 
@@ -17,7 +23,7 @@
   audacity-1.2.2.ebuild, audacity-1.2.3.ebuild, audacity-1.2.3-r1.ebuild:
   oggvorbis Cleanup
 
-  18 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  18 Dec 2005; Diego Petten嘆 <flameeyes@gentoo.org>
   audacity-1.2.3-r1.ebuild:
   Remove eventual stray applnk desktop file, see bug #111204.
 
@@ -26,14 +32,14 @@
   Thanks to basic <basic AT mozdev DOT org> for the patch to fix compilation on
   x86.  Marking ~x86 for testing. bug #73248
 
-  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> audacity-1.2.1.ebuild,
+  15 May 2005; Diego Petten嘆 <flameeyes@gentoo.org> audacity-1.2.1.ebuild,
   audacity-1.2.2.ebuild, audacity-1.2.3.ebuild, audacity-1.2.3-r1.ebuild:
   Fixed dependency ok wxGTK 2.4 slot as per bug #92730.
 
 *audacity-1.2.3-r1 (15 Apr 2005)
 
   15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +audacity-1.2.3-r1.ebuild:
-  applied cleanup patch which was provided by Diego Pettenò
+  applied cleanup patch which was provided by Diego Petten嘆
   <dgp85@users.sourceforge.net>, fixes #74224 and #83301
 
   05 Mar 2005; Markus Rothe <corsair@gentoo.org> audacity-1.2.3.ebuild:
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 03a86cc34d57..3cf1d3b7d0ee 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -3,7 +3,9 @@ MD5 93c9059ec89a928748fbc4c6ff7ce950 audacity-1.2.1.ebuild 2263
 MD5 2fa288b95d1713417e3342b869c83967 audacity-1.2.2.ebuild 2172
 MD5 2d7b8330e198f9fc6f5727f293b13d49 audacity-1.2.3-r1.ebuild 1926
 MD5 466b743fd1ead3cc85a21538f707d2aa audacity-1.2.3.ebuild 2175
+MD5 d463fa70968caf74b1789814cd6db34a audacity-1.2.4b-r1.ebuild 1528
 MD5 c7b795988ee39799680c03a81643908d audacity-1.2.4b.ebuild 2301
+MD5 50bb829589c756874b83b311a5ea11ea audacity-1.3.0.ebuild 1511
 MD5 8d8b48aa5931322a0a0a8ad826335c38 files/audacity-1.2.3-gcc41.patch 650
 MD5 502eabf8993eb2af91e1265425024091 files/audacity-1.2.3-x86.patch 995
 MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155
@@ -12,4 +14,6 @@ MD5 a150eb16468631b07901c6ca01451679 files/digest-audacity-1.2.2 71
 MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3 71
 MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3-r1 71
 MD5 66713de531f00118315348503d7c52c1 files/digest-audacity-1.2.4b 72
+MD5 66713de531f00118315348503d7c52c1 files/digest-audacity-1.2.4b-r1 72
+MD5 17aefee29faab8891b40a731a10225cd files/digest-audacity-1.3.0 71
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
diff --git a/media-sound/audacity/audacity-1.2.4b-r1.ebuild b/media-sound/audacity/audacity-1.2.4b-r1.ebuild
new file mode 100644
index 000000000000..b78721de920b
--- /dev/null
+++ b/media-sound/audacity/audacity-1.2.4b-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.4b-r1.ebuild,v 1.1 2006/01/03 03:11:48 matsuu Exp $
+
+inherit wxwidgets eutils flag-o-matic
+
+IUSE="encode mad 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"
+
+DEPEND="=x11-libs/wxGTK-2.4*
+	>=app-arch/zip-2.3
+	media-libs/libid3tag
+	>=media-libs/libsndfile-1.0.0
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	encode? ( >=media-sound/lame-3.92 )
+	mad? ( >=media-libs/libmad-0.14.2b )"
+
+WX_GTK_VER="2.4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.3-gcc41.patch # bug 113754
+}
+
+src_compile() {
+	if built_with_use '=x11-libs/wxGTK-2.4*' gtk2 ; then
+		need-wxwidgets gtk2
+	else
+		need-wxwidgets gtk
+	fi
+
+	filter-flags -fPIC
+
+	econf \
+		$(use_with mad libmad system) \
+		$(use_with vorbis vorbis system) \
+		--with-id3tag=system \
+		--with-libsndfile=system || die
+
+	# parallel borks
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	# Remove bad doc install
+	rm -rf ${D}/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt audacity-1.2-help.htb
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins images/AudacityLogo48x48.xpm audacity.xpm
+
+	make_desktop_entry audacity Audacity audacity
+}
diff --git a/media-sound/audacity/files/digest-audacity-1.2.4b-r1 b/media-sound/audacity/files/digest-audacity-1.2.4b-r1
new file mode 100644
index 000000000000..496c8a29c351
--- /dev/null
+++ b/media-sound/audacity/files/digest-audacity-1.2.4b-r1
@@ -0,0 +1 @@
+MD5 37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz 4499894