Fix gcc-4.3 issue, bug#216809

Package-Manager: portage-2.1.5_rc3

4 files changed, 26 insertions, 4 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index edb984b1d8b4..01a3de8a038f 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.319 2008/04/16 20:02:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.320 2008/04/17 05:19:03 alonbl Exp $
+
+  17 Apr 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnupg-2.0.9-gcc-4.3.patch, gnupg-2.0.9.ebuild:
+  Fix gcc-4.3 issue, bug#216809
 
   16 Apr 2008; Tobias Klausmann <klausman@gentoo.org> gnupg-2.0.9.ebuild:
   Stable on alpha, bug #217841
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 72df903dc90a..494c8febdd47 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,6 +2,7 @@ AUX gnupg-1.4.3-keyserver.patch 455 RMD160 c7eec6bd5ea73cde4d084cffcc1623bea775a
 AUX gnupg-1.4.3-selftest.patch 1324 RMD160 0a8e6d50fde48a2e795907ca56e1e95261919f43 SHA1 0003ffe4d032ace008e6d6ebca364327225a097f SHA256 0ca949d63f7dbb882c0119344c47bfaa99132bb4c7f253194eea06c7472afa54
 AUX gnupg-1.4.6-badruman.patch 534 RMD160 7789da4ceafcc9f1bec778b9b7986359f1513178 SHA1 8423f2fb9e41fdfbcb4b1eae2c5a99b0c9e045bb SHA256 3fef6d7306823db7a8912f4454b05aef8cff035e36065097d9406f57098018e5
 AUX gnupg-2.0.4-idea.patch 906 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b SHA1 0f56a3d656d8ec3227c1b597bee010b8dbe1d7cd SHA256 89e5af25bf7ae5b1147acb3da41520e2dcad975cda93ab625107626c85651976
+AUX gnupg-2.0.9-gcc-4.3.patch 437 RMD160 44717ceb9cec62b0962c0ee1a533bbf24a6e8658 SHA1 42531c856bd885c76683cfdb312f4a0985b94ea4 SHA256 5fda371998ebf521b57c36ac8b47d0f9069a9d43238850520370f8fab55fa171
 DIST gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 RMD160 df89fc93d5a9836bb12311d66f0ebdab31799fd5 SHA1 ab9e902539a1be746d3c25d969a4ae044a74f44c SHA256 568c1eb297942157250dd11c9a8171566535c49361ade00ab1c95191821ae1fe
 DIST gnupg-1.4.7.tar.bz2 3200642 RMD160 630344c99834cf9adcf806d55e6f609a1e50bd8b SHA1 22149105845c79068771837c8deb7d5ba0854927 SHA256 69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d
 DIST gnupg-1.4.8-ecc0.2.0.diff.bz2 17878 RMD160 532e43cfea00187c72d7d2784decee31b105a5a5 SHA1 822602c76c69160463d7ae3378e8da1b42e6efb2 SHA256 e03a180a95bb3c4c72f4ca97d1038c390b59da1f4d12d97f91ef7932dd01a5c1
@@ -14,6 +15,6 @@ EBUILD gnupg-1.4.7-r1.ebuild 6027 RMD160 e6a9a149dcc2b53f958849b3f77b1b97dd21e04
 EBUILD gnupg-1.4.8-r1.ebuild 5944 RMD160 208ba9bac568a23a034780549e219aa0d90f6c4a SHA1 e4c8e6c2825dfb1e4f7f9794973246b55a2e28f2 SHA256 eed327fd46c9f7ea7759ac7a7da957974713847c35d174aa10e17b25590d55ef
 EBUILD gnupg-1.4.9.ebuild 5246 RMD160 a5eeba5415ef0c28643cac762d5ac3a107a26f14 SHA1 723f8bc913a42301c4b22d3fd6fa812cc4f4173a SHA256 5b1c2128d1189ba2a1acd123e3966f1b814fcfd4c82b655e02d7bc23df5d48e8
 EBUILD gnupg-2.0.7-r1.ebuild 2330 RMD160 fe1d3dcd11cee64242e3bf8bdef470554dfd2689 SHA1 0b8c7d18de838dc778cba555a5f151945cd77766 SHA256 169911d9345b68349560a51a1a49ec16761890824b333466ac0b5422236b83ce
-EBUILD gnupg-2.0.9.ebuild 2339 RMD160 64aef65352f3fc5ed2e2293e9955b5f948ec66fd SHA1 2b702e660383d9eec15ff674b8e360e06764c569 SHA256 2cc63e224530500a254dbfe70020eaf356f8fbe003ca71ad612bbd8e235b21b0
-MISC ChangeLog 49457 RMD160 805de499919649db9670dc3eb9b6c31d241f6e2e SHA1 930ca1bad3ae414047804217608fda95df2dd953 SHA256 4efd33b145f2234301c467c4b3cf896f241caf2d25e527df66f598e163102be5
+EBUILD gnupg-2.0.9.ebuild 2420 RMD160 90cf7c9a34cedae4275f1437600fdee448c8e36e SHA1 9379304c9b9347113f21bdde3bc5558722f5db1c SHA256 f203f9b37e2df750ffc204aa2195df7393cf97b4c5d94f664ea7016be260583e
+MISC ChangeLog 49592 RMD160 fba8922eecf0b4ea65b5649c62b68b9008d66ab1 SHA1 145a7728747221b3510369cae5987bf7c11add7f SHA256 5607053db72a4d3ebd5b973f71d9d4536643ecf1f526fb0bfc3e7eb139648ebb
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
diff --git a/app-crypt/gnupg/files/gnupg-2.0.9-gcc-4.3.patch b/app-crypt/gnupg/files/gnupg-2.0.9-gcc-4.3.patch
new file mode 100644
index 000000000000..0cad7bc6d8de
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.9-gcc-4.3.patch
@@ -0,0 +1,11 @@
+--- keyserver/gpgkeys_curl.c	2007-07-04 15:26:13.000000000 +0200
++++ keyserver/gpgkeys_curl.c.new	2008-04-16 22:14:52.000000000 +0200
+@@ -300,7 +300,7 @@
+       curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
+     }
+ 
+-  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert);
++  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER, opt->flags.check_cert != 0);
+   curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file);
+ 
+   if(proxy)
diff --git a/app-crypt/gnupg/gnupg-2.0.9.ebuild b/app-crypt/gnupg/gnupg-2.0.9.ebuild
index 1e5a05a45a26..9ef10cf62dec 100644
--- a/app-crypt/gnupg/gnupg-2.0.9.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.9.ebuild,v 1.2 2008/04/16 20:02:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.9.ebuild,v 1.3 2008/04/17 05:19:03 alonbl Exp $
 
 inherit flag-o-matic eutils
 
@@ -38,6 +38,12 @@ RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-gnupg )
 	nls? ( virtual/libintl )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+}
+
 src_compile() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \