Merge patches and changes by Pacho Ramos from bug 184869, thanks.

Package-Manager: portage-2.1.3

12 files changed, 256 insertions, 169 deletions

diff --git a/net-misc/streamtuner/ChangeLog b/net-misc/streamtuner/ChangeLog
index 828b8bb885c4..e5f35aa9fa67 100644
--- a/net-misc/streamtuner/ChangeLog
+++ b/net-misc/streamtuner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/streamtuner
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.27 2007/07/12 15:51:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.28 2007/07/29 07:02:31 drac Exp $
+
+*streamtuner-0.99.99-r2 (29 Jul 2007)
+
+  29 Jul 2007; Samuli Suominen <drac@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.
 
   12 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   streamtuner-0.12.4.ebuild:
diff --git a/net-misc/streamtuner/Manifest b/net-misc/streamtuner/Manifest
index edf0f5a782af..8f4537c44f5f 100644
--- a/net-misc/streamtuner/Manifest
+++ b/net-misc/streamtuner/Manifest
@@ -1,38 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX streamtuner-0.12.3-gcc34.patch 413 RMD160 ceca613491efe11e853065bb391e904900e6d7bc SHA1 64081f8a49b424f2a4d60a3f06d1431efe5eab8a SHA256 30a94686e2ee91d2bbf2c35846606c56615fd4b72aee2bfd89a28929b18458ef
-MD5 58f85470334ffd6799ca3330c1f87f5c files/streamtuner-0.12.3-gcc34.patch 413
-RMD160 ceca613491efe11e853065bb391e904900e6d7bc files/streamtuner-0.12.3-gcc34.patch 413
-SHA256 30a94686e2ee91d2bbf2c35846606c56615fd4b72aee2bfd89a28929b18458ef files/streamtuner-0.12.3-gcc34.patch 413
-AUX streamtuner-0.99.99-sedfix.patch 796 RMD160 5c10850f5dc981fa1d6ff6072aba1a098c7b472b SHA1 dab75fa59b42291d31bb4e93f4ae7b2fe1c9898c SHA256 5d285bdf7656b0f6a7e5e7891058218d0e9fcd0004168922599b648ef8f33f1a
-MD5 849257e447f1dea0c2e215fd81890064 files/streamtuner-0.99.99-sedfix.patch 796
-RMD160 5c10850f5dc981fa1d6ff6072aba1a098c7b472b files/streamtuner-0.99.99-sedfix.patch 796
-SHA256 5d285bdf7656b0f6a7e5e7891058218d0e9fcd0004168922599b648ef8f33f1a files/streamtuner-0.99.99-sedfix.patch 796
+AUX streamtuner-0.99.99-gentoo.patch 9120 RMD160 2251fb4acb5769dedc014cc26e5a3fefb0ed54aa SHA1 f85d7c774bacaf1a1d8f8007ef46c7e21f61b906 SHA256 d81cb3f4173858358068093c8dc63a5bba6467ca4c8dae2913145822d5b54b50
+MD5 fb80e990eac23c2cbc1b645bdbf24608 files/streamtuner-0.99.99-gentoo.patch 9120
+RMD160 2251fb4acb5769dedc014cc26e5a3fefb0ed54aa files/streamtuner-0.99.99-gentoo.patch 9120
+SHA256 d81cb3f4173858358068093c8dc63a5bba6467ca4c8dae2913145822d5b54b50 files/streamtuner-0.99.99-gentoo.patch 9120
 DIST streamtuner-0.12.4.tar.gz 677752 RMD160 af1b397143733e0c7436102a3e5f2964b96e1440 SHA1 83a1a702bb775b2fb03b73fdb3d69e693666efcd SHA256 e2eb3187d80cebffde1a98ec7190e3c98588172f502771b1642eff651b9b3e98
 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
-DIST streamtuner-0.99.tar.gz 782084 RMD160 f47696b174515a55f55c381f62db16138817c665 SHA1 6d6d0315a360783be9729b0f035bd38df27230d8 SHA256 dc2b7754bbeb55386574182126444d9dae55e04ab9238635ac3d02a65ae246e5
 EBUILD streamtuner-0.12.4.ebuild 796 RMD160 58626b3693a1398a7807d46ac2c9a974d12d94bd SHA1 e81e6581a522fda5853e40719d92bd25afe0ec6b SHA256 fd6c91f90335e693e8370a49a4b4744a42d06372a0f2643f8ef13f71ca84987a
 MD5 2cdea0b39148891627157f943090356c streamtuner-0.12.4.ebuild 796
 RMD160 58626b3693a1398a7807d46ac2c9a974d12d94bd streamtuner-0.12.4.ebuild 796
 SHA256 fd6c91f90335e693e8370a49a4b4744a42d06372a0f2643f8ef13f71ca84987a streamtuner-0.12.4.ebuild 796
-EBUILD streamtuner-0.99.99-r1.ebuild 907 RMD160 c9ba5678e6f660353e85ab602f4c1104212c3cd5 SHA1 296fbf6587126b2972d9c41dfb0f245edda55923 SHA256 587a22ad96eff07db40bb9048fcf7d8fdcc84834ef398ebc18b4894572c54df6
-MD5 5f7424e3ed090040632b801e1d765406 streamtuner-0.99.99-r1.ebuild 907
-RMD160 c9ba5678e6f660353e85ab602f4c1104212c3cd5 streamtuner-0.99.99-r1.ebuild 907
-SHA256 587a22ad96eff07db40bb9048fcf7d8fdcc84834ef398ebc18b4894572c54df6 streamtuner-0.99.99-r1.ebuild 907
-EBUILD streamtuner-0.99.99.ebuild 812 RMD160 6ca50675a25bca817272bb5ee85b8747acd91d6b SHA1 a8fb9f984126ab6f388259cead6b1a130c4a182f SHA256 8ea46e2b3dc3437d0ef1242d68518879019d9443ea3163595a8d0f9e01485ef4
-MD5 2c0ef29406915d5aec217b9b1b92ab1c streamtuner-0.99.99.ebuild 812
-RMD160 6ca50675a25bca817272bb5ee85b8747acd91d6b streamtuner-0.99.99.ebuild 812
-SHA256 8ea46e2b3dc3437d0ef1242d68518879019d9443ea3163595a8d0f9e01485ef4 streamtuner-0.99.99.ebuild 812
-EBUILD streamtuner-0.99.ebuild 730 RMD160 5253d96671e5012ff582041f04038c77cd41f72b SHA1 e8ed442bbce0b44e84b7a67ee1b54fd9566d1ef7 SHA256 4456c8675894f57d95c8e7c25ff3d0d6300605575e821ab07b6fa38c06d92ef0
-MD5 61cb86bfd6bcac69d4f828bba4033a27 streamtuner-0.99.ebuild 730
-RMD160 5253d96671e5012ff582041f04038c77cd41f72b streamtuner-0.99.ebuild 730
-SHA256 4456c8675894f57d95c8e7c25ff3d0d6300605575e821ab07b6fa38c06d92ef0 streamtuner-0.99.ebuild 730
-MISC ChangeLog 3808 RMD160 b50ee4d85fa1d173a41e246393e39e345b975676 SHA1 cd2a18f3c343ff12420f7263d9d723c8210356a9 SHA256 a8c5ed2e0ae1dd7a20db4637cb8e3717f7a3805131aa43c46945100e649a4a39
-MD5 fb8c519dba396382e8ab5ca8eefc54fe ChangeLog 3808
-RMD160 b50ee4d85fa1d173a41e246393e39e345b975676 ChangeLog 3808
-SHA256 a8c5ed2e0ae1dd7a20db4637cb8e3717f7a3805131aa43c46945100e649a4a39 ChangeLog 3808
+EBUILD streamtuner-0.99.99-r2.ebuild 1094 RMD160 7a313a0f3b60e67132b046e30f56c6c0132448e7 SHA1 bad2def866cfc927a7a25d74f6740d02734a6c0f SHA256 628b7093e3398d82dd673ad50d8b683f8b05e81c0db9046663743a36401bf286
+MD5 5d1f9b114b448c525d41441f8b28c3d9 streamtuner-0.99.99-r2.ebuild 1094
+RMD160 7a313a0f3b60e67132b046e30f56c6c0132448e7 streamtuner-0.99.99-r2.ebuild 1094
+SHA256 628b7093e3398d82dd673ad50d8b683f8b05e81c0db9046663743a36401bf286 streamtuner-0.99.99-r2.ebuild 1094
+MISC ChangeLog 4036 RMD160 4c635214988f13ef634493aecaa184646b006968 SHA1 84e5e74ff8ad5102a5499cba5138d44cad2292ce SHA256 461dbc3ff8699c44a9e36d1c1dc733b80fa5a892a518bb7c5d202f2350960ce2
+MD5 cb881b5e3cbbff4c569e81f3bc3f4f71 ChangeLog 4036
+RMD160 4c635214988f13ef634493aecaa184646b006968 ChangeLog 4036
+SHA256 461dbc3ff8699c44a9e36d1c1dc733b80fa5a892a518bb7c5d202f2350960ce2 ChangeLog 4036
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -40,19 +24,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 2fe617a687760c6f2edae0daaf3acc53 files/digest-streamtuner-0.12.4 256
 RMD160 bf83f605edb9eefaedf3a710858ff9f0f89c07c4 files/digest-streamtuner-0.12.4 256
 SHA256 5ea5027b4c88b0199288fcc76d5cfc746cf33d4e7bf251fe60acf0a1c2b84122 files/digest-streamtuner-0.12.4 256
-MD5 13ea5edc739ba9479458a1fd79e5256e files/digest-streamtuner-0.99 250
-RMD160 86e55781bfb6ff002b10c828e0379e7735784377 files/digest-streamtuner-0.99 250
-SHA256 7744a6d8e17ff8336b3e43cf3a796298c27821114e16d49ce2a8700909b1834e files/digest-streamtuner-0.99 250
-MD5 055ae65ea9f76a2dd6c0b0668b73634e files/digest-streamtuner-0.99.99 259
-RMD160 95f0c408e01dc3bc7a93b469340ff55ffe73d8ca files/digest-streamtuner-0.99.99 259
-SHA256 51011722425ed353a1b3972992d505df7810816bbb79724861f3fbfb72fddc63 files/digest-streamtuner-0.99.99 259
-MD5 979d71601ed84ecab358962c2ebd15af files/digest-streamtuner-0.99.99-r1 533
-RMD160 42d0002058e7f256461857685b05214a81b37b50 files/digest-streamtuner-0.99.99-r1 533
-SHA256 fcc7f49a31b12b229d3df773aa29bd4969b6c9d3c606de286080e1da7e36ac68 files/digest-streamtuner-0.99.99-r1 533
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGlk3nKRy60XGEcJIRAowvAJ9L8NGAtBWXHPmmOF8w0GXamQgk3ACfb8Pu
-/MN9V6CmIdbShIbs1Jr/w10=
-=6GjL
------END PGP SIGNATURE-----
+MD5 979d71601ed84ecab358962c2ebd15af files/digest-streamtuner-0.99.99-r2 533
+RMD160 42d0002058e7f256461857685b05214a81b37b50 files/digest-streamtuner-0.99.99-r2 533
+SHA256 fcc7f49a31b12b229d3df773aa29bd4969b6c9d3c606de286080e1da7e36ac68 files/digest-streamtuner-0.99.99-r2 533
diff --git a/net-misc/streamtuner/files/digest-streamtuner-0.99 b/net-misc/streamtuner/files/digest-streamtuner-0.99
deleted file mode 100644
index 304407679d10..000000000000
--- a/net-misc/streamtuner/files/digest-streamtuner-0.99
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0cd9ad6de35860af5e0a78a0b017973d streamtuner-0.99.tar.gz 782084
-RMD160 f47696b174515a55f55c381f62db16138817c665 streamtuner-0.99.tar.gz 782084
-SHA256 dc2b7754bbeb55386574182126444d9dae55e04ab9238635ac3d02a65ae246e5 streamtuner-0.99.tar.gz 782084
diff --git a/net-misc/streamtuner/files/digest-streamtuner-0.99.99 b/net-misc/streamtuner/files/digest-streamtuner-0.99.99
deleted file mode 100644
index 5beec6cf1d9d..000000000000
--- a/net-misc/streamtuner/files/digest-streamtuner-0.99.99
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2027b7c34e85b594524b0b4351c14362 streamtuner-0.99.99.tar.gz 948075
-RMD160 b2f7dbc47a148e4c195f85b8f5e77bb843bb7d4e streamtuner-0.99.99.tar.gz 948075
-SHA256 5c223a5e8dab9e504617bd221914e97bd2f0ae5f6ed8fe78b8ea8b427fee9123 streamtuner-0.99.99.tar.gz 948075
diff --git a/net-misc/streamtuner/files/digest-streamtuner-0.99.99-r1 b/net-misc/streamtuner/files/digest-streamtuner-0.99.99-r2
index 3978faeff6dd..3978faeff6dd 100644
--- a/net-misc/streamtuner/files/digest-streamtuner-0.99.99-r1
+++ b/net-misc/streamtuner/files/digest-streamtuner-0.99.99-r2
diff --git a/net-misc/streamtuner/files/streamtuner-0.12.3-gcc34.patch b/net-misc/streamtuner/files/streamtuner-0.12.3-gcc34.patch
deleted file mode 100644
index a8313077104a..000000000000
--- a/net-misc/streamtuner/files/streamtuner-0.12.3-gcc34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- streamtuner-0.12.3/work/streamtuner-0.12.3/src/sglib/sg-parser.c	2004-05-11 15:40:41.000000000 +0000
-+++ streamtuner-0.12.3.fixed/work/streamtuner-0.12.3/src/sglib/sg-parser.c	2004-07-04 10:45:30.968529288 +0000
-@@ -288,6 +288,9 @@
- 	  break;
- 	  
- 	default:			/* only to suppress compiler warnings */
-+
-+	  break; 			/* only to please gcc3.4 strictness ;-) */
-+
- 	}
-       
-       if (statement->terminator)
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch
new file mode 100644
index 000000000000..97bf059c7564
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-gentoo.patch
@@ -0,0 +1,192 @@
+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
+@@ -1,9 +1,8 @@
+ prefix=@prefix@
+ includedir=@includedir@/streamtuner
+-oldincludedir=@includedir@
+ 
+ Name: @PACKAGE@
+ Description: A stream directory browser
+ Version: @VERSION@
+ Requires: gmodule-2.0 gtk+-2.0
+-Cflags: -I${includedir} -I${oldincludedir}
++Cflags: -I${includedir}
+diff -ur streamtuner-0.99.99.orig/docs/reference/Makefile.in streamtuner-0.99.99/docs/reference/Makefile.in
+--- streamtuner-0.99.99.orig/docs/reference/Makefile.in	2004-12-21 17:31:18.000000000 +0200
++++ streamtuner-0.99.99/docs/reference/Makefile.in	2007-07-29 09:41:15.000000000 +0300
+@@ -517,7 +517,7 @@
+ @ENABLE_GTK_DOC_TRUE@	rm -rf $(srcdir)/html 
+ @ENABLE_GTK_DOC_TRUE@	mkdir $(srcdir)/html
+ @ENABLE_GTK_DOC_TRUE@	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+-@ENABLE_GTK_DOC_TRUE@	sed -i "" -e \
++@ENABLE_GTK_DOC_TRUE@	sed -i -e \
+ @ENABLE_GTK_DOC_TRUE@		's/background: #ffeeee/background: #daffd1/g; \
+ @ENABLE_GTK_DOC_TRUE@		 s/border: solid 1px #ffaaaa/border: solid 1px #74ff54/g; \
+ @ENABLE_GTK_DOC_TRUE@		 s/background: #eeeeff/background: #feffde/g; \
+diff -ur streamtuner-0.99.99.orig/help/omf.make streamtuner-0.99.99/help/omf.make
+--- streamtuner-0.99.99.orig/help/omf.make	2004-03-23 18:17:10.000000000 +0200
++++ streamtuner-0.99.99/help/omf.make	2007-07-29 09:42:50.000000000 +0300
+@@ -42,7 +42,9 @@
+ 	for file in $(omffile); do \
+ 		$(INSTALL_DATA) $(srcdir)/$$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	done
+-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
++	if test -z "$(DESTDIR)"; then \
++		scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir); \
++	fi
+ 
+ uninstall-local-omf:
+ 	-for file in $(srcdir)/*.omf; do \
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-category-store.c streamtuner-0.99.99/src/streamtuner/st-category-store.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-category-store.c	2004-12-18 11:17:32.000000000 +0200
++++ streamtuner-0.99.99/src/streamtuner/st-category-store.c	2007-07-29 09:41:46.000000000 +0300
+@@ -356,7 +356,6 @@
+ {
+   STCategoryBag **bag = data;
+   STCategoryBag *this_bag;
+-  gboolean status;
+ 
+   gtk_tree_model_get(model, iter, ST_CATEGORY_STORE_COLUMN_BAG, &this_bag, -1);
+   if (! ST_CATEGORY_BAG_IS_STOCK(this_bag)
+@@ -376,8 +375,6 @@
+       g_object_unref(this_bag);
+       return FALSE;		/* continue */
+     }
+-
+-  return status;
+ }
+ 
+ static gboolean
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-network-preferences-page.c streamtuner-0.99.99/src/streamtuner/st-network-preferences-page.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-network-preferences-page.c	2004-12-16 15:05:07.000000000 +0200
++++ streamtuner-0.99.99/src/streamtuner/st-network-preferences-page.c	2007-07-29 09:43:21.000000000 +0300
+@@ -183,10 +183,10 @@
+   st_preferences_bind_boolean(GTK_TOGGLE_BUTTON(page->priv->proxy_check),
+ 			      &st_settings.proxy_enabled);
+   st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->http_radio),
+-				(int *) &st_settings.proxy_type,
++				&st_settings.proxy_type,
+ 				ST_TRANSFER_PROXY_HTTP);
+   st_preferences_bind_int_radio(GTK_RADIO_BUTTON(page->priv->socks5_radio),
+-				(int *) &st_settings.proxy_type,
++				&st_settings.proxy_type,
+ 				ST_TRANSFER_PROXY_SOCKS5);
+   st_preferences_bind_string(GTK_ENTRY(page->priv->server_entry),
+ 			     &st_settings.proxy_server);
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preferences.c streamtuner-0.99.99/src/streamtuner/st-preferences.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-preferences.c	2004-10-17 20:43:18.000000000 +0300
++++ streamtuner-0.99.99/src/streamtuner/st-preferences.c	2007-07-29 09:43:21.000000000 +0300
+@@ -140,13 +140,13 @@
+ }
+ 
+ void
+-st_preferences_bind_int_radio (GtkRadioButton *radio, int *ptr, int value)
++st_preferences_bind_int_radio (GtkRadioButton *radio, void *ptr, int value)
+ {
+   g_return_if_fail(GTK_IS_RADIO_BUTTON(radio));
+   g_return_if_fail(ptr != NULL);
+ 
+   g_object_set_data(G_OBJECT(radio), "value", GINT_TO_POINTER(value));
+-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), value == *ptr);
++  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), value == *(int *)ptr);
+   g_signal_connect(radio, "toggled", G_CALLBACK(st_preferences_radio_toggled_h), ptr);
+ }
+ 
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-preferences.h streamtuner-0.99.99/src/streamtuner/st-preferences.h
+--- streamtuner-0.99.99.orig/src/streamtuner/st-preferences.h	2004-10-17 20:42:06.000000000 +0300
++++ streamtuner-0.99.99/src/streamtuner/st-preferences.h	2007-07-29 09:43:21.000000000 +0300
+@@ -42,7 +42,7 @@
+ void st_preferences_bind_int_spin	(GtkSpinButton		*spin,
+ 					 int			*ptr);
+ void st_preferences_bind_int_radio	(GtkRadioButton		*radio,
+-					 int			*ptr,
++					 void			*ptr,
+ 					 int			value);
+ 
+ #endif /* _ST_PREFERENCES_H */
+diff -ur streamtuner-0.99.99.orig/src/streamtuner/st-shell.c streamtuner-0.99.99/src/streamtuner/st-shell.c
+--- streamtuner-0.99.99.orig/src/streamtuner/st-shell.c	2004-12-20 18:09:03.000000000 +0200
++++ streamtuner-0.99.99/src/streamtuner/st-shell.c	2007-07-29 09:43:21.000000000 +0300
+@@ -465,8 +465,10 @@
+ static void
+ st_shell_make_window (STShell *shell)
+ {
++  union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->window };
++
+   shell->priv->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+-  g_object_add_weak_pointer(G_OBJECT(shell->priv->window), (gpointer *) &shell->priv->window);
++  g_object_add_weak_pointer(G_OBJECT(shell->priv->window), pun.gpp);
+ 
+   shell->priv->accel_group = gtk_accel_group_new();
+   gtk_window_add_accel_group(GTK_WINDOW(shell->priv->window), shell->priv->accel_group);
+@@ -1786,8 +1788,10 @@
+     gtk_window_present(GTK_WINDOW(shell->priv->find));
+   else
+     {
++      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->find };
++
+       shell->priv->find = sgtk_find_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->find), (gpointer *) &shell->priv->find);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->find), pun.gpp);
+ 
+       sgtk_find_dialog_set_token(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_token ? st_settings.find_token : "");
+       sgtk_find_dialog_set_history(SGTK_FIND_DIALOG(shell->priv->find), st_settings.find_history);
+@@ -2101,8 +2105,9 @@
+     gtk_window_present(GTK_WINDOW(shell->priv->stream_properties));
+   else
+     {
++      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->stream_properties };
+       shell->priv->stream_properties = st_stream_properties_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_properties), (gpointer *) &shell->priv->stream_properties);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_properties), pun.gpp);
+ 
+       g_signal_connect(shell->priv->stream_properties,
+ 		       "response",
+@@ -2161,9 +2166,10 @@
+   else
+     {
+       STBrowserTab *selected_tab;
++      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->stream_columns };
+ 
+       shell->priv->stream_columns = st_stream_columns_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_columns), (gpointer *) &shell->priv->stream_columns);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->stream_columns), pun.gpp);
+ 
+       selected_tab = st_shell_get_selected_tab(shell);
+       if (selected_tab)
+@@ -2195,8 +2201,10 @@
+     gtk_window_present(GTK_WINDOW(shell->priv->about));
+   else
+     {
++     union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->about };
++
+       shell->priv->about = st_about_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->about), (gpointer *) &shell->priv->about);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->about), pun.gpp);
+ 
+       g_signal_connect(shell->priv->about,
+ 		       "response",
+@@ -2244,8 +2252,10 @@
+ 
+   if (! shell->priv->preferences)
+     {
++      union { GtkWidget **wpp; gpointer *gpp; }pun = { &shell->priv->preferences };
++
+       shell->priv->preferences = st_preferences_dialog_new(GTK_WINDOW(shell->priv->window));
+-      g_object_add_weak_pointer(G_OBJECT(shell->priv->preferences), (gpointer *) &shell->priv->preferences);
++      g_object_add_weak_pointer(G_OBJECT(shell->priv->preferences), pun.gpp);
+     }
+ 
+   if (handler)
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-sedfix.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-sedfix.patch
deleted file mode 100644
index 639c11914a8c..000000000000
--- a/net-misc/streamtuner/files/streamtuner-0.99.99-sedfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN streamtuner-0.99.99.orig/docs/reference/Makefile.in streamtuner-0.99.99/docs/reference/Makefile.in
---- streamtuner-0.99.99.orig/docs/reference/Makefile.in	2004-12-21 16:31:18.000000000 +0100
-+++ streamtuner-0.99.99/docs/reference/Makefile.in	2004-12-30 00:13:13.599093728 +0100
-@@ -517,7 +517,7 @@
- @ENABLE_GTK_DOC_TRUE@	rm -rf $(srcdir)/html 
- @ENABLE_GTK_DOC_TRUE@	mkdir $(srcdir)/html
- @ENABLE_GTK_DOC_TRUE@	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
--@ENABLE_GTK_DOC_TRUE@	sed -i "" -e \
-+@ENABLE_GTK_DOC_TRUE@	sed -i -e \
- @ENABLE_GTK_DOC_TRUE@		's/background: #ffeeee/background: #daffd1/g; \
- @ENABLE_GTK_DOC_TRUE@		 s/border: solid 1px #ffaaaa/border: solid 1px #74ff54/g; \
- @ENABLE_GTK_DOC_TRUE@		 s/background: #eeeeff/background: #feffde/g; \
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild
deleted file mode 100644
index 5104f780fe2a..000000000000
--- a/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 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-r1.ebuild,v 1.4 2006/11/13 15:13:37 flameeyes Exp $
-
-IUSE=""
-
-inherit gnome2 eutils
-
-DESCRIPTION="Stream directory browser for browsing internet radio streams"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
-	 http://savannah.nongnu.org/download/${PN}/${P}-pygtk-2.6.diff"
-HOMEPAGE="http://www.nongnu.org/streamtuner/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=net-misc/curl-7.10.8
-	>=app-text/scrollkeeper-0.3.0
-	dev-libs/libxml2
-	>=media-libs/taglib-1.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-sedfix.patch
-	epatch ${DISTDIR}/${P}-pygtk-2.6.diff
-}
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r2.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r2.ebuild
new file mode 100644
index 000000000000..7bfe96ada7f0
--- /dev/null
+++ b/net-misc/streamtuner/streamtuner-0.99.99-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/07/29 07:02:31 drac Exp $
+
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils
+
+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"
+
+RDEPEND=">=x11-libs/gtk+-2.4
+	net-misc/curl
+	app-text/scrollkeeper
+	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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${DISTDIR}"/${P}-pygtk-2.6.diff
+}
+
+src_compile() {
+	# live365 causes parse errors at connect time.
+	econf --disable-live365 $(use_enable python)
+	emake || die "emake failed."
+}
diff --git a/net-misc/streamtuner/streamtuner-0.99.99.ebuild b/net-misc/streamtuner/streamtuner-0.99.99.ebuild
deleted file mode 100644
index 1467777fa81d..000000000000
--- a/net-misc/streamtuner/streamtuner-0.99.99.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.3 2006/11/13 15:13:37 flameeyes Exp $
-
-IUSE=""
-
-inherit gnome2 eutils
-
-DESCRIPTION="Stream directory browser for browsing internet radio streams"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.nongnu.org/streamtuner/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=net-misc/curl-7.10.8
-	>=app-text/scrollkeeper-0.3.0
-	>=dev-libs/libxml-1.8.17-r2
-	>=media-libs/taglib-1.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-sedfix.patch
-}
diff --git a/net-misc/streamtuner/streamtuner-0.99.ebuild b/net-misc/streamtuner/streamtuner-0.99.ebuild
deleted file mode 100644
index 68b4aeb159d1..000000000000
--- a/net-misc/streamtuner/streamtuner-0.99.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.ebuild,v 1.3 2006/11/13 15:13:37 flameeyes Exp $
-
-IUSE=""
-
-inherit gnome2 eutils
-
-DESCRIPTION="Stream directory browser for browsing internet radio streams"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.nongnu.org/streamtuner/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=net-misc/curl-7.10.8
-	>=app-text/scrollkeeper-0.3.0
-	>=dev-libs/libxml-1.8.17-r2
-	>=media-libs/taglib-1.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"