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

(Portage version: 2.1.2_rc1-r2)

7 files changed, 229 insertions, 4 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/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() {