Fixed broken plugins. Bug #134096. Thanks to Tristan Heaven for his patch.

(Portage version: 2.1.1_pre1-r5)

4 files changed, 208 insertions, 1 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 3cc761b39ed0..3b4a2d81c5c9 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.122 2006/06/18 14:32:21 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.123 2006/07/04 09:17:37 killerfox Exp $
+
+*gkrellm-2.2.9-r1 (04 Jul 2006)
+
+  04 Jul 2006; Rene Nussbaumer <killerfox@gentoo.org>
+  +files/gkrellm-2.2.9-build.patch, +gkrellm-2.2.9-r1.ebuild:
+  Fixed broken plugins. Bug #134096. Thanks to Tristan Heaven for his patch.
 
   18 Jun 2006; <malc@gentoo.org> +files/gkrellm-mbmon-amd64.patch,
   gkrellm-2.2.9.ebuild:
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.9-r1 b/app-admin/gkrellm/files/digest-gkrellm-2.2.9-r1
new file mode 100644
index 000000000000..04921d477d84
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.9-r1
@@ -0,0 +1,3 @@
+MD5 5334155797901724f4eb46a82ad72395 gkrellm-2.2.9.tar.bz2 691133
+RMD160 e6de12774ec85c51dce18e3208340d1a080a6398 gkrellm-2.2.9.tar.bz2 691133
+SHA256 5f243958342fe0e27432c1d4b01900c5e593b49f00a8bdd29200433b17059de9 gkrellm-2.2.9.tar.bz2 691133
diff --git a/app-admin/gkrellm/files/gkrellm-2.2.9-build.patch b/app-admin/gkrellm/files/gkrellm-2.2.9-build.patch
new file mode 100644
index 000000000000..6e47d53a0c23
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.2.9-build.patch
@@ -0,0 +1,105 @@
+--- 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/gkrellm-2.2.9-r1.ebuild b/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..01797f8a1f5d
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild
@@ -0,0 +1,93 @@
+# 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.1 2006/07/04 09:17:37 killerfox 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}
+	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}.xpm
+	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
+}