blueness    15/04/20 23:05:51

  Modified:             ChangeLog
  Added:                xapian-bindings-1.3.2.ebuild
                        xapian-bindings-1.2.20.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
0xF52D4BBA)

Revision  Changes    Path
1.100                dev-libs/xapian-bindings/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.100&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.100&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?r1=1.99&r2=1.100

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog   19 Apr 2015 06:56:05 -0000      1.99
+++ ChangeLog   20 Apr 2015 23:05:51 -0000      1.100
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.99 
2015/04/19 06:56:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.100 
2015/04/20 23:05:51 blueness Exp $
+
+*xapian-bindings-1.2.20 (20 Apr 2015)
+*xapian-bindings-1.3.2 (20 Apr 2015)
+
+  20 Apr 2015; Anthony G. Basile <[email protected]>
+  +xapian-bindings-1.2.20.ebuild, +xapian-bindings-1.3.2.ebuild:
+  Version bump.
 
   19 Apr 2015; Pacho Ramos <[email protected]> xapian-bindings-1.2.19.ebuild:
   x86 stable wrt bug #531758



1.1                  dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild?rev=1.1&content-type=text/plain

Index: xapian-bindings-1.3.2.ebuild
===================================================================
# Copyright 1999-2015 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.3.2.ebuild,v 
1.1 2015/04/20 23:05:51 blueness Exp $

EAPI="5"

PYTHON_DEPEND="python? 2"
PYTHON_USE_WITH="threads"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"

USE_PHP="php5-4"

PHP_EXT_NAME="xapian"
PHP_EXT_INI="yes"
PHP_EXT_OPTIONAL_USE="php"

inherit java-pkg-opt-2 mono-env php-ext-source-r2 python

DESCRIPTION="SWIG and JNI bindings for Xapian"
HOMEPAGE="http://www.xapian.org/";
SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz";

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="java lua mono perl php python ruby tcl"
REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"

COMMONDEPEND="=dev-libs/xapian-${PV}*
        lua? ( dev-lang/lua:= )
        mono? ( >=dev-lang/mono-1.0.8 )
        perl? ( dev-lang/perl:= )
        ruby? ( dev-lang/ruby:= )
        tcl? ( >=dev-lang/tcl-8.1:0= )"
DEPEND="${COMMONDEPEND}
        java? ( >=virtual/jdk-1.3 )"
RDEPEND="${COMMONDEPEND}
        java? ( >=virtual/jre-1.3 )"

pkg_setup() {
        mono-env_pkg_setup
        java-pkg-opt-2_pkg_setup

        if use python; then
                python_pkg_setup
        fi
}

src_prepare() {
        java-pkg-opt-2_src_prepare

        if use python; then
                sed \
                        -e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
                        -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 
xapian/_xapian$(PYTHON_SO)|' \
                        -i python/Makefile.in || die "sed failed"
        fi
}

src_configure() {
        if use java; then
                CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
        fi

        if use perl; then
                export PERL_ARCH="$(perl -MConfig -e 'print 
$Config{installvendorarch}')"
                export PERL_LIB="$(perl -MConfig -e 'print 
$Config{installvendorlib}')"
        fi

        if use lua; then
                export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
        fi

        econf \
                $(use_with java) \
                $(use_with lua) \
                $(use_with mono csharp) \
                $(use_with perl) \
                $(use_with php) \
                $(use_with python) \
                $(use_with ruby) \
                $(use_with tcl)

        # Python bindings are built/tested/installed manually.
        sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
}

src_compile() {
        default

        if use python; then
                python_copy_sources python
                building() {
                        emake \
                                PYTHON="$(PYTHON)" \
                                PYTHON_INC="$(python_get_includedir)" \
                                PYTHON_LIB="$(python_get_libdir)" \
                                PYTHON_SO="$("$(PYTHON)" -c 'import 
distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
                                pkgpylibdir="$(python_get_sitedir)/xapian"
                }
                python_execute_function -s --source-dir python building
        fi
}

src_test() {
        default

        if use python; then
                testing() {
                        emake \
                                PYTHON="$(PYTHON)" \
                                PYTHON_INC="$(python_get_includedir)" \
                                PYTHON_LIB="$(python_get_libdir)" \
                                PYTHON_SO="$("$(PYTHON)" -c 'import 
distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
                                pkgpylibdir="$(python_get_sitedir)/xapian" \
                                VERBOSE="1" \
                                check
                }
                python_execute_function -s --source-dir python testing
        fi
}

src_install () {
        emake DESTDIR="${D}" install || die "emake install failed"

        if use java; then
                java-pkg_dojar java/built/xapian_jni.jar
                # TODO: make the build system not install this...
                java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
                rm "${D}/${S}/java/built/libxapian_jni.so"
                rmdir -p "${D}/${S}/java/built"
                rmdir -p "${D}/${S}/java/native"
        fi

        if use python; then
                installation() {
                        emake \
                                DESTDIR="${D}" \
                                PYTHON="$(PYTHON)" \
                                PYTHON_INC="$(python_get_includedir)" \
                                PYTHON_LIB="$(python_get_libdir)" \
                                PYTHON_SO="$("$(PYTHON)" -c 'import 
distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
                                pkgpylibdir="$(python_get_sitedir)/xapian" \
                                install
                }
                python_execute_function -s --source-dir python 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 python; then
                python_mod_optimize xapian
        fi

        if use php_targets_php5-4; then
                ewarn "Note: subclassing Xapian classes in PHP currently 
doesn't work with PHP 5.4"
        fi
}

pkg_postrm() {
        if use python; then
                python_mod_cleanup xapian
        fi
}



1.1                  dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild?rev=1.1&content-type=text/plain

Index: xapian-bindings-1.2.20.ebuild
===================================================================
# Copyright 1999-2015 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.20.ebuild,v
 1.1 2015/04/20 23:05:51 blueness Exp $

EAPI="5"

PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"

USE_PHP="php5-4 php5-5 php5-6"

PHP_EXT_NAME="xapian"
PHP_EXT_INI="yes"
PHP_EXT_OPTIONAL_USE="php"

#mono violates sandbox, we disable it until we figure this out
#inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
inherit java-pkg-opt-2 php-ext-source-r2 python-r1

DESCRIPTION="SWIG and JNI bindings for Xapian"
HOMEPAGE="http://www.xapian.org/";
SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz";

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
#IUSE="java lua mono perl php python ruby tcl"
#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
IUSE="java lua perl php python ruby tcl"
REQUIRED_USE="|| ( java lua perl php python ruby tcl )"

COMMONDEPEND="=dev-libs/xapian-${PV}*
        lua? ( dev-lang/lua:= )
        perl? ( dev-lang/perl:= )
        ruby? ( dev-lang/ruby:= )
        tcl? ( >=dev-lang/tcl-8.1:0= )"
#       mono? ( >=dev-lang/mono-1.0.8 )
DEPEND="${COMMONDEPEND}
        java? ( >=virtual/jdk-1.3 )"
RDEPEND="${COMMONDEPEND}
        java? ( >=virtual/jre-1.3 )"

pkg_setup() {
        java-pkg-opt-2_pkg_setup
}

src_unpack() {
        default
}

src_prepare() {
        java-pkg-opt-2_src_prepare
        if use java; then
                sed \
                        -e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
                        -i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in 
|| die "sed failed"
        fi

        if use python; then
                sed \
                        -e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
                        -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 
xapian/_xapian.so|' \
                        -i python/Makefile.in || die "sed failed"
        fi
}

src_configure() {
        if use java; then
                CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
        fi

        if use perl; then
                export PERL_ARCH="$(perl -MConfig -e 'print 
$Config{installvendorarch}')"
                export PERL_LIB="$(perl -MConfig -e 'print 
$Config{installvendorlib}')"
        fi

        if use lua; then
                export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
        fi

        econf \
                $(use_with java) \
                $(use_with lua) \
                $(use_with perl) \
                $(use_with php) \
                $(use_with python) \
                $(use_with ruby) \
                $(use_with tcl)
#               $(use_with mono csharp) \

        # 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() {
#                       emake -C python \
#                               PYTHON="$(PYTHON)" \
#                               PYTHON_INC="$(python_get_includedir)" \
#                               PYTHON_LIB="$(python_get_libdir)" \
#                               PYTHON_SO="$("$(PYTHON)" -c 'import 
distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
#                               pkgpylibdir="$(python_get_sitedir)/xapian"
#               }
                building() {
                        emake -C python \
                                PYTHON_INC="$(python_get_includedir)" \
                                pkgpylibdir="$(python_get_sitedir)/xapian"
                                VERBOSE="1"
                }
                python_foreach_impl building
        fi
}

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 \
                                PYTHON_INC="$(python_get_includedir)" \
                                pkgpylibdir="$(python_get_sitedir)/xapian" \
                                VERBOSE="1" \
                                check
                }
                python_foreach_impl testing
        fi
}

src_install () {
        emake DESTDIR="${D}" install

        if use java; then
                java-pkg_dojar java/built/xapian_jni.jar
                # TODO: make the build system not install this...
                java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
                rm "${D}/${S}/java/built/libxapian_jni.so"
                rmdir -p "${D}/${S}/java/built"
                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 \
                                DESTDIR="${D}" \
                                PYTHON_INC="$(python_get_includedir)" \
                                pkgpylibdir="$(python_get_sitedir)/xapian" \
                                VERBOSE="1" \
                                install
                }
                python_foreach_impl installation
        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
}




Reply via email to