14 files changed, 53 insertions, 100 deletions
diff --git a/x11-plugins/gkacpi/ChangeLog b/x11-plugins/gkacpi/ChangeLog
index 660a4b578bc1..44811f3e0e8a 100644
--- a/x11-plugins/gkacpi/ChangeLog
+++ b/x11-plugins/gkacpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkacpi
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/ChangeLog,v 1.7 2007/02/22 21:27:35 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/ChangeLog,v 1.8 2007/03/09 15:52:57 lack Exp $
+
+  09 Mar 2007; Jim Ramsay <lack@gentoo.org> gkacpi-0.5.ebuild,
+  gkacpi-2.0.4.ebuild:
+  Updated to use new gkrellm-plugin eclass
 
   22 Feb 2007; Jim Ramsay <lack@gentoo.org> +metadata.xml:
   Accepting maintainership
diff --git a/x11-plugins/gkacpi/gkacpi-0.5.ebuild b/x11-plugins/gkacpi/gkacpi-0.5.ebuild
index 15b5f60c44ab..8366495bbd6f 100644
--- a/x11-plugins/gkacpi/gkacpi-0.5.ebuild
+++ b/x11-plugins/gkacpi/gkacpi-0.5.ebuild
@@ -1,25 +1,14 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/gkacpi-0.5.ebuild,v 1.9 2006/10/15 23:20:57 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/gkacpi-0.5.ebuild,v 1.10 2007/03/09 15:52:57 lack Exp $
+
+inherit gkrellm-plugin
 
 IUSE=""
 DESCRIPTION="ACPI monitor for Gkrellm"
 SRC_URI="http://uname.dyndns.org/~uname/files/gkacpi/${P}.tar.gz"
 HOMEPAGE="http://uname.dyndns.org/~uname/software.php"
 LICENSE="GPL-2"
-DEPEND="dev-util/pkgconfig"
-RDEPEND="${DEPEND}
-		=app-admin/gkrellm-2*"
 KEYWORDS="x86"
 SLOT="0"
 
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	insinto /usr/lib/gkrellm2/plugins
-	doins gkacpi.so
-
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-}
diff --git a/x11-plugins/gkacpi/gkacpi-2.0.4.ebuild b/x11-plugins/gkacpi/gkacpi-2.0.4.ebuild
index 2868e9c3ab0c..89cbe0138928 100644
--- a/x11-plugins/gkacpi/gkacpi-2.0.4.ebuild
+++ b/x11-plugins/gkacpi/gkacpi-2.0.4.ebuild
@@ -1,27 +1,18 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/gkacpi-2.0.4.ebuild,v 1.1 2006/10/15 23:20:57 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkacpi/gkacpi-2.0.4.ebuild,v 1.2 2007/03/09 15:52:57 lack Exp $
+
+inherit gkrellm-plugin
 
 IUSE=""
 DESCRIPTION="ACPI monitor for Gkrellm"
 SRC_URI="mirror://sourceforge/gkacpi/${PN}2-0.4.tar.gz"
 HOMEPAGE="http://gkacpi.sf.net"
 LICENSE="GPL-2"
-DEPEND="dev-util/pkgconfig"
-RDEPEND="${DEPEND}
-	=app-admin/gkrellm-2*"
 KEYWORDS="~x86"
 SLOT="0"
 
 S="${WORKDIR}/${PN}2-0.4"
 
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	insinto /usr/lib/gkrellm2/plugins
-	doins gkacpi2.so
+PLUGIN_SO=gkacpi2.so
 
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-}
diff --git a/x11-plugins/gkrellaclock/ChangeLog b/x11-plugins/gkrellaclock/ChangeLog
index 0aa289643b3e..f124f39975d1 100644
--- a/x11-plugins/gkrellaclock/ChangeLog
+++ b/x11-plugins/gkrellaclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkrellaclock
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/ChangeLog,v 1.21 2007/02/21 17:08:48 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/ChangeLog,v 1.22 2007/03/09 15:56:35 lack Exp $
+
+  09 Mar 2007; Jim Ramsay <lack@gentoo.org> gkrellaclock-0.3.2.1.ebuild,
+  gkrellaclock-0.3.4.ebuild:
+  Updated to use new gkrellm-plugin eclass
 
   21 Feb 2007; Jim Ramsay <lack@gentoo.org> metadata.xml:
   Accepting maintainership
diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild
index 2b72cb7db183..c90551d30670 100644
--- a/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild,v 1.9 2005/05/06 00:16:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/gkrellaclock-0.3.2.1.ebuild,v 1.10 2007/03/09 15:56:35 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 IUSE=""
 S=${WORKDIR}/${P/a/A}
@@ -10,8 +10,6 @@ DESCRIPTION="Nice analog clock for GKrellM2"
 SRC_URI="http://www.geocities.com/m_muthukumar/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/m_muthukumar/gkrellaclock.html"
 
-DEPEND=">=app-admin/gkrellm-2"
-
 SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc alpha ppc amd64"
@@ -20,9 +18,3 @@ src_compile() {
 	export CFLAGS="${CFLAGS/-O?/}"
 	emake || die
 }
-
-src_install () {
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	doins gkrellaclock.so
-	dodoc README ChangeLog
-}
diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4.ebuild
index ec8e9d231f10..f17a75ddb309 100644
--- a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4.ebuild
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4.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/gkrellaclock/gkrellaclock-0.3.4.ebuild,v 1.2 2007/02/18 18:26:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellaclock/gkrellaclock-0.3.4.ebuild,v 1.3 2007/03/09 15:56:35 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 IUSE=""
 S=${WORKDIR}/${P/a/A}
@@ -10,8 +10,6 @@ DESCRIPTION="Nice analog clock for GKrellM2"
 SRC_URI="http://www.geocities.com/m_muthukumar/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/m_muthukumar/gkrellaclock.html"
 
-DEPEND=">=app-admin/gkrellm-2"
-
 SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
@@ -23,8 +21,3 @@ src_compile() {
 	emake || die 'emake failed'
 }
 
-src_install () {
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	doins gkrellaclock.so
-	dodoc README ChangeLog
-}
diff --git a/x11-plugins/gkrellfire/ChangeLog b/x11-plugins/gkrellfire/ChangeLog
index 0502cc6b3bec..1b95dfaa7784 100644
--- a/x11-plugins/gkrellfire/ChangeLog
+++ b/x11-plugins/gkrellfire/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/gkrellfire
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellfire/ChangeLog,v 1.1 2007/02/23 16:29:13 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellfire/ChangeLog,v 1.2 2007/03/09 15:57:48 lack Exp $
+
+  09 Mar 2007; Jim Ramsay <lack@gentoo.org> gkrellfire-0.3.3.ebuild:
+  Updated to use new gkrellm-plugin eclass
 
 *gkrellfire-0.3.3 (23 Feb 2007)
 
diff --git a/x11-plugins/gkrellfire/gkrellfire-0.3.3.ebuild b/x11-plugins/gkrellfire/gkrellfire-0.3.3.ebuild
index 4e5518a0ae3d..ca34a5abc435 100644
--- a/x11-plugins/gkrellfire/gkrellfire-0.3.3.ebuild
+++ b/x11-plugins/gkrellfire/gkrellfire-0.3.3.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/gkrellfire/gkrellfire-0.3.3.ebuild,v 1.1 2007/02/23 16:29:13 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellfire/gkrellfire-0.3.3.ebuild,v 1.2 2007/03/09 15:57:48 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 DESCRIPTION="Cpu load flames for GKrellM 2"
 HOMEPAGE="http://people.freenet.de/thomas-steinke"
@@ -13,13 +13,4 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-RDEPEND="=app-admin/gkrellm-2*"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
 
-src_install() {
-	dodoc Changelog COPYING README
-
-	exeinto /usr/$(get_libdir)/gkrellm2/plugins
-	doexe gkrellfire.so
-}
diff --git a/x11-plugins/gkrellflynn/ChangeLog b/x11-plugins/gkrellflynn/ChangeLog
index 24c7721d7416..a256fdcaf12e 100644
--- a/x11-plugins/gkrellflynn/ChangeLog
+++ b/x11-plugins/gkrellflynn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkrellflynn
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/ChangeLog,v 1.15 2007/02/22 22:14:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/ChangeLog,v 1.16 2007/03/09 16:00:36 lack Exp $
+
+  09 Mar 2007; Jim Ramsay <lack@gentoo.org> gkrellflynn-0.6.ebuild,
+  gkrellflynn-0.7.ebuild, gkrellflynn-0.8.ebuild:
+  Updated to use new gkrellm-plugin eclass
 
 *gkrellflynn-0.8 (22 Feb 2007)
 
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
index 8b2a741fc786..5d1f58197832 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild,v 1.15 2007/02/22 16:06:22 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild,v 1.16 2007/03/09 16:00:36 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 IUSE=""
 HOMEPAGE="http://horus.comlab.uni-rostock.de/flynn/"
 SRC_URI="http://horus.comlab.uni-rostock.de/flynn/${P}.tar.gz"
 DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
 KEYWORDS="alpha amd64 ppc sparc x86"
-DEPEND="=app-admin/gkrellm-2*"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -17,9 +16,3 @@ src_compile() {
 	make gkrellm2
 }
 
-src_install() {
-	exeinto /usr/$(get_libdir)/gkrellm2/plugins ;
-	doexe gkrellflynn.so
-
-	dodoc INSTALL Changelog README COPYING AUTHORS
-}
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild
index 99659d4b20c5..354e62c4bae6 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild,v 1.6 2007/02/22 16:06:22 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild,v 1.7 2007/03/09 16:00:36 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 IUSE=""
 HOMEPAGE="http://horus.comlab.uni-rostock.de/flynn/"
 SRC_URI="http://horus.comlab.uni-rostock.de/flynn/${P}.tar.gz"
 DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
 KEYWORDS="alpha ~amd64 ppc ~sparc ~x86"
-DEPEND="=app-admin/gkrellm-2*"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -19,9 +18,3 @@ src_compile() {
 	make gkrellm2
 }
 
-src_install() {
-	exeinto /usr/$(get_libdir)/gkrellm2/plugins ;
-	doexe gkrellflynn.so
-
-	dodoc INSTALL Changelog README COPYING AUTHORS
-}
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
index 5da6ef9714e8..bdc2f855e949 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild,v 1.1 2007/02/22 22:14:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild,v 1.2 2007/03/09 16:00:36 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 IUSE=""
 HOMEPAGE="http://horus.comlab.uni-rostock.de/flynn/"
 SRC_URI="http://horus.comlab.uni-rostock.de/flynn/${P}.tar.gz"
 DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-DEPEND="=app-admin/gkrellm-2*"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -17,9 +16,3 @@ src_compile() {
 	make gkrellm2
 }
 
-src_install() {
-	exeinto /usr/$(get_libdir)/gkrellm2/plugins ;
-	doexe gkrellflynn.so
-
-	dodoc INSTALL Changelog README COPYING AUTHORS
-}
diff --git a/x11-plugins/gkrellkam/ChangeLog b/x11-plugins/gkrellkam/ChangeLog
index 0bcbddf1c6b4..59985fc89964 100644
--- a/x11-plugins/gkrellkam/ChangeLog
+++ b/x11-plugins/gkrellkam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/gkrellkam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/ChangeLog,v 1.14 2007/02/22 21:27:56 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/ChangeLog,v 1.15 2007/03/09 16:01:53 lack Exp $
+
+  09 Mar 2007; Jim Ramsay <lack@gentoo.org> gkrellkam-2.0.0.ebuild:
+  Updated to use new gkrellm-plugin eclass
 
   22 Feb 2007; Jim Ramsay <lack@gentoo.org> +metadata.xml:
   Accepting maintainership
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
index 91ff65a12091..4207cf571196 100644
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild,v 1.12 2005/04/27 21:18:38 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild,v 1.13 2007/03/09 16:01:53 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 MY_P=${P/-/_}
 IUSE=""
@@ -13,12 +13,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha amd64"
 
-DEPEND="=app-admin/gkrellm-2*"
+RDEPEND="net-misc/wget"
 
-src_install () {
-	exeinto /usr/$(get_libdir)/gkrellm2/plugins
-	doexe gkrellkam2.so
+PLUGIN_SO=gkrellkam2.so
+PLUGIN_DOCS="example.list"
 
+src_install () {
+	gkrellm-plugin_src_install
 	doman gkrellkam-list.5
-	dodoc README Changelog COPYING example.list Release Todo INSTALL
 }