Version bumped. Closes 86622

Package-Manager: portage-2.0.51.19

8 files changed, 21 insertions, 110 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 14a2c22a0872..849dfc40eac0 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.102 2005/03/25 16:36:59 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.103 2005/03/28 10:22:48 mholzer Exp $
+
+*gkrellm-2.2.5 (28 Mar 2005)
+
+  28 Mar 2005; Martin Holzer <mholzer@gentoo.org> +gkrellm-2.2.5.ebuild:
+  Version bumped. Closes 86622
 
   25 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> gkrellm-2.2.4.ebuild:
   Marked stable on amd64.
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 9e2d6c8cea4e..02c98ceda39b 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,30 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f76f5cd4149de91625ab111f5d043511 ChangeLog 14217
+MD5 039fc0ff1f6e16d3a09721947f0bb821 ChangeLog 14350
 MD5 0a083390da73e5e82d4f18e1528b7790 gkrellm-1.2.13.ebuild 913
-MD5 0da8c66e1a94887ed2a2cd44a38e71db gkrellm-2.2.1.ebuild 1739
-MD5 f5ab63ae53fe6755cd0ca3e67af1a885 gkrellm-2.2.2.ebuild 1739
+MD5 929a134bf510889dd55977f23603bbe9 gkrellm-2.2.5.ebuild 1759
 MD5 58b241c787b77b848e94e744dbfacdec gkrellm-2.1.25.ebuild 1775
-MD5 4e67a23b70228896cc92a1d2b6880270 gkrellm-2.2.4.ebuild 1741
+MD5 c21e701a5cd188285b164963b79df12b gkrellm-2.2.4.ebuild 1738
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
 MD5 0b2f0811b0f9278c82b06d1d47a0fc2f gkrellm-2.1.28-r1.ebuild 1749
 MD5 7f59850137dd74053a1a7481a154b6d7 gkrellm-2.1.28.ebuild 1690
-MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
-MD5 8d4dc6be2fff39714894285e0791852b files/digest-gkrellm-2.2.1 66
-MD5 0d604c1e27146a460da1f3530d0cfded files/digest-gkrellm-2.2.2 66
-MD5 306e201300b226a8ddd6ef90dd3ad087 files/digest-gkrellm-2.2.4 66
 MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 67
-MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28 67
-MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67
-MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894
+MD5 306e201300b226a8ddd6ef90dd3ad087 files/digest-gkrellm-2.2.4 66
 MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423
 MD5 46477c5d5356a18fe4da5e0548f03af9 files/gkrellmd 591
 MD5 5d126e706c3eccd634e22ccfb007eede files/slit_gtk+-2.4.0.patch 448
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCRD6S5mJXAu5GbtIRAs+wAJ9DacDh4PjtZlge9wJlZnKz6YGedgCfX6FC
-OcwY/PxC3EA4QnoE1ehFqHc=
-=lnpK
------END PGP SIGNATURE-----
+MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894
+MD5 7aee38c8548f2dd99532a9fd5fbf7640 files/digest-gkrellm-2.2.5 66
+MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28 67
+MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.1 b/app-admin/gkrellm/files/digest-gkrellm-2.2.1
deleted file mode 100644
index e2f90c52bbb8..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56b96f14881c30753f3eb1251ef71068 gkrellm-2.2.1.tar.bz2 663952
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.2 b/app-admin/gkrellm/files/digest-gkrellm-2.2.2
deleted file mode 100644
index c631e7c034ea..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a99b8d84036b199b5b318e26d97969f8 gkrellm-2.2.2.tar.bz2 665011
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.5 b/app-admin/gkrellm/files/digest-gkrellm-2.2.5
new file mode 100644
index 000000000000..0db808e262e6
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.5
@@ -0,0 +1 @@
+MD5 24e611ba74d0bfb6aad4e4c6153c859f gkrellm-2.2.5.tar.bz2 668581
diff --git a/app-admin/gkrellm/gkrellm-2.2.2.ebuild b/app-admin/gkrellm/gkrellm-2.2.2.ebuild
deleted file mode 100644
index 5e098d29fb90..000000000000
--- a/app-admin/gkrellm/gkrellm-2.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.2.ebuild,v 1.2 2005/01/01 11:01:50 eradicator Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P/a/}
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~ppc64"
-IUSE="X nls ssl"
-
-DEPEND=">=sys-apps/sed-4
-	ssl? ( dev-libs/openssl )
-	X? (  >=x11-libs/gtk+-2.0.5
-		>=x11-libs/pango-1.4.0 )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	if ! use nls; then
-		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
-	fi
-
-	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
-
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
-		PREFIX=/usr emake ${myconf} || die
-	else
-		cd ${S}/server
-		emake glib12=1 || die
-	fi
-}
-
-src_install() {
-	dodir /usr/{bin,include,share/man}
-
-	if use X
-	then
-		keepdir /usr/share/gkrellm2/themes
-		keepdir /usr/lib/gkrellm2/plugins
-
-		make DESTDIR=${D} install \
-			INSTALLDIR=${D}/usr/bin \
-			MANDIR=${D}/usr/share/man/man1 \
-			INCLUDEDIR=${D}/usr/include \
-			LOCALEDIR=${D}/usr/share/locale \
-			PKGCONFIGDIR=${D}/usr/lib/pkgconfig
-
-		cd ${S}
-		mv gkrellm.1 gkrellm2.1
-
-		mv src/gkrellm src/gkrellm2
-		dobin src/gkrellm2
-		rm -f ${D}/usr/bin/gkrellm
-	else
-		cd ${S}/server
-		dobin gkrellmd
-		cd ${S}
-		rm gkrellm.1
-	fi
-
-	rm -f ${D}/usr/share/man/man1/*
-	doman *.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/gkrellmd
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	dodoc COPYRIGHT CREDITS INSTALL README Changelog
-	dohtml *.html
-}
diff --git a/app-admin/gkrellm/gkrellm-2.2.4.ebuild b/app-admin/gkrellm/gkrellm-2.2.4.ebuild
index 9cc12a1cb667..60d32af2ebdb 100644
--- a/app-admin/gkrellm/gkrellm-2.2.4.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.4.ebuild,v 1.6 2005/03/25 16:36:59 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.4.ebuild,v 1.7 2005/03/28 10:22:48 mholzer Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ppc ~alpha ~sparc ~hppa amd64 ~ia64 ppc64 ~mips"
+KEYWORDS="x86 ppc ~alpha ~sparc ~hppa amd64 ~ia64 ppc64 ~mips"
 IUSE="X nls ssl"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/app-admin/gkrellm/gkrellm-2.2.1.ebuild b/app-admin/gkrellm/gkrellm-2.2.5.ebuild
index 0dc397ce956c..90f7eb2825cf 100644
--- a/app-admin/gkrellm/gkrellm-2.2.1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.2.5.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.1.ebuild,v 1.4 2005/01/01 11:01:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.5.ebuild,v 1.1 2005/03/28 10:22:48 mholzer Exp $
 
 inherit eutils
 
 S=${WORKDIR}/${P/a/}
 DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
+SRC_URI="http://members.dslextreme.com/users/billw/gkrellm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~ppc64 ~mips"
 IUSE="X nls ssl"
 
 DEPEND=">=sys-apps/sed-4