Removed unneccessary gkrellm-1 cases

(Portage version: 2.1.2-r10)

4 files changed, 26 insertions, 56 deletions

diff --git a/x11-plugins/gkrellflynn/ChangeLog b/x11-plugins/gkrellflynn/ChangeLog
index c69001f9caf8..fb3160082a9e 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.13 2007/02/21 23:25:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/ChangeLog,v 1.14 2007/02/22 16:06:22 lack Exp $
+
+  22 Feb 2007; Jim Ramsay <lack@gentoo.org> metadata.xml,
+  gkrellflynn-0.6.ebuild, gkrellflynn-0.7.ebuild:
+  Removed unneccessary gkrellm-1 cases
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
index ea4c151b061c..8b2a741fc786 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild
@@ -1,42 +1,25 @@
-# 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/gkrellflynn/gkrellflynn-0.6.ebuild,v 1.14 2006/05/06 21:49:11 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.6.ebuild,v 1.15 2007/02/22 16:06:22 lack Exp $
+
+inherit multilib
 
 IUSE=""
 HOMEPAGE="http://horus.comlab.uni-rostock.de/flynn/"
 SRC_URI="http://horus.comlab.uni-rostock.de/flynn/${P}.tar.gz"
-DESCRIPTION="A funny GKrellM (1 or 2) load monitor (for Doom(tm) fans)"
+DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
 KEYWORDS="alpha amd64 ppc sparc x86"
-DEPEND="app-admin/gkrellm"
+DEPEND="=app-admin/gkrellm-2*"
 SLOT="0"
 LICENSE="GPL-2"
 
 src_compile() {
-
-	if [ -f /usr/bin/gkrellm ]
-	then
-		make gkrellm
-	fi
-
-	if [ -f /usr/bin/gkrellm2 ]
-	then
-		make gkrellm2
-	fi
+	make gkrellm2
 }
 
 src_install() {
-
-	if [ -f /usr/bin/gkrellm ]
-	then
-		exeinto /usr/lib/gkrellm/plugins
-		doexe gkrellflynn.so
-	fi
-
-	if [ -f /usr/bin/gkrellm2 ]
-	then
-		exeinto /usr/lib/gkrellm2/plugins ;
-		doexe gkrellflynn.so
-	fi
+	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 4ae19fd9c9ef..99659d4b20c5 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild
@@ -1,45 +1,27 @@
-# 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/gkrellflynn/gkrellflynn-0.7.ebuild,v 1.5 2005/09/17 10:07:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellflynn/gkrellflynn-0.7.ebuild,v 1.6 2007/02/22 16:06:22 lack Exp $
 
 inherit multilib
 
 IUSE=""
 HOMEPAGE="http://horus.comlab.uni-rostock.de/flynn/"
 SRC_URI="http://horus.comlab.uni-rostock.de/flynn/${P}.tar.gz"
-DESCRIPTION="A funny GKrellM (1 or 2) load monitor (for Doom(tm) fans)"
+DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
 KEYWORDS="alpha ~amd64 ppc ~sparc ~x86"
-DEPEND="app-admin/gkrellm"
+DEPEND="=app-admin/gkrellm-2*"
 SLOT="0"
 LICENSE="GPL-2"
 
 src_compile() {
 	# Clean out precompiled plugin first
 	make clean
-
-	if [ -f /usr/bin/gkrellm ]
-	then
-		make gkrellm
-	fi
-
-	if [ -f /usr/bin/gkrellm2 ]
-	then
-		make gkrellm2
-	fi
+	make gkrellm2
 }
 
 src_install() {
-	if [ -f /usr/bin/gkrellm ]
-	then
-		exeinto /usr/$(get_libdir)/gkrellm/plugins
-		doexe gkrellflynn.so
-	fi
-
-	if [ -f /usr/bin/gkrellm2 ]
-	then
-		exeinto /usr/$(get_libdir)/gkrellm2/plugins ;
-		doexe gkrellflynn.so
-	fi
+	exeinto /usr/$(get_libdir)/gkrellm2/plugins ;
+	doexe gkrellflynn.so
 
 	dodoc INSTALL Changelog README COPYING AUTHORS
 }
diff --git a/x11-plugins/gkrellflynn/metadata.xml b/x11-plugins/gkrellflynn/metadata.xml
index ea303dc8c30d..220d60947054 100644
--- a/x11-plugins/gkrellflynn/metadata.xml
+++ b/x11-plugins/gkrellflynn/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>mholzer@gentoo.org</email>
-</maintainer>
+	<herd>desktop-dock</herd>
+	<maintainer>
+		<email>lack@gentoo.org</email>
+		<name>Jim Ramsay</name>
+	</maintainer>
 </pkgmetadata>