Version bump closes bug #42251. Header fix. metadata.xml added.

8 files changed, 119 insertions, 9 deletions

diff --git a/media-sound/soundtracker/ChangeLog b/media-sound/soundtracker/ChangeLog
index 39f084feec0a..99fe7077a2aa 100644
--- a/media-sound/soundtracker/ChangeLog
+++ b/media-sound/soundtracker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/soundtracker
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/ChangeLog,v 1.5 2003/07/23 04:36:40 raker Exp $
+# 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 $
+
+*soundtracker-0.6.7 (20 Feb 2004)
+
+  20 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  soundtracker-0.6.6.ebuild, soundtracker-0.6.7.ebuild,
+  soundtracker-0.6.7_pre5.ebuild:
+  Version bump closes bug #42251.  Header fix.  metadata.xml added.
 
 *soundtracker-0.6.7_pre5 (23 Jul 2003)
 
diff --git a/media-sound/soundtracker/Manifest b/media-sound/soundtracker/Manifest
index 35107f59982e..a1df72c8dc53 100644
--- a/media-sound/soundtracker/Manifest
+++ b/media-sound/soundtracker/Manifest
@@ -1,5 +1,9 @@
-MD5 8aa1f59f5f25265af38ad4c4b3a28c17 soundtracker-0.6.7_pre5.ebuild 1387
-MD5 9e8000253c36e6092b7b008be7648125 soundtracker-0.6.6.ebuild 1267
-MD5 b74d336119665765efd24efd37edb60f ChangeLog 1269
+MD5 816f052c108f07825567c17b8e7953c9 soundtracker-0.6.7.ebuild 1561
+MD5 e6992b77e4cf2ba5d20fba591d79ab45 soundtracker-0.6.7_pre5.ebuild 1390
+MD5 e5491519433b21e7fb7f7c5fb07fde9b soundtracker-0.6.6.ebuild 1270
+MD5 1251dde738233e6e47562eb3a1dedacc ChangeLog 1539
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 369a16c17d2850a6ed6d6fee6c9f72fc files/soundtracker-0.6.7-alsa1.patch 951
 MD5 101f1904a2972826f42c6ba029667728 files/digest-soundtracker-0.6.6 70
+MD5 5cbb33544d36f65f595aa8b229e9b515 files/digest-soundtracker-0.6.7 70
 MD5 638dce09725b0578f585bd4c35ed5581 files/digest-soundtracker-0.6.7_pre5 75
diff --git a/media-sound/soundtracker/files/digest-soundtracker-0.6.7 b/media-sound/soundtracker/files/digest-soundtracker-0.6.7
new file mode 100644
index 000000000000..f315c0a2912d
--- /dev/null
+++ b/media-sound/soundtracker/files/digest-soundtracker-0.6.7
@@ -0,0 +1 @@
+MD5 9a5685e0a79fb10066d29baed652d324 soundtracker-0.6.7.tar.gz 875235
diff --git a/media-sound/soundtracker/files/soundtracker-0.6.7-alsa1.patch b/media-sound/soundtracker/files/soundtracker-0.6.7-alsa1.patch
new file mode 100644
index 000000000000..fa7fc95cb3c5
--- /dev/null
+++ b/media-sound/soundtracker/files/soundtracker-0.6.7-alsa1.patch
@@ -0,0 +1,31 @@
+diff -Naur soundtracker-0.6.7.orig/app/midi-utils.h soundtracker-0.6.7/app/midi-utils.h
+--- soundtracker-0.6.7.orig/app/midi-utils.h	2003-05-17 03:09:49.000000000 -0700
++++ soundtracker-0.6.7/app/midi-utils.h	2004-02-20 16:43:39.000000000 -0800
+@@ -27,7 +27,13 @@
+ #if defined(DRIVER_ALSA_050)
+ #include <sys/asoundlib.h>
+ #else
++
++#include <alsa/version.h>
++#if SND_LIB_MAJOR==1 
++# define ALSA_PCM_OLD_HW_PARAMS_API
++#endif
+ #include <alsa/asoundlib.h>
++
+ #endif
+ 
+ void midi_print_event(snd_seq_event_t *ev);
+diff -Naur soundtracker-0.6.7.orig/app/midi.h soundtracker-0.6.7/app/midi.h
+--- soundtracker-0.6.7.orig/app/midi.h	2003-05-17 03:09:30.000000000 -0700
++++ soundtracker-0.6.7/app/midi.h	2004-02-20 16:44:51.000000000 -0800
+@@ -27,6 +27,10 @@
+ #if defined(DRIVER_ALSA_050)
+ #include <sys/asoundlib.h>
+ #else
++#include <alsa/version.h>
++#if SND_LIB_MAJOR==1 
++# define ALSA_PCM_OLD_HW_PARAMS_API
++#endif
+ #include <alsa/asoundlib.h>
+ #endif
+ 
diff --git a/media-sound/soundtracker/metadata.xml b/media-sound/soundtracker/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/soundtracker/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/soundtracker/soundtracker-0.6.6.ebuild b/media-sound/soundtracker/soundtracker-0.6.6.ebuild
index bdcd3f30e9ed..173d8afd5f4a 100644
--- a/media-sound/soundtracker/soundtracker-0.6.6.ebuild
+++ b/media-sound/soundtracker/soundtracker-0.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.6.ebuild,v 1.10 2003/11/14 21:25:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.6.ebuild,v 1.11 2004/02/21 01:02:40 eradicator Exp $
 
 IUSE="nls esd gnome oss alsa"
 
diff --git a/media-sound/soundtracker/soundtracker-0.6.7.ebuild b/media-sound/soundtracker/soundtracker-0.6.7.ebuild
new file mode 100644
index 000000000000..f81f892ac54f
--- /dev/null
+++ b/media-sound/soundtracker/soundtracker-0.6.7.ebuild
@@ -0,0 +1,62 @@
+# 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 $
+
+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
+	dev-util/pkgconfig
+	media-libs/libsndfile
+	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_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-alsa1.patch
+}
+
+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"
+	#borks make DESTDIR=${D} install || 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
+}
diff --git a/media-sound/soundtracker/soundtracker-0.6.7_pre5.ebuild b/media-sound/soundtracker/soundtracker-0.6.7_pre5.ebuild
index bf5002ac4704..61f128a3f059 100644
--- a/media-sound/soundtracker/soundtracker-0.6.7_pre5.ebuild
+++ b/media-sound/soundtracker/soundtracker-0.6.7_pre5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4 2003/11/14 21:25:58 seemant Exp $
+# $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"