From: Pacho Ramos <pacho@gentoo.org>
Date: Thu, 28 Jun 2018 18:48:50 +0000 (+0200)
Subject: dev-libs/xapian-bindings: Fix install (#625592) and deps (#634738)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5677cf5377b20c0f417b1dc9367d8b9d22ac7d67;p=gentoo.git

dev-libs/xapian-bindings: Fix install (#625592) and deps (#634738)

Package-Manager: Portage-2.3.41, Repoman-2.3.9
---

diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
index e8660201f73f..ae965e300f7d 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	ruby? ( || ( $(ruby_get_use_targets) ) )"
 
-COMMONDEPEND="dev-libs/xapian:0/30
+COMMONDEPEND=">=dev-libs/xapian-1.4.5:0/30
 	lua? ( dev-lang/lua:= )
 	perl? ( dev-lang/perl:= )
 	python? (
@@ -275,7 +275,7 @@ src_install() {
 	fi
 
 	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
+		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!"