address bug #90211 for ppc64

(Portage version: 2.0.51.22-r3)

3 files changed, 29 insertions, 6 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 14a289c7b857..b9b0746c247e 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.62 2005/11/10 15:18:47 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.63 2005/11/26 04:16:10 tgall Exp $
+
+  25 Nov 2005; Tom Gall <tgall@gentoo.org> libgcrypt-1.2.1.ebuild,
+  +libgcrypt-1.2.1-ppc64-fix.patch:
+  bug #90211
 
   10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org>  libgcrypt-1.2.2-r1.ebuild files/digest-libgcrypt-1.2.2-r1
   libgcrypt-1.2.2.ebuild files/digest-libgcrypt-1.2.2 +files/libgcrypt-1.2.1-info-entry-fix.patch:
@@ -58,7 +62,7 @@
   07 May 2005; Aron Griffis <agriffis@gentoo.org> libgcrypt-1.2.1.ebuild:
   stable on ia64
 
-  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> libgcrypt-1.2.1.ebuild:
+  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> libgcrypt-1.2.1.ebuild:
   Stable on alpha.
 
   29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> libgcrypt-1.2.1.ebuild:
@@ -128,7 +132,7 @@
   29 Jul 2004; Stephen P. Becker <geoman@gentoo.org> libgcrypt-1.1.94.ebuild:
   Stable on mips.
 
-  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> libgcrypt-1.1.94.ebuild:
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> libgcrypt-1.1.94.ebuild:
   Stable on alpha.
 
   01 Jul 2004; Tom Gall <tgall@gentoo.org> libgcrypt-1.2.0.ebuild:
@@ -148,7 +152,7 @@
   30 May 2004; Mike Frysinger <vapier@gentoo.org> +libgcrypt-1.2.0.ebuild:
   Version bump #48916 by Erinn Looney-Triggs.
 
-  12 May 2004; Bryan Østergaard <kloeri@gentoo.org> libgcrypt-1.1.94.ebuild:
+  12 May 2004; Bryan Østergaard <kloeri@gentoo.org> libgcrypt-1.1.94.ebuild:
   Add ~alpha.
 
   02 May 2004; Stephen P. Becker <geoman@gentoo.org> libgcrypt-1.1.94.ebuild:
@@ -156,7 +160,7 @@
 
 *libgcrypt-1.1.94 (02 May 2004)
 
-  02 May 2004; Bryan Østergaard <kloeri@gentoo.org> +libgcrypt-1.1.94.ebuild:
+  02 May 2004; Bryan Østergaard <kloeri@gentoo.org> +libgcrypt-1.1.94.ebuild:
   Version bump, bug #49610.
 
   29 Feb 2004; Jason Wever <weeve@gentoo.org> libgcrypt-1.1.92.ebuild:
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.2.1-ppc64-fix.patch b/dev-libs/libgcrypt/files/libgcrypt-1.2.1-ppc64-fix.patch
new file mode 100644
index 000000000000..2e515240cf28
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.2.1-ppc64-fix.patch
@@ -0,0 +1,14 @@
+--- mpi/config.links.orig	2005-11-25 21:37:25.000000000 -0600
++++ mpi/config.links	2005-11-25 21:39:37.000000000 -0600
+@@ -221,6 +221,11 @@
+ 	path="m68k/mc68020 m68k"
+ 	;;
+ 
++    powerpc64*-*-linux*)
++	mpi_sflags="-Wa,-mppc"
++	path="powerpc64"
++	;;
++
+     powerpc*-*-linux*)
+ 	echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h
+ 	echo '#define ELF_SYNTAX'               >>./mpi/asm-syntax.h
diff --git a/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild
index 5785be1ccae4..e39081a27a61 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild,v 1.18 2005/11/10 15:18:47 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild,v 1.19 2005/11/26 04:16:10 tgall Exp $
 
 inherit eutils
 
@@ -21,12 +21,17 @@ src_unpack() {
 	unpack ${A}
 	epunt_cxx
 
+	# fix for miss detection of 32 bit ppc
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ppc64-fix.patch
+
 	# Fix info file to make subsequent index entry work
 	cd ${S}/doc
 	epatch ${FILESDIR}/${P}-info-entry-fix.patch
 }
 
 src_compile() {
+	econf $(use ppc64) --disable-asm  || die
 	econf $(use_enable nls) --disable-dependency-tracking || die
 	emake || die
 }