moved to eapi=2

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 30 insertions, 40 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/Manifest b/media-plugins/vdr-weatherng/Manifest
index 12a02e0acf28..d0efc72e2cf5 100644
--- a/media-plugins/vdr-weatherng/Manifest
+++ b/media-plugins/vdr-weatherng/Manifest
@@ -9,14 +9,15 @@ AUX vdr-weatherng-0.0.8_pre3-gentoo.diff 3300 RMD160 d2019261e5d39c879a6b2c9ea1e
 AUX vdr-weatherng-0.0.8_pre3-i18n-fix.diff 726 RMD160 642cd03deeebbbbcdb61a5fe3dcf25f39606cfaa SHA1 042b35fecd71e203dd1d7b3bff63b3746efb58fd SHA256 6ec4720c79c2105f088f745c4b1b8513fd37a6bb26203a48db7dd5afb58a9ac5
 AUX vdr-weatherng-0.0.8_pre3-timeout.diff 1160 RMD160 111b401d975f42ef0998e41e89ce669b5cf38e4f SHA1 b57051a40a1ef514ca40702b3a3df3b8d72b5d21 SHA256 5060f4085b875215945674ab03457e3d241e13086489e7ea1bea4de1045a0639
 DIST vdr-weatherng-0.0.8-pre3.tgz 177242 RMD160 b33c6d98c6bc8eca5c41dca6995e3f70285d70dc SHA1 6221d185c3ba43ffe1396ae0db98cf21e36879a6 SHA256 e9edd9ae745ce45274a436f29a0f3a408cd4d218dc9d16e19e4a25e39be2bd0b
-EBUILD vdr-weatherng-0.0.8_pre3-r1.ebuild 2136 RMD160 06d18e4989fb74f87606ffd8570b179537d50efd SHA1 c4e72bc20cc463b1b1dee51cd28ed37ec2925e94 SHA256 bbd7ae489eae91cc46ef22ad9b351db0845a1bc4060980b5840e0ba5d0f32564
-EBUILD vdr-weatherng-0.0.8_pre3.ebuild 2006 RMD160 9b43d712915511ddbcb46a5e227abf12456b5e71 SHA1 273fbd56faf256e9c90da62e148a76c8f9491adc SHA256 40302afe3bbd5c19152995d801ecae83d0f03bb3f6c4eb8662059f01d401fb96
-MISC ChangeLog 4321 RMD160 e44e2e198e758967d2b40ec39ec786bca0d3b9eb SHA1 7af7219ecad1e9c8e2b1bdfeeeb03586324bf055 SHA256 2b630b98075e94716ed8b7e9ee8dff9e15a2bcb1b55d89cf37596bfb88713d3d
+EBUILD vdr-weatherng-0.0.8_pre3-r1.ebuild 1947 RMD160 ee5bcb956d7c0d43b4482498bc838f402afec981 SHA1 d3096c15b8ab8f945fc4953f7a48c54fbd01bc4c SHA256 3deb272c5b508909a4a95a7e045bc03845512c2a464b5088ab60102bae34c341
+EBUILD vdr-weatherng-0.0.8_pre3.ebuild 1812 RMD160 6cde710bc2dbd08f76a1f9ff576fda3d3d690846 SHA1 a938d038f1c3a67ac0e47a45a544324caf1f1fc2 SHA256 eece6336866537144a6ba1d60ae07afcd85d958a4e4438161fd91373817deaae
+MISC ChangeLog 4471 RMD160 eac8a5d94c579660e2b0383503a817d7c847c5b6 SHA1 375ad36dc5ca602d0f59c9120208ce9aa5c396e1 SHA256 4095fcae8128515956f8e659a007af79dc4c5c32d4ae2f695e646d5e7977e03c
 MISC metadata.xml 470 RMD160 820df9c1e340c84feac26e0ba184b3344aceb7dd SHA1 a58f863766d430ea5e94e19187678e4d9d492ceb SHA256 0b6b4736226a44e9d1d59a77e0c5abd5ff3ad7076b8211d68883efb119656967
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkl18D0ACgkQt2vP6XvVdOfi/wCfTCijdnbN6Z4aPWNUtSoA6eeG
-tqkAoJ1GkSU5SJYmDQZUPdKJ5v8+dyHN
-=t1U5
+iD8DBQFK60Nsdn07HTTCgIoRAiIVAJ4ulX5SGmQR46ccFpVUsMzM+SAKeACdERL9
+QzqkIqrl6bsFRsqIBo2/TSo=
+=bKGB
 -----END PGP SIGNATURE-----
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"