Version bumped.

Package-Manager: portage-2203-svn

5 files changed, 140 insertions, 16 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 75f5b769c797..eaf20d1963a2 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.120 2005/08/12 13:49:52 ka0ttic Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.121 2006/05/02 12:41:31 mholzer Exp $
+
+*gkrellm-2.2.9 (17 Apr 2006)
+
+  17 Apr 2006; Martin Holzer <mholzer@gentoo.org>
+  +files/gkrellm-2.2.9-gnutls.patch, +gkrellm-2.2.9.ebuild:
+  Version bumped. Thx to <tristanheaven@gmail.com> for submitting in #129257
 
   12 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> gkrellm-2.2.5.ebuild:
   Stable on mips.
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 42550eceeea8..f446b667b737 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,20 +1,23 @@
-MD5 9e65fffbb4e24034bc27316a609753e0 gkrellm-2.2.7.ebuild 1986
-MD5 cfa07110f8fcc9408165913fa2532baf gkrellm-2.1.28-r1.ebuild 1773
-MD5 55c4bc6db4f85a560079579542c1dd86 gkrellm-2.2.4.ebuild 1739
-MD5 ea47c8b1e327a6638022fafc0f6d1b4d gkrellm-2.2.6.ebuild 1986
-MD5 0a083390da73e5e82d4f18e1528b7790 gkrellm-1.2.13.ebuild 913
-MD5 dd793dea901f3c57cfed324f0b9c4790 ChangeLog 16072
-MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
-MD5 7fe67aecd9de8ed7a2deaf5a35c4f58f gkrellm-2.2.5.ebuild 1977
-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 df04844dd1fc7e6d46e27a18bcd30ae9 files/gkrellmd 608
+MD5 cc30a8e6e92dabbf70aa6440795388ef ChangeLog 16290
 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
 MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 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
 MD5 7b97a277c3b5730f36562120235fef3b files/digest-gkrellm-2.2.6 66
 MD5 4226fe84fc32754c660e30473ecf9f09 files/digest-gkrellm-2.2.7 66
+MD5 3a56852895e1d937446e9a80e6be74ad files/digest-gkrellm-2.2.9 66
+MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894
+MD5 1cb00c2f14fb053c5ded6831f04aa03c files/gkrellm-2.2.9-gnutls.patch 415
+MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423
+MD5 df04844dd1fc7e6d46e27a18bcd30ae9 files/gkrellmd 608
+MD5 5d126e706c3eccd634e22ccfb007eede files/slit_gtk+-2.4.0.patch 448
+MD5 0a083390da73e5e82d4f18e1528b7790 gkrellm-1.2.13.ebuild 913
+MD5 58b241c787b77b848e94e744dbfacdec gkrellm-2.1.25.ebuild 1775
+MD5 cfa07110f8fcc9408165913fa2532baf gkrellm-2.1.28-r1.ebuild 1773
+MD5 55c4bc6db4f85a560079579542c1dd86 gkrellm-2.2.4.ebuild 1739
+MD5 7fe67aecd9de8ed7a2deaf5a35c4f58f gkrellm-2.2.5.ebuild 1977
+MD5 ea47c8b1e327a6638022fafc0f6d1b4d gkrellm-2.2.6.ebuild 1986
+MD5 9e65fffbb4e24034bc27316a609753e0 gkrellm-2.2.7.ebuild 1986
+MD5 942021d6591bca2cdef22f7f6c6fe9a7 gkrellm-2.2.9.ebuild 2251
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.9 b/app-admin/gkrellm/files/digest-gkrellm-2.2.9
new file mode 100644
index 000000000000..6dc0679fd3f5
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.9
@@ -0,0 +1 @@
+MD5 5334155797901724f4eb46a82ad72395 gkrellm-2.2.9.tar.bz2 691133
diff --git a/app-admin/gkrellm/files/gkrellm-2.2.9-gnutls.patch b/app-admin/gkrellm/files/gkrellm-2.2.9-gnutls.patch
new file mode 100644
index 000000000000..54d86000ca37
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.2.9-gnutls.patch
@@ -0,0 +1,20 @@
+--- src/configure
++++ src/configure
+@@ -37,6 +37,7 @@
+ #include <gnutls/openssl.h>
+ #include <errno.h>
+ #include <pthread.h>
++#include <gcrypt.h>
+ 
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ 
+--- src/mail.c
++++ src/mail.c
+@@ -40,6 +40,7 @@
+ #if defined(HAVE_GNUTLS)
+ #include <gnutls/openssl.h>
+ #include <pthread.h>
++#include <gcrypt.h>
+ #define MD5Init		MD5_Init
+ #define MD5Update	MD5_Update
+ #define MD5Final	MD5_Final
diff --git a/app-admin/gkrellm/gkrellm-2.2.9.ebuild b/app-admin/gkrellm/gkrellm-2.2.9.ebuild
new file mode 100644
index 000000000000..8d4221d77068
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.2.9.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.9.ebuild,v 1.1 2006/05/02 12:41:31 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/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnutls nls ssl X"
+
+RDEPEND="dev-libs/glib
+	gnutls? ( net-libs/gnutls )
+	nls? ( virtual/libintl )
+	ssl? ( dev-libs/openssl )
+	X? ( >=x11-libs/gtk+-2 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gnutls.patch
+
+	sed -e 's:#user\tnobody:user\tgkrellmd:' \
+		-e 's:#group\tproc:group\tgkrellmd:' \
+		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
+
+	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+}
+
+src_compile() {
+	if use X ; then
+		emake \
+			INSTALLROOT=/usr \
+			INCLUDEDIR=/usr/include/gkrellm2 \
+			LINK_FLAGS="${LDFLAGS}" \
+			$(use nls || echo enable_nls=0) \
+			$(use gnutls || echo without_gnutls=yes) \
+			$(use ssl || echo without_ssl=yes) \
+			|| die "emake failed"
+	else
+		cd server
+		emake LINK_FLAGS="${LDFLAGS}" \
+			|| die "emake failed"
+	fi
+}
+
+src_install() {
+	if use X ; then
+		make install \
+			$(use nls || echo enable_nls=0) \
+			INSTALLDIR="${D}"/usr/bin \
+			MANDIR="${T}" \
+			INCLUDEDIR="${D}"/usr/include \
+			LOCALEDIR="${D}"/usr/share/locale \
+			PKGCONFIGDIR="${D}"/usr/$(get_libdir)/pkgconfig \
+			|| die "make install failed"
+
+		mv "${D}"/usr/bin/{${PN},gkrellm2}
+
+		dohtml *.html
+		newman ${PN}.1 gkrellm2.1
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry gkrellm2 GKrellM ${PN}.xpm
+	else
+		dobin server/gkrellmd || die "dobin failed"
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h
+	fi
+
+	doinitd "${FILESDIR}"/gkrellmd \
+		|| die "doinitd failed"
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	doman gkrellmd.1
+	dodoc Changelog CREDITS README
+}