diff options
| author |   Kristian Fiskerstrand <k_f@gentoo.org> | 2015-01-06 17:54:26 +0000 |
|---|---|---|
| committer | Kristian Fiskerstrand <k_f@gentoo.org> | 2015-01-06 17:54:26 +0000 |
| commit | 4c0355c28f50e88984c38921f5fadebb6d573c79 (patch) | |
| tree | 1caedfd21030847288092efb36094bb8d9530031 /app-crypt | |
| parent | initial commit, taken from vdr-devel overlay (diff) | |
| download | gentoo-2-4c0355c28f50e88984c38921f5fadebb6d573c79.tar.gz gentoo-2-4c0355c28f50e88984c38921f5fadebb6d573c79.tar.bz2 gentoo-2-4c0355c28f50e88984c38921f5fadebb6d573c79.zip | |
Gnupg 2.1 require the internal dirmngr to be used and provide this by default so we make this a blocker
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xFC3B17DE05E136A0!)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/gnupg/ChangeLog | 8 | ||||
| -rw-r--r-- | app-crypt/gnupg/gnupg-2.1.1-r1.ebuild | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index 4d45479c81e5..42608b294ab9 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gnupg -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.562 2014/12/31 18:27:16 alonbl Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.563 2015/01/06 17:54:26 k_f Exp $ + + 06 Jan 2015; Kristian Fiskerstrand <k_f@gentoo.org> gnupg-2.1.1-r1.ebuild: + Gnupg 2.1 require the internal dirmngr to be used and provide this by default + so we make this a blocker *gnupg-2.0.26-r3 (31 Dec 2014) *gnupg-2.1.1-r1 (31 Dec 2014) diff --git a/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild index c59232df8373..86b3d16481f7 100644 --- a/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild +++ b/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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.1-r1.ebuild,v 1.1 2014/12/31 18:27:16 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild,v 1.2 2015/01/06 17:54:26 k_f Exp $ EAPI="5" @@ -30,7 +30,8 @@ COMMON_DEPEND_LIBS=" readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) " -COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )" +COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt ) + !app-crypt/dirmngr" # Existence of executables is checked during configuration. DEPEND="${COMMON_DEPEND_LIBS} |