Changing libexec dir to /usr/libexec/gnupg for better multilib friendliness. --disable-agent in the 1.9 versions.

6 files changed, 134 insertions, 25 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index b3a027bcffea..f59c1d8a1fe7 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.94 2005/01/04 20:55:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.95 2005/01/06 10:44:40 eradicator Exp $
+
+*gnupg-1.9.14 (06 Jan 2005)
+
+  06 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  gnupg-1.4.0-r1.ebuild, gnupg-1.9.10.ebuild, +gnupg-1.9.14.ebuild:
+  Changing libexec dir to /usr/libexec/gnupg for better multilib friendliness.
+  --disable-agent in the 1.9 versions.
 
 *gnupg-1.4.0-r1 (05 Jan 2005)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 84505cdaf7c9..32e77e0f34d7 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7e87eaf6b3aa4c753df6015adb6f433b ChangeLog 14415
+MD5 581ba4f2d100e2cf20592b771cad5a56 ChangeLog 14598
+MD5 59e01ef9a7fe57845f5424bc70534664 gnupg-1.9.10.ebuild 2911
 MD5 edc18da65abb2c4ea780b6f4820c9b1b gnupg-1.2.4.ebuild 4251
-MD5 d4f5b9c4a281906444ecf57321fa16f8 gnupg-1.2.6.ebuild 3677
+MD5 1b0ed1ecd151a84d5c164457348b396a gnupg-1.4.0-r1.ebuild 3301
 MD5 f060c73f6f74e7174b1f7d7c570421fe metadata.xml 572
-MD5 1b329ee5ea43a3f4b611da9a15acbfa0 gnupg-1.4.0-r1.ebuild 3293
-MD5 ee8dfcfec88f977c2a447f99d15967d9 gnupg-1.9.10.ebuild 2859
-MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
-MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
-MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 d4f5b9c4a281906444ecf57321fa16f8 gnupg-1.2.6.ebuild 3677
+MD5 59e01ef9a7fe57845f5424bc70534664 gnupg-1.9.14.ebuild 2911
+MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
+MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 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)
-
-iD8DBQFB2wLOmdTrptrqvGERAhe/AJwJpdg3k0C7ErBN+s5y6XRo97wx3wCgkkq3
-74nH7MMJU0VYJjoOkp3K+s4=
-=4jWp
------END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.14 b/app-crypt/gnupg/files/digest-gnupg-1.9.14
new file mode 100644
index 000000000000..63c90efe8d60
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.14
@@ -0,0 +1 @@
+MD5 72b56586392c7be6668df4ef8ea7c879 gnupg-1.9.14.tar.gz 1925582
diff --git a/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
index 634e1b220194..e30eb0bb4944 100644
--- a/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild,v 1.1 2005/01/04 20:55:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild,v 1.2 2005/01/06 10:44:40 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -103,14 +103,14 @@ src_compile() {
 		`use_with caps capabilities` \
 		`use_with readline` \
 		--enable-static-rnd=linux \
-		--libexecdir=/usr/lib \
+		--libexecdir=/usr/libexec \
 		--enable-sha512 \
 		${myconf} || die
 	emake || die
 }
 
 src_install() {
-	emake DESTDIR=${D} libexecdir="/usr/lib/gnupg" install || die
+	emake DESTDIR=${D} libexecdir="/usr/libexec/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 73e23af5d250..6183f6069dbc 100644
--- a/app-crypt/gnupg/gnupg-1.9.10.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.9 2004/12/31 14:50:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.10.ebuild,v 1.10 2005/01/06 10:44:40 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -58,7 +58,8 @@ src_compile() {
 	append-ldflags -Wl,-z,now
 
 	econf \
-		--libexecdir=/usr/lib \
+		--disable-agent \
+		--libexecdir=/usr/libexec \
 		`use_enable smartcard scdaemon` \
 		`use_enable nls` \
 		`use_enable ldap` \
@@ -69,7 +70,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} libexecdir="/usr/lib/gnupg" install || die
+	emake DESTDIR=${D} libexecdir="/usr/libexec/gnupg" install || die
 
 	dosym gpg2 /usr/bin/gpg
 
@@ -80,7 +81,6 @@ src_install() {
 
 	if ! use caps ; then
 		fperms u+s /usr/bin/gpg2
-		fperms u+s /usr/bin/gpg-agent
 	fi
 }
 
@@ -102,4 +102,6 @@ pkg_postinst() {
 	ewarn ""
 	ewarn "	Please see #37109"
 	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
+
+	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
 }
diff --git a/app-crypt/gnupg/gnupg-1.9.14.ebuild b/app-crypt/gnupg/gnupg-1.9.14.ebuild
new file mode 100644
index 000000000000..964528061d8f
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.9.14.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.14.ebuild,v 1.1 2005/01/06 10:44:40 eradicator 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/alpha/gnupg/${P}.tar.gz"
+
+LICENSE="GPL-2 idea? ( IDEA )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="X caps ldap nls smartcard static"
+
+RDEPEND="
+	!static? (
+		ldap? ( net-nds/openldap )
+		caps? ( sys-libs/libcap )
+		sys-libs/zlib
+	)
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	nls? ( sys-devel/gettext )
+	>=dev-libs/libgcrypt-1.1.42
+	>=dev-libs/libksba-0.9.7
+	smartcard? ( dev-libs/opensc )
+	virtual/libc
+	dev-lang/perl
+	dev-libs/pth
+	virtual/mta"
+DEPEND="caps? ( sys-libs/libcap )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	>=dev-libs/libgcrypt-1.1.94
+	>=dev-libs/libksba-0.9.7
+	>=dev-libs/libassuan-0.6.6
+	smartcard? ( dev-libs/opensc )
+	sys-libs/zlib
+	virtual/libc
+	dev-lang/perl
+	dev-libs/pth"
+
+src_compile() {
+	local myconf=""
+
+	if use X; then
+		local viewer
+		if has_version 'media-gfx/xloadimage'; then
+			viewer=/usr/bin/xloadimage
+		else
+			viewer=/usr/bin/xli
+		fi
+		myconf="${myconf} --with-photo-viewer=${viewer}"
+	else
+		myconf="${myconf} --disable-photo-viewers"
+	fi
+
+	append-ldflags -Wl,-z,now
+
+	econf \
+		--disable-agent \
+		--libexecdir=/usr/libexec \
+		`use_enable smartcard scdaemon` \
+		`use_enable nls` \
+		`use_enable ldap` \
+		`use_with caps capabilities` \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR=${D} libexecdir="/usr/libexec/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 ChangeLog INSTALL NEWS README THANKS TODO VERSION
+
+	if ! use caps ; then
+		fperms u+s /usr/bin/gpg2
+	fi
+}
+
+pkg_postinst() {
+	if ! use caps; then
+		einfo "gpg is installed suid root to make use of protected memory space"
+		einfo "This is needed in order to have a secure place to store your"
+		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
+	fi
+	echo
+	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
+	ewarn "	THIS IS _ALPHA_ CODE, IT MAY NOT WORK CORRECTLY OR AT ALL. THERE"
+	ewarn "	MAY BE UNDISCOVERED SECURITY OR DATA-LOSS ISSUES, DO NOT USE "
+	ewarn "	IN A PRODUCTION ENVIRONMENT."
+	ewarn ""
+	ewarn "	This ebuild is provided for those who wish to experiment with this"
+	ewarn "	new branch of gnupg and beta-testers, not for general purpose use"
+	ewarn "	by non-developers"
+	ewarn ""
+	ewarn "	Please see #37109"
+	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
+
+	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
+}