Fixed gpg-agent-info being ignored

Package-Manager: portage-2.1.2-r4

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 3a1e1b3ad404658bf7ce1345c17f93d19177d69e..2e68103b5a37aa47de1aa70583afed700b536cfb 100644 (file)
--- 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/Manifest b/app-crypt/gnupg/Manifest
index 523153da07e8c47a5179fdc30056862e80343078..56410c0ca8ea35124507a50c6f9e6bd857d07356 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -74,6 +74,10 @@ AUX gnupg-1.9.94-make.patch 526 RMD160 2baeb8cdde34e9cb5b9fde85dabde59cc2b07b7b
 MD5 2f2c134892f2a35adc9124b819cccb8a files/gnupg-1.9.94-make.patch 526
 RMD160 2baeb8cdde34e9cb5b9fde85dabde59cc2b07b7b files/gnupg-1.9.94-make.patch 526
 SHA256 43b68e5a4c77083a4c1a2a68b8b6d0e8ef895d8682e4aa4244a71732c286ab33 files/gnupg-1.9.94-make.patch 526
+AUX gnupg-2.0.1-agent.patch 650 RMD160 cb33eaabb9d60a04c63963e46f18cfd38d09de13 SHA1 91e20bbbaaf11f1befebe71e2cb49646d3fe7e84 SHA256 94c4c2793d0f696672dba87825faf94fa0203ba917569ac2725d657f176e1a1c
+MD5 76cbdae82b05274e55d27bd975086504 files/gnupg-2.0.1-agent.patch 650
+RMD160 cb33eaabb9d60a04c63963e46f18cfd38d09de13 files/gnupg-2.0.1-agent.patch 650
+SHA256 94c4c2793d0f696672dba87825faf94fa0203ba917569ac2725d657f176e1a1c files/gnupg-2.0.1-agent.patch 650
 AUX gnupg-2.0.1-bsd-make.patch 6960 RMD160 694eaf6b2b12eb6aa5e425ca48fd37064ce371f2 SHA1 a6ce2d94be3b305918143da06cc8cf4564c41f64 SHA256 cfac92c65ed1b8efa1927b8194eea62f7e45fadded559028a7072cc0685d29a3
 MD5 30c96069403e772fc6bd777d0622dd9f files/gnupg-2.0.1-bsd-make.patch 6960
 RMD160 694eaf6b2b12eb6aa5e425ca48fd37064ce371f2 files/gnupg-2.0.1-bsd-make.patch 6960
@@ -124,14 +128,18 @@ EBUILD gnupg-2.0.1-r2.ebuild 2148 RMD160 cf716592e930f16f84932a43bb20bc8134cbaee
 MD5 7aaf0b60f2ec1093ece1d5584e64bba1 gnupg-2.0.1-r2.ebuild 2148
 RMD160 cf716592e930f16f84932a43bb20bc8134cbaee6 gnupg-2.0.1-r2.ebuild 2148
 SHA256 8e2c2c5948a4d8c0689e09c736c81fffd7b7a78ef36ee105b6dbaeafc905224e gnupg-2.0.1-r2.ebuild 2148
+EBUILD gnupg-2.0.1-r3.ebuild 2189 RMD160 2b78a6d0414158781e6af61594edc1c1b23e8d0c SHA1 ed19e0fa6ecdc7268fd10cf356016d7ecfd6a6c2 SHA256 40925a1aa96b1093789feb39cf7009d6c0a55d435c7b87001dcddd7429132ea1
+MD5 e3a6063cc33cb9a6b00b7367ae58c6ac gnupg-2.0.1-r3.ebuild 2189
+RMD160 2b78a6d0414158781e6af61594edc1c1b23e8d0c gnupg-2.0.1-r3.ebuild 2189
+SHA256 40925a1aa96b1093789feb39cf7009d6c0a55d435c7b87001dcddd7429132ea1 gnupg-2.0.1-r3.ebuild 2189
 EBUILD gnupg-2.0.1.ebuild 2372 RMD160 59454bf9fbd791580892ae03dbd7bffa8cc5c9fa SHA1 b42971cd29c1cd0064cc4255c536870e94736893 SHA256 c17f8c88a028ae39ee153406ac5ec78fcddfffbcce2d56d372e41c0489ec9eb0
 MD5 3a9806610a9a92067b4cc68f56bcb09c gnupg-2.0.1.ebuild 2372
 RMD160 59454bf9fbd791580892ae03dbd7bffa8cc5c9fa gnupg-2.0.1.ebuild 2372
 SHA256 c17f8c88a028ae39ee153406ac5ec78fcddfffbcce2d56d372e41c0489ec9eb0 gnupg-2.0.1.ebuild 2372
-MISC ChangeLog 42192 RMD160 0cabaa67eba07c9ac1c908e2d82e6a51597f0ab3 SHA1 b871188bd492c651e295d2185c8cbbe2fe364f0c SHA256 f3269b580004430ddf8885c48edbf322d3b61248868da11132bace479316825d
-MD5 00461bc76aa7492dbc8dcf66b5c3e2f8 ChangeLog 42192
-RMD160 0cabaa67eba07c9ac1c908e2d82e6a51597f0ab3 ChangeLog 42192
-SHA256 f3269b580004430ddf8885c48edbf322d3b61248868da11132bace479316825d ChangeLog 42192
+MISC ChangeLog 42367 RMD160 8f519a4ff113d59a1c058d73b71f1b85e9d1ca2a SHA1 e39b75b262f489c4a00e756d4b08304d82f7c7e6 SHA256 361298371e5201c33fcd38fefe15715216f5466f8c2822640952a5ab4d46042c
+MD5 989accf34ba89f239536ab95fd675be1 ChangeLog 42367
+RMD160 8f519a4ff113d59a1c058d73b71f1b85e9d1ca2a ChangeLog 42367
+SHA256 361298371e5201c33fcd38fefe15715216f5466f8c2822640952a5ab4d46042c ChangeLog 42367
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -166,3 +174,6 @@ SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/di
 MD5 973de8c9666fa149d0e9ea04d8490f2d files/digest-gnupg-2.0.1-r2 241
 RMD160 24b2ba2a4d33e0f2b910169e8b093caca64d1256 files/digest-gnupg-2.0.1-r2 241
 SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/digest-gnupg-2.0.1-r2 241
+MD5 973de8c9666fa149d0e9ea04d8490f2d files/digest-gnupg-2.0.1-r3 241
+RMD160 24b2ba2a4d33e0f2b910169e8b093caca64d1256 files/digest-gnupg-2.0.1-r3 241
+SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/digest-gnupg-2.0.1-r3 241

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 (file)
index 0000000..8adb116
--- /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 (file)
index 0000000..8639ae2
--- /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 (file)
index 0000000..25ef910
--- /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
+}
+