From c526154e65ee89aec7ce1841cf7e5a54ce34f698 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Wed, 14 Dec 2011 11:21:00 +0000 Subject: [PATCH] Version bump, bug #394413 Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- dev-libs/xapian-bindings/ChangeLog | 8 +- .../xapian-bindings-1.2.8.ebuild | 168 ++++++++++++++++++ dev-libs/xapian/ChangeLog | 7 +- dev-libs/xapian/xapian-1.2.8.ebuild | 66 +++++++ 4 files changed, 247 insertions(+), 2 deletions(-) create mode 100644 dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild create mode 100644 dev-libs/xapian/xapian-1.2.8.ebuild diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog index 25cd9a95314f..15a9d07b13fc 100644 --- a/dev-libs/xapian-bindings/ChangeLog +++ b/dev-libs/xapian-bindings/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/xapian-bindings # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.25 2011/09/18 08:43:28 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.26 2011/12/14 11:21:00 blueness Exp $ + +*xapian-bindings-1.2.8 (14 Dec 2011) + + 14 Dec 2011; Anthony G. Basile + +xapian-bindings-1.2.8.ebuild: + Version bump, bug #394413 *xapian-bindings-1.2.7-r2 (18 Sep 2011) diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild new file mode 100644 index 000000000000..44987c3915f9 --- /dev/null +++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2011 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.8.ebuild,v 1.1 2011/12/14 11:21:00 blueness Exp $ + +EAPI="3" +PYTHON_DEPEND="python? 2" +PYTHON_USE_WITH="threads" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython" + +PHP_EXT_NAME="xapian" +PHP_EXT_INI="yes" +PHP_EXT_OPTIONAL_USE="php" + +inherit java-pkg-opt-2 mono 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.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="java lua mono perl php python ruby tcl" + +COMMONDEPEND="=dev-libs/xapian-${PV}* + lua? ( >=dev-lang/lua-5.1 ) + mono? ( >=dev-lang/mono-1.0.8 ) + perl? ( dev-lang/perl ) + ruby? ( dev-lang/ruby ) + tcl? ( >=dev-lang/tcl-8.1 )" +DEPEND="${COMMONDEPEND} + java? ( >=virtual/jdk-1.3 )" +RDEPEND="${COMMONDEPEND} + java? ( >=virtual/jre-1.3 )" + +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 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$(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 + + 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 +} + +pkg_postrm() { + if use python; then + python_mod_cleanup xapian + fi +} diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog index 60cab4afb5f6..b3dd7a030e68 100644 --- a/dev-libs/xapian/ChangeLog +++ b/dev-libs/xapian/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/xapian # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.67 2011/11/07 09:32:30 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.68 2011/12/14 11:19:43 blueness Exp $ + +*xapian-1.2.8 (14 Dec 2011) + + 14 Dec 2011; Anthony G. Basile +xapian-1.2.8.ebuild: + Version bump, bug #394413 07 Nov 2011; Anthony G. Basile -xapian-1.2.7-r2.ebuild, metadata.xml: diff --git a/dev-libs/xapian/xapian-1.2.8.ebuild b/dev-libs/xapian/xapian-1.2.8.ebuild new file mode 100644 index 000000000000..7ca14d40570e --- /dev/null +++ b/dev-libs/xapian/xapian-1.2.8.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.8.ebuild,v 1.1 2011/12/14 11:19:43 blueness Exp $ + +EAPI=4 + +inherit multilib + +MY_P="${PN}-core-${PV}" + +DESCRIPTION="Xapian Probabilistic Information Retrieval library" +HOMEPAGE="http://www.xapian.org/" +SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc static-libs -sse +sse2 +brass +chert +flint +inmemory +remote" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local myconf="" + + ewarn + if use sse2; then + ewarn "Using sse2" + myconf="${myconf} --enable-sse=sse2" + else + if use sse; then + ewarn "Using sse" + myconf="${myconf} --enable-sse=sse" + else + ewarn "Disabling sse and sse2" + myconf="${myconf} --disable-sse" + fi + fi + ewarn + + myconf="${myconf} $(use_enable static-libs static)" + + use brass || myconf="${myconf} --disable-backend-brass" + use chert || myconf="${myconf} --disable-backend-chert" + use flint || myconf="${myconf} --disable-backend-flint" + use inmemory || myconf="${myconf} --disable-backend-inmemory" + use remote || myconf="${myconf} --disable-backend-remote" + + econf $myconf +} + +src_install() { + emake DESTDIR="${D}" install + rm -rf "${D}usr/$(get_libdir)/libxapian.la" + + mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}" + use doc || rm -rf "${D}usr/share/doc/${PF}" + + dodoc AUTHORS HACKING PLATFORMS README NEWS +} + +src_test() { + emake check VALGRIND= +} -- 2.26.2