gentoo auto-resync : 17:03:2023 - 06:26:48

3 files changed, 91 insertions, 0 deletions

diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 85fe2715a03e..c13cd6534b03 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,6 +1,9 @@
 AUX geos-3.11.1-gcc-13.patch 3330 BLAKE2B 2da75c8f658dd4358089be745fffec8fa49e997c9ade7146e168e8c9cdf05dc532369240a0766b9ccc0aff9335d8155ca99299fb617e895a3b718138a36fb248 SHA512 fc568dc1c458e791c973fb72ecdd433784439a1c427f850cb99c7d5b69190c98e6731b9e5231c39e2a92552e3cd22f897691c3dd3c473f96c604f7935d2a7e9e
+AUX geos-3.11.2-gcc-13.patch 1355 BLAKE2B 1ca9b94ee975bdfb265af74c1d5ebd88951aacaf615f1ab13bf9ac01a237b8f464cd61928de70b5c1273330bc5f1cd989b0faeb9ec4b7bfd39dbd8b157e74649 SHA512 a83a40c6c573e127d33c704685bf470831c91d915678cc2cf09207433e2dd8d3d5eff44974c29e1eb5346c984fefdfcad74ae9a82f2ea6594bdf2119e19b182f
 DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f98df95d5aaf9f6fd957ebcdbdefb43ae4fb17a5a671b6dfdb812bdacfdbfdfdea6e5bd44f135e3701a3cc914d SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189
 DIST geos-3.11.1.tar.bz2 6753232 BLAKE2B 376050ca3224e5220f69d82ff62d79ff7ea3d35d5fe90b7ab4e0cabcb4200b47d7569110538c201df9cb28da784f09f8207a9a8233ee002ab2ec87f5cf336ba1 SHA512 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3
+DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff985555e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec
 EBUILD geos-3.11.0.ebuild 965 BLAKE2B 1d309b8b185f41c09a916d38647c287591e4aa541b3adc9c28d1632bfc9d8e80453e7c8b68e31ec4582a315d0d0c113491c4e24000ccdb76f378a8bf17086394 SHA512 b7324c7318f9634070c98104574be684f44fcb9327fb70548582d4ba3dcac269aa7fa07716f18f4d2aa144526dbd728e8aac83de3f8d0690c4f27482902209fe
 EBUILD geos-3.11.1.ebuild 1017 BLAKE2B 676b990c6ba9599f8b4673d89c66ae9512a0721c6acd711faf66627843e6bc300c460575e87e6bb987c49a4e8d1eaf38c08d59ee5f00c8e2c639a0d9bb52b344 SHA512 e22faee80fc347b65814284b64b5596d389375d58eacd7b8961db2044077e674077f675e5e1762ab6220d3368c9f10ee0828b0e347acc0f5a3a99de7c4f78dd5
+EBUILD geos-3.11.2.ebuild 1014 BLAKE2B 71d5563ca1577fa25bf818788b26610b4816a21192a8dfbc4051845606f280fc756054153715688ded8947734cc186f83414550bfa80849b0d775eb7326cb0ac SHA512 f27f91b44a1b78c2b170cdcf654b34dbc600e0d54731e5adba3f21372d6891b365876f5a09a5e8c3046173d22e332f3ea741dd2d04664635da5b02d67268d3d5
 MISC metadata.xml 990 BLAKE2B 7ad10fb1fcd8f933626c7a4d943070e147e6ff7776c4c57960cb42433c102036fdd724fd7288ea40aafe99c3255490fe304bfc4932e0c866349a38703c3990eb SHA512 1a2e4778017e909088675a9fc4e27e5b4e4aee4ec82708dd9ad9e3abfc8ce44f68bc19e70ab9de7543caf8379b151c40a2cdbe5e3a599216b201ef2fae8d4452
diff --git a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch b/sci-libs/geos/files/geos-3.11.2-gcc-13.patch
new file mode 100644
index 000000000000..fa46cf8bf4d2
--- /dev/null
+++ b/sci-libs/geos/files/geos-3.11.2-gcc-13.patch
@@ -0,0 +1,38 @@
+https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1
+
+From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <mail@heiko-becker.de>
+Date: Mon, 23 Jan 2023 15:56:11 +0100
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint> (#805)
+
+In addition to [1]. Otherwise geos fails to build with:
+"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level'
+   40 |     HilbertEncoder(uint32_t p_level, geom::Envelope& extent);
+      |                   ~        ^~~~~~~~
+      |                            )
+/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type
+   41 |     uint32_t encode(const geom::Envelope* env);
+      |     ^~~~~~~~"
+
+[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146
+--- a/include/geos/shape/fractal/HilbertEncoder.h
++++ b/include/geos/shape/fractal/HilbertEncoder.h
+@@ -19,6 +19,7 @@
+ #include <geos/geom/Geometry.h>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ // Forward declarations
+ namespace geos {
+--- a/tests/unit/capi/GEOSMakeValidTest.cpp
++++ b/tests/unit/capi/GEOSMakeValidTest.cpp
+@@ -9,6 +9,7 @@
+ #include <cstdlib>
+ #include <cmath>
+ #include <cstring>
++#include <cstdint>
+ 
+ #include "capi_test_utils.h"
+ 
+
diff --git a/sci-libs/geos/geos-3.11.2.ebuild b/sci-libs/geos/geos-3.11.2.ebuild
new file mode 100644
index 000000000000..9aa1b4eecd40
--- /dev/null
+++ b/sci-libs/geos/geos-3.11.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="https://libgeos.org/"
+SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-13.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+		-DUSE_CCACHE=OFF
+
+		# bug #709368
+		$(usev arm '-DDISABLE_GEOS_INLINE=ON')
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc ; then
+		HTML_DOCS=( "${BUILD_DIR}"/doxygen/doxygen_docs/html/. )
+		einstalldocs
+	fi
+}