Updated to use new gkrellm-plugin eclass

(Portage version: 2.1.2-r10)

3 files changed, 17 insertions, 19 deletions

diff --git a/x11-plugins/gkrellmbups/ChangeLog b/x11-plugins/gkrellmbups/ChangeLog
index 4617920899ce..073265d62ef7 100644
--- a/x11-plugins/gkrellmbups/ChangeLog
+++ b/x11-plugins/gkrellmbups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkrellmbups
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/ChangeLog,v 1.5 2007/02/21 16:34:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/ChangeLog,v 1.6 2007/03/09 16:53:58 lack Exp $
+
+  09 Mar 2007; Jim Ramsay <lack@gentoo.org> gkrellmbups-2.0.2.ebuild,
+  gkrellmbups-2.0.2-r1.ebuild:
+  Updated to use new gkrellm-plugin eclass
 
 *gkrellmbups-2.0.2-r1 (21 Feb 2007)
 
diff --git a/x11-plugins/gkrellmbups/gkrellmbups-2.0.2-r1.ebuild b/x11-plugins/gkrellmbups/gkrellmbups-2.0.2-r1.ebuild
index 6b0509983875..749a296fc5c8 100644
--- a/x11-plugins/gkrellmbups/gkrellmbups-2.0.2-r1.ebuild
+++ b/x11-plugins/gkrellmbups/gkrellmbups-2.0.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/gkrellmbups-2.0.2-r1.ebuild,v 1.1 2007/02/21 16:34:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/gkrellmbups-2.0.2-r1.ebuild,v 1.2 2007/03/09 16:53:58 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 IUSE="nut"
 DESCRIPTION="GKrellM2 Belkin UPS monitor Plugin"
@@ -13,8 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc x86"
 
-RDEPEND=">=app-admin/gkrellm-2
-	nut? ( sys-power/nut )"
+RDEPEND="nut? ( sys-power/nut )"
 
 src_unpack() {
 	unpack ${A}
@@ -23,12 +22,12 @@ src_unpack() {
 }
 
 src_compile() {
-	econf `use_enable nut` || die "configure failed"
-	emake || die
+	econf `use_enable nut` || die "Configure failed"
+	emake || die "Make failed"
 }
 
 src_install () {
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
+	insinto $(gkrellm-plugin_dir)
 	newins src/gkrellmbups gkrellmbups.so
-	dodoc COPYING INSTALL README TODO
+	dodoc INSTALL README TODO
 }
diff --git a/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild b/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild
index 281ae4e61340..00c10a8db02b 100644
--- a/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild
+++ b/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild,v 1.4 2007/02/05 16:04:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmbups/gkrellmbups-2.0.2.ebuild,v 1.5 2007/03/09 16:53:58 lack Exp $
+
+inherit gkrellm-plugin
 
 IUSE=""
 DESCRIPTION="GKrellM2 Belkin UPS monitor Plugin"
@@ -11,21 +13,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc x86"
 
-DEPEND="=app-admin/gkrellm-2*"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i -e 's:/usr/include/gkrell:/usr/include/gkrellm2:g' configure
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install () {
-	insinto /usr/lib/gkrellm2/plugins
+	insinto $(gkrellm-plugin_dir)
 	newins src/gkrellmbups gkrellmbups.so
-	dodoc COPYING INSTALL README TODO
+	dodoc INSTALL README TODO
 }