summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-02 05:45:33 +0100
committerSam James <sam@gentoo.org>2021-04-03 16:54:37 +0100
commitb941bfb650a31bd32c07e00f0a5ea9da6a1e889c (patch)
tree5113dd773d9117cac9b3c932bdeb622f635abea2 /dev-libs/xapian-bindings
parentdev-libs/uulib: EAPI 7, fix libtool invocation, eutils-- (diff)
downloadgentoo-b941bfb650a31bd32c07e00f0a5ea9da6a1e889c.tar.gz
gentoo-b941bfb650a31bd32c07e00f0a5ea9da6a1e889c.tar.bz2
gentoo-b941bfb650a31bd32c07e00f0a5ea9da6a1e889c.zip
dev-libs/xapian-bindings: drop unused toolchain-funcs, use ${ED}
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/xapian-bindings')
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild8
1 files changed, 4 insertions, 4 deletions
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 81718c3911f..92b6d26f596 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
@@ -17,7 +17,7 @@ PHP_EXT_OPTIONAL_USE="php"
USE_RUBY="ruby24 ruby25 ruby26"
RUBY_OPTIONAL="yes"
-inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+inherit 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/"
@@ -311,7 +311,7 @@ src_install() {
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 "${D}var" || die "could not remove java cruft!"
+ rm -rf "${ED}/var" || die "could not remove java cruft!"
fi
if use lua; then
@@ -334,8 +334,8 @@ src_install() {
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}" || die
+ 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