gentoo resync : 02.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
commit: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree: c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /app-crypt
parent: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)
52 files changed, 583 insertions, 1120 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bec0a607fe82..edc7a6c365d0 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 082fb5026519..367a18a18d61 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -3,6 +3,6 @@ DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 EBUILD acme-0.32.0.ebuild 1263 BLAKE2B 5486282dd90bee28ca65a9170546ed0d09de38880f7945dcef1009cb7c20b991e5d22e7efe89eae07a13013b24e627624c0da907604359e10c75cda5607478f0 SHA512 6517cd06f5430885b072407d11971850cec39c3bca45545006fb58c970f121aaafb725e6a77371bb08151b05a803fd274b45cb9c2e10e48c02e29e5bf9634d3a
 EBUILD acme-0.33.1-r1.ebuild 1681 BLAKE2B 020b1e9b09cc794ebd39ecffeaa904e260b375dd1bd853e62c926d6065501da6cec10977fcf45b7addc660e85b838012e1a5bacfa4f7015ab62496672a0138b3 SHA512 5330cefe084d1b20801bc34b7c8ef30f9f4891f9f3407b28ed84a307b7afe574a2df7bea29fbf208c09520b5075b1c8195e48cd6ba3051387dca8b0bf86d84da
-EBUILD acme-0.34.2.ebuild 1683 BLAKE2B 76931500e9d92a856cdd0d5e26c6df199d111fca3bab417a49bd0373e4f3522f0ea31dd53d43d53436d3e83097617214f9b381193e3e46207b00ba15f347b0ea SHA512 ccbb885ab6021ae583d48cae27e7b32cd24aa88a39cc453c27818cb84911eb7d9fce9d7cc1d42e1afed98cb9349ed05823fa4d1ea2b127a4fdd287da9b320966
-EBUILD acme-9999.ebuild 1687 BLAKE2B ef1c4040e3808237c26b628b8fb7911dc748753b3b30c4aee8e3fded2a4ef6610ddf39117ec8c1164a323b3fba9f0243d3a650f769d4dfad87633c2d4607da03 SHA512 b9de277e5db419c5c80b63d266f07890bb5446103779794c70b877ce4db638d3d9a2aa23d37da04b82a725b0d2ba2e624508d35c67521265dc7fb76ccd993c58
+EBUILD acme-0.34.2.ebuild 1719 BLAKE2B 5c80b37136ee7a8ada33074a902bcb58e3142e19076dbeec1ba2559d0e0943993bc6877e96f5a34dfde243e02c7512eb552d0b2b28c2b83ff2c2bda48421e803 SHA512 1936ca1386df956735403ca55061250c218ca072d4d9d7753c6eb9ecabb5cd959ae7cdbdebe8577c16259c796e97187cc1b1b5c6e04b6d5c3c50afe9c60930a9
+EBUILD acme-9999.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.34.2.ebuild b/app-crypt/acme/acme-0.34.2.ebuild
index 64b8beb25ff0..b972b974afbe 100644
--- a/app-crypt/acme/acme-0.34.2.ebuild
+++ b/app-crypt/acme/acme-0.34.2.ebuild
@@ -42,6 +42,7 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 9500982ce873..3acd37f75f8e 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -42,6 +42,7 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
deleted file mode 100644
index 7b3746ebf57e..000000000000
--- a/app-crypt/bestcrypt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bcrypt3 3197 BLAKE2B 5e9d721a5b4213fcc0e5eb4325c009685dee5bd8dd61f8b47ee1ca29e52faa12b3c6f3c9ab1bc283d7944f4f4178dc831a95348971bde439a7ae77f213df20dc SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b
-AUX bestcrypt-2.0.14-build.patch 16326 BLAKE2B 233e2f896feb159807de1be4e07fad6e97889198709010c5256b93044f1a13559b0a64e59d712c3ddd632f90ea34cf6631c257eac48409c7e0323e5e14a7ad63 SHA512 3ff5d6b69844562f16c1024bb7b409fdcd6f9889e6ea5b58a4ba5f43d04174fa5c60bd73f20eddf2687fea18a01ce06672880602b4b2604e6f014344a3da2911
-DIST BestCrypt-2.0.14.tar.gz 2211286 BLAKE2B 1ff777a72528ec22ca168492c335ec54be924b653323670619049cc9dfbcd144c28702bf857517c5189c937f3712e749c47ef14006a8883c63419b866b8f48f9 SHA512 1e542f00886413f1519ca5667bb297cce25a46fb5ec90a7e1a61934df3cd34e0d680f32e0b111727865459ef7d89d2761b379b4a557ada6d7ee3e47e32bf762c
-EBUILD bestcrypt-2.0.14.ebuild 1903 BLAKE2B cdff8c1095edfa9c228efa1ca54a8207c40b506b88b69ddc7493190d68b102c5fef02298834f3ec4dce95a1d1d480827457afb78397b43d76fdb044f9e60e9a2 SHA512 2bb8fbe1f726b8e369f72fce8f82f88e598bf2ad975d3f89c4e2aac5fdb1edc5506ad8765c3f7fa608efd53b7d08c307d20d3f1d0730440fb6717a1622cce9f3
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
deleted file mode 100644
index afaa12d6d91d..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-MY_PN="BestCrypt"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="https://www.jetico.com/"
-SRC_URI="https://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="bestcrypt"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror bindist"
-
-DEPEND="virtual/linux-sources
-	app-shells/bash"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=(
-	HIDDEN_PART README
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	CONFIG_CHECK="MODULES"
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="bestcrypt(block::kernel/kmod)
-		bc_3des(crypto::kernel/kmod/crypto/algs/3des)
-		bc_bf128(crypto::kernel/kmod/crypto/algs/bf128)
-		bc_bf448(crypto::kernel/kmod/crypto/algs/bf448)
-		bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish)
-		bc_cast(crypto::kernel/kmod/crypto/algs/cast)
-		bc_des(crypto::kernel/kmod/crypto/algs/des)
-		bc_gost(crypto::kernel/kmod/crypto/algs/gost)
-		bc_idea(crypto::kernel/kmod/crypto/algs/idea)
-		bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)"
-	BUILD_TARGETS="module"
-	BUILD_PARAMS=" \
-		BC_KERNEL_DIR=\"${KERNEL_DIR}\""
-}
-
-src_compile() {
-	MAKEOPTS="-j1" linux-mod_src_compile \
-		CXX="$(tc-getCXX)"
-	MAKEOPTS="-j1" emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		CFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	emake install PREFIX="${ED}" install
-
-	newinitd "${FILESDIR}/bcrypt3" bcrypt
-	sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	ewarn
-	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
-	ewarn "http://www.jetico.com/"
-	ewarn
-	ewarn "Upstream do not support this package any more, it was patched to"
-	ewarn "make it built. Use at your own risk!"
-	ewarn
-}
diff --git a/app-crypt/bestcrypt/files/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3
deleted file mode 100644
index b1b6979e63e0..000000000000
--- a/app-crypt/bestcrypt/files/bcrypt3
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/sbin/openrc-run
-#
-# bestcrypt         Encrypted File Systems.
-#
-# Version:      1.2
-#
-# Revision:    $Id$
-#
-# Author:       Jetico Inc. (support@jetico.com)
-#
-# Modified by Stefan Tittel (with thanks to steveb) to work around
-# the "xargs: environment too large for exec"-error occuring in
-# the gentoo 1.4 linux distribution.
-
-# chkconfig: 2345 85 98
-# description: BestCrypt init script
-
-
-# Source function library.
-#. /etc/rc.d/init.d/functions
-
-# See how we were called.
-
-KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
-
-start() {
-	ebegin "Initializing BestCrypt"
-	declare -i status=0
-	rm -rf /dev/bcrypt?* 2>/dev/null
-        if [ $KERNEL_VERSION = "2.2" ]; then
-         mknod -m 666 /dev/bcrypt0 b 7 128
-         mknod -m 666 /dev/bcrypt1 b 7 129
-         mknod -m 666 /dev/bcrypt2 b 7 130
-         mknod -m 666 /dev/bcrypt3 b 7 131
-         mknod -m 666 /dev/bcrypt4 b 7 132
-         mknod -m 666 /dev/bcrypt5 b 7 133
-         mknod -m 666 /dev/bcrypt6 b 7 134
-         mknod -m 666 /dev/bcrypt7 b 7 135
-         mknod -m 666 /dev/bcrypt8 b 7 136
-         mknod -m 666 /dev/bcrypt9 b 7 137
-         mknod -m 666 /dev/bcrypt10 b 7 138
-         mknod -m 666 /dev/bcrypt11 b 7 139
-         mknod -m 666 /dev/bcrypt12 b 7 140
-         mknod -m 666 /dev/bcrypt13 b 7 141
-         mknod -m 666 /dev/bcrypt14 b 7 142
-         mknod -m 666 /dev/bcrypt15 b 7 143
-        else
-	  if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
-	  then
-            mknod -m 666 /dev/bcrypt0 b 188 0
-            mknod -m 666 /dev/bcrypt1 b 188 1
-            mknod -m 666 /dev/bcrypt2 b 188 2
-            mknod -m 666 /dev/bcrypt3 b 188 3
-            mknod -m 666 /dev/bcrypt4 b 188 4
-            mknod -m 666 /dev/bcrypt5 b 188 5
-            mknod -m 666 /dev/bcrypt6 b 188 6
-            mknod -m 666 /dev/bcrypt7 b 188 7
-            mknod -m 666 /dev/bcrypt8 b 188 8
-            mknod -m 666 /dev/bcrypt9 b 188 9
-            mknod -m 666 /dev/bcrypt10 b 188 10
-            mknod -m 666 /dev/bcrypt11 b 188 11
-            mknod -m 666 /dev/bcrypt12 b 188 12
-            mknod -m 666 /dev/bcrypt13 b 188 13
-            mknod -m 666 /dev/bcrypt14 b 188 14
-            mknod -m 666 /dev/bcrypt15 b 188 15
-          fi
-	fi
-	modprobe bc || status=1
-	modprobe bc_blowfish || status=1
-	modprobe bc_des || status=1
-	modprobe bc_gost || status=1
-	modprobe bc_twofish || status=1
-	modprobe bc_bf448 || status=1
-	modprobe bc_bf128 || status=1
-	modprobe bc_3des || status=1
-	modprobe bc_idea || status=1
-	modprobe bc_rijn || status=1
-	modprobe bc_cast || status=1
-	modprobe bc_rc6 || status=1
-	modprobe bc_serpent || status=1
-	eend ${status}
-}
-
-stop() {
-	ebegin "Unmounting encrypted filesystems"
-
-# The original line causing the "xargs: environment too large for exec error".	
-	# grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount
-
-# The line for which it work's fine now.
-	for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done
-
-	eend $?
-	ebegin "Shutting down BestCrypt modules"
-	for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do 
-		rmmod $i
-	done
-	if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
-	then
-		rm -f /dev/bcrypt?* 2>/dev/null
-	fi
-	rmmod bc
-	eend $?
-}
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch
deleted file mode 100644
index c4ce215e975a..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch
+++ /dev/null
@@ -1,522 +0,0 @@
-From 71bd6e496af5990836c34e4dd2d9d0107467349a Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 18:49:17 +0300
-Subject: [PATCH 1/6] build: do not auto build/install module
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ec0fd7e..d52f509 100644
---- a/Makefile
-+++ b/Makefile
-@@ -98,7 +98,7 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests
- #
- 
- # default target builds console tool with modules
--all: Makefile helpers module console
-+all: Makefile helpers console
- 	true
- 
- rebuild: clean all
-@@ -233,7 +233,7 @@ module-clean:
- #
- 
- # install for default target
--install: module-install console-install helpers-install
-+install: console-install helpers-install
- 
- # used by RPM creation script
- build-install: module-put-files console-install helpers-install
--- 
-2.16.4
-
-From 42816e0a4e47e77f290b46460e35a1666748f8b0 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 19:35:26 +0300
-Subject: [PATCH 2/6] build: remove useless log
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp b/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp
-index 3c6fad8..9821073 100644
---- a/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp
-+++ b/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp
-@@ -78,14 +78,12 @@ cSymAlg * cAlgRIJN::createAlg( BYTE *key, int keySize ) // keySize in bytes
- 	return alg;
- }
- 
--#include "../../../../fs-lib/log.h"
- int cAlgRIJN::encryptECB(
- 		const BYTE *inBf,		// Input plaintext buffer. 
- 		BYTE *outBf,	// Output encrypted buffer
- 		int  bfSize		// In/out buffers' size.
- 		)
- {
--	LIBLOG_INFO("");
- 	int i;
- 
- 	if ((bfSize % BC_BLOCK_SIZE) != 0) return sae_invalidBlockSize;
--- 
-2.16.4
-
-From a0ffdc5a135b549b62e1421fcf75d627e0394529 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 19:41:17 +0300
-Subject: [PATCH 3/6] build: do not strip binaries
-
----
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d52f509..a93b850 100644
---- a/Makefile
-+++ b/Makefile
-@@ -243,9 +243,9 @@ uninstall: before-uninstall module-uninstall console-uninstall helpers-uninstall
- 
- helpers-install:
- 	install -o root -m 0755 -d $(PREFIX)/sbin
--	install -o root -m 4755 -s $(TARGET_DIR)/bcmount_helper      $(PREFIX)/sbin
--	install -o root -m 4755 -s $(TARGET_DIR)/bcumount_helper     $(PREFIX)/sbin
--	install -o root -m 4755 -s $(TARGET_DIR)/bcrrpart_helper     $(PREFIX)/sbin
-+	install -o root -m 4755 $(TARGET_DIR)/bcmount_helper         $(PREFIX)/sbin
-+	install -o root -m 4755 $(TARGET_DIR)/bcumount_helper        $(PREFIX)/sbin
-+	install -o root -m 4755 $(TARGET_DIR)/bcrrpart_helper        $(PREFIX)/sbin
- 
- helpers-uninstall:
- 	rm -f $(PREFIX)/sbin/bcmount_helper
-@@ -267,7 +267,7 @@ before-uninstall:
- .PHONY: console-install
- console-install:
- 	install -o root -m 0755 -d $(PREFIX)/usr/bin
--	install -o root -m 0755 -s build/bctool             $(PREFIX)/usr/bin/
-+	install -o root -m 0755 build/bctool                $(PREFIX)/usr/bin/
- 	install -o root -m 0755 -d $(PREFIX)/$(MAN_PATH)/man8
- 	install -m 644 bctool.8                             $(PREFIX)/$(MAN_PATH)/man8/
- 
--- 
-2.16.4
-
-From 7947ac3e152da1ed590364b7c8948deb602a5b50 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 18:52:32 +0300
-Subject: [PATCH 4/6] build: allow override programs
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile                            | 11 +++++++----
- certificate/CertificateLib/Makefile |  4 +++-
- disk/Makefile                       |  6 ++++--
- fslib/Makefile                      | 16 +++++++++-------
- kernel/Makefile                     |  5 +++--
- keygens/kgghost/Makefile            |  7 +++++--
- keygens/kgsha/Makefile              |  7 +++++--
- mount/Makefile                      |  9 +++++----
- spacemap/Makefile                   |  6 ++++--
- tests/Makefile                      | 12 ++++++------
- 10 files changed, 51 insertions(+), 32 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a93b850..d57ee79 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,6 +56,9 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a
- KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a
- SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a
- 
-+CC = gcc
-+CXX = g++
-+
- BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- BC_EXTRA_LDFLAGS = $(LDFLAGS)
- 
-@@ -125,7 +128,7 @@ helpers: create-dirs
- console: spacemap-lib certificate-lib fs-lib kernel-lib keygen-libs $(TARGET)
- 	true
- $(TARGET): $(BCTOOL_OBJS)
--	g++ $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
-+	$(CXX) $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
- 
- # GUI executable only (w/o console and helpers)
- panel: certificate-lib kernel-lib keygen-libs fs-lib
-@@ -339,10 +342,10 @@ module-uninstall:
- 	bash ./scripts/remove_mods
- 
- %.o:%.cpp
--	g++ -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
- 
- %.o:%.cc
--	g++ -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
- 
- %.o:%.c
--	gcc -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CC) -c $(BCTOOL_CFLAGS) $< -o $@
-diff --git a/certificate/CertificateLib/Makefile b/certificate/CertificateLib/Makefile
-index 06353bc..19b772c 100644
---- a/certificate/CertificateLib/Makefile
-+++ b/certificate/CertificateLib/Makefile
-@@ -1,5 +1,7 @@
- 
--CP = cp
-+CC = gcc
-+CXX = g++
-+AR = ar
- CFLAGS += -Wall -fPIC -fno-strict-aliasing
- CXXFLAGS = -Wall -fPIC
- #-Werror
-diff --git a/disk/Makefile b/disk/Makefile
-index e3915b0..1a9ff01 100644
---- a/disk/Makefile
-+++ b/disk/Makefile
-@@ -1,14 +1,16 @@
- DISKMON_OBJS = disk.o diskmon.o
-+
-+CXX = g++
- CFLAGS += -Wall -I. -I../ -p -gdwarf-2 #-DBC_DEBUG
- LDFLAGS += -ludev
- 
- all:diskmon Makefile
- 
- diskmon:$(DISKMON_OBJS)
--	g++ $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
-+	$(CXX) $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
- 
- %.o:%.cc
--	g++ $(CFLAGS) -c $< -o $@
-+	$(CXX) $(CFLAGS) -c $< -o $@
- 
- clean:
- 	rm -rf diskmon *.o
-diff --git a/fslib/Makefile b/fslib/Makefile
-index 9b99e89..0075a9f 100644
---- a/fslib/Makefile
-+++ b/fslib/Makefile
-@@ -1,3 +1,5 @@
-+CC = gcc
-+AR = ar
- 
- FSLIB_CFLAGS = $(CFLAGS) -Wall -fPIC -O0 -DFSLIB_DEBUG -g  # -O3 
- FSLIB_CFLAGS += -I. -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 #-fvisibility=hidden
-@@ -17,25 +19,25 @@ FSLIB_TOOLS = file_hfs test_hfs test_info test_free_space diskinfo
- all: Makefile $(FSLIB) $(FSLIB_TOOLS)
- 
- $(FSLIB): $(OBJS)
--	ar rcs $(FSLIB) $(OBJS)
-+	$(AR) rcs $(FSLIB) $(OBJS)
- 
- test_hfs: $(FSLIB) test/test_hfs.o
--	gcc test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
-+	$(CC) test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
- 
- file_hfs: $(FSLIB) test/file_hfs.o
--	gcc test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
-+	$(CC) test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
- 
- test_info: $(FSLIB) test/test_info.o
--	gcc test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
-+	$(CC) test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
- 	
- test_free_space: $(FSLIB) test/test_free_space.o
--	gcc test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
-+	$(CC) test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
- 	
- diskinfo: $(FSLIB) test/diskinfo.o
--	gcc test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g  -o diskinfo
-+	$(CC) test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g  -o diskinfo
- 
- .c.o:
--	gcc $(FSLIB_CFLAGS) -c $< -o $@
-+	$(CC) $(FSLIB_CFLAGS) -c $< -o $@
- 	
- clean:
- 	rm -rf *~ *.o test/*.o $(OBJS) $(FSLIB) $(FSLIB_TOOLS)
-diff --git a/kernel/Makefile b/kernel/Makefile
-index 1a71617..4f9760d 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -3,6 +3,7 @@ OBJECTS = $(SOURCES:.cc=.o)
- TARGET_DIR = ./build/
- TARGET = $(TARGET_DIR)/libbckernel.a
- BC_CFLAGS = $(BC_EXTRA_CFLAGS) -fPIC -c -Wall -ludev -L../build/ -lspacemap -I../ -fvisibility=hidden #-fvisibility-inlines-hidden
-+CXX = g++
- 
- 
- ### Build ###
-@@ -21,12 +22,12 @@ module: create-dirs force_look
- 
- kernel-lib: create-dirs $(TARGET)
- $(TARGET): $(OBJECTS)
--	ar rcs $(TARGET) $(OBJECTS)
-+	$(AR) rcs $(TARGET) $(OBJECTS)
- 
- $(OBJECTS): Makefile $(SOURCES) BCKernel.h
- 	set -e; \
- 	for i in $(SOURCES); do \
--		g++ -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
-+		$(CXX) -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
- 	done
- 
- create-dirs: $(TARGET_DIR)
-diff --git a/keygens/kgghost/Makefile b/keygens/kgghost/Makefile
-index 65c4bf6..a7b0af8 100644
---- a/keygens/kgghost/Makefile
-+++ b/keygens/kgghost/Makefile
-@@ -5,10 +5,13 @@ KGGHOST_OBJS = hash.o pbe.o keyblock.o datablock.o kgghost.o
- KGGHOST_CFLAGS = -Wall -fPIC -p -ggdb -I. -I../../ -I../../certificate -DBC_LINUX
- KGGHOST_CFLAGS += $(BC_EXTRA_CFLAGS)
- 
-+CXX = g++
-+AR = ar
-+
- all: $(KGGHOST) Makefile
- 
- $(KGGHOST):$(KGGHOST_OBJS) $(CERTIFICATE_LIB)
--	ar rcs $(KGGHOST) $(KGGHOST_OBJS)
-+	$(AR) rcs $(KGGHOST) $(KGGHOST_OBJS)
- 
- $(CERTIFICATE_LIB):
- 	make -C ../../certificate/CertificateLib
-@@ -17,7 +20,7 @@ $(KERNEL_LIB):
- 	make -C ../../kernel/build
- 
- %.o:%.cpp
--	g++ $(KGGHOST_CFLAGS) -c -o $@ $<
-+	$(CXX) $(KGGHOST_CFLAGS) -c -o $@ $<
- 
- clean:
- 	rm -f *.o *.ver *~ $(KGGHOST)
-diff --git a/keygens/kgsha/Makefile b/keygens/kgsha/Makefile
-index d3a33d0..9c8c688 100644
---- a/keygens/kgsha/Makefile
-+++ b/keygens/kgsha/Makefile
-@@ -10,10 +10,13 @@ KGSHA_OBJS = hash.o datablock.o kgsha.o
- KGSHA_CFLAGS = -Wall -fPIC -p -gdwarf-2 -I. -I../../ -I../../certificate -DBC_LINUX
- KGSHA_CFLAGS += $(EXTRA_CFLAGS)
- 
-+CXX = g++
-+AR = ar
-+
- all: $(KGSHA) $(KGSHA_OBJS) Makefile hidden_sector.h defs.h datablock.h
- 
- $(KGSHA): $(KGSHA_OBJS) $(CERTIFICATE_LIB) $(KERN_LIB)
--	ar rcs $(KGSHA) $(KGSHA_OBJS)
-+	$(AR) rcs $(KGSHA) $(KGSHA_OBJS)
- 
- $(CERT_LIB):
- 	make -C ../../certificate/CertificateLib
-@@ -22,7 +25,7 @@ $(KERN_LIB):
- 	make -C ../../kernel/
- 
- %.o:%.cpp
--	g++ $(KGSHA_CFLAGS) -c -o $@ $<
-+	$(CXX) $(KGSHA_CFLAGS) -c -o $@ $<
- 
- clean:
- 	rm -f *.o *.ver *~ $(KGSHA)
-diff --git a/mount/Makefile b/mount/Makefile
-index 7a3d66b..0e60095 100644
---- a/mount/Makefile
-+++ b/mount/Makefile
-@@ -1,22 +1,23 @@
- 
- HELPERS = bcrrpart_helper bcmount_helper bcumount_helper
- 
-+CC = gcc
- OBJS = common.o
- CFLAGS += -Wall -O3
- 
- all: $(HELPERS) Makefile
- 
- bcrrpart_helper: $(OBJS) rrpart.o
--	gcc $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
-+	$(CC) $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
- 
- bcmount_helper: $(OBJS) mount.o
--	gcc $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
-+	$(CC) $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
- 
- bcumount_helper: $(OBJS) umount.o
--	gcc $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
-+	$(CC) $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
- 	
- %.o:%.c
--	gcc $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 	
- clean:
- 	rm -f *.o *.ver *~ $(HELPERS)
-diff --git a/spacemap/Makefile b/spacemap/Makefile
-index 6dff240..7dd2ad9 100644
---- a/spacemap/Makefile
-+++ b/spacemap/Makefile
-@@ -5,17 +5,19 @@ LIB_NAME = spacemap
- STATIC_TARGET = lib$(LIB_NAME).a
- OBJECT_CFLAGS = -fPIC -g -c -Wall -ludev -fvisibility=hidden #-fvisibility-inlines-hidden
- 
-+CXX = g++
-+AR = ar
- 
- all: static
- 	true
- 
- static: $(OBJECTS)
--	ar rcs $(STATIC_TARGET) $(OBJECTS)
-+	$(AR) rcs $(STATIC_TARGET) $(OBJECTS)
- 
- $(OBJECTS): $(SOURCES)
- 	set -e; \
- 	for i in $(SOURCES); do \
--		g++ $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
-+		$(CXX) $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
- 	done
- 
- clean:
-diff --git a/tests/Makefile b/tests/Makefile
-index c6d78f0..419020b 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -2,8 +2,8 @@ TESTS_PWD = ../build/tests/
- TESTS_TARGET = $(TESTS_PWD)/bctool-tests
- TESTS_SOURCES = tests-main.c ../container/cipher.cc ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/linux/file.cpp
- TESTS_CFLAGS = -I../ -I../certificate/ -L../build/ -L../build/kernel/ -DBC_LINUX -ludev -g
--CP = gcc
--CPP = g++
-+CC = gcc
-+CXX = g++
- CERT_LIB_NAME = certificate
- KERN_LIB_NAME = bckernel
- SPACEMAP_LIB_NAME = spacemap
-@@ -15,11 +15,11 @@ all: $(TESTS_TARGET)
- 	cp insert-modules.sh remove-modules.sh bcmod-loaded.sh $(TESTS_PWD)
- 
- $(TESTS_TARGET): $(TESTS_SOURCES) Makefile
--	$(CPP) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
-+	$(CXX) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
- 	cp kernel/print-struct-size.c $(TESTS_PWD)
--	$(CP) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
--	$(CPP) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc  $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
--	$(CP) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
-+	$(CC) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
-+	$(CXX) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc  $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
-+	$(CC) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
- 
- clean:
- 	rm -rf $(TESTS_PWD)
--- 
-2.16.4
-
-From a7e9a6048e443b0a592c56b1b48e66d20092cf76 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 19:34:59 +0300
-Subject: [PATCH 5/6] build: add missing sys/sysmacros.h
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- mount/common.c | 1 +
- mount/mount.c  | 1 +
- mount/rrpart.c | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/mount/common.c b/mount/common.c
-index 0a14ea4..d88394e 100644
---- a/mount/common.c
-+++ b/mount/common.c
-@@ -9,6 +9,7 @@
- #include <stdarg.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-diff --git a/mount/mount.c b/mount/mount.c
-index c57594f..7c802fe 100644
---- a/mount/mount.c
-+++ b/mount/mount.c
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-diff --git a/mount/rrpart.c b/mount/rrpart.c
-index f7ce125..7ba5692 100644
---- a/mount/rrpart.c
-+++ b/mount/rrpart.c
-@@ -13,6 +13,7 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <linux/fs.h>
- 
--- 
-2.16.4
-
-From 9cb62cc4cbe9cb929aa1fca34d3d807a4e83bcca Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 19:12:13 +0300
-Subject: [PATCH 6/6] modules: build for kernel-4.14
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- kernel/kmod/bc_dev.c | 4 +++-
- kernel/kmod/bc_mem.c | 1 +
- spacemap/defs.h      | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/kernel/kmod/bc_dev.c b/kernel/kmod/bc_dev.c
-index cddbf49..8b5657b 100644
---- a/kernel/kmod/bc_dev.c
-+++ b/kernel/kmod/bc_dev.c
-@@ -86,9 +86,11 @@ static void reject_bio(struct bio *bio)
- {
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0))
-             bio_endio(bio, -EIO);
--#else
-+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0))
-             bio->bi_error = -EIO;
-             bio_endio(bio);
-+#else
-+            bio_io_error(bio);
- #endif
- }
- 
-diff --git a/kernel/kmod/bc_mem.c b/kernel/kmod/bc_mem.c
-index 0b516c8..69ec832 100644
---- a/kernel/kmod/bc_mem.c
-+++ b/kernel/kmod/bc_mem.c
-@@ -6,6 +6,7 @@
- #include <linux/init.h>
- #include <linux/slab.h>
- #include <linux/kernel.h>
-+#include <linux/sched.h>
- #include <asm/uaccess.h>
- 
- #define BC_GET_CALLER_PTR __builtin_return_address(0)
-diff --git a/spacemap/defs.h b/spacemap/defs.h
-index f0c87ba..7de9052 100644
---- a/spacemap/defs.h
-+++ b/spacemap/defs.h
-@@ -17,6 +17,7 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
-+#include <linux/sched.h>
- #include <asm/uaccess.h>
- 
- typedef int8_t		bc_8;
--- 
-2.16.4
-
diff --git a/app-crypt/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml
deleted file mode 100644
index f1c3d59fb213..000000000000
--- a/app-crypt/bestcrypt/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>
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 28c5bf10c4b7..48e81b71d3b4 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -3,5 +3,5 @@ DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb32
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 EBUILD gcr-3.20.0.ebuild 1851 BLAKE2B 532e60ee150d6886ea24abda75d29b90acc66f7e055e5941a8c53293dc5491e3850729bc68b8a9f7d5658e0a2b5dd97dc3c0e1a75418fdbf132e0c6b4dbbde29 SHA512 f0c952bff3d6f66c8d75a0671cd886ac0611bd60f7b8a3b29dc71798d545baee9f2e2842ac76a87e34acb05fb200a472fc3bf58d4c0201e5fbaf60bb96efcbbe
 EBUILD gcr-3.28.0.ebuild 1892 BLAKE2B 4dbe4a19c0da7470fe68daa6191e1469fbc192dfd122dc2581340ab54e795289fe8d8ace674d159c851dd0da00fe544587a189c64ad7d50345f4a4b0245b4597 SHA512 c9d40cbf32c1570a9b152a26db32dcf1888945713fdefb3c0bc46add3c5e04d0bf7f4ac62a38e673265380d04b8a7428f511560390c0f756bab44abfaf989fb6
-EBUILD gcr-3.28.1.ebuild 1898 BLAKE2B 90d8b96064a03cf5e0ed33697780f8a89b435d9b67f9560fadd2d21c4b5c548f6be8982954e20970d6be33f033415483d6b4681ee02531d7449bc2ee5a8183ba SHA512 620cb26d286517f092751a6ae56b39dac1c9eb6a214b50106521aca3cd4f1021942b2273622ed81a27d1b6ebaa6bcc654deab0e34e3e3f7b8b758ec24c119294
+EBUILD gcr-3.28.1.ebuild 1897 BLAKE2B 61c7d825073eb4233381fa8b66b6692dae395886af4c6c31150bccdf2677e585a57bb90e6123c6e463b70623cfa885220c648c1ab89d4bd8888d2d11ee39132a SHA512 0a1264fceba0e6639189ba877ae7e7319c87faad00469a0a5759f7877a2f634154746daed4bd0f857d657c86101529c114d08246e09ae5e057ecf2722bc3da2e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index f0c83cd810ee..479ccd4377ba 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 40bab3734fba..a88dcc5d375a 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -4,4 +4,4 @@ DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d6
 EBUILD glep63-check-7.ebuild 658 BLAKE2B 3e742acbd0fdde1670de3348739b10f70b0ccee4b50615ddd3b49225847c5c2e2454652ca8748330e3adac7f9079ea7bb272b3160f4b8daa14a4113fd4793265 SHA512 470627606b86e27d4fb20e6f0281dc13db43e193ae4f3c2d71da21d949d91253afdbc5a375fd36f8505bfca210a86d733663c2ac4dd64785da63be75c73542de
 EBUILD glep63-check-8.ebuild 660 BLAKE2B cae7887511523f495f88aa4f4a2a3178c6b9437aaa51e14ae42a3611de67f64844a0fce2f2c102d53ebbb646a154a7119d929d4e6e5916659e771f62cee835d0 SHA512 481b395c429eedc70bb83e2bbe30298201a8d7981bbf6798ab7f8360597f2b4c42204748732caf3f73ca9e2d362d82a7564a207c406dfb9aa05a2af1bd5a9328
 EBUILD glep63-check-9.ebuild 660 BLAKE2B cae7887511523f495f88aa4f4a2a3178c6b9437aaa51e14ae42a3611de67f64844a0fce2f2c102d53ebbb646a154a7119d929d4e6e5916659e771f62cee835d0 SHA512 481b395c429eedc70bb83e2bbe30298201a8d7981bbf6798ab7f8360597f2b4c42204748732caf3f73ca9e2d362d82a7564a207c406dfb9aa05a2af1bd5a9328
-MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
+MISC metadata.xml 537 BLAKE2B cc05c3872c522fdcc2355da9d451f9ad102d23e2e5de657f447ce5c9441a4379fb5f6560cd22a8be325f322e901b65917b11630fc0229bd0e952c6f8b6b64bf0 SHA512 493bcb28f9144c49050445de98b54e19730e46cc24df02b15859f4114f4fa8775431aac9d8fcb4f50639609680656b108f6c4ca47f67b38680f926cf9610ccd9
diff --git a/app-crypt/glep63-check/metadata.xml b/app-crypt/glep63-check/metadata.xml
index 3c8bc0ae71d4..380dca00d407 100644
--- a/app-crypt/glep63-check/metadata.xml
+++ b/app-crypt/glep63-check/metadata.xml
@@ -5,6 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer status="active">
 			<email>mgorny@gentoo.org</email>
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index ba2ba2659d40..c2a226b33803 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,5 +15,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
-EBUILD heimdal-7.6.0.ebuild 4581 BLAKE2B ef258b25af07a37f83674d2aa2fb58547dd01682813e95e8fdcd0b03540e3bf89dd8e5c842a167dea34894a50ddbc160ff48aa8dac3f0cceb50fd43835363abf SHA512 f0b167596cbd5878371fda6a27686861a6c0c5f9d9bb2db340597d7822671b2765c5fbbd86893514bfc16994c5a194385cf327ffd9a4ce99b4e6d538805c1c9f
+EBUILD heimdal-7.6.0.ebuild 4578 BLAKE2B 6e7fd5f20944725b82a4eafdf169c68d2fc7cfb3bfcbf368e82ffc64712584cfe748732049d08087ef03bfec1ee605a664015826aac967b1ded0bec1ba6e0ac9 SHA512 835430b644c0579bb8cd08d79f77aa678466b156af6196abc81a13769cee0c3b4566e7c791107006215ec1b449d5485a7f68e45440b54bc2baa302f178b9bfe0
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index b4339db5f9bd..7ce4e6e49481 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp +pkinit selinux ssl static-libs test X"
 
 CDEPEND="
diff --git a/app-crypt/jetring/Manifest b/app-crypt/jetring/Manifest
index d28eb12420fa..1253dc95e022 100644
--- a/app-crypt/jetring/Manifest
+++ b/app-crypt/jetring/Manifest
@@ -1,4 +1,6 @@
 AUX jetring-0.21-parallel.patch 762 BLAKE2B 0cdb8e21c3afcf17fdf8dc2eb3c9d9728c1139f0599572168b00cc95581f4c84072b2b3c15f188a120c65d1d9ac678ff1b7721b6e3afc62796849697ce623c1f SHA512 67f866eb53bf6aab22ff955a8ecc4ae9907f2b6cc430e12c5183a18c23488b53ec1de8271dc853f1a429463228f80aa2f90b6161a5350bc6d85db50de95a5f0b
 DIST jetring_0.25.tar.xz 208944 BLAKE2B 417565c1590f677542f81b6f457482ff1c8219317b90d12666a8b497608f5ee16466c03f68d8c4424c4bb92a0713fefb243dc621eee9cd10f7cf3495590143bd SHA512 aa9de0c7c034093789bf74c75533e678b0822cf0d1261d1b906fd5ef2decb41654bf2facc5c06b469367bb1a0fea4c862c0836fd00635779a2e8dd4f3c08ff46
-EBUILD jetring-0.25.ebuild 595 BLAKE2B a451df5ba0382a63c325eb549e27b5429f0c0f396cbd12828abf372d4691768adbdd5ddbfb588959454361c67cf49151ccda3a6469c1ad72a4731fd4ab80700a SHA512 43f69b5b8ce3550ac8d178ae12f6284956c29440eebbeedf2ddac1daedba1984f2765f17336c18b8d436b5318e3a9a3e9970f2c1597947c41df205497eaebb90
+DIST jetring_0.27.tar.xz 209376 BLAKE2B 08081611d42f63dbfd0d8c44c67932ae6428ce244f9f2c01466bae0baef54e4ccaa67f78825004a0292bc619efd44b247b7982669cf5b29b366c4c20f776984a SHA512 707f480d6b5ef2943fcd54776631d2290ec892bcccb0a3099f28262e4660d844d1db135fa4070538ffcf1ddeda00c09dd258707857e0f1af0fcadb407cca383a
+EBUILD jetring-0.25.ebuild 660 BLAKE2B 4beaf7607a56c28d9d80c5707c58757a60a9ddf5dc192ad070f2e8fb932affa52bc88dc086a04f942b0dc7a050c09d27adbe75987168367b1775adb2b71165ce SHA512 26bd7f1dfb4520d82478994cd51deb34030843db4c4caaff325e47ec4779decc7f972656bcf519fb54dd7e39149b0894c99dbe1db176487e8f5292142936eb27
+EBUILD jetring-0.27.ebuild 677 BLAKE2B ba40e08faaa387666e6bf5a3c4c1e4c7410ed870fe696d5f90d79f351c13c3120b553f063c956c21326b8b1c5dec6dc39099fe2a90ab5e7a855f9362c7e6aec2 SHA512 4961d70e626c3df8a968a6dc1902f313f1ba32564577aa9a94bef0ccc5d76f1980c19ebb965850f6e41e03b29547826167ee1c16b8f0352d704b0261047a7c78
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/jetring/jetring-0.25.ebuild b/app-crypt/jetring/jetring-0.25.ebuild
index 04664bb5eb51..1e93e84f2d90 100644
--- a/app-crypt/jetring/jetring-0.25.ebuild
+++ b/app-crypt/jetring/jetring-0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -24,6 +24,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.21-parallel.patch
 }
 
+src_compile() {
+	addpredict "/run/user/$(id -u)/gnupg/"
+	default
+}
+
 src_install() {
 	default
 
diff --git a/app-crypt/jetring/jetring-0.27.ebuild b/app-crypt/jetring/jetring-0.27.ebuild
new file mode 100644
index 000000000000..fe2d14100c31
--- /dev/null
+++ b/app-crypt/jetring/jetring-0.27.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GPG keyring maintenance using changesets"
+HOMEPAGE="http://joeyh.name/code/jetring/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.21-parallel.patch
+	eapply_user
+}
+
+src_compile() {
+	addpredict "/run/user/$(id -u)/gnupg/"
+	default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}/
+	doins -r example
+
+	doman ${PN}*.[0-9]
+}
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 5df05448dd3b..aa704d341314 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -3,5 +3,5 @@ DIST libsecret-0.18.7.tar.xz 508392 BLAKE2B 9774df97c2abb362940c3b373e381afb82ee
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
 EBUILD libsecret-0.18.6-r1.ebuild 2658 BLAKE2B c413830dc2598673d5a0f70c83bc3709c6f2749b2ee7da24da880b52b1c69af977632a45c3c654523a9f0c3271b4d5b0bae7c6c9a776e4e7a6bbe603d5acaf40 SHA512 056cfe38971719b9bc6c97ccf330fb0dd98abbb9637a3e6fd362aa89bd348ed024d415a41ac954fddd5dcf98a81284a48c78f428fab2f7fb56cae7fac3c1b7d9
 EBUILD libsecret-0.18.7.ebuild 2647 BLAKE2B d64cfb08b81738a7f0161c3b3204c5a9371bf4f5493760d06dcce5ba087d0d9cd7274475fff43d9cb265706c1721d0ba6a26456faecfe56ae4662dc9b3082675 SHA512 be27d948abff0e425af426600d95c4dbb484e542d0df9e453efcf81e738b3cd492c0c8aa4dfaa9bb2e46357c884598a770a7c8b81440b985086cf052ff68c615
-EBUILD libsecret-0.18.8.ebuild 2645 BLAKE2B 05a928c17961215211bbabe07a0f6a2199df879bbd6072b927375b4d3370da12be4e733caed48706762b24046f5d4a24bc28b8aedce685f0ea434f112e6f9bb8 SHA512 31cf0d15b0f9ac47c2ecdcd8e6d58931d9c92a2d62720e1d6047f762617debaabf1378d71716d27cae48125aea032c8bd43ac8f9e61e01b5764e525c74420f89
+EBUILD libsecret-0.18.8.ebuild 2644 BLAKE2B 31a1a8281bf6fd9ed03f188b75cec535eef51fcdb9ab3761c7e61cdbcea9fadf815be50fa1affe34b7faac956345087a2aee7908c7d654c550ef00b002f46668 SHA512 c435a380b0ce34b510822d5885d7f0e756d155295b66ded74b075e01f1d31acf8bb6c83bcacbf37fbf72cf90f32ae3c26527c6c757054f217bf016e3bb85b135
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 460fd730a7be..e0656ba4e28a 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test +vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 2add1dfdd613..f512678b6e37 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,40 +1,40 @@
+AUX nitrocli_-_fix-rust-1.35-build.patch 1766 BLAKE2B 5516cf19c40fcd8fa51e804e59d038ab00f0bc67e3db0ea8d8889e1cf2ffb523435ada7eea687bdde23ebd968cae02be20dc94ff39df968261614fb9400b7c48 SHA512 5ce260720bd15b8c5eec026b13faffbcc527e9d994ff4fa46da7636af264b73929e74ed440707aadcea60de35f0c7ab75c3a5a9c3274b316b8d488a31119330a
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
 DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7b37196edb8f33b886cdf7affece70afae6dd0b64fc4d2be10d3a01f2f0b81ed12d5c5e1cf50d39c80e68b SHA512 4c999f2fcded06d803471d08b8d9e42512a85f81974388afb3d5b450c86e5ea60e7b1fdaccc49b1e0346663827408f847e897523955edcaf397f20fe97038345
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
+DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
-DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
 DIST libc-0.2.47.crate 351491 BLAKE2B 10ff90405b911c40478793cadc9a1962e14eb4d7b4ff758554a225bb87340989bbd6089441eaa2638db93782de7d0faba20f77a7e3569a52cec40ba55eb56c06 SHA512 f0eddcbe456b1ee2da22963585ff689ad44f0f8d70af33d9bec41a1ec5a1b3dee26fbeaa29786792cd44d020fc56461b44bbb2da962662377552fa562b2694f6
+DIST libc-0.2.57.crate 408902 BLAKE2B 5c84f490037b5e108400f710da79f5471d5f76c384641bbcb721aee21da84e6a2b523487dbf5984b746d070d23c449968ed546e0bfcdfa961dfd57bfb2f3dce6 SHA512 8f210c0e28d647cd2911ad2b7d2450b6e8ea3d628c0cc68000109a7bfdd64fa31706ed7e9bda0f71b920b38a3580fce3d53fe49e9cc53b6ab9e3aeb2eae0cb8e
 DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
-DIST nitrocli-0.2.2.crate 53443 BLAKE2B b4385b6031f99719dbfde97248df07975d008b2d57fb2c6597e935b0f1d5f338ba4284988a9eb1a1b8b3d07db9b1b0f638acc30a0e6599f7ed09cf7c33211994 SHA512 76aa5e20afb7627730dbf45c6686f1b2ab7d9c6a2121a6c5827c563f4f3f5b8a293729d63cc2b17a7373bc246fd70e73f63e990c95cad7089864611148a50ea1
+DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
 DIST nitrocli-0.2.3.crate 60731 BLAKE2B 52e8a13179ef0391698b87e0172b4beae902c7586b48718538e55f2497a1d31dd645224041a81c8311512a905cd574f34f817b66b2b2f469c1a278437a6cba93 SHA512 e3467dedecc27dbe8b818c63bce9e29d22bf65af03ff53c4f85f1c3730f4b55a359dfe210875efdc8bee7e05147e066ca963d9a5ff1b68b5fc258c8a7d4d82e0
-DIST nitrokey-0.3.1.crate 24023 BLAKE2B e12a8f1a8f2366714ed762093260a001ea2d5efadd0624e5d7b710a5a3ae8bc0012fe6098c69873ca63703e6fe64cb1d9ec400be51fb0b096821769358129e61 SHA512 343f82ad6e643c7353ba5acb2eeb1cd70b4f678f579a7a14ebe5c68fd868bd03447c917495b7fe5e44c4476ca5b40754a58083ab605436c6262ff0699104e4b4
+DIST nitrocli-0.2.4.crate 63798 BLAKE2B 64a4998f9b232993692f85ca3890ecdd20e1027dee61b6f31f06be459a02f11a3cff2c035aa462ee5ea1d680f9e201e25cffdd4ca8d54de80c13d78d9a877fa4 SHA512 cf10287591d55378956118a213e4f9752087be37c67d4c89f7660f51c98dbbf3a877afaf11af7625d3776bdf2c7944b25637873af70119d514f2be93131f9733
 DIST nitrokey-0.3.4.crate 27462 BLAKE2B 07412e0d3d98a0fcaa54be3d494b107a0a4d999da41dc39f8710a5eb845911d175ca15918e212a1025a34e3ddfff89b5ca4a138d66effd47b639afcb19572ca4 SHA512 abb43ca94b7d4ba55cfabce56b712c99bc4e50671149ae2001de77c2cfae25f17465130729a4a856005a692b846c67b54b2992e41b708e8ad94a8c3af0843e20
-DIST nitrokey-sys-3.4.1.crate 61726 BLAKE2B 98a1cfa696434372d980ff5f645de77479e2e7977334df805d67d970df262e19c11c5880343c5bfc1a1b2abe7d29a34762bd90ad926c7cf7ba486e0b513c84fa SHA512 cc9cfbbebbad8a5c5846c60ad4125c87a64624ee90302327b03a94b1494d2329e45bbb09d58a3a00d465b23915faff3d3d787f64c0edcce6c63f25ab7830af13
 DIST nitrokey-sys-3.4.3.crate 61875 BLAKE2B 8c2abf91a40f54907f225c21df9d1e40ac22022a3b8229a8bd6c7a5cb8f87df74675ed5eadf6441bc81025e0cf3ebb21d8301004fe1fc76799e11568317bbf0e SHA512 ae69bc8d3fd0a58224ecfaacd159fbab4f7686daaecd96480a6c824ffbd22a8d2c948c5b2c803fa20ae41adfd4334c6462335f5d02dd7acbae0ab19b33cf0a3b
 DIST nitrokey-test-0.1.1.crate 8044 BLAKE2B de775515a73a500d3c37a58431c14a1cb6d2f715808c855466b78373f983b948b9e257f03fbcb16729a3f17a3f930ddf3eaac913955286e27e0b27f573659d04 SHA512 4dfbc79e64ed77f58599bc570b126f7975e614de07fa30b3c7da421bf184fbf059f401da42110b14eae5a953599e3875430cd4f0e117df5ce9bd03a753026cec
 DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
+DIST proc-macro2-0.4.26.crate 33854 BLAKE2B 833db134470a8f12342248c514b08463836ea22eec90162ba96364686e593e3048fe16de669316d88ed5f44b27f948613cf98f4952d49f6b5f37f2da51584c2d SHA512 e35ce0e0a05559417475abc402ef88e6214d7f27ee6cff35577077c5334ec7c6dd5d1d8099f25617391cd4fd2f54838a16ae74039ea6f99ea1d2f0ef58dec010
 DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
-DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
-DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
+DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
 DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
-DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
-DIST rand_isaac-0.1.0.crate 16011 BLAKE2B 84cd447debff595683ceb97ae2b03cb31ca6e342769dc1ccfca0a20e5bc8474ca3c40cce4bfc3be59b2bc0c849b74848f8916a2bfcf9bf7c0d54b2e8b5ae3c67 SHA512 addd5b4fb2bfdafec8b3d50f607099ce8d9fd7c5cb5cfcd6603368e5022dda7562e2deb2efcf4d5f3304f248629160f906554ed40a0d7cbb19c4b807a36dc74e
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
 DIST rand_os-0.1.1.crate 18553 BLAKE2B 5b74bbce5ee3f20f7c92204c4b60f9450b3a19518356c70737c8dad9873da775c90b8786bc75f0fa166388f6bfc585240c56445a39603704df5e99a4c505e17a SHA512 a7ccc054fd4a60e868520af3fc15e6eb22e62411975923e4d968a4825a48cbf87238338cbf1336792d996da5cc2183ac465a6bf8094358f0e5fc56380ce16193
-DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
-DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
 DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90e92ff175cb9be23e12b1a0f19f51a40075aaf66a56e32fe9b1f08eb30b2a1f47469127061542c96b4f68733780b9a SHA512 7a199c43668f7d660a28a1324ce1951cd6ec299cd98edbfde3b6a6d172e9f1a52135457673b432a0318163a5c23e541abca58607623a310f15fbefeafb50ee3b
-DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
 DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
+DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
@@ -43,6 +43,6 @@ DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2a
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.2.2-r2.ebuild 1535 BLAKE2B 7639eaea62dc5f7e2b7e51813248b33a60899ce84e20f55572716aebb14155dcd74a42339e3d9009364dc162906c1fed14f4ec9371b2dc3e729c08ee5e4f2ab6 SHA512 e45bff033b969119f3e0658d692d7a6324ba020e8212a2a48709b6aa94bfbd5df5e84ea4ecfaa98a59a62aeb312025b643f12134b8df4896b984e1146d058bb8
-EBUILD nitrocli-0.2.3-r1.ebuild 1407 BLAKE2B e8bf0442d55a5cf48f57b65b1f47c4b5f0a1cf7bfb3fd363f818353ef433af1f7e9339a3c996505f1fb78ea12a3edacc5e540d36008d9051115e025d4c10ea57 SHA512 a4533889b8e9bc753489bb1f1f9a419ce46b52a96733649b5c153647c1983f589d334a3f6ab29f3ff8badf2d728b155cd0d2315715f34855c6956656d26fa407
+EBUILD nitrocli-0.2.3-r1.ebuild 1500 BLAKE2B d87f8fadc7af892145f84191279938cec8d4c39b56a8c2bb2c9bd33e9107f97cf29dfa7cd3b61d541c42b5661ea8e4469a61d6892eb63ad06da0dc2ae710a94f SHA512 e6eacfb0442e915ccb3d164ceb0229fc94b8fdf04d82a3a41ff6f29273cfd0348e1a06db4561ef121d6e4fb79df5ef95ba79f95aa4c563dd8458dc14a9ea868f
+EBUILD nitrocli-0.2.4.ebuild 1382 BLAKE2B 3757d9ddfeb7b0be189d95f2ab63be087996dcde5009524db2d7bd66d7bafdaca71dbd6495d5a855411f966d080ae4908a77d9489b24bd5bca567127fc596d7d SHA512 3a566cf66fdbb387adb6027215d6b3d52c2833620ae4a318647c243ffa0446d9c780112790f2be5b2178a91f6901c1c1781b0a2c79ac32389f9f4bbd10497702
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch b/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
new file mode 100644
index 000000000000..d5da3b1f48de
--- /dev/null
+++ b/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
@@ -0,0 +1,52 @@
+From 5383aa73b339e6a53ff027ee6012a3428f67466a Mon Sep 17 00:00:00 2001
+From: Daniel Mueller <deso@posteo.net>
+Date: Fri, 24 May 2019 17:39:14 -0700
+Subject: [PATCH] Allow for unused doc comments on macros
+
+With Rust 1.35 we get compile errors due to doc comments that are added
+to macro invocations but not actually included in the expanded output.
+The rustc wrongly assumes that we want to document the resulting code
+and not just provide details about the invocation itself.
+This change explicitly allows for those cases. Alternatively we could
+have "downgraded" the doc comments to normal comments or removed them
+altogether. There is little difference between those alternatives.
+---
+ nitrocli/src/args.rs     | 2 ++
+ nitrocli/src/pinentry.rs | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs
+index 7f0bfc..7e4f83 100644
+--- a/nitrocli/src/args.rs
++++ b/nitrocli/src/args.rs
+@@ -101,6 +101,7 @@ impl<'io> Stdio for ExecCtx<'io> {
+ }
+ 
+ /// The available Nitrokey models.
++#[allow(unused_doc_comments)]
+ Enum! {DeviceModel, [
+   Pro => "pro",
+   Storage => "storage"
+@@ -116,6 +117,7 @@ impl From<DeviceModel> for nitrokey::Model {
+ }
+ 
+ /// A top-level command for nitrocli.
++#[allow(unused_doc_comments)]
+ Enum! {Command, [
+   Config => ("config", config),
+   Lock => ("lock", lock),
+diff --git a/nitrocli/src/pinentry.rs b/nitrocli/src/pinentry.rs
+index 837032..8bab65 100644
+--- a/nitrocli/src/pinentry.rs
++++ b/nitrocli/src/pinentry.rs
+@@ -30,6 +30,7 @@ type CowStr = borrow::Cow<'static, str>;
+ ///
+ /// The available PIN types correspond to the PIN types used by the Nitrokey devices:  user and
+ /// admin.
++#[allow(unused_doc_comments)]
+ Enum! {PinType, [
+   Admin => "admin",
+   User => "user"
+-- 
+2.21.0
+
diff --git a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
index 41cca617eb9e..fb74af29209c 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
@@ -46,7 +46,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 BDEPEND="
@@ -67,6 +67,11 @@ RDEPEND="
 RESTRICT="test"
 QA_FLAGS_IGNORED="/usr/bin/nitrocli"
 
+src_prepare() {
+	eapply -p2 "${FILESDIR}/${PN}_-_fix-rust-1.35-build.patch"
+	default
+}
+
 src_install() {
 	cargo_src_install --path=.
 
diff --git a/app-crypt/nitrocli/nitrocli-0.2.2-r2.ebuild b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
index 653a9ce8ef2a..9ee7ee1a7e43 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.2-r2.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
@@ -8,40 +8,30 @@ aho-corasick-0.6.9
 argparse-0.2.2
 base32-0.4.0
 bitflags-1.0.4
-cc-1.0.28
+cc-1.0.37
 cfg-if-0.1.6
 cloudabi-0.0.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
+fuchsia-cprng-0.1.1
 lazy_static-1.2.0
-libc-0.2.45
-libc-0.2.45
-memchr-2.1.2
-nitrocli-0.2.2
-nitrokey-0.3.1
-nitrokey-sys-3.4.1
+libc-0.2.57
+memchr-2.1.3
+nitrocli-0.2.4
+nitrokey-0.3.4
+nitrokey-sys-3.4.3
 nitrokey-test-0.1.1
-proc-macro2-0.4.24
-quote-0.6.10
-rand-0.6.1
-rand-0.6.1
-rand_chacha-0.1.0
-rand_core-0.3.0
-rand_hc-0.1.0
-rand_isaac-0.1.0
-rand_pcg-0.1.1
-rand_xorshift-0.1.0
+proc-macro2-0.4.26
+quote-0.6.11
+rand_core-0.3.1
+rand_core-0.4.0
+rand_os-0.1.3
+rdrand-0.4.0
 regex-1.1.0
-regex-syntax-0.6.4
-rustc_version-0.2.3
-semver-0.9.0
-semver-parser-0.7.0
-syn-0.15.23
+regex-syntax-0.6.5
+syn-0.15.26
 thread_local-0.3.6
 ucd-util-0.1.3
 unicode-xid-0.1.0
 utf8-ranges-1.0.2
-version_check-0.1.5
 winapi-0.3.6
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
@@ -50,12 +40,12 @@ winapi-x86_64-pc-windows-gnu-0.4.0
 inherit cargo
 
 DESCRIPTION="A command line application for interacting with Nitrokey devices"
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 BDEPEND="
@@ -80,5 +70,5 @@ src_install() {
 	cargo_src_install --path=.
 
 	einstalldocs
-	doman "${S}/doc/nitrocli.1"
+	doman "doc/nitrocli.1"
 }
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 88f39470e60f..98720a94fe55 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,5 +1,5 @@
 DIST osslsigncode-1.7.1.tar.gz 127631 BLAKE2B f0ced06a33968f03558e189fc9ed2340dba2cdfe823422c760d62476446646f198aed1a95f99734f80e7ec71d23cd286a23e68953f7e432a9a6ff048c76cae63 SHA512 cc5a7e0c5baa2a98db93f1d2cc9d86e732e2a8a55fc20bf8e6aa67e2120af37c6be857dfe4b8eb8c82fd40604dbb3c845190b59c7e6b4147f06b710a256b877f
 DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
-EBUILD osslsigncode-1.7.1.ebuild 566 BLAKE2B b1c16506dc3f8bc5365de9f1012ad43e3f7d24c612b2f165b6a446531e240344a83d92485534e2e164f0c1f0bc4db1e5b339642e206dcce08bf9f9598a7e24e5 SHA512 00925defbd2447e2c4177624d39bcaf203f5600d73eaf6e15fc111119b6ae2a704bf53e7d020b88598ef7709d866b08affbdcac730430de9986440123e5dd1c5
+EBUILD osslsigncode-1.7.1.ebuild 582 BLAKE2B d95a1ad0de96294087a2ab81446ae718438661257a864b4525232c2b91029f68313932186f2a854e4ed2498c0fed9be49054b30c95a46938149918fd5e689779 SHA512 29cbf1ff27b7f04a7a00e02697a39a02b2222e9b23a7d507708db3b322c3ed7443fba4781cd900d3abd8c5a325020f97df1edf0aff5a152b68d594ebe0c40f53
 EBUILD osslsigncode-2.0.ebuild 661 BLAKE2B 6f1a7d79ad04c62a74675e0f0d8d96a7cc315d00d39c6bbc431433b51066016e2830794184a1e9ff6b5862024f382edab3233f2e7ce16158559c077d5410a6d6 SHA512 dc9e8de629017762d7599223597b583200a521a16739edff3d0137e237fa96c829eebc84e129656844ed74169d0c1dbf7e30b0fed828cb864585c24fe3d76a15
 MISC metadata.xml 249 BLAKE2B e2269cf35520934d37b0cace5aaa64dc71ba9917bb90ef01e3ddb5e0208ffd0e2c650008fe88df51ebf6c5c304dbf7670608712f4229cacf62f9c7a747fb8f00 SHA512 9d2ea5145e05b199a7c1cff11164a7eaa9179fec4149b5a0c6f17c5c689d041d68243f4e1cc550617f9649f72ca77d7cadf3d488d1c6cab31bdbdb3fdc26aa9a
diff --git a/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild b/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild
index 4ea247315fc2..6962aa2c45f2 100644
--- a/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild
+++ b/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,12 +12,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="curl libressl"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
+	curl? ( net-misc/curl )
+	!libressl? ( =dev-libs/openssl-1.0*:0= )
 	libressl? ( dev-libs/libressl:0= )
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	econf $(use_with curl)
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 15d433f1418b..2f93b6b1044a 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,6 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
 DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
-EBUILD qca-2.2.0.ebuild 1965 BLAKE2B 9215472e01605560d3210345f76ae74f95f9909db4639c8e6b09762f10daa71e27494d22f68a936e60659da33eed583f10e976703259e72d7693c36bef2a9c0b SHA512 4955ec3ffe41fb89d19d722772a58eb4ac023d5957bed4e9a62baed6d0263ec8e33e3e3798390a297f034385d18679f5c12e279466631ad6a1ab59c6b5080cc9
+EBUILD qca-2.2.0.ebuild 1964 BLAKE2B ef9a051a8b339344646e78a52a517c988d14e36a1cca62d5d797417e8fcb17bdaea256bc7f6344ff146c05d5e429a4b5fbd50bd7cc1d039597fea206b9f402e5 SHA512 7cd82c7168ea8f43ae92dc5dc3843a4a4035417c067a1bdafea18d2ee3ee43070b6cbe95a793a8f3711d4c7929f252c646ba1f8324431d663cf5b9fd2cf36d19
 EBUILD qca-2.2.1.ebuild 1967 BLAKE2B a41078f18a95acc876566fda3d9a3018b5f1d8befc9cff5c6e1054f42a653cfd39f079430afb11e119d672c51048de2bb981b758585aeb78dbec21cd9122775b SHA512 ad17644227fb282cbcebb15510a070d283e5eb7e783f3bd7acf2611a7d7006ab7925d0e25017872f442259f22d97f5b0792cac28d818a83035a2732ba6dbdd37
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
index af427423f54d..6052b0094ada 100644
--- a/app-crypt/qca/qca-2.2.0.ebuild
+++ b/app-crypt/qca/qca-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
 
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 1e0dfb84b687..a5ae33cf196a 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,5 +1,3 @@
-DIST signing-party_2.7.orig.tar.gz 201320 BLAKE2B 4fe5781b610dc8acd5166fc7ce7daa1b856f6617952d5eb226cae0c8c6fcaa196b88ffe313b2d71b8f11423a81e84f2124d9adea86edbfb0d22808473d1c36fe SHA512 d1599ca0cb2dd554b4688bc8c77f4a1dd907d00539bb11abe147300dd2184f8548ebe9fdf793e83e2956a220b1c4bf9e19bd543b77f724b0c8ea4794ac945985
 DIST signing-party_2.9.orig.tar.gz 222606 BLAKE2B 5c7fd8fdb4945f3155d5dc146716ae402c72ec3cc728feb5b3d009878d88313ed26dbf4461820346bd3340ec84d9a439dfd52950452ad796bf1fbc98a342ff6a SHA512 31a0f15f679c0339753bafbac645609e9e16f3da2c5105c33e87e0f258453b3101f188398a7c1509fe5c005339289ac5465ccb18631a526d231c714f9ed61d96
-EBUILD signing-party-2.7.ebuild 2990 BLAKE2B 8abcd322db7149bf2eed60b099bd6cea5281d446148c61c75f59350fa8e718f637609aa91eaec4e5ae0a12d9edbb024bdb9820bf32b02f9cbe5b7e2de70029bf SHA512 31e56b7b2ce039a565b0010acf284a6aef90f479de63912bdcce72b4b2c27c896cfeed50c9e7096ed7ae3a2b9483953a1909e5a03c8f841adb4e7ace377a667c
-EBUILD signing-party-2.9.ebuild 2732 BLAKE2B 48ead04f0e21b455a986c0e3b3e921a7c3e82a2c04ffbbc14b68bc8cf0804e02a5b8a2d394f981c09929912d8dea4cc0e90d0221a24d8935e2a951c4c137d97a SHA512 6a0c2ada8b63f220162795bb5b736b7f28896c45b49aea2a1275574c6f640f18181e12a7769954b8214125529dbc788e764e4661e388f5534940c5d4a3da59e9
+EBUILD signing-party-2.9.ebuild 2731 BLAKE2B 173c2cb4d3b371c085bba45252ed049ee3738092b1dea0e3d175c88b585c96713f72adaf35dba82079f45578657f3d6266b38e58e0f28347f591d53a769b7605 SHA512 0c1b0ba4495c199a1a69d287c4bdfc8eec952bfaab3975f7ef47b5d91e6abc48b4652e85aaad2ed78dbe5d04d278f2935de596ae2615cc13740b72565b01d704
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/signing-party/signing-party-2.7.ebuild b/app-crypt/signing-party/signing-party-2.7.ebuild
deleted file mode 100644
index 4e555984e3e7..000000000000
--- a/app-crypt/signing-party/signing-party-2.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="https://salsa.debian.org/signing-party-team/signing-party"
-SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl
-	app-crypt/libmd"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.3.92
-	dev-perl/GnuPG-Interface
-	dev-perl/Text-Template
-	dev-perl/MIME-tools
-	net-mail/qprint
-	>=dev-perl/MailTools-1.62
-	dev-perl/Net-IDN-Encode
-	virtual/mailx
-	virtual/mta
-	|| (
-		dev-perl/libintl-perl
-		dev-perl/Text-Iconv
-		app-text/recode
-	)"
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# app-crypt/keylookup
-	rm -r keylookup || die
-	# media-gfx/springgraph
-	rm -r springgraph || die
-
-	cd keyanalyze/pgpring || die
-	sed -i 's/AM_C_PROTOTYPES//' configure.ac || die
-	eautoreconf
-	cd "${WORKDIR}" || die
-
-	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
-
-	sed -i "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
-		caff/caff || die
-	sed -i -e 's/automake[^ ]*/true/g' -e 's/autoconf[^ ]*/true/g' keyanalyze/Makefile || die
-	sed -i 's/make /\$(MAKE) /' keyanalyze/Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		STRIP=true
-}
-
-src_install() {
-	einstalldocs
-
-	# Check Makefile when a new tool is introduced to this package.
-	# caff
-	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
-	docinto caff
-	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
-	# gpgdir
-	dobin gpgdir/gpgdir
-	docinto gpgdir
-	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
-	# gpg-key2ps
-	dobin gpg-key2ps/gpg-key2ps
-	docinto gpg-key2ps
-	dodoc gpg-key2ps/README
-	# gpglist
-	dobin gpglist/gpglist
-	# gpg-mailkeys
-	dobin gpg-mailkeys/gpg-mailkeys
-	docinto gpg-mailkeys
-	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
-	# gpgparticipants
-	dobin gpgparticipants/gpgparticipants
-	# gpgwrap
-	dobin gpgwrap/bin/gpgwrap
-	docinto gpgwrap
-	dodoc gpgwrap/{LICENSE,NEWS,README}
-	doman gpgwrap/doc/gpgwrap.1
-	# gpgsigs
-	dobin gpgsigs/gpgsigs
-	insinto /usr/share/signing-party
-	# keyanalyze
-	# TODO: some of the scripts are intended for webpages, and not really
-	# packaging, so they are NOT installed yet.
-	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
-	dobin keyanalyze/{keyanalyze,process_keys}
-	docinto keyanalyze
-	dodoc keyanalyze/{README,Changelog}
-	# See app-crypt/keylookup instead
-	#dobin keylookup/keylookup
-	#docinto keylookup
-	#dodoc keylookup/NEWS
-	# sig2dot
-	dobin sig2dot/sig2dot
-	dodoc sig2dot/README.sig2dot
-	# See media-gfx/springgraph instead
-	#dobin springgraph/springgraph
-	#dodoc springgraph/README.springgraph
-	# all other manpages, and the root doc
-	doman */*.1
-	dodoc README
-}
diff --git a/app-crypt/signing-party/signing-party-2.9.ebuild b/app-crypt/signing-party/signing-party-2.9.ebuild
index 15cc4572eb2f..cd273b6a7680 100644
--- a/app-crypt/signing-party/signing-party-2.9.ebuild
+++ b/app-crypt/signing-party/signing-party-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl
 	app-crypt/libmd"
diff --git a/app-crypt/stoken/Manifest b/app-crypt/stoken/Manifest
index de91d1f9d782..8af76717363f 100644
--- a/app-crypt/stoken/Manifest
+++ b/app-crypt/stoken/Manifest
@@ -1,3 +1,3 @@
 DIST stoken-0.92.tar.gz 117212 BLAKE2B 8d236a73b0626ab91d145d01fa07c28ba8c54a3053aaba32b64b4dacc39dc8265d5740630ec2495d678c975b1bfa480a79a5ec1115accf39170229b444673f48 SHA512 b41262320c24e487ece884fc431d835c787f057947a92e3d57ed2047bc02b576b072e8a69f4b58b47ab1f913b5ae8c3ee8108d3b55c1477f15848420b668fea3
-EBUILD stoken-0.92.ebuild 635 BLAKE2B 4ad1ad155df7f4f933cbd9137637ef5f9dbeea5be8722b1ce7d9afe5df0cbdfe0b0d9e9e21803a1d3338adf6a5e6e5c6ca24ecae5daa543e67846967e86bab58 SHA512 207e1881941c7b3a8307b8d885d7105edd1b1c1ac56e987bb5b957e7987a08d18e0230c1ea2db5e70bc4cbe2d8d3ad27a0866a693f2ae009de83d803d387b30a
+EBUILD stoken-0.92.ebuild 634 BLAKE2B beb51228bcf4b262ec2e2173e430e6886dbc50607d031a11b7b508da8f599046554d33f032b5f04dd2e15cd6c0cf0ceb00019fbe23362ce4c45e6d6b4469c1c0 SHA512 0eb9a2d3b7947f586bcc96a306005a102595f4e7456d17f1e8e3a5cf451a8c0ffd31d535f774d0d97f50c4a2c51da5c0c657ae6f9b104d1dbcfb95c4b2d330e3
 MISC metadata.xml 620 BLAKE2B 2655c4310ae4cc76e7609e4646879d81ef6ee26b9dff67b922822c89de19416c96bd63762920633ff4e018c8431fbb45f8dc93971f2fb8afbe1dd66c8ea2e318 SHA512 bda231308c073a40db47dfaca96c6af8bf194d5ef4727e8c8c99ad1492150f79a9978daeb3ffe503db03501a0a6c6c465d036bec7ad58398319f8d01d27f7931
diff --git a/app-crypt/stoken/stoken-0.92.ebuild b/app-crypt/stoken/stoken-0.92.ebuild
index 06a2e2468cfd..5774eec2cf50 100644
--- a/app-crypt/stoken/stoken-0.92.ebuild
+++ b/app-crypt/stoken/stoken-0.92.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="gtk"
 
 #	|| ( dev-libs/nettle dev-libs/libtomcrypt )    libtomcrypt is not packaged
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 1f98875df8bb..9c14fe83440b 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,6 +1,6 @@
-AUX tpm2-abrmd-2.0.3-build.patch 2266 BLAKE2B ae973682cd38c80405bbfb6c1cee5070c4df08579fe82dc169c04ff547f73d851eeeae0eafea8119dfe6569caace196ef1c523a673f6227ebfa2553cde631c47 SHA512 87ed96de2c8bd39b89e5570540ba84735b0fc3ded0c804b349f0d6588047b93df0df4fddacbe0e73c88c354ff38e9c8646a32eaf105de9f580f278be67a2b3e3
+AUX tpm2-abrmd-2.1.1-build.patch 4350 BLAKE2B 9d8dd854954bb79239a2b443d7d6a8eb4ada564036ef480438d716f06c30ec5d45476d1fee194fbb669d323ea4c67bb7f049f6acd3745ab5f8284cb8efab1e6e SHA512 2fb6f5a63928064612175f822a41295e1c74afe3850ff4b2709384bc7eb54e5ec14a2af60b8720500fa5d91a102a89d9c6b177e8cd880e3f2f8dafc9f82e08d8
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
-DIST tpm2-abrmd-2.0.3.tar.gz 563029 BLAKE2B 89c20066b05818825a2addacaf123568ec095d021e9811b78d11c336af9a9e97fe280a08b4478331663efd1da9b2db54207ca53728398aefe4407bfe4b0c7efd SHA512 70b431b9d09e1c1db819aabf6ca8e40a7553573339f43a6c872ad685b7822e5046bd8ede25dcd0608ce2d8fa32257f6c1dd7f234aa7d6a447ac795625d4e0fac
-EBUILD tpm2-abrmd-2.0.3.ebuild 1188 BLAKE2B 51842982c3644e7007cc827211bc342c0366110d81c10735d096fec3f4ee7332aeb5307f1ca9ecded8015bf2b6ab494e2fe0a4b80aab9ff8e9ff5fd99625f0cd SHA512 2861c1d3b622bbc33b676dd928c481763fab431735a944cf9ad2265656acf97fe1d2cf33fc4854de43d916aafd377e18cf96873f2719e2e1bccf048f93c18636
+DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
+EBUILD tpm2-abrmd-2.1.1.ebuild 1215 BLAKE2B ede9c7f24240bbe5a22f5bdd3dcc7233fcafa38fee77979eaf8103ffa86cd60effed90dd1ee78a32a8de20558c32bb79a3d6b5196ea0174e035a685053723ec4 SHA512 bd3801de3795f6ef7261ea6d373e02eeafc5fefc200542973ee664f15187effb551f8188637d33a6ed339a379ca36c430d1fa7d0d1884ea2f95d8e59c24f4a93
 MISC metadata.xml 329 BLAKE2B 32d5f42e0427e9c83625ec972d4b266a1338c1629933628a0a32b8e4afb053468fece7f03916a983cdce9ff0a1d36d9c0f44006e7df4e383817005197a8be9a3 SHA512 920412d7cae5cfe3cd9a96133948b3101595edd966cc0d056934cdf45f9f4c36e1bb8fc79b0ee7146b2d1047d895de9d1fd57a7a753f4957707fad57962a9cb2
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
deleted file mode 100644
index 07c607579f12..000000000000
--- a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ecbc3bb..5973ff5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -135,7 +135,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
- #   these macros are defined in m4/flags.m4
- AX_ADD_COMPILER_FLAG([-Wall])
- AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Werror])
- AX_ADD_COMPILER_FLAG([-std=gnu99])
- AX_ADD_COMPILER_FLAG([-Wformat])
- AX_ADD_COMPILER_FLAG([-Wformat-security])
-@@ -143,19 +142,9 @@ AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
- # work around for Glib usage of function pointers type casting
- #   https://bugzilla.gnome.org/show_bug.cgi?id=793272
- AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
--AX_ADD_COMPILER_FLAG([-fdata-sections])
--AX_ADD_COMPILER_FLAG([-ffunction-sections])
--AX_ADD_COMPILER_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
- AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
- AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
- AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
--AX_ADD_LINK_FLAG([-Wl,--gc-sections])
--AX_ADD_LINK_FLAG([-Wl,--no-undefined])
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
--AX_ADD_LINK_FLAG([-Wl,-z,now])
--AX_ADD_LINK_FLAG([-Wl,-z,relro])
- 
- AC_SUBST([PATH])
- 
-From 353c5e962f46e3739b1e92cbf6b1f3eb500157fc Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Thu, 17 Jan 2019 23:56:50 +0200
-Subject: [PATCH] tests: run without X
-
-Solves:
-
-$ DISPLAY= make check
-
-FAIL: test/tss2-tcti-tabrmd_unit
-
-** (process:17633): CRITICAL **: 23:53:22.403: failed to allocate dbus proxy object:
-Error spawning command line ?dbus-launch --autolaunch=4f9189e347d5cdf343
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
-
-https://github.com/tpm2-software/tpm2-abrmd/pull/577
----
- .travis.yml | 2 +-
- Makefile.am | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b32a5fb..2598f13 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -76,7 +76,8 @@ XFAIL_TESTS = \
- TEST_EXTENSIONS = .int
- AM_TESTS_ENVIRONMENT = \
-     TEST_FUNC_LIB=$(srcdir)/scripts/int-test-funcs.sh \
--    PATH=./src:$(PATH)
-+    PATH=./src:$(PATH) \
-+    dbus-launch
- INT_LOG_COMPILER = $(srcdir)/scripts/int-test-setup.sh
- INT_LOG_FLAGS = --tabrmd-tcti=$(TABRMD_TCTI)
- 
--- 
-2.19.2
-
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
new file mode 100644
index 000000000000..e58bb7f72ef5
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
@@ -0,0 +1,118 @@
+From a0a961c05c8916863a67a61f469c717f617e1c58 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 01:03:03 +0300
+Subject: [PATCH 1/2] build: let autoconf detect system extensions
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+https://github.com/tpm2-software/tpm2-abrmd/pull/632
+
+diff --git a/configure.ac b/configure.ac
+index 35a0c21..0cc8ce8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_INIT([tpm2-abrmd],
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_CC
+ AC_PROG_LN_S
++AC_USE_SYSTEM_EXTENSIONS
+ LT_INIT()
+ PKG_INSTALLDIR()
+ AM_INIT_AUTOMAKE([foreign subdir-objects])
+@@ -151,9 +152,6 @@ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
+ AX_ADD_COMPILER_FLAG([-fpic])
+ AX_ADD_COMPILER_FLAG([-fPIC])
+ AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
+-AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
+-AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
+-AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
+ AX_ADD_LINK_FLAG([-Wl,--gc-sections])
+ AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+ AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-- 
+2.21.0
+
+From 977de33fe1499e7e8fa25f4c1247aaf9b71ba3a2 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 01:03:08 +0300
+Subject: [PATCH 2/2] build: add --disable-defaultflags
+
+Align with other tpm2 build systems.
+Enable downstream to override flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 54 ++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 31 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0cc8ce8..dc32b09 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -134,29 +134,37 @@ AS_IF([test \( "x$enable_integration" = "xyes" \) -a \( "x$enable_test_hwtpm" =
+     [AC_MSG_NOTICE([Integration tests will be executed against the TPM device.])])
+ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ 
+-# preprocessor / compiler / linker flags
+-#   these macros are defined in m4/flags.m4
+-AX_ADD_COMPILER_FLAG([-Wall])
+-AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Werror])
+-AX_ADD_COMPILER_FLAG([-std=gnu99])
+-AX_ADD_COMPILER_FLAG([-Wformat])
+-AX_ADD_COMPILER_FLAG([-Wformat-security])
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-# work around for Glib usage of function pointers type casting
+-#   https://bugzilla.gnome.org/show_bug.cgi?id=793272
+-AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
+-AX_ADD_COMPILER_FLAG([-fdata-sections])
+-AX_ADD_COMPILER_FLAG([-ffunction-sections])
+-AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+-AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
+-AX_ADD_LINK_FLAG([-Wl,--gc-sections])
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-AX_ADD_LINK_FLAG([-Wl,-z,now])
+-AX_ADD_LINK_FLAG([-Wl,-z,relro])
++AC_ARG_ENABLE([defaultflags],
++              [AS_HELP_STRING([--disable-defaultflags],
++                              [Disable default preprocessor, compiler, and linker flags.])],
++              [enable_defaultflags=$enableval],
++              [enable_defaultflags=yes])
++AS_IF([test "x$enable_defaultflags" = "xyes"],
++      [
++      # preprocessor / compiler / linker flags
++      #   these macros are defined in m4/flags.m4
++      AX_ADD_COMPILER_FLAG([-Wall])
++      AX_ADD_COMPILER_FLAG([-Wextra])
++      AX_ADD_COMPILER_FLAG([-Werror])
++      AX_ADD_COMPILER_FLAG([-std=gnu99])
++      AX_ADD_COMPILER_FLAG([-Wformat])
++      AX_ADD_COMPILER_FLAG([-Wformat-security])
++      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
++      # work around for Glib usage of function pointers type casting
++      #   https://bugzilla.gnome.org/show_bug.cgi?id=793272
++      AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
++      AX_ADD_COMPILER_FLAG([-fdata-sections])
++      AX_ADD_COMPILER_FLAG([-ffunction-sections])
++      AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
++      AX_ADD_COMPILER_FLAG([-fpic])
++      AX_ADD_COMPILER_FLAG([-fPIC])
++      AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
++      AX_ADD_LINK_FLAG([-Wl,--gc-sections])
++      AX_ADD_LINK_FLAG([-Wl,--no-undefined])
++      AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
++      AX_ADD_LINK_FLAG([-Wl,-z,now])
++      AX_ADD_LINK_FLAG([-Wl,-z,relro])
++      ])
+ 
+ AC_SUBST([PATH])
+ 
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
index 8a2bb55ac659..8d21d2b9b4c7 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable test unit) \
+		--disable-defaultflags \
 		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
 		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
 		--with-systemdpresetdisable \
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index e6d0efbdfab8..c9a33f159107 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-tools-3.1.3-libressl.patch 2589 BLAKE2B 2d949ed3d8470bbfee647e691f03ee4a53cc70230140dddba85424238670f147465eecaf85ce95696782e2cf3e8229fa5233300e93e33f4d48c0d56485f3d0a5 SHA512 e45ba9fa0f758105cccd4ded4422f285fdf3c8bd35240c8301ac911049618ae35ad5084045dc72658aced371a4af807dc521e830fdafe1cf9b71bc0f1a7a1325
-DIST tpm2-tools-3.1.3.tar.gz 544098 BLAKE2B 4c22ae98ed444b7d5b5f99e6a7d4cc37fcf9d46979669a2225b6f2abf8ccaaff203ccc8c816169be215c6160ce2480e4c9a0197040764013ab362dd060c29bec SHA512 37edf59e47168c42ffc66e948722753334ae3e00f3e258d9e801dffd259a763a1bf4f63b3feecf7728b4dade69ca5da15d631e1a606f68e10f7d314a1a757bdc
-EBUILD tpm2-tools-3.1.3.ebuild 682 BLAKE2B e8cdeba71654b6c0cd36f1362a1846eb5c7c0fc0b1a0bbfc0b9d7a524b9be1e5d1f7c2bc86a473ecd7e1f74baf811598ca6bda19657cffc8f581581a9f7a390b SHA512 85af6624609561725be46ca88a8d277cd578c840b3820d6ba23a9ed38c05bd70918e956c3742e09aed866fae721604bff839b876f7f3ebf941eaeabcabf8440b
+DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B aaaa9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b SHA512 c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
+EBUILD tpm2-tools-3.1.4.ebuild 693 BLAKE2B eba522790b3417c36f645a70eaed6279d3fa92711d9e9a287f9b987e36851ecfad3c638c622632da6d69b523de269c3364358bb31d0684c2beca8c361e7032a7 SHA512 2ee917cf0ae28faf2108d442e127fba4740aa0f6a8d4facf910e82bbbbd75dc3910db767fa81d960350349f02a4f82e7d3b48f108ff7d04a15d318a3e780bbc9
 MISC metadata.xml 329 BLAKE2B 4839966acc6a4c84deaf050a21adaa680d3a93e5cb17ecff79dd6818723264570b215796e9733ef9beb078b17977078bad12deb6716ee3774947502e8efbbd78 SHA512 49d92ff1f240ce29957166befc9af7af18e665a388943f81c5a3c11c6dd12a924b19ed8dfaf2656223028444bfafa63fb15a54ad6c51e7c37b55ff1fe7287912
diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
index df27445aa2b5..c9391925f760 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libressl test"
 
-RDEPEND=">=app-crypt/tpm2-tss-2.0
-	net-misc/curl
+RDEPEND=">=app-crypt/tpm2-tss-2.0:=
+	net-misc/curl:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch"
+	"${FILESDIR}/${PN}-3.1.3-libressl.patch"
 )
 
 src_configure() {
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
new file mode 100644
index 000000000000..52ea402b8f78
--- /dev/null
+++ b/app-crypt/tpm2-totp/Manifest
@@ -0,0 +1,4 @@
+AUX tpm2-totp-0.1.1-build.patch 2384 BLAKE2B 55acd1b8b8c3425542e7207653598b3c2854c84699d3b40f5f64d75e67a51868a5a8b1aca960124694ceaf3793a3f7a2f3dc51e1a3a71418502625c35785e033 SHA512 7330fccd400be74952652515b5c90a49d91e4b70a4488df18b4e34402ce03bcf2e480223a6b70d5f98b23e7fe0e8b38aa8d46012752a881498f2c804a96481f6
+DIST tpm2-totp-0.1.1.tar.gz 357787 BLAKE2B c7a24b30c155cfd5387180a2c8584497327eadd701068aa5eb3c385bbadf26f448f88c238849fbf68c4e7265f01d3783b3aa50a912070df1c2fd4485310f2299 SHA512 33a4af16a292ddd674a399bf12ce0b355d95de7014e8be11816a1d88edfd36ae222a8b7508f3aa1be3b46c7e04bf2712ee4839cf9f4f83fc308cb4f639ec5b9f
+EBUILD tpm2-totp-0.1.1.ebuild 722 BLAKE2B 2df2c7d4102da1a0d119260d802d76af2705ced973d1108b2309485407cf29805117c97009dcf47286ea97536d3eff7c13eff7057eec94a339f396ced5518c65 SHA512 961b438f32a367ef19b161355bd0e3157ec7a0ebb8fc77032a92531cd6cb5d9ab971443e47ba44035930f274efb3d5ea6b899982f41958815ce0c9c516c759d9
+MISC metadata.xml 328 BLAKE2B 7578cd490eb3c3614ff8a237bbb177830c3fc068579d7cf1e78099a718513b1120435bcb5256232ae6b2042e3282e05751fac4a16193511f450d397965822317 SHA512 c58e6858b8d127eacc0b4b3f1e5639e2d8358c7411461b90f0d6c26c556383390b12627c71fbbce3469d3b7342653393e5af804ecef02a0545961d17ca988c08
diff --git a/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch b/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch
new file mode 100644
index 000000000000..232b4f9e8682
--- /dev/null
+++ b/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch
@@ -0,0 +1,70 @@
+From 2652497a15572d2484f57fee8be252d0d5fe4f8c Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 01:39:29 +0300
+Subject: [PATCH] build: add --disable-defaultflags
+
+Align with tpm2-tss to allow downstream to provide flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 42 +++++++++++++++++++++++++-----------------
+ 1 file changed, 25 insertions(+), 17 deletions(-)
+
+https://github.com/tpm2-software/tpm2-totp/pull/39
+
+diff --git a/configure.ac b/configure.ac
+index baf596b..ac11e1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,23 +47,31 @@ AC_SUBST([LIBEXECDIR])
+ 
+ AC_CONFIG_FILES([Makefile dist/tpm2-totp.pc dist/dracut/module-setup.sh dist/initcpio/install/plymouth-tpm2-totp])
+ 
+-AX_ADD_COMPILER_FLAG([-std=c99])
+-AX_ADD_COMPILER_FLAG([-Wall])
+-AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Wformat-security])
+-AX_ADD_COMPILER_FLAG([-Werror])
+-AX_ADD_COMPILER_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+-
+-# work around GCC bug #53119
+-#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-AX_ADD_LINK_FLAG([-Wl,-z,now])
+-AX_ADD_LINK_FLAG([-Wl,-z,relro])
++AC_ARG_ENABLE([defaultflags],
++              [AS_HELP_STRING([--disable-defaultflags],
++                              [Disable default preprocessor, compiler, and linker flags.])],
++              [enable_defaultflags=$enableval],
++              [enable_defaultflags=yes])
++AS_IF([test "x$enable_defaultflags" = "xyes"],
++      [
++      AX_ADD_COMPILER_FLAG([-std=c99])
++      AX_ADD_COMPILER_FLAG([-Wall])
++      AX_ADD_COMPILER_FLAG([-Wextra])
++      AX_ADD_COMPILER_FLAG([-Wformat-security])
++      AX_ADD_COMPILER_FLAG([-Werror])
++      AX_ADD_COMPILER_FLAG([-fstack-protector-all])
++      AX_ADD_COMPILER_FLAG([-fpic])
++      AX_ADD_COMPILER_FLAG([-fPIC])
++
++      # work around GCC bug #53119
++      #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
++      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
++
++      AX_ADD_LINK_FLAG([-Wl,--no-undefined])
++      AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
++      AX_ADD_LINK_FLAG([-Wl,-z,now])
++      AX_ADD_LINK_FLAG([-Wl,-z,relro])
++      ])
+ 
+ AX_CODE_COVERAGE
+ m4_ifdef([_AX_CODE_COVERAGE_RULES],
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-totp/metadata.xml b/app-crypt/tpm2-totp/metadata.xml
new file mode 100644
index 000000000000..0509d4663725
--- /dev/null
+++ b/app-crypt/tpm2-totp/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-totp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild
new file mode 100644
index 000000000000..8b2622c25865
--- /dev/null
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Attest the trustworthiness of a device against a human using time-based OTP"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-totp"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.0:=
+	media-gfx/qrencode:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-defaultflags
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
new file mode 100644
index 000000000000..0bb11bf31ed5
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -0,0 +1,5 @@
+AUX tpm2-tss-engine-1.0.0-build.patch 2362 BLAKE2B d1e28ef019da77a9f857b90d9bce7d03a55504e0b74b7aafa2e56e417cc528b55ea8284ca9e2e30b35dd357a829b0329f26e595f9c421315c6b08ec8ac2aba80 SHA512 6a5fa163ccf8e0b24c9f1641b1c29be55d437d2e026343d9f33872fe2f2914a440884c705ec0c679130533ffa67d8ee33d475385568c57ed5d738d84b598c49d
+AUX tpm2-tss-engine-1.0.0-libressl.patch 1054 BLAKE2B 42f666eb44e61659e941758ab48bcf76c5be94be5944d7437db0671b286f038d8cee3e8754ca84fdbb0957b7e964445e798d2c494354c6ca9eff576ce45d7f6d SHA512 9b7c769d6a65ec67a522d78abb56da8c8560074a6bc1efcb300669308bfeeb39340da7c049a4c5d0a446f9e0d4e9fc03ee80ad0db52395c4a81013e11d27796d
+DIST tpm2-tss-engine-1.0.0.tar.gz 382277 BLAKE2B 6580eb83f4e9391a12df2fb9cb86ace385a9e29004a64f6ca9378d9b8f60572a7761f4f486e1010d435487fed28858737d2bb71b08e400e9551a7b83c198bbe7 SHA512 b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3
+EBUILD tpm2-tss-engine-1.0.0.ebuild 794 BLAKE2B 4d5fd45aecaa622ccfd1c53f251c9ead5988824b14ffebb5a23b74ab65a89d8fe3fa9f5fce2593a296660c8315c0cbc27d520ea2217ce905d4cdf05f6f04543b SHA512 fea4780fca65134fcbcda56994c6652e2bd934de7c8c50e26b41578596ab85d3dc4aa075d4542d1527247936b3f440ea59a52c8a0adde2caf3c548226cf58b4b
+MISC metadata.xml 334 BLAKE2B 8ee81cad095cd2c3f3a31e2b181ab678a4a51316e868bd6f84af46aa6bf87af35bea0a9d6fa0fad368175f55020e23cbdf2aed8af3ccb853bc3085db4ba82dc3 SHA512 0d38a3515c9b31fc64988812c4015a25fa8a7c6550cfe90e78f73bfcecad57d1c043da2843b5c72c7a220db1c77b1790c32cab61fa3ec970b72da7f448e12b02
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch
new file mode 100644
index 000000000000..aa2b2e4e4fd3
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch
@@ -0,0 +1,70 @@
+From 92aee12fbd246461a22925dd054c4d6394c4fdf5 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 02:30:37 +0300
+Subject: [PATCH] build: add --disable-defaultflags
+
+Align with tpm2-tss to allow downstream to provide flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 42 +++++++++++++++++++++++++-----------------
+ 1 file changed, 25 insertions(+), 17 deletions(-)
+
+https://github.com/tpm2-software/tpm2-tss-engine/pull/117
+
+diff --git a/configure.ac b/configure.ac
+index f3a399c..f59cfaf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,23 +80,31 @@ AS_IF([test "x$enable_tctienvvar" = xyes], [AC_DEFINE([ENABLE_TCTIENVVAR], [1])]
+ 
+ AC_CONFIG_FILES([Makefile])
+ 
+-AX_ADD_COMPILER_FLAG([-std=c99])
+-AX_ADD_COMPILER_FLAG([-Wall])
+-AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Wformat-security])
+-AX_ADD_COMPILER_FLAG([-Werror])
+-AX_ADD_COMPILER_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+-
+-# work around GCC bug #53119
+-#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-AX_ADD_LINK_FLAG([-Wl,-z,now])
+-AX_ADD_LINK_FLAG([-Wl,-z,relro])
++AC_ARG_ENABLE([defaultflags],
++              [AS_HELP_STRING([--disable-defaultflags],
++                              [Disable default preprocessor, compiler, and linker flags.])],
++              [enable_defaultflags=$enableval],
++              [enable_defaultflags=yes])
++AS_IF([test "x$enable_defaultflags" = "xyes"],
++      [
++      AX_ADD_COMPILER_FLAG([-std=c99])
++      AX_ADD_COMPILER_FLAG([-Wall])
++      AX_ADD_COMPILER_FLAG([-Wextra])
++      AX_ADD_COMPILER_FLAG([-Wformat-security])
++      AX_ADD_COMPILER_FLAG([-Werror])
++      AX_ADD_COMPILER_FLAG([-fstack-protector-all])
++      AX_ADD_COMPILER_FLAG([-fpic])
++      AX_ADD_COMPILER_FLAG([-fPIC])
++
++      # work around GCC bug #53119
++      #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
++      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
++
++      AX_ADD_LINK_FLAG([-Wl,--no-undefined])
++      AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
++      AX_ADD_LINK_FLAG([-Wl,-z,now])
++      AX_ADD_LINK_FLAG([-Wl,-z,relro])
++      ])
+ 
+ AX_CODE_COVERAGE
+ m4_ifdef([_AX_CODE_COVERAGE_RULES],
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
new file mode 100644
index 000000000000..66bb68e76940
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
@@ -0,0 +1,35 @@
+From deb2b6697babf99aaf3f64b342ce414b48638ea3 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 20:36:47 +0300
+Subject: [PATCH] build: libressl fix incomplete type
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/tpm2-tss-engine-rand.c:90:1: error: variable ‘rand_methods’ has initializer but incomplete type
+   90 | static RAND_METHOD rand_methods = {
+      | ^~~~~~
+src/tpm2-tss-engine-rand.c:91:5: warning: excess elements in struct initializer
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/tpm2-tss-engine-rand.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+https://github.com/tpm2-software/tpm2-tss-engine/pull/120
+
+diff --git a/src/tpm2-tss-engine-rand.c b/src/tpm2-tss-engine-rand.c
+index 50d5661..86980a5 100644
+--- a/src/tpm2-tss-engine-rand.c
++++ b/src/tpm2-tss-engine-rand.c
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ 
+ #include <openssl/engine.h>
++#include <openssl/rand.h>
+ 
+ #include <tss2/tss2_mu.h>
+ #include <tss2/tss2_esys.h>
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-tss-engine/metadata.xml b/app-crypt/tpm2-tss-engine/metadata.xml
new file mode 100644
index 000000000000..7931bebd0b34
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-tss-engine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
new file mode 100644
index 000000000000..b42ef4ae8168
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="OpenSSL Engine for TPM2 devices"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl test"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.2.2:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--disable-static
+}
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 24daf8c1cc03..8c077b2f6674 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,3 @@
-AUX tpm2-tss-2.1.0-build.patch 3044 BLAKE2B 4d166306c401e0a178626ab9c49f22ee8c69114051c753631870a65f6ae5c80a6ca710092f2ce66b0c2f5b937ec7f05f288a79cfbbaaf59b62bbe61b77e23f6b SHA512 9a3b4fce5e2403f0c9dc2ac3726efd3fd6e0e3f0b62109cce22b25e55f950aa3c2e32894460d016913eb4635fe99580bb7a14afae1677464af1c9f6b927e7f73
-AUX tpm2-tss-2.1.0-tests.patch 1066 BLAKE2B 2ec86af0165f3e50089e238760445046e073e7c9e1f69c0c739078518f83751512889f24f333fac7738539fd3c2057e42a52380003b6483400c78b68c335a75f SHA512 12b1df925a1bbc25ff00a57dbc614c2a01779c0f1849ef22f0172e343e6cc431cdc8daffa0eed271761ba17d035124532796a5072ed8fba19555e214e8b7a804
-DIST tpm2-tss-2.1.0.tar.gz 922814 BLAKE2B 06baa6b817b99c0955a5190b0f90f8a0c55987eb06feb827cb950b69992ec1623367db488617722712ce9932ad8310c1b743af038ac77508106fb8f6f4409b1c SHA512 2aea80a4cb2be59a87de6eda74a2907a2832aa76c3c208f610172f4c5bd29133b24b0876286c40855a742d6068b8f843e32f6d995b0e51c2d1e0a752b92fff7c
-EBUILD tpm2-tss-2.1.0.ebuild 1399 BLAKE2B 007296b2f01c92cd395c357b68a3b7666848b9867ebb6e077c43f1fa4015d4620aa4cd268fb4e77cc43b2022bb263ecc175f5fc8070ed47eacb9b714fe35df1d SHA512 3094d1a812a15b59b2d725c0bad668516805970f3a92e6840be7345cd5a1ce820b9775b97f8f5dc2808b8943af04edcd61a45ae570257e0def482c4ec103a70f
+DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
+EBUILD tpm2-tss-2.2.3.ebuild 1274 BLAKE2B 60f825e8f666b4bd89b01a54d9b0c0802bd0e2bc733060e4c1cd4a5d34f881bd19c33bf6e36b7d31795eaf1fa527f9fd30c8618671fad16f020a11f8357ec036 SHA512 50e563c5fe26f5c223e56d7542d92a60ca68134722a662373eba50ae0f70ce2efdee61cb5073ca8de0779d1657579a3b0ad76f967798c15ac0d0440e8c53c0dd
 MISC metadata.xml 501 BLAKE2B be53401663c21ea24b8fd7a898a30b398c5773d86b5f30cf9a8c4b2334736e09b64ea60e2f6069b765d7babc5695b64a8b38aa3020d65ff224910eb633d76ae6 SHA512 901b9e66b98cea1ee90c8f885f402d66d7fb90494d9b95a2028e4834d5750edb4945563275def32f3944f4e28ba5a3aa558abf3ffce935df1af316cb1cb1d865
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
deleted file mode 100644
index 85f84c38e1f1..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Next version removes these using --disable-defaultflags
-
----
-
-diff --git a/configure.ac b/configure.ac
-index c42b487f..f9118642 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -189,19 +189,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
- 
- gl_LD_VERSION_SCRIPT
- 
--AX_ADD_COMPILER_FLAG([-std=c99])
--AX_ADD_COMPILER_FLAG([-Wall])
--AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Wformat-security])
--AX_ADD_COMPILER_FLAG([-Werror])
--AX_ADD_COMPILER_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
--
--AX_ADD_PREPROC_FLAG([-D_DEFAULT_SOURCE])
--AX_ADD_PREPROC_FLAG([-D_BSD_SOURCE])
--AX_ADD_PREPROC_FLAG([-D_POSIX_SOURCE])
--
- AC_ARG_WITH([maxloglevel],
-             [AS_HELP_STRING([--with-maxloglevel={none,error,warning,info,debug,trace}],
-                             [sets the maximum log level (default is trace)])],
-@@ -227,20 +214,9 @@ AC_ARG_ENABLE([debug],
-             [enable_debug=$enableval],
-             [enable_debug=no])
- AS_IF([test "x$enable_debug" = "xyes"], AX_ADD_COMPILER_FLAG([-ggdb3 -Og]))
--AS_IF([test "x$enable_debug" = "xno"], [AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
--                                        AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
--                                        AX_ADD_COMPILER_FLAG([-g -O2])])
--AX_ADD_LINK_FLAG([-Wl,--no-undefined])
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
--AX_ADD_LINK_FLAG([-Wl,-z,now])
--AX_ADD_LINK_FLAG([-Wl,-z,relro])
- 
- AC_SUBST([PATH])
- 
--# work around GCC bug #53119
--#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
--AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
--
- dnl ---------  Physical TPM device -----------------------
- 
- AC_ARG_WITH([ptpm],
-From 74037d3c15b9f9d98f9b50ca4f1c1a99d239d751 Mon Sep 17 00:00:00 2001
-From: Philip Tricca <flihp@twobit.org>
-Date: Sun, 4 Nov 2018 16:17:19 -0800
-Subject: [PATCH] build: Fix breakage in generated configure script when CFLAGS
- is set.
-
-This fixes a bug introduced in 3980bad87fe18ad9d32914e9d21dba145eba973f.
-That patch references the documentation for AC_PROG_CC but it misread
-the recommended workaround. The leading colon (aka `:`) in the
-documentation is significant.
-
-The `:` is a shell 'builtin' command that is equivalent to invoking the
-'true' command. By placing the conditional substitution of the CFLAGS
-after this, the result of the substitution will be ignored and the
-script won't fail. Without this the contents of the CFLAGS variable set
-in the environment will be interpreted as a command and since they're
-not commands the configure script will abort.
-
-Signed-off-by: Philip Tricca <flihp@twobit.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4e4592e..f88fe38b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,7 +31,7 @@ AC_INIT([tpm2-tss],
-         [],
-         [https://github.com/tpm2-software/tpm2-tss])
- AC_CONFIG_MACRO_DIR([m4])
--${CFLAGS=""}
-+: ${CFLAGS=""}
- AC_PROG_CC
- LT_INIT()
- AM_INIT_AUTOMAKE([foreign
--- 
-2.19.2
-
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch
deleted file mode 100644
index d537c40e1a90..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1ea85a32c0ae20a104badcec807b72ef458d356d Mon Sep 17 00:00:00 2001
-From: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de>
-Date: Tue, 25 Sep 2018 09:35:33 +0200
-Subject: [PATCH] ESYS: Fix crypto_ossl return code
-
-Fix returncode and thus test of interal hmac_finish function.
-
-Fixes: #1157
-
-Signed-off-by: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de>
----
- src/tss2-esys/esys_crypto_ossl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tss2-esys/esys_crypto_ossl.c b/src/tss2-esys/esys_crypto_ossl.c
-index 43088f4a..91871de1 100644
---- a/src/tss2-esys/esys_crypto_ossl.c
-+++ b/src/tss2-esys/esys_crypto_ossl.c
-@@ -448,7 +448,7 @@ iesys_cryptossl_hmac_finish(IESYS_CRYPTO_CONTEXT_BLOB ** context,
-     IESYS_CRYPTOSSL_CONTEXT *mycontext =
-         (IESYS_CRYPTOSSL_CONTEXT *) * context;
-     if (mycontext->type != IESYS_CRYPTOSSL_TYPE_HMAC) {
--        return_error(TSS2_ESYS_RC_BAD_VALUE, "bad context");
-+        return_error(TSS2_ESYS_RC_BAD_REFERENCE, "bad context");
-     }
- 
-     if (*size < mycontext->hmac.hmac_len) {
--- 
-2.19.2
-
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
index 07b4fb47e677..8496a3630e8c 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info udev
+inherit linux-info udev user
 
 DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
@@ -21,36 +21,28 @@ REQUIRED_USE="
 
 RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
 	openssl? ( dev-libs/openssl:0= )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig
-	~sys-devel/autoconf-archive-2018.03.13
 	doc? ( app-doc/doxygen )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
-
 pkg_setup() {
 	local CONFIG_CHECK=" \
 		~TCG_TPM
 	"
 	linux-info_pkg_setup
 	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
 
-src_prepare() {
-	default
-	eautoreconf
+	enewgroup tss
+	enewuser tss -1 -1 /var/lib/tpm tss
 }
 
 src_configure() {
-	# next version add --disable-defaultflags
 	econf \
 		$(use_enable doc doxygen-doc) \
 		$(use_enable static-libs static) \
 		$(use_enable test unit) \
+		--disable-defaultflags \
 		--with-crypto="$(usex gcrypt gcrypt ossl)" \
 		--with-udevrulesdir="$(get_udevdir)/rules.d" \
 		--with-udevrulesprefix=60-
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
commit	2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree	c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /app-crypt
parent	6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)