app-crypt/gnupg: New upstream version 2.1.16

Remove 2.1.15-r1 in bump

Package-Manager: portage-2.3.2

3 files changed, 13 insertions, 51 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 50471db291a2..de07351ea763 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -3,3 +3,4 @@ DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f43
 DIST gnupg-2.0.29.tar.bz2 4416251 SHA256 68ed6b386ba78425b05a60e8ee22785ff0fef190bdc6f1c612f19a58819d4ac9 SHA512 23b452c740ab5c1e1e37337ae0583dd3b15df58a5bb5639c0c2aef1fb603e0a7d90a257ac99b0d9dfb68b81fa061c0c64e0bfd256c00d64e2f432192f5052f37 WHIRLPOOL f3d59a9453b4a65c726788c35b065ffc9cde0b746705080cd3491c73439786d791da29cf8f5bf1e5594a0e39cfaec214e346fe18ec3acf0b425dc396aa189f33
 DIST gnupg-2.0.30.tar.bz2 4414652 SHA256 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71 SHA512 e60a57f7dc74b44f884fd50d5a9c51cef7df8c098644ebab9ef7d945a40b0e4a285d0dc80b10fe39d8e4c2cc9d6cbbe800a0ddae54883180dc755fe47ced3314 WHIRLPOOL 007315882becc1204edf6833a13610284ce7e1c73429fc3b4170c35ba61c645299f811f01b1bc0506b1cf94ce0de23af4cea33f51cf97397ec61caa15ce3ac6c
 DIST gnupg-2.1.15.tar.bz2 5723689 SHA256 c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 WHIRLPOOL 4c5a8cd4e8b7196f4a355ce7739cf6e23c43817414e10bbba219117e4e51c4c618ffb5dbce27cb836a2171eda58e003d5ddf78d4af09a813c2a1729963413151
+DIST gnupg-2.1.16.tar.bz2 5840687 SHA256 49b9a6a6787ad00d4d2d69d8c7ee8905923782583f06078a064a0c80531d8844 SHA512 dbac27106e7800e30f286c3fd83ffab85d2b0acf29d6715ce3e388bfbece2a7deb19ebfe897c445d7a3d6d63e01560b9461567566e936504bc5d6cabe1444af7 WHIRLPOOL e6fe2e39deb1ce5ba41c8d160721c64bc3846c2f5d42027a45d6d3e3bd45b6acba38c41923af1165312c9e993d63f28c6fd6616e6f659f6eb4e6d3899d42897b
diff --git a/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.16.ebuild
index db751a3d0d5d..a1c03eb1234a 100644
--- a/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.16.ebuild
@@ -8,13 +8,14 @@ inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
 HOMEPAGE="http://www.gnupg.org/"
+LICENSE="GPL-3"
+
 MY_P="${P/_/-}"
 SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
-LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard +system-cert-store tofu tools usb"
+IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
 	>=dev-libs/npth-1.2
@@ -48,14 +49,7 @@ RDEPEND="${COMMON_DEPEND_LIBS}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	# System cert store is disabled by default in GnuPG 2.1
-	# This provides use of gnutls system cert store for hkps://
-	# Gentoo-Bug: 597934
-	if use system-cert-store; then
-		sed -i 's/HTTP_FLAG_TRUST_DEF/HTTP_FLAG_TRUST_DEF | HTTP_FLAG_TRUST_SYS/g' \
-           "${S}/dirmngr/ks-engine-hkp.c" || die
-		einfo "Using system TLS certificate store"
-	fi
+	default
 	epatch_user
 }
 
@@ -94,7 +88,8 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with readline) \
 		$(use_enable tofu) \
-		$(use_enable tools wks-tools) \
+		$(use_enable tools) \
+		$(use_enable wks-server wks-tools) \
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 }
 
@@ -111,12 +106,9 @@ src_install() {
 	default
 
 	use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
-		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
+		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+		tools/make-dns-cert
 	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	# The help*txt files are read from the datadir by GnuPG directly.
-	# They do not work if compressed or moved!
-	#rm "${ED}"/usr/share/gnupg/help* || die
 
 	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
 		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
@@ -133,34 +125,3 @@ src_install() {
 		dohtml doc/gnupg.html/* doc/*.png
 	fi
 }
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "If upgrading from a version prior than 2.1 you might have to re-import"
-		elog "secret keys after restarting the gpg-agent as the new version is using"
-		elog "a new storage mechanism."
-		elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
-	fi
-}
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 5d621ecd4ca0..b921e3220798 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -21,9 +21,6 @@
       Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable
       scdaemon.
     </flag>
-	<flag name="system-cert-store">
-	  Use gnutls system TLS cert store for hkps access
-	</flag>
     <flag name="usb">
       Build direct CCID access for scdaemon; requires
       <pkg>dev-libs/libusb</pkg>.
@@ -39,5 +36,8 @@
     <flag name="tools">
       Install extra tools.
     </flag>
+	<flag name="wks-server">
+	  Install the wks-server
+	</flag>
   </use>
 </pkgmetadata>