Version bump. Only installing .desktop in applications. Installing audacity icon to close bug #59611.

8 files changed, 22 insertions, 124 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index adb2c518631c..83d43e84a2ff 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.26 2004/07/01 07:25:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.27 2004/10/31 10:37:32 eradicator Exp $
+
+*audacity-1.2.2 (31 Oct 2004)
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/audacity-1.2.0-STTypes.patch, -audacity-1.1.3.ebuild,
+  -audacity-1.2.0-r1.ebuild, +audacity-1.2.2.ebuild:
+  Version bump. Only installing .desktop in applications. Installing audacity
+  icon to close bug #59611.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   audacity-1.2.0-r1.ebuild, audacity-1.2.1.ebuild:
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index a9a62b94925a..a23558a9a431 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -3,8 +3,10 @@ MD5 d054f422f23fc1a2790bf0a3a8e14be7 audacity-1.1.3.ebuild 2069
 MD5 5c05985b53931ceb077c814a2d1a939d audacity-1.2.0-r1.ebuild 2318
 MD5 a4b9a9c19045d3e0455e825217505db8 audacity-1.2.1.ebuild 2277
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 f5c1c6c2ae45c5918dac142de1f24bd0 audacity-1.2.2.ebuild 2105
 MD5 e2ae7b2007d03d608173fd4faecc1a06 files/audacity-1.2.0-STTypes.patch 499
 MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155
 MD5 cb2f75d37538e9688fe397cf178f57ad files/digest-audacity-1.1.3 68
 MD5 3997cded5596ed884d44484d5a650a5b files/digest-audacity-1.2.0-r1 71
 MD5 8f1e5073472cee2da1987db62e7db3a9 files/digest-audacity-1.2.1 72
+MD5 a150eb16468631b07901c6ca01451679 files/digest-audacity-1.2.2 71
diff --git a/media-sound/audacity/audacity-1.1.3.ebuild b/media-sound/audacity/audacity-1.1.3.ebuild
deleted file mode 100644
index becc3741596a..000000000000
--- a/media-sound/audacity/audacity-1.1.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.9 2004/06/24 23:51:13 agriffis 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}.tgz"
-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
-	=dev-libs/fftw-2*
-	>=media-libs/ladspa-sdk-1.12
-	flac? ( media-libs/flac )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	mad? ( >=media-sound/madplay-0.14 )
-	encode? ( >=media-sound/lame-3.92 )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOC="LICENSE.txt README.txt audacity-1.2-help.htb"
-
-# Disable UNICODE
-CFLAGS="${CFLAGS} -DwxUSE_UNICODE=0"
-
-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 --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
-
-	# Install our docs
-	dodoc ${DOC}
-
-	# Remove bad doc install
-	rm -rf ${D}/share/doc
-}
diff --git a/media-sound/audacity/audacity-1.2.0-r1.ebuild b/media-sound/audacity/audacity-1.2.2.ebuild
index 2f777d53abca..fa12293e17ac 100644
--- a/media-sound/audacity/audacity-1.2.0-r1.ebuild
+++ b/media-sound/audacity/audacity-1.2.2.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0-r1.ebuild,v 1.6 2004/07/01 07:25:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.2.ebuild,v 1.1 2004/10/31 10:37:32 eradicator Exp $
 
-inherit eutils
+IUSE="encode flac mad oggvorbis"
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-src-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
 
 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 ~ppc ~sparc -amd64"
+
+# Do not unmask on amd64 without talking to eradicator
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND=">=x11-libs/wxGTK-2.2.9
 	>=app-arch/zip-2.3
@@ -29,8 +30,6 @@ DEPEND=">=x11-libs/wxGTK-2.2.9
 	mad? ( >=media-sound/madplay-0.14 )
 	encode? ( >=media-sound/lame-3.92 )"
 
-S="${WORKDIR}/${MY_P}"
-
 DOC="LICENSE.txt README.txt audacity-1.2-help.htb"
 
 pkg_setup() {
@@ -43,12 +42,6 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-STTypes.patch
-}
-
 src_compile() {
 	local myconf;
 
@@ -82,7 +75,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	# Install our docs
 	dodoc ${DOC}
@@ -90,10 +83,9 @@ src_install() {
 	# Remove bad doc install
 	rm -rf ${D}/share/doc
 
-	insinto /usr/share/gnome/apps/Multimedia
-	doins ${FILESDIR}/audacity.desktop
-	insinto /usr/share/applnk/Multimedia
-	doins ${FILESDIR}/audacity.desktop
+	insinto /usr/share/pixmaps
+	newins AudacityLogo48x48.xpm audacity.xpm
+
 	insinto /usr/share/applications
 	doins ${FILESDIR}/audacity.desktop
 }
diff --git a/media-sound/audacity/files/audacity-1.2.0-STTypes.patch b/media-sound/audacity/files/audacity-1.2.0-STTypes.patch
deleted file mode 100644
index 55fd95cb7db5..000000000000
--- a/media-sound/audacity/files/audacity-1.2.0-STTypes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib-src/soundtouch/src/STTypes.h.orig	2004-05-06 09:47:37.808353000 -0700
-+++ lib-src/soundtouch/src/STTypes.h	2004-05-06 09:48:18.408353000 -0700
-@@ -49,6 +49,10 @@
- 	virtual const char *what() const throw() { return "soundtouch library st_assertion failure"; }
- };
- 
-+#if defined(__GNUC__) && __GNUC__ >= 3  /* GCC 3.x */
-+#define st_assert(expr) ((expr) ? 0 : throw soundtouch_exception())
-+#else 
- #define st_assert(expr) ((expr) ? (void) 0 : throw soundtouch_exception())
-+#endif
- 
- #endif
diff --git a/media-sound/audacity/files/digest-audacity-1.1.3 b/media-sound/audacity/files/digest-audacity-1.1.3
deleted file mode 100644
index 86b5295fcfcb..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec00d14cb2d7b3a28aab7e6aa098acf3 audacity-src-1.1.3.tgz 3109230
diff --git a/media-sound/audacity/files/digest-audacity-1.2.0-r1 b/media-sound/audacity/files/digest-audacity-1.2.0-r1
deleted file mode 100644
index 71653f4e9403..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cc3dca5327954b876f47124ab6f3586 audacity-src-1.2.0.tar.gz 3341562
diff --git a/media-sound/audacity/files/digest-audacity-1.2.2 b/media-sound/audacity/files/digest-audacity-1.2.2
new file mode 100644
index 000000000000..d964bdead3fc
--- /dev/null
+++ b/media-sound/audacity/files/digest-audacity-1.2.2
@@ -0,0 +1 @@
+MD5 68d60659ad936792f6d7d746a40a7179 audacity-src-1.2.2.tar.gz 3603400