Replace references of xmms with audacious by default. Remove unused part of the patch -gentoo.patch. Use http://classic.shoutcast.com wrt #245373 by djkrysak at stny dot rr dot com. Use EAPI2.

(Portage version: 2.1.6.6/cvs/Linux 2.6.28-gentoo i686)

5 files changed, 127 insertions, 18 deletions

diff --git a/net-misc/streamtuner/ChangeLog b/net-misc/streamtuner/ChangeLog
index f0266f40373f..85e2e03af59a 100644
--- a/net-misc/streamtuner/ChangeLog
+++ b/net-misc/streamtuner/ChangeLog
@@ -1,16 +1,27 @@
 # ChangeLog for net-misc/streamtuner
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.33 2008/05/13 06:10:24 drac Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.34 2009/01/18 18:18:42 ssuominen Exp $
+
+*streamtuner-0.99.99-r4 (18 Jan 2009)
+
+  18 Jan 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +files/streamtuner-0.99.99-audacious.patch,
+  files/streamtuner-0.99.99-gentoo.patch,
+  +files/streamtuner-0.99.99-shoutcast-2.patch,
+  +streamtuner-0.99.99-r4.ebuild:
+  Replace references of xmms with audacious by default. Remove unused part
+  of the patch -gentoo.patch. Use http://classic.shoutcast.com wrt #245373
+  by djkrysak at stny dot rr dot com. Use EAPI2.
 
 *streamtuner-0.99.99-r3 (13 May 2008)
 
-  13 May 2008; Samuli Suominen <drac@gentoo.org>
+  13 May 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/streamtuner-0.99.99-shoutcast.patch,
   +streamtuner-0.99.99-r3.ebuild:
   Fix view of shoutcast genres with a patch from Gentoo bug 220811 or Debian
   bug 471132. Thanks to Per-Erik Westerberg for reporting.
 
-  25 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  25 Jan 2008; Samuli Suominen <ssuominen@gentoo.org>
   streamtuner-0.99.99-r2.ebuild:
   amd64 stable wrt #206313
 
@@ -18,17 +29,17 @@
   streamtuner-0.99.99-r2.ebuild:
   x86 stable, bug #206313
 
-  30 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  30 Jul 2007; Samuli Suominen <ssuominen@gentoo.org>
   streamtuner-0.99.99-r2.ebuild:
   Add shout and xiph USE flags for bug 110358.
 
-  29 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  29 Jul 2007; Samuli Suominen <ssuominen@gentoo.org>
   streamtuner-0.99.99-r2.ebuild:
   Add blockers to old plugins wrt bug 97195.
 
 *streamtuner-0.99.99-r2 (29 Jul 2007)
 
-  29 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  29 Jul 2007; Samuli Suominen <ssuominen@gentoo.org>
   +files/streamtuner-0.99.99-gentoo.patch, +streamtuner-0.99.99-r2.ebuild:
   Merge patches and changes by Pacho Ramos from bug 184869, thanks.
 
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch
new file mode 100644
index 000000000000..bef90444dda8
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-audacious.patch
@@ -0,0 +1,60 @@
+diff -ur streamtuner-0.99.99.orig/src/plugins/live365/live365.c streamtuner-0.99.99/src/plugins/live365/live365.c
+--- streamtuner-0.99.99.orig/src/plugins/live365/live365.c	2004-12-19 12:27:03.000000000 +0200
++++ streamtuner-0.99.99/src/plugins/live365/live365.c	2009-01-18 20:03:35.000000000 +0200
+@@ -1411,7 +1411,7 @@
+ 
+   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
+   st_action_register("view-web", _("Open a web page"), "epiphany %q");
+-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
+ 
+   return TRUE;
+ }
+diff -ur streamtuner-0.99.99.orig/src/plugins/local/local.c streamtuner-0.99.99/src/plugins/local/local.c
+--- streamtuner-0.99.99.orig/src/plugins/local/local.c	2004-12-13 09:39:29.000000000 +0200
++++ streamtuner-0.99.99/src/plugins/local/local.c	2009-01-18 20:03:49.000000000 +0200
+@@ -1057,7 +1057,7 @@
+ 
+   init_handler();
+ 
+-  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
+   st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ 
+   return TRUE;
+diff -ur streamtuner-0.99.99.orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99.orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 17:21:00.000000000 +0200
++++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2009-01-18 20:03:42.000000000 +0200
+@@ -959,7 +959,7 @@
+ 
+   init_handler();
+   
+-  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
+   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
+   st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ 
+diff -ur streamtuner-0.99.99.orig/src/plugins/xiph/xiph.c streamtuner-0.99.99/src/plugins/xiph/xiph.c
+--- streamtuner-0.99.99.orig/src/plugins/xiph/xiph.c	2004-12-13 11:57:33.000000000 +0200
++++ streamtuner-0.99.99/src/plugins/xiph/xiph.c	2009-01-18 20:04:17.000000000 +0200
+@@ -957,7 +957,7 @@
+   init_handler();
+ 
+   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
+-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
+ 
+   return TRUE;
+ }
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preselections.c streamtuner-0.99.99/src/streamtuner/st-preselections.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-preselections.c	2004-12-13 11:57:52.000000000 +0200
++++ streamtuner-0.99.99/src/streamtuner/st-preselections.c	2009-01-18 20:04:02.000000000 +0200
+@@ -390,7 +390,7 @@
+ {
+   st_preselections_init_handler();
+   
+-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
+   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
+   st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ }
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch
index 97bf059c7564..2e5d843420da 100644
--- a/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch
@@ -1,14 +1,3 @@
-diff -ur streamtuner-0.99.99.orig/configure.ac streamtuner-0.99.99/configure.ac
---- streamtuner-0.99.99.orig/configure.ac	2004-12-21 17:20:45.000000000 +0200
-+++ streamtuner-0.99.99/configure.ac	2007-07-29 09:42:17.000000000 +0300
-@@ -21,6 +21,7 @@
- AM_INIT_AUTOMAKE(foreign)
- AM_MAINTAINER_MODE
- AM_CONFIG_HEADER(config.h)
-+AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
- 
- if $CONFIG_SHELL ./libtool --features | grep "enable shared" >/dev/null 2>&1; then :; else
 diff -ur streamtuner-0.99.99.orig/data/streamtuner.pc.in streamtuner-0.99.99/data/streamtuner.pc.in
 --- streamtuner-0.99.99.orig/data/streamtuner.pc.in	2004-12-11 04:03:20.000000000 +0200
 +++ streamtuner-0.99.99/data/streamtuner.pc.in	2007-07-29 09:40:44.000000000 +0300
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast-2.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast-2.patch
new file mode 100644
index 000000000000..e62df03d0434
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast-2.patch
@@ -0,0 +1,5 @@
+--- src/plugins/shoutcast/shoutcast.c
++++ src/plugins/shoutcast/shoutcast.c
+@@ -40,1 +40,1 @@
+-#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
++#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild
new file mode 100644
index 000000000000..1ddd9eac1696
--- /dev/null
+++ b/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild,v 1.1 2009/01/18 18:18:42 ssuominen Exp $
+
+EAPI=2
+GCONF_DEBUG=no
+
+inherit eutils gnome2
+
+DESCRIPTION="Stream directory browser for browsing internet radio streams"
+HOMEPAGE="http://www.nongnu.org/streamtuner"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
+	 http://savannah.nongnu.org/download/${PN}/${P}-pygtk-2.6.diff"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="python +shout +xiph"
+
+RDEPEND=">=x11-libs/gtk+-2.4
+	net-misc/curl
+	app-text/scrollkeeper
+	xiph? ( dev-libs/libxml2 )
+	>=media-libs/taglib-1.2
+	python? ( dev-python/pygtk )
+	x11-misc/xdg-utils"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-shoutcast.patch \
+		"${FILESDIR}"/${P}-shoutcast-2.patch \
+		"${FILESDIR}"/${P}-audacious.patch \
+		"${DISTDIR}"/${P}-pygtk-2.6.diff
+}
+
+src_configure() {
+	# live365 causes parse errors at connect time.
+	econf --disable-live365 $(use_enable python) \
+		$(use_enable shout shoutcast) $(use_enable xiph)
+}