summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-01-18 18:38:25 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-01-18 18:38:25 +0000
commit9a9915fd11c26116aad9c51912d87ba7fa6e90bb (patch)
treec8d8170779eb4fba49c8d11ef07589403539ad6b /net-misc/streamtuner
parentFix for bug #254491. Big Thanks to Permjacov E. A. and Rene Meier. Also remov... (diff)
downloadgentoo-2-9a9915fd11c26116aad9c51912d87ba7fa6e90bb.tar.gz
gentoo-2-9a9915fd11c26116aad9c51912d87ba7fa6e90bb.tar.bz2
gentoo-2-9a9915fd11c26116aad9c51912d87ba7fa6e90bb.zip
Use pkg_setup with G2CONF instead of EAPI2 since this ebuild is inheriting gnome2.eclass.
(Portage version: 2.1.6.6/cvs/Linux 2.6.28-gentoo i686)
Diffstat (limited to 'net-misc/streamtuner')
-rw-r--r--net-misc/streamtuner/ChangeLog5
-rw-r--r--net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild19
2 files changed, 13 insertions, 11 deletions
diff --git a/net-misc/streamtuner/ChangeLog b/net-misc/streamtuner/ChangeLog
index 85e2e03af59a..2056865f011b 100644
--- a/net-misc/streamtuner/ChangeLog
+++ b/net-misc/streamtuner/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for net-misc/streamtuner
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.35 2009/01/18 18:38:25 ssuominen Exp $
*streamtuner-0.99.99-r4 (18 Jan 2009)
@@ -11,7 +11,8 @@
+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.
+ by djkrysak at stny dot rr dot com. Use simple pkg_setup since we are
+ inheriting gnome2.eclass.
*streamtuner-0.99.99-r3 (13 May 2008)
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild
index 1ddd9eac1696..81e0374df8e5 100644
--- a/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild
+++ b/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild
@@ -1,8 +1,8 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.99-r4.ebuild,v 1.2 2009/01/18 18:38:25 ssuominen Exp $
-EAPI=2
+EAPI=1
GCONF_DEBUG=no
inherit eutils gnome2
@@ -27,9 +27,14 @@ RDEPEND=">=x11-libs/gtk+-2.4
DEPEND="${RDEPEND}
dev-util/pkgconfig"
-DOCS="AUTHORS NEWS README TODO"
+pkg_setup() {
+ # live365 causes parse errors at connect time.
+ G2CONF="-disable-live365 $(use_enable python)
+ $(use_enable shout shoutcast) $(use_enable xiph)"
+}
-src_prepare() {
+src_unpack() {
+ gnome2_src_unpack
epatch "${FILESDIR}"/${P}-gentoo.patch \
"${FILESDIR}"/${P}-shoutcast.patch \
"${FILESDIR}"/${P}-shoutcast-2.patch \
@@ -37,8 +42,4 @@ src_prepare() {
"${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)
-}
+DOCS="AUTHORS NEWS README TODO"