Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/xapian-bindings: xapian-bindings-1.2.16.ebuild xapian-bindings-1.2.17.ebuild xapian-bindings-1.3.1.ebuild ChangeLog
Date: Fri, 31 Jan 2014 13:15:48
Message-Id: 20140131131545.175E92004C@flycatcher.gentoo.org
1 blueness 14/01/31 13:15:45
2
3 Modified: xapian-bindings-1.2.16.ebuild
4 xapian-bindings-1.3.1.ebuild ChangeLog
5 Added: xapian-bindings-1.2.17.ebuild
6 Log:
7 Version bump
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
10
11 Revision Changes Path
12 1.2 dev-libs/xapian-bindings/xapian-bindings-1.2.16.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.16.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.16.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.16.ebuild?r1=1.1&r2=1.2
17
18 Index: xapian-bindings-1.2.16.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.16.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- xapian-bindings-1.2.16.ebuild 5 Dec 2013 19:54:43 -0000 1.1
25 +++ xapian-bindings-1.2.16.ebuild 31 Jan 2014 13:15:44 -0000 1.2
26 @@ -1,13 +1,12 @@
27 -# Copyright 1999-2013 Gentoo Foundation
28 +# Copyright 1999-2014 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.16.ebuild,v 1.1 2013/12/05 19:54:43 blueness Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.16.ebuild,v 1.2 2014/01/31 13:15:44 blueness Exp $
32
33 EAPI="5"
34
35 -PYTHON_DEPEND="python? 2"
36 -PYTHON_USE_WITH="threads"
37 -SUPPORT_PYTHON_ABIS="1"
38 -RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
39 +PYTHON_COMPAT=( python{2_6,2_7,3_2} )
40 +PYTHON_REQ_USE="threads"
41 +USE_PYTHON='2.6 2.7'
42
43 USE_PHP="php5-3 php5-4"
44
45 @@ -16,8 +15,8 @@
46 PHP_EXT_OPTIONAL_USE="php"
47
48 #mono violates sandbox, we disable it until we figure this out
49 -#inherit java-pkg-opt-2 mono php-ext-source-r2 python
50 -inherit java-pkg-opt-2 php-ext-source-r2 python
51 +#inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
52 +inherit java-pkg-opt-2 php-ext-source-r2 python-r1
53
54 DESCRIPTION="SWIG and JNI bindings for Xapian"
55 HOMEPAGE="http://www.xapian.org/"
56 @@ -44,10 +43,6 @@
57
58 pkg_setup() {
59 java-pkg-opt-2_pkg_setup
60 -
61 - if use python; then
62 - python_pkg_setup
63 - fi
64 }
65
66 src_prepare() {
67 @@ -61,7 +56,7 @@
68 if use python; then
69 sed \
70 -e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
71 - -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
72 + -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian.so|' \
73 -i python/Makefile.in || die "sed failed"
74 fi
75 }
76 @@ -98,16 +93,22 @@
77 default
78
79 if use python; then
80 - python_copy_sources python
81 + python_copy_sources
82 +# building() {
83 +# emake -C python \
84 +# PYTHON="$(PYTHON)" \
85 +# PYTHON_INC="$(python_get_includedir)" \
86 +# PYTHON_LIB="$(python_get_libdir)" \
87 +# PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
88 +# pkgpylibdir="$(python_get_sitedir)/xapian"
89 +# }
90 building() {
91 - emake \
92 - PYTHON="$(PYTHON)" \
93 + emake -C python \
94 PYTHON_INC="$(python_get_includedir)" \
95 - PYTHON_LIB="$(python_get_libdir)" \
96 - PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
97 pkgpylibdir="$(python_get_sitedir)/xapian"
98 + VERBOSE="1"
99 }
100 - python_execute_function -s --source-dir python building
101 + python_foreach_impl building
102 fi
103 }
104
105 @@ -116,16 +117,13 @@
106
107 if use python; then
108 testing() {
109 - emake \
110 - PYTHON="$(PYTHON)" \
111 + emake -C python \
112 PYTHON_INC="$(python_get_includedir)" \
113 - PYTHON_LIB="$(python_get_libdir)" \
114 - PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
115 pkgpylibdir="$(python_get_sitedir)/xapian" \
116 VERBOSE="1" \
117 check
118 }
119 - python_execute_function -s --source-dir python testing
120 + python_foreach_impl testing
121 fi
122 }
123
124 @@ -143,16 +141,14 @@
125
126 if use python; then
127 installation() {
128 - emake \
129 + emake -C python \
130 DESTDIR="${D}" \
131 - PYTHON="$(PYTHON)" \
132 PYTHON_INC="$(python_get_includedir)" \
133 - PYTHON_LIB="$(python_get_libdir)" \
134 - PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
135 pkgpylibdir="$(python_get_sitedir)/xapian" \
136 + VERBOSE="1" \
137 install
138 }
139 - python_execute_function -s --source-dir python installation
140 + python_foreach_impl installation
141 fi
142
143 if use php; then
144 @@ -168,17 +164,7 @@
145 }
146
147 pkg_postinst() {
148 - if use python; then
149 - python_mod_optimize xapian
150 - fi
151 -
152 if use php_targets_php5-4; then
153 ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
154 fi
155 }
156 -
157 -pkg_postrm() {
158 - if use python; then
159 - python_mod_cleanup xapian
160 - fi
161 -}
162
163
164
165 1.3 dev-libs/xapian-bindings/xapian-bindings-1.3.1.ebuild
166
167 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.3.1.ebuild?rev=1.3&view=markup
168 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.3.1.ebuild?rev=1.3&content-type=text/plain
169 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.3.1.ebuild?r1=1.2&r2=1.3
170
171 Index: xapian-bindings-1.3.1.ebuild
172 ===================================================================
173 RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.3.1.ebuild,v
174 retrieving revision 1.2
175 retrieving revision 1.3
176 diff -u -r1.2 -r1.3
177 --- xapian-bindings-1.3.1.ebuild 11 Aug 2013 00:58:20 -0000 1.2
178 +++ xapian-bindings-1.3.1.ebuild 31 Jan 2014 13:15:44 -0000 1.3
179 @@ -1,6 +1,6 @@
180 -# Copyright 1999-2013 Gentoo Foundation
181 +# Copyright 1999-2014 Gentoo Foundation
182 # Distributed under the terms of the GNU General Public License v2
183 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.3.1.ebuild,v 1.2 2013/08/11 00:58:20 blueness Exp $
184 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.3.1.ebuild,v 1.3 2014/01/31 13:15:44 blueness Exp $
185
186 EAPI="5"
187
188 @@ -15,7 +15,7 @@
189 PHP_EXT_INI="yes"
190 PHP_EXT_OPTIONAL_USE="php"
191
192 -inherit java-pkg-opt-2 mono php-ext-source-r2 python
193 +inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
194
195 DESCRIPTION="SWIG and JNI bindings for Xapian"
196 HOMEPAGE="http://www.xapian.org/"
197 @@ -39,6 +39,7 @@
198 java? ( >=virtual/jre-1.3 )"
199
200 pkg_setup() {
201 + mono-env_pkg_setup
202 java-pkg-opt-2_pkg_setup
203
204 if use python; then
205
206
207
208 1.75 dev-libs/xapian-bindings/ChangeLog
209
210 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.75&view=markup
211 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.75&content-type=text/plain
212 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?r1=1.74&r2=1.75
213
214 Index: ChangeLog
215 ===================================================================
216 RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v
217 retrieving revision 1.74
218 retrieving revision 1.75
219 diff -u -r1.74 -r1.75
220 --- ChangeLog 5 Dec 2013 19:54:43 -0000 1.74
221 +++ ChangeLog 31 Jan 2014 13:15:44 -0000 1.75
222 @@ -1,6 +1,13 @@
223 # ChangeLog for dev-libs/xapian-bindings
224 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
225 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.74 2013/12/05 19:54:43 blueness Exp $
226 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
227 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.75 2014/01/31 13:15:44 blueness Exp $
228 +
229 +*xapian-bindings-1.2.17 (31 Jan 2014)
230 +
231 + 31 Jan 2014; Anthony G. Basile <blueness@g.o>
232 + +xapian-bindings-1.2.17.ebuild, xapian-bindings-1.2.16.ebuild,
233 + xapian-bindings-1.3.1.ebuild:
234 + Version bump
235
236 *xapian-bindings-1.2.15 (05 Dec 2013)
237 *xapian-bindings-1.2.16 (05 Dec 2013)
238
239
240
241 1.1 dev-libs/xapian-bindings/xapian-bindings-1.2.17.ebuild
242
243 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.17.ebuild?rev=1.1&view=markup
244 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.17.ebuild?rev=1.1&content-type=text/plain
245
246 Index: xapian-bindings-1.2.17.ebuild
247 ===================================================================
248 # Copyright 1999-2014 Gentoo Foundation
249 # Distributed under the terms of the GNU General Public License v2
250 # $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.17.ebuild,v 1.1 2014/01/31 13:15:44 blueness Exp $
251
252 EAPI="5"
253
254 PYTHON_COMPAT=( python{2_6,2_7,3_2} )
255 PYTHON_REQ_USE="threads"
256 USE_PYTHON='2.6 2.7'
257
258 USE_PHP="php5-3 php5-4"
259
260 PHP_EXT_NAME="xapian"
261 PHP_EXT_INI="yes"
262 PHP_EXT_OPTIONAL_USE="php"
263
264 #mono violates sandbox, we disable it until we figure this out
265 #inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
266 inherit java-pkg-opt-2 php-ext-source-r2 python-r1
267
268 DESCRIPTION="SWIG and JNI bindings for Xapian"
269 HOMEPAGE="http://www.xapian.org/"
270 SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
271
272 LICENSE="GPL-2"
273 SLOT="0"
274 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
275 #IUSE="java lua mono perl php python ruby tcl"
276 #REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
277 IUSE="java lua perl php python ruby tcl"
278 REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
279
280 COMMONDEPEND="=dev-libs/xapian-${PV}*
281 lua? ( >=dev-lang/lua-5.1 )
282 perl? ( dev-lang/perl )
283 ruby? ( dev-lang/ruby )
284 tcl? ( >=dev-lang/tcl-8.1 )"
285 # mono? ( >=dev-lang/mono-1.0.8 )
286 DEPEND="${COMMONDEPEND}
287 java? ( >=virtual/jdk-1.3 )"
288 RDEPEND="${COMMONDEPEND}
289 java? ( >=virtual/jre-1.3 )"
290
291 pkg_setup() {
292 java-pkg-opt-2_pkg_setup
293 }
294
295 src_prepare() {
296 java-pkg-opt-2_src_prepare
297 if use java; then
298 sed \
299 -e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
300 -i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
301 fi
302
303 if use python; then
304 sed \
305 -e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
306 -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian.so|' \
307 -i python/Makefile.in || die "sed failed"
308 fi
309 }
310
311 src_configure() {
312 if use java; then
313 CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
314 fi
315
316 if use perl; then
317 export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
318 export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
319 fi
320
321 if use lua; then
322 export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
323 fi
324
325 econf \
326 $(use_with java) \
327 $(use_with lua) \
328 $(use_with perl) \
329 $(use_with php) \
330 $(use_with python) \
331 $(use_with ruby) \
332 $(use_with tcl)
333 # $(use_with mono csharp) \
334
335 # Python bindings are built/tested/installed manually.
336 sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
337 }
338
339 src_compile() {
340 default
341
342 if use python; then
343 python_copy_sources
344 # building() {
345 # emake -C python \
346 # PYTHON="$(PYTHON)" \
347 # PYTHON_INC="$(python_get_includedir)" \
348 # PYTHON_LIB="$(python_get_libdir)" \
349 # PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
350 # pkgpylibdir="$(python_get_sitedir)/xapian"
351 # }
352 building() {
353 emake -C python \
354 PYTHON_INC="$(python_get_includedir)" \
355 pkgpylibdir="$(python_get_sitedir)/xapian"
356 VERBOSE="1"
357 }
358 python_foreach_impl building
359 fi
360 }
361
362 src_test() {
363 default
364
365 if use python; then
366 testing() {
367 emake -C python \
368 PYTHON_INC="$(python_get_includedir)" \
369 pkgpylibdir="$(python_get_sitedir)/xapian" \
370 VERBOSE="1" \
371 check
372 }
373 python_foreach_impl testing
374 fi
375 }
376
377 src_install () {
378 emake DESTDIR="${D}" install || die "emake install failed"
379
380 if use java; then
381 java-pkg_dojar java/built/xapian_jni.jar
382 # TODO: make the build system not install this...
383 java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
384 rm "${D}/${S}/java/built/libxapian_jni.so"
385 rmdir -p "${D}/${S}/java/built"
386 rmdir -p "${D}/${S}/java/native"
387 fi
388
389 if use python; then
390 installation() {
391 emake -C python \
392 DESTDIR="${D}" \
393 PYTHON_INC="$(python_get_includedir)" \
394 pkgpylibdir="$(python_get_sitedir)/xapian" \
395 VERBOSE="1" \
396 install
397 }
398 python_foreach_impl installation
399 fi
400
401 if use php; then
402 php-ext-source-r2_createinifiles
403 fi
404
405 # For some USE combinations this directory is not created
406 if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
407 mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
408 fi
409
410 dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed"
411 }
412
413 pkg_postinst() {
414 if use php_targets_php5-4; then
415 ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
416 fi
417 }