Migrate to EAPI 2 in order to get rid of built_with_use for bug #261562.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

4 files changed, 28 insertions, 38 deletions

diff --git a/x11-plugins/gkrellm-hddtemp/ChangeLog b/x11-plugins/gkrellm-hddtemp/ChangeLog
index d469698aa877..1ba6a4fd929d 100644
--- a/x11-plugins/gkrellm-hddtemp/ChangeLog
+++ b/x11-plugins/gkrellm-hddtemp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkrellm-hddtemp
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/ChangeLog,v 1.22 2008/07/28 14:02:14 lack Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/ChangeLog,v 1.23 2009/08/16 08:47:29 betelgeuse Exp $
+
+  16 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+  gkrellm-hddtemp-0.2_beta-r1.ebuild:
+  Migrate to EAPI 2 in order to get rid of built_with_use for bug #261562.
 
   28 Jul 2008; Jim Ramsay <lack@gentoo.org>
   gkrellm-hddtemp-0.2_beta-r1.ebuild:
diff --git a/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta-r1.ebuild b/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta-r1.ebuild
index 48cfeeb69ffd..433cf725f6fc 100644
--- a/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta-r1.ebuild
+++ b/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta-r1.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/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta-r1.ebuild,v 1.3 2008/07/28 14:02:14 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-hddtemp/gkrellm-hddtemp-0.2_beta-r1.ebuild,v 1.4 2009/08/16 08:47:29 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils multilib
 
@@ -15,37 +17,27 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc sparc x86"
 
-CDEPEND="=app-admin/gkrellm-2*
+CDEPEND="=app-admin/gkrellm-2*[X]
 	>=x11-libs/gtk+-2"
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
 RDEPEND="${CDEPEND}
 	>=app-admin/hddtemp-0.3_beta6"
 
-pkg_setup() {
-	if ! built_with_use app-admin/gkrellm X ; then
-		eerror "In order to install ${PN} you need to"
-		eerror "reinstall app-admin/gkrell with USE='X'."
-		die "app-admin/gkrellm built without USE='X'"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# patch Makefile
 	sed -i "s:^CFLAGS.*:CFLAGS=${CFLAGS} -fPIC:" Makefile || die
 }
 
 src_compile() {
-	make gkrellm2 || die
+	emake gkrellm2 || die
 }
 
 src_install() {
-	dodoc README
+	dodoc README || die
 
 	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	doins gkrellm-hddtemp.so
+	doins gkrellm-hddtemp.so || die
 }
 
 pkg_postinst() {
diff --git a/x11-plugins/wmhdplop/ChangeLog b/x11-plugins/wmhdplop/ChangeLog
index e4957251ed93..f5434ce29070 100644
--- a/x11-plugins/wmhdplop/ChangeLog
+++ b/x11-plugins/wmhdplop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmhdplop
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.15 2008/08/05 21:12:48 cardoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.16 2009/08/16 08:47:55 betelgeuse Exp $
+
+  16 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> wmhdplop-0.9.9.ebuild:
+  Migrate to EAPI 2 in order to get rid of built_with_use for bug #261562.
 
   05 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild
index a5c7a87606ae..c491ba9e94e1 100644
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.9.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/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild,v 1.2 2008/06/28 06:59:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.9.ebuild,v 1.3 2009/08/16 08:47:55 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils multilib
 
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="gkrellm"
 
-RDEPEND="media-libs/imlib2
+RDEPEND="media-libs/imlib2[X]
 	x11-libs/libX11
 	x11-libs/libXext
 	media-fonts/corefonts
@@ -23,28 +25,17 @@ DEPEND="${RDEPEND}
 	gkrellm? ( dev-util/pkgconfig
 		>=app-admin/gkrellm-2 )"
 
-pkg_setup() {
-	local fail="Re-emerge media-libs/imlib2 with USE X."
-
-	if ! built_with_use media-libs/imlib2 X; then
-		eerror "${fail}"
-		die "${fail}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	sed -i -e "s:-O3 -fomit-frame-pointer -ffast-math:${CFLAGS}:" "${S}"/configure
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_enable gkrellm)
-	emake || die "emake failed."
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README || die
 
 	insinto /usr/$(get_libdir)/gkrellm2/plugins
 	use gkrellm && doins gkhdplop.so