[gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/, sci-libs/geos/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     b8f7f94b9bb7c1a04d9f010eb556e10ff760bac3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 17:36:57 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 21:08:16 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f7f94b

sci-libs/geos: drop 3.11.2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/geos/Manifest                       |  1 -
 sci-libs/geos/files/geos-3.11.2-gcc-13.patch | 38 -------------------
 sci-libs/geos/geos-3.11.2.ebuild             | 55 ----------------------------
 3 files changed, 94 deletions(-)

diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 1e40fec0618c..93b6aa5079f8 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,3 +1,2 @@
-DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff985555e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec
 DIST geos-3.12.1.tar.bz2 6727199 BLAKE2B 4ffc9cb63f3ac15b3dcb0ba9fec6a1ccaeaf35962a057234f4da38d6bba19df39e800805badfd56fe927da09c9392f0feaf2b7d02085e8f293c4d9503ab28ff9 SHA512 192eba83c651e935b3c9a5cc19321285e4d28b9da9d7a1fa15d9471803027e630db7a7ecea96343d9c5f9846d279062ca3694fe47916a4ebf5698ae66dd5210d
 DIST geos-3.13.0.tar.bz2 6801211 BLAKE2B 8de35093e2819268df2cd15f1661dcbaba6b9c3bd978904fb992fd91905b0056cfa6580cae602511bd8c4b19686597abb81e0af71a8a73a684cafd8013755bad SHA512 8ffaa3f49a8365db693ac948e9d66cf55321eb12151734c7da2775070b7804ffa607de2474b7019d6ea2a99d5e037fb1e8561bf9025e65ddd4bd1ba049382b28

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
deleted file mode 100644
index fa46cf8bf4d2..000000000000
--- a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
deleted file mode 100644
index ab3842bbb0c3..000000000000
--- a/sci-libs/geos/geos-3.11.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-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 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13.patch
-)
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/862702
-	# https://github.com/libgeos/geos/issues/1054
-	filter-lto
-
-	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
-}