gentoo resync : 30.05.2020

24 files changed, 299 insertions, 267 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bf365231b0c2..6f7cfe0ecf50 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gkeys/Manifest b/app-crypt/gkeys/Manifest
deleted file mode 100644
index e07d4f707443..000000000000
--- a/app-crypt/gkeys/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gkeys-0.2.tar.bz2 47726 BLAKE2B f85fcad78251ce8e4b49d452332af869140611161256663310c3a050f7a3c5313f6e37836d90c5a40b1abb043ff7412cea3b5decd3f1c6db24ff5811dd1b9709 SHA512 0c594b5f451329e5e85998bb96243812e0c6e7ef7fa4db0f276a870148adffcf41acc31631fb28c44c473690f154e130ddcb10b986d4546ca19e2cc8cda95036
-EBUILD gkeys-0.2.ebuild 1678 BLAKE2B d00426355a870f2e831e3b3501a3213a050cda76b1479d5ff50fb074b8852f98c48b45a75f2eba73bea6b1365e14cb0546afcc4c7be888b7c3f08ddf3ea06f51 SHA512 733e2a419031d5b366bcad1ac5c32a30fddd77ced5e69df5eb9d969f2489f1f86929e459fca25899d554de9f5ffae43c936c464349c2c1edd26fa46a1dcbe2a8
-EBUILD gkeys-9999.ebuild 1599 BLAKE2B 620f14a72cc4b6b24e8bed657f0176ab6c249ef1671d56da5f0d4183d9e310135891c0ebb2ab7f7acdce933c2ded8fc27334678e1ac7ff42d06285192ec503a3 SHA512 a29d606f76f71eb689e611a64742af8ecd45e60e82f2756d4a5b5161990ed139a326f00c2c3e3b34a8ce042089c37dce7f3489537f7745ee57223f0d998a49af
-MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gkeys/gkeys-0.2.ebuild b/app-crypt/gkeys/gkeys-0.2.ebuild
deleted file mode 100644
index 3f6a31b7af09..000000000000
--- a/app-crypt/gkeys/gkeys-0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="An OpenPGP/GPG key management tool for seed files and keyrings"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	>=dev-python/pyGPG-0.2[${PYTHON_USEDEP}]
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	dev-python/snakeoil[${PYTHON_USEDEP}]
-	>=app-crypt/gentoo-keys-201501052117
-	"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /var/log/gkeys
-	fperms g+w /var/log/gkeys
-}
-
-pkg_preinst() {
-	chgrp users "${D}"/var/log/gkeys
-}
-
-pkg_postinst() {
-	einfo "This is experimental software."
-	einfo "The API's it installs should be considered unstable"
-	einfo "and are subject to change."
-	einfo
-	einfo "This version includes a new gkeys-gpg command"
-	einfo "It can be used as an alternate gpg command for git"
-	einfo "It will set the correct keyring to verify signed commits"
-	einfo "provided the key it needs to verify against is part of the gkeys"
-	einfo "keyring system.   It only works for verification, any other call "
-	einfo "to it will re-direct directly to the normal gpg command."
-	einfo
-	einfo "Please file any enhancement requests, or bugs"
-	einfo "at https://bugs.gentoo.org"
-	einfo "We are also on IRC @ #gentoo-keys of the Freenode network"
-	einfo
-	ewarn "There may be some Python 3 compatibility issues still."
-	ewarn "Please help us debug, fix and report them in Bugzilla."
-}
diff --git a/app-crypt/gkeys/gkeys-9999.ebuild b/app-crypt/gkeys/gkeys-9999.ebuild
deleted file mode 100644
index 6729c94cb2fc..000000000000
--- a/app-crypt/gkeys/gkeys-9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python3_6)
-
-#EGIT_PROJECT="gentoo-keys.git"
-EGIT_BRANCH="master"
-
-inherit distutils-r1 git-r3
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-keys.git"
-
-DESCRIPTION="An OpenPGP/GPG key management tool and python libs"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	=dev-python/pyGPG-9999[${PYTHON_USEDEP}]
-	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	>=app-crypt/gentoo-keys-201501052117
-	"
-
-S="${WORKDIR}/$P/gkeys"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	# copy these 2 into our subdir from the master level
-	cp ../LICENSE ./ || die "cp LICENSE failed"
-	cp ../README.md ./ || die "cp README.me failed"
-	cp -R ../py2man ./ || die "cp-R py2man failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /var/log/gkeys
-	fperms g+w /var/log/gkeys
-}
-
-pkg_preinst() {
-	chgrp users "${D}"/var/log/gkeys
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This is experimental software."
-	einfo "The API's it installs should be considered unstable"
-	einfo "and are subject to change."
-	einfo
-	einfo "Please file any enhancement requests, or bugs"
-	einfo "at https://bugs.gentoo.org"
-	einfo "We are also on IRC @ #gentoo-keys of the freenode network"
-	einfo
-	ewarn "There may be some python 3 compatibility issues still."
-	ewarn "Please help debug/fix/report them in bugzilla."
-}
diff --git a/app-crypt/gkeys/metadata.xml b/app-crypt/gkeys/metadata.xml
deleted file mode 100644
index 1937e8c82b4b..000000000000
--- a/app-crypt/gkeys/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>gkeys@gentoo.org</email>
-		<name>Gentoo-keys Project Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index e55c12cd9bb7..ef573487b7a8 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,3 +1,3 @@
 DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
-EBUILD glep63-check-9.ebuild 684 BLAKE2B 4a1ef24181f792a75e48a22301cc8d4d56ceec40175c7952b776324ddf72d2e9592c87537cbbc30bbf8e184965a0a742fc1bcc5652d85bf2c8db1b5cb8087617 SHA512 09858c4dba91d8d219fbb214b504d00b62a6a354862f710c8d93b30656b62b4c1bc9ad18f2a588a4303fa844d6471a51d1300feb5035f918fbb540544ad01c5e
+EBUILD glep63-check-9.ebuild 686 BLAKE2B 6a9f562dd9ae2719fccd88b93d1e462c983f5fd89b5dae041784187108585056e11271eb9edb10e3cc12257325675175306f1cdc3b55b1a187bdd4bc32a581ec SHA512 ade831ede4af178832a7b7105fd5b983878ae52cbe4d93a6493690b135f188a39b48b0e6106ccfa95a1722cd086b0ab58e6c1d35ffd1c5486eca7a6d1164544f
 MISC metadata.xml 537 BLAKE2B cc05c3872c522fdcc2355da9d451f9ad102d23e2e5de657f447ce5c9441a4379fb5f6560cd22a8be325f322e901b65917b11630fc0229bd0e952c6f8b6b64bf0 SHA512 493bcb28f9144c49050445de98b54e19730e46cc24df02b15859f4114f4fa8775431aac9d8fcb4f50639609680656b108f6c4ca47f67b38680f926cf9610ccd9
diff --git a/app-crypt/glep63-check/glep63-check-9.ebuild b/app-crypt/glep63-check/glep63-check-9.ebuild
index 19655a3b7bc2..7efc46cc6b71 100644
--- a/app-crypt/glep63-check/glep63-check-9.ebuild
+++ b/app-crypt/glep63-check/glep63-check-9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index ab4dd83c3711..d7f0edac3768 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,5 +2,5 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
 DIST gnupg-2.2.19.tar.bz2 6754972 BLAKE2B fc1b9afb398ef78a6d239c62fc88cba7148679b1b666ac39dbd9644847e99de1a683a7938bc112cb33adafe555472319dde4f64860071446a66cd79934f7d69c SHA512 d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd
 DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
 EBUILD gnupg-2.2.19.ebuild 5324 BLAKE2B 5c294c51bd7a8866f64b1c10e8dcfe4cca8e3ba11ab17b21a057654d969bdb8b9b598461f757ed61f1a00bfdf49632b97c53642e6549c9d9a75434c2885f328a SHA512 67fbaa708dcd39a31a4d61a413e1c27eec94758e8e7dca56303c9d6dd97ea750e74a3a8ef551f42df0d5575e23e0916bb0b99d6834f9bd2930f4b72d8f1e0255
-EBUILD gnupg-2.2.20.ebuild 5124 BLAKE2B 3cc31261ff50eaef8b62a076f7d317c6e511de6500247fcf86f0f8f2bae23a72c381f02985c6cd582d6fa6d2042d787192473e7340456273d40b42a05120c10a SHA512 bd7b342b565bd7e23b71e92faaf26d33a3b9809fe8d45566d49f59132ecdb5aff61f0d1f89fb48c6bba553797685578d2684cdad50151e4192474cea0e84d85b
+EBUILD gnupg-2.2.20.ebuild 5116 BLAKE2B 23b115e992bd0a12f516f93766a1b67d1d7e26d1b22c11480a41276101173182bfa3cd8db2f01bea9c09409a2e6214c4846c2d84cca9cace67cbd3778bd7b2ad SHA512 7e768ea8c3304312f11a04eddec071e81a0619b0c54f49ec0fdfacfbba4e411bc9edbe9696b572993b866fd389eb09dc57ff32d93f6b482cc5fdd36dddd033dc
 MISC metadata.xml 1212 BLAKE2B 36bd1e7478abbb579b33292418dc621c65869151cfd0cbe9cb7b553adf92b606273f415db763ec5c3884e91f29929f79de1cbf15cc47626b1115b168d567790e SHA512 646ec87262b7069808976e17fae4b2101f9a8aae7ad5bbd10abce6077a5e4e741eb5692997af4383cf8cd3e6b03ded83f9dd5245ed112533c6a6e4c752b1060a
diff --git a/app-crypt/gnupg/gnupg-2.2.20.ebuild b/app-crypt/gnupg/gnupg-2.2.20.ebuild
index cc4778f3c4b9..cd7106ae9204 100644
--- a/app-crypt/gnupg/gnupg-2.2.20.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/manuale/Manifest b/app-crypt/manuale/Manifest
deleted file mode 100644
index 4000b61f60eb..000000000000
--- a/app-crypt/manuale/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST manuale-1.1.0.tar.gz 14015 BLAKE2B 1c3eb18e591032c1633e73da46bd91653627c127ccd9d0006d776ccc12d95faaf53b8942a47fcedcb37ef998ad6975efee7a20658f6e366fa51f0b6ddd635f31 SHA512 b78d6468fba14738f0b33cb11817a61692bab2b18a3331b2696c6e1c070a202903be6d6f642da7dd35560b15ee5fe24afecebe51395bdacae59f04cc582b6b44
-EBUILD manuale-1.1.0.ebuild 571 BLAKE2B fb570a96e4e607af9a73d35b38fefed7b5eb32bf0454206ef8d80687691326adf2572db1d26f492e4f8e6c49d7837c37e1b873cfb41d3ade4a51209abcc8e103 SHA512 a9d0094c144b576c131cb771eab61fcbeae324746b482d8c33403c1515bc5e1496f9327cc1b9b8450808ef78a825b237f0cfad5b1d50cb7d232c88f7fb851f1f
-MISC metadata.xml 245 BLAKE2B 971a9685a9931969cce9ae3f586e5a1b1be60f3d494139c8f09b19e68552286c04f70e4321473e9d62e20136e322f0ce5c8265a986f27ab4c3b02dc2584a8e05 SHA512 959004edbb7652a51b20d5c16dcdc270389d9ea656a795928323ca071ba51cb34d25b4bedfdc0cabe9e95301986aec7b8f3972bf1a50df4253b6364da932b232
diff --git a/app-crypt/manuale/manuale-1.1.0.ebuild b/app-crypt/manuale/manuale-1.1.0.ebuild
deleted file mode 100644
index ea17625b0910..000000000000
--- a/app-crypt/manuale/manuale-1.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fully manual Let's Encrypt client"
-HOMEPAGE="https://github.com/veeti/manuale"
-SRC_URI="https://github.com/veeti/manuale/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-DOCS=( README.md CHANGELOG.md)
diff --git a/app-crypt/manuale/metadata.xml b/app-crypt/manuale/metadata.xml
deleted file mode 100644
index 0610b7e1cd7e..000000000000
--- a/app-crypt/manuale/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-needed -->
-	<upstream>
-		<remote-id type="github">veeti/manuale</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 2ed3535c68b0..b73a3388a1e0 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -18,9 +18,11 @@ AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a8
 DIST krb5-1.17.1.tar.gz 8765399 BLAKE2B 46be864e2db9c70d164532d82776195bf57342ce4f1fd7dfcf3cf6bd72a3639a69954f742607a2b8950b4dea8acfac5d633aa379d669de20bafe54b407bab94b SHA512 e0c3dc0a6554ab3105ac32f3f01519f56064500213aa743816235d83250abc1db9a9ca38a2ba93a938d562b4af135a013017ce96346d6742bca0c812b842ceef
 DIST krb5-1.17.tar.gz 8761763 BLAKE2B 76f636836c67e9eefca91c9417118efdcf4437c1220691f43f3d246daf3eabd53b40a30956f0e57703c3fde5d7193b1d86b68becf3ae1c0c803d2462e79d3014 SHA512 7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52
 DIST krb5-1.18.1.tar.gz 8711772 BLAKE2B 98ea02b686760d1e080e1b038601fedcb85ceb4c61dbbba717c300f54a784e8494ff0fc7c0139e95fffd6b1cbe2a65158c9a3af71ea76c1b86905642c29cd93a SHA512 c96c9ed676c8ccb9b65d17bb1d982c266228c75030a2d8fd5d7952ee8cdf362a22d202e93018d1011a5e7bd9a9fabe69aa1578d1d2e4839a78b9916d8b8019ce
+DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
 DIST krb5-1.18.tar.gz 8706395 BLAKE2B d2b700c2f869733a7fc9ac735ec27e3973868efcf62c6b130fb5ff33aaaed0571816af519123e9077fc0bc240ee71a6179e87a4f724ae06dba8a70fd1d594b9a SHA512 36a01ea310b4b3d0a3d209b641739575239e1ca5e93b3de99cb1fec83e82f9a70ad0761dd6eb77cda5c18c53044ab80168b00725642a0c2dfde0e492c42af6a9
 EBUILD mit-krb5-1.17-r1.ebuild 4312 BLAKE2B 2ddf3073cc5e7c8f5e811a065a9d1ba7d55defcded9800090b32c31bc591d37d720ee1efbef20fe92605bbda2eb5ee938af6e5277bef1bdc24e498994577c19e SHA512 1818e9165f0d0f3afb60579351ff723aa9e8d6705fae6a52c921c71de3e89922c714b7e15432f98e7ffb789d79c7458599b39bf5b44dd947a813e0b566c23986
 EBUILD mit-krb5-1.17.1.ebuild 4348 BLAKE2B 21649609464816912876ee382b330fe8beb2ff6f63ce77e35bef5c983bc2e5a81eac9db78b2a0915487a735252f8a7bb98150cdd91655cfd21988b7f94836c53 SHA512 b4341d509c5b0ae46dfdc751f6494aa4ae9288bcb5fb5cb604cf16bd8940f2a1eaf831a50553d084ab7a68bc34493258c8ecde4d904555f1bcaf8b0ecc87d644
 EBUILD mit-krb5-1.18.1.ebuild 4338 BLAKE2B 22ec1538e980d8e590cfe65ec64e5350eca7c883c2e278c238e535080ae01a8246c343f899528111a92eb7733ab5d61807944ab127e62fd3b4659071e6c29fe0 SHA512 a9317837e3f5f80b3a602f6483632055b2337d6742be8fca209ea138ad9f8836168da11b2cc7de505721892c6db641067c88fc49eb4d1bd3940e474084ba1042
+EBUILD mit-krb5-1.18.2.ebuild 4336 BLAKE2B b6e2266ab5d4c5e3a1fadd5b13cd23a79a6c281317d1989648d16b8c505e35505f617c6e85a57a3420bd13c1cca88fda4add1b35f392560cc2d66c36c3517554 SHA512 04586cc2d4bf81d102e0308ead9141c5dab63d1973158dadf32cef17c44008beba810e6fb8305f3c21f4fe3ab3a17b4dae5a4162377fa750515b99fe8e50cb80
 EBUILD mit-krb5-1.18.ebuild 4359 BLAKE2B cca19a22d28b67765aa56c3c63e858312892d12053f114b34583b9330125f841bdccc2529276a8f45fb92bf0cf57c877a98c3bd4fa3e14b5c015f190172482d5 SHA512 7da11ab4c00e5551c17a1a442829a71a7e0ac01175255c22bcccb658564dad312a8f55dfb4900ab5c69e26bf549d4f3a7fc88ae364a1895fde5a43a8c290075c
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild
new file mode 100644
index 000000000000..b47db6eeb0ce
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_run.patch"
+	"${FILESDIR}/${PN}-1.18-libressl.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 330258777f5f..a3875a54ab24 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -9,5 +9,5 @@ EBUILD pinentry-1.0.0-r2.ebuild 2847 BLAKE2B 8d93187c84bbc2ad6d5e0c26dde48d53473
 EBUILD pinentry-1.0.0-r3.ebuild 2918 BLAKE2B c565bd9e341bd92ef915ba37820215659b04026a019a8bf035a21880611bea2844c543d3a7ccf39195eddd43f3bb610efe6e7da00eecf8d9da2e9a6950139f5b SHA512 c6ba7579ab5a52b4490d343f971224a3a21f5c0e2d930138c4fc722f26e673be25699c384152d34e38c8fa2eee7a711f131d04767da3e2375cebc6e2bead9fa7
 EBUILD pinentry-1.1.0-r1.ebuild 2769 BLAKE2B 6c82a5f1cf18bf438acdfa972d74231b890e03d6a4d561d6cc4e1b157157805da3ed1d44ef636fd8d9f8e6080e8923798257bf6881e46f4d986b08ed20216806 SHA512 4f8162867d7af98f586a65a12871e136c211dafe4edf4d46121282120f371180b684b828e0c593b7d3f0001fd723eb8c068dba3c68638f0efa49ea4b55cec7ab
 EBUILD pinentry-1.1.0-r2.ebuild 2827 BLAKE2B eb7650162db93d6fe5d98e0935d71237092395ef4610d3f879dd756791b7894c8d331f5eec642264bc0e075237024da189eff471c393819458b58bb3be19e092 SHA512 cb3ada0c71c47d4628662a94401a8e3ccc9ea3416b9dde2b61f8ee1c99a244ee8f4d8c5c7088baeb6aab6de47aea36fd366dc93efc5bb29cbf0dcb1b2ab7aa26
-EBUILD pinentry-1.1.0-r3.ebuild 3092 BLAKE2B 9e64e43707366c4b18d01c729c78953caba94c57c087338748eb2170caf1f71638b20da641d115056f79c878515c0d945ed8f9c0c78ea6fa9be84d332b85fc40 SHA512 8fea8dee6b1d37d69e0d62767627dc374100a5321ff4174bb18afc552ef86c75b609fb86f764b9c8f20a5773c071ba05b7bbb3703665674e08a44be620134603
+EBUILD pinentry-1.1.0-r3.ebuild 3087 BLAKE2B 44d32fa76bd750fd7da7fab10d765c5f3cacf681152bffdb64b312eed6363aec3ac5a22d415d1173925aa3ad2f5f4ff1b5310f80ea7c2f447a913b12449de95d SHA512 fd784da8b021c8d9405422be5f4afd831a4a870729b51dfb3356b9e7db6d6ced9d1b5b8b1888be7abb81fe199603918038bd208aa9d3a54ba1450ab196099758
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index 6fda080adcc1..0ff90bda9f48 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 DEPEND="
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index f89fba1cb6ed..72e65c9f26e9 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,4 +1,6 @@
 AUX 3.32.2-libsecret-0.20-compat.patch 1333 BLAKE2B c1c80f28531726c60a709e136c1c156980d6eb5e32911ded5220382905180a542440e27ace8feab410f963a9920a5d2945085a45da1bd7aa3fbce83f8f776a08 SHA512 468f843cbbee56ae82ed3c36ea18e27e8e21611724631d12da9022bc24f8822c9d863c12b59d6f7110193f5a65cbfe41d3a7b61466d6ba2d2f4f994892d4a4c5
 DIST seahorse-3.32.2.tar.xz 1278668 BLAKE2B cd3fe6794ca02b1b0fd4b833a7128b8180137441a788f1f3ec5bb4186517ebb9e7422fabab2d19f60420b36e6b1ecab8b8326c99122aad185b8e45927232708f SHA512 e372f79907fbc5d60a41ea0db3a91575b0b304c1727c6091f94eec28445cd836faa32754582c59fd1eb8ce784986e63b4c8cabbd46d5e4cacec1150d9ca08481
+DIST seahorse-3.34.1.tar.xz 1271616 BLAKE2B 64956d0ee4f15bc048f42cefd827aad91927b34eecf4a2e53d988c379b3eae1ce0ae29ef469c2ff80ec9cceeaf77a271c57e28cb98dd24ae55c048faff487c1d SHA512 d2dff7d73a0968c1a5a8d39460f08b67f6794f22812200f564ef719354ab5cc2dac2213cba0d4bc10a455aecb9f55de8ff39943db4482beaac9cfdc2ca1012b8
 EBUILD seahorse-3.32.2.ebuild 1548 BLAKE2B c60b73c8b7e427f09b003ebc7d1028a82f236a9975dc41571bf05a16f443e11cd6566aafa502a74eabcb452b6b5b2e14b190c8aeb8b273045a4687eee21352ba SHA512 1aacea7daff0d72cd4b0826faf59430ba62b575dfafb968a950711a6fe68376b8a1afc3fef8176ea471def213ef08962c47d916f24bf7bbf2f64da0a11d7cf83
+EBUILD seahorse-3.34.1.ebuild 1558 BLAKE2B a6f7616c5f0c0bee07719126358bd2cedcb83b343035f1b79f3051b775d6fec30e75ff8d015eb2ddcd0237d1fd26e7354bbb0f3c183c2370bf9668b526dc7f40 SHA512 762c6ed9dc0819240ce13d0f2382ebd69851dcc76d2c8ce1654313e4979659ce804738dbe27f895416afba95866c68cc0f7a96e21aecd9b4237b28205915c9f2
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.34.1.ebuild b/app-crypt/seahorse/seahorse-3.34.1.ebuild
new file mode 100644
index 000000000000..2f9feb4c7928
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-3.34.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="Manage your passwords and encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="ldap zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+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
+	dev-libs/libpwquality
+	net-misc/openssh
+	ldap? ( net-nds/openldap:= )
+	>=net-libs/libsoup-2.33.92:2.4
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	app-crypt/gcr[vala]
+	app-crypt/libsecret[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dhelp=true
+		-Dpgp-support=true
+		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
+		-Dpkcs11-support=true
+		-Dkeyservers-support=true
+		-Dhkp-support=true
+		$(meson_use ldap ldap-support)
+		$(meson_use zeroconf key-sharing)
+		-Dmanpage=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 9ce542e4cf92..8461ef3f202d 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,4 +1,3 @@
-AUX tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch 2205 BLAKE2B 59d04d10159899a453204a4812d768d78cba86b2ca649692d105107790a157fb6bf32fe202ede43a4c57437f87ee7d8c5917d6493386841e9c8574b86db93882 SHA512 d1e97ec52a459da7de3e53797cfac118230da90988a8112d7118c084a85cd04f6f3b8053d2fcae9bf3b819f4ab5ac3cd04d74cd4c8a7c7c725c0547436bfb045
-DIST tpm2-tss-engine-1.0.1.tar.gz 382715 BLAKE2B b33b91bf892509f8ed88bea1ba9611f06c9342726932baebbe918fcd4208f6c4b07710db666261b7676b90feb796746552804553e79ef817c02587504d266f44 SHA512 106fc6aadf0b4b27c3b38be596356aa59b4b76ec1602e8c5564aec6b4be7e2b5d6077006ee13d41e58402255b879aadaa966c758b5b326ae32742007ce2ef238
-EBUILD tpm2-tss-engine-1.0.1.ebuild 750 BLAKE2B 76b054f7a11d9ab8093d5a119a55a6822b92ed2108713dfb23193df1fa8d17ba196e39b1c97bd8f77f9bfee4485fb0c867b3b91a7cce18d0c530dea36c2a5e05 SHA512 49a0b8e9661ebe6af52f093ad80e9f92cac5d9b5a0dbeaae8a62723dbe3b2a60a4f9d2cda4de0d8e7432bfbb48f924e0c9842f2f19ac5f1d588a91797971711d
+DIST tpm2-tss-engine-1.1.0_rc0.tar.gz 37583 BLAKE2B 634ebfa23452c32a4643f735d580df2d8fa07ba4c301804d877d1c75cf608ea4ddf634081c16ac71df3e163bea89931c8c91c188834fa5a7d2bbdedb0b39d952 SHA512 967eca63c58218f461b9e2b2a8042229794da6af7b759081f4c7ca1fbfcf16a1dc9a323f87c1383dc894614552babe1db7bc9c69849bd34526317b62879255a2
+EBUILD tpm2-tss-engine-1.1.0_rc0.ebuild 877 BLAKE2B e4c94cd2a0ae1d384d184a6e61b0aca663486ac575c082c479034274b4ce3d60843c543bdfeaae6ee45115e370b4850cd67e7f85349c109afb4a39e5c54936cf SHA512 415b82124ab4285c6fa3ab8fb3158f2c2100447dd80c82eec3389be3937496d8a4f43ed96da8f62d9154bdc332b5a37f0be774daee5728ce38a8bd45ace74c11
 MISC metadata.xml 463 BLAKE2B 7e0574fa7ade812b4a7176f30d0218a70e0396f2c76ccaedac3cc50ffd0aca7581f7b6075ee98828634d7f3b6b7af63059bfed2eab84b52fce418ee787e237be SHA512 b6d0746d2806d1e1f2a741b5ccd97abfc74e6fd8562796175a900ebf28244d8b3a8a1d9cc4bcd70cf51abd66eb180594f972e03c68deed57fa0023d726b6227b
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch
deleted file mode 100644
index 7556a80600da..000000000000
--- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 56cc4110e1ef0667ff248a689c50803c2ec4312b 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 2/3] 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 | 41 ++++++++++++++++++++++++-----------------
- 1 file changed, 24 insertions(+), 17 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d14c4d7..3ee45c5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,23 +84,30 @@ AC_ARG_ENABLE([tctienvvar],
- 
- 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=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.24.1
-
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc0.ebuild
index 8bdced04657f..48317f9f77c1 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc0.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools bash-completion-r1
+
+MY_PV="${PV/_/-}"
 
 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"
+SRC_URI="https://github.com/tpm2-software/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -15,15 +17,13 @@ KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=app-crypt/tpm2-tss-2.2.2:=
-	dev-libs/openssl:0"
+RDEPEND="app-crypt/tpm2-tss
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build-add-disable-defaultflags.patch"
-)
+BDEPEND="sys-devel/autoconf-archive
+	virtual/pkgconfig"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
 	default
@@ -34,5 +34,12 @@ src_configure() {
 	econf \
 		$(use_enable test unit) \
 		--disable-defaultflags \
-		--disable-static
+		--disable-static \
+		--with-completionsdir="$(get_bashcompdir)"
+
+}
+
+src_install () {
+	default
+	dobashcomp bash-completion/*
 }
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 25801fabaad3..7aaf81605e69 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,4 +1,5 @@
+AUX tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 180ba38d8b383e12f822a490e648f1e7392bb72c587537b655f613d7200fa0812f367fb6fb9e8ec411e22168016f9db4b352804dc55de1d094c7e3f493ce3a2d SHA512 cfc9591034f8216b5b949058dd3444c2c5b0e860b2fe5cbea99f353d80425d051e90b1117cd5c66b96a5990f7514b575ccf7ee98cdf38b7a2060fe250b805982
 AUX tpm2-tss-2.4.0-fix-tmpfiles-path.patch 1145 BLAKE2B 2cb265a5ae605982765675b5911c111c76d433f5ed1803dedbe06766abf9a0e00abd6dd1e378e6d2e30e9f8acdaf2795595c6a83e7fc08b96377c3b125b62ffc SHA512 60a7af4e6aff18837bc6f97211f14af99799942dae197193daa81ceec9a5c889056321abbf3734ec45daf2d873cb978946b6a77f1f5fe4ec2c2df78d3c59c7dd
 DIST tpm2-tss-2.4.0.tar.gz 1446509 BLAKE2B bb078719fa85d9ea07b9710b5ac5d2f9c2b842700ed5b26a30ab2708a227b4bd599563c76e648d6f0b9dfe7785a25c049826f953baffdd39113bd62e7b4563df SHA512 763370381584f2124f751f0736e6a8b34428fd52134fd9966f3581e128f3b74b3f1261992f5d6162d7c866e47f7e5519ea80c1d1d39b80d5ed6e067eb2cd35a0
-EBUILD tpm2-tss-2.4.0.ebuild 1610 BLAKE2B 8f230e65c4327c443c809cc0af7b6f6f5ccd339cfa94c9c5d167898eaa645f1af35bef8e6bd711a153feda87e898e0dfa8d2fa20a6fff3b6da9d7155b814f4f7 SHA512 284e5f7f3d96f1d52b3ddd58fdf051ff56642ae66129f8e09daaa2c81902264741fb0e625c0e1469957ef2554040fa1f0deb3cc40a6f66e2c96606ae3547a04c
+EBUILD tpm2-tss-2.4.0.ebuild 1732 BLAKE2B 79aeca3a75ad2353e9097e04146076d007f4f9f577e43bc22e248ccfe768b2fe26cb11504fe252687c52734fa1cac741e92300400f2a19545888a5827e01546f SHA512 1322dfc40d4be8353b0b8ce64006160ab7717c615351e088e359e73f6e2fb1046db35a77bf9f5a80e5907edf3ed22a3016dbb93cbe3cceb783a83f8cc500e6ee
 MISC metadata.xml 713 BLAKE2B 2abdfb26f5f48d666fb73603855baca019806420a262855faa4d4b00c90cdb260f2d6db4fab0752b13ef67dcfcd0e6462889eed7797545b1893a8c6ed137d563 SHA512 d48e14b074bcaaf77b723671a49979f94b592812d55a1e42acbe9b609be4e799bab939fdd4db66a2f9e37b40a0c2a13b47ef48d0e6c30e0ba88110e28dfaa4d2
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 000000000000..c916bbf0133c
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index c543a287..58187f7e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -558,10 +558,6 @@ uninstall-local:
+ 	-rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
+ endif
+ 
+-# Create tss user and FAPI directories directly after installation (vs. after a reboot)
+-install-exec-hook:
+-	systemd-sysusers && systemd-tmpfiles --create || true
+-
+ uninstall-hook:
+ 	cd $(DESTDIR)$(man3dir) && \
+ 		[ -L Tss2_TctiLdr_Initialize_Ex.3 ] && \
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
index f8986d88dc98..9f3fd54be541 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info tmpfiles udev
+inherit autotools linux-info tmpfiles udev
 
 DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
@@ -17,16 +17,16 @@ IUSE="doc +fapi gcrypt +openssl static-libs test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="^^ ( gcrypt openssl )
-		fapi ( !gcrypt )"
+		fapi? ( openssl !gcrypt )"
 
 RDEPEND="acct-group/tss
-	 acct-user/tss
-	 fapi? (
+	acct-user/tss
+	fapi? (
 		dev-libs/json-c
-	        net-misc/curl
-	 )
-	 gcrypt? ( dev-libs/libgcrypt:0= )
-	 openssl? ( dev-libs/openssl:0= )"
+		net-misc/curl
+	)
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	openssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig
@@ -34,7 +34,8 @@ BDEPEND="virtual/pkgconfig
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.patch"
-)
+	"${FILESDIR}/${PN}-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch"
+	)
 
 pkg_setup() {
 	local CONFIG_CHECK=" \
@@ -44,6 +45,11 @@ pkg_setup() {
 	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable doc doxygen-doc) \
@@ -57,7 +63,7 @@ src_configure() {
 		--with-runstatedir=/run \
 		--with-udevrulesdir="$(get_udevdir)/rules.d" \
 		--with-udevrulesprefix=60- \
-		--with-sysusersdir="/usr/lib/sysusers.d"
+		--with-sysusersdir="/usr/lib/sysusers.d" \
 		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
 }