Adding metadata

12 files changed, 26 insertions, 479 deletions

diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 67c6ba4faaab..8433b1b997ba 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,3 +1,2 @@
-DIST hdf5-1.12.2.tar.bz2 10494264 BLAKE2B 99ca5b57f6f54fa044c909f0773de62b218c1f0ec3c011f88f3c227536dd719e77ddbe42d562b1214e8843e41d8fc56db499d7f122876fdd36ef31b235229cb7 SHA512 cbb4663570de76b11adb6bf62cfdb754371d31eeab04691479a5764a45207a9c1309665ab80f51c63a4b9b87354f9cbe6835cef506a9fd554d142c6d2bec21e5
-DIST hdf5-1.14.4-3.tar.gz 37007795 BLAKE2B f71ba86da65337c3ff30c733760adea56a0ace05b4ac1c0060febb85f45a586ec47cc99828f1199e4e02fd5e2f4329ace450c62a3290f6341d21ec9e30cc59fd SHA512 667a40703b4e330db32d3ede48247781019414426d2949aabf2036089155bc7f2167fbc8b8c78b76286d8369d1f3c9bdd66049d3e4eda2c234ef751df9cc597a
 DIST hdf5-1.14.6.tar.gz 39289609 BLAKE2B c604384c0d98ce092ac59a67ec5baf3d593548d37defa0fd29b676dd0837e321fff937368edb50591ac8841116648e41ed8505611518a2c914a380191a7c0388 SHA512 d93194ad8f48acf110aae317f4c37104b9042f89ef72919aac887817e4c2713449c4cb2ab6a163c61ab1c12811170d7611cdf69322b0e0f96420fcc7f99fdd67
+DIST hdf5-2.2.0.tar.gz 42131403 BLAKE2B 4c964d812e086034d42c3577e8b543d2e05f2a65c838b9d63ac6b28fe639763ddcb04a514ecb2e4f619513ccb83575ffc7fb90c13f7c5f4189359452a3881baf SHA512 597052c7cf4ec40c5655216956fe6a32c3ea1fdc69ddd7f9c39cddd42fd035efbc03fa5837a9378b5c4cd3f88c6b7b5ee054e9db5a739850505149749ed3fefa
diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch b/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch
deleted file mode 100644
index f341fa99ddac..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/HDFGroup/hdf5/commit/9dd36f016a4316b94f5df15856d228de01d304c6
-
-From 9dd36f016a4316b94f5df15856d228de01d304c6 Mon Sep 17 00:00:00 2001
-From: Ryan Schmidt <ryandesign@macports.org>
-Date: Thu, 17 Nov 2022 16:28:44 -0600
-Subject: [PATCH] Simplify & fix check for szlib encoder (#2263)
-
-Return the result rather than setting the exit code. "return" is a
-language keyword whereas "exit" is a function for which the <stdlib.h>
-header has to be included which it wasn't in this test, therefore the
-test would previously fail to identify that the encoder was enabled if
-"-Werror=implicit-function-declaration" was used, which it is by default
-with clang from Xcode 12 and later.
-
-Fixes #2262
---- a/configure.ac
-+++ b/configure.ac
-@@ -1737,10 +1737,7 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-                 #include "szlib.h"
-             ],[[
-                 /* SZ_encoder_enabled returns 1 if encoder is present */
--                if(SZ_encoder_enabled() == 1)
--                    exit(0);
--                else
--                    exit(1);
-+                return SZ_encoder_enabled() != 1;
-             ]])]
-         , [hdf5_cv_szlib_can_encode=yes], [hdf5_cv_szlib_can_encode=no],)]
-    )
-
diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-no-messing-ldpath.patch b/sci-libs/hdf5/files/hdf5-1.12.2-no-messing-ldpath.patch
deleted file mode 100644
index b8585fc647f6..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.12.2-no-messing-ldpath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -159,8 +159,6 @@ settings_DATA=libhdf5.settings
- # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
- # is set to ignore the error.
- H5Tinit.c: H5detect$(EXEEXT)
--	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) |                  \
--		sed -e 's/-L/:/g' -e 's/ //g'`"                               \
- 	$(RUNSERIAL) ./H5detect$(EXEEXT)  $@  ||                               \
- 	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
- 	    ($(RM) $@ ; exit 1)
-@@ -171,8 +169,6 @@ H5Tinit.c: H5detect$(EXEEXT)
- # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
- # is set to ignore the error.
- H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings
--	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) |                  \
--		sed -e 's/-L/:/g' -e 's/ //g'`"                               \
- 	$(RUNSERIAL) ./H5make_libsettings$(EXEEXT)  $@  ||                               \
- 	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
- 	    ($(RM) $@ ; exit 1)
diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-no-strip-symbols.patch b/sci-libs/hdf5/files/hdf5-1.12.2-no-strip-symbols.patch
deleted file mode 100644
index 0f3bf3981fa7..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.12.2-no-strip-symbols.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/665378
---- a/configure.ac
-+++ b/configure.ac
-@@ -2368,9 +2368,9 @@ case "X-$SYMBOLS" in
-     AC_MSG_RESULT([yes])
-     ;;
-   X-no)
--    H5_CFLAGS="$H5_CFLAGS $NO_SYMBOLS_CFLAGS"
--    H5_CXXFLAGS="$H5_CXXFLAGS $NO_SYMBOLS_CXXFLAGS"
--    H5_FCFLAGS="$H5_FCFLAGS $NO_SYMBOLS_FCFLAGS"
-+    H5_CFLAGS="$H5_CFLAGS"
-+    H5_CXXFLAGS="$H5_CXXFLAGS"
-+    H5_FCFLAGS="$H5_FCFLAGS"
-     AC_MSG_RESULT([no])
-     ;;
-   *)
diff --git a/sci-libs/hdf5/files/hdf5-1.14.4-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch b/sci-libs/hdf5/files/hdf5-1.14.4-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch
deleted file mode 100644
index 5b3a5f85f2ce..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.14.4-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dcfab0f9f0c41cb61a25b11cd61eac7204365693 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 17 Dec 2023 09:25:43 +0000
-Subject: [PATCH 1/3] Make sure that during runtime we'll use the same
- libgfortran as during linking
-
-Bug: https://bugs.gentoo.org/419991
-Bug: https://bugs.gentoo.org/419895
-Signed-off-by: Sam James <sam@gentoo.org>
----
- fortran/src/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
-index 8d8396f..de03df9 100644
---- a/fortran/src/Makefile.am
-+++ b/fortran/src/Makefile.am
-@@ -98,6 +98,7 @@ if BUILD_PARALLEL_CONDITIONAL
- else
-   H5FC_NAME = h5fc
- endif
-+H5test_kind_LDFLAGS=-static-libgfortran
- 
- # Rules for automatically detecting which fortran types are present
- # and matching them to C types.  This is accomplished using helper
--- 
-2.44.0
-
diff --git a/sci-libs/hdf5/files/hdf5-1.14.4-0002-Disable-forced-stripping.patch b/sci-libs/hdf5/files/hdf5-1.14.4-0002-Disable-forced-stripping.patch
deleted file mode 100644
index 25a3088dc031..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.14.4-0002-Disable-forced-stripping.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9bcb00e44ce2442db9dcd173e70f8635d7e22c1d Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 17 Dec 2023 09:26:33 +0000
-Subject: [PATCH 2/3] Disable forced stripping
-
-Bug: https://bugs.gentoo.org/665378
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6a3beee..fc44a39 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2512,9 +2512,9 @@ case "X-$SYMBOLS" in
-     AC_MSG_RESULT([yes])
-     ;;
-   X-no)
--    H5_CFLAGS="$H5_CFLAGS $NO_SYMBOLS_CFLAGS"
--    H5_CXXFLAGS="$H5_CXXFLAGS $NO_SYMBOLS_CXXFLAGS"
--    H5_FCFLAGS="$H5_FCFLAGS $NO_SYMBOLS_FCFLAGS"
-+    H5_CFLAGS="$H5_CFLAGS"
-+    H5_CXXFLAGS="$H5_CXXFLAGS"
-+    H5_FCFLAGS="$H5_FCFLAGS"
-     AC_MSG_RESULT([no])
-     ;;
-   *)
--- 
-2.44.0
-
diff --git a/sci-libs/hdf5/files/hdf5-1.14.4-0003-Drop-broken-Werror-stripping.patch b/sci-libs/hdf5/files/hdf5-1.14.4-0003-Drop-broken-Werror-stripping.patch
deleted file mode 100644
index 3b8a628b0384..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.14.4-0003-Drop-broken-Werror-stripping.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 014f4857dc0e5883cb07393d5875412806855d28 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 17 Dec 2023 09:27:18 +0000
-Subject: [PATCH 3/3] Drop broken -Werror stripping
-
-The stripping is broken and mangles -Werror=x -> -x [0].
-
-[0] https://github.com/HDFGroup/hdf5/commit/41526f68f3482f2b3a7aa581288bc86e9c6dcb43#r100076265
-
-Bug: https://bugs.gentoo.org/917448
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac | 36 ------------------------------------
- 1 file changed, 36 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fc44a39..2117303 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,42 +193,6 @@ saved_user_JAVAFLAGS="$JAVAFLAGS"
- saved_user_LDFLAGS="$LDFLAGS"
- saved_user_CPPFLAGS="$CPPFLAGS"
- 
--## Strip out -Werror from CFLAGS since that can cause checks to fail when
--## compiling test programs fails due to warnings
--##
--##  Regex:
--##
--##      -Werror        Literal -Werror
--##      \(             Start optional capturing group
--##      =              Literal equals sign
--##      [^[:space:]]   Non-space characters
--##      \+             1 or more of the above
--##      \)             End optional capturing group
--##      \?             0 or 1 capturing group matches
--##
--## Note that the outer pair of '[]' ends up getting removed
--WERROR_SED='s/-Werror\(=[[^[:space:]]]\+\)\?//g'
--CFLAGS_SED="`echo $CFLAGS | sed -e $WERROR_SED`"
--if test $? -eq 0; then
--  CFLAGS="$CFLAGS_SED"
--fi
--CXXFLAGS_SED="`echo $CXXFLAGS | sed -e $WERROR_SED`"
--if test $? -eq 0; then
--  CXXFLAGS="$CXXFLAGS_SED"
--fi
--FCFLAGS_SED="`echo $FCFLAGS | sed -e $WERROR_SED`"
--if test $? -eq 0; then
--  FCFLAGS="$FCFLAGS_SED"
--fi
--JAVACFLAGS_SED="`echo $JAVACFLAGS | sed -e $WERROR_SED`"
--if test $? -eq 0; then
--  JAVACFLAGS="$JAVACFLAGS_SED"
--fi
--CPPFLAGS_SED="`echo $CPPFLAGS | sed -e $WERROR_SED`"
--if test $? -eq 0; then
--  CPPFLAGS="$CPPFLAGS_SED"
--fi
--
- ## Support F9X variable to define Fortran compiler if FC variable is
- ## not used.  This should be deprecated in the future.
- if test "x" = "x$FC"; then
--- 
-2.44.0
-
diff --git a/sci-libs/hdf5/files/hdf5-1.8.9-static_libgfortran.patch b/sci-libs/hdf5/files/hdf5-1.8.9-static_libgfortran.patch
deleted file mode 100644
index f87ccdd08f7a..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.9-static_libgfortran.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure that during runtime we'll use the same libgfortran as during linking
-
-https://bugs.gentoo.org/show_bug.cgi?id=419991
-https://bugs.gentoo.org/show_bug.cgi?id=419895
-
---- a/fortran/src/Makefile.am
-+++ b/fortran/src/Makefile.am
-@@ -181,6 +181,7 @@
- else
-   H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90
- endif
-+H5test_kind_LDFLAGS=-static-libgfortran
- 
- # Mark this directory as part of the Fortran API
- FORTRAN_API=yes
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild
deleted file mode 100644
index d39ded3b0019..000000000000
--- a/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FORTRAN_NEEDED=fortran
-
-# We've reverted *back* to autotools from CMake because of
-# https://github.com/HDFGroup/hdf5/issues/1814.
-inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
-
-MY_P=${PN}-${PV/_p/-patch}
-MAJOR_P=${PN}-$(ver_cut 1-2)
-
-DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/HDF5/"
-SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="NCSA-HDF"
-SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
-REQUIRED_USE="
-	!unsupported? (
-		cxx? ( !mpi ) mpi? ( !cxx )
-		threads? ( !cxx !mpi !fortran !hl )
-	)
-"
-
-RDEPEND="
-	mpi? ( virtual/mpi[romio] )
-	szip? ( virtual/szip:= )
-	zlib? ( virtual/zlib:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
-	"${FILESDIR}"/${PN}-1.12.2-no-messing-ldpath.patch
-	"${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch
-	"${FILESDIR}"/${PN}-1.12.2-configure-clang16.patch
-)
-
-pkg_setup() {
-	# Workaround for bug 285148
-	tc-export CXX CC AR
-
-	use fortran && fortran-2_pkg_setup
-
-	if use mpi; then
-		if has_version 'sci-libs/hdf5[-mpi]'; then
-			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
-			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
-		fi
-
-		export CC=mpicc
-		use fortran && export FC=mpif90
-	elif has_version 'sci-libs/hdf5[mpi]'; then
-		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
-		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Respect Gentoo examples directory
-	sed \
-		-e "s:hdf5_examples:doc/${PF}/examples:g" \
-		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
-	sed \
-		-e '/docdir/d' \
-		-i config/commence.am || die
-
-	if ! use examples; then
-		# bug #409091
-		sed -e '/^install:/ s/install-examples//' \
-			-i Makefile.am || die
-	fi
-
-	# Enable shared libs by default for h5cc config utility
-	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die
-	hprefixify m4/libtool.m4
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug #686620
-	use sparc && tc-is-gcc && append-flags -fno-tree-ccp
-	# bug #922800, LTO failures:
-	use fortran && filter-lto
-
-	econf \
-		--disable-static \
-		--enable-deprecated-symbols \
-		--enable-build-mode=$(usex debug debug production) \
-		--with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" \
-		$(use_enable cxx) \
-		$(use_enable debug codestack) \
-		$(use_enable fortran) \
-		$(use_enable hl) \
-		$(use_enable mpi parallel) \
-		$(use_enable threads threadsafe) \
-		$(use_enable unsupported) \
-		$(use_with szip szlib) \
-		$(use_with threads pthread) \
-		$(use_with zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install
-
-	# No static archives
-	find "${ED}" -name '*.la' -delete || die
-
-	# Remove "perf" executable due to file collisions with dev-util/perf.
-	# Previously with the CMake build system we only installed h5perf, so
-	# let's simply remove the file for now.
-	use mpi && { rm "${ED}"/usr/bin/perf || die "rm failed" ; }
-}
diff --git a/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild b/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild
deleted file mode 100644
index 15a7cca3ca1b..000000000000
--- a/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FORTRAN_NEEDED=fortran
-
-# We've reverted *back* to autotools from CMake because of
-# https://github.com/HDFGroup/hdf5/issues/1814.
-inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
-
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}
-MAJOR_P=${PN}-$(ver_cut 1-2)
-
-DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="https://github.com/HDFGroup/hdf5/"
-SRC_URI="https://github.com/HDFGroup/hdf5/releases/download/${PN}_${MY_PV/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="NCSA-HDF"
-SLOT="0/311"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
-IUSE="cxx debug examples fortran +hl mpi szip test threads unsupported zlib"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	!unsupported? (
-		cxx? ( !mpi ) mpi? ( !cxx )
-		threads? ( !cxx !mpi !fortran !hl )
-	)
-"
-
-RDEPEND="
-	mpi? ( virtual/mpi[romio] )
-	szip? ( virtual/szip:= )
-	zlib? ( virtual/zlib:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/hdf5-1.14.4-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch
-	"${FILESDIR}"/hdf5-1.14.4-0002-Disable-forced-stripping.patch
-	"${FILESDIR}"/hdf5-1.14.4-0003-Drop-broken-Werror-stripping.patch
-)
-
-pkg_setup() {
-	# Workaround for bug 285148
-	tc-export CXX CC AR
-
-	use fortran && fortran-2_pkg_setup
-
-	if use mpi; then
-		if has_version 'sci-libs/hdf5[-mpi]'; then
-			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
-			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
-		fi
-
-		export CC=mpicc
-		use fortran && export FC=mpif90
-	elif has_version 'sci-libs/hdf5[mpi]'; then
-		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
-		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e '/docdir/d' \
-		-i config/commence.am || die
-
-	if ! use examples; then
-		# bug #409091
-		sed -e '/^install:/ s/install-examples//' \
-			-i Makefile.am || die
-	fi
-
-	# Enable shared libs by default for h5cc config utility
-	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die
-	hprefixify m4/libtool.m4
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug #686620
-	use sparc && tc-is-gcc && append-flags -fno-tree-ccp
-
-	local myeconfargs=(
-		--disable-static
-		--disable-doxygen-errors
-		--enable-deprecated-symbols
-		--enable-build-mode=$(usex debug debug production)
-		--with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin"
-		--with-examplesdir="\${datarootdir}/doc/${PF}/examples" \
-		$(use_enable cxx)
-		$(use_enable debug codestack)
-		$(use_enable fortran)
-		$(use_enable hl)
-		$(use_enable mpi parallel)
-		$(use_enable test tests)
-		$(use_enable threads threadsafe)
-		$(use_enable unsupported)
-		$(use_with szip szlib)
-		$(use_with threads pthread)
-		$(use_with zlib)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install
-
-	# No static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/hdf5/hdf5-1.14.6-r1.ebuild b/sci-libs/hdf5/hdf5-2.2.0.ebuild
index 3dc7f42cfd0a..83ee087c7921 100644
--- a/sci-libs/hdf5/hdf5-1.14.6-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,17 +7,12 @@ FORTRAN_NEEDED=fortran
 
 inherit cmake fortran-2 flag-o-matic toolchain-funcs
 
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}
-MAJOR_P=${PN}-$(ver_cut 1-2)
-
 DESCRIPTION="General purpose library and file format for storing scientific data"
 HOMEPAGE="https://github.com/HDFGroup/hdf5/"
-SRC_URI="https://github.com/HDFGroup/hdf5/releases/download/${PN}_${MY_PV/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="https://github.com/HDFGroup/hdf5/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="NCSA-HDF"
-SLOT="0/310-cmake"
+SLOT="0/320-cmake"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cxx debug fortran +hl mpi szip test threads unsupported zlib"
 RESTRICT="!test? ( test )"
@@ -28,9 +23,11 @@ REQUIRED_USE="
 	)
 "
 
+# HDF5 2.x requires libaec's libsz compatibility library, so virtual/szip
+# (which also allows sci-libs/szip) is not sufficient here.
 DEPEND="
-	mpi? ( virtual/mpi[romio] )
-	szip? ( virtual/szip:= )
+	mpi? ( virtual/mpi[romio,fortran?] )
+	szip? ( sci-libs/libaec:=[szip] )
 	zlib? ( virtual/zlib:= )
 "
 RDEPEND="
@@ -40,15 +37,6 @@ BDEPEND="
 	dev-lang/perl
 "
 
-PATCHES=(
-	# https://github.com/HDFGroup/hdf5/pull/5361
-	"${FILESDIR}"/hdf5-1.14.6-cmake-h5cc.patch
-	# https://github.com/HDFGroup/hdf5/pull/5465
-	"${FILESDIR}"/hdf5-1.14.6-h5cc-sh.patch
-	# https://github.com/HDFGroup/hdf5/pull/5467
-	"${FILESDIR}"/hdf5-1.14.6-override-compiler.patch
-)
-
 pkg_setup() {
 	use fortran && fortran-2_pkg_setup
 
@@ -71,25 +59,29 @@ src_configure() {
 	use sparc && tc-is-gcc && append-flags -fno-tree-ccp
 
 	local mycmakeargs=(
-		-DHDF5_INSTALL_CMAKE_DIR=$(get_libdir)/cmake/hdf5
-		-DHDF5_INSTALL_LIB_DIR=$(get_libdir)
-		# just COPYING
+		# lib/cmake dirs follow CMAKE_INSTALL_LIBDIR from the eclass
+		-DHDF5_USE_GNU_DIRS=ON
+		# just LICENSE
 		-DHDF5_INSTALL_DATA_DIR=tmp
 		# redundant to include?
 		-DHDF5_INSTALL_MODULE_DIR=tmp
 		-DHDF5_INSTALL_DOC_DIR=share/doc/${PF}
 		-DH5_DEFAULT_PLUGINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin"
 
-		-DALLOW_UNSUPPORTED=$(usex unsupported)
-		-DONLY_SHARED_LIBS=ON
-		-DHDF5_BUILD_GENERATORS=OFF
+		-DHDF5_ALLOW_UNSUPPORTED=$(usex unsupported)
+		-DHDF5_ONLY_SHARED_LIBS=ON
 		-DHDF5_ENABLE_TRACE=$(usex debug)
 		-DHDF5_ENABLE_HDFS=OFF
+		# the direct VFD needs O_DIRECT, which is Linux-only here;
+		# requesting it elsewhere is a hard configure error
+		-DHDF5_ENABLE_DIRECT_VFD=$(usex kernel_linux)
 		-DHDF5_ENABLE_PARALLEL=$(usex mpi)
 		-DHDF5_ENABLE_SUBFILING_VFD=OFF
 		-DHDF5_ENABLE_SZIP_SUPPORT=$(usex szip)
-		-DHDF5_ENABLE_Z_LIB_SUPPORT=$(usex zlib)
+		-DHDF5_ENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DHDF5_USE_ZLIB_NG=OFF
 		-DHDF5_ENABLE_THREADSAFE=$(usex threads)
+		-DHDF5_ENABLE_CONCURRENCY=OFF
 		-DHDF5_ENABLE_MAP_API=OFF
 		-DHDF5_BUILD_DOC=OFF
 		-DBUILD_TESTING=$(usex test)
@@ -105,14 +97,14 @@ src_configure() {
 
 	# do not force the compiler used for build
 	if use mpi; then
-		mycmakeargs+=( -DPKG_CONFIG_C_COMPILER=mpicc )
-		use cxx && mycmakeargs+=( -DPKG_CONFIG_CXX_COMPILER=mpic++ )
-		use fortran && mycmakeargs+=( -DPKG_CONFIG_Fortran_COMPILER=mpif90 )
+		mycmakeargs+=( -DHDF5_H5CC_C_COMPILER=mpicc )
+		use cxx && mycmakeargs+=( -DHDF5_H5CC_CXX_COMPILER=mpic++ )
+		use fortran && mycmakeargs+=( -DHDF5_H5CC_Fortran_COMPILER=mpif90 )
 	else
-		mycmakeargs+=( -DPKG_CONFIG_C_COMPILER='${CC:-cc}' )
-		use cxx && mycmakeargs+=( -DPKG_CONFIG_CXX_COMPILER='${CXX:-c++}' )
+		mycmakeargs+=( -DHDF5_H5CC_C_COMPILER='${CC:-cc}' )
+		use cxx && mycmakeargs+=( -DHDF5_H5CC_CXX_COMPILER='${CXX:-c++}' )
 		use fortran &&
-			mycmakeargs+=( -DPKG_CONFIG_Fortran_COMPILER='${FC:-gfortran}' )
+			mycmakeargs+=( -DHDF5_H5CC_Fortran_COMPILER='${FC:-gfortran}' )
 	fi
 
 	cmake_src_configure
diff --git a/sci-libs/libaec/libaec-1.1.4.ebuild b/sci-libs/libaec/libaec-1.1.4.ebuild
index 92e29ecaec6d..ad7776eb84aa 100644
--- a/sci-libs/libaec/libaec-1.1.4.ebuild
+++ b/sci-libs/libaec/libaec-1.1.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="+szip test"
 RESTRICT="!test? ( test )"