gentoo resync : 02.01.2018

3 files changed, 29 insertions, 96 deletions

diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index a3a7c2fc9194..70ba1a14297b 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,5 +1,3 @@
-DIST nco-3.9.9.tar.gz 4109201 BLAKE2B 1249963c2f884326811502b01d02b2ef9c19c4bd0e6e61ddd823661a43e53a895f16f2870d00c02f732a44d7f93b0b4794efe591c95ed4fca1bc168ac13ecb9c SHA512 883d77413aed29982df3be531c458bbbc8c46201783593a71745b993287356aec4c664a080f05da1f2d550d32d2553d55eff7372807d20b4e6dba7bdff282400
 DIST nco-4.5.1.tar.gz 4406757 BLAKE2B f2e203f1c38f5575fe4affb9122c91c61db8a2c2604cbcf9cd1eec6330e4771b8ff4325fcc19cfa292508e9b7a3107ae20e6230397f1269441e4efb883f8e4e9 SHA512 69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485
-EBUILD nco-3.9.9.ebuild 1599 BLAKE2B 5e8a46d85fb4fd2e068e59aee88841d7942380fca65bbf32b9031a17977c7eaf1da54f6c57e28f91969184ea63a56d7ad60b3abbc4be8354c383396ab12cbed0 SHA512 9601e68f6432ab1f8e1df0aaf4718213acdf7c14455be67588fe451fde7c8d7fd9ca8a770e12704e4bcdeaa7a3f1a4460e2173b7a2cd126b589a801e4e471a52
-EBUILD nco-4.5.1-r2.ebuild 1196 BLAKE2B d892c4e1ab687015e0afe7a30314cf8547cd281757609d8dd3b169530db0dbcfc1c7ebdb339c24b404cc75a8bfec2764a49242cb2b80058a319571555ae69e5c SHA512 1bed70fbed0f83edb7e54ac3bfaa8a670b3cf8cc3bc8060335b775b9b8db90fe6b91ffb40a758367c8a238a6b2d48ea684bfd6e11c26d459ee453782fe8fd623
+EBUILD nco-4.5.1-r2.ebuild 1223 BLAKE2B f2455e5507b981f6f069f61f6e608d856fc1b935cf7fdfeb71d710a02e61fa82b273ac0ec849e7e2facb2de76c65aa102ae285241600a6963bebf4fe8262a81b SHA512 71ff58f5613bf2f5297d8751cd19681d659a47d58fd8c994a2666ac04d262f839e2cade69ac7886fbb5662be6b5b14bac915bd3c4747d3f35364e52532198270
 MISC metadata.xml 1144 BLAKE2B 934f8e3e9219b8fda5106cec02a957b0f7b6eb4838c802e37be0796602ab332ee30c6ad53113e347ee639ff9a91191ad1ab8d0282e7937039139d7910948a010 SHA512 8fe5125db677eb40be700176d5aba6f7f59f345a79c2b07aad5892ec18abe43c176be8bc2b2a02c4daa9b10c4ba908c6028d33faae521653c32a71964daaa880
diff --git a/sci-misc/nco/nco-3.9.9.ebuild b/sci-misc/nco/nco-3.9.9.ebuild
deleted file mode 100644
index 17372725724e..000000000000
--- a/sci-misc/nco/nco-3.9.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-SRC_URI="http://dust.ess.uci.edu/nco/src/${P}.tar.gz"
-HOMEPAGE="http://nco.sourceforge.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc mpi ncap2 udunits"
-
-RDEPEND="sci-libs/netcdf
-	mpi? ( virtual/mpi )
-	udunits? ( >=sci-libs/udunits-2 )"
-
-DEPEND="${RDEPEND}
-	ncap2? ( !mpi? ( dev-java/antlr:0 ) )
-	doc? ( virtual/latex-base )"
-
-pkg_setup() {
-	if use mpi && use ncap2; then
-		elog
-		elog "mpi and ncap2 are still incompatible flags"
-		elog "nco configure will automatically disables ncap2"
-		elog
-	fi
-}
-
-src_configure() {
-	local myconf
-	if has_version ">=sci-libs/netcdf-4" && built_with_use sci-libs/netcdf hdf5; then
-		append-cppflags -DHAVE_NETCDF4_H
-		myconf="--enable-netcdf4"
-	else
-		myconf="--disable-netcdf4"
-	fi
-	econf \
-		${myconf} \
-		--disable-udunits \
-		$(use_enable ncap2) \
-		$(use_enable udunits udunits2) \
-		$(use_enable mpi)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	cd doc
-	emake clean info
-	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake html pdf || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd doc
-	dodoc ANNOUNCE ChangeLog MANIFEST NEWS README TAG TODO VERSION *.txt \
-		|| die "dodoc failed"
-	doinfo *.info* || die "doinfo failed"
-	if use doc; then
-		dohtml nco.html/* || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins nco.pdf || die "pdf install failed"
-	fi
-}
diff --git a/sci-misc/nco/nco-4.5.1-r2.ebuild b/sci-misc/nco/nco-4.5.1-r2.ebuild
index 850672c5b053..a1cd22244bb6 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
 }