Updated to use new gkrellm-plugin eclass, and cleaned up old versions

(Portage version: 2.1.2-r10)

10 files changed, 30 insertions, 137 deletions

diff --git a/x11-plugins/gkrelltop/ChangeLog b/x11-plugins/gkrelltop/ChangeLog
index aef700d73d67..32b10e454a26 100644
--- a/x11-plugins/gkrelltop/ChangeLog
+++ b/x11-plugins/gkrelltop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/gkrelltop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/ChangeLog,v 1.17 2007/02/22 20:59:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/ChangeLog,v 1.18 2007/03/12 17:40:26 lack Exp $
+
+  12 Mar 2007; Jim Ramsay <lack@gentoo.org> -gkrelltop-2.2.ebuild,
+  -gkrelltop-2.2.2.ebuild, -gkrelltop-2.2.3.ebuild, gkrelltop-2.2.4.ebuild,
+  gkrelltop-2.2.6.ebuild, gkrelltop-2.2.6-r1.ebuild:
+  Updated to use new gkrellm-plugin eclass, and cleaned up old versions
 
   22 Feb 2007; Jim Ramsay <lack@gentoo.org> metadata.xml:
   Accepting maintainership
diff --git a/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2 b/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2
deleted file mode 100644
index 48f681c28009..000000000000
--- a/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fbddff14365fd81afa9e97dd919fcf6c gkrelltop.2.2.tgz 33435
-RMD160 5856d716f9a3ac0f63e4d673a9ca6688d85d0d3c gkrelltop.2.2.tgz 33435
-SHA256 e754d580e3fcc4eaf3139507922ec44c7b82aed41203e45878f11283fb28ae7b gkrelltop.2.2.tgz 33435
diff --git a/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2.2 b/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2.2
deleted file mode 100644
index 2bc3f27b8d7b..000000000000
--- a/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b55d613d36ce32d0a99562cdf5368b0e gkrelltop.2.2.2.tgz 15350
-RMD160 c371ffc8071266c9a4e43ddefe1735c1dc274d48 gkrelltop.2.2.2.tgz 15350
-SHA256 b3ef3c3f0983cbd1c1d15e9ebdb0108b27b3605273ba370a506bbf4f38c8b53d gkrelltop.2.2.2.tgz 15350
diff --git a/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2.3 b/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2.3
deleted file mode 100644
index db87c2e18ff9..000000000000
--- a/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8787829aedda35b5d1b6e61b6bc3a299 gkrelltop.2.2.3.tgz 16372
-RMD160 5ac47108fb8a1a7da2955a4f1e51cfc07e614283 gkrelltop.2.2.3.tgz 16372
-SHA256 010d8da334278ad0ee41a9ee1e0f44442d0efc9b2b8e333d0cd7712e41b4bbe8 gkrelltop.2.2.3.tgz 16372
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild
deleted file mode 100644
index 7d8e27368bff..000000000000
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild,v 1.4 2005/03/25 16:53:51 kugelfang Exp $
-
-DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
-SRC_URI="http://psychology.rutgers.edu/~zaimi/html/${PN}.${PV}.tgz"
-HOMEPAGE="http://psychology.rutgers.edu/~zaimi/software.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ppc"
-
-IUSE=""
-
-DEPEND="=app-admin/gkrellm-2*"
-
-src_compile() {
-	# Unfortunately, the supplied Makefile won't work properly on
-	# non-x86, so we have to do this the hard way.
-	CONFIG="-DLINUX -DGKRELLM2 -fPIC `pkg-config gtk+-2.0 --cflags`"
-	LIBS="`pkg-config gtk+-2.0 --libs` -shared"
-	OBJS="top_three2.o gkrelltop2.o"
-	gcc -c $CONFIG $CFLAGS top_three.c -o top_three2.o || die
-	gcc -c $CONFIG $CFLAGS gkrelltop.c -o gkrelltop2.o || die
-	gcc $LIBS $CONFIG $CFLAGS -o gkrelltop2.so $OBJS || die
-}
-
-src_install() {
-	dodoc README
-	insinto /usr/lib/gkrellm2/plugins
-	doins gkrelltop2.so
-}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild
deleted file mode 100644
index 2a9ead73a1aa..000000000000
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild,v 1.4 2005/03/25 16:53:51 kugelfang Exp $
-
-DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
-SRC_URI="http://psychology.rutgers.edu/~zaimi/html/${PN}/${PN}.${PV}.tgz"
-HOMEPAGE="http://psychology.rutgers.edu/~zaimi/software.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ppc"
-
-IUSE=""
-
-DEPEND="=app-admin/gkrellm-2*"
-
-src_compile() {
-	# Unfortunately, the supplied Makefile won't work properly on
-	# non-x86, so we have to do this the hard way.
-	CONFIG="-DLINUX -DGKRELLM2 -fPIC `pkg-config gtk+-2.0 --cflags`"
-	LIBS="`pkg-config gtk+-2.0 --libs` -shared"
-	OBJS="top_three2.o gkrelltop2.o"
-	gcc -c $CONFIG $CFLAGS top_three.c -o top_three2.o || die
-	gcc -c $CONFIG $CFLAGS gkrelltop.c -o gkrelltop2.o || die
-	gcc $LIBS $CONFIG $CFLAGS -o gkrelltop2.so $OBJS || die
-}
-
-src_install() {
-	dodoc README
-	insinto /usr/lib/gkrellm2/plugins
-	doins gkrelltop2.so
-}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild
index ee1c218a381b..af8fcd11a6c5 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.4.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/gkrelltop/gkrelltop-2.2.4.ebuild,v 1.9 2005/06/13 18:15:30 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild,v 1.10 2007/03/12 17:40:26 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="http://psychology.rutgers.edu/~zaimi/html/${PN}/${PN}.${PV}.tgz"
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 ppc sparc x86"
 
 IUSE=""
 
-DEPEND=">=app-admin/gkrellm-2"
+PLUGIN_SO=gkrelltop2.so
 
 src_compile() {
 	# Unfortunately, the supplied Makefile won't work properly on
@@ -26,9 +26,3 @@ src_compile() {
 	gcc -c $CONFIG $CFLAGS gkrelltop.c -o gkrelltop2.o || die
 	gcc $LIBS $CONFIG $CFLAGS -o gkrelltop2.so $OBJS || die
 }
-
-src_install() {
-	dodoc README
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	doins gkrelltop2.so
-}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild
index 518f186b7219..3ad82b9fce79 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.6-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/gkrelltop/gkrelltop-2.2.6-r1.ebuild,v 1.1 2007/01/22 06:35:18 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild,v 1.2 2007/03/12 17:40:26 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="http://psychology.rutgers.edu/~zaimi/html/${PN}/${PN}_2.2-6.tar.gz"
@@ -14,24 +14,28 @@ KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 
 IUSE=""
 
-DEPEND=">=app-admin/gkrellm-2"
+PLUGIN_SERVER_SO=gkrelltopd.so
+PLUGIN_SO=gkrelltop2.so
 
 src_compile() {
 	# Unfortunately, the supplied Makefile won't work properly on
 	# non-x86, so we have to do this the hard way.
 	CONFIG="-DLINUX -DGKRELLM2 -fPIC `pkg-config gtk+-2.0 --cflags`"
 	LIBS="`pkg-config gtk+-2.0 --libs` -shared"
-	OBJS="top_three2.o gkrelltop2.o"
+	OBJS="top_three2.o"
+	XOBJS="${OBJS} gkrelltop2.o"
+	DOBJS="${OBJS} gkrelltopd.o"
 	gcc -c $CONFIG $CFLAGS top_three.c -o top_three2.o || die
-	gcc -c $CONFIG $CFLAGS gkrelltop.c -o gkrelltop2.o || die
+	if built_with_use app-admin/gkrellm X; then
+		gcc -c $CONFIG $CFLAGS gkrelltop.c -o gkrelltop2.o || die
+		gcc $LIBS $CONFIG $CFLAGS -o gkrelltop2.so $XOBJS || die
+	fi
 	gcc -c $CONFIG $CFLAGS gkrelltopd.c -o gkrelltopd.o || die
-	gcc $LIBS $CONFIG $CFLAGS -o gkrelltop2.so $OBJS || die
-	gcc $LIBS $CONFIG $CFLAGS -o gkrelltopd.so $OBJS || die
+	gcc $LIBS $CONFIG $CFLAGS -o gkrelltopd.so $DOBJS || die
 }
 
-src_install() {
-	dodoc README
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	doins gkrelltop2.so
-	doins gkrelltopd.so
+pkg_postinst() {
+	einfo "To enable the gkrelltopd server plugin, you must add the following"
+	einfo "line to /etc/gkrellmd.conf:"
+	einfo "\tplugin-enable gkrelltopd"
 }
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild
index 043c00f57a2e..466afcf09783 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.6.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/gkrelltop/gkrelltop-2.2.6.ebuild,v 1.1 2005/05/19 13:25:00 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild,v 1.2 2007/03/12 17:40:26 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="http://psychology.rutgers.edu/~zaimi/html/${PN}/${PN}_2.2-6.tar.gz"
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 
 IUSE=""
 
-DEPEND=">=app-admin/gkrellm-2"
+PLUGIN_SO=gkrelltop2.so
 
 src_compile() {
 	# Unfortunately, the supplied Makefile won't work properly on
@@ -27,8 +27,3 @@ src_compile() {
 	gcc $LIBS $CONFIG $CFLAGS -o gkrelltop2.so $OBJS || die
 }
 
-src_install() {
-	dodoc README
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	doins gkrelltop2.so
-}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild
deleted file mode 100644
index f2a42a4962cc..000000000000
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.ebuild,v 1.6 2005/03/25 16:53:52 kugelfang Exp $
-
-DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
-SRC_URI="http://psychology.rutgers.edu/~zaimi/${PN}.${PV}.tgz"
-HOMEPAGE="http://psychology.rutgers.edu/~zaimi/software.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc alpha ppc"
-
-IUSE=""
-
-DEPEND="=app-admin/gkrellm-2*"
-
-src_compile() {
-	# Unfortunately, the supplied Makefile won't work properly on
-	# non-x86, so we have to do this the hard way.
-	CONFIG="-DLINUX -DGKRELLM2 -fPIC `pkg-config gtk+-2.0 --cflags`"
-	LIBS="`pkg-config gtk+-2.0 --libs` -shared"
-	OBJS="top_three2.o gkrelltop2.o"
-	gcc -c $CONFIG $CFLAGS top_three.c -o top_three2.o || die
-	gcc -c $CONFIG $CFLAGS gkrelltop.c -o gkrelltop2.o || die
-	gcc $LIBS $CONFIG $CFLAGS -o gkrelltop2.so $OBJS || die
-}
-
-src_install() {
-	dodoc README
-	insinto /usr/lib/gkrellm2/plugins
-	doins gkrelltop2.so
-}