PIC patch added thanks to Peter S. Mazinger <ps.m@gmx.net> in bug #74521

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 9b54a43572345a22b674840d9d677f5e36306b9c..7985b2b623be1ee26ef1bc3040f6f2e63457b5d6 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.87 2004/12/19 03:19:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.88 2004/12/31 02:28:18 dragonheart Exp $
+
+  31 Dec 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  gnupg-1.2.6.ebuild:
+  PIC patch added thanks to Peter S. Mazinger <ps.m@gmx.net> in bug #74521
 
 *gnupg-1.4.0 (19 Dec 2004)
 

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5a464472a9a647b62f08252e96e59315b0defa03..e6f77efa6665f93fed5364ba6b6486a26e3dc10b 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c06e156f480d786346a871c102694a7c ChangeLog 13322
+MD5 5e3da2d8ebb9447505f269c5e6107ac7 ChangeLog 13487
 MD5 1d62dab28c4ddd918308194f6dc0dce5 gnupg-1.4.0.ebuild 3064
 MD5 3adff76099e3de476d01abc70260ab0d gnupg-1.2.4.ebuild 4251
-MD5 bf8f03fb22b2f44fd5f6a4395ab001dd metadata.xml 483
-MD5 7558a8b6c29eed0f306317060eb09933 gnupg-1.2.6.ebuild 3598
+MD5 136d6f9c9a4996afc53fef6be3e0372d gnupg-1.2.6.ebuild 3697
+MD5 f060c73f6f74e7174b1f7d7c570421fe metadata.xml 572
 MD5 781e0467caebb4c9f05ba3e97f1c9b91 gnupg-1.9.10.ebuild 2859
 MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0 117
+MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
 MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
 MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
-MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 8c88d9fdef69bdda173170c5a8abd59e files/digest-gnupg-1.9.10 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBxPNLmdTrptrqvGERAowuAJ49H2R4JU/b/6bdN3OMA6klm+OpSQCeP9I0
-qwXMP8UUS+xslXAfbUfE2CE=
-=cXRJ
+iD8DBQFB1LlImdTrptrqvGERAkr+AJ91wuFiuihBvcOTtLJo2DHTynP5eACePKuK
+P1ZSezs+xTPVeDOP22PeIKs=
+=nQWj
 -----END PGP SIGNATURE-----

diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index 9f7be21ec381889aba86c8e998c771273b17bdbe..4b0b4eb1bafaf228ad6be824777a7336af9ed808 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.16 2004/12/07 12:54:06 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.17 2004/12/31 02:28:18 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -40,6 +40,9 @@ src_unpack() {
        fi
 
        use ppc64 && epatch ${FILESDIR}/gnupg-1.2.4.ppc64.patch
+       cd ${S}
+       sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
+       sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
 }
 
 src_compile() {
@@ -73,8 +76,6 @@ src_compile() {
        if use static; then
                myconf="${myconf} --with-included-zlib"
                append-ldflags -static
-       else
-               myconf="${myconf} --without-included-zlib"
        fi
 
        # Still needed?

diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index d98c2406b566e0a7d04de89a2793efc98d8e26a1..6bae8cf213c74842c9487be091838cd823084c8b 100644 (file)
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>crypto</herd>
+<maintainer>
+  <email>crypto@gentoo.org</email>
+  <name>Crypto Herd</name>
+</maintainer>
 <maintainer>
   <email>taviso@gentoo.org</email>
   <name>Tavis Ormandy</name>