gentoo auto-resync : 11:04:2024 - 12:32:48

8 files changed, 33 insertions, 1130 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 399cad9ff4dc..4b2e0bbad21a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,23 +1,12 @@
 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
+AUX gdal-3.8.0-java21.patch 911 BLAKE2B 69c2862b90b7c53d34200172fb17279608fbe2255550a27278bc4ad9012b15436fc950e41555fd79355400a1aa2856428ef9d3706eaf52dafd1280a180dc5916 SHA512 55cd5b466e45182699a8442461f95caa250521e21a77c9367ddfd6cdd04ed485a106b725144ef23e284f6505ce39ec4a266ded7932e41d6c535c5eb47a8724fa
 AUX gdal-3.8.0-libxml2-2.12-1.patch 923 BLAKE2B e75eb8edb5507450ded3bca618a03a283ba49791df416b0a7732f859d93124704e8508fcd11271bbbeef299d05d3ad2df9e03bd805580445407cb6b8c003a98e SHA512 cace97fb0a690b9ef40a2038a8a40070257682e87ff5f90ebf57d3bbb444257a5f06e58403c8607f3f5b0195a6c756146f7d84f4bf7d34a7a0ac94ad07aa08bb
 AUX gdal-3.8.0-libxml2-2.12-2.patch 1118 BLAKE2B 5c0abcfcfbb0ca2a96156abb4c7daaf4860fa30d553228172eb8def8b2f95e93bae9217974fba9621dcf9921e906a5ada9b710b1c0b29e7e580191a0a56a76e2 SHA512 acefa260368a85ab3d3c1436d3fdb60accf13424104c07f1100c9b84a45d99cde1b6baec09f01bd83316bce864e9347b89bfe0310ebe8e0f96c81858bed698ba
-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 gdal-3.7.1.tar.xz 8614512 BLAKE2B c137ca19809170948b5b7bf852193d922d167fed554eef0cf43f326098b7b7faa40427fddbe14b051af31bbc53a91555ce562f88d04f37f81e0753265383c42a SHA512 c72483a28af8f5512757a9f319c70a12e5d5cd5e30cb2ace160e7cbad6099544526a7136875582b6e76ce10968ef1bd67a78e4df65d64bc4e8feeb7684146ca6
-DIST gdal-3.7.2.tar.xz 8619608 BLAKE2B 29a96e34f4ffe661fc2af786b9a229be779ed5e91e4c580834f6624f4173ede8adf22c27b2830c446736c0ff37501441ab2afea9f780dad4588636b03deb1f71 SHA512 6f2bd93520bd45e64b7613c8bcb0e0848d7ce10bcf716ff6ba5ef9ec9cad5798d65c79461fe0b83e99103ac12893893fea44b9b4c23f1e2f05b914f3e7f982f1
-DIST gdal-3.7.3.tar.xz 8625812 BLAKE2B 743ce2d8027fb228630a2951af2de8ac7fb5fa0b32124d58fb545ac61fdf5240f17ae85cfdcab51ea5e1b4e2311b55af4c7bbdfe82c6ed5ea180a5c8b254ccfd SHA512 84b2cb2cb7b9b78dbdd151a9029102e224db4a0901069f41c1672cb02ca049efb4cc84ef7f65acb8e53dcfe1e02f52822efdaff2875654408fc133c68ec01238
 DIST gdal-3.8.0.tar.xz 8853728 BLAKE2B 646aa91283e7228a054221d120bddb456c8b898f9155edd289f2b2e0bf8706fa3045a98d26e4cf5ba5dba6d8c1c7f0a7f4aaaded9457481a65910c2d313c8f9d SHA512 42b3a381190922e546ae83355f56532b92d519b1eac357a9c116ee19b67b67362f282e248e2d82c14ae04cae04dce175bb652f481879442ffa5b58f764a088dd
-DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
-DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B cac18436ad2acb558e27e8ba3f1f2c22aa6c7ba258abe25118acf65fb2cb8a3d5f132ccb8315912a54d07f035b5ff331cf6a66bdf51a54c8275c5203e844eb82 SHA512 81e80c799a8a910a861182480e8306c8583cdffe7cb62f47fbaddf031e1c4d1d3fb341edf0daddbb8c934e5f2d547b380feb2f5a9f22cd50db14e43c2b02737b
-DIST gdalautotest-3.7.1.tar.gz 13830135 BLAKE2B 277574c603fe92758246577df3717363a45c7321378ea15766f4198100f3277e12028ee3b480bc1a7d803519664974c6a745f2968de50278c6e8e6d389a95b46 SHA512 d69de5daa9e1f49089b5465f93b09a2717065d119127150e65dbbfb23dc664c34b7e21e59edb17ce827b62d43d72f1d672ac70dca592ade90fe07359644e2c66
-DIST gdalautotest-3.7.2.tar.gz 13835621 BLAKE2B 38cf190bf5f81836da0b56c89cf3a4fa5461215d82df48a598420bc1bdde81cdcb2e56f9b987ec60c35646470297ade41b6ca5fd3dc7df131cdfeb3de33a7b87 SHA512 9c3ace4811805b6393fe4f06d95e155427da8bb18aa8ceec0f28966c92bdf6edd57c565889c4d8deb58f46a3cb88e39fc31aa33fe27804f228e91781bd9e91b3
-DIST gdalautotest-3.7.3.tar.gz 13833069 BLAKE2B a4d7784b39480816ce530abf9f726312fa4553d6afefabb014a1deb8cba9367fc0aede03d181991e155ab3dee52ba17b9d92c8d04fb312b994a99044dda7fb89 SHA512 e19d5afa9e7280a6ac837b01c23cddc7ff3ca6578ab347b915ec84bdde091f1b54095a2eed0042538eb4eae38613816d79531aa541f6cc6f1cbeee41b2fa11fd
+DIST gdal-3.8.5.tar.xz 8871404 BLAKE2B 2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a259443a8ad68ff8f471f4efa8d2fd7935c57317ee5e94789244067706967f9c5df413bccd2556b5790d51d349 SHA512 4cdf1c45ea110cf6ba6ffe5b890ebd8f82654899ed6224ede6c59864f28626c758b5ea15f26c1840a4d3f70abaf9c1255754c565ef2fe5e5b39e0499ace63521
 DIST gdalautotest-3.8.0.tar.gz 15615239 BLAKE2B fa524bb796a6f5b28bea79b51c4ce34e231b1d10a108a4590e30a48dc946df45880828a5a1ee0db07ed191e0f7dd5631fb294f3a73d1ce24244b6132f5cc3de1 SHA512 e72705571a337412d379cdf36debbe01aca61e789527c5e1f1c47904ba817c390a04032913fde75f899b96ec4f0b3a849ec3ead2539c31b59ca5006cd5e4e431
-EBUILD gdal-3.6.4.ebuild 6773 BLAKE2B 0026aafbfe6c57167c17757b99079c5dfd5e1169234ee03cf3f76c64f140f3432efadb3f3bc2e7ba9c619612aff88b3a6652ed9976db1959e89037642b66c71e SHA512 5a87b1246e481e414311e18282218ed5ea9a74ea26a6739c982e0d8473d7b77cdc8f7fb92af9d87a37b488734b80493099fabafafcb954880bbdcabb00a07bfb
-EBUILD gdal-3.7.0.ebuild 7534 BLAKE2B 03e01ea5a593aeb8d2e0d0f46b1e7ebf9c74eaeefdc607d98439d8844ad4fba651f06ad2d88d61e66e13694e812e322c41aa8e25769c97bb99e07efab5911e84 SHA512 84dc8ca6c0a379a7b8e085a79c3a2df9f2427793b58f630001a2d7bd2cb0019e24b2b11543a857ea1e0399cd1e1333caad943de178fad2d2f14cdcb8edf4e6b8
-EBUILD gdal-3.7.1.ebuild 7538 BLAKE2B 1cb6475c1ee6f56ebcb6f6502092554e0681d27838164937ac2c85a5f4bb8841be24c8444cb40465ca9ce6c897b13856562100616f7ba6f422fd268972dd386d SHA512 e4041dcb67eff0e4db3d1e4168c68e65b704fc223242282640c4f3459fb86b6d7a9b25d63381715a829e1ee7130512686f73d92f1a4b562b98e0e5d524033b50
-EBUILD gdal-3.7.2.ebuild 7538 BLAKE2B 1cb6475c1ee6f56ebcb6f6502092554e0681d27838164937ac2c85a5f4bb8841be24c8444cb40465ca9ce6c897b13856562100616f7ba6f422fd268972dd386d SHA512 e4041dcb67eff0e4db3d1e4168c68e65b704fc223242282640c4f3459fb86b6d7a9b25d63381715a829e1ee7130512686f73d92f1a4b562b98e0e5d524033b50
-EBUILD gdal-3.7.3.ebuild 7534 BLAKE2B 03e01ea5a593aeb8d2e0d0f46b1e7ebf9c74eaeefdc607d98439d8844ad4fba651f06ad2d88d61e66e13694e812e322c41aa8e25769c97bb99e07efab5911e84 SHA512 84dc8ca6c0a379a7b8e085a79c3a2df9f2427793b58f630001a2d7bd2cb0019e24b2b11543a857ea1e0399cd1e1333caad943de178fad2d2f14cdcb8edf4e6b8
-EBUILD gdal-3.8.0.ebuild 7594 BLAKE2B 075edbd5b7ad0e6848f52574ca16e3d10887fbff45f26dc0ad732cf934e976e33e493355e276d64d0ae67d3a069ebd6dce0236c82dbdabda552fda6064dfb0fe SHA512 fb30cfdff2c395c932d8d3bb11b6f99c3ee94187100de841b3f54ead8dd4ab9c62df87e287e8facda66d24f7a61990efbf125d8ede5886e5ed2e706c5b511a21
+DIST gdalautotest-3.8.5.tar.gz 15711701 BLAKE2B 3f0a5ba7f6a2072aaf46e2867739faaba9fae89f2679ad5cb4cb356112b197141e996fc10365bb6a95c3fce648a440bd746aa68f5c52a8743995cf696d230ef0 SHA512 18251e2fe5870bcbbde9c4278d7ce969feb6397a727679f56e6cf051cf5a3ded29217c034566cb9c5ebb02d51ad4d12933ab918eeadb0017c78859892bbf4f19
+EBUILD gdal-3.8.0-r1.ebuild 7643 BLAKE2B 38adb7951372403eff4aa19e013e8982ca3a06f3891572e4ec1316667a96bb1e864fb5be5c026dbafefeb42b6b72b7c320556a0a078fcb003fa8382cb2e3ebb8 SHA512 695c5ea85a7fc45cd2d7516ea430721a5c423b2b907d454f364d0a197a36b0120df7028c19d6b885d3bb19c64e0cd237af72a48a78d456a418fce27dee6e14d8
+EBUILD gdal-3.8.5.ebuild 7549 BLAKE2B 135737bdb891977500a0ec109c7ef12ba224e40beb635da76af17542f92c9561848183c65f59dbd0e3a8bd28bc0e87cc486b420c0bfdb0609369033dd1cd586f SHA512 4a99239c87ffe5445cd7a89a8477030a43d8ddfcbf98c4d7a85055e5b64676dcc0de54ad06bf440fa2317003c5484873bf8732a314805a08711f020e274fcde5
 MISC metadata.xml 1297 BLAKE2B 03cb6c5ccc7d2e6ceeaedf24779e9cb4b0dd8ba7c6609604a7d74a05844079d5b102b5413e6d622b79d464784d106665496dce6c0dc902e121382b84596061bc SHA512 df991d15bd43d009c50de6a76af9939b5c6c83b64c4043b52065a77858b8ae77c8287510505b1b80e25c45eb01ccaf276de12db47a8c2b6b22f908a7cb48fae7
diff --git a/sci-libs/gdal/files/gdal-3.8.0-java21.patch b/sci-libs/gdal/files/gdal-3.8.0-java21.patch
new file mode 100644
index 000000000000..3e924c5206c1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.0-java21.patch
@@ -0,0 +1,20 @@
+--- a/swig/java/build.xml
++++ b/swig/java/build.xml
+@@ -21,7 +21,7 @@
+ 	<target name="compile" depends="init" description="Compile the source files.">
+ 		<mkdir dir="${build_dir}/build/classes"/>
+ 		<javac srcdir="${build_dir}/org" destdir="${build_dir}/build/classes"
+-		       debug="on" source="7" target="7"
++		       debug="on" source="8" target="8"
+ 		       includeantruntime="false" deprecation="true">
+ 		</javac>
+ 		<echo>compilation complete</echo>
+@@ -38,7 +38,7 @@
+ 	<target name="compile_tests" depends="archive" description="Compile the tests files.">
+ 		<mkdir dir="${build_dir}/build/apps"/>
+ 		<javac srcdir="${source_apps}" destdir="${build_dir}/build/apps"
+-		       debug="on" source="7" target="7"
++		       debug="on" source="8" target="8"
+ 		       includeantruntime="false" deprecation="true" classpath="${build_dir}/gdal.jar">
+ 		</javac>
+ 		<echo>compilation of tests complete</echo>
diff --git a/sci-libs/gdal/gdal-3.6.4.ebuild b/sci-libs/gdal/gdal-3.6.4.ebuild
deleted file mode 100644
index a81044fc6486..000000000000
--- a/sci-libs/gdal/gdal-3.6.4.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2024 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-text/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:* )"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	_wstat64 # Windows LFS
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
-)
-
-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.7.0.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild
deleted file mode 100644
index 3b29b3152310..000000000000
--- a/sci-libs/gdal/gdal-3.7.0.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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)"
-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/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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig
-	)
-	python? (
-		dev-lang/swig
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		${PYTHON_DEPS}
-		dev-cpp/gtest
-	)
-"
-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] )
-	java? (
-		>=virtual/jdk-1.8:*[-headless-awt]
-	)
-	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:* )
-"
-
-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() {
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-
-	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
-		-DBUILD_TESTING=$(usex test)
-
-		# 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)
-	)
-
-	if use test ; then
-		mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
-	fi
-
-	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
-
-	if use java; then
-		# Move the native library into the proper place for Gentoo.  The
-		# library in ${D} has already had its RPATH fixed, so we use it
-		# rather than ${BUILD_DIR}/swig/java/libgdalalljni.so.
-		java-pkg_doso "${D}/usr/share/java/libgdalalljni.so"
-		rm "${D}/usr/share/java/libgdalalljni.so" || die
-	fi
-
-	# TODO: install docs?
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-
-	if use java; then
-		elog
-		elog "To use the Java bindings, you need to pass the following to java:"
-		elog "    -Djava.library.path=$(java-config -i gdal)"
-	fi
-}
diff --git a/sci-libs/gdal/gdal-3.7.2.ebuild b/sci-libs/gdal/gdal-3.7.2.ebuild
deleted file mode 100644
index dce209e159b7..000000000000
--- a/sci-libs/gdal/gdal-3.7.2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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)"
-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/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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig
-	)
-	python? (
-		dev-lang/swig
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		${PYTHON_DEPS}
-		dev-cpp/gtest
-	)
-"
-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] )
-	java? (
-		>=virtual/jdk-1.8:*[-headless-awt]
-	)
-	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:* )
-"
-
-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() {
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-
-	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
-		-DBUILD_TESTING=$(usex test)
-
-		# 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)
-	)
-
-	if use test ; then
-		mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
-	fi
-
-	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
-
-	if use java; then
-		# Move the native library into the proper place for Gentoo.  The
-		# library in ${D} has already had its RPATH fixed, so we use it
-		# rather than ${BUILD_DIR}/swig/java/libgdalalljni.so.
-		java-pkg_doso "${D}/usr/share/java/libgdalalljni.so"
-		rm "${D}/usr/share/java/libgdalalljni.so" || die
-	fi
-
-	# TODO: install docs?
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-
-	if use java; then
-		elog
-		elog "To use the Java bindings, you need to pass the following to java:"
-		elog "    -Djava.library.path=$(java-config -i gdal)"
-	fi
-}
diff --git a/sci-libs/gdal/gdal-3.7.3.ebuild b/sci-libs/gdal/gdal-3.7.3.ebuild
deleted file mode 100644
index 3b29b3152310..000000000000
--- a/sci-libs/gdal/gdal-3.7.3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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)"
-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/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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig
-	)
-	python? (
-		dev-lang/swig
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		${PYTHON_DEPS}
-		dev-cpp/gtest
-	)
-"
-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] )
-	java? (
-		>=virtual/jdk-1.8:*[-headless-awt]
-	)
-	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:* )
-"
-
-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() {
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-
-	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
-		-DBUILD_TESTING=$(usex test)
-
-		# 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)
-	)
-
-	if use test ; then
-		mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
-	fi
-
-	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
-
-	if use java; then
-		# Move the native library into the proper place for Gentoo.  The
-		# library in ${D} has already had its RPATH fixed, so we use it
-		# rather than ${BUILD_DIR}/swig/java/libgdalalljni.so.
-		java-pkg_doso "${D}/usr/share/java/libgdalalljni.so"
-		rm "${D}/usr/share/java/libgdalalljni.so" || die
-	fi
-
-	# TODO: install docs?
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-
-	if use java; then
-		elog
-		elog "To use the Java bindings, you need to pass the following to java:"
-		elog "    -Djava.library.path=$(java-config -i gdal)"
-	fi
-}
diff --git a/sci-libs/gdal/gdal-3.8.0.ebuild b/sci-libs/gdal/gdal-3.8.0-r1.ebuild
index 5a47aad92bfa..1a8dd8a1059a 100644
--- a/sci-libs/gdal/gdal-3.8.0.ebuild
+++ b/sci-libs/gdal/gdal-3.8.0-r1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-text/doxygen )
 	java? (
-		dev-java/ant-core
+		>=dev-java/ant-1.10.14-r3:0
 		dev-lang/swig
 	)
 	python? (
@@ -99,6 +99,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
+	"${FILESDIR}/gdal-3.8.0-java21.patch"
 	"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
 	"${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch
 	"${FILESDIR}"/${P}-libxml2-2.12-{1,2}.patch # bug 917564
diff --git a/sci-libs/gdal/gdal-3.7.1.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild
index dce209e159b7..bb1c2e0bde5e 100644
--- a/sci-libs/gdal/gdal-3.7.1.ebuild
+++ b/sci-libs/gdal/gdal-3.8.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake java-pkg-opt-2 python-single-r1
 
 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
@@ -12,7 +12,7 @@ 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/33" # subslot is libgdal.so.<SONAME>
+SLOT="0/34" # 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 )"
@@ -27,7 +27,7 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-text/doxygen )
 	java? (
-		dev-java/ant-core
+		>=dev-java/ant-1.10.14-r3:0
 		dev-lang/swig
 	)
 	python? (
@@ -99,8 +99,8 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-java21.patch
 	"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
-	"${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch
 )
 
 pkg_setup() {
@@ -267,8 +267,8 @@ src_install() {
 		# Move the native library into the proper place for Gentoo.  The
 		# library in ${D} has already had its RPATH fixed, so we use it
 		# rather than ${BUILD_DIR}/swig/java/libgdalalljni.so.
-		java-pkg_doso "${D}/usr/share/java/libgdalalljni.so"
-		rm "${D}/usr/share/java/libgdalalljni.so" || die
+		java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so"
+		rm -rf "${ED}/usr/$(get_libdir)/jni" || die
 	fi
 
 	# TODO: install docs?