-O3 to -O2 for bug #45252. Marking stable.

4 files changed, 11 insertions, 58 deletions

diff --git a/media-sound/soundtracker/ChangeLog b/media-sound/soundtracker/ChangeLog
index 99fe7077a2aa..55e9f0f60d26 100644
--- a/media-sound/soundtracker/ChangeLog
+++ b/media-sound/soundtracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/soundtracker
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/ChangeLog,v 1.6 2004/02/21 01:02:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/ChangeLog,v 1.7 2004/03/23 07:14:41 eradicator Exp $
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  soundtracker-0.6.7.ebuild, soundtracker-0.6.7_pre5.ebuild:
+  -O3 to -O2 for bug #45252.  Marking stable.
 
 *soundtracker-0.6.7 (20 Feb 2004)
 
diff --git a/media-sound/soundtracker/files/digest-soundtracker-0.6.7_pre5 b/media-sound/soundtracker/files/digest-soundtracker-0.6.7_pre5
deleted file mode 100644
index 19ea20bd4c89..000000000000
--- a/media-sound/soundtracker/files/digest-soundtracker-0.6.7_pre5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ca6c72ca6a320d51f01db7d5eabba83 soundtracker-0.6.7-pre5.tar.gz 829769
diff --git a/media-sound/soundtracker/soundtracker-0.6.7.ebuild b/media-sound/soundtracker/soundtracker-0.6.7.ebuild
index f81f892ac54f..c53890b924d5 100644
--- a/media-sound/soundtracker/soundtracker-0.6.7.ebuild
+++ b/media-sound/soundtracker/soundtracker-0.6.7.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.7.ebuild,v 1.1 2004/02/21 01:02:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.7.ebuild,v 1.2 2004/03/23 07:14:41 eradicator Exp $
 
 IUSE="nls esd gnome oss alsa jack"
 
+inherit eutils
+
 S=${WORKDIR}/${P/_/-}
 
 DESCRIPTION="SoundTracker is a music tracking tool for UNIX/X11 (MOD tracker)"
@@ -28,7 +30,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${A}
@@ -36,6 +38,8 @@ src_unpack() {
 }
 
 src_compile() {
+	replace-flags "-O3" "-O2"
+
 	local myconf
 
 	use oss || myconf="--disable-oss"
diff --git a/media-sound/soundtracker/soundtracker-0.6.7_pre5.ebuild b/media-sound/soundtracker/soundtracker-0.6.7_pre5.ebuild
deleted file mode 100644
index 61f128a3f059..000000000000
--- a/media-sound/soundtracker/soundtracker-0.6.7_pre5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.7_pre5.ebuild,v 1.5 2004/02/21 01:02:40 eradicator Exp $
-
-IUSE="nls esd gnome oss alsa jack"
-
-S=${WORKDIR}/${P/_/-}
-
-DESCRIPTION="SoundTracker is a music tracking tool for UNIX/X11 (MOD tracker)"
-SRC_URI="http://www.soundtracker.org/dl/v0.6/${P/_/-}.tar.gz"
-HOMEPAGE="http://www.soundtracker.org"
-
-DEPEND="sys-libs/zlib
-	=x11-libs/gtk+-1.2*
-	>=media-libs/audiofile-0.2.1
-	alsa? ( media-libs/alsa-lib )
-	esd? ( media-sound/esound )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.7 )
-	nls? ( sys-devel/gettext )
-	jack? ( virtual/jack )"
-
-RDEPEND="$DEPEND
-	app-arch/bzip2
-	app-arch/gzip
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_compile() {
-	local myconf
-
-	use oss || myconf="--disable-oss"
-	use esd || myconf="${myconf} --disable-esd"
-	use nls || myconf="${myconf} --disable-nls"
-	use alsa || myconf="${myconf} --disable-alsa"
-	use gnome || myconf="${myconf} --disable-gnome"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install () {
-	einstall || die "make install failed"
-
-	# strip suid from binary
-	chmod -s ${D}/usr/bin/soundtracker
-
-	# documentation
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-	dodoc doc/*.txt
-	dohtml -r doc
-}