Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-text/xapian-omega/Manifest1
-rw-r--r--app-text/xapian-omega/xapian-omega-1.2.23-r2.ebuild46
-rw-r--r--app-text/xapian-omega/xapian-omega-1.3.7-r1.ebuild46
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.1.ebuild (renamed from app-text/xapian-omega/xapian-omega-1.4.0.ebuild)0
-rw-r--r--dev-libs/xapian-bindings/Manifest4
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.2.23.ebuild203
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.3.7-r2.ebuild120
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.4.1.ebuild (renamed from dev-libs/xapian-bindings/xapian-bindings-1.4.0-r1.ebuild)7
8 files changed, 5 insertions, 422 deletions
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 35581c0db3d8..b12c63ed0229 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -3,3 +3,4 @@ DIST xapian-omega-1.2.23.tar.xz 437912 SHA256 55c790204fc0b1ddbd4bdae73aa55eed40
DIST xapian-omega-1.2.24.tar.xz 438104 SHA256 45fca431b812ddacbd592b522389474317af386b3ab554908edd36fc5918da53 SHA512 df483ed1410ca04df3b1ec4248442c91b03bd407737d022e494ffe3e14d62a41ee73b27114a979f59825e0ea2f2d16e0eea3c518a8db0094d697f0093e21f6a7 WHIRLPOOL af7a01659a48cf63a63dfe231cd39bc9d1dabb4e3e097262d21b73d3b99145ba3fe348c3126103dc3c91f4b9a2a1a61c1a4a80b0a0830580bcdf1b5a0cd8c393
DIST xapian-omega-1.3.7.tar.xz 490156 SHA256 3d3064289dc891c774a6be8b6e2f0f21691b88ab57ec7a5d16141179027c7453 SHA512 87aea7e59a612b6757d6c826b328542f5696d544906e85009063b8a7206a9cbf50457f7a03e3d2c25ebfd95d37e3c2a75ee70d2da7c3e1bd021e6c15092a1755 WHIRLPOOL 5da58ff0e30c0341b7f653b30be12770fea82d3f6e6041d8fd82be1ca75b3e058336854a4a651d430c71dbacfebb91b9b0eb4b95ced99ba983bddcd690acb92b
DIST xapian-omega-1.4.0.tar.xz 490224 SHA256 10fc0635b5009bbe726461a62867abf6761bd8cfb812c2ead9646a166a20431f SHA512 973c456e6d6f5b0818ec6ae1fe8e2ad221ddb5f497a0e51ea552b3e634414f0110311de848276904cff9712dcde7f6468f7152e802a912477e087a17d254d65e WHIRLPOOL 94d3d8bf591dd1cba33b6ab5c09159d596d422a822537890a04106feabd2604c19986f2c5a40800d656090c76e224b25a061b61f84c219b457ea19c350d9bd97
+DIST xapian-omega-1.4.1.tar.xz 494868 SHA256 d114bb16431adad50f505edadfb4c97aca9657132b239509ff8cf335aff738af SHA512 19891f5d0e901027e734041fc29b223ef002029b9ffdb91797b8b382132fcf7c335114ca7bec0ff21970a7435758e24675f1577dbb615f3cacad105d8ee91415 WHIRLPOOL d63f91dc0a9893ead23756eb4289ddb9868caf39ea4a5991c5645e50352014480fb98f31f1b6bc2715b1a0b99880c5d9b8e0e63f1792a423a5df2221c080cd0f
diff --git a/app-text/xapian-omega/xapian-omega-1.2.23-r2.ebuild b/app-text/xapian-omega/xapian-omega-1.2.23-r2.ebuild
deleted file mode 100644
index 164eebbecc45..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.2.23-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/1.2.22
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- #move docs to /usr/share/doc/${PF}.
- mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.3.7-r1.ebuild b/app-text/xapian-omega/xapian-omega-1.3.7-r1.ebuild
deleted file mode 100644
index 207ee1dfc00c..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/1.3.8
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- #move docs to /usr/share/doc/${PF}.
- mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.0.ebuild b/app-text/xapian-omega/xapian-omega-1.4.1.ebuild
index faa7c7725330..faa7c7725330 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.0.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.1.ebuild
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 3a54de90153a..add8375f7632 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,3 @@
DIST xapian-bindings-1.2.22.tar.xz 844040 SHA256 b15ca7984980a1d2aedd3378648ef5f3889cb39a047bac1522a8e5d04f0a8557 SHA512 0eec204ebb92f1230b9dbd080ad2b56ea5fa8e6170eb4354556e5790c7a7da7ba4c8475aaf86fb8f10f102a461d91590184271220626315f55c0631e73e122e0 WHIRLPOOL 05ac5b31d73f9de0c101da832ef289f6a505baa68216eba6fa0cf80df1709feef7e42c7b8f4cf9af35f775e8514c6d4b944c2acebffff10bc558a83305a637ce
-DIST xapian-bindings-1.2.23.tar.xz 885888 SHA256 19b4b56c74863c51733d8c2567272ef7f004b898cf44016711ae25bc524b2215 SHA512 4be9d103a4073a08d2481e9ddc347156d4028a1517f313861ad3664e6103e052dc1a0d07a992da3ca02599505c002d09d77c4fd886c144918aab72977e69994c WHIRLPOOL 1323e51dcd8f18f573f9338d9a013bfd370870c1fd2c0b0e3ff9d1f6b3b9154a0512d7442d7c7b1b00a70757faa218e8894a0f4fe56da88bca12ba2259cd35de
DIST xapian-bindings-1.2.24.tar.xz 886148 SHA256 0c2a0df0a4616e2bd8e578d372c9bb4684780573abebbd1ac515502177229965 SHA512 aaedac02ec9fb192ef8b45b07bef5584bc60aff7068c2e3fa0008430ed8296a653780cad04176431d81fe014802df333a3090469dce63204923eead15e6bbaef WHIRLPOOL 996b960727a79dbe669ae8139863c3896c6efdbe781177098d00960982b86a43739433c69db32e62b6660dd4751736d859f5d950d26d6b635c310c35d75a8a0f
-DIST xapian-bindings-1.3.7.tar.xz 1021176 SHA256 f014bb0281fdaa08fd9293ee187af0c2165f4fd2de91a67b76d9327b64677717 SHA512 3dc7eac68c4f3010e5cb831b4baad7bea4d47e0a8dc492ac16f2437057da351caad008aa7bcf3f2bbdaffda7d2524e8b5a945b651dc02deadeb110073ef06ad8 WHIRLPOOL f68a81a37b9c298ad6b061f597806b0823ba01ee02c0921e90988c984ac2f60ec0cb09dba8bdecb43c412517eebd72490196923db474e5362d17c47af4b4fdd2
-DIST xapian-bindings-1.4.0.tar.xz 1021244 SHA256 3aec7a009d0bf0b95968420bf68683176c05d63140eaf1cf265d39afe8fa6253 SHA512 16523be4f2cd576819771e387d469c91cd03b27522808eebc9275ac3281e55c5d40a5c620ad37f96c2dbc89cc2b13808579e29d737eb63584b8c209597b0f7ce WHIRLPOOL 26a31b8a2ca8bd08a45e79fb5f926e917db8e65d8ee1f07c9291c573b8efa647c9ff7bc1c6c3130ae69538ffa1789a0ad60d940f00b758066e55f4835ec20433
+DIST xapian-bindings-1.4.1.tar.xz 1059412 SHA256 6ca9731eed0fdfd84c6f8d788389bc7e7a7dc62fa46e0383eb0bb502576c2331 SHA512 5a7e070d25a8ffe50e5bed473b4975366533ee646699c5c53fc0eb797a4d031c87fc8e5b0b93f77a9f122d17022cbc97862ae93c0d3510cd77588f2cd77dd179 WHIRLPOOL 153f5f5ae42dec8a4b12824a28d391f779dcccb5068b161c303c5374827fe585481c501abdcd56f501329a9e393d49f3a29c45d24111367dad6362ac2b5f28bb
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.23.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.23.ebuild
deleted file mode 100644
index bf94b16dcd8d..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.23.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-USE_PHP="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 toolchain-funcs
-
-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:0/1.2.22
- lua? ( dev-lang/lua:0 )
- perl? ( dev-lang/perl:= )
- ruby? ( dev-lang/ruby:= )
- tcl? ( >=dev-lang/tcl-8.1:0= )"
-# mono? ( >=dev-lang/mono-1.0.8 )
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
- 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="$($(tc-getPKG_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
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.7-r2.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.7-r2.ebuild
deleted file mode 100644
index 88772b9f6fd1..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.7-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE=threads
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-DISTUTILS_IN_SOURCE_BUILD=yesplz
-
-USE_PHP="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 distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
-inherit libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
-
-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"
-IUSE="java lua perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
-
-COMMONDEPEND="dev-libs/xapian:0/1.3.8
- lua? ( dev-lang/lua:= )
- perl? ( dev-lang/perl:= )
- python? (
- dev-python/sphinx
- ${PYTHON_DEPS}
- )
- ruby? ( dev-lang/ruby:= )
- tcl? ( dev-lang/tcl:= )"
-# mono? ( dev-lang/mono )
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
- java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-# use mono && mono-env_pkg_setup
- use java && java-pkg-opt-2_pkg_setup
-# use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use java && java-pkg-opt-2_src_prepare
-
- # http://trac.xapian.org/ticket/702
- export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
- # Accept ruby 2.0 - patch configure directly to avoid autoreconf
- epatch "${FILESDIR}"/${PN}-1.3.6-allow-ruby-2.0.patch
-}
-
-src_configure() {
- if use java; then
- export 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="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
- fi
-
- econf \
- --disable-documentation \
- $(use_with java) \
- $(use_with lua) \
- --without-csharp \
- $(use_with perl) \
- $(use_with php) \
- $(use_with python) \
- $(use_with python python3) \
- $(use_with ruby) \
- $(use_with tcl)
-# $(use_with mono csharp)
-}
-
-src_compile() {
- local -x PYTHONDONTWRITEBYTECODE=
- default
-}
-
-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 java/.libs/libxapian_jni.so
- rm -rf "${D}var" || die "could not remove java cruft!"
- fi
-
- use php && php-ext-source-r2_createinifiles
-
- # 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}" || die
- fi
-
- dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.0-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.1.ebuild
index 4e8c17584411..c1bfac4d11e1 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.0-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE=threads
DISTUTILS_SINGLE_IMPL=yesplz
DISTUTILS_OPTIONAL=yesplz
@@ -18,7 +18,7 @@ PHP_EXT_OPTIONAL_USE="php"
#mono violates sandbox, we disable it until we figure this out
#inherit distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
-inherit libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
+inherit distutils-r1 libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
DESCRIPTION="SWIG and JNI bindings for Xapian"
HOMEPAGE="http://www.xapian.org/"
@@ -53,7 +53,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
pkg_setup() {
# use mono && mono-env_pkg_setup
use java && java-pkg-opt-2_pkg_setup
-# use python && python-single-r1_pkg_setup
+ use python && python-single-r1_pkg_setup
}
src_prepare() {
@@ -88,7 +88,6 @@ src_configure() {
$(use_with perl) \
$(use_with php) \
$(use_with python) \
- $(use_with python python3) \
$(use_with ruby) \
$(use_with tcl)
# $(use_with mono csharp)