blueness 14/10/22 21:28:51 Modified: xapian-bindings-1.2.19.ebuild ChangeLog Log: Fix multiple PHP_TARGETS, thanks Arfrever (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path 1.3 dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild?r1=1.2&r2=1.3 Index: xapian-bindings-1.2.19.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xapian-bindings-1.2.19.ebuild 21 Oct 2014 21:25:16 -0000 1.2 +++ xapian-bindings-1.2.19.ebuild 22 Oct 2014 21:28:51 -0000 1.3 @@ -1,14 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild,v 1.2 2014/10/21 21:25:16 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild,v 1.3 2014/10/22 21:28:51 blueness Exp $ EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7,3_2} ) +PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -USE_PYTHON='2.6 2.7' -USE_PHP="php5-4" +USE_PHP="php5-4 php5-5 php5-6" PHP_EXT_NAME="xapian" PHP_EXT_INI="yes" @@ -45,6 +44,10 @@ java-pkg-opt-2_pkg_setup } +src_unpack() { + default +} + src_prepare() { java-pkg-opt-2_src_prepare if use java; then @@ -85,13 +88,26 @@ $(use_with tcl) # $(use_with mono csharp) \ - # Python bindings are built/tested/installed manually. + # PHP and Python bindings are built/tested/installed manually. + sed -e "/SUBDIRS =/s/ php//" -i Makefile || die "sed Makefile" sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile" } src_compile() { default + if use php; then + local php_slot + for php_slot in $(php_get_slots); do + cp -r php php-${php_slot} + emake -C php-${php_slot} \ + PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \ + PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \ + PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \ + PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" + done + fi + if use python; then python_copy_sources # building() { @@ -115,6 +131,18 @@ src_test() { default + if use php; then + local php_slot + for php_slot in $(php_get_slots); do + emake -C php-${php_slot} \ + PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \ + PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \ + PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \ + PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \ + check + done + fi + if use python; then testing() { emake -C python \ @@ -128,7 +156,7 @@ } src_install () { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install if use java; then java-pkg_dojar java/built/xapian_jni.jar @@ -139,6 +167,20 @@ rmdir -p "${D}/${S}/java/native" fi + if use php; then + local php_slot + for php_slot in $(php_get_slots); do + emake DESTDIR="${D}" -C php-${php_slot} \ + PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \ + PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \ + PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \ + PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \ + install + done + + php-ext-source-r2_createinifiles + fi + if use python; then installation() { emake -C python \ @@ -151,20 +193,10 @@ python_foreach_impl installation fi - if use php; then - php-ext-source-r2_createinifiles - fi - # For some USE combinations this directory is not created if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" fi - dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed" -} - -pkg_postinst() { - if use php_targets_php5-4; then - ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4" - fi + dodoc AUTHORS HACKING NEWS TODO README } 1.83 dev-libs/xapian-bindings/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.83&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.83&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?r1=1.82&r2=1.83 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- ChangeLog 21 Oct 2014 21:25:16 -0000 1.82 +++ ChangeLog 22 Oct 2014 21:28:51 -0000 1.83 @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/xapian-bindings # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.82 2014/10/21 21:25:16 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.83 2014/10/22 21:28:51 blueness Exp $ + + 22 Oct 2014; Anthony G. Basile <bluen...@gentoo.org> + xapian-bindings-1.2.19.ebuild: + Fix multiple PHP_TARGETS, thanks Arfrever 21 Oct 2014; Andreas K. Huettel <dilfri...@gentoo.org> xapian-bindings-1.2.19.ebuild:
