Compile fix for ppc-macos.

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index e2dcbb30c729db47d4dbee211fd2af2770a9a3d3..5fa6c6dfc7149b0fde731d84b9f3cb0b789373a4 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.84 2004/10/19 17:40:50 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.85 2004/11/09 20:15:26 usata Exp $
+
+  10 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> gnupg-1.2.6.ebuild:
+  Compile fix for ppc-macos.
 
   19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> gnupg-1.2.6.ebuild:
   Stable on alpha.

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index d517b348cb6073dae70ef2d993d2a782ec2c86fa..0d82d22e1f8b77703845e10d0cd353b69d7fd799 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,10 +1,20 @@
-MD5 25ded39fb174a7830ed8ade9fc357407 ChangeLog 12715
-MD5 bf8f03fb22b2f44fd5f6a4395ab001dd metadata.xml 483
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 4c15c3113b9eec0264e56fb41143d643 gnupg-1.2.4.ebuild 4180
+MD5 d679aba1a6a66c90876c0a85bfc25c68 gnupg-1.2.6.ebuild 3555
 MD5 5cd60c754cd56f9c2572d8a4327f654b gnupg-1.9.10.ebuild 2807
-MD5 cd409aa45c97bae3e14c0777ec5f75d6 gnupg-1.2.6.ebuild 3555
+MD5 829845fe719b80aa8ca317a107c3c270 ChangeLog 12813
+MD5 bf8f03fb22b2f44fd5f6a4395ab001dd metadata.xml 483
 MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
+MD5 8c88d9fdef69bdda173170c5a8abd59e files/digest-gnupg-1.9.10 65
 MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
 MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
-MD5 8c88d9fdef69bdda173170c5a8abd59e files/digest-gnupg-1.9.10 65
-MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (Darwin)
+
+iD8DBQFBkSVqVWNWqTUmv+0RApUhAJ9aDIYlfz8QzTcZaASmWxixEnNIJgCfSVEb
+yWQLoT73hl3tXpPk6/K3m2k=
+=emdH
+-----END PGP SIGNATURE-----

diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index a26ab613b4c67516bd045ca3dc91f7f5ade9280e..ffb901bd3b5ddee251ac5251aef6a610bd0c8cd7 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.2.6.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.6.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/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.14 2004/10/24 05:31:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.15 2004/11/09 20:15:26 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,7 +17,7 @@ IUSE="X ldap nls static idea"
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
                        app-arch/bzip2
                        sys-libs/zlib )
-               !ppc-macos? ( X? ( || ( media-gfx/xloadimage media-gfx/xli ) ) )
+               X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
                nls? ( sys-devel/gettext )
                dev-lang/perl
                virtual/libc
@@ -83,7 +83,7 @@ src_compile() {
                myconf="${myconf} --enable-m-guard"
        fi
 
-       append-ldflags -Wl,-z,now
+       use ppc-macos || append-ldflags -Wl,-z,now
 
        econf ${myconf} || die
        emake || die