Version bump by Michael Kurz, bug #153754. Fix bug #147292 and bug #150267.

Package-Manager: portage-2.1.2_rc1-r2

8 files changed, 267 insertions, 16 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 50980f8c4e89..53ee11b044c2 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.128 2006/11/01 03:16:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.129 2006/11/02 10:44:06 nyhm Exp $
+
+*gkrellm-2.2.10 (02 Nov 2006)
+
+  02 Nov 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/gkrellm-2.2.10-build.patch, +files/gkrellm-2.2.10-gnutls.patch,
+  files/gkrellmd, gkrellm-2.2.9-r1.ebuild, +gkrellm-2.2.10.ebuild:
+  Version bump by Michael Kurz, bug #153754. Fix bug #147292 and bug #150267.
 
   01 Nov 2006; Steve Dibb <beandog@gentoo.org> gkrellm-2.2.9-r1.ebuild:
   amd64 stable, wrt 140955
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index c9fb68705557..cf0235c2e2cb 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gkrellm-2.2.10-build.patch 2419 RMD160 aa913fe57e7f5841a6f56e59dfc311b331792736 SHA1 20ed4741709efdbbf92f3d27dcc463baa02044e6 SHA256 fa5818076a7faccd60d03b3b3ab48a298d19de7e765c8fda2b768324b15db6e6
+MD5 5b898f43ac157fed22e319bdc104a5d1 files/gkrellm-2.2.10-build.patch 2419
+RMD160 aa913fe57e7f5841a6f56e59dfc311b331792736 files/gkrellm-2.2.10-build.patch 2419
+SHA256 fa5818076a7faccd60d03b3b3ab48a298d19de7e765c8fda2b768324b15db6e6 files/gkrellm-2.2.10-build.patch 2419
+AUX gkrellm-2.2.10-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
+MD5 1cb00c2f14fb053c5ded6831f04aa03c files/gkrellm-2.2.10-gnutls.patch 415
+RMD160 0804d5db018c259930c6abcbe4d78c9908687268 files/gkrellm-2.2.10-gnutls.patch 415
+SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8 files/gkrellm-2.2.10-gnutls.patch 415
 AUX gkrellm-2.2.9-build.patch 2803 RMD160 8a13f1484577949f767e26b88667d7fd57903f34 SHA1 9ad0a7db14ffff6b42331a2316f09c6f3eddbcfa SHA256 77c3f36dbc705f89d5e96b737227c58212ba87fd6863e9fdd00d252111f0b5f3
 MD5 0741a3bebe8324730aaa6c37d07a4578 files/gkrellm-2.2.9-build.patch 2803
 RMD160 8a13f1484577949f767e26b88667d7fd57903f34 files/gkrellm-2.2.9-build.patch 2803
@@ -10,29 +21,34 @@ AUX gkrellm-mbmon-amd64.patch 357 RMD160 540d9628ab6354fb0b1f6445dd6ad53ec27545a
 MD5 45d902b9f40713505d1b588176b2dfb4 files/gkrellm-mbmon-amd64.patch 357
 RMD160 540d9628ab6354fb0b1f6445dd6ad53ec27545a0 files/gkrellm-mbmon-amd64.patch 357
 SHA256 6767c2f78ee8c8363777383b60fa9b7083a0d0f95b8e4c23bf909c2638664f6d files/gkrellm-mbmon-amd64.patch 357
-AUX gkrellmd 608 RMD160 37d0a5e6f7793e40b260ee80d64183009019d7a1 SHA1 4bf324634c1d48d21323e83c43c1a0f31e046eba SHA256 30fdf6078a5f6e66bdc81849a0c8bcd583d13858425a9b0be26bd14f7798b78c
-MD5 df04844dd1fc7e6d46e27a18bcd30ae9 files/gkrellmd 608
-RMD160 37d0a5e6f7793e40b260ee80d64183009019d7a1 files/gkrellmd 608
-SHA256 30fdf6078a5f6e66bdc81849a0c8bcd583d13858425a9b0be26bd14f7798b78c files/gkrellmd 608
+AUX gkrellmd 620 RMD160 8afb791f8a373c97cc7b28a5368e88025eebead2 SHA1 1a7c8d0dfe85a82395f5a24f18d46c3e99f781ec SHA256 5aaa81d4f1ac5a8560339fd7e364b85652309fd11447378aaf0f2363e2152a54
+MD5 ff5a5b0c9bbabe07337951f769af30df files/gkrellmd 620
+RMD160 8afb791f8a373c97cc7b28a5368e88025eebead2 files/gkrellmd 620
+SHA256 5aaa81d4f1ac5a8560339fd7e364b85652309fd11447378aaf0f2363e2152a54 files/gkrellmd 620
 DIST gkrellm-1.2.13.tar.bz2 438917 RMD160 a5d9b7e439788613ebab9718aa05eff0c39d0a9a SHA1 ab0282e663b69ecf0d622ad7c02db0c72b793bd3 SHA256 202b771940f5c2065b99531b1cc2838b9c58f0a4f8e8f038aa5032c1ecab3e5e
+DIST gkrellm-2.2.10.tar.bz2 718894 RMD160 6694838015716c09291887ae598daceb4f4b440f SHA1 329d0ba5600998f21b75491937c3c2924ab6ed40 SHA256 d7676d7734d4821454a840a1ef05020c9c4f4797ab96ec54f2351e26d437c88c
 DIST gkrellm-2.2.5.tar.bz2 668581 RMD160 7755fa7bbf88dfd53185e76604981b2a5c81d74d SHA1 4cbdf75828b3d8b216694c2e6978c29a4920595a SHA256 03be5a470eb13f29e53ae18515f7291ef4f1c94b1f362a168cb8ed2bde754c55
 DIST gkrellm-2.2.9.tar.bz2 691133 RMD160 e6de12774ec85c51dce18e3208340d1a080a6398 SHA1 114c09c78ae27bbb1b2f4c2edb346800831f2cef SHA256 5f243958342fe0e27432c1d4b01900c5e593b49f00a8bdd29200433b17059de9
 EBUILD gkrellm-1.2.13.ebuild 913 RMD160 cce44278bbc5387ddb0005bc7d400416c99f191f SHA1 baf7ca4e7a302603daa474d4d11c632274a79e10 SHA256 c6eb4d77130dc90c0638194967c8d7c6ecebaec724ea95682bc02b1614517a32
 MD5 0a083390da73e5e82d4f18e1528b7790 gkrellm-1.2.13.ebuild 913
 RMD160 cce44278bbc5387ddb0005bc7d400416c99f191f gkrellm-1.2.13.ebuild 913
 SHA256 c6eb4d77130dc90c0638194967c8d7c6ecebaec724ea95682bc02b1614517a32 gkrellm-1.2.13.ebuild 913
+EBUILD gkrellm-2.2.10.ebuild 2530 RMD160 856363e5a44dabe94d543dd961f151916d72ea1f SHA1 5a2e9e104eba2389c34c762d61990c490d67524b SHA256 472809833ef0bcd5d178c8fdd66d579d33f7ab428c479f1e0c4c22ca5ccae0ef
+MD5 e75dada8d73f2055cf74bee1e6cbf40f gkrellm-2.2.10.ebuild 2530
+RMD160 856363e5a44dabe94d543dd961f151916d72ea1f gkrellm-2.2.10.ebuild 2530
+SHA256 472809833ef0bcd5d178c8fdd66d579d33f7ab428c479f1e0c4c22ca5ccae0ef gkrellm-2.2.10.ebuild 2530
 EBUILD gkrellm-2.2.5.ebuild 1977 RMD160 be9c387c1d43743ad8b30fbced69a40ba0f4c477 SHA1 5c0c3c1cbab11f8c7b325b4a08c20ced2e819f6e SHA256 40e25c3fec2f722634d5184121c57c000636a13ada10fc9b7d57602165d905fe
 MD5 7fe67aecd9de8ed7a2deaf5a35c4f58f gkrellm-2.2.5.ebuild 1977
 RMD160 be9c387c1d43743ad8b30fbced69a40ba0f4c477 gkrellm-2.2.5.ebuild 1977
 SHA256 40e25c3fec2f722634d5184121c57c000636a13ada10fc9b7d57602165d905fe gkrellm-2.2.5.ebuild 1977
-EBUILD gkrellm-2.2.9-r1.ebuild 2290 RMD160 aa0bc3f088ab34396c2cbdb4459ded1d111dc6f4 SHA1 4649ae2c5ae867e28c65557aa378aba7d0947be4 SHA256 e20d070b35b68a7a805232aacd679f195fe1c805e134e6591fbc6b8b0e0ebf49
-MD5 79cd4f8eeb4ede9a8f1e9b8e8ff2da77 gkrellm-2.2.9-r1.ebuild 2290
-RMD160 aa0bc3f088ab34396c2cbdb4459ded1d111dc6f4 gkrellm-2.2.9-r1.ebuild 2290
-SHA256 e20d070b35b68a7a805232aacd679f195fe1c805e134e6591fbc6b8b0e0ebf49 gkrellm-2.2.9-r1.ebuild 2290
-MISC ChangeLog 17472 RMD160 e101ad8d631322e95022d0fe7ce040cd6dc503bf SHA1 b643789427d400dcfa75c9357cf07bf2720be46f SHA256 2fe7fcb09ee39bd08c8229f539080e8d353c8a22635188e7b52c73d41e042d8e
-MD5 1f1cb2f62ff40331f6285f7103ccb71c ChangeLog 17472
-RMD160 e101ad8d631322e95022d0fe7ce040cd6dc503bf ChangeLog 17472
-SHA256 2fe7fcb09ee39bd08c8229f539080e8d353c8a22635188e7b52c73d41e042d8e ChangeLog 17472
+EBUILD gkrellm-2.2.9-r1.ebuild 2307 RMD160 59da38c103a20e63f0aa91af17c51fd1ca3ec630 SHA1 e0df3b6378cb1e63f6251280438658ee96c3c346 SHA256 1df5f10b18b128d2c3a357f49c84b1b5b50479cec431e2904f47830747ddff10
+MD5 a13461f7880151acb66252ca53f93da8 gkrellm-2.2.9-r1.ebuild 2307
+RMD160 59da38c103a20e63f0aa91af17c51fd1ca3ec630 gkrellm-2.2.9-r1.ebuild 2307
+SHA256 1df5f10b18b128d2c3a357f49c84b1b5b50479cec431e2904f47830747ddff10 gkrellm-2.2.9-r1.ebuild 2307
+MISC ChangeLog 17767 RMD160 a48a85c24e4e522a2084180635d1b5eb489e01a9 SHA1 44762647cb4f5b41087c95a6fca019e4af520cbf SHA256 7f4706842596793ac36a7f500028443ab71d2e583bef979216fcfdcbe3b48a62
+MD5 d3558e93fa867f25480b38bac2710589 ChangeLog 17767
+RMD160 a48a85c24e4e522a2084180635d1b5eb489e01a9 ChangeLog 17767
+SHA256 7f4706842596793ac36a7f500028443ab71d2e583bef979216fcfdcbe3b48a62 ChangeLog 17767
 MISC metadata.xml 223 RMD160 13df98db6609a9a7ddffa345a64e3f08222ce1f9 SHA1 041466a94004d9e3c5aeeb568c77748745bcc35b SHA256 dbb0b5bf8c3292e19f54df0cca95ed2297622fa5abf48c6e835ee8ac2fcfdf70
 MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
 RMD160 13df98db6609a9a7ddffa345a64e3f08222ce1f9 metadata.xml 223
@@ -40,9 +56,19 @@ SHA256 dbb0b5bf8c3292e19f54df0cca95ed2297622fa5abf48c6e835ee8ac2fcfdf70 metadata
 MD5 84b7bfad2f6e1e9820cf2c003a9008ae files/digest-gkrellm-1.2.13 247
 RMD160 2d81d100430cc3b5f57754e234e8a1198ce99ba5 files/digest-gkrellm-1.2.13 247
 SHA256 4da7eaf8e8f8e0fd8260f621c4b14de45fc1fa15225544f3945756419cc26561 files/digest-gkrellm-1.2.13 247
+MD5 4c7ab540ce5a9f4f9f9f00a18ffe3168 files/digest-gkrellm-2.2.10 247
+RMD160 93c887c8d64f914127cb0950c38ebbd289a60181 files/digest-gkrellm-2.2.10 247
+SHA256 663ea15612097a9df3c42605c7ec4550b3f415483bbfa9f6e514eea8b7dbb293 files/digest-gkrellm-2.2.10 247
 MD5 fda84afc6f1fb1474817a6f9c9826873 files/digest-gkrellm-2.2.5 244
 RMD160 70ea679e771014e6d6add5a91588edc1a6f0142e files/digest-gkrellm-2.2.5 244
 SHA256 e53a807c12857de04783a817f5344d96b3315d200770e066691b66336dcb13ca files/digest-gkrellm-2.2.5 244
 MD5 ce818367f079fe7a038297c801251667 files/digest-gkrellm-2.2.9-r1 244
 RMD160 0dd16f13d550b601d9085fb84c004d94ee244ef6 files/digest-gkrellm-2.2.9-r1 244
 SHA256 3d76715749813c484cdb2f7902ad804fcb1f7d9fe78df7ef936c46742fd0fddc files/digest-gkrellm-2.2.9-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFScv8dz7hIScOURERAqGwAJ9v+I8nL2kEgu9+aMmYZMiKXznu7gCg5ejC
+cVTNvDv+4T2ydoAmgQmt93M=
+=1lzs
+-----END PGP SIGNATURE-----
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.10 b/app-admin/gkrellm/files/digest-gkrellm-2.2.10
new file mode 100644
index 000000000000..45c11b0af70a
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.10
@@ -0,0 +1,3 @@
+MD5 57ef0525c0997ac2e7720712811f5a84 gkrellm-2.2.10.tar.bz2 718894
+RMD160 6694838015716c09291887ae598daceb4f4b440f gkrellm-2.2.10.tar.bz2 718894
+SHA256 d7676d7734d4821454a840a1ef05020c9c4f4797ab96ec54f2351e26d437c88c gkrellm-2.2.10.tar.bz2 718894
diff --git a/app-admin/gkrellm/files/gkrellm-2.2.10-build.patch b/app-admin/gkrellm/files/gkrellm-2.2.10-build.patch
new file mode 100644
index 000000000000..40278af6e4e4
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.2.10-build.patch
@@ -0,0 +1,93 @@
+--- Makefile
++++ Makefile
+@@ -116,7 +116,7 @@
+ export MANDIR SMANDIR MANDIRMODE MANMODE
+ export OS_NAME OS_RELEASE
+ 
+-enable_nls=1
++enable_nls=0
+ debug=0
+ export enable_nls
+ export debug
+--- server/Makefile
++++ server/Makefile
+@@ -18,7 +18,7 @@
+ MANMODE ?= 644
+ MANDIRMODE ?= 755
+ INSTALL ?= install
+-LINK_FLAGS ?= -Wl,-E
++LINK_FLAGS = $(LDFLAGS) -Wl,-E
+ 
+ 
+ ifeq ($(without-libsensors),yes)
+@@ -37,7 +37,6 @@
+ 
+ 
+ CC ?= gcc
+-STRIP ?= -s
+ 
+ GKRELLMD_INCLUDES = gkrellmd.h
+ 
+@@ -47,7 +46,7 @@
+ GLIB12_INCLUDE = `glib-config --cflags`
+ GLIB12_LIB = `glib-config --libs glib gmodule`
+ 
+-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
++FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+ ifeq ($(glib12),1)
+ FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+ endif
+@@ -147,11 +146,9 @@
+ 
+ install:
+ 	$(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
+-	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
++	$(INSTALL) -c -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
+ 	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
+ 	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
+-	$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
+-	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
+ 
+ uninstall:
+ 	rm -f $(SINSTALLDIR)/$(PACKAGE_D)
+--- src/Makefile
++++ src/Makefile
+@@ -16,7 +16,7 @@
+ MANMODE ?= 644
+ MANDIRMODE ?= 755
+ INSTALL ?= install
+-LINK_FLAGS ?= -Wl,-E
++LINK_FLAGS = $(LDFLAGS) -Wl,-E
+ SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
+ 
+ ifeq ($(without-gnutls),1)
+@@ -60,7 +60,6 @@
+ endif
+ 
+ CC ?= gcc
+-STRIP ?= -s
+ 
+ GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h
+ 
+@@ -68,7 +67,7 @@
+ 
+ PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
+ 
+-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
++FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+ FLAGS+= $(PTHREAD_INC)
+ 
+ LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)
+@@ -156,11 +155,9 @@
+ 
+ install:
+ 	$(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR)
+-	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/$(PACKAGE)
++	$(INSTALL) -c -m $(BINMODE) gkrellm $(INSTALLDIR)/$(PACKAGE)
+ 	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
+ 	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
+-	$(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
+-	$(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1
+ 
+ uninstall:
+ 	rm -f $(INSTALLDIR)/$(PACKAGE)
diff --git a/app-admin/gkrellm/files/gkrellm-2.2.10-gnutls.patch b/app-admin/gkrellm/files/gkrellm-2.2.10-gnutls.patch
new file mode 100644
index 000000000000..54d86000ca37
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.2.10-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/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
index b9a55c016fb5..3f9075a2d805 100644
--- a/app-admin/gkrellm/files/gkrellmd
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -1,11 +1,12 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.5 2005/07/12 18:50:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.6 2006/11/02 10:44:06 nyhm Exp $
 
 depend() {
 	need net
 	after lm_sensors
+	after hddtemp
 }
 
 start() {
diff --git a/app-admin/gkrellm/gkrellm-2.2.10.ebuild b/app-admin/gkrellm/gkrellm-2.2.10.ebuild
new file mode 100644
index 000000000000..83327c1b4db2
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.2.10.ebuild
@@ -0,0 +1,100 @@
+# 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.10.ebuild,v 1.1 2006/11/02 10:44:06 nyhm Exp $
+
+inherit eutils multilib toolchain-funcs
+
+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 lm_sensors nls ssl X"
+
+RDEPEND=">=dev-libs/glib-2
+	gnutls? ( net-libs/gnutls )
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ssl? ( dev-libs/openssl )
+	X? ( >=x11-libs/gtk+-2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-build.patch
+	if use gnutls ; then
+		epatch "${FILESDIR}"/${P}-gnutls.patch
+	fi
+
+	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 \
+			CC=$(tc-getCC) \
+			INSTALLROOT=/usr \
+			INCLUDEDIR=/usr/include/gkrellm2 \
+			$(use nls && echo enable_nls=1) \
+			$(use gnutls || echo without-gnutls=yes) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+			$(use ssl || echo without-ssl=yes) \
+			|| die "emake failed"
+	else
+		cd server
+		emake \
+			CC=$(tc-getCC) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+			|| die "emake failed"
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake install \
+			$(use nls || echo enable_nls=0) \
+			INSTALLDIR="${D}"/usr/bin \
+			INCLUDEDIR="${D}"/usr/include \
+			LOCALEDIR="${D}"/usr/share/locale \
+			PKGCONFIGDIR="${D}"/usr/$(get_libdir)/pkgconfig \
+			|| die "emake 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 || die "doins failed"
+	fi
+
+	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
+
+	insinto /etc
+	doins server/gkrellmd.conf || die "doins failed"
+
+	doman gkrellmd.1
+	dodoc Changelog CREDITS README
+}
diff --git a/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild b/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild
index 1fa5bde75fd9..119ff9a3e024 100644
--- a/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.6 2006/11/01 03:16:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild,v 1.7 2006/11/02 10:44:06 nyhm Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,6 +19,7 @@ RDEPEND="dev-libs/glib
 	ssl? ( dev-libs/openssl )
 	X? ( >=x11-libs/gtk+-2 )"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {