stable on ppc64 (fingers crossed)

4 files changed, 34 insertions, 5 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 2650c4c4ab70..599558b6ec67 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.34 2004/07/02 04:42:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.35 2004/08/20 04:23:56 tgall Exp $
+
+  19 Aug 2004; Tom Gall <tgall@gentoo.org> gmp-4.1.3.ebuild, +ppc64-gmp-acinclude.patch:
+  stable on ppc64
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gmp-4.1.2.ebuild,
   gmp-4.1.3.ebuild:
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index f4e23f5b53c2..ca5904ca1717 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,10 +1,11 @@
-MD5 50709d105101ac4da757fb48aeaee702 ChangeLog 4821
+MD5 0a5bfb0a9678b8f6e41e8dfc01852583 ChangeLog 4901
 MD5 50e66a474417cd0ae217963c82d8ae56 gmp-4.1-r1.ebuild 1043
 MD5 a32fc343b820fbd1643569595cc1a22f gmp-4.1.2.ebuild 1445
-MD5 bbccd6a4d675757dc8c9fa6e5a81faf9 gmp-4.1.3.ebuild 1531
+MD5 2911341c9a9fbc006825c713111c173f gmp-4.1.3.ebuild 1850
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 6fe67063d13e286170b681d7220f6bb7 files/digest-gmp-4.1-r1 60
 MD5 265f53218c05ee4ac1192b1fee5d5038 files/digest-gmp-4.1.2 62
 MD5 5e16de635136241e3ca3d414a8e1d181 files/digest-gmp-4.1.3 62
 MD5 d646f32e97b41529d4ab5066c69bc856 files/longlong.patch 473
 MD5 8458ecf3c3c6b27f949d1b1c1e6a9cc7 files/randraw.c.41.diff 585
+MD5 d70b080c2f0efd82a800ba8a1af7b305 files/ppc64-gmp-acinclude.patch 474
diff --git a/dev-libs/gmp/files/ppc64-gmp-acinclude.patch b/dev-libs/gmp/files/ppc64-gmp-acinclude.patch
new file mode 100644
index 000000000000..cb03d237f71c
--- /dev/null
+++ b/dev-libs/gmp/files/ppc64-gmp-acinclude.patch
@@ -0,0 +1,13 @@
+--- acinclude.m4.orig	2004-08-19 22:30:34.729944200 -0500
++++ acinclude.m4	2004-08-19 22:31:02.021056464 -0500
+@@ -999,8 +999,8 @@
+ for tmp_underscore in "" "_"; do
+   cat >conftes2.s <<EOF
+       	$gmp_cv_asm_text
+-	$gmp_cv_asm_globl ${tmp_underscore}underscore_test
+-${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix
++	$gmp_cv_asm_globl .${tmp_underscore}underscore_test
++.${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix
+ EOF
+   case $host in
+   *-*-aix*)
diff --git a/dev-libs/gmp/gmp-4.1.3.ebuild b/dev-libs/gmp/gmp-4.1.3.ebuild
index 1467741c3e76..3dcf38b15c2f 100644
--- a/dev-libs/gmp/gmp-4.1.3.ebuild
+++ b/dev-libs/gmp/gmp-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.3.ebuild,v 1.6 2004/07/02 04:42:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.3.ebuild,v 1.7 2004/08/20 04:23:56 tgall Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/gmp/${P}.tar.gz"
 RESTRICT="nomirror"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm hppa ~amd64 ia64 s390"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm hppa ~amd64 ia64 s390 ppc64"
 IUSE="debug"
 
 DEPEND="sys-apps/gawk
@@ -22,6 +22,18 @@ DEPEND="sys-apps/gawk
 
 RDEPEND="virtual/libc"
 
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+
+#   This patch will actually be somewhat short lived as it's really
+#   somewhat of a hack. The toolchain folks (alanm) have a set of patches
+#   to remove the use of the '.' form in ppc64 assembler
+	use ppc64 && epatch ${FILESDIR}/ppc64-gmp-acinclude.patch
+
+	autoreconf
+}
+
 src_compile() {
 	filter-flags -ffast-math