summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Fiskerstrand <k_f@gentoo.org>2014-08-18 22:43:34 +0000
committerKristian Fiskerstrand <k_f@gentoo.org>2014-08-18 22:43:34 +0000
commitc6240c7076a037e3c3c133c6c6cbe4bf2c364273 (patch)
tree9adfe499ec1fff224dca3fefaf43e63ca025b750 /app-crypt
parentVersion bump for security bug 520212. (diff)
downloadgentoo-2-c6240c7076a037e3c3c133c6c6cbe4bf2c364273.tar.gz
gentoo-2-c6240c7076a037e3c3c133c6c6cbe4bf2c364273.tar.bz2
gentoo-2-c6240c7076a037e3c3c133c6c6cbe4bf2c364273.zip
Bump 2.1 version to beta783. Fix bug #519200
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xFC3B17DE05E136A0!)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/gnupg/ChangeLog8
-rw-r--r--app-crypt/gnupg/gnupg-2.1.0_beta783.ebuild (renamed from app-crypt/gnupg/gnupg-2.1.0_beta751.ebuild)11
2 files changed, 12 insertions, 7 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 13dac3e051ea..fe19f3ce34f9 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
# 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.538 2014/08/13 14:24:41 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.539 2014/08/18 22:43:34 k_f Exp $
+
+*gnupg-2.1.0_beta783 (18 Aug 2014)
+
+ 18 Aug 2014; Kristian Fiskerstrand <k_f@gentoo.org>
+ +gnupg-2.1.0_beta783.ebuild, -gnupg-2.1.0_beta751.ebuild:
+ Bump 2.1 version to beta783. Fix bug #519200
*gnupg-2.0.26 (13 Aug 2014)
diff --git a/app-crypt/gnupg/gnupg-2.1.0_beta751.ebuild b/app-crypt/gnupg/gnupg-2.1.0_beta783.ebuild
index e9bca86b243e..25e71a1abfaf 100644
--- a/app-crypt/gnupg/gnupg-2.1.0_beta751.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.0_beta783.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.0_beta751.ebuild,v 1.2 2014/07/25 03:53:22 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.0_beta783.ebuild,v 1.1 2014/08/18 22:43:34 k_f Exp $
EAPI="5"
@@ -9,13 +9,12 @@ inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
HOMEPAGE="http://www.gnupg.org/"
MY_P="${P/_/-}"
-#SRC_URI="mirror://gnupg/gnupg/${PN}/unstable/${MY_P}.tar.bz2"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/unstable/${MY_P}.tar.bz2"
+SRC_URI="mirror://gnupg/gnupg/unstable/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="adns bzip2 doc nls readline static selinux smartcard usb"
+IUSE="bzip2 doc nls readline static selinux smartcard usb"
COMMON_DEPEND_LIBS="
dev-libs/npth
@@ -24,8 +23,9 @@ COMMON_DEPEND_LIBS="
>=dev-libs/libgpg-error-1.13
>=dev-libs/libksba-1.0.7
>=net-misc/curl-7.10
+ >=net-libs/gnutls-3.0
sys-libs/zlib
- adns? ( >=net-libs/adns-1.4 )
+ net-nds/openldap
bzip2? ( app-arch/bzip2 )
readline? ( sys-libs/readline )
smartcard? ( usb? ( virtual/libusb:0 ) )
@@ -92,7 +92,6 @@ src_configure() {
--enable-gpgsm \
--enable-agent \
"${myconf[@]}" \
- $(use_with adns) \
$(use_enable bzip2) \
$(use_enable nls) \
$(use_with readline) \