patch for gcc-4.3 compatibility thanks to Jack. bug #227535

Package-Manager: portage-2.1.4.4

5 files changed, 32 insertions, 6 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index 63cd98ee94ef..494c82be2ee3 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.31 2008/05/02 07:34:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.32 2008/06/18 08:14:29 dragonheart Exp $
+
+  18 Jun 2008; Daniel Black <dragonheart@gentoo.org>
+  files/botan-1.6.1-gcc-4.2.patch, +files/botan-1.6.1-gcc-4.3.patch,
+  botan-1.6.1-r1.ebuild:
+  patch for gcc-4.3 compatibility thanks to Jack. bug #227535
 
   02 May 2008; Alon Bar-Lev <alonbl@gentoo.org>
   +files/botan-1.6.1-gcc-4.2.patch, botan-1.6.1-r1.ebuild:
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index cdff96c53772..dfd21065d47d 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,7 @@
 AUX botan-1.6.1-asm.patch 1383 RMD160 61187729bb9a05fbdd0423265257e0f53c621035 SHA1 70d9b565d58e2e34e7242bd5479e8a0e06e5566c SHA256 59c952e65b30e8761d327ac5bebd9202cb5e385a4cb61e2f0eedb31110913a3c
-AUX botan-1.6.1-gcc-4.2.patch 815 RMD160 0ca35c10f1b055c90e98c2d3909ad774c23aadc7 SHA1 5d447e91d40c6b1804942f902bcd51489cbe5efd SHA256 0c6441cf262acc21c40dc65cb5917921806afed10e9fa46c29ca5161f1f313ac
+AUX botan-1.6.1-gcc-4.2.patch 818 RMD160 2847fa3327542ae411d32820adb5933acbcce986 SHA1 66dcc3aad9982b42cf4c7eb07f1d948c4387c9a5 SHA256 26ee15113053f29f281a0a059670543d04ba54321ec2e526931a2d2590d83e1a
+AUX botan-1.6.1-gcc-4.3.patch 579 RMD160 61c8b6b46ff19276aec33c4473a1c187aee24ea7 SHA1 2dc1a2fa8eb5130367fff79fe159eb2f8ca7aff6 SHA256 c854a5736fb876dee5a13f06a33bd3ab1446f9ecd6ea4135ccff19d6d8d74e6c
 DIST Botan-1.6.1.tgz 1845323 RMD160 e729d03ac8aba3a8c157cd956f4ddf08d99fe33b SHA1 c0c980539e13ba1332301bdd1dcb7dce6905624e SHA256 4ff3ec8c0c5c21fcb5b56e2c54a4eeddf7101a883e13a816630ccff288c0a9c4
-EBUILD botan-1.6.1-r1.ebuild 2754 RMD160 26ca7788421e19e2a1ad69c8f45fcc13e01425cb SHA1 2782c897c9b6290cd183df82399fc40638696d19 SHA256 2542902228d07e5b4c8d76b7c99181caa113db121a13c5f31cd844a186a4bd17
-MISC ChangeLog 5219 RMD160 0abf8536df02ce054b0b0c24d4f257fe3d867870 SHA1 5b367154187d3e02e92ec44d1b4d715b6acc757e SHA256 0c96d7784d8b4885e5d839723bbe67de0828f7637c29180aae736086cf31754d
+EBUILD botan-1.6.1-r1.ebuild 2800 RMD160 1420af4c01307a338c7c50a66f2d39609b369b34 SHA1 dccadf23f58ecb5500b0234943235267df11d4bb SHA256 43a8ad0658418c667b2f08db8758e3d84e9cab2b1f9d4d18ba142e20bfffb575
+MISC ChangeLog 5434 RMD160 1bf2178b9171314dffe60f58aaa54e62cdd02dcc SHA1 36bdf70b56c462158d87b091988adf434b819452 SHA256 9c3e142a2ff52d92d44d189fe73dbe93c9799eeb0845d9bf4b466c1588758193
 MISC metadata.xml 319 RMD160 084032a656409b8d666fa6e9c0b0f89e3ef955e7 SHA1 77d4f800c80c56a3191d488ef2d6444ab165cee3 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054
diff --git a/dev-libs/botan/botan-1.6.1-r1.ebuild b/dev-libs/botan/botan-1.6.1-r1.ebuild
index 256935365bff..2ac5afb30508 100644
--- a/dev-libs/botan/botan-1.6.1-r1.ebuild
+++ b/dev-libs/botan/botan-1.6.1-r1.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/dev-libs/botan/botan-1.6.1-r1.ebuild,v 1.5 2008/05/02 07:34:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild,v 1.6 2008/06/18 08:14:29 dragonheart Exp $
 
 inherit eutils multilib
 
@@ -32,6 +32,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-asm.patch"
 	epatch "${FILESDIR}/${P}-gcc-4.2.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
 }
 
 src_compile() {
diff --git a/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch b/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch
index 8a4f999f717f..cdeffbd4e4b4 100644
--- a/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch
+++ b/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch
@@ -13,7 +13,7 @@
              # if we're wrong it's OK.
  
 -            if(($gcc_version =~ /4\.[01]/) || ($gcc_version =~ /3\.[34]/) ||
-+            if(($gcc_version =~ /4\.[0123]/) || ($gcc_version =~ /3\.[34]/) ||
++            if(($gcc_version =~ /4\.[0123456]/) || ($gcc_version =~ /3\.[34]/) ||
                 ($gcc_version =~ /2\.95\.[0-4]/) ||
                 ($gcc_version eq '' && $^O eq 'cygwin'))
              {
diff --git a/dev-libs/botan/files/botan-1.6.1-gcc-4.3.patch b/dev-libs/botan/files/botan-1.6.1-gcc-4.3.patch
new file mode 100644
index 000000000000..6352414d5430
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.6.1-gcc-4.3.patch
@@ -0,0 +1,19 @@
+#
+# old_revision [0f5f960e749e55bc7b457b944ec168184353c300]
+#
+# patch "modules/es_unix/unix_cmd.cpp"
+#  from [a6f6bcae52c8704373362bde3174cc1688b65702]
+#    to [9727c050244b2a27760d460a060ed36ebd37b08d]
+#
+============================================================
+--- modules/es_unix/unix_cmd.cpp       
+a6f6bcae52c8704373362bde3174cc1688b65702
++++ modules/es_unix/unix_cmd.cpp       
+9727c050244b2a27760d460a060ed36ebd37b08d
+@@ -16,6 +16,7 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <signal.h>