1 |
commit: 287d369fccff7bffb877dd06ce5c8bcb30c248c6 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Feb 24 11:14:39 2016 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 24 11:20:58 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287d369f |
7 |
|
8 |
dev-libs/libixion: Fix build, EAPI=6 |
9 |
|
10 |
- ${P}-python-optional.patch was removing -DMDDS_HASH_CONTAINER_BOOST, |
11 |
fixed and removed any python-unrelated parts from the patch |
12 |
- Removed unnecessary ${P}-python-symbol.patch |
13 |
|
14 |
Package-Manager: portage-2.2.27 |
15 |
|
16 |
.../files/libixion-0.9.1-python-optional.patch | 42 +++++++--------------- |
17 |
.../files/libixion-0.9.1-python-symbol.patch | 13 ------- |
18 |
...ixion-0.9.1.ebuild => libixion-0.9.1-r1.ebuild} | 12 ++++--- |
19 |
3 files changed, 19 insertions(+), 48 deletions(-) |
20 |
|
21 |
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch |
22 |
index df945ab..632fa07 100644 |
23 |
--- a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch |
24 |
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch |
25 |
@@ -1,21 +1,21 @@ |
26 |
--- a/configure.ac 2016-02-06 17:08:05.505990463 +0100 |
27 |
+++ b/configure.ac 2016-02-06 17:08:42.316530268 +0100 |
28 |
-@@ -15,18 +15,13 @@ |
29 |
+@@ -15,18 +15,22 @@ |
30 |
AC_INIT([libixion], [ixion_version]) |
31 |
AC_CONFIG_HEADERS([config.h]) |
32 |
AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz]) |
33 |
-AM_PATH_PYTHON(2.7.0) |
34 |
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
35 |
|
36 |
--AC_ARG_WITH(hash-container-compat, |
37 |
--[ |
38 |
-- --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo |
39 |
--], |
40 |
--,with_hash_container_compat=no) |
41 |
-- |
42 |
--AC_ARG_WITH(mdds-include-path, |
43 |
-- AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.]) |
44 |
--,) |
45 |
+ AC_ARG_WITH(hash-container-compat, |
46 |
+ [ |
47 |
+ --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo |
48 |
+ ], |
49 |
+ ,with_hash_container_compat=no) |
50 |
+ |
51 |
+ AC_ARG_WITH(mdds-include-path, |
52 |
+ AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.]) |
53 |
+ ,) |
54 |
+AC_ARG_ENABLE([python], |
55 |
+ [AS_HELP_STRING([--disable-python], [Disable python bindings])], |
56 |
+ [enable_python="$enableval"], |
57 |
@@ -24,25 +24,7 @@ |
58 |
|
59 |
IXION_API_VERSION=ixion_api_version |
60 |
IXION_MAJOR_VERSION=ixion_major_version |
61 |
-@@ -66,23 +61,19 @@ |
62 |
- AC_FUNC_STRTOD |
63 |
- AC_CHECK_FUNCS([gettimeofday]) |
64 |
- |
65 |
--CPPFLAGS="$CPPFLAGS -D_REENTRANT -DMDDS_HASH_CONTAINER_BOOST" |
66 |
-+CPPFLAGS="$CPPFLAGS -D_REENTRANT" |
67 |
- |
68 |
--AC_MSG_CHECKING([whether to turn on hash container compatibility]) |
69 |
--if test "z$with_hash_container_compat" = "zno"; then |
70 |
-- AC_MSG_RESULT([no]) |
71 |
-- BOOST_REQUIRE([1.36]) |
72 |
-- BOOST_UNORDERED |
73 |
--else |
74 |
-- AC_MSG_RESULT([yes]) |
75 |
-- DEFINES="$DEFINES -D_IXION_HASH_CONTAINER_COMPAT" |
76 |
--fi |
77 |
-+BOOST_REQUIRE([1.36]) |
78 |
- |
79 |
- # Check for mdds. |
80 |
+@@ -70,7 +74,11 @@ |
81 |
PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0]) |
82 |
|
83 |
# Check for python. |
84 |
@@ -55,7 +37,7 @@ |
85 |
|
86 |
CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden" |
87 |
|
88 |
-@@ -101,3 +92,10 @@ |
89 |
+@@ -101,3 +109,10 @@ |
90 |
src/libixion/constants.inl |
91 |
src/python/Makefile]) |
92 |
AC_OUTPUT |
93 |
|
94 |
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch |
95 |
deleted file mode 100644 |
96 |
index 1a62bbc..0000000 |
97 |
--- a/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch |
98 |
+++ /dev/null |
99 |
@@ -1,13 +0,0 @@ |
100 |
-diff --git a/src/python/Makefile.am b/src/python/Makefile.am |
101 |
-index 0dfae54..094e0cf 100644 |
102 |
---- a/src/python/Makefile.am |
103 |
-+++ b/src/python/Makefile.am |
104 |
-@@ -10,7 +10,7 @@ ixion_la_SOURCES = \ |
105 |
- sheet.hpp \ |
106 |
- sheet.cpp |
107 |
- |
108 |
--ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex initixion |
109 |
-+ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit_ixion |
110 |
- ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS) |
111 |
- ixion_la_LIBADD = \ |
112 |
- ../libixion/libixion-@IXION_API_VERSION@.la \ |
113 |
|
114 |
diff --git a/dev-libs/libixion/libixion-0.9.1.ebuild b/dev-libs/libixion/libixion-0.9.1-r1.ebuild |
115 |
similarity index 85% |
116 |
rename from dev-libs/libixion/libixion-0.9.1.ebuild |
117 |
rename to dev-libs/libixion/libixion-0.9.1-r1.ebuild |
118 |
index 9c993be..6dc3c0e 100644 |
119 |
--- a/dev-libs/libixion/libixion-0.9.1.ebuild |
120 |
+++ b/dev-libs/libixion/libixion-0.9.1-r1.ebuild |
121 |
@@ -2,7 +2,7 @@ |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
# $Id$ |
124 |
|
125 |
-EAPI=5 |
126 |
+EAPI=6 |
127 |
|
128 |
EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git" |
129 |
|
130 |
@@ -17,7 +17,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion" |
131 |
[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz" |
132 |
|
133 |
LICENSE="MIT" |
134 |
-SLOT="0/0.10" |
135 |
+SLOT="0/0.10" # based on SONAME of libixion.so |
136 |
[[ ${PV} == 9999 ]] || \ |
137 |
KEYWORDS="~amd64 ~arm ~ppc ~x86" |
138 |
IUSE="python static-libs" |
139 |
@@ -37,9 +37,11 @@ pkg_setup() { |
140 |
} |
141 |
|
142 |
src_prepare() { |
143 |
- epatch "${FILESDIR}/${PN}-0.9.1-typo.patch" \ |
144 |
- "${FILESDIR}/${PN}-0.9.1-python-optional.patch" \ |
145 |
- "${FILESDIR}/${PN}-0.9.1-python-symbol.patch" |
146 |
+ eapply_user |
147 |
+ |
148 |
+ eapply "${FILESDIR}/${PN}-0.9.1-typo.patch" \ |
149 |
+ "${FILESDIR}/${PN}-0.9.1-python-optional.patch" |
150 |
+ |
151 |
eautoreconf |
152 |
} |