Fix build when ldap useflag is not set, bug #546348

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xFED5002857C1ABFA!

4 files changed, 266 insertions, 13 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index babae99349ba..da5d8ad7d092 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.591 2015/04/12 14:50:03 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.592 2015/04/13 16:53:46 k_f Exp $
+
+  13 Apr 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/gnupg-2.1.3-dirmngr-no-ldap.patch, gnupg-2.1.3.ebuild:
+  Fix build when ldap useflag is not set, bug #546348
 
   12 Apr 2015; Kristian Fiskerstrand <k_f@gentoo.org> gnupg-2.1.3.ebuild:
   Remove --enable-agent from ebuild as this is a hard requirement in 2.1 and the
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 4da507869dae..0e2eae1748eb 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -6,6 +6,7 @@ AUX gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch 895 SHA256 063f50e829
 AUX gnupg-2.0.26-misc-cve.patch 3201 SHA256 d0f16d14da9868b79d17fa49ff284ec05fb45ef61f35c864bde9e38dc7539de2 SHA512 bb2860e5d8bb1567238e25d05cda7cb76557fa43dca3b8e802f7b4664e9b46e10187f2cbb76d1bcea5816d14c936d704fd606bdf125855ef3401b08412ac1fed WHIRLPOOL eefd707be37662bccd63d671496c79b30a07c13fb7497562887c678495020c382b5fb664ec8d5c76c45077fd6cfe36d4fc33f804b544f0efd042f6eaa5d2ed36
 AUX gnupg-2.1.1-misc-cve.patch 3548 SHA256 cef5fabc9b02366a33ed79e35b887fcb47e1d46f674f787da11e09b2ec8e5801 SHA512 9616ba2cdc513bc4982a2d66e1e06dcea6e52abba1e14033ab179e19b84ebaf43c60c3d3238ce38c7517c8fc4478570c0ea37f9e23f519d00bb720263d64e5dc WHIRLPOOL 2ab9c19edd012c4267d30aaf38f0880ea3cac2cf1f222cc37a883f69e839cd50486d3f4bd23fb191d3a97ed5557040088d764fa78acdf5eb9982937d1199eee3
 AUX gnupg-2.1.3-dirmngr-Fix-segfault-in-ldap-engine.patch 962 SHA256 d762d7ca1bf850203e24ec1d3151fb3df1b1e368b3cb80ec884cdd6b716e0273 SHA512 602cd338abb7897c6b101ec1644e137880baab2bf35ab0c4b21b439548b3ccb04f8f63c45afb4da89d88200c3402a64e67c3b3845f76e01a42c82f99e20efb30 WHIRLPOOL 3c7d1a29a8f43e2a29d871853ce0042e24df522abc26bd3342874abb8053b735fdc2ffefc3c4686fe82f45f98608914c3f899fba6545f58af8e58da6648a5483
+AUX gnupg-2.1.3-dirmngr-no-ldap.patch 7476 SHA256 d210eb26f0853547948d46e391eb5cbf02ec99fe216238d2475cf478da154f64 SHA512 64176f4158540b64a1c8ddcc1535869a62eff7eb02bd161eb93434288b4bebe123d66ef03b61745c5741ba11eb9ffdce25da80eea4aa8afa18858755a015387d WHIRLPOOL e312ed8de95e0edcbc0eebc46907a0c90b8d872074920fc2a3d80581e30bef8c569e9b70798ad64a638965b1b34803e5acb343c557f195bcd4a6cf440fdb0e88
 DIST gnupg-1.4.18.tar.bz2 3649557 SHA256 b7b5fdda78849955e0cdbc5a085f3a08f8b7fba126c622085debb62def5d6388 SHA512 f9619ede8e0d2844774e07fb42359444c5ab8e15565a87f419f76cc3d781940c564f35f429131686fdd7559c5c2edb49506b3c0a1feecbd95438743075be3e63 WHIRLPOOL 780876be0603fd0605b192721e2bbb770ad67d98acba8ef0fd769ab3241467696da5f49a189d89600d076691bf2cedb1294ffade5c44f6d24512d6a93a6f8981
 DIST gnupg-1.4.19.tar.bz2 3713811 SHA256 7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86 SHA512 cce2a83efb05f963ad0f8afd04999cc852889d46b4cad4cf399a37fd6e69f0911a5ccaa0192cb891a941cfa93125349b481efa789a127e3c0aa2c5ba53672741 WHIRLPOOL 14eaddca0981f05757aa0751b9563837efd3f5943a422d5f29e0de94eb6233b85b8848a1f4816ab7e897d6e656c7c08705115d53ed89f554604ffd2009c3c39f
 DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
@@ -15,16 +16,16 @@ EBUILD gnupg-1.4.18.ebuild 3763 SHA256 37cedb3946b555e83111f5096b3dd73f950617597
 EBUILD gnupg-1.4.19.ebuild 3472 SHA256 e2d789f8ddd23866340e7e2cd450e7d7c51ea135e403571ec00873e85e04a4a1 SHA512 e4b5eb1b1d03762528464596316e433ec2b01330cd76ce5a7d7006ba77f8b7dda2d15e66f8574803a229fb5f543c587fe01b82ad981bb7a26c7ad7c2d86d7f7e WHIRLPOOL 9452157d05e9fc515af5b1d71bc14c820ac09337d6b3ac5ff66bca45a7de1ea50958f42bfdc6aee3f27e2596997efe36a473e7053bd904e144c73c3fbbc3a17e
 EBUILD gnupg-2.0.26-r3.ebuild 4889 SHA256 d68393d52300de25451d6e732c7c10484f31283b560988e4992e9ac8fed0874a SHA512 5cc4f633741c32f244aa43eb4606a339e9de7b0d7ceb6cc38bdc985293efc605abcaafe438d0d60250d30f1cf7923a92a093d854f2abb28b302a8ff385b4cfc9 WHIRLPOOL 3d5df13d06a20c6cb53ca9259a416e7f0fc6490331d19ba4b98508d1dd18ddbcfe19913ce0a8fb61071c5a4ed38e8d9dca68b79f22ceb97890ce8236dd2e739c
 EBUILD gnupg-2.0.27.ebuild 4782 SHA256 5453bd69096075d8866a4877b6dbc3efa03a85ae8cbee63ff72269741749545e SHA512 6fa97736a7995c4f6a0095453bfdc0a627c9915da1e7442a65933532aa2ec7d21fdc69ae1cc1b32147731927eaa3cd1716715fdc8dcd969956201649a9da23ce WHIRLPOOL f9f7fe16b87194311f24f9699c561248faec2600fb632a9bd14a205e5ba8092826c7167e895968ea516d6b260f5bc618faf412cd5e5df0198d04891f7ad2c4f1
-EBUILD gnupg-2.1.3.ebuild 4656 SHA256 482d2c9ad4140f45e0af6cd298ca796c5857f343434b65d58fada8268aea83b6 SHA512 9d0d4eee829014875226800645a23a0b33616a3c44578d55fefdc87f2437766990d1da909a1ba1ec82048c9e91e660d02a87be2ec0aa22e1f84ebb65bf456945 WHIRLPOOL fd923fc5161ba78a44895071b9037b85fc505b9e20aba112fafb0bf9323803e8fe4041d38f8e323633ce5ffdc2fb3670695528721a01654de3bbeb2f3968fd42
-MISC ChangeLog 86367 SHA256 b7b68097f946a01c44507c39223ede2cf5b856082d1dba16ae7ad66d396e0e79 SHA512 9014c4c8f9e4dbe218e56db2d2bd7886a3e38f0cc65e0501e49778f1643d89e906da559ee0fcfd8feb98fbebf79845c100330604d24c5c5869c5ddc3a28eb68b WHIRLPOOL 8ce4b6f6a186aa9d5847baa5665566783df76d84d15c9c28d3aab82cd6073a85b2719c67a9032fcddd6185027acbd5d494d013a95fcfeeeaa19bc3721bb47a3a
+EBUILD gnupg-2.1.3.ebuild 4735 SHA256 af133aca5253c1783165bd59acdd79b6de96c15fe969361045122426f3998002 SHA512 0b15f4582a64202e7664888a37d79c6b0aacd842ee72d0b2eb90db067f8880fccafc10c3f67db2bac74ebe9770daa236664f52b1d43ed7029b8c54fbad829823 WHIRLPOOL 7568172ba811738ac0d0ab65a4012c2c4b8da9215dddf4c6f71bd09cae2e7cf27b16aa0a231c9e7736b8f502bff8c906aadd5f1eeff65a1927016276ed3ed92a
+MISC ChangeLog 86540 SHA256 0c41458c08b60f2abb9315357d04a70c02da219adea384f481670e3ac8b35317 SHA512 a0976f9414c8fc4b06c23cfb5a3c25929d64a1ff22b545e0a95d5f6b3934b57320db2cbd73051b19980d530620ace47e1d7dad313e27866791c342e30d766a26 WHIRLPOOL d7bba8d12d01fb64daa770ec4bf2ff19d3233fe64372d35b7282443d4c840e19868f65b6fcfbeadcd968b37d2e022d9b0333e5d04279a90e3701a5bf4c9f2947
 MISC metadata.xml 1032 SHA256 cbef1621eb1364c8d12ac18e71cf4aabfced9ecd3c990a3f3cdf066902dc97bb SHA512 5e2ef4380effe027a0b0b8a11a29ed1996b3b5256ee333909d4a7cfcb18ea1e9dead9b8303c7dffc1ad10014dea79e827b1d84caa92294f4d3dfc29ff23a6af5 WHIRLPOOL a24c7f71ed140f34dd59b10314869d0c5482063be20faefa1591595feb856c79bc57a6b344dd467875cf3389d8cd14e2d41f2312f51d3b77dcbe27af97b7f129
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAEBCAAGBQJVKoYdAAoJEP7VAChXwav6JYEH/3pztAiRDDiOFWm2x37N4USX
-lJbxB7wbj8gLnOlWo8hnYkkV0GdAh3al2boTuqdJhnOv2qdWXO4/XHB269n62jMv
-jTiAp+dpgvFsha2n68C5XrR4EGI+SLsC34SCWvm1B5qZrfC/STxN43W5nKqFSzoe
-Dca3d4euxESB9Eb/cUXrMPUgZ0pmhOO773fKO+b+B6ld4xQUqfS9ByPET4M4QDCo
-A481kb0dGYgeBGF3Wobuzjz8oqe4oSCOXDr3XPrCpCxm7f8R+XiyUF0dXgmId0JZ
-UN18zJxVmKzCMenHsiZ0SjlVcJergYOWeMFLOPo99bJY1zdvg8OmTtjawa6TU3k=
-=S8bA
+iQEcBAEBCAAGBQJVK/SbAAoJEP7VAChXwav66j4IALrfk3NuXmAVIkUu6w52dGwW
+wOnYU4ndl6lqTL1jcr+woxQcOj40uixVxlAQtIXCutDGDaWJKzJb5wzhJqwqD9Kj
+FQtga2hudzxd1vVrMFeUfM5jd0B5X1/H21PDZzI8r4AjQU48aGp0/n7Z1lyPb+LA
+XeaD4r/4vq76smmM7PsWoCpN3oIZRC1ztPMK5h5Ksh7CI9BpwfhIUJ5UUZepcIEg
+D7gao5ypHHgiC11GK5P9kGC7h7ctyO3S8LVNStFqKFiBiGhqDvWNNyMZVP7YOHjZ
+gjOc1ZXIrR08Q2rL/SBOzJV22yAdob1lWfN00I+8zSgJ+6Igs/qNgHAhBbXPfJw=
+=NnIF
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/gnupg-2.1.3-dirmngr-no-ldap.patch b/app-crypt/gnupg/files/gnupg-2.1.3-dirmngr-no-ldap.patch
new file mode 100644
index 000000000000..441fa1ae4ca0
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.1.3-dirmngr-no-ldap.patch
@@ -0,0 +1,246 @@
+From 5cde5bf37339cdeb0bd0a33d39477382eafebede Mon Sep 17 00:00:00 2001
+From: "Neal H. Walfield" <neal@g10code.com>
+Date: Mon, 13 Apr 2015 12:02:40 +0200
+Subject: [PATCH 1/1] dirmngr: If LDAP is not enable, don't build the LDAP
+ bits.
+
+* dirmngr/Makefile.am (dirmngr_SOURCES): Only include
+ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
+is TRUE.
+(module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
+* dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+TRUE.
+(ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
+TRUE.
+(ks_action_search): Likewise.
+(ks_action_get): Likewise.
+(ks_action_put): Likewise.
+* dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+TRUE.
+(cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
+TRUE.
+
+--
+Signed-off-by: Neal H. Walfield <neal@g10code.com>
+GnuPG-bug-id: 1949
+---
+ dirmngr/Makefile.am | 14 ++++++----
+ dirmngr/ks-action.c | 76 ++++++++++++++++++++++++++++++++++++++---------------
+ dirmngr/server.c    | 10 +++++--
+ 3 files changed, 72 insertions(+), 28 deletions(-)
+
+diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
+index a8b1c52..c5713a7 100644
+--- a/dirmngr/Makefile.am
++++ b/dirmngr/Makefile.am
+@@ -62,13 +62,12 @@ dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c	\
+ 	cdb.h cdblib.c misc.c dirmngr-err.h  \
+ 	ocsp.c ocsp.h validate.c validate.h  \
+ 	ks-action.c ks-action.h ks-engine.h \
+-        ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c \
+-	ks-engine-ldap.c \
+-	ldap-parse-uri.c ldap-parse-uri.h
++	ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c
+ 
+ if USE_LDAP
+ dirmngr_SOURCES += ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
+-                   ldap-wrapper.h $(ldap_url) $(extraldap_src)
++                   ldap-wrapper.h ldap-parse-uri.c ldap-parse-uri.h \
++                   ks-engine-ldap.c $(ldap_url) $(extraldap_src)
+ ldaplibs = $(LDAPLIBS)
+ else
+ ldaplibs =
+@@ -114,7 +113,12 @@ t_common_ldadd = $(libcommontls) $(libcommon) no-libgcrypt.o \
+                  $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+                  $(DNSLIBS) $(LIBINTL) $(LIBICONV)
+ 
+-module_tests = t-ldap-parse-uri
++module_tests =
++
++if USE_LDAP
++module_tests += t-ldap-parse-uri
++endif
++
+ t_ldap_parse_uri_SOURCES = \
+ 	t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
+         $(ldap_url) $(t_common_src)
+diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c
+index c76aaaa..dd4516a 100644
+--- a/dirmngr/ks-action.c
++++ b/dirmngr/ks-action.c
+@@ -30,7 +30,9 @@
+ #include "misc.h"
+ #include "ks-engine.h"
+ #include "ks-action.h"
+-#include "ldap-parse-uri.h"
++#if USE_LDAP
++# include "ldap-parse-uri.h"
++#endif
+ 
+ /* Called by the engine's help functions to print the actual help.  */
+ gpg_error_t
+@@ -73,10 +75,14 @@ ks_action_help (ctrl_t ctrl, const char *url)
+     }
+   else
+     {
++#if USE_LDAP
+       if (ldap_uri_p (url))
+ 	err = ldap_parse_uri (&parsed_uri, url);
+       else
+-	err = http_parse_uri (&parsed_uri, url, 1);
++#endif
++	{
++	  err = http_parse_uri (&parsed_uri, url, 1);
++	}
+ 
+       if (err)
+         return err;
+@@ -90,8 +96,10 @@ ks_action_help (ctrl_t ctrl, const char *url)
+     err = ks_finger_help (ctrl, parsed_uri);
+   if (!err)
+     err = ks_kdns_help (ctrl, parsed_uri);
++#if USE_LDAP
+   if (!err)
+     err = ks_ldap_help (ctrl, parsed_uri);
++#endif
+ 
+   if (!parsed_uri)
+     ks_print_help (ctrl,
+@@ -151,16 +159,23 @@ ks_action_search (ctrl_t ctrl, uri_item_t keyservers,
+   for (uri = keyservers; !err && uri; uri = uri->next)
+     {
+       int is_http = uri->parsed_uri->is_http;
+-      int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++      int is_ldap = 0;
++#if USE_LDAP
++      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
++		 || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
++		 || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++#endif
+       if (is_http || is_ldap)
+         {
+           any_server = 1;
+-	  if (is_http)
+-	    err = ks_hkp_search (ctrl, uri->parsed_uri, patterns->d, &infp);
+-	  else if (is_ldap)
++#if USE_LDAP
++	  if (is_ldap)
+ 	    err = ks_ldap_search (ctrl, uri->parsed_uri, patterns->d, &infp);
++	  else
++#endif
++	    {
++	      err = ks_hkp_search (ctrl, uri->parsed_uri, patterns->d, &infp);
++	    }
+ 
+           if (!err)
+             {
+@@ -203,18 +218,27 @@ ks_action_get (ctrl_t ctrl, uri_item_t keyservers,
+   for (uri = keyservers; !err && uri; uri = uri->next)
+     {
+       int is_http = uri->parsed_uri->is_http;
+-      int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++      int is_ldap = 0;
++
++#if USE_LDAP
++      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
++		 || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
++		 || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++#endif
++
+       if (is_http || is_ldap)
+         {
+           any_server = 1;
+           for (sl = patterns; !err && sl; sl = sl->next)
+             {
+-	      if (is_http)
+-		err = ks_hkp_get (ctrl, uri->parsed_uri, sl->d, &infp);
+-	      else
++#if USE_LDAP
++	      if (is_ldap)
+ 		err = ks_ldap_get (ctrl, uri->parsed_uri, sl->d, &infp);
++	      else
++#endif
++		{
++	          err = ks_hkp_get (ctrl, uri->parsed_uri, sl->d, &infp);
++	        }
+ 
+               if (err)
+                 {
+@@ -322,22 +346,32 @@ ks_action_put (ctrl_t ctrl, uri_item_t keyservers,
+   int any_server = 0;
+   uri_item_t uri;
+ 
++  (void) info;
++  (void) infolen;
++
+   for (uri = keyservers; !err && uri; uri = uri->next)
+     {
+       int is_http = uri->parsed_uri->is_http;
+-      int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++      int is_ldap = 0;
++
++#if USE_LDAP
++      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
++		|| strcmp (uri->parsed_uri->scheme, "ldaps") == 0
++		|| strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++#endif
+ 
+       if (is_http || is_ldap)
+         {
+           any_server = 1;
+-	  if (is_http)
+-	    err = ks_hkp_put (ctrl, uri->parsed_uri, data, datalen);
+-	  else
++#if USE_LDAP
++	  if (is_ldap)
+ 	    err = ks_ldap_put (ctrl, uri->parsed_uri, data, datalen,
+ 			       info, infolen);
+-
++	  else
++#endif
++	    {
++	      err = ks_hkp_put (ctrl, uri->parsed_uri, data, datalen);
++	    }
+           if (err)
+             {
+               first_err = err;
+diff --git a/dirmngr/server.c b/dirmngr/server.c
+index 506b137..3e6d99d 100644
+--- a/dirmngr/server.c
++++ b/dirmngr/server.c
+@@ -48,7 +48,9 @@
+ #endif
+ #include "ks-action.h"
+ #include "ks-engine.h"  /* (ks_hkp_print_hosttable) */
+-#include "ldap-parse-uri.h"
++#if USE_LDAP
++# include "ldap-parse-uri.h"
++#endif
+ 
+ /* To avoid DoS attacks we limit the size of a certificate to
+    something reasonable. */
+@@ -1530,10 +1532,14 @@ cmd_keyserver (assuan_context_t ctx, char *line)
+       item->parsed_uri = NULL;
+       strcpy (item->uri, line);
+ 
++#if USE_LDAP
+       if (ldap_uri_p (item->uri))
+ 	err = ldap_parse_uri (&item->parsed_uri, line);
+       else
+-	err = http_parse_uri (&item->parsed_uri, line, 1);
++#endif
++	{
++	  err = http_parse_uri (&item->parsed_uri, line, 1);
++	}
+       if (err)
+         {
+           xfree (item);
+-- 
+2.1.4
+
diff --git a/app-crypt/gnupg/gnupg-2.1.3.ebuild b/app-crypt/gnupg/gnupg-2.1.3.ebuild
index e6ad899b81d9..2bae71611814 100644
--- a/app-crypt/gnupg/gnupg-2.1.3.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3.ebuild,v 1.2 2015/04/12 14:50:03 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3.ebuild,v 1.3 2015/04/13 16:53:46 k_f Exp $
 
 EAPI="5"
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
 
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
 HOMEPAGE="http://www.gnupg.org/"
 MY_P="${P/_/-}"
 SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
@@ -61,7 +61,9 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
 	epatch "${FILESDIR}/${P}-dirmngr-Fix-segfault-in-ldap-engine.patch"
+	epatch "${FILESDIR}/${P}-dirmngr-no-ldap.patch"
 	epatch_user
+	eautoreconf
 }
 
 src_configure() {