From 9b692ff5efed782263ab9423d8684f3cd47e55c4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Dec 2014 18:21:49 +0100
Subject: [PATCH] gmp: split C++ into gmpxx subpkg; less deps in base.

---
 common/shlibs        |  2 +-
 srcpkgs/gmp/template | 30 ++++++++++++++++++------------
 srcpkgs/gmpxx        |  1 +
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/gmpxx

diff --git a/common/shlibs b/common/shlibs
index 5d493fc83b2..8021f17ed64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -57,7 +57,7 @@ libgij.so.15 libgcj-4.9.0_1
 libperl.so perl-5.20.1_1
 libmp.so.3 gmp-5.0.1_1
 libgmp.so.10 gmp-5.0.1_1
-libgmpxx.so.4 gmp-5.0.1_1
+libgmpxx.so.4 gmpxx-6.0.0_2
 libmpfr.so.4 mpfr-3.0.0_1
 libppl.so.13 ppl-1.1_1
 libppl_c.so.4 ppl-0.11_1
diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template
index db8dff7ed8a..6b8bc2962bb 100644
--- a/srcpkgs/gmp/template
+++ b/srcpkgs/gmp/template
@@ -1,13 +1,11 @@
 # Template build file for 'gmp'
 pkgname=gmp
 version=6.0.0
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
-configure_args="--enable-cxx --build=${XBPS_MACHINE}-unknown-linux-gnu"
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	cnfigure_args+=" ABI=32"
-fi
+configure_args="--enable-cxx"
+hostmakedepends="m4 libtool"
 makedepends="zlib-devel"
 short_desc="Library for arbitrary precision arithmetic"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,15 +14,23 @@ homepage="http://gmplib.org/"
 distfiles="http://mirror.anl.gov/pub/gnu/gmp/gmp-${version}a.tar.xz"
 checksum=9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="m4 libtool"
-	pre_configure() {
-		libtoolize -f
-	}
-fi
+case "$XBPS_TARGET_MACHINE" in
+	i686*) cnfigure_args+=" ABI=32";;
+esac
 
+pre_configure() {
+	libtoolize -f
+}
+
+gmpxx_package() {
+	short_desc+=" - C++ support"
+	replaces="gmp<6.0.0_2"
+	pkg_install() {
+		vmove usr/lib/libgmpxx.so.*
+	}
+}
 gmp-devel_package() {
-	depends="gmp>=${version}_${revision}"
+	depends="gmpxx>=${version}_${revision} gmp>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/gmpxx b/srcpkgs/gmpxx
new file mode 120000
index 00000000000..eeaa9d938de
--- /dev/null
+++ b/srcpkgs/gmpxx
@@ -0,0 +1 @@
+gmp
\ No newline at end of file