applied cleanup patch which was provided by Diego Pettenò <dgp85@users.sourceforge.net>, fixes #74224 and #83301

(Portage version: 2.0.51.19)

4 files changed, 84 insertions, 4 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 7473b64aef07..c39252e2a265 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.32 2005/03/05 09:54:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.33 2005/04/15 17:46:25 luckyduck Exp $
+
+*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ò
+  <dgp85@users.sourceforge.net>, fixes #74224 and #83301
 
   05 Mar 2005; Markus Rothe <corsair@gentoo.org> audacity-1.2.3.ebuild:
   Stable on ppc64
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 026efbab7790..c3359d6a8e3e 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,9 +1,11 @@
-MD5 7eea10f09eb23d0355f2dcdd18dbe732 ChangeLog 6247
 MD5 ecd50e76ec32ebc7c65713f25043676e audacity-1.2.1.ebuild 2274
+MD5 83d33964926464f7f3b6854e80809081 audacity-1.2.3.ebuild 2186
+MD5 6969a59fd40665476862fadd22927484 audacity-1.2.3-r1.ebuild 1804
 MD5 c2e4f3e0a392870cc3cfb7536ca9c4f9 audacity-1.2.2.ebuild 2183
+MD5 cef126c696d308d3d06099f53d68a183 ChangeLog 6479
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 83d33964926464f7f3b6854e80809081 audacity-1.2.3.ebuild 2186
-MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155
+MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3-r1 71
 MD5 8f1e5073472cee2da1987db62e7db3a9 files/digest-audacity-1.2.1 72
 MD5 a150eb16468631b07901c6ca01451679 files/digest-audacity-1.2.2 71
 MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3 71
+MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155
diff --git a/media-sound/audacity/audacity-1.2.3-r1.ebuild b/media-sound/audacity/audacity-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..8bf454c75d23
--- /dev/null
+++ b/media-sound/audacity/audacity-1.2.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.3-r1.ebuild,v 1.1 2005/04/15 17:46:25 luckyduck Exp $
+
+inherit wxwidgets eutils
+
+IUSE="gtk2 encode flac mad oggvorbis libsamplerate"
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-src-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://audacity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# amd64: causes xfce pannel to crash...
+# Bad x86 assembly: #73248
+KEYWORDS="~amd64 ~ppc ~sparc -x86 ~ppc64"
+
+DEPEND=">=x11-libs/wxGTK-2.4.2-r1
+	>=app-arch/zip-2.3
+	>=media-libs/id3lib-3.8.0
+	media-libs/libid3tag
+	>=media-libs/libsndfile-1.0.0
+	libsamplerate? ( >=media-libs/libsamplerate-0.0.14 )
+	>=media-libs/ladspa-sdk-1.12
+	flac? ( media-libs/flac )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	mad? ( media-libs/libmad )
+	encode? ( >=media-sound/lame-3.92 )"
+
+WX_GTK_VER="2.4"
+
+src_compile() {
+	if ! use gtk2; then
+		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
+	else
+		need-wxwidgets gtk2 || die "No gtk2 version of x11-libs/wxGTK found"
+	fi
+
+	econf \
+		$(use_with mad libmad system) \
+		$(use_with oggvorbis vorbis system) \
+		$(use_with flac libflac system) \
+		$(use_with libsamplerate system) \
+		--with-id3tag=system \
+		--with-libsndfile=system \
+		${myconf} || die
+
+	# parallel borks
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	# Install our docs
+	dodoc LICENSE.txt README.txt audacity-1.2-help.htb
+
+	# Remove bad doc install
+	rm -rf ${D}/share/doc
+
+	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.3-r1 b/media-sound/audacity/files/digest-audacity-1.2.3-r1
new file mode 100644
index 000000000000..e3ad05e9d285
--- /dev/null
+++ b/media-sound/audacity/files/digest-audacity-1.2.3-r1
@@ -0,0 +1 @@
+MD5 dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz 4175943