Removed all reference to gkrellm-1

Package-Manager: portage-2.1.2-r10

4 files changed, 28 insertions, 53 deletions

diff --git a/x11-plugins/i8krellm/ChangeLog b/x11-plugins/i8krellm/ChangeLog
index 803a970ae792..ef2f20bc745f 100644
--- a/x11-plugins/i8krellm/ChangeLog
+++ b/x11-plugins/i8krellm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/i8krellm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/ChangeLog,v 1.9 2007/02/21 23:30:38 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/ChangeLog,v 1.10 2007/02/22 18:54:09 lack Exp $
+
+  22 Feb 2007; Jim Ramsay <lack@gentoo.org> metadata.xml,
+  i8krellm-2.5.ebuild:
+  Removed all reference to gkrellm-1
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
index 48dbad10d46c..2c10689ec50b 100644
--- a/x11-plugins/i8krellm/Manifest
+++ b/x11-plugins/i8krellm/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST i8krellm-2.5.tar.gz 15378 RMD160 6964e2df836af9993c7deb1f00094f17fcb26172 SHA1 447a667048251ed90a5151a318e5f8b442d13bef SHA256 c86a0a859c9ffb58a51adfee2b76859dcd730ff38d9d4cfed4613f068c6c973c
-EBUILD i8krellm-2.5.ebuild 1155 RMD160 c0b1524e42b15e790601e249e8af1c6ff4193140 SHA1 eb12e11883b7bfb177f6eaa158f22d9c42cfb447 SHA256 f7ab58906bceae278289f98b708eb7ae7075bfd4bdbcc5886174e946fc6bc10a
-MD5 4e479d690dd9981235463ad7e13f2397 i8krellm-2.5.ebuild 1155
-RMD160 c0b1524e42b15e790601e249e8af1c6ff4193140 i8krellm-2.5.ebuild 1155
-SHA256 f7ab58906bceae278289f98b708eb7ae7075bfd4bdbcc5886174e946fc6bc10a i8krellm-2.5.ebuild 1155
-MISC ChangeLog 1517 RMD160 6b367e122a4b4b9f271776b5940ddfe7a7623b40 SHA1 02eafb303213e7e809b1fb10a68a251eb8e761c1 SHA256 51d02c37faadd8fec53bfb73e3952a185d6afb41f2cd82a9871c3abc0c68b653
-MD5 dc63d7b61e79f9ab00e14f6ea0e45116 ChangeLog 1517
-RMD160 6b367e122a4b4b9f271776b5940ddfe7a7623b40 ChangeLog 1517
-SHA256 51d02c37faadd8fec53bfb73e3952a185d6afb41f2cd82a9871c3abc0c68b653 ChangeLog 1517
-MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
-MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
-RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
-SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b metadata.xml 233
+EBUILD i8krellm-2.5.ebuild 842 RMD160 f79dc6cc02695aecf66ea11837dd97c90915e6e7 SHA1 5dc854feaef251f7fee976ff8c14abab9863fbe2 SHA256 915c1c723bca187553ff086e1efb2e6cdc69be3691cd830c0d50443b37d164a6
+MD5 9c67863eae61553101bbddebcff207ce i8krellm-2.5.ebuild 842
+RMD160 f79dc6cc02695aecf66ea11837dd97c90915e6e7 i8krellm-2.5.ebuild 842
+SHA256 915c1c723bca187553ff086e1efb2e6cdc69be3691cd830c0d50443b37d164a6 i8krellm-2.5.ebuild 842
+MISC ChangeLog 1636 RMD160 c3e2f77b28fb6c7d14bf9160bf61e5448c2b6c91 SHA1 c6fd28221e1ebdf88f0e7135fe2a219498f19b34 SHA256 0de752d5b3f0f81606ba0cc02dea0e6bfd71249def92df0425419395497900f2
+MD5 4d509a4918174b3a606c32a3036308c3 ChangeLog 1636
+RMD160 c3e2f77b28fb6c7d14bf9160bf61e5448c2b6c91 ChangeLog 1636
+SHA256 0de752d5b3f0f81606ba0cc02dea0e6bfd71249def92df0425419395497900f2 ChangeLog 1636
+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 3824477ce9541cce77600aa91c33622c files/digest-i8krellm-2.5 235
 RMD160 d178750881f206b86ca847c50a2e8cfada8379a9 files/digest-i8krellm-2.5 235
 SHA256 a36a42a7efe23ecbc10a4ba46afc7cb02e6af3edcc75309ad1d81f515801212c files/digest-i8krellm-2.5 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3NWyz974XjDVpbkRAhezAKC1aUk1N6E5E7bo49SI0/1qZNrbwQCeNc0K
-htbQj2KAJ7nern8Ru1y6vPc=
-=6qs8
------END PGP SIGNATURE-----
diff --git a/x11-plugins/i8krellm/i8krellm-2.5.ebuild b/x11-plugins/i8krellm/i8krellm-2.5.ebuild
index 245b822375f0..a25e0ea99047 100644
--- a/x11-plugins/i8krellm/i8krellm-2.5.ebuild
+++ b/x11-plugins/i8krellm/i8krellm-2.5.ebuild
@@ -1,6 +1,6 @@
-# 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/i8krellm/i8krellm-2.5.ebuild,v 1.7 2006/06/06 11:14:58 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/i8krellm/i8krellm-2.5.ebuild,v 1.8 2007/02/22 18:54:09 lack Exp $
 
 DESCRIPTION="GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks"
 SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
@@ -10,40 +10,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa"
 
-DEPEND="app-admin/gkrellm
-	x11-libs/gtk+
+DEPEND="=app-admin/gkrellm-2*
 	>=app-laptop/i8kutils-1.5"
 
 src_compile() {
-
-	if [ -f /usr/bin/gkrellm ]
-	then
-		emake i8krellm1 || die
-	fi
-
-	if [ -f /usr/bin/gkrellm2 ]
-	then
-		emake || die
-	fi
+	emake || die
 }
 
 src_install () {
+	insinto /usr/lib/gkrellm2/plugins
+	doins i8krellm.so
 
-	if [ -f /usr/bin/gkrellm ]
-	then
-		insinto /usr/lib/gkrellm/plugins
-		doins i8krellm1.so
-	fi
-
-	if [ -f /usr/bin/gkrellm2 ]
-	then
-		insinto /usr/lib/gkrellm2/plugins
-		doins i8krellm.so
-	fi
 	dodoc README Changelog AUTHORS
 
 	einfo "PLEASE NOTE that the module is renamed:"
 	einfo "       gkrellm2: i8krellm (it was i8krellm2 in the past)"
-	einfo "       grellm:   i8krellm1 (the former i8krellm)"
 	einfo "Make sure to switch your plugin to the new one."
 }
diff --git a/x11-plugins/i8krellm/metadata.xml b/x11-plugins/i8krellm/metadata.xml
index 73420b6cf0f0..220d60947054 100644
--- a/x11-plugins/i8krellm/metadata.xml
+++ b/x11-plugins/i8krellm/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<herd>desktop-dock</herd>
+	<maintainer>
+		<email>lack@gentoo.org</email>
+		<name>Jim Ramsay</name>
+	</maintainer>
 </pkgmetadata>