net-misc/streamtuner: scrollkeeper is not needed, update ebuild

Package-Manager: portage-2.3.2

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
index e62df03d0434d91a78ce02467749d360167c40df..dac5973f83e0900c7f48265b89e4859f05711577 100644 (file)
--- a/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast-2.patch
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast-2.patch
@@ -1,5 +1,5 @@
---- src/plugins/shoutcast/shoutcast.c
-+++ src/plugins/shoutcast/shoutcast.c
+--- a/src/plugins/shoutcast/shoutcast.c
++++ b/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/files/streamtuner-0.99.99-shoutcast.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch
index b7db78b20b76db08bd042bbdfd46d54e53720d84..41f80c4a9076ca0767b19463f3b4a3e8087fdebb 100644 (file)
--- a/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch
@@ -1,5 +1,5 @@
---- src/plugins/shoutcast/shoutcast.c.orig     2004-12-19 15:21:00.000000000 +0000
-+++ src/plugins/shoutcast/shoutcast.c  2008-03-16 10:39:24.000000000 +0000
+--- a/src/plugins/shoutcast/shoutcast.c.orig   2004-12-19 15:21:00.000000000 +0000
++++ b/src/plugins/shoutcast/shoutcast.c        2008-03-16 10:39:24.000000000 +0000
 @@ -94,6 +94,8 @@
  
    GNode                       *parent_node;

diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-stack_increase.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-stack_increase.patch
index 0b64aa72b0987deab839578b2bc294dfbb46145a..2313915ad32f2d301ff23384db404101c416e830 100644 (file)
--- a/net-misc/streamtuner/files/streamtuner-0.99.99-stack_increase.patch
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-stack_increase.patch
@@ -1,5 +1,5 @@
---- src/streamtuner/st-thread.c
-+++ src/streamtuner/st-thread.c
+--- a/src/streamtuner/st-thread.c
++++ b/src/streamtuner/st-thread.c
 @@ -108,1 +108,1 @@
 -                           0x18000, /* 96k, big enough for libcurl */
 +                           0x40000, /* change from 96k to 256k */

diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
index c108b0aa8797a94f150b79acc7a6ab20065dd734..bdd97ba4bbda27cdff5fbbc2ec1cc9695f042323 100644 (file)
--- a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
+++ b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-GCONF_DEBUG=no
-inherit eutils gnome2
+EAPI=6
+inherit gnome2
 
 DESCRIPTION="Stream directory browser for browsing internet radio streams"
 HOMEPAGE="http://www.nongnu.org/streamtuner"
@@ -19,7 +18,6 @@ IUSE="python +shout +xiph"
 RDEPEND="
        >=x11-libs/gtk+-2.4:2
        net-misc/curl
-       app-text/scrollkeeper
        xiph? ( dev-libs/libxml2:2 )
        >=media-libs/taglib-1.2
        python? ( dev-python/pygtk:2 )
@@ -31,12 +29,12 @@ DEPEND="${RDEPEND}
 "
 
 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 \
-               "${FILESDIR}"/${P}-stack_increase.patch
+       eapply "${FILESDIR}"/${P}-gentoo.patch
+       eapply "${FILESDIR}"/${P}-shoutcast.patch
+       eapply "${FILESDIR}"/${P}-shoutcast-2.patch
+       eapply "${FILESDIR}"/${P}-audacious.patch
+       eapply -p0 "${DISTDIR}"/${P}-pygtk-2.6.diff
+       eapply "${FILESDIR}"/${P}-stack_increase.patch
 
        # Fix .desktop file
        sed -i \