Added a workaround for some sparc32 machines that may have trouble building gnupg-1.2.3-r5 and adjusted copyright dates in ebuilds.

5 files changed, 26 insertions, 12 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 45118ad9ab06..c2b9b556eccf 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.45 2003/12/29 02:28:27 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.46 2004/01/02 21:00:09 weeve Exp $
+
+  02 Jan 2004; Jason Wever <weeve@gentoo.org> gnupg-1.2.3-r2.ebuild,
+  gnupg-1.2.3-r5.ebuild, gnupg-1.2.4.ebuild:
+  Added a workaround for some sparc32 machines that may have trouble building
+  gnupg-1.2.3-r5 and adjusted copyright dates in ebuilds.
 
   28 Dec 2003; Joshua Kinard <kumba@gentoo.org> gnupg-1.2.3-r5.ebuild:
   Move to mips stable (~mips -> mips)
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index a868c7a3a4ac..a166a9153cfa 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,10 +1,10 @@
-MD5 c64b30e8c882aa25024adc9c6d0ecf2e ChangeLog 7170
-MD5 b1b8b51a3ba07896162db22ca158d07d gnupg-1.2.3-r2.ebuild 1638
-MD5 c76eb332354e0f42435d3444ba849968 gnupg-1.2.3-r5.ebuild 3310
-MD5 b4fcf99de71ac7a6f90f5a06f8af695e gnupg-1.2.4.ebuild 3881
+MD5 61333de811e3862974b1e3650a9f49d2 ChangeLog 7420
+MD5 380a466f455cb1df109f76c333568976 gnupg-1.2.3-r2.ebuild 1635
 MD5 ad53378ee0bb633bb019209272913196 metadata.xml 484
+MD5 a2addb8ddf8b55e7f8f87b32cca0835c gnupg-1.2.4.ebuild 3880
+MD5 c0b9e64f13e4a576805ab567a4ea67e9 gnupg-1.2.3-r5.ebuild 3640
+MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r2 65
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r5 65
-MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
 MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554
 MD5 db3c4c4fe234f87d269216f6e0be8817 files/gnupg-1.2.3-hkp-format-string.diff 922
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
index e0be034d026c..e1deaeadecec 100644
--- a/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild,v 1.7 2003/11/15 03:17:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild,v 1.8 2004/01/02 21:00:09 weeve Exp $
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
index 5438f1e12ecd..d7a981e5b239 100644
--- a/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild,v 1.3 2003/12/29 02:28:27 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild,v 1.4 2004/01/02 21:00:09 weeve Exp $
 
 inherit eutils
 
@@ -31,6 +31,15 @@ DEPEND="caps? ( sys-libs/libcap )
 	virtual/glibc
 	dev-lang/perl"
 
+# Certain sparc32 machines seem to have trouble building correctly with 
+# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
+# fix until the gcc problem can be tracked down.
+
+if [ ${ARCH} = "sparc" -a ${PROFILE_ARCH} = "sparc" ]; then
+	inherit flag-o-matic
+	filter-flags "-mcpu=supersparc -mcpu=v8 -mcpu=v7"
+fi
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index 3681ca0c578a..ddfb7f46e37a 100644
--- a/app-crypt/gnupg/gnupg-1.2.4.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.3 2003/12/27 12:26:38 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.4 2004/01/02 21:00:09 weeve Exp $
 
 inherit eutils