gentoo resync : 07.01.2022

20 files changed, 557 insertions, 240 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b9c8749039d0..0294a37c8a7f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index ae8531cee599..97681d581afb 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,7 @@
+AUX dealii-9.1.1-fix_boost_177.patch 470 BLAKE2B 0e701500943bf400d021ac787e089485efaa58a0659e96de3bc92d785c26fbe5f63360a5b81713d868bce2e04a6f02a19bd809e28017e2c2a8ce8ec724350345 SHA512 350da7118fa94b04e5d53c681a51c60f450536ed82093de1106cfb2f5d60111db41dad46929c1831efd4ff902558a17a8a01c71cca85d456c6b17e29fd2cec31
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
 DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
-EBUILD dealii-9.3.1-r3.ebuild 5439 BLAKE2B fb0184863504e4a490b5d170d2eef59951846a84b5ea3d002939096a6b7d5bbb7832a36771e06ca1790fca9528d6b4a4b1b723e0185d91270c6367d8ab35a429 SHA512 65bdbce63d914189a6fbefbc149f811f6416d194769aa49f58b74fe2bb2f8b9b7499348334fecfec6a3e0f5e76861203d5eb00890c0de3153a3fdf8f82118ad7
-EBUILD dealii-9999.ebuild 5410 BLAKE2B f43901b5bba82076a93039f408ec7829eab104c6b1e1efd09beb583037532364ea00fe65501abfeb8db96adc6c24ecb6c2875fa65220538091527384024f20b3 SHA512 165db04bca48076e6e52641fe8300f83a75bc30f54031bce366027bd93c93d97826eb51462b141c800190f1003800520e4f03c91ad268c25d6ee74ed178219ad
+EBUILD dealii-9.3.1-r4.ebuild 5478 BLAKE2B a300b5267930af10f9218e4bf2c8ec0aa5ce11455aac32b904d6467cfe5aadc347ffcd908f4af3c46936f42c980a07131344ce5771cc6a4afb531902d001ee13 SHA512 2cdac16a058b06b6d9d40d6076c6bafd9bd35c3e1612857699c12fa98b7e0a99ac23cefed53195786c2b7228493a2ffc0db7ca0db6f344f98135f36233fb0c54
+EBUILD dealii-9999.ebuild 5385 BLAKE2B 775f8ab5e40eb5ac1d12c972c3518fddc212050f920588f68c6e6fa3cf4d4b5cb7d14c91a756770bbe4055f53a6dcf61ee3200e33f71068701ec67c82238323c SHA512 9de81d5d1b0b3fbd9aacb0562397bb373ec66bbf44711e6932908c9f79c45e5a61f05577982efcc7ae4d14ee4c996b631f3e24bb606d56278bf39376a763868b
 MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
diff --git a/sci-libs/dealii/dealii-9.3.1-r3.ebuild b/sci-libs/dealii/dealii-9.3.1-r4.ebuild
index c52bce06b69d..ebe0f99102e4 100644
--- a/sci-libs/dealii/dealii-9.3.1-r3.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,7 +45,7 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.3
 
-RDEPEND="<dev-libs/boost-1.77.0:=
+RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/tbb:=
@@ -80,6 +80,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+	"${FILESDIR}"/${PN}-9.1.1-fix_boost_177.patch
 )
 
 src_configure() {
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 4717fd8600ce..f95f48acaaac 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,6 @@ REQUIRED_USE="
 CAS_VERSION=7.5.3
 
 RDEPEND="dev-libs/boost:=
-	!~dev-libs/boost-1.77.0
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/cpp-taskflow
diff --git a/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch
new file mode 100644
index 000000000000..b040e240ad61
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch
@@ -0,0 +1,12 @@
+diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h
+index 1b9d04d..1e1bfd2 100644
+--- a/include/deal.II/numerics/rtree.h
++++ b/include/deal.II/numerics/rtree.h
+@@ -26,6 +26,7 @@
+ #include <deal.II/boost_adaptors/segment.h>
+ 
+ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
++#include <boost/geometry/algorithms/distance.hpp>
+ #include <boost/geometry/index/rtree.hpp>
+ #include <boost/geometry/strategies/strategies.hpp>
+ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 088e24358394..0b65f743aa19 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -6,6 +6,8 @@ AUX gdal-3.3.0-libdir.patch 19617 BLAKE2B c0fd86a2d79155ee17a8ae69ae59876b76d9a4
 AUX gdal-3.3.2-poppler-21.10.0.patch 1226 BLAKE2B 7475f40216fcf14417c5bb916b5508935e518e4428c8134099109b85af966935a83f807039ac2617f0a437ff1594ded0d403d447ceacdf53e77f74973bf866f1 SHA512 760f6ba7746496b2f72562ff3dad6067f67d1a612ecb713c1b9526dc335f4ecdcd97d406e8e6f395ad10b5a66a1febbe12579a52aab3d4518807999def361de4
 DIST gdal-3.3.3.tar.gz 19600111 BLAKE2B 2d4558062b35016372d6964884296878fdcef0afa83fb03b10cd902ce101ec52f551d48014d95b391d19b8db13d7ca1d639575b39e9421780f4212bef02dd51f SHA512 c49e4555e598e4182e6419758c31df08d46b8b061480f08be09d61e840057529bd833338eaa8c1ecfe1c6a0cc8cd6a073bf15fa6cdae003e4475485cf3851145
 DIST gdal-3.4.0.tar.gz 20008930 BLAKE2B b4dad7226d2cfee3bdcab9782d2d35355501c1dd830d247099f6a8030311b86e7620e90f7bba675bf49dc47d166ab586fabe45ba02d9d7e9a73829194da6b360 SHA512 e363258172cff9647804be11f28ebec1614ddfbfc6eed72d44700c23aea674267e413099555d25e784d567ea915b5fb9092ff74b98d890dfcb8aae56b0575eb6
+DIST gdal-3.4.1.tar.gz 20022859 BLAKE2B fe6da8b3f098839bc5da9e49932a7a8e172b5dcb79f34eaa5f82a336cab3666223ae6f354c7847d1090e312838cc2e121e357c914cca3375541ee8ed31746edc SHA512 dcfd5f5ceac633838db2a92af6f6eb1c9fca55216885f071c7d8df8fc119aa800b2854c6e5ae84cdeea531e7e61296ad4378d798107c19d80d2ba4e1094299bf
 EBUILD gdal-3.3.3.ebuild 7852 BLAKE2B 03a04b87e0099452c748d0400a4c21a9369a04f01948b298a39dd9a938c3b2264e00827b3cf0ca7d7719f35a90974c493fcc5a99efb111789c684249c58dcafd SHA512 28738878e2f1cb78f5ab1a25553e445563a4b17e555bf87808de1ff0d373b6b309ad561d6514e1b9b02f5391bb19c7f0519c31d490d4465f8eccef0f1cbc0945
 EBUILD gdal-3.4.0.ebuild 8033 BLAKE2B cf27f9b230f4fba647892383bd51112a9ba072424a834189569027faea7852476fc2f627837759d99c126d6307deacdf951ddaa2d88dcaf120ef4c8455ef2424 SHA512 9633034b855d9b640de491fc1e9c7d64eb149114787dcebfa76fec083b2772ba45e59cfb87154f35e4ce6544607fff515decc4bd4ce574c237f2ade914498361
+EBUILD gdal-3.4.1.ebuild 8033 BLAKE2B 0be979fe6c87eb39f5db25dcad069ef8458f49a5177301204831372f4dba0f86abb8ece3c599961a2b9f467e19d0f321b8e0cbd675ff4b3cb6ca31278d3f5121 SHA512 30c2c0a9feb6337e6004d8e0feabfff68ccde64b329dc4aa209305b196b735ffac73f577370f558fe5fe1895e722737768bd7a80b1bb87a83b2acabd73b5f9b8
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild
new file mode 100644
index 000000000000..620283cbc410
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.4.1.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+# subslot is libgdal.so.<SONAME>
+SLOT="0/30"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	heif? ( media-libs/libheif:= )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop a --prefix hack in the upstream build system
+	# We don't want the line at all, so let's just drop it rather than
+	# trying to put in the right libdir value.
+	# bug #696106
+	sed -e '/\$ADD_PREFIX\/lib/d' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+
+	# autoconf 2.70+
+	# bug #775209
+	config_rpath_update .
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}"/usr/include/${PN}
+		--disable-lto
+		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
+		--enable-shared
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
+		--with-crypto
+		--with-cryptopp=no
+		--with-expat
+		--with-geotiff
+		--with-gnm
+		--with-hide-internal-symbols
+		--with-libjson-c="${ESYSROOT}"/usr
+		--with-libtiff
+		--with-libtool
+		--with-libz="${ESYSROOT}"/usr
+		--without-blosc
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		# libjxl yet packaged.
+		--without-jxl
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-lz4
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-rasdaman
+		--without-rasterlite2
+		# Revisit when OpenEXR 3 / ilmmath migration is more complete in tree
+		--without-exr
+		--without-pcraster
+		--without-pdfium
+		--without-perl
+		--without-podofo
+		--without-python
+		--without-qhull
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux-xml pam)
+		$(use_with curl)
+		$(use_with cpu_flags_x86_avx avx)
+		$(use_with cpu_flags_x86_sse sse)
+		$(use_with cpu_flags_x86_ssse3 ssse3)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with heif)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	# Respect libdir in pkgconfig file
+	sed -i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):" "${ED}"/usr/$(get_libdir)/pkgconfig/gdal.pc || die
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
+		perl-module_src_install
+		popd > /dev/null || die
+		perl_delete_localpod
+	fi
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.rst README-python.rst
+	fi
+
+	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index 0c5d9506b287..d1ce7850acbe 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -1,7 +1,8 @@
-AUX silo-4.10.2-mpiposix.patch 1902 BLAKE2B c26f6681bbab0065f046414c406bcfac3cc1a993729bb67e1178e67261201afbaad3f0469b8859d5c34261ea00f4be4f131a9db9f981dbbe18f137b53dc9a435 SHA512 626a7b8084a936b667f704a1a35edb8f6ce9ab42b58857024b87f280364d99b452e3f149b577e45898eb08523f0741eecc1c4ad20a46018dae377ca17adcf97a
-AUX silo-4.10.2-qt5.patch 1414 BLAKE2B 3b33d1228f9b26340d851a97dfcdde38b1ab66632a05ef0a3a5d7b9cec2c9c7186c922d0630bf6600830c53263218b90fe66ab0156cdf143a4df5577b200f5ab SHA512 a6a22b7ef04179b8d101d38b72244be6c59d4d23bb8dd0855ba5f3267a181e2b175806dbfa6c1184bd5f3542e842701f096a389e6cae6df5d26209319d96316f
-AUX silo-4.10.2-qtlibs.patch 4320 BLAKE2B 34fbff942d4caa73bf18302873ba4dc63de063eec84b3e0cd3bf3b24a5aeb44d40b74567f8001c3d14e19dabdb5133ea4ca32af067b16398a6aaaaac664209c5 SHA512 3f2e63ee943463fc23d7ba3542c756bd158c8b8f8280ec87eef53e30add0b335edfd202c592885e2f4002c7f975324ca7e96351c1d9c25ffb1adf2b67cd034d9
-AUX silo-4.10.2-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3
-DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e
-EBUILD silo-4.10.2-r1.ebuild 1204 BLAKE2B cd8fff90a101fc3888af7918ded496abc0c205c9e2e4434fec166b03713ccc9ffc598641377979be7ed42cc80058e17616193ad18646c462dc204e9200e14c1c SHA512 02d1c29c400ed9624a6d7714ac2cc53e503f43516f61f25380dfd3de604fe6398402ee1c0f94c5dd18f75e85ee1d5528f9a321f81fb6ff4f0d35c6b7436a8ee5
-MISC metadata.xml 674 BLAKE2B 3689c25bc7a4803dc6aee8c93d494cea99ba3a2f42a5f41a693e40cce0bd1daa8dd33fc4074d44a3eac756084893076ee3525deea0ef27363ab6311d1e475775 SHA512 33e3f253ef4e7488ad861a514cdd26069cbb51546f5ccaffedd73b3338ae55b462127dcef24c3481d77b27526f53cd779065d5fdb950a4715218a992314c8500
+AUX silo-4.11-autoreconf.patch 1692 BLAKE2B 23d9ef8806f655874bedb3a0bf3d839e61e4da06a95457bdacb6ddf54da46ceeb563b8bb623b8c6edd9c13eb110ffab07c146e1e04f4ac537a3eac0952942e44 SHA512 0c1eb37267c116180ce6f54dfdb998eceaf865bd4a544da01e29a56cd1cf0846af14518780888c029ea5fc37b02e07b146ec7dcb8bea759869aa1235fbd79a22
+AUX silo-4.11-hdf5.patch 1927 BLAKE2B 7c712cf43f4f8b1b4ac502afbde68de105e5cba34767f9faa523d9fdfa185b8eb6675cfb5c678d0dd9c27a12a5693b9ca6c2d3ee6d3af146db3d2039479ffe8b SHA512 7c34856634daade9976a71cb70286cc735a29a6082f67efcbf61ffcab4f8620a447daace8ae49eb7b6100b8d8c7ed482a3aafa4269a29b70c8da8829815bcbb4
+AUX silo-4.11-test-disable-largefile.patch 913 BLAKE2B b8c244bbe4df98e8a90af306894290c3103d9763610bf720c77fd22ff8ca9f1cdfc8d69176a9d330552e690ba38af72cd32f46bf4047351704d57644a24e3a03 SHA512 320cc6a110a0c1a641aa053ef642cfacafa0e22e76373d10bc214f7cc716619a2229062ee5dffd92ebb16bd02b3c0d5a6137380be5e88bcfd2fef45284436455
+AUX silo-4.11-tests.patch 909 BLAKE2B 0472a4ea51ca60285415b4da0cdfb5cd0cc8b75289abdf6040640d39dd5f528797ec8a36cc1681785c0945f379cfe2ce3ef0d1b9998b36cf38f797f7c0cd173a SHA512 d29efc8b0edfb996e3a1d7a7dbab6f15a60d3481135625852084d30c2f89f5a9a7bcd937619f01c31a301bca3250e4632e87ea5056f54be5613ad6ead008c8eb
+AUX silo-4.11-testsuite-python-write.patch 827 BLAKE2B a2cfc512ff5aaffec6af29a5de16c9c827d7488dcaae8e808ead2a8d9d6dc5f0fddea821d9b6cd170d2657d98a13d9b79faa8bad0fbb11150099a1b7b489beb3 SHA512 6ff64305f7c72be9683494c8095fe192273d06bafe027d18ca0a71fcd1579af71100e31381b65d2f9d6b805bcb95a6a9b85aeec5e99bc4d2dac93b828977f98e
+DIST silo-4.11-bsd.tgz 13298515 BLAKE2B fcf2e7912381e57d1a64644d3cee4dea50302c12704eaf0ee9e2569b7bc29b1d5c9df66878744ffc2cc04e16834fdf1cd4d677983af36005e4ecf0918c6283d5 SHA512 f642dd21dacffa147aea54d6f8669c704772d5640d6eb7eeff1d7e5e5d37ddbde250d78bad30e9478dcfec63a86863243d7a56cd9b692eaefdd7a89b34df35d0
+EBUILD silo-4.11.ebuild 1098 BLAKE2B 817d224691f2087511604b2d061a72a684ca09baca3d5b463fb9e275267484798eb0d47a989f8502d431111a1834b41b342d98350d4587557f13693b17d44ed7 SHA512 8da126e5136ff7dc4587ab2f815d3eb046ca69882023595a7d9407e602c4d90538146b542a886dfe77138cc3e5a9209b26cce35bdec2087811db8bd17eccb9be
+MISC metadata.xml 729 BLAKE2B 0bab9cb0101f967456a70472cb819b0eb43eb8444ae5260d33c3dc3f8f49480594609698110155dc6a12ef93ff6acf539b02f2cbfebc496fa0b641ed36738715 SHA512 3131fb65d7c9048d5a3b49ca9ce1ce790ca4b34c588b8bd72fc48a9facc995b1da1a8ac7ae4601db1c6cd14313f6d32084eaf101e95f2279df8e3316c3467514
diff --git a/sci-libs/silo/files/silo-4.10.2-mpiposix.patch b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
deleted file mode 100644
index 30a3f910b196..000000000000
--- a/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/hdf5_drv/silo_hdf5.c.orig	2017-07-28 08:52:09.026638768 +0200
-+++ src/hdf5_drv/silo_hdf5.c	2017-07-28 09:00:12.306635882 +0200
-@@ -4752,18 +4752,19 @@
-         }
- 
-         /* default HDF5 mpi drivers */
--        case DB_FILE_OPTS_H5_DEFAULT_MPIP:
--        {
--#ifdef H5_HAVE_PARALLEL
--            h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
--#else
--            H5Pclose(retval);
--            return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
--#endif
--            break;
--        }
-+//        case DB_FILE_OPTS_H5_DEFAULT_MPIP:
-+//        {
-+//#ifdef H5_HAVE_PARALLEL
-+//            h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
-+//#else
-+//            H5Pclose(retval);
-+//            return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
-+//#endif
-+//            break;
-+//        }
- 
-         case DB_FILE_OPTS_H5_DEFAULT_MPIO:
-+	case DB_FILE_OPTS_H5_DEFAULT_MPIP:
-         {
- #ifdef H5_HAVE_PARALLEL
-             MPI_Info info;
-@@ -5069,15 +5070,15 @@
-                     if ((p = DBGetOption(opts, DBOPT_H5_MPIP_NO_GPFS_HINTS)))
-                         use_gpfs_hints = FALSE;
- 
--                    if (vfd == DB_H5VFD_MPIO)
-+//                    if (vfd == DB_H5VFD_MPIO)
-                     {
-                         h5status |= H5Pset_fapl_mpio(retval, mpi_comm, mpi_info);
-                         if (created_info) MPI_Info_free(&mpi_info);
-                     }
--                    else
--                    {
--                        h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints);
--                    }
-+//                    else
-+//                    {
-+//                        h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints);
-+//                    }
- #else 
-                     H5Pclose(retval);
-                     return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
diff --git a/sci-libs/silo/files/silo-4.10.2-qt5.patch b/sci-libs/silo/files/silo-4.10.2-qt5.patch
deleted file mode 100644
index 1e1fe8803a37..000000000000
--- a/sci-libs/silo/files/silo-4.10.2-qt5.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- tools/silex/SiloFile.h.orig	2018-01-24 11:01:23.354705068 +0100
-+++ tools/silex/SiloFile.h	2018-01-24 11:01:34.843705761 +0100
-@@ -61,6 +61,8 @@
- #include <vector>
- using std::vector;
- 
-+#define toAscii toLatin1
-+
- // ****************************************************************************
- //  Class:  SiloDir
- //
---- tools/silex/main.cpp.orig	2018-01-24 11:02:21.201708556 +0100
-+++ tools/silex/main.cpp	2018-01-24 11:02:34.146709336 +0100
-@@ -58,7 +58,7 @@
- #include <cstdlib>
- 
- #ifndef Q_WS_MACX
--#include "qwindowsstyle.h"
-+//#include "qwindowsstyle.h"
- #endif
- #include "qfiledialog.h"
- #include "qstring.h"
-@@ -91,7 +91,7 @@
-     QApplication::setColorSpec(QApplication::ManyColor);
-     QApplication a(argc, argv);
- #ifndef Q_WS_MACX
--    a.setStyle(new QWindowsStyle);
-+//    a.setStyle(new QWindowsStyle);
- #endif
-     Explorer *w = 0;
-     if (argc > 1)
---- tools/silex/SiloView.cpp.orig	2018-01-24 11:03:13.775711725 +0100
-+++ tools/silex/SiloView.cpp	2018-01-24 11:03:30.032712706 +0100
-@@ -109,8 +109,8 @@
-         dirTreeView->OpenRootDir();
-         dirView->Set(silo->root);
- 
--        dirTreeView->header()->setResizeMode(QHeaderView::Interactive);
--        dirView->header()->setResizeMode(QHeaderView::Interactive);
-+        dirTreeView->header()->setSectionResizeMode(QHeaderView::Interactive);
-+        dirView->header()->setSectionResizeMode(QHeaderView::Interactive);
-     }
- }
- 
diff --git a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
deleted file mode 100644
index ecd5297c281f..000000000000
--- a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- configure.orig	2018-01-24 10:50:10.458664501 +0100
-+++ configure	2018-01-24 10:50:42.967666461 +0100
-@@ -27541,7 +27541,7 @@
-         ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-                      sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
-       fi
--      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-     else
-       # Use cached value or do search, starting with suggestions from
-       # the command line
-@@ -27615,7 +27615,7 @@
-       ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-                    sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
-     fi
--    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-   else
-     # There is no valid definition for $QTDIR as Trolltech likes to see it
-     ax_qt_dir=
-@@ -27627,7 +27627,7 @@
-         ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-                      sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
-       fi
--      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-     else
-       # Normally, when there is no traditional Trolltech installation,
-       # the library is installed in a place where the linker finds it
-@@ -27645,10 +27645,10 @@
-       # See if we find the library without any special options.
-       # Don't add top $LIBS permanently yet
-       ax_save_LIBS="$LIBS"
--      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-       ax_qt_LIBS="$LIBS"
-       ax_save_CXXFLAGS="$CXXFLAGS"
--      CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
-+      CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC"
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27706,7 +27706,7 @@
-         # That did not work. Try the multi-threaded version
-         echo "Non-critical error, please neglect the above." >&5
-         ax_qt_lib=qt-mt
--        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-         cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27764,7 +27764,7 @@
-           # That did not work. Try the OpenGL version
-           echo "Non-critical error, please neglect the above." >&5
-           ax_qt_lib=qt-gl
--          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-           cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27847,7 +27847,7 @@
-               fi
-             done
-             # Try with that one
--            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-             cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27955,7 +27955,7 @@
-     fi # all $ax_qt_* are set
-   fi   # $have_qt reflects the system status
-   if test x"$have_qt" = xyes; then
--    QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
-+    QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC"
-     if test x"$ax_qt_lib" = xqt-mt; then
-         QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
-     fi
diff --git a/sci-libs/silo/files/silo-4.10.2-tests.patch b/sci-libs/silo/files/silo-4.10.2-tests.patch
deleted file mode 100644
index 2e0a52191d0e..000000000000
--- a/sci-libs/silo/files/silo-4.10.2-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/Makefile.in.old	2014-07-24 07:25:53.464381420 +0200
-+++ tests/Makefile.in	2014-07-24 07:26:14.951048323 +0200
-@@ -169,7 +169,7 @@
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@
- rocket_silo_la_LIBADD =
--am_rocket_silo_la_OBJECTS = rocket_silo.lo
-+am_rocket_silo_la_OBJECTS = rocket_silo.lo ../src/.libs/libsilo.la
- rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS)
- rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
diff --git a/sci-libs/silo/files/silo-4.11-autoreconf.patch b/sci-libs/silo/files/silo-4.11-autoreconf.patch
new file mode 100644
index 000000000000..371b346e921c
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-autoreconf.patch
@@ -0,0 +1,35 @@
+Author: Alastair McKinstry <mckinstry@debian.org>
+Description: Fixes needed for autoreconf to work on Debian
+ When autoreconf is run, VL_LIB_READLINE is lost from aclocal, so included in config/
+ Also include AX_CHECK_COMPLER_FLAG() which is not in autoconf (just autoconf-archive)
+ AX_CHECK_COMPILER_FLAGS() is obsolete
+Last-Updated: 2021-01-14
+Forwarded: no
+Link: https://sources.debian.org/patches/silo-llnl/4.11-2/autoreconf.patch/
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -195,6 +195,8 @@
+ dnl This allows multiple src-dir builds within one host.
+ AC_PREFIX_DEFAULT("SILO_TOP_SRC_DIR")
+ 
++AC_PROG_F77
++
+ dnl
+ dnl Handle the python module right away to determine if we need shared libs.
+ dnl Ordinarily, we default to static libs
+@@ -618,10 +620,10 @@
+ # it is an argument to the -D argument. So, I think this is
+ # just totally bogus!
+ # Default to large file support
+-AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
+-AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
+-AX_CHECK_COMPILER_FLAGS("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
+-AX_CHECK_COMPILER_FLAGS("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
++AX_CHECK_COMPILE_FLAG("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
++AX_CHECK_COMPILE_FLAG("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
++AX_CHECK_COMPILE_FLAG("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
++AX_CHECK_COMPILE_FLAG("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
+ 
+ #
+ # Note: regardless of what the stuff above regarding large file support
diff --git a/sci-libs/silo/files/silo-4.11-hdf5.patch b/sci-libs/silo/files/silo-4.11-hdf5.patch
new file mode 100644
index 000000000000..6791a44aa2b1
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-hdf5.patch
@@ -0,0 +1,46 @@
+Link: https://aur.archlinux.org/cgit/aur.git/tree/hdf5.patch?h=silo
+
+--- a/src/hdf5_drv/H5FDsilo.c	2021-09-11 01:22:52.000000000 +0300
++++ b/src/hdf5_drv/H5FDsilo.c	2021-11-25 00:37:06.685422949 +0200
+@@ -252,13 +252,13 @@
+         snprintf(msg, sizeof(msg), Msg "(errno=%d, \"%s\")",	\
+             Errno, strerror(Errno));					\
+     ret_value = Ret;							\
+-    H5Epush_ret(Func, Cls, Maj, Min, msg, Ret)				\
++    H5Epush_ret(Func, Cls, Maj, Min, msg, Ret);				\
+ }
+ #else
+ #define H5E_PUSH_HELPER(Func,Cls,Maj,Min,Msg,Ret,Errno)			\
+ {									\
+     ret_value = Ret;							\
+-    H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret)				\
++    H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret);				\
+ }
+ #endif
+ 
+@@ -1355,7 +1355,7 @@
+     assert(sizeof(hsize_t)<=8);
+     memcpy(p, &file->block_size, sizeof(hsize_t));
+     if (H5Tconvert(H5T_NATIVE_HSIZE, H5T_STD_U64LE, 1, buf+8, NULL, H5P_DEFAULT)<0)
+-        H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
++        H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1);
+ 
+     return 0;
+ }
+@@ -1383,14 +1383,14 @@
+ 
+     /* Make sure the name/version number is correct */
+     if (strcmp(name, "LLNLsilo"))
+-        H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1)
++        H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1);
+ 
+     buf += 8;
+     /* Decode block size */
+     assert(sizeof(hsize_t)<=8);
+     memcpy(x, buf, 8);
+     if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HSIZE, 1, x, NULL, H5P_DEFAULT)<0)
+-        H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
++        H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1);
+     ap = (hsize_t*)x;
+     /*file->block_size = *ap; ignore stored value for now */
+ 
diff --git a/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch b/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch
new file mode 100644
index 000000000000..953453e12fe0
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch
@@ -0,0 +1,23 @@
+Author: Alastair McKinstry <mckinstry@debian.org>
+Description: Disable largefile test. Seems to fail on rounding error
+Forwarded: yes
+Last-Updated: 2011-06-09
+Link: https://sources.debian.org/patches/silo-llnl/4.11-2/test-disable-largefile.patch/
+
+--- a/tests/testsuite.at
++++ b/tests/testsuite.at
+@@ -324,10 +324,10 @@
+ AT_SETUP(xversion)
+ AT_CHECK(test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testxvers `pwd`,,ignore,ignore)
+ AT_CLEANUP
+-AT_SETUP(largefile)
+-AT_KEYWORDS(large)
+-AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile,,ignore,ignore)
+-AT_CLEANUP
++#AT_SETUP(largefile)
++#AT_KEYWORDS(large)
++#AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile,,ignore,ignore)
++#AT_CLEANUP
+ #AT_SETUP(memfile_simple)
+ #AT_CHECK(testall -small $STARGS,,ignore)
+ #AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND memfile_simple $STARGS,,ignore,ignore)
diff --git a/sci-libs/silo/files/silo-4.11-tests.patch b/sci-libs/silo/files/silo-4.11-tests.patch
new file mode 100644
index 000000000000..a093d318ded6
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-tests.patch
@@ -0,0 +1,26 @@
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -169,7 +169,7 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@
+ rocket_silo_la_LIBADD =
+-am_rocket_silo_la_OBJECTS = rocket_silo.lo
++am_rocket_silo_la_OBJECTS = rocket_silo.lo ../src/.libs/libsiloh5.la
+ rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS)
+ rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+
+Author: Alastair McKinstry <mckinstry@debian.org>
+Description: bash is needed to execute this testscript for test 62.
+Last-Updated: 2011-04-11
+Forwarded: no
+Link: https://sources.debian.org/patches/silo-llnl/4.11-2/testsuite-fix.patch/
+
+--- a/tests/testdtypes
++++ b/tests/testdtypes
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Copyright (C) 1994-2016 Lawrence Livermore National Security, LLC.
+ # LLNL-CODE-425250.
diff --git a/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch b/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch
new file mode 100644
index 000000000000..ac0bc859068a
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch
@@ -0,0 +1,27 @@
+Author: Alastair McKinstry <mckinstry@debian.org>
+Description: Python code seems to be broken. Disable test and inform upstream.
+Last-Updated: 2011-06-09
+Forwarded: yes
+Link: https://sources.debian.org/patches/silo-llnl/4.11-2/testsuite-python-write.patch/
+
+--- a/tests/test_write.py
++++ b/tests/test_write.py
+@@ -52,11 +52,13 @@
+ db = Silo.Create("foo.silo", "test file")
+ db.Write("t1", 12)
+ db.Write("t2", "hello")
+-db.Write("t3", (13,))
+-db.Write("t4", 14.5)
+-db.Write("t5", (1.2, 10))
+-db.Write("t6", (1.2, 10.2))
+-db.Write("t7", (10, 1.2))
++# Disable writes with floating point. Seem to break on python2.7
++# --amck, 2011-06-09
++#db.Write("t3", (13,))
++#db.Write("t4", 14.5)
++#db.Write("t5", (1.2, 10))
++#db.Write("t6", (1.2, 10.2))
++#db.Write("t7", (10, 1.2))
+ db.Write("t8", "a")
+ db.MkDir("a")
+ db.Write("a/t8", "x2")
diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml
index 042cd6fc239a..ebaabb67af86 100644
--- a/sci-libs/silo/metadata.xml
+++ b/sci-libs/silo/metadata.xml
@@ -9,6 +9,7 @@
     computing platforms.
   </longdescription>
   <use>
+    <flag name="browser">Enable browser support</flag>
     <flag name="silex">Build silex data browser</flag>
   </use>
   <maintainer type="project">
diff --git a/sci-libs/silo/silo-4.10.2-r1.ebuild b/sci-libs/silo/silo-4.10.2-r1.ebuild
deleted file mode 100644
index 65c67760377f..000000000000
--- a/sci-libs/silo/silo-4.10.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch fortran-2
-
-DESCRIPTION="A mesh and field I/O library and scientific database"
-HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
-SRC_URI="https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PN}/${P}/${P}.tar.gz"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +silex static-libs +qt5 test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="silex? ( qt5 )"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5 )
-	qt5? ( dev-qt/qtgui:5 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-qtlibs.patch"
-	epatch "${FILESDIR}/${P}-qt5.patch"
-	epatch "${FILESDIR}/${P}-tests.patch"
-	epatch "${FILESDIR}/${P}-mpiposix.patch"
-}
-
-src_configure() {
-	econf \
-		--enable-install-lite-headers \
-		--enable-shared \
-		$(use_enable silex silex ) \
-		$(use_enable static-libs static ) \
-		$(use_with qt5 Qt-lib-dir "${EPREFIX}"/usr/$(get_libdir) ) \
-		$(use_with qt5 Qt-include-dir "${EPREFIX}"/usr/include/qt5 ) \
-		$(use_with qt5 Qt-bin-dir "${EPREFIX}"/usr/$(get_libdir)/qt5/bin ) \
-		$(use_with hdf5 hdf5 ${EPREFIX}"/usr/include,${EPREFIX}"/usr/$(get_libdir) )
-}
diff --git a/sci-libs/silo/silo-4.11.ebuild b/sci-libs/silo/silo-4.11.ebuild
new file mode 100644
index 000000000000..e7a7f142d2aa
--- /dev/null
+++ b/sci-libs/silo/silo-4.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fortran-2
+
+DESCRIPTION="A mesh and field I/O library and scientific database"
+HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
+SRC_URI="https://wci.llnl.gov/sites/wci/files/2021-09/${P}-bsd.tgz"
+S="${WORKDIR}/${P}-bsd"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="browser +hdf5 +silex"
+# Waiting for fix/answer upstream
+# See https://github.com/LLNL/Silo/issues/234
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	virtual/szip
+	hdf5? ( sci-libs/hdf5 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autoreconf.patch
+	"${FILESDIR}"/${P}-hdf5.patch
+	"${FILESDIR}"/${P}-test-disable-largefile.patch
+	"${FILESDIR}"/${P}-tests.patch
+	"${FILESDIR}"/${P}-testsuite-python-write.patch
+)
+
+src_configure() {
+	econf \
+		--enable-install-lite-headers \
+		--enable-shared \
+		$(use_enable silex silex ) \
+		$(use_enable browser browser ) \
+		$(use_with hdf5 hdf5 "${EPREFIX}"/usr/include,"${EPREFIX}"/usr/$(get_libdir) )
+}
+
+# src_test() {
+#	emake -C tests check
+# }