commit: 7551503c25287bff9b02c956f660adf647ec4c87 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Tue Jan 5 18:56:14 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Tue Jan 5 18:56:14 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7551503c
sci-biology/conrad: works just fine with jdk-1.8 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> sci-biology/conrad/conrad-1.ebuild | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sci-biology/conrad/conrad-1.ebuild b/sci-biology/conrad/conrad-1.ebuild index 66acb381f..2185a23dd 100644 --- a/sci-biology/conrad/conrad-1.ebuild +++ b/sci-biology/conrad/conrad-1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit java-pkg-2 java-ant-2 @@ -11,13 +11,11 @@ SRC_URI="https://downloads.sourceforge.net/project/conradcrf/conradcrf/Version%2 LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="" -IUSE="" +KEYWORDS="~amd64" -# upstream binaries do not work with oracle-java-8 RDEPEND=" >=virtual/jre-1.5:* - <=virtual/jre-1.7:* + <virtual/jdk-1.9:* dev-java/commons-logging >=dev-java/commons-lang-2.1:* dev-java/colt @@ -27,7 +25,7 @@ RDEPEND=" # dev-java/LBFGS # LBFGS is a numericla library we use internally for the solver DEPEND="${RDEPEND} >=virtual/jdk-1.5:* - <=virtual/jdk-1.7:* + <virtual/jdk-1.9:* dev-java/ant-core >=dev-java/jfreechart-1.0.3 >=dev-java/jcommon-1.0.6 @@ -36,6 +34,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}" src_prepare(){ + default sed -e s'#lib/conrad.jar#/usr/share/conrad/lib/conrad.jar#' -i bin/conrad.sh || die } @@ -46,9 +45,7 @@ src_compile(){ src_install() { dobin bin/conrad.sh - java-pkg_newjar lib/conrad.jar java-pkg_dojar lib/conrad.jar java-pkg_dolauncher conrad --jar conrad.jar - insinto /usr/share/conrad dodoc -r docs models samples trainingFiles }
