moved to eapi=2

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 22 insertions, 33 deletions

diff --git a/media-plugins/vdr-weatherng/ChangeLog b/media-plugins/vdr-weatherng/ChangeLog
index 8a32306447f3..6cdce40113f9 100644
--- a/media-plugins/vdr-weatherng/ChangeLog
+++ b/media-plugins/vdr-weatherng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-weatherng
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.24 2009/01/20 15:39:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.25 2009/10/30 19:50:06 hd_brummy Exp $
+
+  30 Oct 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-weatherng-0.0.8_pre3.ebuild, vdr-weatherng-0.0.8_pre3-r1.ebuild:
+  moved to eapi=2
 
 *vdr-weatherng-0.0.8_pre3-r1 (20 Jan 2009)
 
diff --git a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild
index 0368fd5d4af8..d63391fc8bf4 100644
--- a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild
+++ b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild,v 1.1 2009/01/20 15:39:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3-r1.ebuild,v 1.2 2009/10/30 19:50:06 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin eutils
 
@@ -16,8 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dxr3"
 
-DEPEND="media-libs/imlib2
+DEPEND="media-libs/imlib2[jpeg,gif]
 	>=media-video/vdr-1.3.34"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/weatherng-${MY_PV}"
 
@@ -26,20 +29,9 @@ VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.0.8.sh"
 
 PATCHES=("${FILESDIR}/${P}-i18n-fix.diff")
 
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! built_with_use media-libs/imlib2 jpeg gif ; then
-		echo
-		eerror "Please recompile media-libs/imlib2 with"
-		eerror "USE=\"jpeg gif\""
-		die "media-libs/imlib2 need jpeg and gif support"
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-	cd "${S}"
+src_prepare() {
+	vdr-plugin_src_prepare
+#	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gentoo.diff"
 	epatch "${FILESDIR}/${P}-timeout.diff"
diff --git a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild
index f9d04aa69263..4ac78c4626ee 100644
--- a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild
+++ b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild,v 1.10 2008/06/15 21:32:01 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild,v 1.11 2009/10/30 19:50:06 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin eutils
 
@@ -16,9 +18,11 @@ SLOT="0"
 KEYWORDS="x86 ~amd64"
 IUSE="dxr3"
 
-DEPEND="media-libs/imlib2
+DEPEND="media-libs/imlib2[jpeg,gif]
 	>=media-video/vdr-1.3.34"
 
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/weatherng-${MY_PV}"
 
 VDR_CONFD_FILE="${FILESDIR}/confd-0.0.8"
@@ -26,19 +30,8 @@ VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.0.8.sh"
 
 PATCHES=("${FILESDIR}/${P}-i18n-fix.diff")
 
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! built_with_use media-libs/imlib2 jpeg gif ; then
-		echo
-		eerror "Please recompile media-libs/imlib2 with"
-		eerror "USE=\"jpeg gif\""
-		die "media-libs/imlib2 need jpeg and gif support"
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
 	epatch "${FILESDIR}/${P}-gentoo.diff"
 	epatch "${FILESDIR}/${P}-timeout.diff"