gentoo resync : 16.04.2022

12 files changed, 437 insertions, 37 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4a001bec7af1..57b30f28caa6 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 894ea4815485..b7f48396a58d 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -3,8 +3,9 @@ AUX gdal-2.3.0-curl.patch 323 BLAKE2B 19a89ac9ffed5716fe2c26234233045022a3bc262d
 AUX gdal-3.3.0-libdir.patch 19617 BLAKE2B c0fd86a2d79155ee17a8ae69ae59876b76d9a4a35c79b896d838edcd497f17bf35ddfd3ab6de8e792a87ae8c012a91b1d2f0351d47e89f7d7fcf88a72647d38a SHA512 ee74ee86b8249abfbbce6e114f3a5f1c79a30a86aeb45761ca8637ebcae0e0df4c4961b292fdd1f49865da6445a8afaf161d80c28849dde6adf72cc3ed092852
 AUX gdal-3.4.1-poppler-22.01.0-c++17.patch 759 BLAKE2B bfb9cfc97fb56a18eda0f0d20e83f8e48ba44bab80fa7253c3883cac0a6a6460345745aaf4e63c750e4c0d8e3866c2978da382ea9889c9ff638b697e6398ad84 SHA512 bc95a835093b9b8bb3ed44d82a9c4b0fb987f1299d572e05f6791df2bd14c279853cfc877e41a012367bb4089b4e81ea359bc44d1ae11e67048063d2a1105a1a
 AUX gdal-3.4.1-poppler-22.03.0.patch 2056 BLAKE2B 119a71daf7d53ee405041b8e7c2bd33e1672aac1883ebdd967a0252cbdc809dea2b993ad630a6c206cb68afe081354c2a56b94b6f9e76a868858aa1de34964cb SHA512 07511f9490a5385271210b140c07096232611a0604618e30cd97e8e737b4d81deaf536438296ad0307cf0f59a5fc7448ed36e3fda6e6faad6a49daac05fb2c54
-DIST gdal-3.4.1.tar.gz 20022859 BLAKE2B fe6da8b3f098839bc5da9e49932a7a8e172b5dcb79f34eaa5f82a336cab3666223ae6f354c7847d1090e312838cc2e121e357c914cca3375541ee8ed31746edc SHA512 dcfd5f5ceac633838db2a92af6f6eb1c9fca55216885f071c7d8df8fc119aa800b2854c6e5ae84cdeea531e7e61296ad4378d798107c19d80d2ba4e1094299bf
-DIST gdal-3.4.2.tar.gz 20048761 BLAKE2B e5134d8602d23b9b83f14e02d15cf734dbffeea76504c8d0c96ebfe7e40d7d16911a2f1b5f570458dcbf14aa9a681481409581cc6fc4cd2fe10359be88f20b5a SHA512 7c1e9fd48c57c8e1dde6bff22aa181ce8c5d39c8bb22c51ca592fe453c66178171f51f4a49d3800e51bedb17d0e78692a118e0b16891bb9c7bf66937e3546cfe
-EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 1be6f00ff6b65525c425b55090036a313b1c8416991ff23b911401455f486d6137e5db4c997b98bd8f0a5f5e9a7e8deddb1855a119b6996a4528999be3b6ee3b SHA512 27e5be8c59d70f8437cbaaab8a205e8b5fa0f27192ccd3fd66f802d01535c38d03538ba7289967ca51351e949ccbe605bbdc8145533d6da933fb6ce64a40664d
-EBUILD gdal-3.4.2.ebuild 8133 BLAKE2B 9b2b7333f9033398195a75a0cc809103b42cd2ca58323191c075783a7d1e2c69242cac5393d56903f81c8aa5762a831d40b1c44c8b76ee0a19dacd2422060b79 SHA512 3e931072e54281887225c2fc8f5d47c31417d10df15a36aa8ed60b53d792217413bf7575c3ce1541667cfae0a93d6a5577eccc6df3d4360169cee075d39ebb51
+DIST gdal-3.4.1.tar.xz 13257288 BLAKE2B 3b01e8345579c9d46fb3d4ff240f5b97cf13eb4b580ecc93044e0ca3d99e2d19fa2a2a52a2342b3158d67525a1de18a9ba77a2033ad891f73fee682b2c10cade SHA512 a66362996f255cb75116693b4ee398337ec8b9699b5cd7fed90105f72832faa20750b77ebbc3e8d59ab72a23b35c4e4e78513cc803bd93e1b7846711ccfb5bff
+DIST gdal-3.4.2.tar.xz 13273280 BLAKE2B b40e2978d0841386b52de1ad08cec862c52aab8c015aecd58983bb8c5bbf8d86ca8e4ef5d2bbae39f421b3c78eecd0df1b3cd83d6bf25b1469563b4f9f37d8ca SHA512 7b7e2800b2c23ffe6b7739fbf77748e3be2db9e34b061753da5e175f6ad6ed7f9f91856d3838f071a17a6afab96c258d37a15502e254d2008310d3061031af73
+EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 49f36d5018cf65bfc92369d4d7e7f8eecfa823fb6ec88069fa7ae605d5c0a57643ddcc690fc5cfd830d45023a75baf6007da7f510174cfe8a4b67ef661a87b37 SHA512 f462eb9247d7f0c9b281e95d7ae69808811fb619973ea785de5061c84b5aaf2b42222b61425e49ac6b614573ec49da72ba35426694731445313f814888240aa5
+EBUILD gdal-3.4.2-r1.ebuild 8166 BLAKE2B 5d8db98d2976f5a5010dba2ca66ceb3496205c4931fe703eec668dae02c80ac40048e7e88c33a47697810e152fbae655429acc1d58adbca7c1d4dc9b506f4ffe SHA512 5b983e33bea3f05b4c84055872a6267202f279eedcae5873cfa28f901da6f1e860fc71f0984a7e01eb0e2f5ef0656b9339a0b155dddbb6798e72787209295300
+EBUILD gdal-3.4.2.ebuild 8133 BLAKE2B d9f24a278b01eaf11c1b58bc8aa9c01335c4e3ec3ac4fa2317d7745dd98d5eb01965686262045b82ec0d770d63ef2d455b6c5459a1b24c491c039889df40509e SHA512 0042eed7df18d29c4209eeeb9cd58afaeb6b5b2feac5f4a1cab1420f6c757357e2f54809fb27d594dcc765f2c3faed571b19233ec847538afd8b6b20e036783a
 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
index 904b9e2d0280..48138f904731 100644
--- a/sci-libs/gdal/gdal-3.4.1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.1.ebuild
@@ -10,7 +10,7 @@ inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 pe
 
 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"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/30" # subslot is libgdal.so.<SONAME>
diff --git a/sci-libs/gdal/gdal-3.4.2-r1.ebuild b/sci-libs/gdal/gdal-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..5a96f300c4d6
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.4.2-r1.ebuild
@@ -0,0 +1,329 @@
+# 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.xz"
+
+LICENSE="BSD Info-ZIP MIT"
+SLOT="0/30" # subslot is libgdal.so.<SONAME>
+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 )
+	java? ( threads )
+"
+
+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/libpcre2
+	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
+		--with-pcre2
+		--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-pcre
+		--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
+
+	if use java; then
+		# bug #752399
+		java-pkg_dojar "${S}"/swig/java/gdal.jar
+		dolib.so "${S}"/swig/java/.libs/libgdalalljni.so.*
+	fi
+
+	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/gdal/gdal-3.4.2.ebuild b/sci-libs/gdal/gdal-3.4.2.ebuild
index 7ceb3100de0e..97c8af9a4910 100644
--- a/sci-libs/gdal/gdal-3.4.2.ebuild
+++ b/sci-libs/gdal/gdal-3.4.2.ebuild
@@ -10,7 +10,7 @@ inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 pe
 
 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"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/30" # subslot is libgdal.so.<SONAME>
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 04106f49edb8..75e94f61b4cc 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,4 +1,5 @@
-AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
 DIST lapack-3.10.0.tar.gz 7630775 BLAKE2B fd2f920dd3f69eab471aa8c20d1b8178fb5c6e80337a2ed6948aba3ec639a816f8d368bb59ff6fb513b2f5cda9e61c2a547182f22fbc84a8c34191acefc3406a SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
-EBUILD lapack-3.10.0.ebuild 3063 BLAKE2B 7f3fe2ba2104f4a04ebecae2e9159f59cb8e0b742920e6bfcbecc84174404064ddee45e7753815eb7dc7e2dbe555c1f7b570422d92e6fed659d7d608785026c7 SHA512 80423a2c878b688f38a4daa11bbc661b64493a550398d7d8a40ce71ee394444f8fe2a6ad99d3b72d1d48980ff13dbe7bcc8580027a45015f134462412382e3de
+DIST lapack-3.10.1.tar.gz 7632257 BLAKE2B f2653239029ed9c136173fc2e54773a785ad3e469d581ca2b7f6a72697e6bb9d22879edaf8327ada510df259c08fe984202d14cb3860c0d2a711eb55a1cc11dd SHA512 0500bbbb48483208c0a35b74972ff0059c389da6032824a2079637266a99fa980882eedf7f1fc490219ee4ff27812ac8c6afe118e25f40a9c2387e7b997762fb
+EBUILD lapack-3.10.0.ebuild 3004 BLAKE2B d30beb1a09b7f69bd0dca44ffb013e1fa3646017c527b41a6453de3dc6f01ac61fa409855c510ab4164f6e939b059d2b8479751601c12564faae3c1fdd55026b SHA512 8e58ec461d8a7b14b1df611743f8fdfe41022c5a01873fc367781545bfbea407502661129078bb3172a9ca4a031209b713862f38e9d7648834563e9af68608ad
+EBUILD lapack-3.10.1.ebuild 2974 BLAKE2B 065a365797777b8e332c6af0a20854f7bdec6b203484c5d58c570c5210801fe368aeffd7509b68dbab60fe3461d89c216c9999a5d3fa2a320c4a00f1b2328d1b SHA512 30b03f9078b18dafddafd45faa07b9e9913f06cfbb9e154723f93c051ea5feb5505abe8afe7ac82bbc7577844be8c1c645075d01c2ff6aa7ec0c8042633f8b8d
 MISC metadata.xml 1583 BLAKE2B 8db26f3744a6ee5f88f7ad37e749843eb8b63cd11af4182dd9d6408a854a5b060a651abd5f2f2098252a38b68b34c464a99f9654be9e6cba8f444eff23e4e297 SHA512 d8e8eb140e1a05f297b9e6edcc9aeb48e958baa7741be2a693ea4fca1a6d3f66a60d72c4c61e2dac8b8efd6210daf10ea9350fdbcfbaf801ac6366d0025ad2ca
diff --git a/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch b/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch
deleted file mode 100644
index 1dbcd6d9f677..000000000000
--- a/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9dbf97..9635ba4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,7 +127,7 @@ set(PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
- # --------------------------------------------------
- # Testing
--option(BUILD_TESTING "Build tests" ${_is_coverage_build})
-+option(BUILD_TESTING "Build tests")
- include(CTest)
- message(STATUS "Build tests: ${BUILD_TESTING}")
- 
-@@ -443,4 +443,4 @@ install(FILES
-   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
-   COMPONENT Development
-   )
--  
-\ No newline at end of file
-+  
diff --git a/sci-libs/lapack/lapack-3.10.0.ebuild b/sci-libs/lapack/lapack-3.10.0.ebuild
index af0b1bcc0c31..0c071e5d12d0 100644
--- a/sci-libs/lapack/lapack-3.10.0.ebuild
+++ b/sci-libs/lapack/lapack-3.10.0.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
@@ -27,10 +27,6 @@ RDEPEND="
 	doc? ( app-doc/blas-docs )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	#"${FILESDIR}"/${PN}-3.9.0-build-tests.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 }
diff --git a/sci-libs/lapack/lapack-3.10.1.ebuild b/sci-libs/lapack/lapack-3.10.1.ebuild
new file mode 100644
index 000000000000..962b68b1d175
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.10.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
+HOMEPAGE="https://www.netlib.org/lapack/"
+SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+# TODO: static-libs 64bit-index
+IUSE="lapacke deprecated doc eselect-ldso test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!app-eselect/eselect-cblas
+	virtual/fortran
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCBLAS=ON
+		-DLAPACKE=$(usex lapacke)
+		-DBUILD_DEPRECATED=$(usex deprecated)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	use eselect-ldso || return
+	# Create private lib directory for eselect::blas (ld.so.conf)
+	dodir /usr/$(get_libdir)/blas/reference
+	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
+	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
+	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
+	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
+
+	# Create private lib directory for eselect::lapack (ld.so.conf)
+	dodir /usr/$(get_libdir)/lapack/reference
+	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
+	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+
+	local me=reference libdir=$(get_libdir)
+	# check eselect-blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check eselect-lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	use eselect-ldso || return
+
+	eselect blas validate
+	eselect lapack validate
+}
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index f2f48d36c176..388b901a86ac 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -10,6 +10,6 @@ DIST p4est-2.3.3.tar.gz 2644849 BLAKE2B f39546d0583c4671f32814c3c1d297d903a4f746
 DIST p4est-2.8.0.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
 EBUILD p4est-2.3.1-r1.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
 EBUILD p4est-2.3.3.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
-EBUILD p4est-2.8.0-r1.ebuild 1564 BLAKE2B 470bc5bf133c6ec6c769300300dcf0bb0fed7882b7cbc96b34bdbf05b88bcbae4799e47f4e260cd7a6fda41c4e50d6aedcba913d2ccfe092bcf9d363f77e55af SHA512 aa766cf1368d2a3341ecb5f5cdf21467e82eef3b33e9d3bf7e666b19fdc072c1c154170927b4ad0b9051c63766f2cfc636a3aabac2d41bc15aa24f819021fecd
-EBUILD p4est-9999.ebuild 1508 BLAKE2B 18d08f6fcbc8ed6f16dd57e692e6de45c9da2407ede56ae8bc0b0c8ef74d74d272bcb70c6642b7bd8f3ca2a363e19adc69604317cf7b137dfc066221bece5f02 SHA512 a650059814c9c31ee6af07d2be9331c54455cfaba7932731efed20a8564a20f442bc3f82e35d34b6214f9146e6940d8c41ddc39dadd37217c43ab4ca8b35bcb5
+EBUILD p4est-2.8.0-r1.ebuild 1551 BLAKE2B 831a5c37bb0997a530c3b72f54358699fbf2288b4cda79026ea26ecd94181138e5b875b6502339c03c80265aa6ff54f41021f98f938eb91695bd866096dff066 SHA512 6540a34f7026bee590b9302eb68a55375f0843f3ce37ce2a1a34b0d2ea42e4a8bbc2a28f2691ad6084d57ad944fa39eecda540fd4a5dd5075a9bf0a05dd30141
+EBUILD p4est-9999.ebuild 1495 BLAKE2B cff45eb0a7951254a026c82c186f7eaea825779bdba372bea524a9913d070c281f0c88b55243ec5c4a883169f209a52d8055ea151e1a4b0f7feb5b6f0beaf810 SHA512 c60b7aa0d13389c30ad4c10ef9127f6c8ce6fdde10a00ddf2cf287070aef6a53d21feacecdebc353d123ec6de8f48b9f29111b281734b2898d5b823ce7b9b1d0
 MISC metadata.xml 933 BLAKE2B dbebf4c49f70183487e695e63b78c412260956c197dce7471145c8eb150672fcd7223d1ab4b81c793c0147bc77c49f235fbf31949581d760d077c0ca61e72a0b SHA512 228cade7cf570c4e5f629ae64b8fef9cb3635556f2ad52bc31c34480cc148ace1d2ebcb59563d02f1cc94f21a863c6077e8acc9b58b01d0519962c1580d836c5
diff --git a/sci-libs/p4est/p4est-2.8.0-r1.ebuild b/sci-libs/p4est/p4est-2.8.0-r1.ebuild
index 2e803199a24b..177d7985ea02 100644
--- a/sci-libs/p4est/p4est-2.8.0-r1.ebuild
+++ b/sci-libs/p4est/p4est-2.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index d27a0814359b..41605b7be0f7 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"