Fix bug#219896, thanks to Nickolay Kolchin-Semyonov and Jack Lloyd, also fix g++ CHOST usage

Package-Manager: portage-2.1.5_rc6

4 files changed, 38 insertions, 10 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index cdaeef5497e0..63cd98ee94ef 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/botan
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.30 2007/11/11 05:40:38 alonbl Exp $
+# 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 $
+
+  02 May 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/botan-1.6.1-gcc-4.2.patch, botan-1.6.1-r1.ebuild:
+  Fix bug#219896, thanks to Nickolay Kolchin-Semyonov and Jack Lloyd, also fix
+  g++ CHOST usage
 
   11 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> -botan-1.6.1.ebuild:
   Cleanup
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index a850dff91d3f..cdff96c53772 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,5 +1,6 @@
 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
 DIST Botan-1.6.1.tgz 1845323 RMD160 e729d03ac8aba3a8c157cd956f4ddf08d99fe33b SHA1 c0c980539e13ba1332301bdd1dcb7dce6905624e SHA256 4ff3ec8c0c5c21fcb5b56e2c54a4eeddf7101a883e13a816630ccff288c0a9c4
-EBUILD botan-1.6.1-r1.ebuild 2663 RMD160 d7ca218312d80c8f603f53f717de8d3a38352aec SHA1 38fb3db7392999d567c716a7048afe32ab0d4090 SHA256 61c992cb3cefd97479c85c1a6f33291dae8b5404c54b4476d1e8e2c796b113b7
-MISC ChangeLog 5014 RMD160 75a5598dd96658c7e3df05c20189df196d4ee686 SHA1 94ad977afc91ac4715c3a331ddd0825ee41d9d47 SHA256 f67b3946839d7c1dc5171ab0e914ff1ea5a809fbb168164a996d06b4f39fb4bb
+EBUILD botan-1.6.1-r1.ebuild 2754 RMD160 26ca7788421e19e2a1ad69c8f45fcc13e01425cb SHA1 2782c897c9b6290cd183df82399fc40638696d19 SHA256 2542902228d07e5b4c8d76b7c99181caa113db121a13c5f31cd844a186a4bd17
+MISC ChangeLog 5219 RMD160 0abf8536df02ce054b0b0c24d4f257fe3d867870 SHA1 5b367154187d3e02e92ec44d1b4d715b6acc757e SHA256 0c96d7784d8b4885e5d839723bbe67de0828f7637c29180aae736086cf31754d
 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 45167c62ffbd..256935365bff 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-2007 Gentoo Foundation
+# 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.4 2007/11/11 04:12:38 cla Exp $
+# $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 $
 
 inherit eutils multilib
 
@@ -31,6 +31,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-asm.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.2.patch"
 }
 
 src_compile() {
@@ -73,11 +74,13 @@ src_compile() {
 
 	# FIXME: We might actually be on *BSD or OS X...
 	./configure.pl \
-		--noauto gcc-linux-${CHOSTARCH} \
+		--noauto \
 		--libdir=/$(get_libdir) \
-		--modules=$modules ||
-			die "configure.pl failed"
-	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
+		--modules=$modules \
+		gcc-linux-${CHOSTARCH} ||
+		die "configure.pl failed"
+	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" \
+		"LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
 }
 
 src_test() {
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
new file mode 100644
index 000000000000..8a4f999f717f
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch
@@ -0,0 +1,19 @@
+#
+# old_revision [98e326ec23e729a704878ea5174472e0b4d8f2a1]
+#
+# patch "configure.pl"
+#  from [a32942b1c853313df9bd9014344f61952bc45279]
+#    to [ac4bc30d588510c3702b07b97f07ab2fd29d93d8]
+#
+============================================================
+--- configure.pl        a32942b1c853313df9bd9014344f61952bc45279
++++ configure.pl        ac4bc30d588510c3702b07b97f07ab2fd29d93d8
+@@ -334,7 +334,7 @@ sub choose_target {
+             # buggy GCC. There is no reduction in code quality so even
+             # 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]/) ||
+                ($gcc_version =~ /2\.95\.[0-4]/) ||
+                ($gcc_version eq '' && $^O eq 'cygwin'))
+             {