[gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/

[Dennis Lamm]

commit:     f5f8ac640f14b6c95c7aff796ece44de6e79158f
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 21:34:37 2016 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 21:34:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f8ac64

dev-libs/link-grammar:5.3.3: fixed bug #574872

Package-Manager: portage-2.2.26

 dev-libs/link-grammar/link-grammar-5.3.3.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-libs/link-grammar/link-grammar-5.3.3.ebuild 
b/dev-libs/link-grammar/link-grammar-5.3.3.ebuild
index 546f5cd..dbbbfc4 100644
--- a/dev-libs/link-grammar/link-grammar-5.3.3.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.3.3.ebuild
@@ -15,18 +15,21 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="aspell +hunspell java python static-libs threads"
+IUSE="aspell +hunspell +java python static-libs threads"
 
 DEPEND="
        aspell? ( app-text/aspell )
        hunspell? ( app-text/hunspell )
-       java? ( >=virtual/jdk-0:= dev-java/ant-core )
+       java? ( >=virtual/jdk-1.6:=
+                       dev-java/ant-core )
        ${PYTHON_DEPS}"
 
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-       java-pkg-opt-2_pkg_setup
+       if use java; then
+               java-pkg-opt-2_pkg_setup
+       fi
        if use aspell && use hunspell; then
                ewarn "You have enabled 'aspell' and 'hunspell' support, but 
both cannot coexist,"
                ewarn "only aspell will be build. Press Ctrl+C and set only 
'hunspell' USE flag if"
@@ -40,7 +43,9 @@ src_unpack() {
 }
 
 src_prepare() {
-       java-pkg-opt-2_src_prepare
+       if use java; then
+               java-pkg-opt-2_src_prepare
+       fi
        ./autogen.sh || die
 }