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

6 files changed, 0 insertions, 261 deletions

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;