Fix compilation with glibc-2.10 (Bug #270682)

(Portage version: 2.1.6.13/cvs/Linux i686)

7 files changed, 40 insertions, 202 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 6fee1f304c3f..6f8121ed0730 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/gkrellm
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.169 2009/02/04 19:40:04 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.170 2009/05/21 16:11:32 lack Exp $
+
+  21 May 2009; Jim Ramsay <lack@gentoo.org> -gkrellm-2.3.1.ebuild,
+  gkrellm-2.3.2.ebuild, +files/gkrellm-2.3.2-getline-fix.patch,
+  -files/gkrellm-2.3-Makefile.patch, -files/gkrellm-2.3-build.patch,
+  -files/gkrellm-2.3-gnutls.patch:
+  Fix compilation with glibc-2.10 (Bug #270682)
 
   04 Feb 2009; Raúl Porcel <armin76@gentoo.org> gkrellm-2.3.2.ebuild:
   arm/ia64/sparc stable wrt #254203
diff --git a/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch b/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch
deleted file mode 100644
index 0648d3d0bc5e..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3-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.3-build.patch b/app-admin/gkrellm/files/gkrellm-2.3-build.patch
deleted file mode 100644
index 38de713aa64b..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- server/Makefile
-+++ server/Makefile
-@@ -21,7 +21,7 @@
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+LINK_FLAGS ?= $(LDFLAGS) -Wl,-E
- EXTRAOBJS =
- 
- 
-@@ -41,7 +41,7 @@
- 
- 
- CC ?= gcc
--STRIP ?= -s
-+STRIP ?=
- 
- GKRELLMD_INCLUDES = gkrellmd.h
- 
-@@ -51,7 +51,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
---- src/Makefile
-+++ src/Makefile
-@@ -18,7 +18,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)
-@@ -62,7 +62,7 @@
- endif
- 
- CC ?= gcc
--STRIP ?= -s
-+STRIP ?=
- 
- GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h
- 
-@@ -70,7 +70,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)
diff --git a/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch b/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch
deleted file mode 100644
index 54d86000ca37..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3-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.3.2-getline-fix.patch b/app-admin/gkrellm/files/gkrellm-2.3.2-getline-fix.patch
new file mode 100644
index 000000000000..7d0cd88acc92
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.2-getline-fix.patch
@@ -0,0 +1,29 @@
+--- src/client.c.org	2008-10-04 04:33:37.000000000 +0400
++++ src/client.c	2009-05-21 12:54:22.000000000 +0400
+@@ -1620,7 +1620,7 @@
+ 
+ 
+ static gint
+-getline(gint fd, gchar *buf, gint len)
++getline_(gint fd, gchar *buf, gint len)
+ 	{
+ 	fd_set			read_fds;
+ 	struct timeval	tv;
+@@ -1714,7 +1714,7 @@
+ 
+ 	while (1)
+ 		{
+-		rs=getline(fd, buf, sizeof(buf));
++		rs=getline_(fd, buf, sizeof(buf));
+         if(rs<0)
+             return FALSE;
+ 		if (!strcmp(buf, "</gkrellmd_setup>"))
+@@ -1732,7 +1732,7 @@
+ 	table_size = sizeof(update_table) / sizeof(KeyTable);
+ 	while (1)
+ 		{
+-		rs=getline(fd, buf, sizeof(buf));
++		rs=getline_(fd, buf, sizeof(buf));
+         if(rs<0)
+             return FALSE;
+ 		if (!strcmp(buf, "</initial_update>"))
diff --git a/app-admin/gkrellm/gkrellm-2.3.1.ebuild b/app-admin/gkrellm/gkrellm-2.3.1.ebuild
deleted file mode 100644
index bacf2e65729e..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.1.ebuild
+++ /dev/null
@@ -1,109 +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.3.1.ebuild,v 1.9 2008/11/17 21:27:32 lack 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-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"
-
-RDEPEND=">=dev-libs/glib-2
-	hddtemp? ( app-admin/hddtemp )
-	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}"/${PN}-2.3-build.patch
-	epatch "${FILESDIR}"/${PN}-2.3-Makefile.patch
-	use gnutls && epatch "${FILESDIR}"/${PN}-2.3-gnutls.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 ${TARGET} \
-			CC="$(tc-getCC)" \
-			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"
-	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 \
-			MANDIR="${D}"/usr/share/man/man1 \
-			|| die "emake install failed"
-			dosym gkrellm /usr/bin/gkrellm2
-
-			dohtml *.html
-
-			newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} 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"
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
-
-	insinto /etc
-	doins server/gkrellmd.conf || die "doins failed"
-
-	dodoc Changelog CREDITS README
-}
-
-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."
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.2.ebuild b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
index eb7d16e2d27e..d7d58ddfdc82 100644
--- a/app-admin/gkrellm/gkrellm-2.3.2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.9 2009/02/04 19:40:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.10 2009/05/21 16:11:32 lack Exp $
 
 EAPI=2
 
@@ -46,6 +46,8 @@ src_prepare() {
 	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"
+
+	epatch "${FILESDIR}/gkrellm-2.3.2-getline-fix.patch"
 }
 
 src_compile() {