Fix gcc-4.3 issue, bug#220783, thanks to Peter Alfredsen

Package-Manager: portage-2.1.5_rc7

4 files changed, 67 insertions, 7 deletions

diff --git a/app-crypt/coolkey/ChangeLog b/app-crypt/coolkey/ChangeLog
index ed386d1609ff..fc1c28c17da7 100644
--- a/app-crypt/coolkey/ChangeLog
+++ b/app-crypt/coolkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/coolkey
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/ChangeLog,v 1.5 2007/11/10 11:26:35 alonbl Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/ChangeLog,v 1.6 2008/05/08 07:42:38 alonbl Exp $
+
+  08 May 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/coolkey-1.1.0-gcc-4.3.patch, coolkey-1.1.0-r1.ebuild:
+  Fix gcc-4.3 issue, bug#220783, thanks to Peter Alfredsen
 
   10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> -coolkey-1.1.0.ebuild:
   Cleanup
diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest
index 31cbbc52ec75..0f67deba6d8c 100644
--- a/app-crypt/coolkey/Manifest
+++ b/app-crypt/coolkey/Manifest
@@ -1,5 +1,6 @@
 AUX coolkey-1.1.0-cache-move.patch 4176 RMD160 d93eb2865ca9351b83c5dff99cfbd25999d82102 SHA1 484584f25644eb7f8698979201b68151d014fc2f SHA256 18312c4097c0915fc89cc922127b4371c771ca22831cc8ed8681b529cd3b06a1
+AUX coolkey-1.1.0-gcc-4.3.patch 1582 RMD160 c8c060d75e53875c40ce6d6f3667f8339b8a566e SHA1 d5ab4c049f0c5b5c52d0b8e3ccbe49b34286ee6f SHA256 004a8bf835c15afef6c163c8b9d6773791932fa612c6c9b055d0506799d1626d
 DIST coolkey-1.1.0.tar.gz 432808 RMD160 1873e85aecb30c5311444c76fd85ba79633dce23 SHA1 54136decf9dfd091c8b231cb77dac97db95e1866 SHA256 8448e3abb81bffc593c96b577dcfbc05b40e8684188456c31be15fae73d730f7
-EBUILD coolkey-1.1.0-r1.ebuild 882 RMD160 843bfa0fb060f810addcbcd8e45a2c431ada7b8e SHA1 92f200b45a244bf4757000c28f1f121351b34be2 SHA256 bdf21d603e89c94609a5b79debcf376a978aa78dbc5b896150426e482662a236
-MISC ChangeLog 850 RMD160 a7413a9fbe6d1da3f109e15ac87a964f2ebead83 SHA1 e0a5bc5d03122652925d648e8a8125a16dbef05f SHA256 f46b1d794b1f9deabdf9013084992b67b9da0078a111c804b90d3497b4d71d20
+EBUILD coolkey-1.1.0-r1.ebuild 927 RMD160 4c4f8bb03f53ff5674a17d820e4a193ef263ca1b SHA1 a4a1f0e0740ad06bf0e293189096b6916c935dc3 SHA256 842370ccbefd721fe2fb4ae2747911f80b08eeb0c565f9ccab9822f22d60c12b
+MISC ChangeLog 1021 RMD160 0dfb1e63fca7697c145358783345c2f1cea750e9 SHA1 99c26aea009c711e7c9dc954d9ff65c01acb99cd SHA256 995c397883fd8c582903f4c2d0b42ec3b1339cdb8fb2d45cc1de46921c4abc3d
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild
index 3213f99e094a..1349664a6566 100644
--- a/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild
+++ b/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild,v 1.1 2007/09/08 08:20:52 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild,v 1.2 2008/05/08 07:42:38 alonbl Exp $
 
 inherit eutils
 
@@ -21,11 +21,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-cache-move.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
 }
 
 src_compile() {
 	econf $(use_enable debug) || die "configure failed"
-	emake || die "make failed"
+	emake -j1 || die "make failed"
 }
 
 src_install() {
diff --git a/app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch b/app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch
new file mode 100644
index 000000000000..5e41b5ab702b
--- /dev/null
+++ b/app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch
@@ -0,0 +1,54 @@
+diff -up ./src/coolkey/slot.cpp.coolkey-gcc43 ./src/coolkey/slot.cpp
+--- ./src/coolkey/slot.cpp.coolkey-gcc43	2008-02-13 18:01:45.000000000 -0800
++++ ./src/coolkey/slot.cpp	2008-02-13 18:03:05.000000000 -0800
+@@ -25,7 +25,6 @@
+ #include "PKCS11Exception.h"
+ #include <winscard.h>
+ #include "slot.h"
+-#include <memory.h>
+ #include "zlib.h"
+ #include "params.h"
+ 
+@@ -33,7 +32,6 @@
+ 
+ #define MIN(x, y) ((x) < (y) ? (x) : (y))
+ 
+-using std::auto_ptr;
+ 
+ 
+ #ifdef DEBUG
+diff -up ./src/coolkey/machdep.cpp.coolkey-gcc43 ./src/coolkey/machdep.cpp
+--- ./src/coolkey/machdep.cpp.coolkey-gcc43	2008-02-13 18:02:06.000000000 -0800
++++ ./src/coolkey/machdep.cpp	2008-02-13 18:04:04.000000000 -0800
+@@ -33,6 +33,8 @@
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <pthread.h>
++#include <string.h>
++#include <stdlib.h>
+ #endif
+ 
+ #ifdef _WIN32
+diff -up ./src/coolkey/log.cpp.coolkey-gcc43 ./src/coolkey/log.cpp
+--- ./src/coolkey/log.cpp.coolkey-gcc43	2008-02-13 18:01:55.000000000 -0800
++++ ./src/coolkey/log.cpp	2008-02-13 18:03:37.000000000 -0800
+@@ -18,6 +18,8 @@
+  * ***** END COPYRIGHT BLOCK *****/
+ 
+ #include <string>
++#include <string.h>
++#include <stdlib.h>
+ #include "mypkcs11.h"
+ #include <assert.h>
+ #include <stdio.h>
+diff -up ./src/coolkey/object.cpp.coolkey-gcc43 ./src/coolkey/object.cpp
+--- ./src/coolkey/object.cpp.coolkey-gcc43	2008-02-13 18:02:20.000000000 -0800
++++ ./src/coolkey/object.cpp	2008-02-13 18:04:22.000000000 -0800
+@@ -21,6 +21,7 @@
+ #include "PKCS11Exception.h"
+ #include "object.h"
+ #include <algorithm>
++#include <string.h>
+ 
+ using std::find_if;
+