From 3d2b03c607c9bd9949c3fc40e6940c7e667b30a5 Mon Sep 17 00:00:00 2001
From: Ed Robbins <edd.robbins@gmail.com>
Date: Mon, 6 Jan 2014 16:31:07 +0000
Subject: [PATCH] Update gmp and readline to support multi arch

---
 dev-libs/gmp/gmp-5.1.1.recipe         | 23 ++++++++++++-----------
 sys-libs/readline/readline-6.2.recipe | 27 ++++++++++++++-------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe
index 18b274937..b9bc4c46a 100644
--- a/dev-libs/gmp/gmp-5.1.1.recipe
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -1,7 +1,7 @@
 SUMMARY="GMP - GNU Multiple Precision Arithmetic Library" 
 DESCRIPTION="
 GMP - GNU Multiple Precision Arithmetic Library
-" 
+"
 HOMEPAGE="http://gmplib.org/" 
 SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz"
 CHECKSUM_MD5="485b1296e6287fa381e6015b19767989"
@@ -10,14 +10,15 @@ LICENSE="GNU GPL v3
 COPYRIGHT="1991-2013 Free Software Foundation, Inc."
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-PROVIDES="cmd:gmp = $portVersion compat >= 5.1
-	lib:libgmp
-	lib:libgmp = 10
-	lib:libgmp = 10.1.1"
-REQUIRES="haiku >= $haikuVersion"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+PROVIDES="cmd:gmp$secondaryArchSuffix = $portVersion compat >= 5.1
+	lib:libgmp$secondaryArchSuffix
+	lib:libgmp$secondaryArchSuffix = 10
+	lib:libgmp$secondaryArchSuffix = 10.1.1"
+REQUIRES="haiku$secondaryArchSuffix >= $haikuVersion"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
 	cmd:libtool
 	cmd:autoconf
 	cmd:automake
@@ -54,10 +55,10 @@ TEST()
 # ----- devel package 
 
 PROVIDES_devel="
-	libgmp = $portVersion
-	devel:libgmp = 10.1.1 compat >= 0
+	libgmp$secondaryArchSuffix = $portVersion
+	devel:libgmp$secondaryArchSuffix = 10.1.1 compat >= 0
 	"
 REQUIRES_devel="
-	libgmp == $portVersion base
+	libgmp$secondaryArchSuffix == $portVersion base
 	"
 
diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe
index c30bc05fa..db322d227 100644
--- a/sys-libs/readline/readline-6.2.recipe
+++ b/sys-libs/readline/readline-6.2.recipe
@@ -17,27 +17,28 @@ SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz"
 CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="readline-6.2.patch"
 
 PROVIDES="
-	readline = $portVersion compat >= 6
-	lib:libhistory = $portVersion compat >= 6
-	lib:libreadline = $portVersion compat >= 6
+	readline$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libhistory$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libncurses
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libncurses
+	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
@@ -70,10 +71,10 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	readline_devel = $portVersion
-	devel:libhistory = $portVersion compat >= 6
-	devel:libreadline = $portVersion compat >= 6
+	readline${secondaryArchSuffix}_devel = $portVersion
+	devel:libhistory$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libreadline$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES_devel="
-	readline == $portVersion base
+	readline$secondaryArchSuffix == $portVersion base
 	"