Fixed gpg-agent-info being ignored

(Portage version: 2.1.2-r4)

4 files changed, 120 insertions, 1 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 3a1e1b3ad404..2e68103b5a37 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.271 2007/01/28 19:04:24 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.272 2007/01/29 20:01:35 alonbl Exp $
+
+*gnupg-2.0.1-r3 (29 Jan 2007)
+
+  29 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnupg-2.0.1-agent.patch, +gnupg-2.0.1-r3.ebuild:
+  Fixed gpg-agent-info being ignored
 
   28 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> -gnupg-1.4.2.2.ebuild,
   -gnupg-1.4.4.ebuild, -gnupg-1.4.5.ebuild, -gnupg-1.4.5-r1.ebuild,
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3
new file mode 100644
index 000000000000..8adb116e6cf6
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3
@@ -0,0 +1,3 @@
+MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
+RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
+SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch b/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch
new file mode 100644
index 000000000000..8639ae26261a
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch
@@ -0,0 +1,15 @@
+diff -urNp gnupg-2.0.1.org/g10/call-agent.c gnupg-2.0.1/g10/call-agent.c
+--- gnupg-2.0.1.org/g10/call-agent.c	2006-10-04 16:49:27.000000000 +0200
++++ gnupg-2.0.1/g10/call-agent.c	2007-01-29 21:46:57.000000000 +0200
+@@ -87,7 +87,10 @@ start_agent (void)
+     return 0; /* fixme: We need a context for each thread or serialize
+                  the access to the agent. */
+ 
+-  infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
++  if (opt.gpg_agent_info != NULL)
++    infostr = opt.gpg_agent_info;
++  else
++    infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
+   if (!infostr || !*infostr)
+     {
+       const char *pgmname;
diff --git a/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..25ef9100b209
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild,v 1.1 2007/01/29 20:01:35 alonbl Exp $
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+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"
+IUSE="bzip2 X doc ldap nls openct pcsc-lite smartcard selinux"
+
+COMMON_DEPEND="
+	virtual/libc
+	>=dev-libs/pth-1.3.7
+	>=dev-libs/libgcrypt-1.2.0
+	>=dev-libs/libksba-1.0.0
+	>=dev-libs/libgpg-error-1.4
+	>=dev-libs/libassuan-1.0.1
+	bzip2? ( app-arch/bzip2 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	openct? ( >=dev-libs/openct-0.5.0 )
+	ldap? ( net-nds/openldap )
+	app-crypt/pinentry"
+
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-crypt/gpg-agent
+	!<=app-crypt/gnupg-2.0.1
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	virtual/mta
+	selinux? ( sec-policy/selinux-gnupg )
+	nls? ( virtual/libintl )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-2.0.1-bsd-make.patch"
+	epatch "${FILESDIR}/${P}-agent.patch"
+
+	AT_M4DIR="m4 gl/m4" eautoreconf
+}
+
+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 $(bindnow-flags)
+
+	econf \
+		--enable-symcryptrun \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-agent \
+		$(use_enable bzip2) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable nls) \
+		$(use_enable ldap) \
+		--disable-capabilities \
+		${myconf} \
+		|| die
+	emake || die
+	if use doc; then
+		cd doc
+		emake html || die
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog NEWS README THANKS TODO VERSION
+
+	dosym gpg2 /usr/bin/gpg
+	dosym gpgv2 /usr/bin/gpgv
+
+	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
+}
+