commit: c884caac2a3f227502ac2e8f5ee5cbcd6985d3a1 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Wed Mar 3 12:29:47 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Wed Mar 3 12:29:47 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c884caac
dev-java/netcdf: EAPI bump, fix build Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> dev-java/netcdf/netcdf-4.2.ebuild | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dev-java/netcdf/netcdf-4.2.ebuild b/dev-java/netcdf/netcdf-4.2.ebuild index 9b7d03fc5..0514802dc 100644 --- a/dev-java/netcdf/netcdf-4.2.ebuild +++ b/dev-java/netcdf/netcdf-4.2.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 JAVA_PKG_IUSE="doc examples source test" -inherit eutils java-pkg-2 java-ant-2 + +inherit java-pkg-2 java-ant-2 DESCRIPTION="Java Common Data Model (CDM) interface to to netCDF files" HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf-java/"; @@ -13,32 +14,33 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/${PN}-java/v${PV}/ncSrc-${PV}.zip"; LICENSE="netCDF" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" CDEPEND=" - dev-java/commons-codec - dev-java/commons-httpclient - dev-java/commons-logging - dev-java/ehcache:* - dev-java/jcommon - dev-java/jdom:* - dev-java/jfreechart - dev-java/jgoodies-forms:* - dev-java/joda-time - dev-java/log4j - dev-java/slf4j-api - dev-java/protobuf-java" + dev-java/commons-codec:0 + dev-java/commons-httpclient:3 + dev-java/commons-logging:0 + dev-java/ehcache:1.2 + dev-java/jcommon:1.0 + dev-java/jdom:0 + dev-java/jfreechart:1.0 + dev-java/jgoodies-forms:0 + dev-java/joda-time:0 + dev-java/junit:4 + dev-java/log4j:0 + dev-java/slf4j-api:0 + dev-java/protobuf-java:0 +" RDEPEND="${CDEPEND} >=virtual/jre-1.5" DEPEND="${CDEPEND} >=virtual/jdk-1.5 - app-arch/unzip test? ( dev-java/ant-junit4 dev-java/hamcrest-core )" +BDEPEND="app-arch/unzip" # There is a from-source maven package in java-overlay, but it hasn't # been merged into the Portage trunk yet. @@ -46,19 +48,20 @@ DEPEND="${CDEPEND} S="${WORKDIR}" src_prepare() { + default java-pkg_jar-from --into lib/external commons-codec commons-codec.jar java-pkg_jar-from --into lib/external commons-httpclient-3 commons-httpclient.jar java-pkg_jar-from --into lib/external commons-logging commons-logging.jar java-pkg_jar-from --into lib/external ehcache-1.2 ehcache.jar java-pkg_jar-from --into lib/external jcommon-1.0 jcommon.jar rm -f lib/external/jdom.jar || die - java-pkg_jar-from --into lib/external jdom-1.0 jdom.jar + java-pkg_jar-from --into lib/external jdom jdom.jar java-pkg_jar-from --into lib/external jfreechart-1.0 jfreechart.jar java-pkg_jar-from --into lib/external jgoodies-forms forms.jar jgoodies-forms.jar java-pkg_jar-from --into lib/external joda-time joda-time.jar java-pkg_jar-from --into lib/external junit-4 junit.jar java-pkg_jar-from --into lib/external log4j log4j.jar - java-pkg_jar-from --into lib/external protobuf protobuf.jar + java-pkg_jar-from --into lib/external protobuf-java protobuf.jar java-pkg_jar-from --into lib/external slf4j-api slf4j-api.jar }
