From 9d15a45078e295f9d46eb203879df7eb52d5052a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 19:35:49 +0000
Subject: [PATCH] mpfr & mpc: enable x86 and x86_64

* cleanup
---
 dev-libs/mpc/mpc-1.0.2.recipe   | 36 ++++++++++++++++---------------
 dev-libs/mpfr/mpfr-3.1.2.recipe | 38 +++++++++++++++++----------------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/dev-libs/mpc/mpc-1.0.2.recipe b/dev-libs/mpc/mpc-1.0.2.recipe
index 5595390e3..5f01fe661 100644
--- a/dev-libs/mpc/mpc-1.0.2.recipe
+++ b/dev-libs/mpc/mpc-1.0.2.recipe
@@ -9,9 +9,9 @@ is a major design goal.
 LICENSE="GNU LGPL v3"
 COPYRIGHT="2006-2014 Andreas Enge, Mickaël Gastineau, Philippe Théveny
 and Paul Zimmermann"
-REVISION="1"
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 HOMEPAGE="http://www.multiprecision.org"
 SRC_URI="$HOMEPAGE/mpc/download/mpc-$portVersion.tar.gz"
 CHECKSUM_SHA256="b561f54d8a479cee3bc891ee52735f18ff86712ba30f036f8b8537bae380c488"
@@ -19,34 +19,25 @@ CHECKSUM_SHA256="b561f54d8a479cee3bc891ee52735f18ff86712ba30f036f8b8537bae380c48
 PROVIDES="
 	mpc$secondaryArchSuffix = $portVersion
 	lib:libmpc$secondaryArchSuffix = 3.0.0 compat = 3
-"
+	"
 
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	lib:libmpfr$secondaryArchSuffix
-"
+	"
 
 BUILD_REQUIRES="
 	devel:libgmp$secondaryArchSuffix
 	devel:libmpfr$secondaryArchSuffix
-"
+	"
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:awk
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
-"
-
-PROVIDES_devel="
-	mpc_devel$secondaryArchSuffix = $portVersion
-	devel:libmpc$secondaryArchSuffix = 3.0.0 compat = 3
-"
-
-REQUIRES_devel="
-	mpc$secondaryArchSuffix == $portVersion base
-"
+	"
 
 BUILD()
 {
@@ -65,3 +56,14 @@ TEST()
 {
 	make $jobArgs check
 }
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	mpc${secondaryArchSuffix}_devel = $portVersion
+	devel:libmpc$secondaryArchSuffix = 3.0.0 compat >= 3
+	"
+
+REQUIRES_devel="
+	mpc$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-libs/mpfr/mpfr-3.1.2.recipe b/dev-libs/mpfr/mpfr-3.1.2.recipe
index 0d02295dc..cfa7d157c 100644
--- a/dev-libs/mpfr/mpfr-3.1.2.recipe
+++ b/dev-libs/mpfr/mpfr-3.1.2.recipe
@@ -23,42 +23,33 @@ improved an existing one, please share your work!"
 LICENSE="GNU LGPL v3"
 HOMEPAGE="http://www.mpfr.org" 
 COPYRIGHT="2000-2014 INRIA"
-SRC_URI="http://www.mpfr.org/mpfr-current/mpfr-3.1.2.tar.bz2"
+SRC_URI="http://www.mpfr.org/mpfr-current/mpfr-$portVersion.tar.bz2"
 CHECKSUM_SHA256="79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b"
-REVISION="1"
+REVISION="2"
 
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	mpfr$secondaryArchSuffix = $portVersion
-	lib:libmpfr$secondaryArchSuffix = 4.1.2 compat = 4
-"
+	lib:libmpfr$secondaryArchSuffix = 4.1.2 compat >= 4
+	"
 
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
-"
+	"
 
 BUILD_REQUIRES="
 	devel:libgmp$secondaryArchSuffix
-"
+	"
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-"
-
-PROVIDES_devel="
-	mpfr${secondaryArchSuffix}_devel = $portVersion
-	devel:libmpfr$secondaryArchSuffix = 4.1.2 compat = 4
-"
-
-REQUIRES_devel="
-	mpfr$secondaryArchSuffix == $portVersion base
-"
+	"
 
 BUILD()
 {
@@ -77,3 +68,14 @@ TEST()
 {
 	make check $jobArgs
 }
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	mpfr${secondaryArchSuffix}_devel = $portVersion
+	devel:libmpfr$secondaryArchSuffix = 4.1.2 compat >= 4
+	"
+
+REQUIRES_devel="
+	mpfr$secondaryArchSuffix == $portVersion base
+	"