Version cleanup, and version bump. Should address bug 224571 and bug 240052

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686

13 files changed, 72 insertions, 591 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index d929f60f2438..04562acc9e3d 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.160 2008/09/27 16:29:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.161 2008/11/05 18:18:10 lack Exp $
+
+*gkrellm-2.3.2 (05 Nov 2008)
+
+  05 Nov 2008; Jim Ramsay <lack@gentoo.org>
+  -files/gkrellm-2.2.9-build.patch, -files/gkrellm-2.2.9-gnutls.patch,
+  -files/gkrellm-2.2.10-Makefile.patch, -files/gkrellm-mbmon-amd64.patch,
+  -files/gkrellm-2.2.10-build.patch, -files/gkrellm-2.2.10-gnutls.patch,
+  metadata.xml, -gkrellm-2.2.5.ebuild, -gkrellm-2.2.9-r1.ebuild,
+  -gkrellm-2.2.10.ebuild, -gkrellm-2.3.0.ebuild, +gkrellm-2.3.2.ebuild:
+  Version cleanup, and version bump. Should address bug 224571 and bug
+  240052.
 
   27 Sep 2008; Raúl Porcel <armin76@gentoo.org> gkrellm-2.3.1.ebuild:
   arm stable wrt #231166
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 9347052305b5..6223996b449d 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,23 +1,11 @@
-AUX gkrellm-2.2.10-Makefile.patch 424 RMD160 dc1ebf789dcc3942c1e39d6167d532d2e2506cb3 SHA1 6b42bfa24540433f5cc16d3e1b36d9be33c7b056 SHA256 4c87410cb2ef50b3b490a97fef525d4138446e02d8c60d0f4f7a13b58a575085
-AUX gkrellm-2.2.10-build.patch 2419 RMD160 aa913fe57e7f5841a6f56e59dfc311b331792736 SHA1 20ed4741709efdbbf92f3d27dcc463baa02044e6 SHA256 fa5818076a7faccd60d03b3b3ab48a298d19de7e765c8fda2b768324b15db6e6
-AUX gkrellm-2.2.10-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
-AUX gkrellm-2.2.9-build.patch 2803 RMD160 8a13f1484577949f767e26b88667d7fd57903f34 SHA1 9ad0a7db14ffff6b42331a2316f09c6f3eddbcfa SHA256 77c3f36dbc705f89d5e96b737227c58212ba87fd6863e9fdd00d252111f0b5f3
-AUX gkrellm-2.2.9-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
 AUX gkrellm-2.3-Makefile.patch 424 RMD160 dc1ebf789dcc3942c1e39d6167d532d2e2506cb3 SHA1 6b42bfa24540433f5cc16d3e1b36d9be33c7b056 SHA256 4c87410cb2ef50b3b490a97fef525d4138446e02d8c60d0f4f7a13b58a575085
 AUX gkrellm-2.3-build.patch 1191 RMD160 05550436111e308152889b7c21d66215a40e0bf1 SHA1 1052f00ea6ea44960445edeb8861d1cf6bfa96ac SHA256 e69131b0cc82def1c055baf0d6c075f6894dd7eb91cec62a85ab112acca4d74a
 AUX gkrellm-2.3-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
-AUX gkrellm-mbmon-amd64.patch 357 RMD160 540d9628ab6354fb0b1f6445dd6ad53ec27545a0 SHA1 b2da04a505da8e88ff49d474372ef9c4e1d6418e SHA256 6767c2f78ee8c8363777383b60fa9b7083a0d0f95b8e4c23bf909c2638664f6d
 AUX gkrellmd 636 RMD160 7b2f43f8dc826f3da487d779c47220df9019a530 SHA1 38dfc92a6f7f6eada6d7bf52e70e7b6b70eac3a8 SHA256 f830ab66d71490572f206ce36beefcef29f937a6a2808e2618f672d0a2c65305
 AUX gkrellmd.conf 166 RMD160 dfd23d203baab2ff89dbe157b5615aeecc7e188b SHA1 baeccfb3f398d7dfc28fcf1582c9855d9067937a SHA256 14d1b3f11b30fd83976825d1af2c2923fd552b2073a2c0c1c228b2ca2348fcbe
-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
-DIST gkrellm-2.3.0.tar.bz2 742468 RMD160 6db53085008fca36bafa1085f1362e79c65b3203 SHA1 b955aa38304d97bfedaa2167220f1d62407345d9 SHA256 eae0a6862fe6131c67c2f8bca451b0410e69229a5a16463dd1f2266b3ff13dcb
 DIST gkrellm-2.3.1.tar.bz2 744132 RMD160 40f4aa5349be42d01a1f8ff7b4f2e83986be0e62 SHA1 f5e8206aeee93f5b3a6afff9cc55c58e9d511f56 SHA256 1a2a7e3ee9d1f2d7305da0d33d9be71ffe5d1903ed6a9c69cf77ffe10fc95b4d
-EBUILD gkrellm-2.2.10.ebuild 2676 RMD160 ae83a9e0807c346325390a542af5b0709dfce1bf SHA1 4b3a08efa1dd59c724baffb77e57631ab8edd17a SHA256 6199f24119433d4efd4be87782ab9e682f16476a5ce868b383525b021b819845
-EBUILD gkrellm-2.2.5.ebuild 1983 RMD160 6c05da12b50c6df26cd23af77f328de6aaa994ec SHA1 d120f12bad9464687809e8c2b5c70ef3ef1d33cf SHA256 d73fc2a62f5d872e130ae932798ee94b8ea111863faa0a222d7d1402251d969e
-EBUILD gkrellm-2.2.9-r1.ebuild 2302 RMD160 6f4d6a5a3cb52354386756eccab95e91ad942523 SHA1 b596d0ff595187d45d1e1cb846b20b0eb574a9fe SHA256 4cc97f9bc07cdf52c9dc3b12cfeca6dba722dccc279f1f605987a0f87b193dec
-EBUILD gkrellm-2.3.0.ebuild 2981 RMD160 67b1f33e1cf16bc3125bde456a6917c5ad43eb1f SHA1 9e2ade5e5fedf8c651c3beace32e1149671d555f SHA256 e8b24d60a4bda607d4dbcedd738eaaaef8dfb0d60bbb753ccbd12831239ba1c1
+DIST gkrellm-2.3.2.tar.bz2 747697 RMD160 0aacc0d0783cff5bb2fd8c6736553a3ce8874ad9 SHA1 fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0 SHA256 a102e681cbcc45f8cb225ca0a321b62772106d6f0bb372eaa026b5a2da840873
 EBUILD gkrellm-2.3.1.ebuild 3049 RMD160 28674db777af681c15b1fa5eb91bfe7d57e112fb SHA1 4354a576273eb3f0ccb43d48069e4efcaddcdc50 SHA256 e077b5fc09027271ecb35a11067bc195f4e97e0f1c936869c9a37cb6dc578d3e
-MISC ChangeLog 21805 RMD160 8a01df2d44f2102d9bc32d6ddb175e135dd0e554 SHA1 48742dfa494788896aed5b96e3ecf60e1ea98cf1 SHA256 5cc32c618158624b32329aea0d16a43d36eee4bb2295e86801e7db95a7c9acd9
-MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
+EBUILD gkrellm-2.3.2.ebuild 3112 RMD160 4c476b9fb6889842abda742b4a737e621b351d2e SHA1 973d7ce00717d2bff80852e07ee169ab336c7f82 SHA256 763c1e44dd1b91801fc7f4b27c142a705d3a8567c00dfbc1df28c547d47809e0
+MISC ChangeLog 22313 RMD160 64c0b189345f1de2b90952211cf01bde98eb44b6 SHA1 ceaa877323a8a3ab56e6a8cf29ef00fdfc3bc37d SHA256 3cd275835898673f5bdf2c40e4f9ce5d66c15d8ff5063f81c428306bd635a634
+MISC metadata.xml 940 RMD160 e85c2b39ba9e3d4fcdf2b314e9357b17e9b2aad2 SHA1 989f5eaebb57c3d432c9b1a9ae8cdee0f0729f5a SHA256 000169e157ad6f8af0d7506f288212f54640b849a4229467bccad41e924c6324
diff --git a/app-admin/gkrellm/files/gkrellm-2.2.10-Makefile.patch b/app-admin/gkrellm/files/gkrellm-2.2.10-Makefile.patch
deleted file mode 100644
index 0648d3d0bc5e..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.2.10-Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru gkrellm-2.2.10/src/Makefile gkrellm-2.2.10_patched/src/Makefile
---- gkrellm-2.2.10/src/Makefile	2007-02-15 17:50:03 +0100
-+++ gkrellm-2.2.10_patched/src/Makefile	2007-02-15 17:50:49 +0100
-@@ -95,7 +95,7 @@
- endif
- 
- 
--override CC += -Wall $(FLAGS)
-+CFLAGS += -Wall $(FLAGS)
- 
- OBJS =	main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \
- 	hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \
diff --git a/app-admin/gkrellm/files/gkrellm-2.2.10-build.patch b/app-admin/gkrellm/files/gkrellm-2.2.10-build.patch
deleted file mode 100644
index 40278af6e4e4..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.2.10-build.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- 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
deleted file mode 100644
index 54d86000ca37..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.2.10-gnutls.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/gkrellm-2.2.9-build.patch b/app-admin/gkrellm/files/gkrellm-2.2.9-build.patch
deleted file mode 100644
index 6e47d53a0c23..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.2.9-build.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- server/Makefile
-+++ server/Makefile
-@@ -18,9 +18,8 @@
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+LDFLAGS += -Wl,-E
- CC ?= gcc
--STRIP ?= -s
- 
- GKRELLMD_INCLUDES = gkrellmd.h
- 
-@@ -30,7 +29,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
-@@ -88,11 +87,11 @@
- all:	gkrellmd
- 
- gkrellmd: $(OBJS)
--	$(CC) $(OBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)
-+	$(CC) $(OBJS) -o gkrellmd $(LIBS) $(LDFLAGS)
- 
- static: $(OBJS)
- 	$(CC) $(OBJS) -o gkrellmd.static -static \
--		$(LIBS) $(LINK_FLAGS)
-+		$(LIBS) $(LDFLAGS)
- 
- freebsd2:
- 	$(MAKE) GTK_CONFIG=gtk12-config \
-@@ -129,11 +128,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
-+LDFLAGS += -Wl,-E
- SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
- 
- ifeq ($(without-gnutls),1)
-@@ -48,7 +48,6 @@
- endif
- 
- CC ?= gcc
--STRIP ?= -s
- 
- GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h
- 
-@@ -56,7 +55,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)
-@@ -95,11 +94,11 @@
- all:	gkrellm
- 
- gkrellm: $(OBJS) $(EXTRAOBJS)
--	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LINK_FLAGS)
-+	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LDFLAGS)
- 
- static: $(OBJS) $(EXTRAOBJS)
- 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm.static -static \
--		$(LIBS) $(LINK_FLAGS)
-+		$(LIBS) $(LDFLAGS)
- 
- freebsd2:
- ifeq ($(HAVE_SSL),1)
-@@ -144,11 +143,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.9-gnutls.patch b/app-admin/gkrellm/files/gkrellm-2.2.9-gnutls.patch
deleted file mode 100644
index 54d86000ca37..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.2.9-gnutls.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/gkrellm-mbmon-amd64.patch b/app-admin/gkrellm/files/gkrellm-mbmon-amd64.patch
deleted file mode 100644
index 4e5560ca504c..000000000000
--- a/app-admin/gkrellm/files/gkrellm-mbmon-amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sysdeps/sensors-common.orig	2006-06-18 14:57:44.000000000 +0100
-+++ src/sysdeps/sensors-common.c	2006-06-18 14:57:58.000000000 +0100
-@@ -195,7 +195,7 @@
- gboolean
- gkrellm_sys_sensors_mbmon_check(gboolean force)
- 	{
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__x86_64__)
- 	GList			*list;
- 	MbmonSensor		*mb;
- 	gboolean		result = TRUE;
diff --git a/app-admin/gkrellm/gkrellm-2.2.10.ebuild b/app-admin/gkrellm/gkrellm-2.2.10.ebuild
deleted file mode 100644
index 03e870120423..000000000000
--- a/app-admin/gkrellm/gkrellm-2.2.10.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2008 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.11 2008/02/29 17:40:13 carlo 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 ~x86-fbsd"
-IUSE="gnutls lm_sensors nls ssl X kernel_FreeBSD"
-
-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
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-Makefile.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 ${TARGET} \
-			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 ${TARGET} \
-			CC=$(tc-getCC) \
-			$(use lm_sensors || echo without-libsensors=yes) \
-			|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake install${TARGET:+_}${TARGET} \
-			$(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}
-	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.5.ebuild b/app-admin/gkrellm/gkrellm-2.2.5.ebuild
deleted file mode 100644
index 0e9638d01c17..000000000000
--- a/app-admin/gkrellm/gkrellm-2.2.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.5.ebuild,v 1.14 2008/03/30 23:42:46 ricmm 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
-
-	doinitd "${FILESDIR}"/gkrellmd
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	dodoc CREDITS INSTALL README Changelog
-	dohtml *.html
-}
diff --git a/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild b/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild
deleted file mode 100644
index 4f722d884f0e..000000000000
--- a/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2008 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.12 2008/03/30 23:42:46 ricmm Exp $
-
-inherit eutils 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 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}
-	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
-	epatch "${FILESDIR}"/${P}-gnutls.patch
-	epatch "${FILESDIR}"/gkrellm-mbmon-amd64.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 \
-			CC=$(tc-getCC) \
-			INSTALLROOT=/usr \
-			INCLUDEDIR=/usr/include/gkrellm2 \
-			$(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 || die "emake failed"
-	fi
-}
-
-src_install() {
-	if use X ; then
-		make 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 "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}
-	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
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.0.ebuild b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
index 0a705004464f..eb05ac017dc7 100644
--- a/app-admin/gkrellm/gkrellm-2.3.0.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.0.ebuild,v 1.10 2008/02/29 17:40:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.1 2008/11/05 18:18:10 lack Exp $
+
+EAPI=2
 
 inherit eutils multilib toolchain-funcs
 
@@ -10,15 +12,16 @@ SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="hddtemp gnutls lm_sensors nls ssl X kernel_FreeBSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
 
 RDEPEND=">=dev-libs/glib-2
 	hddtemp? ( app-admin/hddtemp )
 	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
 	lm_sensors? ( sys-apps/lm_sensors )
 	nls? ( virtual/libintl )
-	ssl? ( dev-libs/openssl )
+	ntlm? ( net-libs/libntlm )
 	X? ( >=x11-libs/gtk+-2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -31,13 +34,10 @@ pkg_setup() {
 	use kernel_FreeBSD && TARGET="freebsd"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.3-build.patch
-	epatch "${FILESDIR}"/${PN}-2.3-Makefile.patch
-	use gnutls && epatch "${FILESDIR}"/${PN}-2.3-gnutls.patch
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-i */Makefile || die "sed Makefile(s) failed"
 
 	sed -e 's:#user\tnobody:user\tgkrellmd:' \
 		-e 's:#group\tproc:group\tgkrellmd:' \
@@ -50,22 +50,34 @@ src_unpack() {
 
 src_compile() {
 	if use X ; then
+		local sslopt=""
+		if use gnutls; then
+			sslopt="without-ssl=yes"
+		elif use ssl; then
+			sslopt="without-gnutls=yes"
+		else
+			sslopt="without-ssl=yes without-gnutls=yes"
+		fi
+
 		emake ${TARGET} \
 			CC="$(tc-getCC)" \
-			INSTALLROOT=/usr \
-			INCLUDEDIR=/usr/include/gkrellm2 \
-			LOCALEDIR=/usr/share/locale \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			INSTALLROOT="/usr" \
+			INCLUDEDIR="/usr/include/gkrellm2" \
+			LOCALEDIR="/usr/share/locale" \
 			$(use nls || echo enable_nls=0) \
-			$(use gnutls || echo without-gnutls=yes) \
 			$(use lm_sensors || echo without-libsensors=yes) \
-			$(use ssl || echo without-ssl=yes) \
-			|| die "emake failed"
+			${sslopt} \
+		|| die "emake failed"
 	else
 		cd server
 		emake ${TARGET} \
 			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
 			$(use lm_sensors || echo without-libsensors=yes) \
-			|| die "emake failed"
+		|| die "emake failed"
 	fi
 }
 
@@ -73,13 +85,13 @@ src_install() {
 	if use X ; then
 		emake install${TARGET:+_}${TARGET} \
 			$(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 \
-			MANDIR="${D}"/usr/share/man/man1 \
-			|| die "emake install failed"
-		dosym gkrellm /usr/bin/gkrellm2
+			STRIP="" \
+			INSTALLDIR="${D}/usr/bin" \
+			INCLUDEDIR="${D}/usr/include" \
+			LOCALEDIR="${D}/usr/share/locale" \
+			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${D}/usr/share/man/man1" \
+		|| die "emake install failed"
 
 		dohtml *.html
 
@@ -93,6 +105,7 @@ src_install() {
 	fi
 
 	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
+	doconfd "${FILESDIR}"/gkrellmd.conf || die "doconfd failed"
 
 	insinto /etc
 	doins server/gkrellmd.conf || die "doins failed"
@@ -101,8 +114,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "The old executable name 'gkrellm2' is deprecated."
-	ewarn "We have provided a compatible symlink for your convenience,"
-	ewarn "but this is only temporary.  You should run this as just 'gkrellm'"
-	ewarn "instead."
+	if use X ; then
+		ewarn "The old executable name 'gkrellm2' has been removed."
+		ewarn "Run 'gkrellm' instead."
+	fi
 }
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 220d60947054..e48507d7b2ea 100644
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -6,4 +6,18 @@
 		<email>lack@gentoo.org</email>
 		<name>Jim Ramsay</name>
 	</maintainer>
+	<use>
+		<flag name="hddtemp">Enable monitoring harddrive temperatures via
+			<pkg>app-admin/hddtemp</pkg></flag>
+		<flag name="gnutls">Enable SSL support for mail checking with
+			<pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
+		<flag name="ssl">Enable SSL support for mail checking with
+			<pkg>dev-libs/openssl</pkg></flag>
+		<flag name="lm_sensors">Enable monitoring sensors via
+			<pkg>sys-apps/lm_sensors</pkg></flag>
+		<flag name="X">Build both the X11 gui (gkrellm) and the server
+			(gkrellmd).  Disabling this flag builds the server only.</flag>
+		<flag name="ntlm">Enable NTLM authentication for mail checking with
+			<pkg>net-libs/libntlm</pkg></flag>
+	</use>
 </pkgmetadata>