gentoo resync : 11.02.2018

33 files changed, 253 insertions, 30 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 54706bc58836..a9ad85d8c952 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
index ac658e597f32..16a73738857f 100644
--- a/app-crypt/acr38u/Manifest
+++ b/app-crypt/acr38u/Manifest
@@ -2,4 +2,4 @@ AUX 1.7.11-bis.rules 590 BLAKE2B 8604b9d067bac53501127f7d6ed8b6ef226e6faee64cd89
 AUX acr38u-1.7.11-build.patch 6299 BLAKE2B 4c18a2c36f980d1ab381373b0312b0049b94d7a8568827f44bde3381018998ef4ad059e3cb8e355da55ec539ce9c303569c1fb29364b0fe06a730c326c4871c7 SHA512 9979ca060a4dc4da526e0a0fbbe45a09e5e261cfde4f928f0dbc514af7d799796a2edf2f81d4015f512d9a374aeab57e971ce34f62cd7b0ac024ec2662c4a029
 DIST ACR38_LINUX_100711_P.tar.bz2 274137 BLAKE2B 0087cc63ee3af898824fd7cfe31f8b1f922ca4dded22215196b2bdaf1296cd50319d4923735fd2ecdb3cc329dee0df7f288a70e875417b02eb0803d19b1613af SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7
 EBUILD acr38u-1.7.11-r3.ebuild 1427 BLAKE2B 5284cca8d7b496b63e3078153038e03fa65e92f2c546fadbeaebb1e7fdd71b6f5b4e21840a41f3eaf456bf83cd5975feba2da8a8cce2feee708ea61c792d2250 SHA512 d7707ef223b52136953520a40b20b7365a5cfdb4623ff097500e8c6f312d6f1e004aa9a2e5c214c7d41f955c75a53370b3689c0a705804bed6e81dee65d90063
-MISC metadata.xml 526 BLAKE2B 69c69c552dab809b8b4ad1d662afbe5865a215ea61fc10b8b12ff2106d2cc6e112d83953655ed6ef9f26c9fb1926332c1c55a0eb66b2934dd8b2ceb6e8f2daff SHA512 8228c380a3dd574785b66d451cd008318f37f73c56da35c1c516c1fee96c68221a36aee6e0079df0b1babe24c4e41bdaef3cebb8e635a50b72a754685098b614
+MISC metadata.xml 460 BLAKE2B 67621bd05f882e269bd7d756f61412917070d57b3a328676bdb3e725b0b1bb55f3723f2ead4f8f1e84a83779ea8c8c0ef4c59c49f4dcd80874aaea15e08df6f8 SHA512 ee27e065eecd06d74c8c44d29214ccf96bf1ed980701734f8a7fe0e1a427b486ef554368e74ce3ee1ecb5d86afbf3adb13d08b3e5162ef5c17cc378cbcd19afe
diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
index 8dbe56e40ef1..b7f98870cc26 100644
--- a/app-crypt/acr38u/metadata.xml
+++ b/app-crypt/acr38u/metadata.xml
@@ -3,13 +3,12 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>vincent.hardy.be@gmail.com</email>
-    <description>Proxied maintainer, assign bugs to him</description>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>crypto@gentoo.org</email>
     <name>Crypto</name>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index 60b2810889de..5066b346bf45 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -6,4 +6,4 @@ EBUILD codecrypt-1.7.2.ebuild 672 BLAKE2B 525178d3411173523afa24e0df3fd117095f34
 EBUILD codecrypt-1.7.5.ebuild 677 BLAKE2B ef4461f71e009d7eeff1bbdc282e06a1e941ceb5185dd8f5b32183dfb7836e7737d9123a8f1cfabe1f5aa60250b4b165d5cbd7bd8f94028f1dbb6a9ffc5b0731 SHA512 f39a62e22e29a39bde6aad8df33a4741ab6b94d0f797b1c5907511e7f5e5f1005516935e7d0801c246cfd2f843348666db78af3bc822c6cd7a6ed638cbfecf56
 EBUILD codecrypt-1.7.6.ebuild 677 BLAKE2B 5f5aaa254095aae48d27d1a13d8033a3d034febd9b01b47284792c952476c8cde5131de612f77889171927cd49ed07bcbfaf2a44e3f48f1b83790af0b3d313ca SHA512 fd767cde802038e27f375727adc48894bb588ef434e42dfd5e09dc6efb3c98b1048aea533954c5bb91447c7388ddc1c362f8cfd0f394284f935366d1ab72f17f
 EBUILD codecrypt-1.8.ebuild 698 BLAKE2B 1503c168832401752ed9c97900c491c6656facd16deb7864374fd6de64340d741b80b27ce1bd26d65ab15cf0079efccbaff6c0d3e1e462cd38eaec47ba09bad2 SHA512 2ee7d6740af6fd54cc77eb8dd3bb79b787c6a09256cc426a27bdece3c30735fb3d63b8dde6919ddaac5bb1bfe0ed7e1eb347b22f407682fb79f42a2962e7f874
-MISC metadata.xml 805 BLAKE2B 841340081b7d8cdc496556638f0dbf2f88c9ac3fc9c32108d96f25c5b10e18dc6f12c1f625836ce09ad2e0cb28dc8421eb7c1ca744d8705d72c56dba0d456ec3 SHA512 d61f49d169e0cb48acdf478774d04eff124b12b221ea3baa4416c6aa51a16c30cbf4f1bfe1257a88c9e46872b6e6699d71918dd5c980f3fb6b9784a53e59a1d3
+MISC metadata.xml 757 BLAKE2B 5346ca41ed3210ef96baa63fc22e5733d47d8998f7b0cca37cd0aed53b67a7adf5bd8cbedd68d4194476ec7ff0fe83196038766cdbb3580b185566abca76ad9e SHA512 f7e7f6a747c42a666bd0b5de69999fd377374da728c9c98f8e57fa4c7fd93e97a7a7a721c568ba920c4cbe5f5591f4174db99d89fd209df7aecbad06f59f75a3
diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
index 5e3d6e0452ec..ec617cd817af 100644
--- a/app-crypt/codecrypt/metadata.xml
+++ b/app-crypt/codecrypt/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>exa.exa@gmail.com</email>
 		<name>Mirek Kratochvil</name>
-		<description>Proxied Maintainer</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 2fff53f1a758..a6eeea2b5611 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,6 +2,7 @@ AUX gnupg-2.1.20-gpg-Fix-typo.patch 843 BLAKE2B 6e7c56d54ef0b0a1e14030a7636bd35d
 AUX gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch 2987 BLAKE2B eff568f4988b147a9d1aba77965222fcbfc2e9c3efef8eed9ce58f1c7058214ece62046435c90227d8fce1829f3131387f59598676d1359320f61b441018eb85 SHA512 2cf3147638c69f49b4d792a01321b5892f882fc67a1aee8f51f9b35761e6961e9c46d9abc92b0e5250a85b7145e69ba9583b3ce2323943587feb52a029e95deb
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 AUX gnupg-2.2.1-fix-gnupg-wait.patch 2881 BLAKE2B 054c3de81a2ae70c7dea439cd66b9d5642510920af9ba48e4dab28c3457dad95f7ffd3ddb106dd4a5dacebfbedf225e88ad57934ee03a6b80da00ac03f7f944d SHA512 3622c1667c3f0b0acb28fd3ac440af76c0f2757e1d654fbd85344a1193a088db087861f7410e249ece5c99fd7afd7d7a24c43f58e88f5c21949195714be4cbf6
+AUX gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch 1342 BLAKE2B d494d544e9bbfd4115b58cc0117171d7792b44158e48032ddfdbacaff38cc5aebae4e1f1d46fa814ea40504441c8288937a5cfa7d475246cd301061176969e7c SHA512 171ae5092b9cab26446a2c4fe12137f5f1e92ba1d3c542a52900c14c488d902dfad84594473063f7eacb65ff7cefadb88239534498245f79f16ce8c58005f99c
 DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
 DIST gnupg-2.1.15.tar.bz2 5723689 BLAKE2B 48889c0a5445b5b76b027debd6a4711930694e7440b76c06a7da1db5e7989eeae791e4c7a29e60a9d0b862c167374016d908aaa54165a44268f072075cdd9690 SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1
 DIST gnupg-2.1.20.tar.bz2 6456128 BLAKE2B 009a8b8163701f5f5e269caea315a81f4c90c32ec19d501e9fd180bdd3a21454956549b433eb81e98c7a22c4c551eed666d9f3e59ea8e55ed2545ddf49334151 SHA512 14a9890bc64e143f87cff121dd298d490d78dbd34e36883e0f25763ff9064e5706a7632893d7c5d0e8e9b8cf9cdb0d378b4ce1715348729f0fc080455b61eca9
@@ -16,5 +17,6 @@ EBUILD gnupg-2.2.0.ebuild 3121 BLAKE2B abb9424fbbd74ed5d0e3a71f48af85e9d569601ec
 EBUILD gnupg-2.2.1.ebuild 3224 BLAKE2B 3e5c1fa5fdd5fbca8a5b554b09e2221ba612185415e009ebbf2e999369dfa4697139674ccf94b9be52bc2c8024b56a4a846f1803a940755a1650765325a10d17 SHA512 ebe3107c7444f4f821760d854da5376a9953b7e6781673cc55b3704ce9accf5306277140648a047f9fe705c7e5ef7922e45c0fceb8508d80edd63b6dab08b579
 EBUILD gnupg-2.2.3.ebuild 3209 BLAKE2B 44f319cfee71a4c4c38deb496f361e022e2b729b2d075e3d2c03f4276f69b5b8e42bffd90eed5a8b0cccc468bf2512cd6c6b593e6b74cf2ac9867c8f05b0b447 SHA512 4800b7469ad42721294d08c05aa32914a9f0b6d8313efc10a44d5d6b4f9e62d8ee4eb083162808aad5b9829ddc041ea4cac53a60f7b7614451fba41a69c39a28
 EBUILD gnupg-2.2.4-r1.ebuild 3206 BLAKE2B 084fd1814201be6c963a2adc262e4a8c137950cd07a15d9e021d149de752894b3db1096ccf59f04f97fe7ab1764471b6063e103e8f28bb0fc68a2d3ea04f1612 SHA512 b3112ebc907b92caa56f7786a15589701fcbcceb1de8f8ea78d22921a293d84454902f8ca11250c63b5f833936cc46d3d31d5878df712586c032b1297980c603
+EBUILD gnupg-2.2.4-r2.ebuild 3277 BLAKE2B 9823777c197f629c7776b7e61c7d239bc7b174444be69b35ee4c707f8cb61cd9c1ef491bfe863a5a37c1c0b284183d705e952a7b3c1030f4b1aae13ccea76470 SHA512 ed62cccfc4b81acea0f9b9a18c7d652c05a1ae5d4740350df50443a3004605a3d399fd58120636c84b896069d2709b1fb8a56b9f7acf29f22b70404f4a971eba
 EBUILD gnupg-2.2.4.ebuild 3203 BLAKE2B 42bf0180668dc428b4d6529d23f38c82ff31bf9ad41c8be1f157718f25e96203d16a9e6e6f2764bc8865fa78001ca862a3ca81b1bffd1cc569a6e706e45f6487 SHA512 13fbcc6aff14cde19508f631c9912e5b5648cda50c8a8ddf4b9fe3a84495344470747f8d57a238f3323c651290eaed6935b958f7fadf408a257fea4b4a011ffc
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch b/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch
new file mode 100644
index 000000000000..53843900b9f3
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch
@@ -0,0 +1,31 @@
+From b7f48a0095a5b010b94f8192f4adc1adf8697567 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 31 Jan 2018 16:57:19 +0100
+Subject: [PATCH] dirmngr: Handle failures related to missing IPv6 gracefully
+
+Handle the two possible connect failures related to missing IPv6 support
+gracefully by marking the host dead and retrying with another one.
+If IPv6 is disabled via procfs, connect() will return EADDRNOTAVAIL.
+If IPv6 is not compiled into the kernel, it will return EAFNOSUPPORT.
+This makes it possible to use dual-stack hkp servers on hosts not having
+IPv6 without random connection failures.
+---
+ dirmngr/ks-engine-hkp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
+index 4a0b08f4f..a9bb93666 100644
+--- a/dirmngr/ks-engine-hkp.c
++++ b/dirmngr/ks-engine-hkp.c
+@@ -1353,6 +1353,8 @@ handle_send_request_error (ctrl_t ctrl, gpg_error_t err, const char *request,
+     case GPG_ERR_UNKNOWN_HOST:
+     case GPG_ERR_NETWORK:
+     case GPG_ERR_EIO:  /* Sometimes used by estream cookie functions.  */
++    case GPG_ERR_EADDRNOTAVAIL:  /* e.g. when IPv6 is disabled */
++    case GPG_ERR_EAFNOSUPPORT:  /* e.g. when IPv6 is not compiled in */
+       if (mark_host_dead (request) && *tries_left)
+         retry = 1;
+       break;
+-- 
+2.16.1
+
diff --git a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
new file mode 100644
index 000000000000..94a73507e7e8
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.24
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${P}-dirmngr-Handle-failures-related-to-missing-IPv6.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable ssl gnutls) \
+		$(use_enable nls) \
+		$(use_enable tofu) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--enable-all-tests \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index dab8c5db4601..13a1a4e6ead7 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -3,7 +3,7 @@ AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450
 AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
-EBUILD gpgme-1.10.0.ebuild 2839 BLAKE2B beee81d46b73808c5b0bb262479e1dba0dc6a3c1538e5fdc39021a1170cb20d17f999f4cfc785bc99ba5d0fba345f743eb6afdc1876b313708d1cafdad4f2743 SHA512 95154344254f4108901cad62e2bfb175b56c009ea3e54944635bb4e54d1d898c014605502c6420e1f872b6c903e95c6706ac260c8339fb7490f71a3e5cab8d89
+EBUILD gpgme-1.10.0.ebuild 2838 BLAKE2B 29dcfc5c52fd632fb812da7257d0d1395fd99558c666c554e4f2c20cccc771a9d8a50253e550c067ac403d9fe348b40cacdbcc4bcc223801f62f2be676046e05 SHA512 8ba983567f65d145ee3a65b622e3a35d10ed5f6d6ba43d607c087fe135fbe3d7c28812b402432617e92ae50c63c3301cb7c0a62a3654de0052e770cac160cb0b
 EBUILD gpgme-1.8.0-r2.ebuild 2530 BLAKE2B f51880eb8800e66df6954ccb73e2e330f69ea553c52d187bacb00921306c8250204d14dbe748612cdd4958ca5728e1f80914eedd42367bf70225ec173ec32c18 SHA512 d1f5f1aad5bb8de38ff049084d81443c82fe88ddd720a5770e89fadb00d06094493d1911d033ebcd6ae8cbf1117e9b921465d0730b2a17730420895dd60c9244
 EBUILD gpgme-1.8.0-r3.ebuild 2682 BLAKE2B f04e23cf0773a36e380ad71e4603ec2b26583eddf25670946d4d05f134c18da8ae830cf0228417853ea97e4472e7284a87c3ac50099156de3b569961baa6827f SHA512 b6beaec93a62270d5e87b5f3798655ce3c48b3da65947904ec7667963ba39d28d9e032eb72477ff88ec68922c677b1b921daf2bed1de09c9f48e0c788fd394cb
 EBUILD gpgme-9999.ebuild 2238 BLAKE2B afef415c3a730fc5ec3da76963a9c6a02adc2c49fd6629a49589fbc51513a288edafcb5d730f862c6147ca287d489b26190e4edbc4dbc3e29ad3c74dc7538a96 SHA512 a7c211d5b9cdddcb3d67e364e069f2d256aca238d7d1262af948859a3db50f0a300868113c721bf2796e696c5559a7089fbfc00e6096b5fc2686dac69c296e49
diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild
index 8aebc92fc119..43f3c5d077a8 100644
--- a/app-crypt/gpgme/gpgme-1.10.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/hmaccalc/Manifest b/app-crypt/hmaccalc/Manifest
index d522b05bd9c6..ab5e901a0f59 100644
--- a/app-crypt/hmaccalc/Manifest
+++ b/app-crypt/hmaccalc/Manifest
@@ -1,3 +1,3 @@
 DIST hmaccalc-0.9.14.tar.gz 111893 BLAKE2B 30aebd67e49db354c616110477e78fd6923df3ddfbe5e5023fd791bd90c783031da8c631fbfc9e5f2bdae06a08da1d56a08df921ddee359b630c5665e833ad4e SHA512 688a72b4e534ca4a1d45a116c0361ffd389de93dfdeec68e35cbffe0be13832789abaf33300003e12c7317ba473d3a0415f4b22cb3b7b36946c04bd40aa49184
-EBUILD hmaccalc-0.9.14.ebuild 597 BLAKE2B 53e626fb862b07018e77b385fdf6e4f396164cdac2f66c38ac1b7739fc85e587e0e5472105e02933e2c46ace66c7c325100657d16bf4d792bd2e0b9a0856f003 SHA512 449917ee87cb06a939087f8a8b1d6006cacb8e600cfc416030e881f1eef0ef71723459707f80e34404af92ade592149695c18e70109821a7a34455e1a3e28920
+EBUILD hmaccalc-0.9.14.ebuild 570 BLAKE2B ba3b4eae888ea54a913ecf6032b28963b2ac52f26d61686a082f3bf224c5ec2e3802c799d06d1701027b3ae9d392f0b116a7d75e4e82659c1790566f1466854d SHA512 b0a6335a64fde93f59be97e62de212333dd8c446eb9b564117b9fcabf5d5d5a4ee629b6dcd83b58dd57411119b50c3ee2c068a4c782d3388f5b00078aa67698b
 MISC metadata.xml 671 BLAKE2B 276b40259996c8556788b1aecc645cd2e344908e8705d4b73771401a07eb1a75132d81589ef046ad7e1b72d4421251a9690e10668d43a67a0cb925be58835e77 SHA512 d4bb7d03ed78f667255e38138262ccdfe33c42707e967817c52d8f445552b9502d6ed1a10a96df7e20cc62f7fa06c2285057a2f81cff1004b28c6e0c20fb17b7
diff --git a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
index 01eab6cdde7d..08448ab7923e 100644
--- a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
+++ b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit multilib-minimal
 
 DESCRIPTION="Tools for computing and checking HMAC values for files"
-HOMEPAGE="https://fedorahosted.org/hmaccalc/"
-SRC_URI="https://fedorahosted.org/released/hmaccalc/hmaccalc-${PV}.tar.gz"
+HOMEPAGE="https://pagure.io/hmaccalc"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index d7641dcaf3e9..2dde70f59750 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -5,4 +5,4 @@ EBUILD ima-evm-utils-0.2.ebuild 648 BLAKE2B 0adf4addc331065e8ee18e7e3f541d4377eb
 EBUILD ima-evm-utils-0.8.ebuild 648 BLAKE2B 9a75d8548fbb18a0b7d830c1d8815024dd7c9791da50182ad926da8b8b57b69de883f3d8746566224f59f041d937e6f418619d856a81d9de58d472eb8ebc27f7 SHA512 041926b0b5f24446810ae458d8d3f63130fb2b1a87f35e00962191e4c4ae5d8b51608fd0f0980601f6b858ecdf5b97364b0846d9a722846e13115f50f0257539
 EBUILD ima-evm-utils-1.0.ebuild 701 BLAKE2B f54badac76413e9eb3c05f832d8907d88dbd933f866992362dd9a1501bf3385243638d90620014271ae0e3953d9f7d38e98931c3f2bd5fab1ae786961a8d738b SHA512 8770aad2f0d0a60058a91d28214264fc1256d2945c2dcec4894de2fa067d764b37bd7be2f6278a889681d9b2c4419e47074b5126888e2d30b32693365c191a31
 EBUILD ima-evm-utils-9999.ebuild 715 BLAKE2B c4801b96be72fc7852b5977c294ab8ac4583bfd20b36e49748d47d0ccfab47531b3a762b2a27c7ab3132ac8b863965a02bdd9a6ea4012d5090f57cb8809e5172 SHA512 312b5ad08de34c00f77d7db17d80eaa482c35a3079c09baa851a31423882734657556e908f3f9996770dcef4dd809eea5383370e91dc5419a6980001d7bcaea0
-MISC metadata.xml 559 BLAKE2B 16226a2886f8e63b44f3eef45efab376997c47d68df8fafc69e68129783cadc149121194907828bbac4cd3b10157919c99d5639676492dade3c0485a6ec039ab SHA512 64c2c269f117b48550db69b200d716d0498d2b320e2ec1c2295684b28a016b7803ee62cc07ba7162aa8b30781334f9a7c8821dded79697c82bfbe4f03e6ea506
+MISC metadata.xml 519 BLAKE2B a421147d697524cfafe22995d14069d21eec1e0b134aee40ac014d9be716608800c6096c50d20ad9c77da00a10123b8900ae7eeb50997ab4cc9f136d4217d719 SHA512 d207f51e8723c1c36f4b6bdbf514977004da3af6e0ba1e1425b9cf3155562beaca233153549fb6e9007c6608bea180215a6918c484438ea31522a15aa00dd258
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
index 8d9db951aca3..b45a890a4174 100644
--- a/app-crypt/ima-evm-utils/metadata.xml
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>swift@gentoo.org</email>
 		<name>Sven Vermeulen</name>
-		<description>Maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>hardened@gentoo.org</email>
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index 5ca4956c9e0a..7197836abab0 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1,3 +1,5 @@
 DIST pius-2.2.1.tar.bz2 39466 BLAKE2B e88f607cfe7261fc2a0177154ec05626b159cf83b84eb87c7f3f86947a07278a6d7de01bff549affafd5072d330a5a9e7a91caea5e8b522bceefd3264cc9c9e1 SHA512 6380ca3edb045ab25669e1dbf29a9e209f8de2b41b930b81c94a45dc5921bedeebbdc8fb17b494845228353598f882aeefee5ee7dc16b7cc86297e8a333de6ae
+DIST pius-2.2.4.tar.bz2 40578 BLAKE2B e7989631813658ff888c72b825269482ff33296abf0b9780ecb24df4628c499087a7591372ef96449b4899b1bcd730b0c75411bcd3c8839c57d3d4b5de374862 SHA512 3a178d30d98d0ed7ddf6819578a54ccfb9719f77c1f6385e3b254e28cd890817f328685c02cc464d4d592961c28ba314ca3175056b412dcdb301b851d874eb60
 EBUILD pius-2.2.1.ebuild 490 BLAKE2B 87acafa5c445b69e41403c35ebbd58c002108155fb9bafc639a4cb9c06fe2f708ddc33bb78f8c506df79799491b1af6dace90d32d4be7eb485f1540156456845 SHA512 828b38f435ba0328352c42740e792f01aa96f5043871a28125f608bb06be2b447b039765017d6ecbc5ced9477c0bf66ed6ac85ea82608d228bbfb89fdc938c25
+EBUILD pius-2.2.4.ebuild 491 BLAKE2B 61ece77e1bb6e0112561fa0cd104e855e0cbdfdbe2880d99454ffa8c44848dce2cfa7e162622ff86c38314c8bf2bcd1ef25ae62a744486aa68677302dfcb9906 SHA512 562dceeaa4fdaa16cbaa34f5e86db4c827d713048f3799746a988f9b10530e0b5a3431435d419aeb0485ac7da98f5b29eb5193b550de74a0ef2e94e1fb86e34b
 MISC metadata.xml 689 BLAKE2B 40ea626d106920eaf8d0e2ae15637e54f9f81933c222b058834f69e9ec1cef52c634fb176f1a6b8d48f4c0f664092cfcf2ee1f58bdec84f591410323eb0a4914 SHA512 77e117dc545213fdc376935a62d22a0b1db1aaa05fc5fc6ae83e0ffba49693411a451485c519c1bf1a17a829833a90d78472754600ed4dd5f779a772cc480218
diff --git a/app-crypt/pius/pius-2.2.4.ebuild b/app-crypt/pius/pius-2.2.4.ebuild
new file mode 100644
index 000000000000..927947b3642a
--- /dev/null
+++ b/app-crypt/pius/pius-2.2.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
+HOMEPAGE="https://www.phildev.net/pius/"
+SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=app-crypt/gnupg-2.0.0"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
diff --git a/app-crypt/sbsigntool/Manifest b/app-crypt/sbsigntool/Manifest
index 159b25b6c28a..bf63001a7c0f 100644
--- a/app-crypt/sbsigntool/Manifest
+++ b/app-crypt/sbsigntool/Manifest
@@ -5,4 +5,4 @@ DIST sbsigntool-0.8.tar.gz 55537 BLAKE2B f81a530995b90f4030ae2bb36cdf4c5bab8fde5
 DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c
 EBUILD sbsigntool-0.6-r1.ebuild 1122 BLAKE2B 86c468b5de842a7b5228ebf0e4de8eb053b44e539d4bf46a563ac57e8ced2feedffa7b0ef8f891a03d5b722886e53e95a2b62d20e571434ad0b7534aac6edcf8 SHA512 3805523425a7a4b85094c7cc1a2db43b7a8a8b15ed63f587cb5d512d76774eb77a683500f33ccb69ee2c1e55a71587b2111c6fa1cd54820137da442158a9a28d
 EBUILD sbsigntool-0.8.ebuild 1242 BLAKE2B 7a26b18d70daa8c091325b3a016d634a243b57b05931b441050f77f8c435b01092ce99a52c08fe02e0d897c3c7374cd6adbdf9dfd12405a2b50f2e77678c2fd8 SHA512 bfa6d73bcf491ae0acc533d27721a18ad30b022afc26cd6f0e8cd4ade4828617ee7ef031e4782bb867b50d7652c3ccb9609b43cf4d871ffa69eb29b77bb9df34
-MISC metadata.xml 344 BLAKE2B d5f6127fbfd8f7481bf099ffa0aa953d3f98266a483f7f5e3f01a77009ae3baa2f6e31523239d3c59fb7e073f0e7b459832964b5487d05cfcd930c34c5135e4a SHA512 364b9eb845d2a5bef8d8cf314e42a022f228034014ba7ecf773820f1d260abfa35d6a6de36dd1b0e42f89d1580d3a7a00ab693a2109c3ce46280c5d76c2b04b2
+MISC metadata.xml 291 BLAKE2B 0aeb75750176d719f10db508a8924d0bf2fe75e8544b275a7c7e11c44320ce4f7819febb093dd3083a33a998a225f2a3b882407a8ffc03d1a57d03cbfc0a7ff2 SHA512 f7a520fc9a216ff983bd3d361c6ddb3b635eb5dcd94ed042e7c5d0beb0b4e10cdb231e2b4ace599ebb93d4bb46e071a744f1a780ec83f451bb2ee6bad4c2d8cc
diff --git a/app-crypt/sbsigntool/metadata.xml b/app-crypt/sbsigntool/metadata.xml
index ddbcc8f95eb4..20001d6eb7ad 100644
--- a/app-crypt/sbsigntool/metadata.xml
+++ b/app-crypt/sbsigntool/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
-		<description>yell at me if it breaks</description>
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ubuntu</remote-id>
diff --git a/app-crypt/scute/Manifest b/app-crypt/scute/Manifest
index 8f1e1c865830..2cd587fc064b 100644
--- a/app-crypt/scute/Manifest
+++ b/app-crypt/scute/Manifest
@@ -4,4 +4,4 @@ DIST scute-1.4.0.tar.bz2 772986 BLAKE2B b03ed34d5bfcba13f21b73287e68d2e9add413c6
 DIST scute-1.5.0.tar.bz2 991598 BLAKE2B 3a5fdcb5c7d1ae50ce5aa508388e768c6f59c366d81d91312a60ff319b3ad7e01b3bfe5986ee880980b0f5371402c21bd8da963977459d3b90fbd607e64ea2ae SHA512 ad1dbdba5681a92696c851eca7e2bfb61f7bf84f5e02728efc1f72cd25c4ee2dc18fe975e2903d1a85c635d16be1e2085ff2305827b48d80e18c9354e555b39a
 EBUILD scute-1.4.0.ebuild 1217 BLAKE2B a6659950ed1c6d920bd32ed8af69ed6d26da9014733d475ee85ef550b2893d7a47f01fe136f52add0fac46e25da8c4d60f45af81870168b52f199818fb77104a SHA512 428315b9f117a07e058662c286aa3a5f95a142ffc3973b43567910af6bbf8b89bc4bf211e7adc72f900bd9ce5d730c0676ae45f947be726a967b695c1c78a5fd
 EBUILD scute-1.5.0.ebuild 919 BLAKE2B 70a700361e4c1a613ea336ad850997a2eeb16369ab8204a03dbc5a1a944df514c3ec1b5ad252db99fd7ae2a7e7c96c2b4b4695d5b95b075340e5c9358f69aa76 SHA512 2a3ada5f2e21995fcd4920b460c578d37421c3916193b4a499c95c51aec5984fd57579300ea5dddac299e6c740501ab26a00aa3969abdf7b4149443100c86940
-MISC metadata.xml 1080 BLAKE2B 42dd5c0c723fecd2587f863fd41c856efdb6aff147617c68b852ac0498d7ac569cf817aafdbbd793f75307f95e4a55b70ddce3c2db086a1b8b290101fccf0053 SHA512 067f8352727d945e9b6b748f297aa91e07e3f52573f5315346f7369829cd45fef9819288fae86f60a475cd470bf423c89d52869b503b1dc434bd2decccf1dd35
+MISC metadata.xml 1031 BLAKE2B cbe957a386e02db4f584dd3e844b0e86da8b17b3c09e000821925be37196a5aac46f4d3a7730dfd4062ee91018be2428f1270202183b60225a9da8614d006317 SHA512 60ff0db241cca0cd3442e635b3579fdcb574d1121b47806a0046f77e6c4b5a32146c44779e52939570110ed7a0745b8606e7ea6b8e5b923d850d8d08a22dd1af
diff --git a/app-crypt/scute/metadata.xml b/app-crypt/scute/metadata.xml
index e64af5b8aed2..ef8bdd1eaecc 100644
--- a/app-crypt/scute/metadata.xml
+++ b/app-crypt/scute/metadata.xml
@@ -4,7 +4,6 @@
   <maintainer type="person">
     <email>lucas.yamanishi@gmail.com</email>
     <name>Lucas Yamanishi</name>
-    <description>Proxy maintainer.</description>
   </maintainer>
   <maintainer type="project">
     <email>crypto@gentoo.org</email>
diff --git a/app-crypt/sgeps/Manifest b/app-crypt/sgeps/Manifest
index d358c3120c5e..d9df51e9a507 100644
--- a/app-crypt/sgeps/Manifest
+++ b/app-crypt/sgeps/Manifest
@@ -1,3 +1,3 @@
 DIST sgeps-0_pre15.tar.xz 3284 BLAKE2B e30662e1353e6b4bf1680f730152d972c769d7728b9d30fa8a01d76c40b65549f8cb63d616cf70119201952ee1b0f7ec7aae087a1e37f36e7c6df3ece1259494 SHA512 8ebf5f492baaf6ee7f93054a9afcc6c4318f755d85190ce2576c89a88908ee132283af873a37f60f611683689bc7e2e77903c95c6020c80ad916ebabf4583702
 EBUILD sgeps-0_pre15.ebuild 1061 BLAKE2B bd5e52dea7d2bf72c90a0d38a98f70995b83cec285320f473c48ee9f984096878e07ab235d1c9f45da6fd5dc2394d7794bc69f7e76d57e89d137b054016e7b46 SHA512 abb2a1b87a76543dcfcfbab1c2cc7e06ade77dfd8f6d98fe3c66d597e1b2077cb266a86f3ad43a8d235ff953c0729ca62b2018f6b38e9e7af1ad24a32e4ea868
-MISC metadata.xml 440 BLAKE2B 5b0ae1e687e8146ec68e10261252770b0e7a97a16610b00da5239a0dc6ff84f489f2a9f502295e2906e002a825ec294ee44b31a91ccd85f796758eb6cbdae6cd SHA512 32e01741da219cffd93e0c4a0c7c48585b75dc6f442fdb425a09c134b3de515f1d5691c5319201daabee7d38c1fd1d7c0c5fb7750a2e635406a01cc4a48f77f3
+MISC metadata.xml 387 BLAKE2B e1dedc093efde04e635a60abe48bed920fb6a799faaeb8ff6ed4bf05ae3fcebaaa36b7ccd0b13db1940ba740fde5ed8e7a7931567f601bcd1797c5013c6fac5e SHA512 80eccb576d91e4abe4b472528f8a0f145dec34fdb8a120b43943e742dd077dbe6b45256c4634e6f00f7e240d46fcf174b5eedd9f10954b51b69e25d53ccbf22c
diff --git a/app-crypt/sgeps/metadata.xml b/app-crypt/sgeps/metadata.xml
index b269cc3b4689..6bd8c99de505 100644
--- a/app-crypt/sgeps/metadata.xml
+++ b/app-crypt/sgeps/metadata.xml
@@ -4,7 +4,6 @@
   <maintainer type="person">
     <email>enrico.tagliavini@gmail.com</email>
     <name>Enrico Tagliavini</name>
-    <description>Proxied co-maintainer</description>
   </maintainer>
 <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 12e43d786480..549d4ad99f88 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -5,4 +5,4 @@ AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd2564
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
 EBUILD shash-0.2.6-r2.ebuild 895 BLAKE2B c1cc57e9531b91cfe7da1d1d8f3bfab28ca536de1bf6d67e8c158bb21a34344bb1c69c799f858097827107868222af854f97a6c6a4008b859b665db5904ef3cb SHA512 ad6aeeda95e2c205af81816ca05593a163966bc0fff9ffd42aec90237d70d3331645fc711829b49685a219e2f383d36550e56b146c77ac7972308585a955588e
 EBUILD shash-0.2.6-r3.ebuild 923 BLAKE2B 5b41073761b2f723dad67298cf38adffc6f26dc421bf754b7dc7e389f11413aa2237bd513fc5ad92e830d990776ce98c09be92be9ad85900bc76da4114040970 SHA512 a75a9b80eb674812cf64cfc4ec2d69bf3aac8b6393b3e91132e10372940128cdf32777c131550f448ab3123a7fc2c32d8dad7a5f9411094190dc3444b029be66
-MISC metadata.xml 437 BLAKE2B e63ebd159e39421a74ce18c4623827dc34092a226ffe079becd58894f8397d111a6e7425e3b91a52a406d38acf81aa6dc9c799e88cda229900e5c85a19bcc745 SHA512 5402bd757c9295e1e6ac0239552344a3e117da528d11db153e6a1a805e8aa5627493d22af1f7a87a7ef7a33170b5d08c9f344751deb9e1e8303e66eac096f13d
+MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/metadata.xml b/app-crypt/shash/metadata.xml
index 3b9877fc08c3..67634f6f0db4 100644
--- a/app-crypt/shash/metadata.xml
+++ b/app-crypt/shash/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>swegener@gentoo.org</email>
 		<name>Sven Wegener</name>
-		<description>primary maintainer</description>
 	</maintainer>
 	<longdescription>shash is a command-line interface for libmhash and is used to generate or check digests or MACs of files.</longdescription>
 </pkgmetadata>
diff --git a/app-crypt/sign/Manifest b/app-crypt/sign/Manifest
index 11bc9388270d..99728cb1abd1 100644
--- a/app-crypt/sign/Manifest
+++ b/app-crypt/sign/Manifest
@@ -2,4 +2,4 @@ AUX 1.0.7-as-needed.patch 383 BLAKE2B 7f657ee7a64f34769474174c948613fe376e17797d
 AUX 1.0.7-openssl-0.9.8.patch 503 BLAKE2B 8e8625161458a8c7e46d6f4a4f02fd81695f93c02cc20e1178e19e413f4b735d7d7a19f5785e473f4ad7b8ccdeb09852fe1840f30241e3d772832db82188032a SHA512 ffb9d1390f3fa7cb9189ccb8ebe94a8fb5fc14de3cb487758363c405d44d07e4dfdb8b78b71b4b6e26c459ac8972e2b526316a8a1360db72879997683f592b6c
 DIST sign-1.0.7.tar.gz 28535 BLAKE2B e75811aa60f5408af8272503b7b6909eb03e58ab2f70a72efc73a9827af39aa9d5587e2366bc4be4eb67ca88b583d3c75927a0ab94f9f3441ffc60fb6e0e9d6f SHA512 9adb9e520da654e7196451e20501be8e1b84ee750a26344cb7e1816e56e4e8b88773a76a2707a6428faa7828658807eaaef2073b6940e212435ed915881885c0
 EBUILD sign-1.0.7.ebuild 861 BLAKE2B 6c5f5be4d07dfc84d2e6155eb337496518056fe8c449f043fb04a08d04534f9d58ef0f1aec79b32f5be31265f67001f5ccd8ca36e5f6d5ceaf682c809b700413 SHA512 2e874d30078cffab6dbe3a67941e5a1488b45494c67d11da43d0cd07c4db1c05f9581146574ea60d247cb2e3672721212b1a4299b85623c99b864fc8b0f6a45b
-MISC metadata.xml 595 BLAKE2B 8c27be06642f0d63d010ff3a3842b8adaba94133d88cef6d4061237d80c6c48766ec03650050ffd8f674aced6398a7eb3c6169bc3493f62b78e9007a97ead115 SHA512 805b6bb906d2236985d276a641bc71de0b3d8f4574ead6944775f03c3e45100db1775a8499b2527866592b89d81b1cab12b1d07e5a110073fa545047100c395e
+MISC metadata.xml 548 BLAKE2B 8134e0f90d5a5edf3d879801beb54802689491bf47c5b1a8f0954c47c8549b722dfdc8100a5d0759d6694d42c44484f165f17cd79804b6fd1b4852cd1b9f9d59 SHA512 75eaa714f205bd2a5e46693c51dee25fec89447b4f0db2e8c3723ba8bdb17206fbb47ad667092541a8e186f727ee0063a0a58fc02719bab32b8052e07ff6e02f
diff --git a/app-crypt/sign/metadata.xml b/app-crypt/sign/metadata.xml
index eac2478a0ac2..15e7b65be77a 100644
--- a/app-crypt/sign/metadata.xml
+++ b/app-crypt/sign/metadata.xml
@@ -4,7 +4,6 @@
 <maintainer type="person">
 	<email>alicef@gentoo.org</email>
 	<name>Alice Ferrazzi</name>
-	<description>Assign bugs to me.</description>
 </maintainer>
 <longdescription>
 sign is a file signing and signature verification utility. It's main purpose is
diff --git a/app-crypt/ssh-multiadd/Manifest b/app-crypt/ssh-multiadd/Manifest
index 5202887668f7..e14f3feadac3 100644
--- a/app-crypt/ssh-multiadd/Manifest
+++ b/app-crypt/ssh-multiadd/Manifest
@@ -1,3 +1,3 @@
 DIST ssh-multiadd-1.3.2.tar.gz 14035 BLAKE2B 1de9e8593be128b792d6babe9ada37e7f611045d573e3430c0bc08a66d9c6acb00f5f6c453b22fd2308233cc8e58c62ab116de1aae702d066f664036bb029027 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3
 EBUILD ssh-multiadd-1.3.2-r1.ebuild 682 BLAKE2B 03116f84d519517597ea91bad356c8b1f78fa976df95a6719d2c14c6d7d77abe5e9c82b77a6e7fb0ec498e170c63033fb1437324be4e6eb990ec499460e2321b SHA512 5744aadd5c4ae1070299465beecde93886f481d763576a6bcf09c03e13f9849dc4516bd5c435cd1b7ca1664dae2167c1a46650442b4571c4a7bac5e1a76646ea
-MISC metadata.xml 615 BLAKE2B 7641ed963291c80abd0f57bd8632bdcd6e0c2c2e0f6b709f38ba9b635ec133cea9c2b43296622e07854be968e47cf04abf5aba0f2ac37ae0fb9e5c615dad8713 SHA512 865642e6651b5a897892e5b2fe48bdf0fcd1f173cbe1eccc7e101eea2b4779abf6ad2908ae9e51cb51c1a7386fa14ae759cbef0b09ce236a7e0b1e55f55c0193
+MISC metadata.xml 489 BLAKE2B ddca902fdd544bc9272fdf6ba38c9e84f6fe97f1b16fb3d118e8b1e8116d0823a8422a5a14e5b3542e06bb7d9424b1da3e53a65527d13bb0a7177c06ff47bcb6 SHA512 4b0ca57e691272aa2c8dcb4272a22d964355191b1dbed5751a58d6c4cad9b083ec0416b0583294abeccadec2f4da5334555484fcbd6f533a2033de129dcf26b3
diff --git a/app-crypt/ssh-multiadd/metadata.xml b/app-crypt/ssh-multiadd/metadata.xml
index 142211018917..d24c4924b930 100644
--- a/app-crypt/ssh-multiadd/metadata.xml
+++ b/app-crypt/ssh-multiadd/metadata.xml
@@ -4,12 +4,10 @@
 	<maintainer type="person">
 		<email>ashmew2@gmail.com</email>
 		<name>Ashish Gupta</name>
-		<description>Proxied Maintainer, assign bugs to him</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
-		<description>Proxy Maintainer, CC on bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
index d8fb56a599ae..174b4a4259cc 100644
--- a/app-crypt/ubuntu-keyring/Manifest
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -2,8 +2,12 @@ DIST ubuntu-keyring_2012.05.19.tar.gz 18495 BLAKE2B 8bc9e0c8a112e50b686db7224b88
 DIST ubuntu-keyring_2016.09.01.tar.gz 18251 BLAKE2B 223982d494c7f455e834b8ed1763bd84fe0929af3a556143b7a166160ac056fc07bad5c52dafb170df0ab232bed6816479e2dad549bc90becdf7d847345523ae SHA512 ae48fb7a57c95140abb38fa3ed0484acf5374ecc562b54ca321a1c33e76178c3f9e5869ceca1f529686135d601f5738d4426589e558f65923271ca5d2f16ebe2
 DIST ubuntu-keyring_2016.09.19.tar.gz 20282 BLAKE2B bfe9af3dd25b2f35f27bd421b5b03d94f018fc02af0f3dfb95441260b31ec48ea406c869305f99a1599661bc4862e40c9258d5fe39c2b84e8a3534f3ae807e1c SHA512 2dec94d99502730f455ca9832a0f20a027fbcbd896124b93f79dbf0b2c15e73641719626c08caaf9d35922d569929097f2e2189bad855d12bf4cddd2e4379d19
 DIST ubuntu-keyring_2016.10.27.tar.gz 19182 BLAKE2B 2a3f67be4f2e14e15747f497ffb6a5d784010ae4532b4b3990103cc461f7e2af8a00957fb173ab98e7e44e3fab843c611c33a88cd68c462e09b70a54acfe3cce SHA512 ac4b4353a89bd15f8511ba1cecccb6597c407b67b4642c24ae1e461b2be2a5b2989bf5bc033cb2a265217688a366d2c2907b52bc1e484061348cb218ee5cb6a2
+DIST ubuntu-keyring_2018.02.05.tar.gz 27788 BLAKE2B 6d11ad002063eb0663316a157058fe4733bae42af4bb6620c20f0230b0f3f0c7a7760b90401c7fe711f0177de9302f13814245dff4476e8781912e08fa35a8d3 SHA512 cbed6d444f9d83c46f9d4a3351dec7da2ae9746fc56fa66f74c95719fa0ecdb84edb90c74acec26ffecae3741c9c460c84208bdbd3a1ec006b735acf90a7fe99
+DIST ubuntu-keyring_2018.02.06.tar.gz 29977 BLAKE2B 0ea4fc1ab191ee1c04eb1df1675ce3b1a432415c726e2778d9dd7e2bf7eb6b122d39438d07217279172ad19c3618e95b378516cd8bca63fe860b0e721678db07 SHA512 bd87412686dbdc5ca25bad5d810a7410f3d9472cc254d8dc8936d45fd65b559ed5b4f103058192afd8db8b9fc01adb9a71125e998bbeb939b01c732e5c1f03b6
 EBUILD ubuntu-keyring-2012.05.19.ebuild 455 BLAKE2B 970d2cc72e6a44e8850177bd90662ffa08b2f30acdad15514fb9abec63b0e9a1bb205e1337e3a884f73061f8ac418a10c2d3b65128b7985c091c0f54cdff35aa SHA512 769b976910747fe0fd14d3f3da674215131323fb4cad95498474abb88136ad64aa7b9792828f09f3b30cc39908b14e9bea4cb7351fe146493d252777740224a9
 EBUILD ubuntu-keyring-2016.09.01.ebuild 457 BLAKE2B 1d7fc1f70567cda4a4753f8a8f93552874bf867a11eb3634d9405c6bdbed496d5e73862db7136f31fd255f6eb2f6b125cb519a3cdd62fb76b25a2910130060f8 SHA512 7d7bce997366bde8eec384d1edefe465359e167c925e72ea8f514d667f0eb760ac98b8e9eaa0a7c880bdcfad33ea8337e00efcdf787a76522db5c24f1bd62468
 EBUILD ubuntu-keyring-2016.09.19.ebuild 490 BLAKE2B b83c81e6e7003a4ed31cef3607b7c024702681a8535cd5494d9762ebe57d6cab94600c881a0e626a04ca04e667d5b13685bd8f4b2646e6f48b07e6d7c2cd1cac SHA512 6c1dfa4f14c8f06db782307102ad909af3a848b6da3cbb5784500667567bd72cab8db25cb553e5358cfeaa14be9274530d1f2a96a5e9ff6b0ee86c3756209287
 EBUILD ubuntu-keyring-2016.10.27.ebuild 455 BLAKE2B a1f770632c83057c6a0a1c57497e687170aeb2d7fb6fe54088ad32ba9d55577021c5924b2301279d58658e82041f1a77a52df02417cceca573ce486b8e47c242 SHA512 98a2c935e545783920dfc940df4756141ae39ef2cd9beb5d1a96423671d06fff9d2aa81b308c891d47b5196b46cdc254c2efbac2c72ecac59d7c4c11f5fa8ae7
+EBUILD ubuntu-keyring-2018.02.05.ebuild 488 BLAKE2B 612edf16bf66aafcb1c86b6f362fd5bc4514dd6573b13c9a8dd8ace6de07eb57bbbfece853eee7bce4ee13e2a5e8f9c69ce45b830121ba7fa7d4ec979cb628a5 SHA512 25b9e53a069ff23a446a69f560fe7137955525d17bb79b5e02311925d50b717969672c461494a848f541bffb6f879e5dd61e5289bacca6d76882e10c478485fc
+EBUILD ubuntu-keyring-2018.02.06.ebuild 488 BLAKE2B 612edf16bf66aafcb1c86b6f362fd5bc4514dd6573b13c9a8dd8ace6de07eb57bbbfece853eee7bce4ee13e2a5e8f9c69ce45b830121ba7fa7d4ec979cb628a5 SHA512 25b9e53a069ff23a446a69f560fe7137955525d17bb79b5e02311925d50b717969672c461494a848f541bffb6f879e5dd61e5289bacca6d76882e10c478485fc
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.05.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.05.ebuild
new file mode 100644
index 000000000000..2189efd914c9
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.05.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
+SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${PN}-2018.01.17
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.06.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.06.ebuild
new file mode 100644
index 000000000000..2189efd914c9
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.06.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
+SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${PN}-2018.01.17
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}
diff --git a/app-crypt/xor-analyze/Manifest b/app-crypt/xor-analyze/Manifest
index 4783408a40a3..7a537e489aef 100644
--- a/app-crypt/xor-analyze/Manifest
+++ b/app-crypt/xor-analyze/Manifest
@@ -1,4 +1,4 @@
 DIST xor-analyze-0.5.tar.gz 26635 BLAKE2B ad5134b50366cdfb4af31d1944cc4c02c43b2bac171b20054fd7960e62a96b3b959f5b973ab82076ca8cdb0ae7068c0917f89c581936e16723c0223ac64d78a0 SHA512 e28aef799dc6f64a57609638f578bbe66c3ced5784599a65be6bf4ee14921600b7d292880f1288b5ad81ed3dd0897b6aeff2d741b96efc30cf0eab453e4b21b1
-EBUILD xor-analyze-0.5-r1.ebuild 616 BLAKE2B b573e32ddb63273e2f5bbdb1327ea9df0a4c50ed28ca2f44a2e81fc1539ab2b6649dc6f31fc9fb0610e0360c1e998fd65a59388c8ab06cdfd6a85eba627c12b8 SHA512 c70e36656798f14edef3fe17662e8c4d08bcf7e29b61426d36c35a0dedc4e06139cb537023826ccb5c441d02f56d5e7d8dfcd9496b103c86f526cc87a121ceac
+EBUILD xor-analyze-0.5-r1.ebuild 615 BLAKE2B 8afc6771bf841c83fb17e14273f2f87b3771a7137e40b834e29e7f9ba03892d1b1a183fdc90a285809496329af61912d28753d7533ac48cd3da20b156c8aac87 SHA512 3cc206f8571c2210941f93b6ed76fbbb24c3d7a6227a3b45a84c6cbdee8fcc05cf461627713c5e89e2eacb4f21dd14397ddfa2e53765f38e21511ae8abdd99fe
 EBUILD xor-analyze-0.5.ebuild 613 BLAKE2B a973b51620d9b5e6dbbab9bc7e260a10ec61e55363e0a117d1982ef2dc34cf11b2072e00a15d3123f35d66eefb1b89512195a0b0a84d98d67267ba689f226f74 SHA512 9b891d788cf3c253dd27dc370b9eecd9173b0f0fd56ffd7654e62334914dab7dab7fed69e202448772486838f1f4733009210f52c6f6c7457bacb0f46f1e5a29
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild b/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
index 379db39defbc..1b00a0add70b 100644
--- a/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
+++ b/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 src_compile() {