pass --disable-alsa since there is no support for recent alsa wrt #196636.

Package-Manager: portage-2.1.5_rc10

3 files changed, 25 insertions, 34 deletions

diff --git a/media-sound/soundtracker/ChangeLog b/media-sound/soundtracker/ChangeLog
index 8e1608a8328e..64fa07be803a 100644
--- a/media-sound/soundtracker/ChangeLog
+++ b/media-sound/soundtracker/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/soundtracker
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/ChangeLog,v 1.27 2008/02/29 20:07:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/ChangeLog,v 1.28 2008/05/15 21:02:22 drac Exp $
+
+  15 May 2008; Samuli Suominen <drac@gentoo.org> soundtracker-0.6.8.ebuild:
+  pass --disable-alsa since there is no support for recent alsa wrt #196636.
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> soundtracker-0.6.8.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/media-sound/soundtracker/Manifest b/media-sound/soundtracker/Manifest
index 54a9d89b912a..655ce614aeda 100644
--- a/media-sound/soundtracker/Manifest
+++ b/media-sound/soundtracker/Manifest
@@ -1,5 +1,5 @@
 AUX soundtracker-0.6.7-execstack.patch 852 RMD160 df57e68a2dac9d442484b26e1cbf85cb59f1e756 SHA1 be2878faac868ca1c2b7122c106c3e42cf7d451c SHA256 f6f293a8e025d4e9b46a06e0597674196d55b5253d2efe84ecc61ffa97a9d975
 DIST soundtracker-0.6.8.tar.gz 1016718 RMD160 b86bf86013e5d2959e1a8dbb19a9255c116b68d0 SHA1 255c87cdbe2ccb715d9f97a0677e4594b7909595 SHA256 03b2f2c0edba48457ec6178b0a10edfe3481254112936715603a21f638822f50
-EBUILD soundtracker-0.6.8.ebuild 1860 RMD160 ebdad4172330c6dd17c38093e801be876d6d3744 SHA1 40439bf68e5fbbf4841fbf9bff83fc87037c068b SHA256 b52f5f59661335894650ba082d3d9a954ce7f69b932c22b7277f1f6732c9710c
-MISC ChangeLog 4301 RMD160 c040e79f1cd1f833a8b6f149204c75f9d990a637 SHA1 3199f0675b6f42bd58b57b2e26e2836d8f0babc4 SHA256 1be446d6002f39bd77ecf2c646a6787d43870b8f819e176ada693fe7e4dfb431
+EBUILD soundtracker-0.6.8.ebuild 1617 RMD160 0b9474b09aeba30df00ac219de364dc098801663 SHA1 b953a115626e6c4f24050e9fccdf5e49750a544f SHA256 163a0c3c47e89f9082ea919f0bc57cfa1dba769f3be47ca24b2adae7febc000d
+MISC ChangeLog 4454 RMD160 db3814105a4a42272cac36f4d903ed174250995b SHA1 ab1c8c7682aae77820c239fdd7c205c02bd31699 SHA256 8bd2693d81347f486febfe699f1edb437fb9a5714bc7b383e4d5ff5cd70bf14c
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/soundtracker/soundtracker-0.6.8.ebuild b/media-sound/soundtracker/soundtracker-0.6.8.ebuild
index 08f1c6f303bf..a229129e9457 100644
--- a/media-sound/soundtracker/soundtracker-0.6.8.ebuild
+++ b/media-sound/soundtracker/soundtracker-0.6.8.ebuild
@@ -1,43 +1,35 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.8.ebuild,v 1.6 2008/02/29 20:07:24 carlo Exp $
-
-IUSE="alsa esd jack nls oss sdl"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.8.ebuild,v 1.7 2008/05/15 21:02:22 drac Exp $
 
 inherit eutils
 
-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"
 
-RDEPEND="sys-libs/zlib
-	=x11-libs/gtk+-1.2*
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
+IUSE="esd jack nls oss sdl"
+
+RDEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/audiofile-0.2.1
 	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
 	esd? ( media-sound/esound )
 	jack? ( media-sound/jack-audio-connection-kit )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
+	sdl? ( >=media-libs/libsdl-1.2 )
 	nls? ( virtual/libintl )"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig
-	app-arch/bzip2
-	app-arch/gzip
-	app-arch/unzip"
+	dev-util/pkgconfig"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
+S=${WORKDIR}/${P/_/-}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.6.7-execstack.patch"
+	epatch "${FILESDIR}"/${PN}-0.6.7-execstack.patch
 }
 
 src_compile() {
@@ -46,28 +38,24 @@ src_compile() {
 	use oss || myconf="--disable-oss"
 	use esd || myconf="${myconf} --disable-esd"
 	use nls || myconf="${myconf} --disable-nls"
-	use alsa || myconf="${myconf} --disable-alsa"
 	myconf="${myconf} --disable-gnome"
 	use x86 && myconf="${myconf} --enable-asm"
 	use jack || myconf="${myconf} --disable-jack"
 	use sdl || myconf="${myconf} --disable-sdl"
 
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
+	# no support for recent alsa wrt 196636
+	econf --disable-alsa ${myconf} || die "econf failed."
+	emake || die "emake failed."
 }
 
 src_install () {
-	einstall || die "make install failed"
-	#borks make DESTDIR=${D} install || die "make install failed"
+	einstall || die "einstall failed."
 
-	# strip suid from binary
-	chmod -s ${D}/usr/bin/soundtracker
+	fperms -s /usr/bin/${PN}
 
-	# documentation
-	dodoc AUTHORS ChangeLog* FAQ NEWS README TODO
-	dodoc doc/*.txt
+	dodoc AUTHORS ChangeLog* FAQ NEWS README TODO doc/*.txt
 	dohtml -r doc
 
-	doicon soundtracker_splash.png
-	make_desktop_entry soundtracker SoundTracker soundtracker_splash
+	doicon ${PN}_splash.png
+	make_desktop_entry ${PN} SoundTracker ${PN}_splash
 }