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

Package-Manager: portage-2.1.2_rc1-r2

4 files changed, 119 insertions, 2 deletions

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() {