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.

Package-Manager: portage-2.1.6.6/cvs/Linux 2.6.28-gentoo i686

6 files changed, 132 insertions, 20 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/Manifest b/net-misc/streamtuner/Manifest
index a4f64b10b1d2..3579b7cf01b3 100644
--- a/net-misc/streamtuner/Manifest
+++ b/net-misc/streamtuner/Manifest
@@ -1,8 +1,11 @@
-AUX streamtuner-0.99.99-gentoo.patch 9120 RMD160 2251fb4acb5769dedc014cc26e5a3fefb0ed54aa SHA1 f85d7c774bacaf1a1d8f8007ef46c7e21f61b906 SHA256 d81cb3f4173858358068093c8dc63a5bba6467ca4c8dae2913145822d5b54b50
+AUX streamtuner-0.99.99-audacious.patch 3187 RMD160 32553ec6423cdd07cbfd39a83b95c7c7c13ca694 SHA1 df65334063323e01f01099cbfade88e1ab1a3bd8 SHA256 35b695629459203d3101d6ea70b62adbae5e169d6181501fd10195242b53b192
+AUX streamtuner-0.99.99-gentoo.patch 8666 RMD160 52888b8710f688bd32c379028a7199c083c59cef SHA1 5162e84a8f4bc77ea9e483002c65638d2e8c4f21 SHA256 78f68d2394d0c50a7b6601b13c05d42cb39c0e880a662f5c75aeae259c0ceeb2
+AUX streamtuner-0.99.99-shoutcast-2.patch 204 RMD160 0e9a9523141fa5a91da41c6e9868f03b896912b2 SHA1 d2284628efbd19d71a03c80ae6faba81589fd8b6 SHA256 1c617c4b5328440f3022e1170c6a0425084dc2f2629dbc2e0f6159e2d8ae23af
 AUX streamtuner-0.99.99-shoutcast.patch 1365 RMD160 1bd09fc44d06b31267c81b1f3c71ad248c80a147 SHA1 5c9dd55b112296b37595935afc0b60ae96ddb2e0 SHA256 afce3acb575e4faabba51b059664a9e530f52619278bbecca35318b56fe49040
 DIST streamtuner-0.99.99-pygtk-2.6.diff 437 RMD160 b983875d8b34efc546bd8f11d5746106fa2bd583 SHA1 ac67e9d041bf129c1bcbd5f3b4a6a3c12b596ea2 SHA256 8629df3b297f57b94afddf479c405b3922a74447318fbb8075cbdd0b91bac7ec
 DIST streamtuner-0.99.99.tar.gz 948075 RMD160 b2f7dbc47a148e4c195f85b8f5e77bb843bb7d4e SHA1 d912dbe1741ba9d14342ab6d9d818f06e97f6b59 SHA256 5c223a5e8dab9e504617bd221914e97bd2f0ae5f6ed8fe78b8ea8b427fee9123
 EBUILD streamtuner-0.99.99-r2.ebuild 1304 RMD160 91fa4811cbde53f688aa084b766fe77d332276bf SHA1 f2d37e524a391ec13436b9bca247e0e49d0e083b SHA256 8677f9c7d7e8cc3c62222fbe5351d30acaa42ba61f43c0c4b621b3984e687218
 EBUILD streamtuner-0.99.99-r3.ebuild 1349 RMD160 ef746ebae70144120259b9794d1c9a8e115d1953 SHA1 60c5fae164e378af61e7ff84efee83b98b843517 SHA256 776d416f9c96fea1626b84a0ce2a35c58f0d3687553c2f3c340b98d4027a8e0e
-MISC ChangeLog 4817 RMD160 4c1c5e8f783641d2c4d263c24053aa196630bda3 SHA1 25583863ea66af7851738a42e9b4791e84e6c761 SHA256 cf7845d2ae1f4d75a7d292be85844e9d772fd9449cf0da421def806c9f42abd6
+EBUILD streamtuner-0.99.99-r4.ebuild 1244 RMD160 fc7d53222be122ba415d0431458d699777d19ed0 SHA1 10a27b7c382b1dd82e58d6e51d4913cef48d81d9 SHA256 5caf7065cae13539e08ae4f769f2aa0a4b32d7e392212e6c2d4c28e455725fa4
+MISC ChangeLog 5310 RMD160 ea6f8ed21ff53af8fdecbc807d9cbddb2da257dc SHA1 706973e4734fb8f27c5c0cfe0b993a955fdeda55 SHA256 5bd04d3cf7b636af89e78f24fe2747f7d4ce8724c1f2e298cb90fd5067233d10
 MISC metadata.xml 287 RMD160 aec7dcf72869e99fe003cd04f167de44376a20e5 SHA1 aba94742667c6e045841f1978fdf9fd17be65391 SHA256 6f79c7542730173a2de8b8b6c9e95a9fe727d9a17928a8a15a170f93389554ba
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)
+}