gentoo auto-resync : 22:07:2022 - 20:47:41

5 files changed, 492 insertions, 5 deletions

diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 2a0ba215d4d6..d2aa90d979fc 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,7 +1,9 @@
+AUX xapian-bindings-1.4.20-slibtool.patch 4917 BLAKE2B 7c2b580e39071e7812067165220fcaef016f8e99f451dd5a1c460198987e5754a075214b67b90712686cd6d345c54f31d3a5b0a6d5b7c0fc94dae9c0422ba0f1 SHA512 ce7ee401e91713c9f914e6c87c2adc968dd8c863f19d597048d2052348abc65760213eded0deec3dc46dd0df637d61a0cfd0986670a1aa9c47c892a6b6c1597d
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
 DIST xapian-bindings-1.4.20.tar.xz 1143304 BLAKE2B 3ab6a9be536d10b0dd369c1c638acbdd7fdf855f6dc8726db9c3791a8369cd83196214771b923aa538e5dda320d2b417f5f0944181b5691cfe5d8e7ddc97dd96 SHA512 bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed
-EBUILD xapian-bindings-1.4.18-r1.ebuild 7061 BLAKE2B 8ab8e0fa2a6ab5bd3bf0298e2afd9dad783abb9660ac104a16046922838b23592c6b7099a47d113039d60be14ab549aace5da5ff602284e48242c4a027429a3d SHA512 57ff3aaa344665e81859569e5d9db86d5efe5c901ddc4c2f5f2970fea0ebe60f62252db1428b74c613da3acfa3f193f45ed66f655b29a562e82c37960fac32d7
-EBUILD xapian-bindings-1.4.19.ebuild 7128 BLAKE2B 4652a7e3551db03f66cc85ef3c2d3ee4688435baa3473ddb5f76621198e95602d68ede04ea1e6ec7b456ac842f18c2fcb7f725de613317420aa9c69d8b1d0fba SHA512 754f18185c7e6a8d75c40462f97086297a66f1b91386a81e8b1e910e291a34b00405adaf17121bb0331ccebcdf21708de1bba885e10b5b3aae1f9094beb434d6
+EBUILD xapian-bindings-1.4.18-r1.ebuild 7047 BLAKE2B 1d2fd7b5d833876d00d49f7f5159255e83233ca662dedb720813d10ce15e39a2bfb46cdb0836b88773d3887469c3a62648356aa8676fe3a2cf1ab8e8e45659d5 SHA512 f1c2675ad652b555cb2be48a1a327192424c5866c04b10c84c9f8ea794fff8d487fc9edfe7417c8bf141fee253f2669c635c51def709818db2f8a3b6fa5a3b45
+EBUILD xapian-bindings-1.4.19.ebuild 7121 BLAKE2B a2c0d20a764a5a192e354986961803e49c535ee2338305366d0dbf93c6f1747654c30b48d01cc1fc3a9876c572e3faa588ef941b1ecad9a938060251d89d7bca SHA512 7b8b48bac9926d5a596b775bd687cafd6fc53a153ba18bc5aac8de1730c258494f7e340c623a56e218b626889f14971f44b9e6606d9cc05dd889d14346e94e84
+EBUILD xapian-bindings-1.4.20-r1.ebuild 7206 BLAKE2B badceb446b50d5b5ecb5e934efdd35daa33bed66cbdd3f0cfd48cd3878f266051c77fe08c57ff13d7dd5d1b020d905cf39269a9201a76cd22c16b348f981901c SHA512 5a58191d7c1b8c07ae331b8b24d656709985ce6bb1187c58435b388e5e52fa91ed78427c4c046f61f76e6d157d6b9db8db209b64d57f5f0564f2208fdba85c71
 EBUILD xapian-bindings-1.4.20.ebuild 7125 BLAKE2B d11fbd87002b5e57c1d3c7ce035e0d517b4cf3750bf4a5cd23c6b97203be3754744c8780d1c90848892ce55da1f1904bb70a1bd22dfaba69531fa320bcac1365 SHA512 bcda12bd88f3a6f16e9e6032a9cd143d79e4402a66f3daea677521d5b3b0502ad59a49ae9778085055498e84c1e9c3bef51e1065ed9a8ae8d2c4c86a3798ff05
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
new file mode 100644
index 000000000000..d73f8bcb19b9
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
@@ -0,0 +1,133 @@
+Upstream-PR: https://github.com/xapian/xapian/pull/322
+
+From c513b0d31d2df31eb57ccbe08bbe46821863557d Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 20 Jul 2022 13:37:20 -0700
+Subject: [PATCH] xapian-bindings: Fix the build with slibtool
+
+With slibtool the --config argument works differently than in GNU
+libtool which results in 'auto/Xapian/Xapian$(PERL_SO)' failing to be
+created. This can be worked around by using libtool --mode=install where
+slibtool can copy the module to the intended location.
+
+However GNU libtool still requires using --config otherwise it fails
+during --mode=install with the following error.
+
+  /bin/bash ../libtool --mode=install cp Xapian.la /home/runner/work/xapian/xapian/perl/auto/Xapian/Xapian.la
+  libtool:   error: error: cannot install 'Xapian.la' to a directory not ending in /usr/local/lib/x86_64-linux-gnu/perl/5.26.1/auto/Xapian
+
+gentoo issue: https://bugs.gentoo.org/793428
+---
+ java/run-java-test  | 21 +++++++++++++++++----
+ perl/Makefile.am    |  9 +++++++--
+ python3/Makefile.am |  9 +++++++--
+ tcl8/run-tcl-test   | 20 +++++++++++++-------
+ 4 files changed, 44 insertions(+), 15 deletions(-)
+
+diff --git a/java/run-java-test b/java/run-java-test
+index d0e97af300e..a838de98492 100755
+--- a/java/run-java-test
++++ b/java/run-java-test
+@@ -1,11 +1,24 @@
+ #!/bin/sh
+ # To run `jdb` instead of `java` set JAVA=jdb
+ # To run under gdb, set JAVA='gdb --args java'
++LIBTOOL="${LIBTOOL-../libtool}"
+ arg=`echo "$1"|sed 's!.*/!!;s!\.class$!!'`
++
++# GNU libtool and slibtool have different and incompatible usage for --config.
++if ${LIBTOOL} --config > libtoolconfig.$$ 2>/dev/null; then
++	. ./libtoolconfig.$$
++else
++	objdir="built/libs"
++	rm -rf "$objdir"
++	mkdir -p "$objdir"
++	${LIBTOOL} --mode=install cp libxapian_jni.la "$objdir"
++fi
++rm -f libtoolconfig.$$
++
+ # Use libtool's -dlopen option to ensure that libxapian_jni.so (or whatever)
+ # is in the shared library path.
+-${LIBTOOL-../libtool} --config > libtoolconfig.$$
+-. ./libtoolconfig.$$
+-rm -f libtoolconfig.$$
+-${LIBTOOL-../libtool} -dlopen libxapian_jni.la --mode=execute \
++${LIBTOOL} -dlopen libxapian_jni.la --mode=execute \
+   $OSX_SIP_HACK_ENV ${JAVA-java} -Djava.library.path="$objdir" -classpath built/xapian.jar${PATHSEP-:}. "$arg"
++rc=$?
++rm -rf built/libs
++exit $rc
+diff --git a/perl/Makefile.am b/perl/Makefile.am
+index 4f2e5e4283d..f71579736e5 100644
+--- a/perl/Makefile.am
++++ b/perl/Makefile.am
+@@ -55,9 +55,14 @@ BUILT_SOURCES = Xapian.pm xapian_wrap.cc \
+ 
+ auto/Xapian/Xapian$(PERL_SO): Xapian.la
+ 	@$(MKDIR_P) auto/Xapian
+-	$(LIBTOOL) --config > libtoolconfig.tmp
++## GNU libtool and slibtool have different and incompatible usage for --config.
++	if $(LIBTOOL) --config > libtoolconfig.tmp 2>/dev/null; then \
+ ## ksh requires a path on the sourced file.
+-	. ./libtoolconfig.tmp; cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian
++		. ./libtoolconfig.tmp; \
++		cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian; \
++	else \
++		$(LIBTOOL) --mode=install cp $< $@; \
++	fi;
+ 	rm -f libtoolconfig.tmp
+ 
+ EXTRA_DIST = perl.i except.i extra.i $(TESTS) \
+diff --git a/python3/Makefile.am b/python3/Makefile.am
+index 3c692a9e2d4..9bf01833636 100644
+--- a/python3/Makefile.am
++++ b/python3/Makefile.am
+@@ -88,9 +88,14 @@ xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@: xapian/__init__.py xapian/
+ 
+ xapian/_xapian$(PYTHON3_EXT_SUFFIX): _xapian.la
+ 	$(MKDIR_P) xapian
+-	$(LIBTOOL) --config > libtoolconfig.tmp
++## GNU libtool and slibtool have different and incompatible usage for --config.
++	if $(LIBTOOL) --config > libtoolconfig.tmp 2>/dev/null; then \
+ ## ksh requires a path on the sourced file.
+-	. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON3_EXT_SUFFIX) xapian
++		. ./libtoolconfig.tmp; \
++		cp $$objdir/_xapian$(PYTHON3_EXT_SUFFIX) xapian; \
++	else \
++		$(LIBTOOL) --mode=install cp $< $@; \
++	fi;
+ 	rm -f libtoolconfig.tmp
+ 
+ CLEANFILES = \
+diff --git a/tcl8/run-tcl-test b/tcl8/run-tcl-test
+index 206b5e0e056..71511032024 100755
+--- a/tcl8/run-tcl-test
++++ b/tcl8/run-tcl-test
+@@ -1,14 +1,20 @@
+ #!/bin/sh
+-${LIBTOOL-../libtool} --config > libtoolconfig.$$
+-. ./libtoolconfig.$$
+-rm -f libtoolconfig.$$
++tclshlibext=`echo 'puts [info sharedlibextension]'|${TCLSH-tclsh}`
++rm -f xapian$tclshlibext
++
++LIBTOOL="${LIBTOOL-../libtool}"
+ module=yes
+-eval shlibext=$shrext_cmds
+ 
+-tclshlibext=`echo 'puts [info sharedlibextension]'|${TCLSH-tclsh}`
++# GNU libtool and slibtool have different and incompatible usage for --config.
++if ${LIBTOOL} --config > libtoolconfig.$$ 2>/dev/null; then
++	. ./libtoolconfig.$$
++	eval shlibext=$shrext_cmds
++	ln -s $objdir/xapian$shlibext xapian$tclshlibext
++else
++	${LIBTOOL} --mode=install cp xapian.la ./xapian$tclshlibext
++fi
++rm -f libtoolconfig.$$
+ 
+-rm -f xapian$tclshlibext
+-ln -s $objdir/xapian$shlibext xapian$tclshlibext
+ $OSX_SIP_HACK_ENV ${TCLSH-tclsh} ${srcdir-.}/runtest.tcl ${srcdir-.}/smoketest.tcl
+ rc=$?
+ rm -f xapian$tclshlibext
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
index c86a53c03216..5c0655965cf7 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-4"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
index a84e74c37607..551cc14289db 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
@@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-{1,3,4} luajit )
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-4 php8-0"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.20-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.20-r1.ebuild
new file mode 100644
index 000000000000..adaa8d9ff860
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.20-r1.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php7-4 php8-0"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby26 ruby27 ruby30"
+RUBY_OPTIONAL="yes"
+
+inherit autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~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 )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.20
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.8:* )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch # 793428
+)
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like lua, php, python and ruby are
+	return $(use mono || use java || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use lua; then
+		lua_copy_sources
+	fi
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+}
+
+src_configure() {
+	# Needed to get e.g. test failure details
+	MAKEOPTS+=" VERBOSE=1"
+
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-lua
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	lua_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-csharp
+			--without-java
+			--without-perl
+			--without-tcl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+			--with-lua
+		)
+
+		local -x LUA_INC="$(lua_get_include_dir)"
+		local -x LUA_LIB="$(lua_get_cmod_dir)"
+
+		econf "${myconf[@]}"
+
+	}
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+			--with-python3
+		)
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${ED}/var" || die "could not remove java cruft!"
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}