gentoo resync : 02.06.2019

25 files changed, 109 insertions, 97 deletions

diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index fb8a6ddfb78a..9ca2c12983bf 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acme-0.34.2 b/metadata/md5-cache/app-crypt/acme-0.34.2
index e05a8e3b7b3b..de56f4fdab8f 100644
--- a/metadata/md5-cache/app-crypt/acme-0.34.2
+++ b/metadata/md5-cache/app-crypt/acme-0.34.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.34.2.tar.gz -> certbot-0.34.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0a478dfd1a533e59ae54da7cefa203e2
+_md5_=dcbc291fa704e48b6562dd08347cf22e
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index 280a8635f322..8eabb596f543 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dcfd7044805ceca0badda663d4ba4294
+_md5_=b6c4dd4d981e09d5f383f348e46c63fa
diff --git a/metadata/md5-cache/app-crypt/bestcrypt-2.0.14 b/metadata/md5-cache/app-crypt/bestcrypt-2.0.14
deleted file mode 100644
index e75ee2409af9..000000000000
--- a/metadata/md5-cache/app-crypt/bestcrypt-2.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=virtual/linux-sources app-shells/bash kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=commercially licensed transparent filesystem encryption
-EAPI=7
-HOMEPAGE=https://www.jetico.com/
-IUSE=kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=bestcrypt
-RDEPEND=kernel_linux? ( virtual/modutils )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://www.jetico.com/linux/BestCrypt-2.0.14.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c58694ff9c24082e4edc431f148e5830
diff --git a/metadata/md5-cache/app-crypt/gcr-3.28.1 b/metadata/md5-cache/app-crypt/gcr-3.28.1
index ad6d7d1a1829..a7ab111c842f 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.28.1
+++ b/metadata/md5-cache/app-crypt/gcr-3.28.1
@@ -4,11 +4,11 @@ DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gcr
 IUSE=debug gtk +introspection +vala test
-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
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) !<gnome-base/gnome-keyring-3.3
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.28/gcr-3.28.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4cf164ee558c7df7c716d74253e69c15
+_md5_=feb3d22d8a125c86a5edd8e17be77a14
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.6.0 b/metadata/md5-cache/app-crypt/heimdal-7.6.0
index 29f79a186d00..47d662c82671 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.6.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=Kerberos 5 implementation from KTH
 EAPI=7
 HOMEPAGE=http://www.h5l.org/
 IUSE=afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp +pkinit selinux ssl static-libs test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-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
 LICENSE=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.6.0/heimdal-7.6.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=aa519ec607665ac01d58bb0d45562a6a
+_md5_=2f42a9b14f54aae87461ea9b55f2eeb7
diff --git a/metadata/md5-cache/app-crypt/jetring-0.25 b/metadata/md5-cache/app-crypt/jetring-0.25
index 29a3f1569bff..e6e44063588e 100644
--- a/metadata/md5-cache/app-crypt/jetring-0.25
+++ b/metadata/md5-cache/app-crypt/jetring-0.25
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=app-crypt/gnupg
 DESCRIPTION=GPG keyring maintenance using changesets
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=app-crypt/gnupg dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.25.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b44891adeda657cf64ec8895c97f9d2d
+_md5_=9069b77a055ff6cea97bbfdccd5ddb0a
diff --git a/metadata/md5-cache/app-crypt/jetring-0.27 b/metadata/md5-cache/app-crypt/jetring-0.27
new file mode 100644
index 000000000000..8c389df48b12
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/jetring-0.27
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-crypt/gnupg
+DESCRIPTION=GPG keyring maintenance using changesets
+EAPI=7
+HOMEPAGE=http://joeyh.name/code/jetring/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/gnupg dev-lang/perl
+SLOT=0
+SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.27.tar.xz
+_md5_=e86ebe617105979acd30d7ad8482f3f1
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.8 b/metadata/md5-cache/app-crypt/libsecret-0.18.8
index 326d7c65e8d9..b93d4578f80c 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.8
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.8
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 IUSE=+crypt +introspection test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-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
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.44:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c34b887d88a5758ee4233ff1cb46ec21
+_md5_=6406398ad149ec8fa978c23ad6c121da
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.2-r2 b/metadata/md5-cache/app-crypt/nitrocli-0.2.2-r2
deleted file mode 100644
index 83fd0681743d..000000000000
--- a/metadata/md5-cache/app-crypt/nitrocli-0.2.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-libs/hidapi
-DESCRIPTION=A command line application for interacting with Nitrokey devices
-EAPI=7
-HOMEPAGE=https://github.com/d-e-s-o/nitrocli
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=dev-libs/hidapi app-crypt/gnupg
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.28/download -> cc-1.0.28.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.45/download -> libc-0.2.45.crate https://crates.io/api/v1/crates/libc/0.2.45/download -> libc-0.2.45.crate https://crates.io/api/v1/crates/memchr/2.1.2/download -> memchr-2.1.2.crate https://crates.io/api/v1/crates/nitrocli/0.2.2/download -> nitrocli-0.2.2.crate https://crates.io/api/v1/crates/nitrokey/0.3.1/download -> nitrokey-0.3.1.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.1/download -> nitrokey-sys-3.4.1.crate https://crates.io/api/v1/crates/nitrokey-test/0.1.1/download -> nitrokey-test-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.24/download -> proc-macro2-0.4.24.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.6.1/download -> rand-0.6.1.crate https://crates.io/api/v1/crates/rand/0.6.1/download -> rand-0.6.1.crate https://crates.io/api/v1/crates/rand_chacha/0.1.0/download -> rand_chacha-0.1.0.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.0/download -> rand_isaac-0.1.0.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.0/download -> rand_xorshift-0.1.0.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.4/download -> regex-syntax-0.6.4.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.23/download -> syn-0.15.23.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=05dd66e0143c88791171346f648222ec
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1 b/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
index 9395dff78be4..ce73b3680297 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
-DEFINED_PHASES=compile install test unpack
+DEFINED_PHASES=compile install prepare test unpack
 DEPEND=dev-libs/hidapi
 DESCRIPTION=A command line application for interacting with Nitrokey devices
 EAPI=7
 HOMEPAGE=https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.28/download -> cc-1.0.28.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.47/download -> libc-0.2.47.crate https://crates.io/api/v1/crates/memchr/2.1.2/download -> memchr-2.1.2.crate https://crates.io/api/v1/crates/nitrocli/0.2.3/download -> nitrocli-0.2.3.crate https://crates.io/api/v1/crates/nitrokey/0.3.4/download -> nitrokey-0.3.4.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.3/download -> nitrokey-sys-3.4.3.crate https://crates.io/api/v1/crates/nitrokey-test/0.1.1/download -> nitrokey-test-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.24/download -> proc-macro2-0.4.24.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_os/0.1.1/download -> rand_os-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.4/download -> regex-syntax-0.6.4.crate https://crates.io/api/v1/crates/syn/0.15.23/download -> syn-0.15.23.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=eeecc006db86cc33f0cf1013e9485939
+_md5_=4488b532e30a242bafb1b42731c3697d
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.4 b/metadata/md5-cache/app-crypt/nitrocli-0.2.4
new file mode 100644
index 000000000000..7ff65e9a8e97
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.2.4
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-libs/hidapi
+DESCRIPTION=A command line application for interacting with Nitrokey devices
+EAPI=7
+HOMEPAGE=https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/hidapi app-crypt/gnupg
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.37/download -> cc-1.0.37.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.57/download -> libc-0.2.57.crate https://crates.io/api/v1/crates/memchr/2.1.3/download -> memchr-2.1.3.crate https://crates.io/api/v1/crates/nitrocli/0.2.4/download -> nitrocli-0.2.4.crate https://crates.io/api/v1/crates/nitrokey/0.3.4/download -> nitrokey-0.3.4.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.3/download -> nitrokey-sys-3.4.3.crate https://crates.io/api/v1/crates/nitrokey-test/0.1.1/download -> nitrokey-test-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.26/download -> proc-macro2-0.4.26.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.5/download -> regex-syntax-0.6.5.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=b08bfdf44737433d301b9370dfd933ef
diff --git a/metadata/md5-cache/app-crypt/osslsigncode-1.7.1 b/metadata/md5-cache/app-crypt/osslsigncode-1.7.1
index a47aacbe39b4..2a556c0f624b 100644
--- a/metadata/md5-cache/app-crypt/osslsigncode-1.7.1
+++ b/metadata/md5-cache/app-crypt/osslsigncode-1.7.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl ) virtual/pkgconfig
+DEPEND=curl? ( net-misc/curl ) !libressl? ( =dev-libs/openssl-1.0*:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=Platform-independent tool for Authenticode signing of EXE/CAB files
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/osslsigncode
 IUSE=curl libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl )
+RDEPEND=curl? ( net-misc/curl ) !libressl? ( =dev-libs/openssl-1.0*:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/osslsigncode/osslsigncode-1.7.1.tar.gz
-_md5_=872ac36e22c62623ec904a4a378e0b34
+_md5_=75067deddbd4156cbc8d64dc525aa5b3
diff --git a/metadata/md5-cache/app-crypt/qca-2.2.0 b/metadata/md5-cache/app-crypt/qca-2.2.0
index 29364bab83db..620829e4a78e 100644
--- a/metadata/md5-cache/app-crypt/qca-2.2.0
+++ b/metadata/md5-cache/app-crypt/qca-2.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Qt Cryptographic Architecture (QCA)
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/QCA
 IUSE=botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test
-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
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.2.0/qca-2.2.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5fb987a86eb87ed8f2310d451a98c862
+_md5_=1bdbbbc4d17c4642111bd61c72e6d3b6
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.30.1.1 b/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
index 523a14184128..6fb25ef4c8c3 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=app-crypt/gcr-3.11.91:= >=app-crypt/gpgme-1.7.0 >=x11-libs/gtk+-3.22.0:3 >=app-crypt/gnupg-2.0.12 >=app-crypt/libsecret-0.16 net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.30/seahorse-3.30.1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	340492f765f55914375a07f726621c52	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b2663cdf515231f4bb1d340545d858d7
diff --git a/metadata/md5-cache/app-crypt/signing-party-2.7 b/metadata/md5-cache/app-crypt/signing-party-2.7
deleted file mode 100644
index 59fad2248e46..000000000000
--- a/metadata/md5-cache/app-crypt/signing-party-2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl app-crypt/libmd
-DESCRIPTION=A collection of several tools related to OpenPGP
-EAPI=7
-HOMEPAGE=https://salsa.debian.org/signing-party-team/signing-party
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-crypt/libmd >=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 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.7.orig.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=197a5d6f34803ec0d4cad8e7004ee01d
diff --git a/metadata/md5-cache/app-crypt/signing-party-2.9 b/metadata/md5-cache/app-crypt/signing-party-2.9
index de7168e15127..86db367a88e7 100644
--- a/metadata/md5-cache/app-crypt/signing-party-2.9
+++ b/metadata/md5-cache/app-crypt/signing-party-2.9
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl app-crypt/libmd
 DESCRIPTION=A collection of several tools related to OpenPGP
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/signing-party-team/signing-party
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl app-crypt/libmd >=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 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.9.orig.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0904682e8b929d303908e7c78f663293
+_md5_=8d4bddee8001bedc159ffa7d1ab18bb6
diff --git a/metadata/md5-cache/app-crypt/stoken-0.92 b/metadata/md5-cache/app-crypt/stoken-0.92
index 8b6b87479841..8b3550e07456 100644
--- a/metadata/md5-cache/app-crypt/stoken-0.92
+++ b/metadata/md5-cache/app-crypt/stoken-0.92
@@ -4,10 +4,10 @@ DESCRIPTION=Software Token for Linux/UNIX
 EAPI=6
 HOMEPAGE=https://github.com/cernekee/stoken
 IUSE=gtk
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/nettle gtk? ( >=x11-libs/gtk+-3.12:3 )
 SLOT=0
 SRC_URI=https://github.com/cernekee/stoken/archive/v0.92.tar.gz -> stoken-0.92.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=42fb07b0626cc7e2fdfc0487bd47870b
+_md5_=5669af1a1c0e1beab38d61c9a34ce365
diff --git a/metadata/md5-cache/app-crypt/tpm2-abrmd-2.0.3 b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1
index 57e54a5e0f6b..9e452c2d3bec 100644
--- a/metadata/md5-cache/app-crypt/tpm2-abrmd-2.0.3
+++ b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=sys-apps/dbus:= dev-libs/glib:= app-crypt/tpm2-tss:=
 SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-abrmd/releases/download/2.0.3/tpm2-abrmd-2.0.3.tar.gz
+SRC_URI=https://github.com/tpm2-software/tpm2-abrmd/releases/download/2.1.1/tpm2-abrmd-2.1.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=1761a1e50b803a77001464a3304eb801
+_md5_=5cbad9162c3dbec4259e06658a5f0bac
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3 b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3
deleted file mode 100644
index ba3f84e9f1f2..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=>=app-crypt/tpm2-tss-2.0 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) test? ( dev-util/cmocka )
-DESCRIPTION=Tools for the TPM 2.0 TSS
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
-IUSE=libressl test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=app-crypt/tpm2-tss-2.0 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/3.1.3/tpm2-tools-3.1.3.tar.gz
-_md5_=136d4ab66c189cb65be3ce63773e87c0
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4 b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4
new file mode 100644
index 000000000000..07bc67bb7ccf
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=>=app-crypt/tpm2-tss-2.0:= net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) test? ( dev-util/cmocka )
+DESCRIPTION=Tools for the TPM 2.0 TSS
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
+IUSE=libressl test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=app-crypt/tpm2-tss-2.0:= net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/3.1.4/tpm2-tools-3.1.4.tar.gz
+_md5_=20bec7eaf66b70c9ce9cf680a416d3a5
diff --git a/metadata/md5-cache/app-crypt/tpm2-totp-0.1.1 b/metadata/md5-cache/app-crypt/tpm2-totp-0.1.1
new file mode 100644
index 000000000000..457cde71eac2
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-totp-0.1.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-crypt/tpm2-tss-2.0:= media-gfx/qrencode:=
+DESCRIPTION=Attest the trustworthiness of a device against a human using time-based OTP
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-totp
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=app-crypt/tpm2-tss-2.0:= media-gfx/qrencode:=
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-totp/releases/download/v0.1.1/tpm2-totp-0.1.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0ce8034f10a031cdc2f6de7e70395e57
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0 b/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0
deleted file mode 100644
index e30ad8402d69..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig ~sys-devel/autoconf-archive-2018.03.13 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=test? ( dev-util/cmocka )
-DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
-IUSE=doc +gcrypt openssl static-libs test kernel_linux
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=gcrypt? ( !openssl ) openssl? ( !gcrypt ) || ( gcrypt openssl )
-SLOT=0/0
-SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.1.0/tpm2-tss-2.1.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=9ae0dd86a2988854eeb635d75ffff3ad
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3 b/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
new file mode 100644
index 000000000000..2e0c84b13a4b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEFINED_PHASES=configure install setup
+DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) test? ( dev-util/cmocka )
+DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
+IUSE=doc +gcrypt openssl static-libs test kernel_linux
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=gcrypt? ( !openssl ) openssl? ( !gcrypt ) || ( gcrypt openssl )
+SLOT=0/0
+SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.2.3/tpm2-tss-2.2.3.tar.gz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=e39bf6501bef9b17b71c15411ecb13fb
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0 b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0
new file mode 100644
index 000000000000..1ca523b383bf
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=>=app-crypt/tpm2-tss-2.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) test? ( dev-util/cmocka )
+DESCRIPTION=OpenSSL Engine for TPM2 devices
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tools
+IUSE=libressl test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=app-crypt/tpm2-tss-2.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.0.0/tpm2-tss-engine-1.0.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=88e25df5422183dda1169cd7588538bc