Version bumped. Closes #92716Version bumped. Closes #92716

Package-Manager: portage-2.0.51.19

4 files changed, 107 insertions, 21 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 6a93a877aac9..b3c4215a4033 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.108 2005/04/27 16:45:38 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.109 2005/05/18 21:45:46 mholzer Exp $
+
+*gkrellm-2.2.6 (18 May 2005)
+
+  18 May 2005; Martin Holzer <mholzer@gentoo.org> +gkrellm-2.2.6.ebuild:
+  Version bumped. Closes #92716 
 
   27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellm-2.2.5.ebuild:
   Multilib fixes.
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index fd9b82b426d0..b6772c9e80c7 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,28 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0b2f0811b0f9278c82b06d1d47a0fc2f gkrellm-2.1.28-r1.ebuild 1749
-MD5 55c4bc6db4f85a560079579542c1dd86 gkrellm-2.2.4.ebuild 1739
+MD5 44e00c942a178aa93902775c795c1ef9 ChangeLog 14944
 MD5 0a083390da73e5e82d4f18e1528b7790 gkrellm-1.2.13.ebuild 913
+MD5 58b241c787b77b848e94e744dbfacdec gkrellm-2.1.25.ebuild 1775
+MD5 0b2f0811b0f9278c82b06d1d47a0fc2f gkrellm-2.1.28-r1.ebuild 1749
 MD5 7f59850137dd74053a1a7481a154b6d7 gkrellm-2.1.28.ebuild 1690
-MD5 077e847d19845d38b61fc33803d53a62 ChangeLog 14805
-MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 55c4bc6db4f85a560079579542c1dd86 gkrellm-2.2.4.ebuild 1739
 MD5 03933e5ec50b25d09d86b7e525237568 gkrellm-2.2.5.ebuild 1984
-MD5 58b241c787b77b848e94e744dbfacdec gkrellm-2.1.25.ebuild 1775
-MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67
-MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894
-MD5 46477c5d5356a18fe4da5e0548f03af9 files/gkrellmd 591
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 ea47c8b1e327a6638022fafc0f6d1b4d gkrellm-2.2.6.ebuild 1986
 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
 MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 67
 MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28 67
-MD5 5d126e706c3eccd634e22ccfb007eede files/slit_gtk+-2.4.0.patch 448
-MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423
+MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67
 MD5 306e201300b226a8ddd6ef90dd3ad087 files/digest-gkrellm-2.2.4 66
 MD5 7aee38c8548f2dd99532a9fd5fbf7640 files/digest-gkrellm-2.2.5 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCb8HO2G5bA0cA/ScRAtFiAKCYiHTkITjQ5qgsZkPJz0+8o9kp4QCfdjVW
-4lVJsueJzSU/nD97lbute80=
-=hdTV
------END PGP SIGNATURE-----
+MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894
+MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423
+MD5 46477c5d5356a18fe4da5e0548f03af9 files/gkrellmd 591
+MD5 5d126e706c3eccd634e22ccfb007eede files/slit_gtk+-2.4.0.patch 448
+MD5 7b97a277c3b5730f36562120235fef3b files/digest-gkrellm-2.2.6 66
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.6 b/app-admin/gkrellm/files/digest-gkrellm-2.2.6
new file mode 100644
index 000000000000..a38808ce8278
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.6
@@ -0,0 +1 @@
+MD5 eda0bd5e71e9e09d58043f47cfdab566 gkrellm-2.2.6.tar.bz2 672074
diff --git a/app-admin/gkrellm/gkrellm-2.2.6.ebuild b/app-admin/gkrellm/gkrellm-2.2.6.ebuild
new file mode 100644
index 000000000000..86f04abb4bc8
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.2.6.ebuild
@@ -0,0 +1,88 @@
+# 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.6.ebuild,v 1.1 2005/05/18 21:45:46 mholzer Exp $
+
+inherit eutils
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://members.dslextreme.com/users/billw/gkrellm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X nls ssl"
+
+DEPEND="=dev-libs/glib-1*
+	ssl? ( dev-libs/openssl )
+	X? ( >=x11-libs/gtk+-2.0.5
+		>=x11-libs/pango-1.4.0 )"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${P/a/}
+
+src_compile() {
+	local myconf
+	if ! use nls; then
+		sed -i "s:enable_nls=1:enable_nls=0:" Makefile || die
+	fi
+
+	sed -i -e 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' \
+		-e "s:\(PKGCONFIGDIR ?= \$(INSTALLROOT)/\)lib:\1$(get_libdir):" \
+		Makefile || die
+
+	sed -i -e "s:/usr/lib:/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
+		src/gkrellm.h || die
+
+	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/$(get_libdir)/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/$(get_libdir)/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 CREDITS INSTALL README Changelog
+	dohtml *.html
+}