summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/botan/files/botan-1.10-python3.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/botan/files/botan-1.10-python3.patch')
-rw-r--r--dev-libs/botan/files/botan-1.10-python3.patch24
1 files changed, 24 insertions, 0 deletions
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