5 files changed, 42 insertions, 48 deletions
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
index 124c8abf2a83..470273002e21 100644
--- a/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
@@ -1,14 +1,14 @@
 # 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.11 2004/04/25 21:55:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild,v 1.12 2004/05/31 20:34:33 vapier Exp $
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha ~sparc hppa ia64"
+SLOT="0"
+KEYWORDS="x86 ~sparc alpha hppa ia64"
 IUSE="X zlib ldap nls"
 
 DEPEND="dev-lang/perl
@@ -32,7 +32,7 @@ src_compile() {
 	fi
 
 	econf ${myconf} --libexecdir=/usr/lib || die "econf failed"
-	emake
+	emake || die
 }
 
 src_install() {
@@ -40,8 +40,8 @@ src_install() {
 
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	docinto sgml
 	dodoc doc/*.sgml
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
index ba8da13294a5..56ef54dd2c47 100644
--- a/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
@@ -1,14 +1,15 @@
 # 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.8 2004/03/13 12:37:49 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild,v 1.9 2004/05/31 20:34:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64"
 IUSE="X ldap nls static caps"
 
@@ -20,7 +21,6 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	virtual/glibc
 	dev-lang/perl
 	virtual/mta"
-
 # XXX: libpcap earlier than 1.10-r3 did not provide libcap.a
 #	DEPEND="caps? ( static? ( >=sys-libs/libcap-1.10-r3 )
 #				!static? ( sys-libs/libcap ) )
@@ -31,14 +31,6 @@ 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" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-	filter-flags "-mcpu=supersparc -mcpu=v8 -mcpu=v7"
-fi
-
 src_unpack() {
 	unpack ${A}
 
@@ -57,6 +49,13 @@ src_unpack() {
 }
 
 src_compile() {
+	# 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" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags "-mcpu=supersparc -mcpu=v8 -mcpu=v7"
+	fi
+
 	# support for external HKP keyservers requested in #16457.
 	# gpg faq entry 3.3 reccommends using --enable-static-rnd=linux 
 	# whenever possible.
@@ -106,8 +105,8 @@ src_install() {
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	newdoc ${FILESDIR}/${P}-disable-elgamal.diff README.elgamal
 
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index ef3dc89cfa18..1921fe61349c 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-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.17 2004/04/28 22:05:18 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.18 2004/05/31 20:34:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -8,11 +8,10 @@ DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
 	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )"
-SLOT="0"
 
 LICENSE="GPL-2 | IDEA GPL-2"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~mips"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64"
 IUSE="X ldap nls static caps idea"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
@@ -23,7 +22,6 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
 	virtual/glibc
 	dev-lang/perl"
-
 # XXX: libpcap earlier than 1.10-r3 did not provide libcap.a
 #	DEPEND="caps? ( static? ( >=sys-libs/libcap-1.10-r3 )
 #				!static? ( sys-libs/libcap ) )
@@ -35,14 +33,6 @@ 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" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-	filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-fi
-
 src_unpack() {
 	unpack ${A}
 
@@ -59,6 +49,13 @@ src_unpack() {
 }
 
 src_compile() {
+	# 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" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
+	fi
+
 	# support for external HKP keyservers requested in #16457.
 	local myconf="--enable-external-hkp --enable-static-rnd=linux --libexecdir=/usr/lib --enable-sha512"
 
@@ -106,8 +103,8 @@ src_install() {
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	use idea && dodoc ${S}/cipher/idea.c
 
diff --git a/app-crypt/gnupg/gnupg-1.9.0.ebuild b/app-crypt/gnupg/gnupg-1.9.0.ebuild
index 17b304e8782c..f0c55c34e084 100644
--- a/app-crypt/gnupg/gnupg-1.9.0.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.0.ebuild
@@ -1,16 +1,16 @@
 # 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.9.0.ebuild,v 1.4 2004/04/25 03:40:11 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.0.ebuild,v 1.5 2004/05/31 20:34:33 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2 | GPL-2 IDEA"
 
-KEYWORDS="~x86 ~alpha ~mips"
+LICENSE="GPL-2 | GPL-2 IDEA"
+SLOT="0"
+KEYWORDS="~x86 ~mips ~alpha"
 IUSE="X ldap nls caps"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
@@ -24,7 +24,6 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	dev-lang/perl
 	dev-libs/pth
 	virtual/mta"
-
 DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
@@ -75,8 +74,8 @@ src_install() {
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO VERSION \
+		doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	if ! use caps; then
 		chmod u+s "${D}/usr/bin/gpg"
diff --git a/app-crypt/gnupg/gnupg-1.9.8.ebuild b/app-crypt/gnupg/gnupg-1.9.8.ebuild
index 4ca1cacb14eb..a9721967d7f5 100644
--- a/app-crypt/gnupg/gnupg-1.9.8.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.8.ebuild
@@ -1,16 +1,16 @@
 # 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.9.8.ebuild,v 1.2 2004/05/05 17:43:05 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.8.ebuild,v 1.3 2004/05/31 20:34:33 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2 | GPL-2 IDEA"
 
-KEYWORDS="~x86 ~alpha ~mips"
+LICENSE="GPL-2 | GPL-2 IDEA"
+SLOT="0"
+KEYWORDS="~x86 ~mips ~alpha"
 IUSE="X ldap nls caps"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
@@ -24,7 +24,6 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	dev-lang/perl
 	dev-libs/pth
 	virtual/mta"
-
 DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
@@ -75,8 +74,8 @@ src_install() {
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO VERSION \
+		doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	if ! use caps; then
 		chmod u+s "${D}/usr/bin/gpg"