| 1 |
commit: e3a0d23f4ad40c56ab64367c541a368ce145c3ae |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 10 16:09:28 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 10 16:09:44 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a0d23f |
| 7 |
|
| 8 |
dev-python/enable: Add support for gcc-5 |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=561836 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.23 |
| 13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-python/enable/enable-4.5.1.ebuild | 5 ++++- |
| 16 |
dev-python/enable/files/enable-4.5.1-gcc-5.patch | 22 ++++++++++++++++++++++ |
| 17 |
dev-python/enable/metadata.xml | 2 +- |
| 18 |
3 files changed, 27 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild |
| 21 |
index 31a0a80..300c03c3 100644 |
| 22 |
--- a/dev-python/enable/enable-4.5.1.ebuild |
| 23 |
+++ b/dev-python/enable/enable-4.5.1.ebuild |
| 24 |
@@ -41,7 +41,10 @@ DEPEND="${RDEPEND} |
| 25 |
|
| 26 |
DISTUTILS_IN_SOURCE_BUILD=1 |
| 27 |
|
| 28 |
-PATCHES=( "${FILESDIR}"/${PN}-4.4.1-swig.patch ) |
| 29 |
+PATCHES=( |
| 30 |
+ "${FILESDIR}"/${PN}-4.4.1-swig.patch |
| 31 |
+ "${FILESDIR}"/${P}-gcc-5.patch |
| 32 |
+ ) |
| 33 |
|
| 34 |
python_prepare_all() { |
| 35 |
append-cflags -fno-strict-aliasing |
| 36 |
|
| 37 |
diff --git a/dev-python/enable/files/enable-4.5.1-gcc-5.patch b/dev-python/enable/files/enable-4.5.1-gcc-5.patch |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..b18b8ea |
| 40 |
--- /dev/null |
| 41 |
+++ b/dev-python/enable/files/enable-4.5.1-gcc-5.patch |
| 42 |
@@ -0,0 +1,22 @@ |
| 43 |
+From 55a74ccfc33764499497022dd3649be4bb1091ed Mon Sep 17 00:00:00 2001 |
| 44 |
+From: Nathan Ringo <tikiking1@××××××××××××××××××××.com> |
| 45 |
+Date: Wed, 10 Jun 2015 22:06:57 -0500 |
| 46 |
+Subject: [PATCH] Fixes #200 |
| 47 |
+ |
| 48 |
+--- |
| 49 |
+ kiva/agg/setup.py | 2 +- |
| 50 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 51 |
+ |
| 52 |
+diff --git a/kiva/agg/setup.py b/kiva/agg/setup.py |
| 53 |
+index 5b4d458..c6e290a 100644 |
| 54 |
+--- a/kiva/agg/setup.py |
| 55 |
++++ b/kiva/agg/setup.py |
| 56 |
+@@ -170,7 +170,7 @@ def get_ft2_sources((lib_name, build_info), build_dir): |
| 57 |
+ f = os.popen("g++ --version") |
| 58 |
+ line0 = f.readline() |
| 59 |
+ f.close() |
| 60 |
+- m = re.match(r'.+?\s(3|4)\.\d+', line0) |
| 61 |
++ m = re.match(r'.+?\s([3-5])\.\d+', line0) |
| 62 |
+ if int(m.group(1)) < 4: |
| 63 |
+ use_32bit_workaround = True |
| 64 |
+ |
| 65 |
|
| 66 |
diff --git a/dev-python/enable/metadata.xml b/dev-python/enable/metadata.xml |
| 67 |
index de31ed9..aee1004 100644 |
| 68 |
--- a/dev-python/enable/metadata.xml |
| 69 |
+++ b/dev-python/enable/metadata.xml |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-<?xml version='1.0' encoding='UTF-8'?> |
| 72 |
+<?xml version="1.0" encoding="UTF-8"?> |
| 73 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 74 |
<pkgmetadata> |
| 75 |
<herd>python</herd> |
Archives