address bug #90211 for ppc64

Package-Manager: portage-2.0.51.22-r3

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 14a289c7b857d61021b6de0d63c3064a4e83ad6e..b9b0746c247ea377a68f8ad6541c9e66fbd8628d 100644 (file)
--- 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 Ã\83Â\83Ã\82Â\98stergaard <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 Ã\83Â\83Ã\82Â\98stergaard <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 Ã\83Â\83Ã\82Â\98stergaard <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 Ã\83Â\83Ã\82Â\98stergaard <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/Manifest b/dev-libs/libgcrypt/Manifest
index 849b408499a681ee736c7b7e7db028c357505bb8..ea9ad7556ef8559aea6a6dc261fe544fd18233ed 100644 (file)
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,18 +1,19 @@
-MD5 9c6930570e9e78d47a815ed5300c6144 libgcrypt-1.2.2-r1.ebuild 1151
-MD5 12f2bb1634231d638334fbe3fcfe20ce libgcrypt-1.2.1-r1.ebuild 1215
-MD5 21741207a7c0ecd2d33aa8049e2eafae libgcrypt-1.2.1.ebuild 1144
+MD5 ae75c377a3f16c025d04020a218afbd8 ChangeLog 9574
+MD5 e04ce4b3ccafdf1cdc3e2069a75ac11c libgcrypt-1.1.12.ebuild 1123
 MD5 aac9d14d38568a9aab54928cc3e05a5c libgcrypt-1.1.94.ebuild 992
 MD5 dd3b6ee3caf7dc34c0ffa5758993c72a libgcrypt-1.2.0.ebuild 1050
-MD5 e04ce4b3ccafdf1cdc3e2069a75ac11c libgcrypt-1.1.12.ebuild 1123
-MD5 22f72521d7cc1d1352b6caa053cd5ea7 ChangeLog 9433
-MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
+MD5 12f2bb1634231d638334fbe3fcfe20ce libgcrypt-1.2.1-r1.ebuild 1215
+MD5 7dc93eccc7b1d3187503d3316fc5c449 libgcrypt-1.2.1.ebuild 1277
+MD5 9c6930570e9e78d47a815ed5300c6144 libgcrypt-1.2.2-r1.ebuild 1151
 MD5 27ec73eb30a43599906954d2fbf18b22 libgcrypt-1.2.2.ebuild 1121
-MD5 1c871fcf508869ff09d46782655c3ca5 files/digest-libgcrypt-1.2.1-r1 67
-MD5 72e64d81017126496070072ae2f3421b files/digest-libgcrypt-1.2.2-r1 67
+MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 MD5 9bf9811b5db655640e7f280bb9bab24c files/digest-libgcrypt-1.1.12 68
 MD5 9f546283fe69d56096f3707d52a4668a files/digest-libgcrypt-1.1.94 68
 MD5 16b1f5ae3cd2e7678379e1c6be616455 files/digest-libgcrypt-1.2.0 67
 MD5 1c871fcf508869ff09d46782655c3ca5 files/digest-libgcrypt-1.2.1 67
+MD5 1c871fcf508869ff09d46782655c3ca5 files/digest-libgcrypt-1.2.1-r1 67
 MD5 72e64d81017126496070072ae2f3421b files/digest-libgcrypt-1.2.2 67
-MD5 bd80e49e664820c114b28f832dd23e1c files/libgcrypt-1.2.1-info-entry-fix.patch 318
+MD5 72e64d81017126496070072ae2f3421b files/digest-libgcrypt-1.2.2-r1 67
 MD5 af5915592167ae4fd16bab42364d3c8a files/libgcrypt-1.2.1-GNU-stack-fix.patch 22394
+MD5 bd80e49e664820c114b28f832dd23e1c files/libgcrypt-1.2.1-info-entry-fix.patch 318
+MD5 66effa36b401f2dfc6de7dec7c612f8a files/libgcrypt-1.2.1-ppc64-fix.patch 401

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 (file)
index 0000000..2e51524
--- /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 5785be1ccae492387b4bc249702c7d8a6ececf12..e39081a27a613ad5408c6e0ff54a748461de66d8 100644 (file)
--- 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
 }