Fix compilation with gcc-4.3; bug #251147

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

4 files changed, 43 insertions, 7 deletions

diff --git a/kde-misc/krd/ChangeLog b/kde-misc/krd/ChangeLog
index 77ecfe08be4c..52a71ae38ff3 100644
--- a/kde-misc/krd/ChangeLog
+++ b/kde-misc/krd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/krd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krd/ChangeLog,v 1.1 2007/10/26 20:23:01 philantrop Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krd/ChangeLog,v 1.2 2009/01/21 20:06:17 halcy0n Exp $
+
+  21 Jan 2009; Mark Loeser <halcy0n@gentoo.org> +files/krd-1.6-gcc43.patch,
+  krd-1.6.ebuild:
+  Fix compilation with gcc-4.3; bug #251147
 
 *krd-1.6 (26 Oct 2007)
 
diff --git a/kde-misc/krd/Manifest b/kde-misc/krd/Manifest
index cbf3f67a93d3..36b066660793 100644
--- a/kde-misc/krd/Manifest
+++ b/kde-misc/krd/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX krd-1.6-gcc43.patch 355 RMD160 a0ba2f91548be99658fd690db84badf734cb6090 SHA1 fa0e5bc8de7c88ce8fcde2298e1593e69537d937 SHA256 9ba86663c095e1fef33050a0eb22c71ad2886ea821efbf2e1fac14c90df1aec8
 DIST krd-1.6.tar.gz 1485997 RMD160 c93cff25b5b06a3ab46d0ff9d66d824713ca0d2c SHA1 fd5631dc9fdb345d728ae89ddc8a4fb121d0006d SHA256 ed3b156ae9b9839281cb8e43f9b1ce10d84cfb32cda59e53fbc8160384ce5d85
-EBUILD krd-1.6.ebuild 544 RMD160 4c58af8af728e7b8389a4ed7258c109956c93f35 SHA1 30df8308baddb8b5e928dd589f486a6691513431 SHA256 ea1226c6dfcf2c7b3f83f512c20ff33513280d39223f1202c65f19a68de26a14
-MISC ChangeLog 441 RMD160 98401ddebe3b214f974985bb24ea20437f186a0b SHA1 3d0ab10eac95f53d8338c097434956c7e47e3486 SHA256 11eb50427f6b6c8383ac269423ea2b9fae2b522fb554d6d09f1fe454a0df0d38
+EBUILD krd-1.6.ebuild 630 RMD160 d40b5ac74c8d131f39a6ba1be241ce3341f25f78 SHA1 6cdc50542152d6c521b917eecc9cae4ae9ccfba5 SHA256 c3bcc9f5f7f2a39025c96848d91e80105570c4968fcfeb378baebee46007b09c
+MISC ChangeLog 577 RMD160 7e2c48a0973a6793fbf3768aa8959672b7ebebf4 SHA1 6ce7af2983d1690c0f4d7afb9995492551be18d3 SHA256 27375755dbf69fe8f3cb3820a0c8ace37b81943646cec287f4c625667f0bf2ac
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkl3gEEACgkQCRZPokWLroQAEACgqL5BdG/xBwmi4TOXGOPYTqM3
+DHMAnAzyooPPdi9AHXzQJyelHO5a6mHu
+=Trn2
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/krd/files/krd-1.6-gcc43.patch b/kde-misc/krd/files/krd-1.6-gcc43.patch
new file mode 100644
index 000000000000..4a1921046300
--- /dev/null
+++ b/kde-misc/krd/files/krd-1.6-gcc43.patch
@@ -0,0 +1,14 @@
+diff -ur krd-orig/src/main.cpp krd/src/main.cpp
+--- krd-orig/src/main.cpp	2009-01-20 17:47:53.000000000 -0500
++++ krd/src/main.cpp	2009-01-20 17:48:02.000000000 -0500
+@@ -11,7 +11,8 @@
+ #include <kcmdlineargs.h>
+ #include <klocale.h>
+ #include "krd_main_form.h"
+-#include <iostream.h>
++#include <iostream>
++using std::cout;
+ /*
+ #include <libintl.h>*/
+ 
+
diff --git a/kde-misc/krd/krd-1.6.ebuild b/kde-misc/krd/krd-1.6.ebuild
index 397740ef5590..ecfb2ef099db 100644
--- a/kde-misc/krd/krd-1.6.ebuild
+++ b/kde-misc/krd/krd-1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 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/krd/krd-1.6.ebuild,v 1.1 2007/10/26 20:23:01 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krd/krd-1.6.ebuild,v 1.2 2009/01/21 20:06:17 halcy0n Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="kde remote desktop connections manager"
 HOMEPAGE="http://krdm.sourceforge.net/"
@@ -19,3 +19,10 @@ DEPEND=""
 need-kde 3.5
 
 S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}