From 530dc0b7fb273174fb273f0fec93e1f5b2a26b77 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alonbl@gentoo.org>
Date: Mon, 23 Jan 2017 19:29:34 +0200
Subject: [PATCH] app-crypt/dirmngr: tree clean

Conflict with stable gnupg, removal of older gnupg.

Bug: 606604
Bug: 596010
---
 app-crypt/dirmngr/Manifest                    |  1 -
 app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild     | 41 -------------------
 .../dirmngr/files/dirmngr-1.1.1-pth.patch     | 17 --------
 app-crypt/dirmngr/metadata.xml                |  8 ----
 4 files changed, 67 deletions(-)
 delete mode 100644 app-crypt/dirmngr/Manifest
 delete mode 100644 app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild
 delete mode 100644 app-crypt/dirmngr/files/dirmngr-1.1.1-pth.patch
 delete mode 100644 app-crypt/dirmngr/metadata.xml

diff --git a/app-crypt/dirmngr/Manifest b/app-crypt/dirmngr/Manifest
deleted file mode 100644
index 6b6bad27ca15..000000000000
--- a/app-crypt/dirmngr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dirmngr-1.1.1.tar.bz2 566929 SHA256 d2280b8c314db80cdaf101211a47826734443436f5c3545cc1b614c50eaae6ff SHA512 922512f22853c49cf291207c81862c68ba51c89646036288592d6b2f57709d35ac53f9f550569986c04daec20403ab8ec85b08893443af417950916b869c8419 WHIRLPOOL 84a174d42418723e346c7af8d9bb9aa12e4602cbba9510f492ef10d29f4900768ede986d2c7c93cee129ce03e5aeca08357490ec050b54e1250e2e4b36150617
diff --git a/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild b/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild
deleted file mode 100644
index d9c8bd8d558d..000000000000
--- a/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="DirMngr is a daemon to handle CRL and certificate requests for GnuPG"
-HOMEPAGE="http://www.gnupg.org/download/index.en.html#dirmngr"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND=">=net-nds/openldap-2.1.26
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libgcrypt-1.4.0:0
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/pth-1.3.7
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/libassuan-2
-	nls? ( >=sys-devel/gettext-0.12.1 )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-pth.patch"
-}
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}" $(use_enable nls) \
-		LDAPLIBS="-lldap -llber"
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/app-crypt/dirmngr/files/dirmngr-1.1.1-pth.patch b/app-crypt/dirmngr/files/dirmngr-1.1.1-pth.patch
deleted file mode 100644
index 862458ed1db6..000000000000
--- a/app-crypt/dirmngr/files/dirmngr-1.1.1-pth.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: src/dirmngr.c
-===================================================================
---- src/dirmngr.c	(revision 348)
-+++ src/dirmngr.c	(working copy)
-@@ -665,8 +665,11 @@
-      the option parsing may need services of the libraries. */
- 
-   /* Libgcrypt requires us to register the threading model first.
--     Note that this will also do the pth_init. */
-+     Note that this will also do the pth_init for libgcrypt < 1.6 */
- 
-+#if GCRYPT_VERSION_NUMBER >= 0x010600
-+  pth_init ();
-+#endif
-   /* Init Libgcrypt. */
-   rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
-   if (rc)
diff --git a/app-crypt/dirmngr/metadata.xml b/app-crypt/dirmngr/metadata.xml
deleted file mode 100644
index f1c3d59fb213..000000000000
--- a/app-crypt/dirmngr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
-</pkgmetadata>
-- 
2.26.2