gentoo resync : 03.03.2021

6 files changed, 6 insertions, 110 deletions

diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index b118e414a117..7ea706eaad50 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -1,11 +1,7 @@
-AUX netcdf-cxx-4.2-config.patch 829 BLAKE2B cd4285ce14647bc1822ac474b3a632fcacfb377d22e34be931741f67b4c071866689311d6d40e9cd86866b5c396605f2ec8e53a2308344ed201fccdf11722789 SHA512 80d0a436103c8408898c065079f3988f706505bace1567a9eff1f5964cac3a09a97f8449b9dcd5bd994d1e3c6e9dfb646d8fcdfb0c5f659cdc64e0800234810f
-DIST netcdf-cxx-4.2.1.tar.gz 456547 BLAKE2B e973f064ad40c0d0cb76766f3b1639d16ed7eaae73d8e55db011645fc0d4e6f8949a60aeb9d47a4f8e88b3c5b2d486d42442e417908a2194b8b9a5e720ba2ff5 SHA512 d51ab1cbda74db5f7b074799d2407d0214d1c920af780ae3bb7a47b3708e45f721be7eec61902e035968a9df5019a7b2b5a10f236f6bab4cb47a26e4e7867adb
 DIST netcdf-cxx-4.2.tar.gz 703482 BLAKE2B a6727b7305204d2b53e6ee951c8165b03cd07f14e5d59a306445481272d0e10eb077e4bc62a2586c57652cb8273b9098ed77836f9023817d8a9e6ef51ac2cfe8 SHA512 347ddbc518ac2186868d69417342e5146e285fc3a88f7c55edc33063f5c9a6647af7e512a03b9b6a8f67a448b85a1edcdde5df707b893f6a1527821cfd78e643
 DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245cd932bcf86df4edf36eb7ae636906eaafc25cfcbb3dd58bc1d346edacd7f80daa3be9a544d5d777d32ad115cfd00f SHA512 8e77333c979513721209e6b3fde31c298e18a45d7ea08123056e8120469eb8c4024d71289fab2b9182ee19ee7b6ad22bd133525bef048a497ede4aa2e9017465
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
-EBUILD netcdf-cxx-4.2-r300.ebuild 609 BLAKE2B 9e47eb431106ee5e8dd5401bc367b9208785f0588bd3e5fb7ba674a18b806cf212875ab10a5fd6d91971d73a9147ef113894e58cc9d6015e9bf5e509b0ef5de7 SHA512 0d3e37ec51bceb183f0efd2e7922e36922fb7a6c1a07f915efeb9fd967c57b4061ac7801c59ad5eac0a445125b7ac119a6e1977c469d66421d0f41b438e3b202
-EBUILD netcdf-cxx-4.2.1-r1.ebuild 730 BLAKE2B 777504e25979d68ef5e0acaaf1416fd7b336d86511c84cb0f23bfafa5eee1f72711428ee72a27318684446ccd8a388a024c5069615fd20aeb7bdd8e2d992e020 SHA512 03c7b49c8cdc252a2f76a5019cbd2323eed57b1d184bc29c4d2095533d7e4bf82a40484fe16e299bcd54cafcf4dd934433fe51028c792c270f1f07b4eac4415a
-EBUILD netcdf-cxx-4.2.1.ebuild 754 BLAKE2B a8defcffabafa13894b9ae70e3fb8d64a4e5eedec56336f9df961872b1b3bf0fea8dae7254adde67204905b547d8973ce978f7bd03b4152eab8f281ebc998b81 SHA512 cd2bade6d82df307186bb3a0bf5cdaee00798d222e843eb3e71943b3f67839543dccb309df7fec5feab37d32b83ba3186d771cf2aa9952a528962bc671c5b910
-EBUILD netcdf-cxx-4.3.0.ebuild 679 BLAKE2B d414cf3febdf7faca2999c2ff5fc4a9957f3b9d206097e8ebd690597839707820245e2d844d4ff6d127cbce3bce243bb998a4b3db3428f0df1aadf8913ef48da SHA512 a7f23db13baf8222812948a976404e956027c0aa23be49eeb40a018df6ac8f744e3afa130fb0a6dec7ffcaf0e5ad46f72d66a72bd3af6f813c683bb2a0695145
+EBUILD netcdf-cxx-4.2-r300.ebuild 616 BLAKE2B ba1024cdc714085a5984779fd274d4c5a9af57c44823a14cbf4cb453ce0a0588c92006baaca28416fda1b5e9e07a78c551f083a534d6882047900d989d5a0d21 SHA512 e9da1886babc4ecca8736fd5c587e2068c59bdacc5093f0b276cf0db4427af8d7d02373df7e42bc5d9c7255290974742e1d2fa6bbbcc504d1cd1314a6b005daa
+EBUILD netcdf-cxx-4.3.0.ebuild 677 BLAKE2B 0d544400e444b2e794545189fbdd1206de049bd9a6d8083be7eb4b2120b0b65a77461e7ce1dfa599240c4f1759e09f920e028490b0d86b9ddcce150613d5c030 SHA512 6cb81dde09c8206222c85ad9ffface7e6f554836f3ccf3ea7fc5fa95b571d0a9f3675d9a0a0e400d9d4d30f105945b97744d6397f7111b1a73b22abe6d2c3778
 EBUILD netcdf-cxx-4.3.1.ebuild 700 BLAKE2B 754efa5707393af0aa7063aa679d2902b1b4a4e075cb04eb0a1bc95098bc531a058651d0dfa37ddaec2e1b79ceb6e71d4530037953620bc100c62dc2d958c5d3 SHA512 228ea6396dc0c677b908f6acae8bab342af442cc464d6b1da97a72fda9fcf7fe7281a3b88cb1192f7ec8661c8a0d8f3a05a1d31db52eff887663d6e9176610d2
 MISC metadata.xml 838 BLAKE2B 7dfb894eff8881120e319f30baf54c41a04a1822f5d7c4db5a90cae56cdd89914ef938c1ad39601d3573d06b419c93d50efe8e563c002473c4a0b3c4f079d426 SHA512 7db14bcbc67509b05f00dcd0e0ee33281ad1d77e566c1de0362058d0fb7c3d2b82430377fb5df4bb09c3e0b9c3fee0d8ddbd9861a24e4b13e70b1151acb26c5b
diff --git a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
deleted file mode 100644
index 50b6b478bdb1..000000000000
--- a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- netcdf-cxx4-4.2.1/ncxx4-config.in.orig	2013-01-10 10:47:00.595224631 -0800
-+++ netcdf-cxx4-4.2.1/ncxx4-config.in	2013-01-10 10:49:22.856926765 -0800
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@libdir@
- includedir=${prefix}/include
- 
- cc="@CC@"
-@@ -13,7 +13,7 @@
- fc="@FC@"
- cflags=" -I${includedir} @CPPFLAGS@" 
- fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
--libs="-L${libdir} @NC_LIBS@"
-+libs="-L${libdir} @NC_LIBS@ -lnetcdf"
- flibs="-L${libdir} @NC_FLIBS@"
- has_dap="@HAS_DAP@"
- has_nc2="@HAS_NC2@"
---- netcdf-cxx4-4.2.1/netcdf-cxx4.pc.in.orig	2013-01-10 10:46:50.995177250 -0800
-+++ netcdf-cxx4-4.2.1/netcdf-cxx4.pc.in	2013-01-10 10:49:45.030036161 -0800
-@@ -10,4 +10,4 @@
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} @NC_LIBS@
- Cflags: -I${includedir}
--
-+Requires: netcdf
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild
index 35eed157f022..a15d37a2a1d2 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://www.unidata.ucar.edu/downloads/netcdf/ftp/${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="3"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs"
 
 RDEPEND=">=sci-libs/netcdf-4.2:0="
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild
deleted file mode 100644
index fa311868cb0b..000000000000
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-MYP=${PN}4-${PV}
-
-DESCRIPTION="C++ library for netCDF"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2-config.patch"
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples
-	prune_libtool_files
-}
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild
deleted file mode 100644
index b1bb22728e01..000000000000
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-MYP=${PN}4-${PV}
-
-DESCRIPTION="C++ library for netCDF"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-RDEPEND=">=sci-libs/netcdf-4.2:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2-config.patch )
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test -j1
-}
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
index c64a6ff9763c..e029c4ea6b3b 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs"
 
 RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"