Fixed bug #72008 and a few other QA faults. Readded missing keywords to 1.2.6

4 files changed, 19 insertions, 10 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 5fa6c6dfc714..5e24b28341ba 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.85 2004/11/09 20:15:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.86 2004/12/07 12:54:06 dragonheart Exp $
+
+  07 Dec 2004; Daniel Black <dragonheart@gentoo.org> gnupg-1.2.4.ebuild,
+  gnupg-1.2.6.ebuild, gnupg-1.9.10.ebuild:
+  Fixed bug #72008 and a few other QA faults. Readded missing keywords to 1.2.6
+  and ppc tested and keyworded it
 
   10 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> gnupg-1.2.6.ebuild:
   Compile fix for ppc-macos.
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index 38eb93cfc947..86b66f2ee06a 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 Foundation
 # 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.24 2004/10/21 02:50:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.25 2004/12/07 12:54:06 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -95,12 +95,14 @@ src_compile() {
 		myconf="${myconf} --enable-m-guard"
 	fi
 
+	append-ldflags -Wl,-z,now
+
 	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-	einstall libexecdir="${D}/usr/lib/gnupg"
+	emake DESTDIR=${D} libexecdir="/usr/lib/gnupg" install || die "install failed"
 
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index ffb901bd3b5d..9f7be21ec381 100644
--- 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.15 2004/11/09 20:15:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.16 2004/12/07 12:54:06 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
 
 LICENSE="GPL-2 idea? ( IDEA )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc-macos s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~ppc-macos s390 sparc x86 ~ia64 ~mips ~ppc64"
 IUSE="X ldap nls static idea"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
@@ -90,7 +90,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall libexecdir="${D}/usr/lib/gnupg" || die
+	emake DESTDIR=${D} libexecdir="/usr/lib/gnupg" install || die
 
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
diff --git a/app-crypt/gnupg/gnupg-1.9.10.ebuild b/app-crypt/gnupg/gnupg-1.9.10.ebuild
index b803f56b6341..3118cce6629d 100644
--- a/app-crypt/gnupg/gnupg-1.9.10.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.10.ebuild
@@ -1,8 +1,8 @@
 # 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.9.10.ebuild,v 1.7 2004/10/24 05:31:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.10.ebuild,v 1.8 2004/12/07 12:54:06 dragonheart Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
@@ -55,6 +55,8 @@ src_compile() {
 		myconf="${myconf} --disable-photo-viewers"
 	fi
 
+	append-ldflags -Wl,-z,now
+
 	econf \
 		--libexecdir=/usr/lib \
 		`use_enable smartcard scdaemon` \
@@ -67,14 +69,14 @@ src_compile() {
 }
 
 src_install() {
-	einstall libexecdir="${D}/usr/lib/gnupg" || die
+	emake DESTDIR=${D} libexecdir="/usr/lib/gnupg" install || die
 
 	dosym gpg2 /usr/bin/gpg
 
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO VERSION
+	dodoc ChangeLog INSTALL NEWS README THANKS TODO VERSION
 
 	if ! use caps ; then
 		fperms u+s /usr/bin/gpg2