gentoo auto-resync : 14:09:2022 - 11:10:10

12 files changed, 283 insertions, 236 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b595b8f085b3..a151cffea799 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index 5fd7e3824d01..825bce7fd121 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -5,6 +5,6 @@ AUX fflas-ffpack-2.4.3-no-fabi-version.patch 1170 BLAKE2B 90e9c080291251d4a5231c
 AUX fflas-ffpack-2.4.3-no-test-echelon.patch 1374 BLAKE2B f62631e7e4e358584a826fb5ec3e9f36b892b5f0636c965677c55a97901ffefe3ad47dea79c46d65bb3090668e335d4f7cfc04cd12bc2b72f1c3c7db45833108 SHA512 9c9ee6e7df7d04fcc5ffc84cd3a2dae08e960540371671cc79c4eb99606bc1fd150a6e0ad96f16a51904ff83fabe69bdc9bfc6e9603855fe21acea535fc31dc1
 AUX fflas-ffpack-2.4.3-no-test-fgesv.patch 1268 BLAKE2B 51c0cf74dac9b296a944e918475807e97a2cf71f066cda9c067b63b344e260b9fbb9ea2851db7ac2170e2b239c0778be0c9a99e0efbbbb9215df921197208784 SHA512 9a57cba58a6bab69092c4d335d92994651bb51d2f4e867d4f0396813e14f492d720232779615299b5203603bb76553ec8a4881ffb9677c349f22c0ef3975df0d
 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
-EBUILD fflas-ffpack-2.4.3-r2.ebuild 2245 BLAKE2B deb3c0666641c90eb6789d83023b394423c0fa0f3e1167d787d7ba1d68fbeddad9855c1a2e252374990bf0948b99ada21fc8019e6ada0791e8f9b52120b691de SHA512 e12cb9f870745ccc604f2511a71278db867f6f911ee13c8beb4137515b3e0d22845f98fcc1a94a1cfee8e6703f3937151ac258be41cbc109e46dd5db9c216db6
-EBUILD fflas-ffpack-2.4.3-r3.ebuild 2245 BLAKE2B 5c47c02b52c579123f87d2dd64769a754deeebf2ff0cfacaeb964a6e9a491b522919098e37489021377b34bbe453beb0f44a28b19b6894601d55932edff90838 SHA512 08cfa565b5d1b00429ac4f8c640f07382368e4d91a5cf7207723b62225cb6dfe74fbaf13293f65bcda5b0279f8f8ec08266b24797f24d00620fbbfd90370e06b
+EBUILD fflas-ffpack-2.4.3-r2.ebuild 2230 BLAKE2B e432af2f9315f5a56ca693ffcec7f40a3ddcea76901d84178e4d5b561696e875e72f7425919313783387abc00aae16515584da9effcf29ea6e5f482be20fdaa8 SHA512 4bcbd0a128e36e5c7f354e998d37e8e72f920c24f73fb0de6e5710af011ed14455a592c6454ce83e16080e326fcad43b1b013897c5ddf6b835591b20a8916c20
+EBUILD fflas-ffpack-2.4.3-r3.ebuild 2229 BLAKE2B 02040e83e38717f35601e0d2fbc0a6ab5df23377671dcea95b3b9d11937de7f0c9fa7092995841b33bae4d1c6ddbfd154e1b0816a17a78778483a3373dad33e0 SHA512 ab68923da8b421941d4adcbf664f03a573868bb450b1c2f117d8ec357ace31b792f1ecfef6c0b4c0e2e0b2aac482d00e5dd9666c7e0c4f76f9f91bbff3d1f803
 MISC metadata.xml 1492 BLAKE2B 46a6b13fb1bae6f2aa43a9d7a96c7882d4d7de4b885a4ac92f320f72ce3076ad820c4c5f75c0f2d60334801d2764c20524ea26c1cc6c9975be13e00906708927 SHA512 fc6d90e2945f67a32594f601df69952baec0821d1e529a03c8dc332723848ca531f747efe7c30ea00885c4c4a081cdb81c0ea05085e7ca3acd7db304bb4f468b
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
index 5428716175bf..327b02fb947b 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.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
@@ -42,16 +42,14 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-pkg_setup() {
-	tc-export PKG_CONFIG
-}
-
 src_prepare() {
 	default
 	eautoreconf
 }
 
 src_configure() {
+	 tc-export PKG_CONFIG
+
 	econf \
 		--enable-precompilation \
 		$(use_enable openmp) \
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
index 87c452d6e355..9d9117b172ef 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
@@ -43,16 +43,14 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-pkg_setup() {
-	tc-export PKG_CONFIG
-}
-
 src_prepare() {
 	default
 	eautoreconf
 }
 
 src_configure() {
+	tc-export PKG_CONFIG
+
 	econf \
 		--enable-precompilation \
 		$(use_enable openmp) \
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index f60640cc8cac..4e294fea9909 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -9,12 +9,15 @@ DIST gdal-3.4.3.tar.xz 13275504 BLAKE2B 5b1cc2be9c2af7a326dc532d547b1e7d2f9c4af3
 DIST gdal-3.5.0-build-fixes-no-deps.patch.xz 5016 BLAKE2B 0d0ef0ccae73f8a903b0ccbf992fa775b394df85a89d86f86ad60187bfce6a87eb8b23a573bd65c0173c0e7cffe3df447cef0ddddfd5aebfcedfbed3e6a7716e SHA512 e32c97e3fef948f2fa9c0f4b7116ccb231554e962380d7bebb433083926fb4e1902b0a3bc243f747c81c95813651153ce2751d8c2de4e8abb096778ffe589a2e
 DIST gdal-3.5.0.tar.xz 8826500 BLAKE2B 7123ff4a7270b309d458e4a7bd32241cdef53953c305c5027873424794f4ed27d2a4838f86c42f9f84b5174ff499ee5539694c41e906509d21d899ccfe38ff99 SHA512 15d9675ffe5e76fdcb431bef1dce0ed8c23695f418186f37c63f4c7274322924095662bbbc95232d5b4d700704c1c4922d52b419cef5bb67f3bb64ee59654d8b
 DIST gdal-3.5.1.tar.xz 8844808 BLAKE2B 38efbc69a386607b10fbe9d0add14716fec68a48c6df60f618c306a25d824b499c8dab6cc3d9f614b57e2e69352be860fbba683c58b5d82970a346aa9699f111 SHA512 d731b2b2bd5d300786e2e0eca296d302fda8bc9c76b41d7e78b728f82bb857c55a0d0ba65ae0ccd3b03c6b5812d0afee07940e4133b4b2c852a384c9fe00a8bc
+DIST gdal-3.5.2.tar.xz 8863680 BLAKE2B 6d3277bde363abb202d8caa715af4d1b4b6d184c961502c9ee6d8367ac722329dc941def8b060c9ecd4f48e9561b60cc14a9cc633ba39ace8d02a2245ae2c5a4 SHA512 9515b6709bf3a32f800b38ebba41f1a475946aa7249f072ebe37af0aea896e2b834c9156151f94261366afa400870944fc394637b02e2fd69136af5171715d70
 DIST gdalautotest-3.5.0.tar 50442240 BLAKE2B 15005f16530690e584e39b036881c339f147e525e3e0dc39b57d027c493ab89027baa2ea3a0ed148c8fa3ebb7cd53cdb4cf4d53c96d068b5a89caf28165e213b SHA512 723c57425dd5f8acd61795be98b450844b5664b9940d47823829d510b8fb84d1d6db9ca880200d7732a83e7b0f1ae6e33269d8ebd91bf0e7d99e887b5f79aad0
 DIST gdalautotest-3.5.1.tar 51005440 BLAKE2B b6c927f35598a406c186fb834befb6941d3665f924dae77e69191e1190a74ba20153ddf14a5e9e9e0b65e70f3496a67ec9ab60fcfce5a62d8b71f5ed54fecc35 SHA512 50bcaf7dc63c8dc7209b3e6915f5cfd0e6fd6721bc741ac13ef13d485ac7ae4fbf2b59c0e856cbe73b5d9fd787da2859037bf9c3264953bb6fbc8dbbe3662308
+DIST gdalautotest-3.5.2.tar 51046400 BLAKE2B bd6f73b98548998d00b5631025abd2dc800c61a8afd16b63505cadd7fa46621c59f7be4eaee43d6cca9dd55684d17fc0e7e08c8540988f48af9e74c649f32dab SHA512 92017d76dc9523b7e24c50dc54b1b1d8856cb4be8a3c8d4fc23bd8a5abaad46c758d606a743cfc30aa4c74a876f203ae105f7e06b66b2873d06de70c2edd1cc2
 EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 49f36d5018cf65bfc92369d4d7e7f8eecfa823fb6ec88069fa7ae605d5c0a57643ddcc690fc5cfd830d45023a75baf6007da7f510174cfe8a4b67ef661a87b37 SHA512 f462eb9247d7f0c9b281e95d7ae69808811fb619973ea785de5061c84b5aaf2b42222b61425e49ac6b614573ec49da72ba35426694731445313f814888240aa5
 EBUILD gdal-3.4.2-r2.ebuild 8171 BLAKE2B dcb8f1836bd8f40c9c6c78a178e7cbe3bd38934345d2d0dc6a7f4e6057ae4e06b9d7a50f8d3c9e5a74013e2ae6068ea9bbc7c38bfa297731136a9662f946f561 SHA512 d47d70febcbaa9b9e3df4a3eb9d1ecf43f006629e1afec4ef1b399fd9a8fb3664d9a99b7af291ac941137b373e86e4c59cfe6eac5620508f251af658bddf242a
 EBUILD gdal-3.4.3-r1.ebuild 8125 BLAKE2B e6c3df82d9d1ccd60d57405d17ccb93ffa31353c1738e6adc67cac1faafe01c3da4650d2f4f0ad413c08c7d1bc8cf20e649978a9ac8d500873aa3c0b171d996c SHA512 0e1f00f7607d9b3b7cc6d64ac7e7c7619a6b4eb9c86a5ce102c087703ba36a8c15016fbcc1f196073126b22d2aa6f201a7ece1cd509244d95060946c34b43c1f
 EBUILD gdal-3.5.0-r3.ebuild 6663 BLAKE2B 90012f3cc1e50719569d6511d463874b8f25b9c3b2851b29b59311dce21d9105e8edd6197af84481a08e25a12d179fde606170cef6662a1c2a3332ae9bc98e6e SHA512 3613cb30254c17f1cb9f918bd4909c460a4483e9e88c264004b21a225a148bde0207115453be6d318b8458be9321e040ae07c493b6e78e524551e26dc8caa061
 EBUILD gdal-3.5.0-r4.ebuild 6879 BLAKE2B 7bd435458e65229bdeb871cd30985540588044ec9254f766cec81c58786edfb472df2d8845563a0457741eb7600d3aae0f6230c047abe6b1af3e5d7acef159ba SHA512 0bd2b4e1776bcfa7127d6300d6151702c2d66f7e384f2ee746d269f28d2dfe248db37db626422981b928eb110ea3dec5d7a2814edade458ad313913d75eb0f91
 EBUILD gdal-3.5.1.ebuild 6692 BLAKE2B a8a44e47733f93347ed4945220105df2d3e8c645929a1d72caa30b2288917779ba3098a97564210072683c181d01d65701acb4b9845a7975c6e0797333ad6ea7 SHA512 c6fc38ed6684402f9c030b5f6f893761192019d0301da6dcf2e5bcbc97840580efe1f22902938c677f167f88bf2e28fdc520442d7a59b4dc3fea84acfd0c187b
+EBUILD gdal-3.5.2.ebuild 6692 BLAKE2B a8a44e47733f93347ed4945220105df2d3e8c645929a1d72caa30b2288917779ba3098a97564210072683c181d01d65701acb4b9845a7975c6e0797333ad6ea7 SHA512 c6fc38ed6684402f9c030b5f6f893761192019d0301da6dcf2e5bcbc97840580efe1f22902938c677f167f88bf2e28fdc520442d7a59b4dc3fea84acfd0c187b
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.5.2.ebuild b/sci-libs/gdal/gdal-3.5.2.ebuild
new file mode 100644
index 000000000000..1be7580b66bd
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.5.2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake java-pkg-opt-2 python-single-r1
+
+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"
+SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz -> ${PN}autotest-${PV}.tar )"
+
+LICENSE="BSD Info-ZIP MIT"
+SLOT="0/31" # subslot is libgdal.so.<SONAME>
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
+# Tests fail to build in 3.5.0, let's not worry too much yet given
+# we're only just porting to CMake. Revisit later.
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="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:*
+	)
+	python? (
+		dev-lang/swig:0
+		$(python_gen_cond_dep '
+			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:=[cxx,szip] )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( >=sci-libs/ogdi-4.1.0-r1 )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	png? ( media-libs/libpng:= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			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:* )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test ; then
+		mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_IPO=OFF
+		-DGDAL_USE_EXTERNAL_LIBS=ON
+		-DGDAL_USE_INTERNAL_LIBS=OFF
+
+		# bug #844874 and bug #845150
+		-DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
+
+		# Options here are generally off because of one of:
+		# - Not yet packaged dependencies
+		#
+		# - Off for autotools build and didn't want more churn by
+		#   enabling during port to CMake. Feel free to request them
+		#   being turned on if useful for you.
+		-DGDAL_USE_ARMADILLO=$(usex armadillo)
+		-DGDAL_USE_ARROW=OFF
+		-DGDAL_USE_BLOSC=OFF
+		-DGDAL_USE_BRUNSLI=OFF
+		-DGDAL_USE_CRNLIB=OFF
+		-DGDAL_USE_CFITSIO=$(usex fits)
+		-DGDAL_USE_CURL=$(usex curl)
+		-DGDAL_USE_CRYPTOPP=OFF
+		-DGDAL_USE_DEFLATE=OFF
+		-DGDAL_USE_ECW=OFF
+		-DGDAL_USE_EXPAT=ON
+		-DGDAL_USE_FILEGDB=OFF
+		-DGDAL_USE_FREEXL=$(usex xls)
+		-DGDAL_USE_FYBA=OFF
+		-DGDAL_USE_GEOTIFF=ON
+		-DGDAL_USE_GEOS=$(usex geos)
+		-DGDAL_USE_GIF=$(usex gif)
+		-DGDAL_USE_GTA=OFF
+		-DGDAL_USE_HEIF=$(usex heif)
+		-DGDAL_USE_HDF4=OFF
+		-DGDAL_USE_HDF5=$(usex hdf5)
+		-DGDAL_USE_HDFS=OFF
+		-DGDAL_USE_ICONV=ON # TODO dep
+		-DGDAL_USE_IDB=OFF
+		-DGDAL_USE_JPEG=$(usex jpeg)
+
+		# https://gdal.org/build_hints.html#jpeg12
+		# Independent of whether using system libjpeg
+		-DGDAL_USE_JPEG12_INTERNAL=ON
+
+		-DGDAL_USE_JSONC=ON
+		-DGDAL_USE_JXL=OFF
+		-DGDAL_USE_KDU=OFF
+		-DGDAL_USE_KEA=OFF
+		-DGDAL_USE_LERC=OFF
+		-DGDAL_USE_LIBKML=OFF
+		-DGDAL_USE_LIBLZMA=$(usex lzma)
+		-DGDAL_USE_LIBXML2=ON
+		-DGDAL_USE_LURATECH=OFF
+		-DGDAL_USE_LZ4=OFF
+		-DGDAL_USE_MONGOCXX=OFF
+		-DGDAL_USE_MRSID=OFF
+		-DGDAL_USE_MSSQL_NCLI=OFF
+		-DGDAL_USE_MSSQL_ODBC=OFF
+		-DGDAL_USE_MYSQL=$(usex mysql)
+		-DGDAL_USE_NETCDF=$(usex netcdf)
+		-DGDAL_USE_ODBC=$(usex odbc)
+		-DGDAL_USE_ODBCCPP=OFF
+		-DGDAL_USE_OGDI=$(usex ogdi)
+		-DGDAL_USE_OPENCAD=OFF
+		-DGDAL_USE_OPENCL=$(usex opencl)
+		-DGDAL_USE_OPENEXR=OFF
+		-DGDAL_USE_OPENJPEG=$(usex jpeg2k)
+		-DGDAL_USE_OPENSSL=ON
+		-DGDAL_USE_ORACLE=$(usex oracle)
+		-DGDAL_USE_PARQUET=OFF
+		-DGDAL_USE_PCRE2=ON
+		-DGDAL_USE_PDFIUM=OFF
+		-DGDAL_USE_PNG=$(usex png)
+		-DGDAL_USE_POPPLER=$(usex pdf)
+		-DGDAL_USE_POSTGRESQL=$(usex postgres)
+		-DGDAL_USE_QHULL=OFF
+		-DGDAL_USE_RASTERLITE2=OFF
+		-DGDAL_USE_RDB=OFF
+		-DGDAL_USE_SPATIALITE=$(usex spatialite)
+		-DGDAL_USE_SQLITE3=$(usex sqlite)
+		-DGDAL_USE_SFCGAL=OFF
+		-DGDAL_USE_TEIGHA=OFF
+		-DGDAL_USE_TIFF=ON
+		-DGDAL_USE_TILEDB=OFF
+		-DGDAL_USE_WEBP=$(usex webp)
+		-DGDAL_USE_XERCESC=$(usex gml)
+		-DGDAL_USE_ZLIB=ON
+		-DGDAL_USE_ZSTD=$(usex zstd)
+
+		# Bindings
+		-DBUILD_PYTHON_BINDINGS=$(usex python)
+		-DBUILD_JAVA_BINDINGS=$(usex java)
+		# bug #845369
+		-DBUILD_CSHARP_BINDINGS=OFF
+
+		# Check work/gdal-3.5.0_build/CMakeCache.txt after configure
+		# and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
+		# Commented out: not (yet?) implemented upstream.
+		# Also, arm64 stuff is a TODO upstream, but not there (yet?)
+		-Dtest_avx=$(usex cpu_flags_x86_avx)
+		-Dtest_avx2=$(usex cpu_flags_x86_avx2)
+		-Dtest_sse=$(usex cpu_flags_x86_sse)
+		-Dtest_sse2=$(usex cpu_flags_x86_sse2)
+		#-Dtest_sse3=$(usex cpu_flags_x86_sse3)
+		-Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
+		#-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
+		#-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
+		-Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
+		#-Dtest_fma4=$(usex cpu_flags_x86_fma4)
+		#-Dtest_xop=$(usex cpu_flags_x86_xop)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_test() {
+	export GDAL_RUN_SLOW_TESTS=0
+	export GDAL_DOWNLOAD_TEST_DATA=0
+
+	# Two test suites:
+	# 1. autotests (much larger, uses pytest)
+	# 2. Small set of fuzzing tests (no download needed)
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# TODO: install docs?
+}
+
+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/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 72dc534a71e6..7903b980298f 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,6 +1,4 @@
-DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
 DIST nlopt-2.7.1.tar.gz 2044180 BLAKE2B 6d459f94a26ee6dd7f72c73c48992bd047150aa525bc4ad088c8516127afc5c7843f6fbb6726c2f845271b87934c13e0892a063362ab50df51f92e81979111fb SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2
-EBUILD nlopt-2.6.2-r1.ebuild 2307 BLAKE2B 9c57f104122725bb2660bde7259ff187256d26cffbb4f0bd399acd2b07dcbac522ea4c83ea2196c84a274fe3c188ee61830e0e09d93505a78df1d74618505364 SHA512 858cc72c427ec512c1ef07619fc44230b1b5fe9b1ca68899341a80c13db7a9a1ac82cc8a8dd3d419a832519739ec672361ee3acdb058f31140df9195101fefd9
 EBUILD nlopt-2.7.1-r1.ebuild 2135 BLAKE2B 3ec2db52921253d9b5b47447496e4c589ec2d75003193a0476e82c146fd51f5aa838c4c9958f992f15285e86eb8392e32181e7ba2c612a8ca9ce0c0ccba89965 SHA512 eecdc3bf5bc76269aa8c786c2c032b35447b52f17ac07c11f3824540b5f9309989090a0b993e6b0e9804823461671fc8c7878f918071da45bfebd52c4fff6aeb
-EBUILD nlopt-2.7.1.ebuild 1989 BLAKE2B 9250bcd302e71a9d261930c8ec91646d5b9981a9aaec70274bc1e2c006f15e40d787c6ba7c7f02fbd31cf9c47144fb7a97017954d9ffe0ca9845a7b6914a479e SHA512 d618cf5a1f7ee9d41e6cc7e9a5756b9fa59668bade2428bbcae8a4f4e782268e095f9dbdeb95eaee0c23aa1c5508f18cdde7b869328063f1becb8c13d278651b
+EBUILD nlopt-2.7.1-r2.ebuild 2139 BLAKE2B 540a0706ed5d84e034c87f96a9790e07c559e6e71961b16889975a731dd32cdcd4c194abe088560558d0993c599feb65da21ef737eabbe7137e88097fcff8029 SHA512 80f750456e97f7cf2a557f1de1863f87e2136a9ef2ead9a652a0615d0d5ffad5b9d119f4b4c535421d5293a4a7b8dcd19e1539533ab213dee8052b8abec65a0d
 MISC metadata.xml 1096 BLAKE2B 2b35b6f79c882fbae26b6bc68c75e30b0e2d48f540696cbbc48f06c2686e89a1a5f582d59d2c1ee3b47d5f813f4dbc20cd1d35228c7f968e327e41bb2f1f4da9 SHA512 5776b4b8faa1a6406f1d65bcd9de9ce4087580d98b5c3272804d442905c34d64c6e7d632022425e6e13b12161c94a99906a6196c3624b5b9b4aa1eac6fe9aa1e
diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
deleted file mode 100644
index 01368b67d508..000000000000
--- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit python-r1 cmake fortran-2
-
-DESCRIPTION="Non-linear optimization library"
-HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
-SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="cxx guile octave python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	guile? ( dev-scheme/guile:* )
-	octave? ( sci-mathematics/octave )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	"
-
-src_prepare() {
-	cmake_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNLOPT_CXX=$(usex cxx)
-		-DNLOPT_FORTRAN=$(usex test)
-		-DNLOPT_GUILE=$(usex guile)
-		-DNLOPT_OCTAVE=$(usex octave)
-		-DNLOPT_PYTHON=$(usex python)
-		-DNLOPT_SWIG=$(usex python)
-		-DNLOPT_TESTS=$(usex test)
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir cmake_src_configure
-	else
-		cmake_src_configure
-	fi
-	if use static-libs; then
-		mycmakeargs+=(
-			-DBUILD_SHARED_LIBS=OFF
-		)
-		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir cmake_src_compile
-	else
-		cmake_src_compile
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
-	fi
-}
-
-src_test() {
-	do_test() {
-		local a f
-		cd "${BUILD_DIR}"/test
-		for a in {1..$(usex cxx 9 7)}; do
-			for f in {5..9}; do
-				./testopt -a $a -o $f || die "algorithm $a function $f failed"
-			done
-		done
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_test
-	else
-		do_test
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
-	fi
-}
-
-nlopt_install() {
-	cmake_src_install
-	python_optimize
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl run_in_build_dir nlopt_install
-	else
-		cmake_src_install
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
-	fi
-	local r
-	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
-}
diff --git a/sci-libs/nlopt/nlopt-2.7.1.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 10e6b998d4e3..b49baaa4267f 100644
--- a/sci-libs/nlopt/nlopt-2.7.1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt"
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -20,19 +20,18 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	guile? ( dev-scheme/guile:* )
-	octave? ( >=sci-mathematics/octave-6 )
+	octave? ( >=sci-mathematics/octave-6:= )
 	python? (
 		${PYTHON_DEPS}
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)
 	"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	"
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( dev-lang/swig )"
 
 src_prepare() {
 	cmake_src_prepare
+
 	use python && python_copy_sources
 }
 
@@ -45,22 +44,33 @@ src_configure() {
 		-DNLOPT_GUILE=$(usex guile)
 		-DNLOPT_OCTAVE=$(usex octave)
 		-DNLOPT_MATLAB=OFF
-		-DNLOPT_PYTHON=$(usex python)
+		-DNLOPT_PYTHON=OFF
 		-DNLOPT_SWIG=$(usex python)
 		-DNLOPT_TESTS=$(usex test)
 	)
+
+	cmake_src_configure
+
 	if use python; then
-		python_foreach_impl run_in_build_dir cmake_src_configure
-	else
-		cmake_src_configure
+		python_configure() {
+			local mycmakeargs=(
+				${mycmakeargs[@]}
+				-DNLOPT_PYTHON=ON
+				-DINSTALL_PYTHON_DIR="$(python_get_sitedir)"
+			)
+
+			cmake_src_configure
+		}
+
+		python_foreach_impl run_in_build_dir python_configure
 	fi
 }
 
 src_compile() {
+	cmake_src_compile
+
 	if use python; then
 		python_foreach_impl run_in_build_dir cmake_src_compile
-	else
-		cmake_src_compile
 	fi
 }
 
@@ -74,10 +84,11 @@ src_test() {
 			done
 		done
 	}
+
+	do_test
+
 	if use python; then
 		python_foreach_impl run_in_build_dir do_test
-	else
-		do_test
 	fi
 }
 
@@ -87,11 +98,14 @@ nlopt_install() {
 }
 
 src_install() {
+	cmake_src_install
+
 	if use python; then
 		python_foreach_impl run_in_build_dir nlopt_install
-	else
-		cmake_src_install
 	fi
+
 	local r
-	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+	for r in */README; do
+		newdoc ${r} README.$(dirname ${r})
+	done
 }
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index 9666c8cc1d86..f1a755b45fd2 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,8 +1,6 @@
 AUX symengine-0.7.0-cmake-build-type.patch 1234 BLAKE2B b416e9b83db5eb6689bb9e18682d8f36f6ec13a4fe368004d2c3f961945cb0d1ec94081cb2c99bb16656439214cfd127a21cad2844a4752cd5c2fa6f40f3a3dc SHA512 d5e09a9603fab4caa9d9b091a0636be5ab8eddea6cb5b37b184ff7a65ac9707536f1a71e1893e0b5f795efb33396ae653d2745487aa863f7a239c63e42d22032
 AUX symengine-0.8.1-fix_llvm.patch 2674 BLAKE2B f7d493318389f63a8b61f47ee2ba6429d205e91fec3f94a5c45a062622fa7b6c29ab410fb04a260d98f983402e4e74103ca591ea3aa035c68bd4e431dfde371f SHA512 683e9acac3f6304e2ac1d2c67304d1e6a2fc6915115a201a870e29253c804e378b39d8d00298a70ac5a4e1456a153febe69d63cfbab821b31cda46fc94782131
 AUX symengine-0.9.0-pthread-cmake.patch 1973 BLAKE2B c66e3b3eb8895ac27e1a294632a1496a23271c1c315ea0781c50f48dc02ea35795759900ae152f942a2246bafd777398195d851ee9b8910f29216d92f4227a76 SHA512 7c76371c6892b6faf0848b0d25f895f37b56e318ade48eff27ac2fabe830a17dd317a48641d47cee0e4eaa689898d54c675dd5f6d01ba29d233255aaa0b9c86a
-DIST symengine-0.8.1.tar.gz 733007 BLAKE2B b218674bd4cc1eb5b5ebf7ec9d69093d3ab0d25c5fd302430457189ff56f44cb56640fab380a7415fdc241e9c7e3e1a4199ec8063a54b9358b35f0ab8076f05a SHA512 b83b354a722c589cf262fbfad902b277a7232ae2b949ff97f4ad8f654c44965f15eae7d78e87045a42dd6ee5f6f6f67af0a2c4def8899db430fc17e3360696a9
 DIST symengine-0.9.0.tar.gz 878574 BLAKE2B 32c37ca6575b3f7e37184c80c2df74ebf7bb7846537e951be6c888994b8dc049c1ed2a6f51da1c1cfb038e0a47393b18acff60cfef665c5a5e714beb9b0ecb12 SHA512 dceca49ddb6e2ac7c4f8ecb73ce19824cbaa3eff41ad0f50008e403498121184b4e9dc660628dbd8e4db979f8c16b83a709a40540f7834954ab01f9854e12caa
-EBUILD symengine-0.8.1-r2.ebuild 2386 BLAKE2B 6147d12c2fdabec0f92337d89da05ba8e09ae4d281e766b13617cb59f180167b887b3acb1577bdbc04d52bc4e75af30891f36d83c3bcbeff1cd569afbf44cdb9 SHA512 f0c45508d7ddf1e357d6764022132def42ab2e0d22eaaf82b00644fab25c3cc443664335f96c94221fa4616287fd32b85403284eea38371d2733a96ccce4ff6f
-EBUILD symengine-0.9.0-r2.ebuild 2619 BLAKE2B 53fa816f959d8382b9501e467f896e8576d3d27d9f26fe17fa56f1feac067c426fd9d34064298af713d969eba69ca349c3cb861c50722327a0a663f9a6a0e535 SHA512 846146c45383d9c81146030e1cbc5be835abc7955fe11a2cc16b2433ddaeb88ddb5298c99d97444b75f465587afdde697bf59248860167a36e187043765b9549
+EBUILD symengine-0.9.0-r3.ebuild 2619 BLAKE2B 19c34faf458b9561dc1c3d9c0b35220c678a2595b1806c16d2951b9f61435246f88a879aeb8b399362da70ad32e77e91a483869eea5c4c9870601cd7ed68e385 SHA512 1af7a096483cd0849fa00da285eb9df539819ac54b325da2c8cbc1114de16177c28fb845a3ac6708fe8b3ab379c20427901074ac74817703d053b083987ee983
 MISC metadata.xml 1270 BLAKE2B e52ff12980457252a05195ef47bd90e52816794948169473a597e263d744d163cbe42d35e995243daf6b8664f1ed7d41879b63927606187277cdf503fc7bf846 SHA512 4fd6f340d1d4952774eb0fcd47d9ed6e9f145bd83ba7bd04fe428faa96ec63b6cd62173b6ead116a649471fe9b6466be7bbb48c8e534b3203f232f9a7bae12b9
diff --git a/sci-libs/symengine/symengine-0.8.1-r2.ebuild b/sci-libs/symengine/symengine-0.8.1-r2.ebuild
deleted file mode 100644
index 93bc13fbc646..000000000000
--- a/sci-libs/symengine/symengine-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/sympy/symengine"
-SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:=
-	sys-libs/binutils-libs:=
-	arb? ( sci-mathematics/arb:= )
-	boost? ( dev-libs/boost:= )
-	ecm? ( sci-mathematics/gmp-ecm )
-	flint? ( sci-mathematics/flint:= )
-	mpc? ( dev-libs/mpc:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch
-	"${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|lib/|$(get_libdir)/|g" \
-		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
-		-i CMakeLists.txt symengine/CMakeLists.txt \
-		symengine/utilities/teuchos/CMakeLists.txt || die
-}
-
-src_configure() {
-	# not in portage yet: piranha
-	local int_class
-
-	if use arb || use flint; then
-		int_class=flint
-	elif use mpfr; then
-		int_class=gmpxx
-	elif use boost; then
-		int_class=boostmp
-	else
-		int_class=gmp
-	fi
-
-	local mycmakeargs=(
-		-DINTEGER_CLASS="${int_class}"
-		-DBUILD_BENCHMARKS="$(usex benchmarks)"
-		-DBUILD_DOXYGEN="$(usex doc)"
-		-DBUILD_TESTS="$(usex test)"
-		-DWITH_ARB="$(usex arb)"
-		-DWITH_BFD="$(usex debug)"
-		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
-		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
-		-DWITH_FLINT="$(usex flint)"
-		-DWITH_OPENMP="$(usex openmp)"
-		-DWITH_MPFR="$(usex mpfr)"
-		-DWITH_MPC="$(usex mpc)"
-		-DWITH_LLVM="$(usex llvm)"
-		-DWITH_PTHREAD="$(usex threads)"
-		-DWITH_TCMALLOC="$(usex tcmalloc)"
-		-DWITH_ECM="$(usex ecm)"
-	)
-	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
-
-	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
-	cmake_src_configure
-}
diff --git a/sci-libs/symengine/symengine-0.9.0-r2.ebuild b/sci-libs/symengine/symengine-0.9.0-r3.ebuild
index 52ecab72e67c..6853ffe83e82 100644
--- a/sci-libs/symengine/symengine-0.9.0-r2.ebuild
+++ b/sci-libs/symengine/symengine-0.9.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=15
 inherit cmake llvm toolchain-funcs
 
 DESCRIPTION="Fast symbolic manipulation library, written in C++"