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.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
 }