From ab26644871dc5cab53f58ea94249b3861d6e32df Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sun, 17 Jun 2018 09:21:38 +0000
Subject: [PATCH] gsl: bump to 2.5, fix PROVIDES{,_devel}, add commandBinDir.
 (#2700)

{lib,devel}:libgsl had a wrong compat, ">= 0" instead of ">= 23",
so we will need to rebuild calligra, krita and xaos.
---
 .../gsl/{gsl-2.4.recipe => gsl-2.5.recipe}    | 53 ++++++++++++++-----
 1 file changed, 41 insertions(+), 12 deletions(-)
 rename sci-libs/gsl/{gsl-2.4.recipe => gsl-2.5.recipe} (65%)

diff --git a/sci-libs/gsl/gsl-2.4.recipe b/sci-libs/gsl/gsl-2.5.recipe
similarity index 65%
rename from sci-libs/gsl/gsl-2.4.recipe
rename to sci-libs/gsl/gsl-2.5.recipe
index eb21c1b8f..93f1f6bb7 100644
--- a/sci-libs/gsl/gsl-2.4.recipe
+++ b/sci-libs/gsl/gsl-2.5.recipe
@@ -1,7 +1,7 @@
 SUMMARY="GNU Scientific Library"
 DESCRIPTION="This is GSL, the GNU Scientific Library, a collection of \
 numerical routines for scientific computing."
-HOMEPAGE="http://www.gnu.org/software/gsl/"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
 COPYRIGHT="1996-2007, 2009, 2010 Gerard Jungman
 	1996-2001, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2013 Brian Gough
 	1996-2000, 2007, 2010 Jim Davies
@@ -51,18 +51,31 @@ COPYRIGHT="1996-2007, 2009, 2010 Gerard Jungman
 	2002-2004 Jason H. Stover"
 LICENSE="GNU GPL v3"
 REVISION="1"
-SOURCE_URI="http://ftp.gnu.org/gnu/gsl/gsl-$portVersion.tar.gz"
-CHECKSUM_SHA256="4d46d07b946e7b31c19bbf33dda6204d7bedc2f5462a1bae1d4013426cd1ce9b"
+SOURCE_URI="https://ftpmirror.gnu.org/gsl/gsl-$portVersion.tar.gz
+	https://ftp.gnu.org/gnu/gsl/gsl-$portVersion.tar.gz"
+CHECKSUM_SHA256="0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libgslVersion="23.1.0"
+libgslcblasVersion="0.0.0"
+libgslVersionCompat="$libgslVersion compat >= ${libgslVersion%%.*}"
+libgslcblasVersionCompat="$libgslcblasVersion compat >= ${libgslcblasVersion%%.*}"
+
 PROVIDES="
 	gsl$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:gsl_histogram$secondaryArchSuffix
-	cmd:gsl_randist$secondaryArchSuffix
-	lib:libgsl$secondaryArchSuffix = 23.0.0 compat >= 0
-	lib:libgslcblas$secondaryArchSuffix = 0.0.0 compat >= 0
+	cmd:gsl_histogram$commandSuffix = $portVersion
+	cmd:gsl_randist$commandSuffix = $portVersion
+	lib:libgsl$secondaryArchSuffix = $libgslVersionCompat
+	lib:libgslcblas$secondaryArchSuffix = $libgslcblasVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -71,8 +84,8 @@ REQUIRES="
 PROVIDES_devel="
 	gsl${secondaryArchSuffix}_devel = $portVersion compat >= 1
 	cmd:gsl_config$secondaryArchSuffix
-	devel:libgsl$secondaryArchSuffix = 23.0.0 compat >= 0
-	devel:libgslcblas$secondaryArchSuffix = 0.0.0 compat >= 0
+	devel:libgsl$secondaryArchSuffix = $libgslVersionCompat
+	devel:libgslcblas$secondaryArchSuffix = $libgslcblasVersionCompat
 	"
 REQUIRES_devel="
 	gsl$secondaryArchSuffix == $portVersion base
@@ -93,13 +106,15 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage gsl$secondaryArchSuffix \
-	$libDir/libgsl.so.23.0.0 \
-	$libDir/libgslcblas.so.0.0.0
+	"$commandBinDir"/gsl-histogram \
+	"$commandBinDir"/gsl-randist \
+	"$libDir"/libgsl.so.$libgslVersion \
+	"$libDir"/libgslcblas.so.$libgslcblasVersion \
 
 BUILD()
 {
 	autoreconf -fi
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
 	make $jobArgs
 }
 
@@ -110,6 +125,11 @@ INSTALL()
 	prepareInstalledDevelLibs libgsl libgslcblas
 	fixPkgconfig
 
+	if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then
+		mkdir -p "$binDir"
+		mv "$commandBinDir"/gsl-config "$binDir"
+	fi
+
 	# devel package
 	packageEntries devel \
 		$binDir/gsl-config \
@@ -117,4 +137,13 @@ INSTALL()
 		$manDir/man1/gsl-config.1 \
 		$manDir/man3 \
 		$dataDir/aclocal
+
+	if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then
+		rmdir "$binDir"
+	fi
+}
+
+TEST()
+{
+	make check
 }