From 6890798ad5e6c9896d0bd5029377de50e2381d43 Mon Sep 17 00:00:00 2001
From: extrowerk <5569059+extrowerk@users.noreply.github.com>
Date: Sat, 12 Dec 2020 07:46:47 +0100
Subject: [PATCH] GEOS: bump (#5458)

---
 sci-libs/geos/geos-3.8.1.recipe               | 83 +++++++++++++++++++
 ...geos-3.7.2.recipe => geos372-3.7.2.recipe} | 34 ++++----
 2 files changed, 98 insertions(+), 19 deletions(-)
 create mode 100644 sci-libs/geos/geos-3.8.1.recipe
 rename sci-libs/geos/{geos-3.7.2.recipe => geos372-3.7.2.recipe} (66%)

diff --git a/sci-libs/geos/geos-3.8.1.recipe b/sci-libs/geos/geos-3.8.1.recipe
new file mode 100644
index 000000000..75aa95d97
--- /dev/null
+++ b/sci-libs/geos/geos-3.8.1.recipe
@@ -0,0 +1,83 @@
+SUMMARY="Geometry Engine Open Source"
+DESCRIPTION="GEOS is a C++ port of the Java Topology Suite (JTS). As such, \
+it aims to contain the complete functionality of JTS in C++. This includes \
+all the OpenGIS Simple Features for SQL spatial predicate functions and \
+spatial operators, as well as specific JTS enhanced topology functions."
+HOMEPAGE="https://trac.osgeo.org/geos"
+COPYRIGHT="2005-2006 Refractions Research Inc.
+	2012 Excensus LLC.
+	2001-2002 Vivid Solutions Inc.
+	2009-2012 Sandro Santilli
+	2008-2010 Safe Software Inc.
+	2008 Sean Gillies"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+SOURCE_URI="https://download.osgeo.org/geos/geos-$portVersion.tar.bz2"
+CHECKSUM_SHA256="4258af4308deb9dbb5047379026b4cd9838513627cb943a44e16c40e42ae17f7"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="1.13.3"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= ${portVersion%.*}"
+
+PROVIDES="
+	geos$secondaryArchSuffix = $portVersionCompat
+	lib:libgeos_${portVersion}$secondaryArchSuffix = $libVersionCompat
+	lib:libgeos_c$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	geos${secondaryArchSuffix}_devel = $portVersionCompat
+	cmd:geos_config$secondaryArchSuffix = $portVersionCompat
+	devel:libgeos$secondaryArchSuffix = $libVersionCompat
+	devel:libgeos_${portVersion}$secondaryArchSuffix = $libVersionCompat
+	devel:libgeos_c$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	geos$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:which
+	"
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libgeos_c libgeos libgeos-$portVersion
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$binDir \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}
diff --git a/sci-libs/geos/geos-3.7.2.recipe b/sci-libs/geos/geos372-3.7.2.recipe
similarity index 66%
rename from sci-libs/geos/geos-3.7.2.recipe
rename to sci-libs/geos/geos372-3.7.2.recipe
index 48b4d4e63..e7a66fe79 100644
--- a/sci-libs/geos/geos-3.7.2.recipe
+++ b/sci-libs/geos/geos372-3.7.2.recipe
@@ -11,34 +11,28 @@ COPYRIGHT="2005-2006 Refractions Research Inc.
 	2008-2010 Safe Software Inc.
 	2008 Sean Gillies"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://download.osgeo.org/geos/geos-$portVersion.tar.bz2"
 CHECKSUM_SHA256="2166e65be6d612317115bfec07827c11b403c3f303e0a7420a2106bc999d7707"
 PATCHES="geos-$portVersion.patchset"
+SOURCE_DIR="geos-$portVersion"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="1.11.2"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= ${portVersion%.*}"
+
 PROVIDES="
-	geos$secondaryArchSuffix = $portVersion compat >= 3.7
-	lib:libgeos_${portVersion}$secondaryArchSuffix = $portVersion compat >= 3.7
-	lib:libgeos_c$secondaryArchSuffix = 1.11.2 compat >= 1
+	geos372$secondaryArchSuffix = $portVersionCompat
+	lib:libgeos_${portVersion}$secondaryArchSuffix = $libVersionCompat
+	lib:libgeos_c$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-PROVIDES_devel="
-	geos${secondaryArchSuffix}_devel = $portVersion compat >= 3.7
-	cmd:geos_config$secondaryArchSuffix
-	devel:libgeos$secondaryArchSuffix = $portVersion compat >= 3.7
-	devel:libgeos_${portVersion}$secondaryArchSuffix = $portVersion compat >= 3.7
-	devel:libgeos_c$secondaryArchSuffix = 1.11.2 compat >= 1
-	"
-REQUIRES_devel="
-	geos$secondaryArchSuffix == $portVersion base
-	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -68,8 +62,10 @@ INSTALL()
 	prepareInstalledDevelLibs libgeos_c libgeos libgeos-$portVersion
 	fixPkgconfig
 
-	# devel package
-	packageEntries devel \
-		$binDir \
-		$developDir
+	rm -rf $binDir $developDir
+}
+
+TEST()
+{
+	make test
 }