summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/botan/files/botan-1.10-python3.patch24
-rw-r--r--dev-libs/botan/files/botan-1.11.20-build-python.patch35
2 files changed, 0 insertions, 59 deletions
diff --git a/dev-libs/botan/files/botan-1.10-python3.patch b/dev-libs/botan/files/botan-1.10-python3.patch
deleted file mode 100644
index d6db23b838fe..000000000000
--- a/dev-libs/botan/files/botan-1.10-python3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
diff --git a/dev-libs/botan/files/botan-1.11.20-build-python.patch b/dev-libs/botan/files/botan-1.11.20-build-python.patch
deleted file mode 100644
index ae858856864c..000000000000
--- a/dev-libs/botan/files/botan-1.11.20-build-python.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5bb0b47e608e083dda5e39132174b840f3b091cf Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 15 Sep 2015 00:18:19 +0300
-Subject: [PATCH] build: support multiple python versions
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/scripts/install.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/scripts/install.py b/src/scripts/install.py
-index 2c69213..d1d62b6 100755
---- a/src/scripts/install.py
-+++ b/src/scripts/install.py
-@@ -181,11 +181,12 @@ def main(args = None):
- os.path.join(pkgconfig_dir, os.path.basename(cfg['botan_pkgconfig'])))
-
- if 'ffi' in cfg['mod_list'].split('\n'):
-- py_lib_path = os.path.join(lib_dir, 'python%s' % (cfg['python_version']), 'site-packages')
-- logging.debug('Installing python module to %s' % (py_lib_path))
-- makedirs(py_lib_path)
-- for py in ['botan.py']:
-- copy_file(os.path.join(cfg['python_dir'], py), os.path.join(py_lib_path, py))
-+ for ver in cfg['python_version'].split(','):
-+ py_lib_path = os.path.join(lib_dir, 'python%s' % (ver), 'site-packages')
-+ logging.debug('Installing python module to %s' % (py_lib_path))
-+ makedirs(py_lib_path)
-+ for py in ['botan.py']:
-+ copy_file(os.path.join(cfg['python_dir'], py), os.path.join(py_lib_path, py))
-
- shutil.rmtree(target_doc_dir, True)
- shutil.copytree(cfg['doc_output_dir'], target_doc_dir)
---
-2.4.6
-