Fix building with GLIBC 2.10+ wrt #277567, thanks to Arttu Valo for patch.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

4 files changed, 39 insertions, 52 deletions

diff --git a/kde-misc/kload/ChangeLog b/kde-misc/kload/ChangeLog
index f3bee3c12cf8..39df32ea7572 100644
--- a/kde-misc/kload/ChangeLog
+++ b/kde-misc/kload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kload
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/ChangeLog,v 1.6 2008/06/30 18:07:09 sbriesen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/ChangeLog,v 1.7 2009/08/08 22:16:28 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> kload-0.9.4-r1.ebuild,
+  +files/kload-0.9.4-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277567, thanks to Arttu Valo for patch.
 
 *kload-0.9.4-r1 (29 Jun 2008)
 
diff --git a/kde-misc/kload/files/kload-0.9.4-glibc-2.10.patch b/kde-misc/kload/files/kload-0.9.4-glibc-2.10.patch
new file mode 100644
index 000000000000..dc0db87939b6
--- /dev/null
+++ b/kde-misc/kload/files/kload-0.9.4-glibc-2.10.patch
@@ -0,0 +1,24 @@
+diff -ur kload-0.9.4.old/kload.cpp kload-0.9.4/kload.cpp
+--- kload-0.9.4.old/kload.cpp	2009-08-06 03:15:59.000000000 +0300
++++ kload-0.9.4/kload.cpp	2009-08-06 03:17:06.000000000 +0300
+@@ -87,7 +87,7 @@
+     for (;it != sv.end();++it)
+     {
+         const char *line = it->c_str();
+-        char *colon = strchr(line,':');
++        const char *colon = strchr(line,':');
+         if (NULL != colon)  // we believe that this is a "real line"
+         {
+             // determine actual device name
+diff -ur kload-0.9.4.old/netpanel.cpp kload-0.9.4/netpanel.cpp
+--- kload-0.9.4.old/netpanel.cpp	2009-08-06 03:15:59.000000000 +0300
++++ kload-0.9.4/netpanel.cpp	2009-08-06 03:16:42.000000000 +0300
+@@ -114,7 +114,7 @@
+     {
+         const char *line = it->c_str();
+         
+-        char *colon = strchr(line,':');
++        const char *colon = strchr(line,':');
+         if (NULL != colon)  // we believe that this is a "real line"
+         {
+             // determine actual device name
diff --git a/kde-misc/kload/kload-0.9.4-r1.ebuild b/kde-misc/kload/kload-0.9.4-r1.ebuild
index 0446ee7d3d48..dc5bd898cab5 100644
--- a/kde-misc/kload/kload-0.9.4-r1.ebuild
+++ b/kde-misc/kload/kload-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/kload-0.9.4-r1.ebuild,v 1.1 2008/06/30 18:07:09 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/kload-0.9.4-r1.ebuild,v 1.2 2009/08/08 22:16:28 ssuominen Exp $
 
 inherit eutils
 
@@ -11,21 +11,21 @@ SRC_URI="http://www.richard-schneider.de/uwe/kde/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="minimal"
+IUSE="kde"
 
-DEPEND="!minimal? ( >=kde-base/kdelibs-3 )"
-
-RDEPEND="${DEPEND}"
+RDEPEND="kde? ( =kde-base/kdelibs-3* )"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.diff"
+	epatch "${FILESDIR}"/${P}-gcc43.diff
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_compile() {
 	local TARGET="\$(SERVER)"
-	use minimal || TARGET="${TARGET} \$(CLIENT)"
+	use kde && TARGET="${TARGET} \$(CLIENT)"
 
 	emake \
 		QTDIR="${QTDIR}" \
@@ -39,7 +39,7 @@ src_install() {
 	dosbin kloadd
 	newinitd "${FILESDIR}/kloadd.initd" kloadd
 	newconfd "${FILESDIR}/kloadd.confd" kloadd
-	if ! use minimal; then
+	if use kde; then
 		dobin kload
 		make_desktop_entry kload "Performace Monitor" ksysguard
 	fi
diff --git a/kde-misc/kload/kload-0.9.4.ebuild b/kde-misc/kload/kload-0.9.4.ebuild
deleted file mode 100644
index b36226394eb4..000000000000
--- a/kde-misc/kload/kload-0.9.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/kload-0.9.4.ebuild,v 1.4 2008/02/29 19:52:33 carlo Exp $
-
-inherit eutils
-
-DESCRIPTION="A performance monitoring program for KDE/Linux"
-HOMEPAGE="http://www.richard-schneider.de/uwe/kde/"
-SRC_URI="http://www.richard-schneider.de/uwe/kde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="minimal"
-
-DEPEND="!minimal? ( >=kde-base/kdelibs-3 )"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local TARGET="\$(SERVER)"
-	use minimal || TARGET="${TARGET} \$(CLIENT)"
-
-	emake \
-		QTDIR="${QTDIR}" \
-		TARGET="${TARGET}" \
-		KDEDIR="$(kde-config --prefix)" \
-		CXXFLAGS="${CXXFLAGS} \$(KDEDEF) \$(QTDEF)" \
-		CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dosbin kloadd
-	newinitd "${FILESDIR}/kloadd.initd" kloadd
-	newconfd "${FILESDIR}/kloadd.confd" kloadd
-	if ! use minimal; then
-		dobin kload
-		make_desktop_entry kload "Performace Monitor" ksysguard
-	fi
-	dodoc ChangeLog README
-}