From bc8f169e477c009cf5a5137291753d4ec94f5160 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Thu, 26 Apr 2018 21:09:24 +0200
Subject: [PATCH] Primesieve: bump (#2480)

---
 ...eve-5.7.3.recipe => primesieve-6.4.recipe} | 53 ++++++++++++-------
 1 file changed, 33 insertions(+), 20 deletions(-)
 rename sci-libs/primesieve/{primesieve-5.7.3.recipe => primesieve-6.4.recipe} (53%)

diff --git a/sci-libs/primesieve/primesieve-5.7.3.recipe b/sci-libs/primesieve/primesieve-6.4.recipe
similarity index 53%
rename from sci-libs/primesieve/primesieve-5.7.3.recipe
rename to sci-libs/primesieve/primesieve-6.4.recipe
index a777b926e..5c0af842e 100644
--- a/sci-libs/primesieve/primesieve-5.7.3.recipe
+++ b/sci-libs/primesieve/primesieve-6.4.recipe
@@ -3,26 +3,31 @@ DESCRIPTION="primesieve is a program and C/C++ library that generates primes \
 using a highly optimized sieve of Eratosthenes implementation. It counts the \
 primes below 10^10 in just 0.45 seconds on an Intel Core i7-6700 CPU \
 (4 x 3.4GHz). primesieve can generate primes and prime k-tuplets up to 2^64."
-HOMEPAGE="http://primesieve.org/"
-COPYRIGHT="2010-2016, Kim Walisch"
+HOMEPAGE="https://primesieve.org/"
+COPYRIGHT="2010-2018 Kim Walisch"
 LICENSE="BSD (2-clause)"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/kimwalisch/primesieve/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="22c5ec34f020592cd559551e3e6e1e86aa51f6e34d639bef352d155ea415ac62"
+CHECKSUM_SHA256="130040305c4b1fdd1a9177d5edd7f57d741a31e0f9b190d43aa85637534f4eed"
+SOURCE_FILENAME="primesieve-$portVersion.tar.gz"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
 
-if [ "$targetArchitecture" != x86_gcc2 ]; then
-	commandBinDir=$binDir
-else
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
 	commandBinDir=$prefix/bin
 fi
 
+libVersion="8.4.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	primesieve$secondaryArchSuffix = $portVersion
-	cmd:primesieve = $portVersion
-	lib:libprimesieve$secondaryArchSuffix = 7.0.3 compat >= 7
+	cmd:primesieve$commandSuffix = $portVersion
+	lib:libprimesieve$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -31,7 +36,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	primesieve${secondaryArchSuffix}_devel = $portVersion
-	devel:libprimesieve$secondaryArchSuffix = 7.0.3 compat >= 7
+	devel:libprimesieve$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	primesieve$secondaryArchSuffix == $portVersion base
@@ -41,8 +46,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoreconf
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
@@ -50,25 +54,34 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	./autogen.sh
-	runConfigure ./configure
+	mkdir -p build && cd build
+
+	cmake .. \
+		-DCMAKE_INSTALL_BINDIR="$commandBinDir" \
+		-DCMAKE_INSTALL_LIBDIR="$libDir" \
+		-DCMAKE_INSTALL_INCLUDEDIR="$includeDir" \
+		-DCMAKE_INSTALL_DOCDIR="$docDir" \
+		-DCMAKE_INSTALL_MANDIR="$manDir" \
+		-DBUILD_TESTS=ON
+
 	make $jobArgs
 }
 
 INSTALL()
 {
-	make install bindir=$commandBinDir
-
-	rm $libDir/libprimesieve.la
+	cd build
+	make install
 
 	prepareInstalledDevelLib libprimesieve
 	fixPkgconfig
 
 	packageEntries devel \
-		$developDir
+		$developDir \
+		$libDir/cmake
 }
 
 TEST()
 {
-	make check
+	cd build
+	make test
 }