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

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686)

12 files changed, 68 insertions, 575 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/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>