From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-994345-garchives=archives.gentoo.org@lists.gentoo.org>
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 1F7EA138206
for <garchives@archives.gentoo.org>; Mon, 1 Jan 2018 22:41:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6009FE07E2;
Mon, 1 Jan 2018 22:41:35 +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 3041CE07E2
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2018 22:41:34 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 CC183335C0C
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2018 22:41:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 63AB8186
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2018 22:41:31 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1514846444.906d6a3933fcfe30c68f701d021d50be5dde48e7.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-misc/nco/nco-4.5.1-r2.ebuild
X-VCS-Directories: sci-misc/nco/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 906d6a3933fcfe30c68f701d021d50be5dde48e7
X-VCS-Branch: master
Date: Mon, 1 Jan 2018 22:41:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c418ccd4-da12-4f64-a10a-7e4f29e6f39e
X-Archives-Hash: dd6be3282f9b3e66ecdbb7a2b6b688c7
commit: 906d6a3933fcfe30c68f701d021d50be5dde48e7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 22:40:44 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 22:40:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906d6a39
sci-misc/nco: Port to EAPI 6
* Remove use of `built_with_use` function
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-misc/nco/nco-4.5.1-r2.ebuild | 51 ++++++++++++++++++++++------------------
1 file changed, 28 insertions(+), 23 deletions(-)
diff --git a/sci-misc/nco/nco-4.5.1-r2.ebuild b/sci-misc/nco/nco-4.5.1-r2.ebuild
index 850672c5b05..a1cd22244bb 100644
--- a/sci-misc/nco/nco-4.5.1-r2.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils flag-o-matic
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Command line utilities for operating on netCDF files"
HOMEPAGE="http://nco.sourceforge.net/"
@@ -13,37 +12,43 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/${PV}"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
+IUSE="dap gsl hdf5 ncap2 openmp static-libs test udunits"
RDEPEND="
- >=sci-libs/netcdf-4:=[dap=,tools]
+ >=sci-libs/netcdf-4:=[dap=,hdf5?,tools]
gsl? ( sci-libs/gsl:= )
ncap2? ( dev-cpp/antlr-cpp:2= )
udunits? ( >=sci-libs/udunits-2 )"
-
DEPEND="${RDEPEND}
test? ( >=sci-libs/netcdf-4[tools] )"
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
src_configure() {
- local myeconfargs=(
- --disable-udunits
- $(use_enable dap dap-netcdf)
- $(use_enable gsl)
- $(use_enable ncap2)
- $(use_enable openmp)
+ use hdf5 && append-cppflags -DHAVE_NETCDF4_H
+
+ econf \
+ --disable-udunits \
+ $(use_enable dap) \
+ $(use_enable gsl) \
+ $(use_enable hdf5 netcdf4) \
+ $(use_enable ncap2) \
+ $(use_enable openmp) \
+ $(use_enable static-libs static) \
$(use_enable udunits udunits2)
- )
- if has_version '>=sci-libs/netcdf-4[hdf5]'; then
- myeconfargs+=( --enable-netcdf4 )
- append-cppflags -DHAVE_NETCDF4_H
- else
- myeconfargs+=( --disable-netcdf4 )
- fi
- autotools-utils_src_configure
}
src_install() {
- use doc && DOCS=( doc/nco.pdf ) && HTML_DOCS=( doc/nco.html )
- autotools-utils_src_install
+ default
doinfo doc/*.info*
+
+ if ! use static-libs; then
+ find "${D}" -name '*.la' -delete || die
+ fi
}