fix python3 issue, bug#485490, thanks to Martin von Gagern

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

3 files changed, 32 insertions, 2 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index 169c6b8e1e25..d9999d02dd91 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.84 2013/09/18 13:13:58 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.85 2013/09/21 19:26:53 alonbl Exp $
+
+  21 Sep 2013; Alon Bar-Lev <alonbl@gentoo.org> +files/botan-1.10-python3.patch,
+  botan-1.10.5.ebuild:
+  fix python3 issue, bug#485490, thanks to Martin von Gagern
 
 *botan-1.11.4 (18 Sep 2013)
 
diff --git a/dev-libs/botan/botan-1.10.5.ebuild b/dev-libs/botan/botan-1.10.5.ebuild
index d6d79bd234e8..65c3848c9308 100644
--- a/dev-libs/botan/botan-1.10.5.ebuild
+++ b/dev-libs/botan/botan-1.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.5.ebuild,v 1.2 2013/09/18 11:11:26 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.5.ebuild,v 1.3 2013/09/21 19:26:53 alonbl Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.10-python3.patch"
+
 	sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
 	sed \
 		-e "/DOCDIR/d" \
diff --git a/dev-libs/botan/files/botan-1.10-python3.patch b/dev-libs/botan/files/botan-1.10-python3.patch
new file mode 100644
index 000000000000..d6db23b838fe
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.10-python3.patch
@@ -0,0 +1,24 @@
+Make configure script work for Python 3.
+
+In Python 3, map returns an iterable, not a list, so for a subsequent map to
+work we have to convert that to a list explicitely.  This should work for
+Python 2 just as well, so the patch can be applied unconditionally.
+
+2013-09-21 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/485490
+
+Index: Botan-1.10.5/configure.py
+===================================================================
+--- Botan-1.10.5.orig/configure.py
++++ Botan-1.10.5/configure.py
+@@ -1780,7 +1780,7 @@ def main(argv = None):
+                 gcc_version = stdout.strip()
+ 
+                 logging.info('Detected gcc version %s' % (gcc_version))
+-                return map(int, gcc_version.split('.')[0:2])
++                return [int(c) for c in gcc_version.split('.')[0:2]]
+             except OSError:
+                 logging.warning('Could not execute %s for version check' % (gcc_bin))
+                 return None