ginac & cln: fix cln 1.3.4, update ginac 1.6.5, add ginac 1.6.7. (#559)

sci-libs/cln:

* REQUIRES_devel was set to libcln$secondaryArchSuffix instead of
  cln$secondaryArchSuffix, therefore preventing both the installation
  of cln_devel and its use in chrooted builds of ginac.
* Drop the recipe for version 1.3.2 (which was really old.)
* Change cmd:gcc to cmd:g++ in BUILD_PREREQUIRES.
* On x86_gcc2 using x86 as secondary arch, install pi in bin/ instead
  of bin/x86/.
* Do not use $portVersion as version of lib:libcln. Instead, use the
  libs' real version. This change is safe since the only package wich
  needs libcln is ginac and it is being updated in this very commit.

sci-mathematics/ginac:

* Fix versioned dependency on libcln for ginac-1.6.5.
* On x86_gcc2 using x86 2nd arch, do not install runtimes in bin/x86/
  but in bin/.
* Add ginac-1.6.7.

sci-libs/cln/cln-1.3.2.recipe

@@ -1,30 +0,0 @@
-DESCRIPTION="
-CLN is a library for efficient computations with all kinds of numbers in \
-arbitrary precision.
-"
-HOMEPAGE="http://www.ginac.de/CLN/"
-SOURCE_URI="http://www.ginac.de/CLN/cln-1.3.2.tar.bz2"
-CHECKSUM_MD5="d897cce94d9c34d106575ed4ec865d71"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd cln-1.3.2
-	autoreconf -i
-	./configure	--prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cln-1.3.2
-	make install
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="Bruno Haible 1988-2008
-	Alexei Sheplyakov 2008
-	Richard Kreckel 2000-2009"

sci-libs/cln/cln-1.3.4.recipe

@@ -10,18 +10,26 @@ COPYRIGHT="1988-2008 Bruno Haible
 	2000-2014 Richard Kreckel
 	2008-2010 Alexei Sheplyakov"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://www.ginac.de/CLN/cln-$portVersion.tar.bz2"
 CHECKSUM_SHA256="2d99d7c433fb60db1e28299298a98354339bdc120d31bb9a862cafc5210ab748"
 PATCHES="cln-$portVersion.patch"
 
-ARCHITECTURES="x86 !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+
+if [ "$targetArchitecture" != x86_gcc2 ]; then
+	commandSuffix=$secondaryArchSuffix
+	commandBinDir=$binDir
+else
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
 	cln$secondaryArchSuffix = $portVersion
 	lib:libcln$secondaryArchSuffix = 6.0.4 compat >= 6
-	cmd:pi$secondaryArchSuffix = $portVersion
+	cmd:pi$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -32,7 +40,7 @@ PROVIDES_devel="
 	devel:libcln$secondaryArchSuffix = 6.0.4 compat >= 6
 	"
 REQUIRES_devel="
-	libcln$secondaryArchSuffix == $portVersion
+	cln$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -41,12 +49,12 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:make
-	cmd:gcc$secondaryArchSuffix
+	cmd:g++$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
 	make $jobArgs
 }
 

sci-libs/cln/patches/cln-1.3.2.patch

@@ -1,21 +0,0 @@
-diff -Naur cln-1.3.2/src/base/random/cl_random_from.cc cln-1.3.2-haiku/src/base/random/cl_random_from.cc
---- cln-1.3.2/src/base/random/cl_random_from.cc	2009-05-10 22:32:30.056360960 +0200
-+++ cln-1.3.2-haiku/src/base/random/cl_random_from.cc	2012-06-14 20:16:49.920387584 +0200
-@@ -18,7 +18,7 @@
- #include "base/cl_low.h"
- #include <cstdlib>  // declares rand()
- 
--#if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__)
-+#if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__) || defined(__HAIKU__)
- 
- #include <sys/types.h>
- #include <unistd.h> // declares getpid()
-@@ -86,7 +86,7 @@
- {
- 	var uint32 seed_hi;
- 	var uint32 seed_lo;
--#if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__)
-+#if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__) || defined(__HAIKU__)
- 	seed_lo = get_seed();
- 	seed_hi = (rand() // zufällige 31 Bit (bei UNIX_BSD) bzw. 16 Bit (bei UNIX_SYSV)
-                           << 8) ^ (uintL)(getpid()); // ca. 8 Bit von der Process ID