gentoo auto-resync : 15:05:2024 - 00:01:27

3 files changed, 26 insertions, 1 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 4b2e0bbad21a..ea6a0ae08400 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -3,10 +3,11 @@ AUX gdal-3.7.0-zlib-OF.patch 2272 BLAKE2B 81364de12d222689f7c681cf131cc2483b5360
 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
+AUX gdal-3.8.5-poppler-24.05.0.patch 1007 BLAKE2B b0bed1a9b145226581e9047c0d810ea1101e6f83c9ee2c533dfff771d3ad57599738492994652bb39e6d0d79158efe953b530799f6861b45385a1e14c54badca SHA512 2fcb7ea4f09978b6c3542eef3ed1cf34eb86c4412bef129c3822e6b03d8ae240fedcdf90c6f490f5eb4bc173cb06af36cdba253a63924e63736aeef22071a4ab
 DIST gdal-3.8.0.tar.xz 8853728 BLAKE2B 646aa91283e7228a054221d120bddb456c8b898f9155edd289f2b2e0bf8706fa3045a98d26e4cf5ba5dba6d8c1c7f0a7f4aaaded9457481a65910c2d313c8f9d SHA512 42b3a381190922e546ae83355f56532b92d519b1eac357a9c116ee19b67b67362f282e248e2d82c14ae04cae04dce175bb652f481879442ffa5b58f764a088dd
 DIST gdal-3.8.5.tar.xz 8871404 BLAKE2B 2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a259443a8ad68ff8f471f4efa8d2fd7935c57317ee5e94789244067706967f9c5df413bccd2556b5790d51d349 SHA512 4cdf1c45ea110cf6ba6ffe5b890ebd8f82654899ed6224ede6c59864f28626c758b5ea15f26c1840a4d3f70abaf9c1255754c565ef2fe5e5b39e0499ace63521
 DIST gdalautotest-3.8.0.tar.gz 15615239 BLAKE2B fa524bb796a6f5b28bea79b51c4ce34e231b1d10a108a4590e30a48dc946df45880828a5a1ee0db07ed191e0f7dd5631fb294f3a73d1ce24244b6132f5cc3de1 SHA512 e72705571a337412d379cdf36debbe01aca61e789527c5e1f1c47904ba817c390a04032913fde75f899b96ec4f0b3a849ec3ead2539c31b59ca5006cd5e4e431
 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
+EBUILD gdal-3.8.5.ebuild 7602 BLAKE2B dd02614db1b93710c7b66ea0d2462a60ecce40173b2568411dedf023bd1a851a522b0acaf3bfe6896c1f0ee9ee06ecda737259b2a39c4bc22bc7785c8febb55b SHA512 a926bdd7349db286dc77d5b73706f1178afe254510dd985641145522aae51e87f2ee09c4e4716101c8eabca1877fa2b5e7eedd0703d798c8ae06b0eab59ff062
 MISC metadata.xml 1297 BLAKE2B 03cb6c5ccc7d2e6ceeaedf24779e9cb4b0dd8ba7c6609604a7d74a05844079d5b102b5413e6d622b79d464784d106665496dce6c0dc902e121382b84596061bc SHA512 df991d15bd43d009c50de6a76af9939b5c6c83b64c4043b52065a77858b8ae77c8287510505b1b80e25c45eb01ccaf276de12db47a8c2b6b22f908a7cb48fae7
diff --git a/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch
new file mode 100644
index 000000000000..837a50f6b825
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch
@@ -0,0 +1,23 @@
+From 60dcddbf5fab917338caf433b3e7dca283cf9720 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Thu, 4 Apr 2024 17:48:33 +0200
+Subject: [PATCH] Fix build with Poppler 24.05 (unreleased yet)
+
+---
+ frmts/pdf/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt
+index 9b9a1898a730..bcb19c3aa24c 100644
+--- a/frmts/pdf/CMakeLists.txt
++++ b/frmts/pdf/CMakeLists.txt
+@@ -54,6 +54,9 @@ if (GDAL_USE_POPPLER)
+   if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+")
+     string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR ${Poppler_VERSION_MINOR})
+   endif ()
++  if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05")
++    target_compile_features(gdal_PDF PRIVATE cxx_std_20)
++  endif ()
+   target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR}
+                                               -DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR})
+ endif ()
diff --git a/sci-libs/gdal/gdal-3.8.5.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild
index bb1c2e0bde5e..3b40e02bfefc 100644
--- a/sci-libs/gdal/gdal-3.8.5.ebuild
+++ b/sci-libs/gdal/gdal-3.8.5.ebuild
@@ -101,6 +101,7 @@ 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}"/${P}-poppler-24.05.0.patch # in 3.9.0
 )
 
 pkg_setup() {