7 files changed, 33 insertions, 50 deletions
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 31a4ff26e6c2..c0f41b43c922 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.9.1 b/metadata/md5-cache/sci-libs/netcdf-4.9.1
deleted file mode 100644
index 1113d0b20758..000000000000
--- a/metadata/md5-cache/sci-libs/netcdf-4.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo:= sci-libs/hdf:= sci-libs/hdf5:= ) hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
-DESCRIPTION=Scientific library and interface for array oriented data access
-EAPI=8
-HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-INHERIT=cmake flag-o-matic
-IUSE=+dap doc examples hdf +hdf5 mpi szip test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=UCAR-Unidata
-RDEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo:= sci-libs/hdf:= sci-libs/hdf5:= ) hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
-REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
-RESTRICT=!test? ( test )
-SLOT=0/19
-SRC_URI=https://github.com/Unidata/netcdf-c/archive/v4.9.1.tar.gz -> netcdf-4.9.1.tar.gz
-_eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=522c49d7f8cbea8e930fac4aeb5da8d4
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.9.0 b/metadata/md5-cache/sci-libs/netcdf-4.9.2
index 31d8dc76ee47..e879e193984f 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.9.0
+++ b/metadata/md5-cache/sci-libs/netcdf-4.9.2
@@ -4,14 +4,14 @@ DEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo
 DESCRIPTION=Scientific library and interface for array oriented data access
 EAPI=8
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-INHERIT=cmake flag-o-matic
-IUSE=+dap doc examples hdf +hdf5 mpi szip test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux
+INHERIT=cmake
+IUSE=+dap doc examples hdf +hdf5 mpi szip test
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo:= sci-libs/hdf:= sci-libs/hdf5:= ) hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
-REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
+REQUIRED_USE=szip? ( hdf5 ) mpi? ( hdf5 )
 RESTRICT=!test? ( test )
 SLOT=0/19
-SRC_URI=https://github.com/Unidata/netcdf-c/archive/v4.9.0.tar.gz -> netcdf-4.9.0.tar.gz
+SRC_URI=https://downloads.unidata.ucar.edu/netcdf-c/4.9.2/netcdf-c-4.9.2.tar.gz
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=92ccc514bcec77ff5393618cdecd76ab
+_md5_=0a28bd9bdc899718179ff0cde6054620
diff --git a/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.0 b/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.0
deleted file mode 100644
index e1319429efe5..000000000000
--- a/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sci-libs/netcdf-4.2:=[hdf5]
-DESCRIPTION=C++ library for netCDF
-EAPI=7
-HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-IUSE=examples
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=UCAR-Unidata
-RDEPEND=>=sci-libs/netcdf-4.2:=[hdf5]
-SLOT=0/1
-SRC_URI=https://github.com/Unidata/netcdf-cxx4/archive/v4.3.0.tar.gz -> netcdf-cxx-4.3.0.tar.gz
-_md5_=f33b58e438ee7bf0677d30c86b182861
diff --git a/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1-r1 b/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1-r1
new file mode 100644
index 000000000000..7a723dd71cac
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=sci-libs/netcdf-4.2:=[hdf5]
+DESCRIPTION=C++ library for netCDF
+EAPI=8
+HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=UCAR-Unidata
+RDEPEND=>=sci-libs/netcdf-4.2:=[hdf5]
+SLOT=0/1
+SRC_URI=https://downloads.unidata.ucar.edu/netcdf-cxx/4.3.1/netcdf-cxx4-4.3.1.tar.gz
+_md5_=a441f1ab995f92389ad81cb56c5091da
diff --git a/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.3 b/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.3
deleted file mode 100644
index c84e9fb52d8f..000000000000
--- a/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/fortran
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sci-libs/netcdf dev-lang/cfortran virtual/fortran
-DESCRIPTION=Scientific library and interface for array oriented data access
-EAPI=7
-HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-INHERIT=autotools fortran-2 flag-o-matic
-IUSE=doc examples static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=UCAR-Unidata
-RDEPEND=sci-libs/netcdf virtual/fortran
-SLOT=0/7
-SRC_URI=https://github.com/Unidata/netcdf-fortran/archive/v4.5.3.tar.gz -> netcdf-fortran-4.5.3.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b62f9f184f99fcd8103f69b64c97695a
diff --git a/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4-r1 b/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4-r1
new file mode 100644
index 000000000000..4c3c2a868e5d
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) virtual/fortran
+DEFINED_PHASES=configure install setup
+DEPEND=sci-libs/netcdf dev-lang/cfortran virtual/fortran
+DESCRIPTION=Scientific library and interface for array oriented data access
+EAPI=8
+HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
+INHERIT=fortran-2
+IUSE=doc examples static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=UCAR-Unidata
+RDEPEND=sci-libs/netcdf virtual/fortran
+SLOT=0/7
+SRC_URI=https://downloads.unidata.ucar.edu/netcdf-fortran/4.5.4/netcdf-fortran-4.5.4.tar.gz -> netcdf-fortran-4.5.4.upstream.tar.gz
+_eclasses_=fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f31fe11b8f62ccd0cbe6f917bcec7241