Fix compilation with gcc-4.3, thanks to J.M. Gottfried and Andreas Philipp; bug #224113

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27.1 x86_64

4 files changed, 48 insertions, 5 deletions

diff --git a/net-misc/kvpnc/ChangeLog b/net-misc/kvpnc/ChangeLog
index 50039299aad8..6d0aef9c7262 100644
--- a/net-misc/kvpnc/ChangeLog
+++ b/net-misc/kvpnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/kvpnc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/ChangeLog,v 1.32 2008/02/07 22:09:03 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/ChangeLog,v 1.33 2008/11/15 20:07:07 halcy0n Exp $
+
+  15 Nov 2008; Mark Loeser <halcy0n@gentoo.org>
+  +files/kvpnc-0.9.0-gcc43.patch, kvpnc-0.9.0.ebuild:
+  Fix compilation with gcc-4.3, thanks to J.M. Gottfried and Andreas
+  Philipp; bug #224113
 
 *kvpnc-0.9.0 (07 Feb 2008)
 
diff --git a/net-misc/kvpnc/Manifest b/net-misc/kvpnc/Manifest
index d28e2a64ce67..888da4e75fb9 100644
--- a/net-misc/kvpnc/Manifest
+++ b/net-misc/kvpnc/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kvpnc-0.9.0-gcc43.patch 664 RMD160 5e274821aa837faff304dcdfc647e6e3c2940a72 SHA1 41ab6e54ccf4d9a85f0131473b627df267ad5c8d SHA256 068cb94c56b0c332608bbc4dd67a65d77d53a5d8751cdf47fe0e6d7dc01c5552
 DIST kvpnc-0.7.2.tar.bz2 839430 RMD160 61e24a0ed0f468fd115fb7ca3cec8c36a4f5888a SHA1 3980af13749eecb188ecf7aefc05ea4949da6f06 SHA256 c4bd8d86b61742714503f57a061f36dc3bfd438aeeab9c871dccaf46dfa2b4f9
 DIST kvpnc-0.8.6.1.tar.bz2 1894558 RMD160 f0e1e29530bc2c3f30fb26c2784c0a832485ea5a SHA1 e598dfd46efdda0edc42f55157c3ca66302d4da2 SHA256 8ff03471dc8a13c9007ca93bb46711154aaa639191c45d753d127bcdfdf065ed
 DIST kvpnc-0.8.8.tar.bz2 2212182 RMD160 f6c73f6bb1106f5f19ad1b2ccc19a56e80e6df4c SHA1 e5788db3855006745e5c7661a9da713f80d07304 SHA256 823934785104d5c1d52b61d22e49d785d48ed122bec027dfb844ae829f5f7b68
@@ -7,6 +11,13 @@ EBUILD kvpnc-0.7.2.ebuild 482 RMD160 68aa030d3b963b3946d6ff0a171f6e6c9f2e5012 SH
 EBUILD kvpnc-0.8.6.1.ebuild 519 RMD160 e68445cf4d24fec46c0f7d02b7084f1f4231a307 SHA1 204dc9284611c540747bd4329279c6e01c0f0283 SHA256 bc9e02f10c8937e200bb913f96d4cb17b526a14844426f40855e3fcb0d113486
 EBUILD kvpnc-0.8.8.ebuild 519 RMD160 e6c533273a74148b6af964fc2aa30654ce0ba1ff SHA1 986c65d86ce001c5b6000dccd628bd20d93abba0 SHA256 df8edb963ed5b9b4af158ccc67db9af6e0c80d35f5389e19102af4abd1002ac3
 EBUILD kvpnc-0.8.9.ebuild 589 RMD160 990438e666dcaa75b7615d10cce0c05e279885d5 SHA1 45e221ab2adca9a02f2fd9860a9cf14727e5985d SHA256 8e851f480aa520f8dd740e75fd51aae8feac6349ded18c9689b06fe7f6b06009
-EBUILD kvpnc-0.9.0.ebuild 594 RMD160 4e2b60bca169aa28fa7720e070ae3e81044290f0 SHA1 aa859450826466e6eb69e95e4415bb32c45ef7bf SHA256 7821b1aaecc1f7bf9e34be6ddc1913919b2659d039bc6de285efd5b794e89b48
-MISC ChangeLog 4802 RMD160 6cbc3d4964582d77d172be14b7dd91f8257380fe SHA1 5314796402b8c321bd8333b3f1bae98fd81b2c99 SHA256 b8245f8a3a54299e7601a48e43862fe553ebb64bbd46383679d5c123581c9d22
+EBUILD kvpnc-0.9.0.ebuild 679 RMD160 a5a4ffc4e29936d6bc5ffa42a8fe8517993b69c7 SHA1 0ef3c0c01bb570bdbdc6884e0070a0dd7510fbe4 SHA256 60bec1ae580175941faba1f77f8017649c1a5d6e118bc0fd44d52ac56ad8a3bf
+MISC ChangeLog 4994 RMD160 ffb4c2456374945f1e741f89550d117a1bae46bf SHA1 710b49eccbd8a9b41b3df779275191d867cfe7f3 SHA256 906ec14bd8ce652d68e431e360b8c55f31465b00b8fd87b2b93261a7c2412088
 MISC metadata.xml 306 RMD160 6e8ce461e3cda022b5f908e0cb60b4c24d443ba9 SHA1 73fcfe0d1964780a6f7058cfade75267466e138e SHA256 2efc0932db6df860d170ee7bb26b3623f90f6e70e401d567035ad159fb25c89c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkfK/cACgkQCRZPokWLroR6EQCffDneM1gUTt9b/qtlHysdB+nR
+3kAAn1dRmku5XhDcWBJWfWRiUC8czjfO
+=O11r
+-----END PGP SIGNATURE-----
diff --git a/net-misc/kvpnc/files/kvpnc-0.9.0-gcc43.patch b/net-misc/kvpnc/files/kvpnc-0.9.0-gcc43.patch
new file mode 100644
index 000000000000..a0bad6e749e4
--- /dev/null
+++ b/net-misc/kvpnc/files/kvpnc-0.9.0-gcc43.patch
@@ -0,0 +1,21 @@
+--- src/kvpnc.h	2008-05-29 09:58:45.000000000 +0200
++++ src/kvpnc.h	2008-05-29 09:59:07.000000000 +0200
+@@ -77,7 +77,7 @@
+ 	* @param parent Parent widget
+ 	* @param name Name of the Mainwindow
+ 	*/
+-	KVpnc( KApplication *parent, QWidget*parent = 0, const char *name = 0 );
++	KVpnc( KApplication *parent, QWidget*qparent = 0, const char *name = 0 );
+ 
+ 	/**
+ 	* Destruktor
+--- src/toolinfo.cpp	2008-05-29 09:59:19.000000000 +0200
++++ src/toolinfo.cpp	2008-05-29 09:59:37.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include "toolinfo.h"
+ #include <qfile.h>
+ #include <iostream>
++#include <cstdlib>
+ #include <klocale.h>
+ #include <kstandarddirs.h>
+ #include <kmessagebox.h>
diff --git a/net-misc/kvpnc/kvpnc-0.9.0.ebuild b/net-misc/kvpnc/kvpnc-0.9.0.ebuild
index 5a05dc626052..e67b17166de4 100644
--- a/net-misc/kvpnc/kvpnc-0.9.0.ebuild
+++ b/net-misc/kvpnc/kvpnc-0.9.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.9.0.ebuild,v 1.1 2008/02/07 22:09:03 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.9.0.ebuild,v 1.2 2008/11/15 20:07:07 halcy0n Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="kvpnc - a KDE-VPN connection utility."
 SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
@@ -17,3 +17,9 @@ RDEPEND="cisco? ( >=net-misc/vpnc-0.4 )
 	smartcard? ( >=dev-libs/openct-0.6.11-r1 )"
 
 need-kde 3.5
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${FILESDIR}"/kvpnc-0.9.0-gcc43.patch
+}