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

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

5 files changed, 42 insertions, 55 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/Manifest b/kde-misc/kload/Manifest
index 1fa8281dff58..95a8a5f57de9 100644
--- a/kde-misc/kload/Manifest
+++ b/kde-misc/kload/Manifest
@@ -1,8 +1,8 @@
 AUX kload-0.9.4-gcc43.diff 1633 RMD160 e29256d17232974e84ae2f18143a8bc59a9a7509 SHA1 51814c456603ec0e318d97e143c5151d356f6a6d SHA256 27bf5306f6cdf1979d86a7aea90f4ca8e4f5d0d16b72492c04db7f2b3e4e3ed2
+AUX kload-0.9.4-glibc-2.10.patch 986 RMD160 bad42fea89920b771f2b15608ac4fec041bda9fc SHA1 1f4974319b40ba2bc1c02b4ae451534d637ff0f1 SHA256 28b7b0daa2631501dcdb7b63b9876cae262395d0f95f00aa75db2ae31011f81d
 AUX kloadd.confd 107 RMD160 20677931a42164f69ce071b3a59d1481aad120ef SHA1 77c35fe64d494b60ca067aa1667d1bb620f7d83a SHA256 0ab18cdc3003a7dd7c14cd9701f0c7ac62644353b8a581a5c118813770ab9653
 AUX kloadd.initd 511 RMD160 4102dc12ef5bd4dbeb459188291f96222407df42 SHA1 b6e5cb9d2981550603576fe19fe464171b0742ad SHA256 eef04c8ff7309bf6308d3cb42e2fc8a9a51404ba54249ec41efbf63a93da873c
 DIST kload-0.9.4.tar.gz 39180 RMD160 df5a605205ef136ee3287fab6941a945e92cfdf3 SHA1 eb594cb53a8a1460485ffc9804a96a073b2cacf5 SHA256 436f9677a025772f6c4561906ad827596ba83b80550c71b9e965661e3fd4b3b9
-EBUILD kload-0.9.4-r1.ebuild 1146 RMD160 f5a755375d4f6edd5f186f24fcc5842b97faa57a SHA1 b83c79311597028452ba41c947da79b64fe1c568 SHA256 c9dfa644d987c94310fd070031630cc336b1fa0ee775abfa95506b0198aec979
-EBUILD kload-0.9.4.ebuild 1060 RMD160 1a9e4cdb9e42e59bc0af9571f62c8152ac4d03a6 SHA1 b54364df48a3db42212a99dd8b887c34deba16a4 SHA256 401a44a9f8a5aa1c953bb75e7f280b7288679102487b033e603f7cc9ea4e8383
-MISC ChangeLog 1070 RMD160 f09bc1674eeea15aa346a2c3fbac2d0554a0352f SHA1 90e7f39049dfb45f10fca538b3b45e191f8effbc SHA256 c555beb8dd081e608d7c4059374f0d674fb9c92b58474288cd475afbf7e5b305
+EBUILD kload-0.9.4-r1.ebuild 1172 RMD160 64d2bfafdaa71b9620f577fde0160812626187e8 SHA1 90e25212d774d85de62226c013e1e9fb4be290f2 SHA256 7870fb194757da76c7391e427000f19e0a8b3332c031192caf28867f24c0ffbd
+MISC ChangeLog 1265 RMD160 48b92fe47ecf94f844fcd3c9cace6bb7e6a6e88f SHA1 f371ce43fa67294d14b5d9fee2d105765fd5acb3 SHA256 29e1049d362384b92857338bccad544774b79358126d30c5d0f7567cfd2f210a
 MISC metadata.xml 366 RMD160 cbbd27905e4f6743364a44d5f5f1588c2903ad76 SHA1 b777c89290cbe10ffb81c4437c1de6ff31c554b9 SHA256 973d25712bc530fa7bad7da0639ec101b01353d5746d844f68e86fcab084f7e0
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
-}