[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2023-08-26 Thread Andreas Sturmlechner
commit: 08d64121efe6762e5c867b8d536cc9feafbaaeb8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 26 14:05:18 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 26 14:05:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d64121

sci-misc/nco: drop 4.5.1-r3

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-misc/nco/Manifest|  1 -
 sci-misc/nco/nco-4.5.1-r3.ebuild | 55 
 2 files changed, 56 deletions(-)

diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index 972fa14c834a..6bb0324c4a09 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,2 +1 @@
-DIST nco-4.5.1.tar.gz 4406757 BLAKE2B 
f2e203f1c38f5575fe4affb9122c91c61db8a2c2604cbcf9cd1eec6330e4771b8ff4325fcc19cfa292508e9b7a3107ae20e6230397f1269441e4efb883f8e4e9
 SHA512 
69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485
 DIST nco-5.1.3.tar.gz 6438534 BLAKE2B 
6296d881b0e0b62e18daa40db71ccca79b4cca9fa8f046a0664f53b690d8f85175676900d792a4691090662ed80ce5c4e32e4236c69c6057d292800bd9987f36
 SHA512 
c4819a0b3a1c431419df73250e6648e5afc55439d260d166fb4e13ca3f4ae34bdc728b921922e075c86f6bf5dbede1565741616b2b9a32bcdcfbe85617a7f8ec

diff --git a/sci-misc/nco/nco-4.5.1-r3.ebuild b/sci-misc/nco/nco-4.5.1-r3.ebuild
deleted file mode 100644
index 67c918a6c9ac..
--- a/sci-misc/nco/nco-4.5.1-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-HOMEPAGE="http://nco.sourceforge.net/;
-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 gsl hdf5 ncap2 openmp static-libs test udunits"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=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() {
-   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)
-}
-
-src_install() {
-   default
-   doinfo doc/*.info*
-
-   if ! use static-libs; then
-   find "${D}" -name '*.la' -delete || die
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2023-06-09 Thread Arthur Zamarin
commit: c4143fff4e80a6442b13b3a8570d08d7a4fe51c4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  3 14:55:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 14:50:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4143fff

sci-misc/nco: destabilize for ~x86

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-misc/nco/nco-4.5.1-r3.ebuild | 2 +-
 sci-misc/nco/nco-5.1.3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/nco/nco-4.5.1-r3.ebuild b/sci-misc/nco/nco-4.5.1-r3.ebuild
index c43eb9c88c09..67c918a6c9ac 100644
--- a/sci-misc/nco/nco-4.5.1-r3.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="dap gsl hdf5 ncap2 openmp static-libs test udunits"
 RESTRICT="!test? ( test )"
 

diff --git a/sci-misc/nco/nco-5.1.3-r1.ebuild b/sci-misc/nco/nco-5.1.3-r1.ebuild
index db1cf5ca67af..1350da622372 100644
--- a/sci-misc/nco/nco-5.1.3-r1.ebuild
+++ b/sci-misc/nco/nco-5.1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="dap gsl hdf5 ncap2 openmp test udunits"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2023-03-14 Thread Sam James
commit: 76309dd0c59bc1cc6542f4357b17b473cf575e17
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 15 05:48:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 15 05:48:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76309dd0

sci-misc/nco: update netcdf[tools] dep

Tools are now always available.

Signed-off-by: Sam James  gentoo.org>

 sci-misc/nco/{nco-4.5.1-r2.ebuild => nco-4.5.1-r3.ebuild} | 6 +++---
 sci-misc/nco/{nco-5.1.3.ebuild => nco-5.1.3-r1.ebuild}| 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-misc/nco/nco-4.5.1-r2.ebuild b/sci-misc/nco/nco-4.5.1-r3.ebuild
similarity index 90%
rename from sci-misc/nco/nco-4.5.1-r2.ebuild
rename to sci-misc/nco/nco-4.5.1-r3.ebuild
index f4733a08d8d3..c43eb9c88c09 100644
--- a/sci-misc/nco/nco-4.5.1-r2.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,12 +16,12 @@ IUSE="dap gsl hdf5 ncap2 openmp static-libs test udunits"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-   >=sci-libs/netcdf-4:=[dap=,hdf5?,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] )"
+   test? ( >=sci-libs/netcdf-4[tools(+)] )"
 
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

diff --git a/sci-misc/nco/nco-5.1.3.ebuild b/sci-misc/nco/nco-5.1.3-r1.ebuild
similarity index 93%
rename from sci-misc/nco/nco-5.1.3.ebuild
rename to sci-misc/nco/nco-5.1.3-r1.ebuild
index 4afb64138161..db1cf5ca67af 100644
--- a/sci-misc/nco/nco-5.1.3.ebuild
+++ b/sci-misc/nco/nco-5.1.3-r1.ebuild
@@ -16,12 +16,12 @@ IUSE="dap gsl hdf5 ncap2 openmp test udunits"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-   >=sci-libs/netcdf-4:=[dap=,hdf5?,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] )"
+   test? ( >=sci-libs/netcdf-4[tools(+)] )"
 BDEPEND="sys-apps/texinfo"
 
 pkg_pretend() {



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2023-03-04 Thread Arthur Zamarin
commit: 941048e698196d7b95f75898fef9c6155acf8ee7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 09:16:01 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 09:16:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941048e6

sci-misc/nco: Stabilize 5.1.3 x86, #899440

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-misc/nco/nco-5.1.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/nco/nco-5.1.3.ebuild b/sci-misc/nco/nco-5.1.3.ebuild
index 4ecf55b16fb0..e98f8eb72b05 100644
--- a/sci-misc/nco/nco-5.1.3.ebuild
+++ b/sci-misc/nco/nco-5.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="dap gsl hdf5 ncap2 openmp test udunits"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2023-03-04 Thread Arthur Zamarin
commit: 7e1dfc3005fc851cb2e1501e7d9ee5673339b8a7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 09:16:02 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 09:16:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1dfc30

sci-misc/nco: Stabilize 5.1.3 amd64, #899440

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-misc/nco/nco-5.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/nco/nco-5.1.3.ebuild b/sci-misc/nco/nco-5.1.3.ebuild
index e98f8eb72b05..4afb64138161 100644
--- a/sci-misc/nco/nco-5.1.3.ebuild
+++ b/sci-misc/nco/nco-5.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="dap gsl hdf5 ncap2 openmp test udunits"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2022-12-26 Thread David Seifert
commit: 8659242edb4678314edd834464e75d0eb7558389
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec 26 15:05:06 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 26 15:05:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8659242e

sci-misc/nco: mask useless automake test results

Closes: https://bugs.gentoo.org/888519
Signed-off-by: David Seifert  gentoo.org>

 sci-misc/nco/nco-5.1.3.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/sci-misc/nco/nco-5.1.3.ebuild b/sci-misc/nco/nco-5.1.3.ebuild
index 09b909e232be..4ecf55b16fb0 100644
--- a/sci-misc/nco/nco-5.1.3.ebuild
+++ b/sci-misc/nco/nco-5.1.3.ebuild
@@ -47,6 +47,12 @@ src_configure() {
$(use_enable udunits udunits2)
 }
 
+src_test() {
+   emake test
+   # testsuite doesn't run through automake
+   rm src/nco/test-suite.log || die
+}
+
 src_install() {
default
dodoc doc/ChangeLog



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2022-12-26 Thread David Seifert
commit: 1fe9f9fa888635a70d5dc68de2c8063ed1b29ca7
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec 26 12:52:16 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 26 12:52:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe9f9fa

sci-misc/nco: add 5.1.3

Bug: https://bugs.gentoo.org/741592
Signed-off-by: David Seifert  gentoo.org>

 sci-misc/nco/Manifest |  1 +
 sci-misc/nco/nco-5.1.3.ebuild | 55 +++
 2 files changed, 56 insertions(+)

diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index 5d9f8e4e9e04..972fa14c834a 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1 +1,2 @@
 DIST nco-4.5.1.tar.gz 4406757 BLAKE2B 
f2e203f1c38f5575fe4affb9122c91c61db8a2c2604cbcf9cd1eec6330e4771b8ff4325fcc19cfa292508e9b7a3107ae20e6230397f1269441e4efb883f8e4e9
 SHA512 
69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485
+DIST nco-5.1.3.tar.gz 6438534 BLAKE2B 
6296d881b0e0b62e18daa40db71ccca79b4cca9fa8f046a0664f53b690d8f85175676900d792a4691090662ed80ce5c4e32e4236c69c6057d292800bd9987f36
 SHA512 
c4819a0b3a1c431419df73250e6648e5afc55439d260d166fb4e13ca3f4ae34bdc728b921922e075c86f6bf5dbede1565741616b2b9a32bcdcfbe85617a7f8ec

diff --git a/sci-misc/nco/nco-5.1.3.ebuild b/sci-misc/nco/nco-5.1.3.ebuild
new file mode 100644
index ..09b909e232be
--- /dev/null
+++ b/sci-misc/nco/nco-5.1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command line utilities for operating on netCDF files"
+HOMEPAGE="http://nco.sourceforge.net/;
+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 gsl hdf5 ncap2 openmp test udunits"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=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] )"
+BDEPEND="sys-apps/texinfo"
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+   econf \
+   --disable-udunits \
+   --disable-gpu \
+   --enable-doc \
+   $(use_enable dap) \
+   $(use_enable gsl) \
+   $(use_enable hdf5 netcdf4) \
+   $(use_enable hdf5 netcdf-4) \
+   $(use_enable ncap2) \
+   $(use_enable ncap2 ncoxx) \
+   $(use_enable openmp) \
+   $(use_enable udunits udunits2)
+}
+
+src_install() {
+   default
+   dodoc doc/ChangeLog
+
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2018-01-01 Thread David Seifert
commit: e72e45e4d390cbdcfd2cc67a1746ef0b3756de5a
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jan  1 22:40:47 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan  1 22:40:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72e45e4

sci-misc/nco: Remove old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-misc/nco/Manifest |  1 -
 sci-misc/nco/nco-3.9.9.ebuild | 70 ---
 2 files changed, 71 deletions(-)

diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index f265a13c299..5d9f8e4e9e0 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,2 +1 @@
-DIST nco-3.9.9.tar.gz 4109201 BLAKE2B 
1249963c2f884326811502b01d02b2ef9c19c4bd0e6e61ddd823661a43e53a895f16f2870d00c02f732a44d7f93b0b4794efe591c95ed4fca1bc168ac13ecb9c
 SHA512 
883d77413aed29982df3be531c458bbbc8c46201783593a71745b993287356aec4c664a080f05da1f2d550d32d2553d55eff7372807d20b4e6dba7bdff282400
 DIST nco-4.5.1.tar.gz 4406757 BLAKE2B 
f2e203f1c38f5575fe4affb9122c91c61db8a2c2604cbcf9cd1eec6330e4771b8ff4325fcc19cfa292508e9b7a3107ae20e6230397f1269441e4efb883f8e4e9
 SHA512 
69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485

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 17372725724..000
--- 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
-}



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2018-01-01 Thread David Seifert
commit: 906d6a3933fcfe30c68f701d021d50be5dde48e7
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jan  1 22:40:44 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan  1 22:40:44 2018 +
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
 }



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2017-09-12 Thread Matt Turner
commit: 9962e297a820f0ea96e59f525b080c0018bc0037
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Sep 12 23:22:26 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Sep 12 23:22:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9962e297

sci-misc/nco: dropped ppc keywords

 sci-misc/nco/nco-3.9.9.ebuild| 4 ++--
 sci-misc/nco/nco-4.5.1-r2.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-misc/nco/nco-3.9.9.ebuild b/sci-misc/nco/nco-3.9.9.ebuild
index 9baf4f80ff3..17372725724 100644
--- a/sci-misc/nco/nco-3.9.9.ebuild
+++ b/sci-misc/nco/nco-3.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -10,7 +10,7 @@ HOMEPAGE="http://nco.sourceforge.net/;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc mpi ncap2 udunits"
 

diff --git a/sci-misc/nco/nco-4.5.1-r2.ebuild b/sci-misc/nco/nco-4.5.1-r2.ebuild
index 5d7f0ce120a..850672c5b05 100644
--- a/sci-misc/nco/nco-4.5.1-r2.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2017-08-18 Thread Thomas Deutschmann
commit: f6f3678d230203d0916fe3761fd280ec2e10f314
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 18 23:39:13 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Aug 19 00:30:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f3678d

sci-misc/nco: x86 stable (bugs #607728)

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-misc/nco/nco-4.5.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/nco/nco-4.5.1-r2.ebuild b/sci-misc/nco/nco-4.5.1-r2.ebuild
index 44765a583dc..5d7f0ce120a 100644
--- a/sci-misc/nco/nco-4.5.1-r2.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2017-07-15 Thread Tobias Klausmann
commit: 6680963dfca0ba9f9faeb73ae294d00baa005504
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Jul 15 16:22:37 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Jul 15 16:22:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6680963d

sci-misc/nco-4.5.1-r2: add amd64 keyword

Gentoo-Bug: 607728

 sci-misc/nco/nco-4.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/nco/nco-4.5.1-r2.ebuild b/sci-misc/nco/nco-4.5.1-r2.ebuild
index ecc6997d802..44765a583dc 100644
--- a/sci-misc/nco/nco-4.5.1-r2.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2016-01-02 Thread James Le Cuirot
commit: 632d426b187566345c80409164b9162223dbeb39
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  2 19:20:59 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  2 19:21:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632d426b

sci-misc/nco: antlr-cpp should be in RDEPEND

I commented that antlr should have been in RDEPEND before and forgot
to put antlr-cpp there myself. D'oh!

Package-Manager: portage-2.2.26

 sci-misc/nco/{nco-4.5.1-r1.ebuild => nco-4.5.1-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/nco/nco-4.5.1-r1.ebuild b/sci-misc/nco/nco-4.5.1-r2.ebuild
similarity index 96%
rename from sci-misc/nco/nco-4.5.1-r1.ebuild
rename to sci-misc/nco/nco-4.5.1-r2.ebuild
index 32a8c25..a8db552 100644
--- a/sci-misc/nco/nco-4.5.1-r1.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,10 +19,10 @@ IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
 RDEPEND="
>=sci-libs/netcdf-4:=[dap=,tools]
gsl? ( sci-libs/gsl:= )
+   ncap2? ( dev-cpp/antlr-cpp:2= )
udunits? ( >=sci-libs/udunits-2 )"
 
 DEPEND="${RDEPEND}
-   ncap2? ( dev-cpp/antlr-cpp:2= )
test? ( >=sci-libs/netcdf-4[tools] )"
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2015-10-14 Thread James Le Cuirot
commit: bdd1e0e47b402bca6dc22c44bc8ee132f53afe85
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct 14 14:47:40 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct 14 15:22:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd1e0e4

sci-misc/nco: Remove old

Package-Manager: portage-2.2.20.1

 sci-misc/nco/Manifest |  1 -
 sci-misc/nco/nco-4.4.2.ebuild | 51 ---
 sci-misc/nco/nco-4.5.1.ebuild | 50 --
 3 files changed, 102 deletions(-)

diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index 6c94272..3117a36 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,3 +1,2 @@
 DIST nco-3.9.9.tar.gz 4109201 SHA256 
cdfd7cf47aef49b32e4e581bc7d2d6cdd05312ed88a2a0cfaf83c520e665b142 SHA512 
883d77413aed29982df3be531c458bbbc8c46201783593a71745b993287356aec4c664a080f05da1f2d550d32d2553d55eff7372807d20b4e6dba7bdff282400
 WHIRLPOOL 
7bf120f96522808dcb3e9a08d6da419a82519f8d4cefcefc98752c6368eaddb832cd21e84e67a6e0caf98adfb5d652bf2b8566cb54d5f403da294550da459200
-DIST nco-4.4.2.tar.gz 7801937 SHA256 
6b2f48ac4618ba50306885a6358925956c2b178dee6348ada3195a3fc2a425d8 SHA512 
b624174bdb4d10b6f4e05024c0e4f06f642ebeb9bdb291e7dbf07b858522cdb7f2385d63ba70cab36aef40fc42d6d229a1c3bfacd85747f516cbbd45748ae185
 WHIRLPOOL 
ca5d974ac10a0211d5cb4d0daab1501d7e13429530ef480c070af2f70e46630a3b49213b1370b17be0f829b9d73a437a3d44d4bc750b0c54f55a56402b3e7ec7
 DIST nco-4.5.1.tar.gz 4406757 SHA256 
c9a34b1f649635093e219604479b0aa4fd2d400aaee4328577443642ed2920ae SHA512 
69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485
 WHIRLPOOL 
868fc67f0bb5c43f8b00a1479de428d0b2e9bdfed75ed4983baf05dee266d6750e43ead70a1bef16d693f2f47bc343c16a1fdd0cf77cabb36595fd8043a7844d

diff --git a/sci-misc/nco/nco-4.4.2.ebuild b/sci-misc/nco/nco-4.4.2.ebuild
deleted file mode 100644
index 9fcd4d6..000
--- a/sci-misc/nco/nco-4.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-HOMEPAGE="http://nco.sourceforge.net/;
-SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="dap doc gsl ncap2 static-libs test udunits"
-
-RDEPEND="
-   >=sci-libs/netcdf-4:=[dap=,tools]
-   gsl? ( sci-libs/gsl:= )
-   udunits? ( >=sci-libs/udunits-2 )"
-
-DEPEND="${RDEPEND}
-   ncap2? ( dev-java/antlr:0 )
-   test? ( >=sci-libs/netcdf-4[tools] )"
-
-src_configure() {
-   local myeconfargs=(
-   --disable-udunits
-   $(use_enable dap dap-netcdf)
-   $(use_enable gsl)
-   $(use_enable ncap2)
-   $(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() {
-   autotools-utils_src_install
-   cd doc
-   doinfo *.info*
-   use doc && dohtml nco.html && dodoc nco.pdf
-}

diff --git a/sci-misc/nco/nco-4.5.1.ebuild b/sci-misc/nco/nco-4.5.1.ebuild
deleted file mode 100644
index 599f5f5..000
--- a/sci-misc/nco/nco-4.5.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-HOMEPAGE="http://nco.sourceforge.net/;
-SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
-
-RDEPEND="
-   >=sci-libs/netcdf-4:=[dap=,tools]
-   gsl? ( sci-libs/gsl:= )
-   udunits? ( >=sci-libs/udunits-2 )"
-
-DEPEND="${RDEPEND}
-   ncap2? ( dev-java/antlr:0 )
-   test? ( >=sci-libs/netcdf-4[tools] )"
-
-src_configure() {
-   local myeconfargs=(
-   --disable-udunits
-   $(use_enable dap dap-netcdf)
-   $(use_enable gsl)
-   $(use_enable ncap2)
-   $(use_enable openmp)
-   $(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
-}
-

[gentoo-commits] repo/gentoo:master commit in: sci-misc/nco/

2015-10-14 Thread James Le Cuirot
commit: f90aa9b95704da2cc4969e8008bfbb25cd62d85b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct 14 14:41:33 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct 14 15:22:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90aa9b9

sci-misc/nco: Use dev-cpp/antlr-cpp instead of dev-java/antlr

The old dependency was wrong anyway because it was missing from
RDEPEND and didn't include the cxx USE flag.

Package-Manager: portage-2.2.20.1

 sci-misc/nco/nco-4.5.1-r1.ebuild | 50 
 1 file changed, 50 insertions(+)

diff --git a/sci-misc/nco/nco-4.5.1-r1.ebuild b/sci-misc/nco/nco-4.5.1-r1.ebuild
new file mode 100644
index 000..32a8c25
--- /dev/null
+++ b/sci-misc/nco/nco-4.5.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils eutils flag-o-matic
+
+DESCRIPTION="Command line utilities for operating on netCDF files"
+HOMEPAGE="http://nco.sourceforge.net/;
+SRC_URI="http://nco.sf.net/src/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
+
+RDEPEND="
+   >=sci-libs/netcdf-4:=[dap=,tools]
+   gsl? ( sci-libs/gsl:= )
+   udunits? ( >=sci-libs/udunits-2 )"
+
+DEPEND="${RDEPEND}
+   ncap2? ( dev-cpp/antlr-cpp:2= )
+   test? ( >=sci-libs/netcdf-4[tools] )"
+
+src_configure() {
+   local myeconfargs=(
+   --disable-udunits
+   $(use_enable dap dap-netcdf)
+   $(use_enable gsl)
+   $(use_enable ncap2)
+   $(use_enable openmp)
+   $(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
+   doinfo doc/*.info*
+}