gentoo auto-resync : 10:05:2023 - 23:44:41

4 files changed, 94 insertions, 260 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 88a90c197d8c..730f3275fd8a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,17 +1,15 @@
 AUX gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch 528 BLAKE2B c393c21cb29687a52fbbc2283021c60ee5d2accba1c558763a6f8ed6e102aef813f0e75650adb37bc1492d9f65d9125f8d0cb361666379dba9c5adf748413770 SHA512 3849e73d5871eb62a6cec2a14f1ad480a6fb1e75f8fbfe2b9574944c2f00c43eb3429e9183db4aa4ddd5388b18488a0e5381fd5142e9983e68c3e71e70c87d27
+AUX gdal-3.7.0-zlib-OF.patch 2272 BLAKE2B 81364de12d222689f7c681cf131cc2483b536043bf7907db70ce07c50871c9594a9a17853e28749484ab7c78f4d8168962c1024a7eefb3ce1ca783cb5501a655 SHA512 e46f2fd83ac6a56206567f5668ca4d644827440aa32938b87dc0b3beacc107fb5573fc228949e02d88a06f29d651699d6f0481ecba6666b0888dca76e196d547
 DIST gdal-3.5.3.tar.xz 9504740 BLAKE2B 7054df4c7ea6d8d3e6e9cf2544fc5c7a9149dea94ed882723ec82c61268100c2f5330f28a8d9d44e1296511eb2a204c64dfe41f135fadb44db380aa331d9c731 SHA512 b7bac9dd568e9db49d1fa5be8cd48df37f37196b0cacce44f738a981f0c43a77b5750312cd0c3385fdd881a6b525a5ceac56bcd08284d76071bd508d01781f49
-DIST gdal-3.6.1.tar.xz 8685072 BLAKE2B 84f707085e77317f2e6577afe594eb01aae777d2863454bfc873ba170f1254094946f02301079d9cce66f8e64848b2b97f03651b114b283c7910d46da1507430 SHA512 07138bdd66a0259cffed3a1587904760b734fffa546f5cdf7ca9ee472c77676e5694f6c92d57f03f9cdb94cc3992a0404688f248b79e263eb0c1e3ab6025f6bb
 DIST gdal-3.6.2.tar.xz 8635724 BLAKE2B c90606b642c632dd5ec224d63aa80c158c9ee04c6ca0341815f7449b319bf9442d65c2f9b981aedd242713ef6909a30f620b448ba26baf6cd8a31e2a9ae0dd8a SHA512 d404335d37ef4916b6098fa8dc7a5e1579ecdd958b37ce73bb08855fa226d3a7b488eee52db17364ef1c0697d59805d495a734f21dad2ad2f0b27e7b1f253e50
-DIST gdal-3.6.3.tar.xz 8645148 BLAKE2B c9d6817e74d0ec377979a060db231ec989e676f9aa0c1c04a8bcd6913c271eaccbb43a59b8bd52f0e297844759a3925039b83c73c4e0773943eeec8af656bb8a SHA512 296901ea667b7d419638fafd9a3ef3cb8bfb1753223048660c463b18e510cb840ae99fdcdb860495782003376c9fb8c24ca3be3699dc31497bd324a09e2abec9
 DIST gdal-3.6.4.tar.xz 8648032 BLAKE2B d6abdbcc87029bf230dae5586f06cbd329e5e43be37d8f5e9a72c67c93a6769458cc9c693b498e3f697b1ee1b68c9f9dbf7545ff9819fceb8fdde81b8d4ac882 SHA512 a8f69158d44ea456c44cfcb8937892697a28d2e4a43333c28db8fb9e81c51436a6edcb7a392b8c7ef63cd7453be6350a938bc4ba910720d9d5d9a1f32c57c558
+DIST gdal-3.7.0.tar.xz 8604724 BLAKE2B 400cc17fc636c637f7c40e93aed8e2db7bfbbe73741da4135cfeec8dbcda24ce0c8035214edf038afc29a916012da86a78d789729540f870231dfa6aa27e424a SHA512 4a3262d75ffbb58ec0821cd266843e28ca64c34383fb2bfaf30c984bf01c6d012381892a31a2ebc7c27a58b058fb44389cd45b05b619579b6178feb192f37bc6
 DIST gdalautotest-3.5.3.tar.gz 12374523 BLAKE2B 3f8e2ba8b49d7bb870a49bde4ec95f807ff79cf23d36504cf7beeccff104364d8fc8e287184a0239cd2c4bf5e26c900cfb29bda3beb615504e588519385a322c SHA512 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e
-DIST gdalautotest-3.6.1.tar.gz 12577286 BLAKE2B 5215db1c39ee1b6d923da9503a2220d8862cf262d3f92605902e6a8e7272fbae156c306a8172f7ef75ad110fc6a82a06873c8420d5d1f2a3a8d4600430932a79 SHA512 a91ba311840b98d16df1918752bb5a629bdbe68b98e3ca9f00e2a8ee49f9f68021081700eb39cce7cf5b09fc3fafed987ea067c8135ab2469b91c34338ba7ef2
 DIST gdalautotest-3.6.2.tar.gz 12586870 BLAKE2B 28b6ae04d68964705dfe370bf189343c76fa63e358ce1c7362604743c92130c8e93ec826170a7adfd95aad8a05a5ae7a006b35cf487a81eb0c6695353ab7ef20 SHA512 63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859
-DIST gdalautotest-3.6.3.tar.gz 12613287 BLAKE2B a4548ccf7bd4a8de9fd093514afbd3d6de453ca6a1bb0c4b6e50f6f37ac5ec321f7b80943f32fcf4164442d2d63b09458c1d0ebad76ee76a53b681e2b07ee388 SHA512 2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4
 DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
+DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B cac18436ad2acb558e27e8ba3f1f2c22aa6c7ba258abe25118acf65fb2cb8a3d5f132ccb8315912a54d07f035b5ff331cf6a66bdf51a54c8275c5203e844eb82 SHA512 81e80c799a8a910a861182480e8306c8583cdffe7cb62f47fbaddf031e1c4d1d3fb341edf0daddbb8c934e5f2d547b380feb2f5a9f22cd50db14e43c2b02737b
 EBUILD gdal-3.5.3-r1.ebuild 6692 BLAKE2B 2648c9ba25041e36dbb482964b2b5cdabddee82170232f1372b1f3436c16041e6675234407d5fb38d85a17753216fb29e6f41bdee417312ba78d0ef7b3173cae SHA512 9af7d1da2dbbb461e400ffad40e94546e08e40aeb2ef89db367e6b4981798ec0321e9a17e655c2fa46aedc89ae0739f1ee04c15a77d382fec4b30802156d2491
-EBUILD gdal-3.6.1-r1.ebuild 6766 BLAKE2B 9dc9bdebdf831012495ade7983b5df18f7aae1c036bb4dec925d22bce39f4a218ccd2cdd6aaa32f8aa78652858a031c2ab98127ea8e05338844b57c546b7751d SHA512 5d9273750e6ab779bfd006650790c8741d3a5778440c9dd17761eda906fd36994d7ada2c8261d4e0ac13b6b7434446a363164952b4daabc8a97d0131fe4bb2e9
 EBUILD gdal-3.6.2.ebuild 6762 BLAKE2B 1adf8ab59134602a90e3797021a01bbb92e62496b1cbe1ba5b9da0fad4977e90c718f855eaf5981ae8d1a1ec81bc2b98c8f4f5825df77547b279eb76fce4ea54 SHA512 1ad6c2c44f02e69d8355494f0da37ad44a24cc70209858252cfbff91d5e6cb5d89a414edba6632a63d139769f1c9db64dc4fddc4755f3a8db4f2a3062e36696e
-EBUILD gdal-3.6.3.ebuild 6648 BLAKE2B ecc59e3aaebcaeb5ba0332f11e1e331be9e83153fe710da6c8c33a16459bf41080d5201249337cab917b8c52742fcdf6fc8a80c64f6f5e46a145fa6f38c371fd SHA512 c4ef0a2d7949c273c2563294e0a9dafdba2198ac9002f0cfee47f172c41419b6fafcc380965e382b4ecb0e55074019d3018ee6d6c0f6f030fac7d9d252d9a8ab
 EBUILD gdal-3.6.4.ebuild 6776 BLAKE2B 8856545ec242dba14c48acf40bd6e254b85701c4ba78a3d93925597cd20cbf8ea976f732e7a7c1c622fa765a453a46f6ac93a5dfe02eccd368935e69f4e25a4c SHA512 b34cbf95712bd9fb570fb142836c67f6067abd57c6724528ae035e8062dfed039b24f1c29af6de697e72d105640b6935ad61f39780214a24aa2d8e5893a1a900
+EBUILD gdal-3.7.0.ebuild 7027 BLAKE2B 8995c2630f2d2d9749559ce2d13eb0ba2935c02e24cb707044ddfc775279ebe682e51c1a54ab49e9cc94d67720f495529b9b5679a8ba88298369dd93c5718aab SHA512 963575b670488d625e7701793d8e2e914a48bb9058a62c52501a51c4c06b4d8aae8cb809c8494edeefa2ca63b3ded3dcbc6ee94ac0564fff85bf8fc40f6255d2
 MISC metadata.xml 1348 BLAKE2B 6666f26bc5f48bbfe1971736c6737420fefa7949cd6e1b74c649ae53cb51b756ebba42bb934930af83de254bebc4e4268f60a04ed2fb1aa8835b9abbdb3968b2 SHA512 b5b90368a48679c780dbe89b73ddee9e2c74639bf1a2c9f39dd4a3cdbb005878cd2197271f2ddc23d9611feaf79c0239b32d655d8a29592ad6d87a402970b726
diff --git a/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch
new file mode 100644
index 000000000000..5f6dafeab525
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch
@@ -0,0 +1,51 @@
+--- a/frmts/zlib/contrib/infback9/minified_zutil.c
++++ b/frmts/zlib/contrib/infback9/minified_zutil.c
+@@ -8,9 +8,9 @@
+ #include "minified_zutil.h"
+ 
+ #ifndef STDC
+-extern voidp  malloc OF((uInt size));
+-extern voidp  calloc OF((uInt items, uInt size));
+-extern void   free   OF((voidpf ptr));
++extern voidp  malloc (uInt size);
++extern voidp  calloc (uInt items, uInt size);
++extern void   free   (voidpf ptr);
+ #endif
+ 
+ voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
+--- a/frmts/zlib/contrib/infback9/minified_zutil.h
++++ b/frmts/zlib/contrib/infback9/minified_zutil.h
+@@ -191,9 +191,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ /* provide prototypes for these when building zlib without LFS */
+ #if !defined(_WIN32) && \
+     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+-    ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
++    ZEXTERN uLong ZEXPORT adler32_combine64 (uLong, uLong, z_off_t);
++    ZEXTERN uLong ZEXPORT crc32_combine64 (uLong, uLong, z_off_t);
++    ZEXTERN uLong ZEXPORT crc32_combine_gen64 (z_off_t);
+ #endif
+ 
+         /* common defaults */
+@@ -232,16 +232,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ #    define zmemzero(dest, len) memset(dest, 0, len)
+ #  endif
+ #else
+-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
++   void ZLIB_INTERNAL zmemcpy (Bytef* dest, const Bytef* source, uInt len);
++   int ZLIB_INTERNAL zmemcmp (const Bytef* s1, const Bytef* s2, uInt len);
++   void ZLIB_INTERNAL zmemzero (Bytef* dest, uInt len);
+ #endif
+ 
+ /* Diagnostic functions */
+ #ifdef ZLIB_DEBUG
+ #  include <stdio.h>
+    extern int ZLIB_INTERNAL z_verbose;
+-   extern void ZLIB_INTERNAL z_error OF((char *m));
++   extern void ZLIB_INTERNAL z_error (char *m);
+ #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+ #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+ #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
diff --git a/sci-libs/gdal/gdal-3.6.3.ebuild b/sci-libs/gdal/gdal-3.6.3.ebuild
deleted file mode 100644
index 3d1a8d72c769..000000000000
--- a/sci-libs/gdal/gdal-3.6.3.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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 )"
-
-LICENSE="BSD Info-ZIP MIT"
-SLOT="0/32" # 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"
-RESTRICT="!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_PODOFO=OFF
-		-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)
-
-	# Missing file for test-unit?
-	cmake_src_test -E "(test-unit)"
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	# 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/gdal/gdal-3.6.1-r1.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild
index 9d53fd3a7beb..7015e10d415d 100644
--- a/sci-libs/gdal/gdal-3.6.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit cmake java-pkg-opt-2 python-single-r1
 
 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
@@ -12,32 +12,38 @@ 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 )"
 
 LICENSE="BSD Info-ZIP MIT"
-SLOT="0/32" # subslot is libgdal.so.<SONAME>
+SLOT="0/33" # 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 )"
 
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	spatialite? ( sqlite )
+	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	java? (
 		dev-java/ant-core
-		dev-lang/swig:0
+		dev-lang/swig
 		>=virtual/jdk-1.8:*
 	)
 	python? (
-		dev-lang/swig:0
+		dev-lang/swig
 		$(python_gen_cond_dep '
 			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
-	)"
-DEPEND="dev-libs/expat
+	)
+	test? (
+		${PYTHON_DEPS}
+		dev-cpp/gtest
+	)
+"
+DEPEND="
+	dev-libs/expat
 	dev-libs/json-c:=
 	dev-libs/libpcre2
 	dev-libs/libxml2:2
@@ -79,12 +85,27 @@ DEPEND="dev-libs/expat
 	sqlite? ( dev-db/sqlite:3 )
 	webp? ( media-libs/libwebp:= )
 	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	_wstat64 # Windows LFS
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
+	"${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch
+)
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+
 	use java && java-pkg-opt-2_pkg_setup
 }
 
@@ -101,6 +122,7 @@ src_configure() {
 		-DENABLE_IPO=OFF
 		-DGDAL_USE_EXTERNAL_LIBS=ON
 		-DGDAL_USE_INTERNAL_LIBS=OFF
+		-DBUILD_TESTING=$(usex test)
 
 		# bug #844874 and bug #845150
 		-DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
@@ -210,6 +232,10 @@ src_configure() {
 		#-Dtest_xop=$(usex cpu_flags_x86_xop)
 	)
 
+	if use test ; then
+		mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+	fi
+
 	cmake_src_configure
 }