From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1DEA1382C5 for ; Wed, 3 Mar 2021 12:31:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39627E086A; Wed, 3 Mar 2021 12:31:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 147C0E086A for ; Wed, 3 Mar 2021 12:31:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE10B340F8A for ; Wed, 3 Mar 2021 12:31:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BB7B567 for ; Wed, 3 Mar 2021 12:31:34 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1614774587.c884caac2a3f227502ac2e8f5ee5cbcd6985d3a1.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-java/netcdf/ X-VCS-Repository: proj/sci X-VCS-Files: dev-java/netcdf/netcdf-4.2.ebuild X-VCS-Directories: dev-java/netcdf/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: c884caac2a3f227502ac2e8f5ee5cbcd6985d3a1 X-VCS-Branch: master Date: Wed, 3 Mar 2021 12:31:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3d13043-45cb-4f1c-a568-1e4c95826f01 X-Archives-Hash: d072a8c20cb351d63d4b72a9c61e0b03 commit: c884caac2a3f227502ac2e8f5ee5cbcd6985d3a1 Author: Andrew Ammerlaan riseup net> AuthorDate: Wed Mar 3 12:29:47 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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 }