--- /usr/portage/media-sound/soundtracker/soundtracker-0.6.7-r1.ebuild	2006-04-28 14:36:29.000000000 +0200
+++ soundtracker-0.6.8.ebuild	2006-11-11 19:32:00.000000000 +0100
@@ -2,19 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.7-r1.ebuild,v 1.3 2006/04/28 12:08:14 flameeyes Exp $
 
-IUSE="nls esd gnome oss alsa jack"
-
 inherit eutils flag-o-matic
 
 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"
+SRC_URI="http://www.soundtracker.org/dl/v0.6/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa asm esd gnome oss jack nls"
 
 RDEPEND="sys-libs/zlib
 	=x11-libs/gtk+-1.2*
-	>=media-libs/audiofile-0.2.1
 	media-libs/libsndfile
 	alsa? ( media-libs/alsa-lib )
 	esd? ( media-sound/esound )
@@ -29,32 +31,31 @@
 	app-arch/gzip
 	app-arch/unzip"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-alsa1.patch"
-	epatch "${FILESDIR}/${P}-invalid-free.patch"
-	epatch "${FILESDIR}/${P}-execstack.patch"
+	epatch "${FILESDIR}/${PN}-0.6.7-execstack.patch"
 }
 
 src_compile() {
 	replace-flags "-O3" "-O2"
 
-	local myconf
+	# disabling gdk-pixbuf, the package actually links against libgdk-1.2.so
+	econf \
+		--disable-gdk-pixbuf \
+		--disable-gdk_pixbuftest \
+		--disable-audiofiletest \
+		$(use_enable sdl sdl) \
+		$(use_enable oss oss) \
+		$(use_enable esd esd) \
+		$(use_enable nls nls) \
+		$(use_enable alsa alsa) \
+		$(use_enable jack jack) \
+		$(use_enable gnome gnome) \
+		$(use_enable asm asm) \
+		${myconf} || die "configure failed"
 
-	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"
-	use x86 || myconf="${myconf} --disable-asm"
-
-	econf ${myconf} || die "configure failed"
 	emake || die "make failed"
 }
 
@@ -69,4 +70,11 @@
 	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
 	dodoc doc/*.txt
 	dohtml -r doc
+
+	# desktop entry 
+	insinto /usr/share/pixmaps
+	newins ${FILESDIR}/${PN}.png ${PN}.png
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${PN}.desktop
 }