stable amd64, bug 278015

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 7 insertions, 50 deletions

diff --git a/net-misc/streamtuner/ChangeLog b/net-misc/streamtuner/ChangeLog
index 68d56c468aa6..1a148129501b 100644
--- a/net-misc/streamtuner/ChangeLog
+++ b/net-misc/streamtuner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/streamtuner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.38 2009/07/16 08:14:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.39 2009/07/17 18:51:21 ssuominen Exp $
+
+  17 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  streamtuner-0.99.99-r5.ebuild:
+  stable amd64, bug 278015
 
   16 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
   streamtuner-0.99.99-r5.ebuild:
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r2.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r2.ebuild
deleted file mode 100644
index 745d5f7a663e..000000000000
--- a/net-misc/streamtuner/streamtuner-0.99.99-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 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.5 2008/01/25 16:11:18 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 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
-	!media-plugins/streamtuner-xiph
-	!media-plugins/streamtuner-local
-	!media-plugins/streamtuner-live365
-	!media-plugins/streamtuner-python"
-
-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) \
-		$(use_enable shout shoutcast) $(use_enable xiph)
-	emake || die "emake failed."
-}
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
index 8836e5cf42a3..a35aa5202de0 100644
--- a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
+++ b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
@@ -1,6 +1,6 @@
 # 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-r5.ebuild,v 1.2 2009/07/16 08:14:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild,v 1.3 2009/07/17 18:51:21 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
@@ -13,7 +13,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="python +shout +xiph"
 
 RDEPEND=">=x11-libs/gtk+-2.4