1 |
commit: 77d879fe444909e960a42c563cae442e72aabca8 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 6 15:09:03 2016 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 22 17:05:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d879fe |
7 |
|
8 |
dev-libs/libixion: Fix DEPENDs, subslot, fix USE=-python (bug 550814) |
9 |
|
10 |
- >=9999: Pin mdds DEPEND to slot 1 |
11 |
- <9999: Pin mdds DEPEND to slot 0 |
12 |
|
13 |
Package-Manager: portage-2.2.27 |
14 |
|
15 |
.../files/libixion-0.9.1-python-optional.patch | 96 ++++++++++++++-------- |
16 |
.../files/libixion-0.9.1-python-symbol.patch | 13 +++ |
17 |
dev-libs/libixion/libixion-0.9.0.ebuild | 2 +- |
18 |
dev-libs/libixion/libixion-0.9.1.ebuild | 9 +- |
19 |
dev-libs/libixion/libixion-9999.ebuild | 11 +-- |
20 |
dev-libs/libixion/metadata.xml | 3 + |
21 |
6 files changed, 89 insertions(+), 45 deletions(-) |
22 |
|
23 |
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 |
24 |
index a4e7239..df945ab 100644 |
25 |
--- a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch |
26 |
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch |
27 |
@@ -1,34 +1,48 @@ |
28 |
-commit 59c360c9fe438a2805d65decc6c7889bc99a7747 |
29 |
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
30 |
-Date: Sun May 31 10:14:17 2015 +0200 |
31 |
- |
32 |
- python: Make it optional |
33 |
- |
34 |
- python bindings are built unless disabled |
35 |
- |
36 |
-diff --git a/configure.ac b/configure.ac |
37 |
-index 03f6120..1c7d8b2 100644 |
38 |
---- a/configure.ac |
39 |
-+++ b/configure.ac |
40 |
-@@ -15,7 +15,6 @@ AC_PREREQ([2.63]) |
41 |
+--- a/configure.ac 2016-02-06 17:08:05.505990463 +0100 |
42 |
++++ b/configure.ac 2016-02-06 17:08:42.316530268 +0100 |
43 |
+@@ -15,18 +15,13 @@ |
44 |
AC_INIT([libixion], [ixion_version]) |
45 |
AC_CONFIG_HEADERS([config.h]) |
46 |
AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz]) |
47 |
-AM_PATH_PYTHON(2.7.0) |
48 |
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
49 |
|
50 |
- AC_ARG_WITH(hash-container-compat, |
51 |
-@@ -28,6 +27,9 @@ AC_ARG_WITH(mdds-include-path, |
52 |
- AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.]) |
53 |
- ,) |
54 |
- |
55 |
+-AC_ARG_WITH(hash-container-compat, |
56 |
+-[ |
57 |
+- --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo |
58 |
+-], |
59 |
+-,with_hash_container_compat=no) |
60 |
+- |
61 |
+-AC_ARG_WITH(mdds-include-path, |
62 |
+- AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.]) |
63 |
+-,) |
64 |
+AC_ARG_ENABLE([python], |
65 |
-+ AS_HELP_STRING([--disable-python], [Disable python bindings])) |
66 |
-+ |
67 |
++ [AS_HELP_STRING([--disable-python], [Disable python bindings])], |
68 |
++ [enable_python="$enableval"], |
69 |
++ [enable_python=yes] |
70 |
++) |
71 |
+ |
72 |
IXION_API_VERSION=ixion_api_version |
73 |
IXION_MAJOR_VERSION=ixion_major_version |
74 |
- IXION_MINOR_VERSION=ixion_minor_version |
75 |
-@@ -82,7 +84,11 @@ fi |
76 |
+@@ -66,23 +61,19 @@ |
77 |
+ AC_FUNC_STRTOD |
78 |
+ AC_CHECK_FUNCS([gettimeofday]) |
79 |
+ |
80 |
+-CPPFLAGS="$CPPFLAGS -D_REENTRANT -DMDDS_HASH_CONTAINER_BOOST" |
81 |
++CPPFLAGS="$CPPFLAGS -D_REENTRANT" |
82 |
+ |
83 |
+-AC_MSG_CHECKING([whether to turn on hash container compatibility]) |
84 |
+-if test "z$with_hash_container_compat" = "zno"; then |
85 |
+- AC_MSG_RESULT([no]) |
86 |
+- BOOST_REQUIRE([1.36]) |
87 |
+- BOOST_UNORDERED |
88 |
+-else |
89 |
+- AC_MSG_RESULT([yes]) |
90 |
+- DEFINES="$DEFINES -D_IXION_HASH_CONTAINER_COMPAT" |
91 |
+-fi |
92 |
++BOOST_REQUIRE([1.36]) |
93 |
+ |
94 |
+ # Check for mdds. |
95 |
PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0]) |
96 |
|
97 |
# Check for python. |
98 |
@@ -37,20 +51,32 @@ index 03f6120..1c7d8b2 100644 |
99 |
+ AM_PATH_PYTHON(2.7.0) |
100 |
+ PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1]) |
101 |
+]) |
102 |
-+AM_CONDITIONAL([PYTHON], [test "x$enable_python" != "xno"]) |
103 |
++AM_CONDITIONAL([BUILD_PYTHON], [test "x$enable_python" != "xno"]) |
104 |
|
105 |
CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden" |
106 |
|
107 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
108 |
-index 6e138a4..cd912ab 100644 |
109 |
---- a/src/Makefile.am |
110 |
-+++ b/src/Makefile.am |
111 |
-@@ -1,4 +1,7 @@ |
112 |
--SUBDIRS = libixion python |
113 |
-+SUBDIRS = libixion |
114 |
-+if PYTHON |
115 |
-+ SUBDIRS += python |
116 |
-+endif |
117 |
- |
118 |
- AM_CPPFLAGS = -I$(top_srcdir)/include $(MDDS_CFLAGS) |
119 |
+@@ -101,3 +92,10 @@ |
120 |
+ src/libixion/constants.inl |
121 |
+ src/python/Makefile]) |
122 |
+ AC_OUTPUT |
123 |
++ |
124 |
++AC_MSG_NOTICE([ |
125 |
++============================================================================== |
126 |
++Build configuration: |
127 |
++ python: $enable_python |
128 |
++============================================================================== |
129 |
++]) |
130 |
+--- a/src/python/Makefile.am 2016-02-06 17:08:12.138907540 +0100 |
131 |
++++ b/src/python/Makefile.am 2016-02-06 17:08:38.034583800 +0100 |
132 |
+@@ -1,3 +1,5 @@ |
133 |
++if BUILD_PYTHON |
134 |
++ |
135 |
+ pyexec_LTLIBRARIES = ixion.la |
136 |
+ ixion_la_SOURCES = \ |
137 |
+ document.hpp \ |
138 |
+@@ -16,3 +18,5 @@ |
139 |
|
140 |
+ AM_TESTS_ENVIRONMENT = PYTHONPATH=.libs$${PYTHONPATH:+:$${PYTHONPATH}}; export PYTHONPATH; |
141 |
+ TESTS = ../../test/ixion-python-test.py |
142 |
++ |
143 |
++endif |
144 |
|
145 |
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 |
146 |
new file mode 100644 |
147 |
index 0000000..1a62bbc |
148 |
--- /dev/null |
149 |
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch |
150 |
@@ -0,0 +1,13 @@ |
151 |
+diff --git a/src/python/Makefile.am b/src/python/Makefile.am |
152 |
+index 0dfae54..094e0cf 100644 |
153 |
+--- a/src/python/Makefile.am |
154 |
++++ b/src/python/Makefile.am |
155 |
+@@ -10,7 +10,7 @@ ixion_la_SOURCES = \ |
156 |
+ sheet.hpp \ |
157 |
+ sheet.cpp |
158 |
+ |
159 |
+-ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex initixion |
160 |
++ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit_ixion |
161 |
+ ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS) |
162 |
+ ixion_la_LIBADD = \ |
163 |
+ ../libixion/libixion-@IXION_API_VERSION@.la \ |
164 |
|
165 |
diff --git a/dev-libs/libixion/libixion-0.9.0.ebuild b/dev-libs/libixion/libixion-0.9.0.ebuild |
166 |
index f36ed25..59b8842 100644 |
167 |
--- a/dev-libs/libixion/libixion-0.9.0.ebuild |
168 |
+++ b/dev-libs/libixion/libixion-0.9.0.ebuild |
169 |
@@ -27,7 +27,7 @@ RDEPEND="${PYTHON_DEPS} |
170 |
dev-libs/boost:=[threads] |
171 |
" |
172 |
DEPEND="${RDEPEND} |
173 |
- >=dev-util/mdds-0.12.0:= |
174 |
+ >=dev-util/mdds-0.12.0:0= |
175 |
" |
176 |
|
177 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
178 |
|
179 |
diff --git a/dev-libs/libixion/libixion-0.9.1.ebuild b/dev-libs/libixion/libixion-0.9.1.ebuild |
180 |
index ff9dd6d..9c993be 100644 |
181 |
--- a/dev-libs/libixion/libixion-0.9.1.ebuild |
182 |
+++ b/dev-libs/libixion/libixion-0.9.1.ebuild |
183 |
@@ -1,4 +1,4 @@ |
184 |
-# Copyright 1999-2015 Gentoo Foundation |
185 |
+# Copyright 1999-2016 Gentoo Foundation |
186 |
# Distributed under the terms of the GNU General Public License v2 |
187 |
# $Id$ |
188 |
|
189 |
@@ -27,7 +27,7 @@ RDEPEND=" |
190 |
python? ( ${PYTHON_DEPS} ) |
191 |
" |
192 |
DEPEND="${RDEPEND} |
193 |
- >=dev-util/mdds-0.12.0:= |
194 |
+ >=dev-util/mdds-0.12.0:0= |
195 |
" |
196 |
|
197 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
198 |
@@ -37,8 +37,9 @@ pkg_setup() { |
199 |
} |
200 |
|
201 |
src_prepare() { |
202 |
- epatch "${FILESDIR}/${PN}-0.9.1-typo.patch" |
203 |
- epatch "${FILESDIR}/${PN}-0.9.1-python-optional.patch" |
204 |
+ epatch "${FILESDIR}/${PN}-0.9.1-typo.patch" \ |
205 |
+ "${FILESDIR}/${PN}-0.9.1-python-optional.patch" \ |
206 |
+ "${FILESDIR}/${PN}-0.9.1-python-symbol.patch" |
207 |
eautoreconf |
208 |
} |
209 |
|
210 |
|
211 |
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild |
212 |
index 676202b..0a1ad43 100644 |
213 |
--- a/dev-libs/libixion/libixion-9999.ebuild |
214 |
+++ b/dev-libs/libixion/libixion-9999.ebuild |
215 |
@@ -1,12 +1,12 @@ |
216 |
-# Copyright 1999-2015 Gentoo Foundation |
217 |
+# Copyright 1999-2016 Gentoo Foundation |
218 |
# Distributed under the terms of the GNU General Public License v2 |
219 |
# $Id$ |
220 |
|
221 |
-EAPI=5 |
222 |
+EAPI=6 |
223 |
|
224 |
EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git" |
225 |
|
226 |
-PYTHON_COMPAT=( python{3_3,3_4} ) |
227 |
+PYTHON_COMPAT=( python{3_3,3_4,3_5} ) |
228 |
|
229 |
[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" |
230 |
inherit eutils python-single-r1 ${GITECLASS} |
231 |
@@ -17,7 +17,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion" |
232 |
[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz" |
233 |
|
234 |
LICENSE="MIT" |
235 |
-SLOT="0/0.12" |
236 |
+SLOT="0/0.11" # based on SONAME of libixion.so |
237 |
[[ ${PV} == 9999 ]] || \ |
238 |
KEYWORDS="~amd64 ~arm ~ppc ~x86" |
239 |
IUSE="python static-libs" |
240 |
@@ -27,7 +27,7 @@ RDEPEND=" |
241 |
python? ( ${PYTHON_DEPS} ) |
242 |
" |
243 |
DEPEND="${RDEPEND} |
244 |
- >=dev-util/mdds-0.12.0:= |
245 |
+ dev-util/mdds:1= |
246 |
" |
247 |
|
248 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
249 |
@@ -37,6 +37,7 @@ pkg_setup() { |
250 |
} |
251 |
|
252 |
src_prepare() { |
253 |
+ eapply_user |
254 |
[[ ${PV} == 9999 ]] && eautoreconf |
255 |
} |
256 |
|
257 |
|
258 |
diff --git a/dev-libs/libixion/metadata.xml b/dev-libs/libixion/metadata.xml |
259 |
index 13ce236..4fc2ac0 100644 |
260 |
--- a/dev-libs/libixion/metadata.xml |
261 |
+++ b/dev-libs/libixion/metadata.xml |
262 |
@@ -5,4 +5,7 @@ |
263 |
<email>office@g.o</email> |
264 |
<name>Gentoo Office project</name> |
265 |
</maintainer> |
266 |
+ <upstream> |
267 |
+ <remote-id type="gitlab">ixion/ixion</remote-id> |
268 |
+ </upstream> |
269 |
</pkgmetadata> |