projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 64d67ff)
Updated to use new gkrellm-plugin eclass, and cleaned up old versions
authorJim Ramsay <lack@gentoo.org>
Mon, 12 Mar 2007 17:40:26 +0000 (17:40 +0000)
committerJim Ramsay <lack@gentoo.org>
Mon, 12 Mar 2007 17:40:26 +0000 (17:40 +0000)
Package-Manager: portage-2.1.2-r10

x11-plugins/gkrelltop/ChangeLog patch | blob | history
x11-plugins/gkrelltop/Manifest patch | blob | history
x11-plugins/gkrelltop/files/digest-gkrelltop-2.2 [deleted file] patch | blob | history
x11-plugins/gkrelltop/files/digest-gkrelltop-2.2.2 [deleted file] patch | blob | history
x11-plugins/gkrelltop/files/digest-gkrelltop-2.2.3 [deleted file] patch | blob | history
x11-plugins/gkrelltop/gkrelltop-2.2.2.ebuild [deleted file] patch | blob | history
x11-plugins/gkrelltop/gkrelltop-2.2.3.ebuild [deleted file] patch | blob | history
x11-plugins/gkrelltop/gkrelltop-2.2.4.ebuild patch | blob | history
x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild patch | blob | history
x11-plugins/gkrelltop/gkrelltop-2.2.6.ebuild patch | blob | history
x11-plugins/gkrelltop/gkrelltop-2.2.ebuild [deleted file] patch | blob | history

diff --git a/x11-plugins/gkrelltop/ChangeLog b/x11-plugins/gkrelltop/ChangeLog
index aef700d73d6770886a067487c7c2340cfa2cfe33..32b10e454a2671fb9dfab658667fabf7ee3433c5 100644 (file)
--- 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/Manifest b/x11-plugins/gkrelltop/Manifest
index 1cfd407b77a8e67c8c29311d9e985be399d56bc6..1d72595e4d780109fa51cca5926c57ad0a50257d 100644 (file)
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -1,49 +1,25 @@
-DIST gkrelltop.2.2.2.tgz 15350 RMD160 c371ffc8071266c9a4e43ddefe1735c1dc274d48 SHA1 0c1a2f3eda5ab02eaa9b5dbf3720295cbb3121c5 SHA256 b3ef3c3f0983cbd1c1d15e9ebdb0108b27b3605273ba370a506bbf4f38c8b53d
-DIST gkrelltop.2.2.3.tgz 16372 RMD160 5ac47108fb8a1a7da2955a4f1e51cfc07e614283 SHA1 d8076a1f9122288f34628bac4d9d3ac17052a998 SHA256 010d8da334278ad0ee41a9ee1e0f44442d0efc9b2b8e333d0cd7712e41b4bbe8
 DIST gkrelltop.2.2.4.tgz 16387 RMD160 6d512e0a5c359ce2d0dafc77ceba67a6b0cc02ce SHA1 8aa71009431fb84199f0e5a81406897bebc1e876 SHA256 d3373c9d71994b733b69a63dfbfd4d07d1e6b61bcb2aa905c21aa96e911afc09
-DIST gkrelltop.2.2.tgz 33435 RMD160 5856d716f9a3ac0f63e4d673a9ca6688d85d0d3c SHA1 2a0937f0a8a0f8c19809b9ae50150795c71fc69e SHA256 e754d580e3fcc4eaf3139507922ec44c7b82aed41203e45878f11283fb28ae7b
 DIST gkrelltop_2.2-6.tar.gz 23384 RMD160 2bda8e41ae0f287f6a33446e71365f7b8ca189a1 SHA1 55cd54d8495d18507d8016c2ec38d53957a0a4b8 SHA256 8ba11fbbfd5b1cdf33ef489310b565c8dc4252d54ee406effabb43d7ce7cd1d3
-EBUILD gkrelltop-2.2.2.ebuild 1071 RMD160 73b3802ce1238fc918bef89971c9493f026010f3 SHA1 b91f1e64a46971d8c1a782d9fef45f6c88f9b758 SHA256 c1316bc87ac0f1f9ea3b42128a9a8db132fa13e704204c85cac8d03975f514a4
-MD5 a4d4fd2553657a78370b15d3db3eff2c gkrelltop-2.2.2.ebuild 1071
-RMD160 73b3802ce1238fc918bef89971c9493f026010f3 gkrelltop-2.2.2.ebuild 1071
-SHA256 c1316bc87ac0f1f9ea3b42128a9a8db132fa13e704204c85cac8d03975f514a4 gkrelltop-2.2.2.ebuild 1071
-EBUILD gkrelltop-2.2.3.ebuild 1077 RMD160 d1f29a5486968302a3dbe625956bc6e9623dab8b SHA1 2cc155ca6173ed68429f7eaf386328359fdcc3a2 SHA256 25d17f635423c527ab9c47cbee9210bca4d0f9c2dc2d42826087efdaedf0da03
-MD5 cb8a61347726fe9d2a224c1ef9b7805f gkrelltop-2.2.3.ebuild 1077
-RMD160 d1f29a5486968302a3dbe625956bc6e9623dab8b gkrelltop-2.2.3.ebuild 1077
-SHA256 25d17f635423c527ab9c47cbee9210bca4d0f9c2dc2d42826087efdaedf0da03 gkrelltop-2.2.3.ebuild 1077
-EBUILD gkrelltop-2.2.4.ebuild 1104 RMD160 58e50fc0a96f37ee76bef46fb35a1296bfecd6c8 SHA1 82d00bbf8144a24e44b4605e0494d25742cb8ede SHA256 d588d20f90171ff4662ced16b46ac28ce1159f8414d68dfe613c706c3967e1f7
-MD5 401c26388a082ddc4c4fc9bb5601fde3 gkrelltop-2.2.4.ebuild 1104
-RMD160 58e50fc0a96f37ee76bef46fb35a1296bfecd6c8 gkrelltop-2.2.4.ebuild 1104
-SHA256 d588d20f90171ff4662ced16b46ac28ce1159f8414d68dfe613c706c3967e1f7 gkrelltop-2.2.4.ebuild 1104
-EBUILD gkrelltop-2.2.6-r1.ebuild 1255 RMD160 3597b3b498c0826c2517d3bdf87b34a43749c765 SHA1 1bcd813c275e2c90fe718b0cd607a6335efc0fb5 SHA256 0805fcdcd6b02e3da4733bf1948dcdcc0dcf34971a735bb7889ffd0b8a892686
-MD5 5ff40a533156a737f82ca5b13777932e gkrelltop-2.2.6-r1.ebuild 1255
-RMD160 3597b3b498c0826c2517d3bdf87b34a43749c765 gkrelltop-2.2.6-r1.ebuild 1255
-SHA256 0805fcdcd6b02e3da4733bf1948dcdcc0dcf34971a735bb7889ffd0b8a892686 gkrelltop-2.2.6-r1.ebuild 1255
-EBUILD gkrelltop-2.2.6.ebuild 1114 RMD160 369606da1efc3c89b2010b9d1ce8fa9f993574d6 SHA1 882ab3e4a8ffbc6a723479819f5e23eda155b0ea SHA256 ee9ccf6b869ae01e740a1d6e577ead08fc1c328c48a396e49c5c3f7752354b1b
-MD5 aced8e84e9e47cdd40be95cfb3a43cb6 gkrelltop-2.2.6.ebuild 1114
-RMD160 369606da1efc3c89b2010b9d1ce8fa9f993574d6 gkrelltop-2.2.6.ebuild 1114
-SHA256 ee9ccf6b869ae01e740a1d6e577ead08fc1c328c48a396e49c5c3f7752354b1b gkrelltop-2.2.6.ebuild 1114
-EBUILD gkrelltop-2.2.ebuild 1061 RMD160 088aa3028e4c52295e0ec4e92d5d05f85cd1bb9c SHA1 a6b14d3d3ccdb00ee83c56c96898426bb550f1b0 SHA256 0f814e7d5d64f5d49ce6810db6712749c0d4de6eb5687fc17ca7e4f75de7e696
-MD5 cafded5eea504fb8e9ba892ba253e4e7 gkrelltop-2.2.ebuild 1061
-RMD160 088aa3028e4c52295e0ec4e92d5d05f85cd1bb9c gkrelltop-2.2.ebuild 1061
-SHA256 0f814e7d5d64f5d49ce6810db6712749c0d4de6eb5687fc17ca7e4f75de7e696 gkrelltop-2.2.ebuild 1061
-MISC ChangeLog 2507 RMD160 9031692c50ca1e1c2ad09aed3ab7afe879254a92 SHA1 a2c87cec2d5aa5fdc3452aee6e7db4fbc0e95161 SHA256 3b9211e4ad4e0936bbd41c83ecb94669abec3c3554d7c5dc8edbb21094277ad8
-MD5 92188143caa7f332916951d662133981 ChangeLog 2507
-RMD160 9031692c50ca1e1c2ad09aed3ab7afe879254a92 ChangeLog 2507
-SHA256 3b9211e4ad4e0936bbd41c83ecb94669abec3c3554d7c5dc8edbb21094277ad8 ChangeLog 2507
+EBUILD gkrelltop-2.2.4.ebuild 1004 RMD160 4063455747ffc737da2ad2c90a9f8ee1c7bfdc82 SHA1 62c2c74b752857d9e397d314be2f01aee22af84d SHA256 128d30803539dd3797046286786d4a706fc0760a5b8d42a6eb4b368699622099
+MD5 e9a29ab49cfb70932de1a9f33d2e0bf4 gkrelltop-2.2.4.ebuild 1004
+RMD160 4063455747ffc737da2ad2c90a9f8ee1c7bfdc82 gkrelltop-2.2.4.ebuild 1004
+SHA256 128d30803539dd3797046286786d4a706fc0760a5b8d42a6eb4b368699622099 gkrelltop-2.2.4.ebuild 1004
+EBUILD gkrelltop-2.2.6-r1.ebuild 1431 RMD160 14751df1a05573bbe09629702bf4a67639c34924 SHA1 42671cb926d20951b9f6ab882b82e33bca3995e0 SHA256 43525e7f8edab2a6dcbe473aeae30a6dfd9b94567b4122ae7efdb3b1e5c74231
+MD5 1f2b663d506d5b2362aa65580334b724 gkrelltop-2.2.6-r1.ebuild 1431
+RMD160 14751df1a05573bbe09629702bf4a67639c34924 gkrelltop-2.2.6-r1.ebuild 1431
+SHA256 43525e7f8edab2a6dcbe473aeae30a6dfd9b94567b4122ae7efdb3b1e5c74231 gkrelltop-2.2.6-r1.ebuild 1431
+EBUILD gkrelltop-2.2.6.ebuild 1012 RMD160 daf02860e795d05ac587fb81c7ddc04778de0997 SHA1 1793f5732611b90e3f262118da6b3b6e1d50fb1d SHA256 fe80342ab43ce2249e130df044977ce11e3b0d9fbbb4280ed57831949dd6e389
+MD5 d7f7d9e30f4777f36e64acab21cccbbf gkrelltop-2.2.6.ebuild 1012
+RMD160 daf02860e795d05ac587fb81c7ddc04778de0997 gkrelltop-2.2.6.ebuild 1012
+SHA256 fe80342ab43ce2249e130df044977ce11e3b0d9fbbb4280ed57831949dd6e389 gkrelltop-2.2.6.ebuild 1012
+MISC ChangeLog 2776 RMD160 6e1221731aed8dc4f575cfa1d29ad1a0d1973c30 SHA1 7853625c65296ef7bbd84f3f160dd8e87301d94b SHA256 8e093e5a1f5f2e8a1d3c272aa6c7bbb65abfcda759147d955a670239341b4ff1
+MD5 af2c1b29ff2169b6b44f42eb73b40a13 ChangeLog 2776
+RMD160 6e1221731aed8dc4f575cfa1d29ad1a0d1973c30 ChangeLog 2776
+SHA256 8e093e5a1f5f2e8a1d3c272aa6c7bbb65abfcda759147d955a670239341b4ff1 ChangeLog 2776
 MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
 MD5 599b71bb15dd853af7b7733ed80c5d79 metadata.xml 254
 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c metadata.xml 254
 SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279 metadata.xml 254
-MD5 c155f9339be4a6b7b06975ae2c0fe660 files/digest-gkrelltop-2.2 229
-RMD160 1df74d605618628363f4a8d325dd3ca658f5e99c files/digest-gkrelltop-2.2 229
-SHA256 3cb4d6f55e811ee495ff8b0cec8e20732df7facb486aa216bbb71a428e116c14 files/digest-gkrelltop-2.2 229
-MD5 f6393e1206008539e4ebf8356bcab6b1 files/digest-gkrelltop-2.2.2 235
-RMD160 2c7ac5e2a2d93bd75c91bac2e8c1d867c31ea0a0 files/digest-gkrelltop-2.2.2 235
-SHA256 7aa1416e635eaad0f8775eee5b6be9463a2382900db09b8330eace6697f481cc files/digest-gkrelltop-2.2.2 235
-MD5 ab6a41be1d19646cc9d4156d06624933 files/digest-gkrelltop-2.2.3 235
-RMD160 3991d40c2753e3e63d67904b2990b62002c8e9e1 files/digest-gkrelltop-2.2.3 235
-SHA256 933967a79e1de36123ff0217d0936a2cd38663b12b0c40ce5053a9aa138b81b5 files/digest-gkrelltop-2.2.3 235
 MD5 a15157021c4991bbd2843361c17cc44e files/digest-gkrelltop-2.2.4 235
 RMD160 ad0245ac3637ccf63993d59db01dd4122a9070be files/digest-gkrelltop-2.2.4 235
 SHA256 1fe807d7f77ac9ee3e414bce7a8b65fd6471c384b1d81d588eff437b45d41101 files/digest-gkrelltop-2.2.4 235
diff --git a/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2 b/x11-plugins/gkrelltop/files/digest-gkrelltop-2.2
deleted file mode 100644 (file)
index 48f681c..0000000
--- 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 (file)
index 2bc3f27..0000000
--- 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 (file)
index db87c2e..0000000
--- 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 (file)
index 7d8e273..0000000
--- 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 (file)
index 2a9ead7..0000000
--- 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 ee1c218a381bb601671668e0836089789c4d7c26..af8fcd11a6c59227b6c77089da8f4904990b29d6 100644 (file)
--- 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 518f186b72190ba515a07d78cf14f566339f6236..3ad82b9fce79cb7501cf31e51e3fdf4827e904ec 100644 (file)
--- 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 043c00f57a2e0b18ed48599b967a5c7d6c2cf7ac..466afcf09783d11fa28a366621f2cb76df08a533 100644 (file)
--- 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 (file)
index f2a42a4..0000000
--- 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
-}
Unnamed repository; edit this file 'description' to name the repository.