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 1/5] 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
 	"

From 049811e4202ebdf6b18417fbeb5cea6dd0edd122 Mon Sep 17 00:00:00 2001
From: Ed Robbins <edd.robbins@gmail.com>
Date: Tue, 7 Jan 2014 12:21:04 +0000
Subject: [PATCH 2/5] gmp: fix requires, move headers to /devlop/headers.
 readline: fix requires.

---
 dev-libs/gmp/gmp-5.1.1.recipe         | 15 ++++++++++++---
 sys-libs/readline/readline-6.2.recipe |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe
index b9bc4c46a..94e64a811 100644
--- a/dev-libs/gmp/gmp-5.1.1.recipe
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -1,6 +1,13 @@
 SUMMARY="GMP - GNU Multiple Precision Arithmetic Library" 
 DESCRIPTION="
-GMP - GNU Multiple Precision Arithmetic Library
+The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \
+arbitrary-precision arithmetic, operating on signed integers, rational numbers, \
+and floating point numbers. There are no practical limits to the precision \
+except the ones implied by the available memory in the machine GMP runs on \
+(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \
+64-bit machines). GMP has a rich set of functions, and the functions have a \
+regular interface. The basic interface is for C but wrappers exist for other \
+languages including Ada, C++, C#, OCaml, Perl, PHP, and Python. \
 "
 HOMEPAGE="http://gmplib.org/" 
 SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz"
@@ -18,12 +25,14 @@ PROVIDES="cmd:gmp$secondaryArchSuffix = $portVersion compat >= 5.1
 REQUIRES="haiku$secondaryArchSuffix >= $haikuVersion"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtool
 	cmd:autoconf
 	cmd:automake
 	cmd:make
-	"
+"
 
 BUILD()
 {
@@ -37,7 +46,7 @@ BUILD()
 
 INSTALL()
 {
-	make install
+	make install includedir=$includeDir includeexecdir=$includeDir
 	
 	# prepare devel/lib
 	prepareInstalledDevelLibs libgmp
diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe
index db322d227..8f3c0f185 100644
--- a/sys-libs/readline/readline-6.2.recipe
+++ b/sys-libs/readline/readline-6.2.recipe
@@ -31,10 +31,10 @@ REQUIRES="
 	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix

From 4ad7a37f2f25d727f3df6eaddb545ea6992a95b9 Mon Sep 17 00:00:00 2001
From: Ed Robbins <edd.robbins@gmail.com>
Date: Tue, 7 Jan 2014 12:26:03 +0000
Subject: [PATCH 3/5] Fix PROVIDES_devel package

---
 dev-libs/gmp/gmp-5.1.1.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe
index 94e64a811..638ee13a4 100644
--- a/dev-libs/gmp/gmp-5.1.1.recipe
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -64,7 +64,7 @@ TEST()
 # ----- devel package 
 
 PROVIDES_devel="
-	libgmp$secondaryArchSuffix = $portVersion
+	libgmp${secondaryArchSuffix}_devel = $portVersion
 	devel:libgmp$secondaryArchSuffix = 10.1.1 compat >= 0
 	"
 REQUIRES_devel="

From 239d389c58da101e6224b0d99f87defe836c3086 Mon Sep 17 00:00:00 2001
From: Ed Robbins <edd.robbins@gmail.com>
Date: Tue, 7 Jan 2014 14:57:23 +0000
Subject: [PATCH 4/5] gmp: Fixes for provides requires for devel package, some
 other mess cleanup

---
 dev-libs/gmp/gmp-5.1.1.recipe | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe
index 638ee13a4..97d114cac 100644
--- a/dev-libs/gmp/gmp-5.1.1.recipe
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -18,11 +18,12 @@ COPYRIGHT="1991-2013 Free Software Foundation, Inc."
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
 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"
+PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1
+	lib:libgmp$secondaryArchSuffix = 10.1.1 compat >= 10
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
@@ -32,7 +33,7 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	cmd:make
-"
+	"
 
 BUILD()
 {
@@ -64,10 +65,10 @@ TEST()
 # ----- devel package 
 
 PROVIDES_devel="
-	libgmp${secondaryArchSuffix}_devel = $portVersion
+	libgmp${secondaryArchSuffix}_devel = 10.1.1
 	devel:libgmp$secondaryArchSuffix = 10.1.1 compat >= 0
 	"
 REQUIRES_devel="
-	libgmp$secondaryArchSuffix == $portVersion base
+	lib:libgmp$secondaryArchSuffix == 10.1.1 base
 	"
 

From b5001b20c4233e193a715488201a31ace2173275 Mon Sep 17 00:00:00 2001
From: Ed Robbins <edd.robbins@gmail.com>
Date: Tue, 7 Jan 2014 15:15:22 +0000
Subject: [PATCH 5/5] gmp: More fixes for devel package

---
 dev-libs/gmp/gmp-5.1.1.recipe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe
index 97d114cac..5301d1a1e 100644
--- a/dev-libs/gmp/gmp-5.1.1.recipe
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -65,10 +65,10 @@ TEST()
 # ----- devel package 
 
 PROVIDES_devel="
-	libgmp${secondaryArchSuffix}_devel = 10.1.1
+	gmp${secondaryArchSuffix}_devel = $portVersion
 	devel:libgmp$secondaryArchSuffix = 10.1.1 compat >= 0
 	"
 REQUIRES_devel="
-	lib:libgmp$secondaryArchSuffix == 10.1.1 base
+	gmp$secondaryArchSuffix == $portVersion base
 	"