Bump to EAPI=3, add prefix keywords

(Portage version: -svn/cvs/Linux i686)

4 files changed, 27 insertions, 23 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index fa132b08a437..681ccaf567c4 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.366 2010/03/10 18:55:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.367 2010/04/01 21:28:21 abcd Exp $
+
+  01 Apr 2010; Jonathan Callen <abcd@gentoo.org> gnupg-1.4.10.ebuild,
+  gnupg-2.0.14.ebuild, gnupg-2.0.15.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
 *gnupg-2.0.15 (10 Mar 2010)
 
diff --git a/app-crypt/gnupg/gnupg-1.4.10.ebuild b/app-crypt/gnupg/gnupg-1.4.10.ebuild
index 71f0779f0cf4..3a2eb1ee211b 100644
--- a/app-crypt/gnupg/gnupg-1.4.10.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.10.ebuild,v 1.8 2009/10/28 18:30:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.10.ebuild,v 1.9 2010/04/01 21:28:21 abcd Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 bindist curl idea ldap nls readline selinux smartcard static usb zlib linguas_ru"
 #IUSE="bzip2 bindist curl ecc idea ldap nls readline selinux smartcard static usb zlib linguas_ru"
 
@@ -91,7 +91,7 @@ src_configure() {
 	use static &&append-ldflags -static
 
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable ldap) \
 		--enable-mailto \
 		--enable-hkp \
@@ -107,7 +107,7 @@ src_configure() {
 		$(use_with usb libusb /usr) \
 		$(use_enable static) \
 		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
+		--libexecdir="${EPREFIX}/usr/libexec" \
 		--enable-noexecstack \
 		CC_FOR_BUILD=$(tc-getBUILD_CC) \
 		${myconf}
@@ -117,7 +117,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
+	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html"
 
 	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
 		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP,faq.raw}
diff --git a/app-crypt/gnupg/gnupg-2.0.14.ebuild b/app-crypt/gnupg/gnupg-2.0.14.ebuild
index 510dd0785b18..b7b4a0d87048 100644
--- a/app-crypt/gnupg/gnupg-2.0.14.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.14.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.14.ebuild,v 1.8 2010/02/12 20:22:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.14.ebuild,v 1.9 2010/04/01 21:28:21 abcd Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
 
 COMMON_DEPEND_LIBS="
@@ -52,7 +52,7 @@ src_configure() {
 	use static && append-ldflags -static
 
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-symcryptrun \
 		--enable-gpg \
 		--enable-gpgsm \
@@ -78,8 +78,8 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc ChangeLog NEWS README THANKS TODO VERSION
 
-	mv "${D}usr/share/gnupg/help"* "${D}usr/share/doc/${PF}"
-	ecompressdir "/usr/share/doc/${P}"
+	mv "${ED}usr/share/gnupg/help"* "${ED}usr/share/doc/${PF}"
+	ecompressdir "/usr/share/doc/${PF}"
 
 	dosym gpg2 /usr/bin/gpg
 	dosym gpgv2 /usr/bin/gpgv
@@ -87,8 +87,8 @@ src_install() {
 	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
 	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
 	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${D}usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${D}usr/share/man/man1/gpgv.1"
+	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
+	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
 
 	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
 }
diff --git a/app-crypt/gnupg/gnupg-2.0.15.ebuild b/app-crypt/gnupg/gnupg-2.0.15.ebuild
index cfd4a0989cd4..d72662ebf6ca 100644
--- a/app-crypt/gnupg/gnupg-2.0.15.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.1 2010/03/10 18:55:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.2 2010/04/01 21:28:21 abcd Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
 
 COMMON_DEPEND_LIBS="
@@ -52,7 +52,7 @@ src_configure() {
 	use static && append-ldflags -static
 
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-symcryptrun \
 		--enable-gpg \
 		--enable-gpgsm \
@@ -78,8 +78,8 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc ChangeLog NEWS README THANKS TODO VERSION
 
-	mv "${D}usr/share/gnupg/help"* "${D}usr/share/doc/${PF}"
-	ecompressdir "/usr/share/doc/${P}"
+	mv "${ED}usr/share/gnupg/help"* "${ED}usr/share/doc/${PF}"
+	ecompressdir "/usr/share/doc/${PF}"
 
 	dosym gpg2 /usr/bin/gpg
 	dosym gpgv2 /usr/bin/gpgv
@@ -87,8 +87,8 @@ src_install() {
 	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
 	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
 	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${D}usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${D}usr/share/man/man1/gpgv.1"
+	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
+	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
 
 	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
 }