gentoo resync : 21.06.2020

36 files changed, 242 insertions, 426 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 23d839d18a09..fe29b59257aa 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/envchain/Manifest b/app-crypt/envchain/Manifest
index 8addf2ca800d..2c151c84d7b7 100644
--- a/app-crypt/envchain/Manifest
+++ b/app-crypt/envchain/Manifest
@@ -1,3 +1,5 @@
 DIST envchain-1.0.0.tar.gz 8252 BLAKE2B 5b4e07421d47eede180ddbd1968090050ec4b25e887d235f2714604ed0d4439f1a36b72f0d277c53e3b9f010ee9c6bb61f598daec330641384c21b00802feadd SHA512 0c7e129509fa60adbbedd995c30a11e981171b85dfce60385a0fd4a3d8264f1a2d65300f882e45075556490dfff0255eb6a6688066455809653b81e83d29c514
+DIST envchain-1.0.1.tar.gz 8604 BLAKE2B 6273eac40cf2a9eaf0704ee81d23b6e72cd296232f378bf5e5b15cdfb29a91bd394201724491e3a7104017b2416084d16e07b3634e5abe382e05eec52e388410 SHA512 ac2bca6e53f46c10978d55b2924595988ed6d76a9969691f01c1a57d17e5e8e2abd21653cba996aad31408bb029e8ba00818100c60f5b089b84c70eaf20a2c75
 EBUILD envchain-1.0.0.ebuild 476 BLAKE2B c424c556f180f755c75db9bb650be9e375f94950bac6f83c114d3f14667f5c0818bf35c98c4c94c3fce098f51c65f1a42791605109ddf279a519a6446994fe7f SHA512 09f8a61e03ad2115a5db8005f4fbd90bb7599c51e6d8bcbda7baffe399116e36a89b07ee7176a13039ff67548a9ae5f51a19967701ef37dc0c7220e5d0f30e2a
-MISC metadata.xml 563 BLAKE2B 2bd37267ec48793d16ed8f7bc8a2c27a5e68bbc9aa3c98ddfb84f2f9bd34c60421bc7627bb193762641ef72ddca078ae7a4d4c1ca0013d5544e2f4eb7e6ea29f SHA512 5643beb6d2bb34e30f3f671a08f7a648e071f70100f7ccbd081976c026f761e1774825eb634fff3a4ea656dc270b2342d9284c026a2dda8edaa14aa3c138ce3c
+EBUILD envchain-1.0.1.ebuild 478 BLAKE2B 4a7f5f450de103e61a9797d215dc3b55fd1181573914bab3228c47d6fb4daa6fce28b8261e9b7e35ad46e3b0a3b9a2bdb296dadb71618fc1ceddba98b8f9efd1 SHA512 454c17e0950d1afad8dfe04310469c6989f730aad483d6f387031be50c8dbb76c0b0f41b4f6f4168360e9a3adb3ad7084e7b291e49bdc08517c167783b10e09e
+MISC metadata.xml 746 BLAKE2B 2a0348bc637eb81abd5d5f7252685b13d3ead96afa478c066b0c00a3b01ca77479e181b6e5c51590d5cf96a3490e011d42e8172f8261b1aa9db257440ffbbfe6 SHA512 c345e54594f861bbd90d61d92c4e549b8885dce39c72253e84cddecb999d71c450eae659b2d5e59ab162849403beac86225c8ffb5a72fdc721a7383cdf2c5aad
diff --git a/app-crypt/envchain/envchain-1.0.1.ebuild b/app-crypt/envchain/envchain-1.0.1.ebuild
new file mode 100644
index 000000000000..2fbc68f9cb3b
--- /dev/null
+++ b/app-crypt/envchain/envchain-1.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Save environment variables in a secret vault"
+HOMEPAGE="https://github.com/sorah/envchain"
+SRC_URI="https://github.com/sorah/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	sys-libs/readline:0=
+	app-crypt/libsecret"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}/usr" install
+}
diff --git a/app-crypt/envchain/metadata.xml b/app-crypt/envchain/metadata.xml
index 103ed877db34..da51982cb6e3 100644
--- a/app-crypt/envchain/metadata.xml
+++ b/app-crypt/envchain/metadata.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-    Set environment variables with OS X keychain or D-Bus secret service.
-    Envchain allows you to save credentials in a secure vault to use as
-    environment variables only when you need them.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">sorah/envchain</remote-id>
-    <bugs-to>https://github.com/sorah/envchain/issues</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<email>hfern@fernhout.info</email>
+		<name>Hans Fernhout</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Set environment variables with OS X keychain or D-Bus secret service.
+		Envchain allows you to save credentials in a secure vault to use as
+		environment variables only when you need them.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sorah/envchain</remote-id>
+		<bugs-to>https://github.com/sorah/envchain/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index cc89c1537a71..f46413daa6ed 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,6 +1,4 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
-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 5115 BLAKE2B d6878ce455f902a1bb36428ec221f5f538870a8b691df845b2fe05cac7c5d605423d8153c4fb70bca00e4be80f97a33adf89926221252ce31849582d8ee43f0d SHA512 92d90e52c1dceb187690bf85dd55f0167ae1f4745b919afa2f91109b21dd36fce609f834e1a352c7770deadbeec8106ef2cf98a3d640375fb04c065451fca067
+EBUILD gnupg-2.2.20.ebuild 5112 BLAKE2B bfe3ab170947c0d237795080961b92d70f9188fd520172443303b4dd65f8b8822e3727167ecb9117d365ccaab4246a737d881073654b629314656707336d9ad5 SHA512 06ff4fcc40d5cb0eed8e623d8dc8e3eb65f2364ede85ac234aa00eda619c1a79c9cfd85c99162229a50371773be9f600800320bb5893e253d1ce49a45f3b47c8
 MISC metadata.xml 1212 BLAKE2B 36bd1e7478abbb579b33292418dc621c65869151cfd0cbe9cb7b553adf92b606273f415db763ec5c3884e91f29929f79de1cbf15cc47626b1115b168d567790e SHA512 646ec87262b7069808976e17fae4b2101f9a8aae7ad5bbd10abce6077a5e4e741eb5692997af4383cf8cd3e6b03ded83f9dd5245ed112533c6a6e4c752b1060a
diff --git a/app-crypt/gnupg/gnupg-2.2.19.ebuild b/app-crypt/gnupg/gnupg-2.2.19.ebuild
deleted file mode 100644
index 5282aaf4c937..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.19.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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.
-DEPEND="!app-crypt/dirmngr
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.28
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=()
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	# Remove when https://dev.gnupg.org/T4831 gets released.
-	[[ $PV != 2.2.19 ]] && die "Check if -fcommon workaround is still needed."
-	# Workaround gcc-10 build failure (bug #705884).
-	append-cflags -fcommon
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable ssl gnutls) \
-		$(use_enable tofu) \
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--with-mailprog=/usr/libexec/sendmail \
-		--disable-ntbtls \
-		--enable-all-tests \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
-		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
-		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
-
-pkg_postinst() {
-	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
-	elog
-	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.20.ebuild b/app-crypt/gnupg/gnupg-2.2.20.ebuild
index 05048d8c6a30..35dc9274af97 100644
--- a/app-crypt/gnupg/gnupg-2.2.20.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic systemd toolchain-funcs
 MY_P="${P/_/-}"
 
 DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
+HOMEPAGE="https://gnupg.org/"
 SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 12c817d29e1a..34db87e46a73 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,12 +1,7 @@
-DIST hashcat-4.1.0.tar.gz 3956136 BLAKE2B f9d6f9322e4c50ee1e156c283da1257a24f0e2cb22618cf93b8b11dd1964f6741f409429ee904412f70301e4b2381b388bcab0296a30ea3a94569efe7aaaeec6 SHA512 c9e01847c89dd8521da8734ea324c69f1e9bfef50c059e9dc29d4b947fe090405774a57ae688f907698c7d9a2d1f087b730e0a994dc5ed0d5d937a9ef950dd73
-DIST hashcat-4.2.0.tar.gz 3965021 BLAKE2B ad208f2debe1e4ece893e4a277b199962aa98aab57a2e78aef1d4177dcf7fc03bf262657dfe0f51c2ae845c8ed92232de7131f909d63bdc91e9f14e0b9602bb6 SHA512 686975db24737a718b484dd84b66807dfbe9694f1832da648b3c3b9fc8b859cd5c4c4d0aebf04ae862de38656d92c989e4e9515a07bec19b3779d74350beb0bd
-DIST hashcat-4.2.1.tar.gz 3966264 BLAKE2B 2034fff6aa8724cded0c8576cb4593d90f94eaea8f932e511ed82f2576ded2ffd6f686dac484e52a9ebb3029e90845469418ac414f2edf03e3fdc3350df8766f SHA512 a2cfc7e19e82b237892bacc79ca1a62a3b2ea598e4e5f60d4e275a0c128d865945595d8f918e3bb93bf62376f11f448ff53257faa12fd051dfc64973fbb6ed1e
-DIST hashcat-5.0.0.tar.gz 4019964 BLAKE2B 5d33bb2b0d82018d8ea6a906bee48375376879a47e5ca8f880d6fad6c6763d1ef90d44b228257021603e560acadf3d8fbfcbafdbd41dbad3733141d3c3957762 SHA512 090f07a011961a2c9a9bdf31e8a5efae4b443b6b205e964a6cd74bed6efe8fae2377f22ce7728ad7e732e9f943cf30da88066fe0990d085547f1e2ba000a3d95
+AUX hashcat-6.0.0-missing-not-fatal.patch 1515 BLAKE2B 2cf28447a83df00db96f73380195a5a86648cd068a14adfea65d6eacc7a760f4b1513a35b524d7bed087ad5375f5c439adb71216c00b6c85a788fafb59fa6ca2 SHA512 bb8f51febbf46b2318af8ee230fa686cce9a340b2d59068fbf64c2236df467f80bb44c5fc172f5d99da0e2ed32eeb6d9c5498408cb6c077a18f2f294b2217664
 DIST hashcat-5.1.0.tar.gz 4266878 BLAKE2B 677554fc5d6c5a93d0f4955c2e3cb6a40913ca2f7d00a89cf0c00bb48cadcaca94d3fdf55b853208f9fda4ce1bcc13fed865c5128a7c429223bcf8b4b825a15b SHA512 90605c2bcd0ec275d2f6ec581899b95cdc320b1494613a19803192c8a08037a7829b3776ed42c58eb6551ec1a746f47f94ab5b273958ca74e0fc57315e209ece
-EBUILD hashcat-4.1.0.ebuild 1278 BLAKE2B 91cfef7aae4aeafab3acf969011b1972c7f578eb95294be2dab71e86ec7a4664fbb8bda0c4c4b52214af95f42fcc71a3344611c7dacfcbc199ed915f0e38faf9 SHA512 06d8bf4b38da6c366db3f901bb0bd887459158229de890bf4ae28aa4e31ee72d5409ec86510b6a5a0c3f5726a6bdcb463e2e19a40bc24c0d8852a0f80f5fd78c
-EBUILD hashcat-4.2.0.ebuild 1323 BLAKE2B 038b4a3de1259a13e1b7655fb454fcb9e26948f48aa7cb45288b8039917ca732fd0022d686f80d264f1f1ec5a7551f81d617593ebfc6d6f1218315114f387f3f SHA512 776c800315ea9ee09476a1870134df575210b05a336fe46ee9ef763d0fc6e3b1c23d739c67c115b80ff3f48a227ba3a99a58f652b43324e673f50560e2e45715
-EBUILD hashcat-4.2.1.ebuild 1369 BLAKE2B 6bd72666c506aa48dccb6464ecd1084ec7b397dd1bd064ac2321ab8cb7947ee272ec2ba5150101b5d16a4730b9d8df32bfd95d7bb838d8cbcdf6427d33327894 SHA512 d6345507dad42bb3e4015e7d8795a25c8515cad55087d9bcdb6f740add0cf3e509a64b31945c26c561c53c61bcc02864087fe313d11642d0caed3e39d76587bd
-EBUILD hashcat-5.0.0.ebuild 1625 BLAKE2B b0c091c95dce2b8e243f8010079ea3ec0abdb7622f861ef991086c3d4ae07a830ebf0771074ee9336d587213d592909611d41ffe139264832b2fc31072cf489f SHA512 c982352784431e8cb13cd5eec896ada0367c342dfef396732a3ae81135711b883f33d9e6c6418be07cac5f5e36e1fbc6f370ce4813e361a4fe03f38486c92756
-EBUILD hashcat-5.1.0.ebuild 2214 BLAKE2B 4e83644b6d52e7dacdb48d7cdf5ace1536e94aef273b22133dace7431ca9ef6dba88960bafe5848ce39c786a765d3ce58d037b9474ddfdd9ea556bc3a41bc299 SHA512 02bd43009fca243aee558617533cdfe949a7492819893422a7cd3476c45018d06556b83d770b59ad120eb4bb188fb13136fc8167bada6e3866253835e5f48dc7
-EBUILD hashcat-9999.ebuild 2214 BLAKE2B 4e83644b6d52e7dacdb48d7cdf5ace1536e94aef273b22133dace7431ca9ef6dba88960bafe5848ce39c786a765d3ce58d037b9474ddfdd9ea556bc3a41bc299 SHA512 02bd43009fca243aee558617533cdfe949a7492819893422a7cd3476c45018d06556b83d770b59ad120eb4bb188fb13136fc8167bada6e3866253835e5f48dc7
+DIST hashcat-6.0.0.tar.gz 5360568 BLAKE2B 9d44c94d136a4c4cf7254ee11dc978db6bb1159d66ea525777c0a3dae59149983c9e8220f50cdbe6c24e330c757f3519b48f920662582e914f80068723ba5acd SHA512 b508c77e1735c02bb59c427774a3f4fafdea37d09777ef2dcb6e5081cb993d02c4f46a6ab846dc97a8cef2b0f69bbc191e26b8f1608a299bc2c1a6b3d2474f96
+EBUILD hashcat-5.1.0.ebuild 2201 BLAKE2B ba3d5b2652ae0fea0226265a9ae71b93eb6d0c225d9973466a4330b8b2c3c573ad41434f4be1f888e05737b417b7de639ddeb0b447ad910d37d754db79b99079 SHA512 4e6f0fd1b6e5f7451bfeb0408caec1eda01dedf6394b227fb948ab592b70e0fee81a777497baf73b5f67156f4a1c5f57fceae17e984671b8b29be5e96f626a1c
+EBUILD hashcat-6.0.0-r1.ebuild 2351 BLAKE2B d451d10baba0e2555c712ba0aaa344787b31c5884926eaef923171b5129930f2ae9fe158cc2523e150b60c568eabe4546a3527a5c57c1334809c18a31431d947 SHA512 30e9e5392527e0fec4bd0ccd314963540a776f84ee0e908c9a5de0785c2edd9b6a8576daa5f4a5c602526d939b5c691a02134fb3f12afc3ce4120bbaccaac1cf
+EBUILD hashcat-9999.ebuild 2295 BLAKE2B 4504eab73c1b0fb65d6d9c1c3c93e3030699b234e890374b4a84b9c59743d32c79d4472d0163da2c3bf0b02282ef34c65d48a68d8c38a0ec9b0734626d875d98 SHA512 9e6db642a6a1e38f91b939add0a57b15dc8d3ce95e1c82685c0ebe9cf070a77f500eefccb956874c1ad0cf38a1d421c62dc63d32228918553ae7bbfc8312754f
 MISC metadata.xml 395 BLAKE2B b058a0b0749da5d258660ddc67733d9f6ba09d10acf98ccb2c46b23534d09cd2865a6e37050b96f89dc97a9584e6791360398c41576224905b667a9b149fd3f7 SHA512 1d2ee684f0180752b2dd6eee437ce2714437775a0224a34c6ffd9f9b86ef8c375947b25f5a372358672a4c69516861fe1fc26d1dbd972684f2df725fba87698e
diff --git a/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch b/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch
new file mode 100644
index 000000000000..52120e0e05c4
--- /dev/null
+++ b/app-crypt/hashcat/files/hashcat-6.0.0-missing-not-fatal.patch
@@ -0,0 +1,53 @@
+diff --git a/docs/changes.txt b/docs/changes.txt
+index 1527da46..420c2102 100644
+--- a/docs/changes.txt
++++ b/docs/changes.txt
+@@ -1,3 +1,11 @@
++* changes v6.0.0 -> v6.0.x
++
++##
++## Improvements
++##
++
++- OpenCL Runtime: Reinterpret return code CL_DEVICE_NOT_FOUND from clGetDeviceIDs() as non-fatal
++
+ * changes v5.1.0 -> v6.0.0
+ 
+ ##
+diff --git a/src/backend.c b/src/backend.c
+index 80fdbb38..7f79879f 100644
+--- a/src/backend.c
++++ b/src/backend.c
+@@ -5185,7 +5185,31 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
+         {
+           event_log_error (hashcat_ctx, "clGetDeviceIDs(): %s", val2cstr_cl (CL_rc));
+ 
+-          return -1;
++          // Special handling for CL_DEVICE_NOT_FOUND, see: https://github.com/hashcat/hashcat/issues/2455
++
++          #define IGNORE_DEVICE_NOT_FOUND 1
++
++          if (IGNORE_DEVICE_NOT_FOUND)
++          {
++            backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
++
++            OCL_PTR *ocl = (OCL_PTR *) backend_ctx->ocl;
++
++            const cl_int CL_err = ocl->clGetDeviceIDs (opencl_platform, CL_DEVICE_TYPE_ALL, DEVICES_MAX, opencl_platform_devices, &opencl_platform_devices_cnt);
++
++            if (CL_err == CL_DEVICE_NOT_FOUND)
++            {
++              // we ignore this error
++            }
++            else
++            {
++              return -1;
++            }
++          }
++          else
++          {
++            return -1;
++          }
+         }
+ 
+         opencl_platforms_devices[opencl_platforms_idx] = opencl_platform_devices;
diff --git a/app-crypt/hashcat/hashcat-4.1.0.ebuild b/app-crypt/hashcat/hashcat-4.1.0.ebuild
deleted file mode 100644
index 71db0a6fe5dd..000000000000
--- a/app-crypt/hashcat/hashcat-4.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils multilib
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="custom-cflags video_cards_nvidia"
-DEPEND="virtual/opencl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	#do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	export PREFIX=/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	eapply_user
-}
-
-src_compile() {
-	default
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
diff --git a/app-crypt/hashcat/hashcat-4.2.0.ebuild b/app-crypt/hashcat/hashcat-4.2.0.ebuild
deleted file mode 100644
index b94ec8299ae8..000000000000
--- a/app-crypt/hashcat/hashcat-4.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils multilib
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="video_cards_nvidia"
-DEPEND="virtual/opencl
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	#do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	export PREFIX=/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	eapply_user
-}
-
-src_compile() {
-	default
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
diff --git a/app-crypt/hashcat/hashcat-4.2.1.ebuild b/app-crypt/hashcat/hashcat-4.2.1.ebuild
deleted file mode 100644
index 6e73c7c23841..000000000000
--- a/app-crypt/hashcat/hashcat-4.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils multilib
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="video_cards_nvidia"
-DEPEND="virtual/opencl
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	#do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	export PREFIX=/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
-	eapply_user
-}
-
-src_compile() {
-	default
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
diff --git a/app-crypt/hashcat/hashcat-5.1.0.ebuild b/app-crypt/hashcat/hashcat-5.1.0.ebuild
index d85c65f96f6b..bc8b3fb95c51 100644
--- a/app-crypt/hashcat/hashcat-5.1.0.ebuild
+++ b/app-crypt/hashcat/hashcat-5.1.0.ebuild
@@ -12,7 +12,6 @@ SLOT="0"
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-crypt/hashcat/hashcat-5.0.0.ebuild b/app-crypt/hashcat/hashcat-6.0.0-r1.ebuild
index 30255c39d174..eab3098c5c18 100644
--- a/app-crypt/hashcat/hashcat-5.0.0.ebuild
+++ b/app-crypt/hashcat/hashcat-6.0.0-r1.ebuild
@@ -1,24 +1,41 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils pax-utils multilib
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
-SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
 
-IUSE="video_cards_nvidia"
-DEPEND="virtual/opencl
+IUSE="brain video_cards_nvidia"
+DEPEND="
 	app-arch/lzma
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
+	brain? ( dev-libs/xxhash )
+	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
+						|| ( dev-util/nvidia-cuda-toolkit
+							virtual/opencl )
+						)
+	!video_cards_nvidia? ( virtual/opencl )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-missing-not-fatal.patch" )
+
 src_prepare() {
+	#remove bundled stuff
+	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
+	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
+	#rm -r deps || die "Failed to remove bundled deps"
 	#do not strip
 	sed -i "/LFLAGS                  += -s/d" src/Makefile
 	#do not add random CFLAGS
@@ -27,11 +44,11 @@ src_prepare() {
 	export PREFIX=/usr
 	export LIBRARY_FOLDER="/usr/$(get_libdir)"
 	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
-	eapply_user
+	default
 }
 
 src_compile() {
-	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=0 SYSTEM_LZMA_SDK=0
+	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}"
 	pax-mark -mr hashcat
 }
 
@@ -53,5 +70,5 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" SHARED=1 PRODUCTION=1 ENABLE_BRAIN=0 SYSTEM_LZMA_SDK=0 install
+	emake DESTDIR="${ED}" SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}" install
 }
diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild
index d85c65f96f6b..32005fae3ae5 100644
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils pax-utils multilib
 
@@ -12,17 +12,20 @@ SLOT="0"
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 IUSE="brain video_cards_nvidia"
-DEPEND="virtual/opencl
+DEPEND="
 	app-arch/lzma
 	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
+	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
+						|| ( dev-util/nvidia-cuda-toolkit
+							virtual/opencl )
+						)
+	!video_cards_nvidia? ( virtual/opencl )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -39,7 +42,7 @@ src_prepare() {
 	export PREFIX=/usr
 	export LIBRARY_FOLDER="/usr/$(get_libdir)"
 	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
-	eapply_user
+	default
 }
 
 src_compile() {
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 36fb1c7d9113..0a67e81971f9 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,7 +15,7 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.5.0.ebuild 4337 BLAKE2B eed76284c29cd994cf7b208f9520b3300335368095ad50b4086bb09715456b40a34cfe80f91672162373ffddb94d5ca7491c16cb2131c5179cfdf609a18dceef SHA512 af7a2e146e416a62088a1ab1d5c752b1245ae9b0bb5b5b9a923feec0325ef6ef4e9d1fe85f90d351a21e6453ef0a6ab3e2d03c598290304ed0eaf872aa4292f7
-EBUILD heimdal-7.6.0.ebuild 4543 BLAKE2B e4120775ab6ce389acb2c65b21e3a57fffd6d2791379aaad2217fc5a928ccea8ebf5253073360d7d37ef535566bc095a9aa2a583a40cec0205b05574f148f77e SHA512 36f6afd2112ac21d71fe2519a55efdc70566bf66b2bf9a58ac4fc654c9a179bb6fd80cad2dd1ff51eb6e87f20bb63c0e876bfe25764dbd941924ee89ab1b06da
-EBUILD heimdal-7.7.0-r1.ebuild 4541 BLAKE2B 88c0f5e9c5052bbd6d4debbb088a4909a61469d34869a056c79e4d9518b14855b12d70d5c5e7934191c2c031fe54a21ff39942be43908082c505016ab3317271 SHA512 5b8a07e38ba068c8f18b0be0a90b8d2907e5af36e5dd0a0352f4960b8375cd9503122c41da39494d0c4b670e9e818f57fcd1666b43f6d22d65149ac3d2edb1c1
+EBUILD heimdal-7.5.0.ebuild 4310 BLAKE2B 3a610d8f8a7630b88d005efa0064d47f012fdc9d9e8c6e9eb53dfd8fef464d08a7412cdc012128cc37d0f73ac68cba216c507e0ad47176f2a65ef679c2de74de SHA512 bf8ef7ff7b910d12935399eb1d58c939351d02461e25d1f262d7b6c4fc3ad247e16e5af6099d008e76e0f450d7bb71e32ad981461bf5ca03d3f538d19556b3bd
+EBUILD heimdal-7.6.0.ebuild 4516 BLAKE2B e35d12fd84b8096b5e9a0a04cba7a4744b4163107f79995950fbbea7f4468d7007eb7be4a467ec2f43a3ddcbb46e6a2a66cb57625b429c523e7697cce5e6331b SHA512 d902eda25291890b164dc3b011c227cb6443054886093c98b36aa57914ac196bfb8403ed43ab4c9d353527c35727d7dec1d0ff1fa57e9d8564a75fc988c80130
+EBUILD heimdal-7.7.0-r1.ebuild 4514 BLAKE2B d68abb7b643f9fd4542b64f926d9ead25c451acd26787ae14aa3045226fec8995417bb9bd1a1a27e4da5e047e86c613b5673856e9110c545384612d48c8e794d SHA512 9ecb0137d1ac9e33448719f48a630c6b48499a02c5de1f8014d8e31ae7540f46ff3c15579b0126ae4583364a7caa2a2bd853ffc2c77e4b407aa2d04d12adc055
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index c6af58ac732d..0710a88ee3d1 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
 
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	>=sys-devel/autoconf-2.62
 	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 648f2f91ecff..36aee840b6d5 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -45,7 +45,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	dev-perl/JSON
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	>=sys-devel/autoconf-2.62
 	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index f62d69fb6a6e..1f5dcf3141cf 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -45,7 +45,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	dev-perl/JSON
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	>=sys-devel/autoconf-2.62
 	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 75d687783112..d3d57f782923 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,7 +1,7 @@
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
 DIST libsecret-0.20.2.tar.xz 526224 BLAKE2B cae93962480f65d2c91b1c26a23321d19c256692754ef37c658e346a6cb6b91cdebe134516c3c8652c5ee502b8f7a070a8d519ed878b2f6dfc124ea7b032613f SHA512 89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857
 DIST libsecret-0.20.3.tar.xz 526388 BLAKE2B ae2e64af61c269eb109fa7840cc7ff2362ac69eab4b452074c2cb3a80b26cc88e8d341a7649e0f16fa73541943d968dfbd6f3cc802d99a37f3a7d91e8b20cfe3 SHA512 020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22
-EBUILD libsecret-0.18.8.ebuild 2652 BLAKE2B 07cbecd0bbef05c9c5538e5a212b7533ab61a39e563e5a7cec21ff75b98d61802ed66512f282ce368f5aba6093b775c00afcf48d29618074fdfc175d7667c83c SHA512 e42f531f040f7600bcdc4af20f6cc3db23a7e886e683c6202de97484fe52876e763f75b8ecb3b1a67436ca84a04fdc97625bb456b9bc414fa5ab81da54d4d54a
-EBUILD libsecret-0.20.2.ebuild 2657 BLAKE2B a32a3c1996925609c2e431a015f12767830adfaa2284dd7948d748e426e3ba4311bba8a6f4ea5f30c67c4f77b69d545cf7cb824d584db3401b6121887e7d3e57 SHA512 2f87cb1ff6f8bf6583b209ec2c9877010973fcde82f51c694f8c9083705809420b3a2bebb76386fc640097e0eb66ff8f2a17b39058065545b2553f24e9ff6bca
-EBUILD libsecret-0.20.3.ebuild 2663 BLAKE2B d52f33a3a7aaba917f8ac2ca6949beebbf4cf1c9f6ce4493513030a7cdad5cb4448b904cc71a5813c28ccd518ec720d86c92665421bf9b9f3636e7644970afea SHA512 065315ebe759bb893f7adaaee0c13fe44d22d6d0b5f43023e1c9e5772d2c485d8d6ec1e3a36989ec47b0a00bf11bf17cf444a8b86d55f2b198da00367477cfe9
+EBUILD libsecret-0.18.8.ebuild 2632 BLAKE2B 4606cccccc9771bf3c3b45d2267be781d7e57e217f91a5385883b3d1af27a02ba33cb23945c609ec660b234c7e26812bf1215d18ae0e2d57ad8cbef84c5534e0 SHA512 caaeb5ff5ee638e2fad31e9753c2546ca09078fdfefaff1b0c8fb760e94c75214aed5b039ae134a81af5984de93eb15f049d9229032e30721cd7a45b86ea3b78
+EBUILD libsecret-0.20.2.ebuild 2637 BLAKE2B 5059338cfd2085bc32343b2614965335b0cd222eb502080afb555080e1f82b36767c4ab5cc85eebd55485233fa6a8aa45d3cf8d2d59ebf8d186b5c4c6f6ded8f SHA512 362a1e6ad2e3100ae432af0297159e3328eaef9fc1e074258b526c97dfbff26e4361b79ea21583215147c4c366528930438e1b36f6f13e01f906fe73a033d408
+EBUILD libsecret-0.20.3.ebuild 2643 BLAKE2B 7d7741ff809281b23904bed3c5ea39ba043b4b168185a84462be46c2377d7632b5bf3ddf18e2b1262cc6bf647c30e4cc4b325cff960ecfc32739af960213ec6e SHA512 d60122ac754942b99a078dba69ae1cb0bda123a596b4fd60a3a84c861541844ac398545519cd18eff3579bf00a8d5cc43197a1547d5f522e9e931d6fececd738
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 7b382e18f118..121e3f5f3f02 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.9
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? (
 		$(python_gen_any_dep '
 			dev-python/mock[${PYTHON_USEDEP}]
diff --git a/app-crypt/libsecret/libsecret-0.20.2.ebuild b/app-crypt/libsecret/libsecret-0.20.2.ebuild
index 346eb620ef31..e5125875d2b1 100644
--- a/app-crypt/libsecret/libsecret-0.20.2.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.2.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.9
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? (
 		$(python_gen_any_dep '
 			dev-python/mock[${PYTHON_USEDEP}]
diff --git a/app-crypt/libsecret/libsecret-0.20.3.ebuild b/app-crypt/libsecret/libsecret-0.20.3.ebuild
index 28696c25eb4b..8272d6cfa416 100644
--- a/app-crypt/libsecret/libsecret-0.20.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.3.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.9
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	test? (
 		$(python_gen_any_dep '
 			dev-python/mock[${PYTHON_USEDEP}]
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
index d41ab0bb8950..976fd4c8918a 100644
--- a/app-crypt/scrypt/Manifest
+++ b/app-crypt/scrypt/Manifest
@@ -1,3 +1,3 @@
-DIST scrypt-1.2.0.tgz 107796 BLAKE2B 83ad13e83dad1ecf6a73553e2402c01409062e53089b5c6598607a50794113ad7ed89d855486e33464237b5ba033b57b72af851199e674235ac53e822fece865 SHA512 81ac8d82c38dc73981fa5bd4c011142c7ccef962a650ed849317a49e8aa66c26f4557dde326202792500a996178784d5eb0d28f909ab630cb05c86fdebfaae0d
-EBUILD scrypt-1.2.0.ebuild 370 BLAKE2B fbab30f8da99b3a0aebebf8e1f01386eb319101c93f377808cdcc97ce0a7be27d6479b3f2694d37659458023d2b97e8f5b6a8f78c6f9812171660701641f49cf SHA512 273611f0a388859719fd9d8e2667421a6df4cad42af07a25d03d49a620d32f5d214a813db0842db382ae83acb218775f56a4b269217ec13a7b56bc1ae84d2a2e
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+DIST scrypt-1.3.0.tgz 380332 BLAKE2B 4bb2c5b911cd25e80444e7dd6381692a3ddd3dcd3a5f4bcda14c8cc4169f332f2c617175bfd222f03d8e48a3eefd9d01b2d7c3fd6b712b3266b2cc75bee8396b SHA512 199f58adb5231f1ad585dbe8f64d6c54920cee201bd7703bcfc7e64917bf8647f9e35b3835b78c41210fd9af5223a79938f2495e4b48e6a62bfe8721d82492c2
+EBUILD scrypt-1.3.0.ebuild 367 BLAKE2B 8c54c781b521093b14953bc48d71f0dc6fc0af0f0c66dcace8aa3c982b67fb6dfe349f7491e5c7e1c22157dcf78b9043776b3c09185365157262160a4ef1cb94 SHA512 85a67ababd83b9734198e34247ebcfe4889f0a62231649b7fa23375991a2177926aaa4a84a14e81e66e8c8261b7d302b6e27b5c01557c6bcceb2696e4f464f71
+MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index 7a38bb900964..9654d1c22bc0 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/scrypt/scrypt-1.2.0.ebuild b/app-crypt/scrypt/scrypt-1.3.0.ebuild
index 31b749d7d257..bce60158dd53 100644
--- a/app-crypt/scrypt/scrypt-1.2.0.ebuild
+++ b/app-crypt/scrypt/scrypt-1.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A simple password-based encryption utility using scrypt key derivation function"
 HOMEPAGE="http://www.tarsnap.com/scrypt.html"
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 138f7f0f8688..b67c4171ae7b 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,5 +1,5 @@
 AUX swtpm-disable-test-dependencies.patch 774 BLAKE2B 8089885d5b21cea09fb5ec59d69640754671ba27763d57bdb45345768722166d4cd5fa0d890542aa79a90c2b8e609f611ac4ccd58be71ec13128d81daccb50bd SHA512 d803222c8fb04a7909f8a60563dfd23327c842f12138309f3b901309651857d6c545ca8e46c68c9b60b97f0e03ab79575784e242409d41b3d69e6ad8516428e5
 AUX swtpm-fix-localca-path.patch 1197 BLAKE2B fb94a734303e1c71158ffda2958275a377d9c75b98262061b06bb22d2dce6efd3b5d126758b65cbab8141a78549c4ab99d3aa2c241c4870de67f871706840b5d SHA512 c9a0e6ee27f0b38b65f2cad65a48622c3b9e9e8913bba002f0c82168f22162dbc62ed2b104942ed8141889625f225f29516ecbd20ba6ffb5091eb2201df0f107
 DIST swtpm-0.3.1.tar.gz 308576 BLAKE2B 96c44654b92d453d91594aed6fdd4cb56853973c1215bfb131e750d38a3ed1e64e3283647e54ad9ad84747406f53d7ac4f221fc5b319d7fa80bab758fed04062 SHA512 4b3e58048336ee82a87d17905a7d0dc5fbe13160ebb8f072b91410e782dae7fafc72e572a2f6aa2b1d9f4377074c01afd30505b9e71d92b8d7066365811d3e3f
-EBUILD swtpm-0.3.1.ebuild 1450 BLAKE2B 05dd73fc1d56d910be37d1f919792294aca40a03f00e8065d2f8ca76dd749634b6039f08bf0154adfd2b4c87eec98e5a612e5d194f6d5282307cd5a8d4828247 SHA512 0034a03fa8c529d49d8d5ca47bc9bd22bbcec7c5118d6f9a66a42f4b34998720f5b1b8a786190ed92f9e9751a02deb1181dc515475a5f764a86d42e78a2eecc1
+EBUILD swtpm-0.3.1-r1.ebuild 1474 BLAKE2B dcabf7367cb4aacfceebe8c79465c211d29ab3e9ae8dd53407b2cd2ac5b7400397ff89093428f034b2976fc0a95eea192b60bc6ff6a58c583616e5fec5ddf44e SHA512 b50cd8257a7edf4e48a755d83b2e396b05fbefdcf0c0959defbc23e5c96a3458ccb5ed3b7052fc670f4a81a448d7d6690f4d588d5ceb73ee303802ab3af12dd2
 MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
diff --git a/app-crypt/swtpm/swtpm-0.3.1.ebuild b/app-crypt/swtpm/swtpm-0.3.1-r1.ebuild
index 20d0ca3946c5..279c4c49b1cd 100644
--- a/app-crypt/swtpm/swtpm-0.3.1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.3.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools python-any-r1
 
@@ -61,6 +61,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+	  --disable-static \
 	  --with-openssl \
 	  --without-selinux \
 	  $(use_with fuse cuse) \
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index 6a47d3521e9f..d0cb880a56fb 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-totp-0.2.1.tar.gz 427226 BLAKE2B e6a9dbcdac4d7fc31048aff968e3eea097752c79a3c1b8551d22558a6b143a758e7bb507722185c648000f4b1edd2f0bbdd443890b5763b297f3d42cfbd84d9d SHA512 2bda34e89b76319a40206e08c0208b0f139309c0b0e40e7168b5e7562096750df504dfcae3a39e6f82fdccbf7a79ed0802d115fbd7560dc3f5b52d81fe8fb59c
-EBUILD tpm2-totp-0.2.1.ebuild 675 BLAKE2B a60f721b94ea6fadb92e18179d252cb887ebd3b5cab5a469d6e4240f5517d3bfc9172c88b8f0c526764c477550de58c188f83feca5e5db437dcc0d5be0b78d07 SHA512 6a71882c10f410a795df26a7923b2194167596fa974e74b5d3e9981653b6f3a73115b37889195aa85e5361dc6d3af41ce48aae7c69eb8d518ee90e4a85a03a38
+EBUILD tpm2-totp-0.2.1-r1.ebuild 694 BLAKE2B d65fbee79e5e778b13ebd74718b581e16f8a4279444296738d20bd3322990ba232215f86dce929c2b99e0d62e16c73c5cdfc5c3c332900ba81e45c894b097803 SHA512 517b17bf9de14ea0d1bbca0ea0c8019ff1d0473b0fd19c490ddf70858be8ba5698a1e9464bb0a9b54b181afafc1208c4d1b68fab306ae5b82a06dacb38ae6a62
 MISC metadata.xml 457 BLAKE2B a9c8431a32d462bb22c6362828b488746c0ec6f7cb0e2990894db416eedc1b0093b2b6a34cf05797ffe1769c5706f41099ec0a239904d3cd66f948dbe330d12c SHA512 eb49af2e52b354ee329f7bff699ad3a8d30efb83162f907806896021a54fd6d8cc17fa3ba037332004fed460576b4c1ac2e7323ff10331e053d8423540f17542
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.2.1.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
index 345b03f9a7aa..bafbd71fdc7d 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.2.1.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
@@ -25,6 +25,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static
 		--disable-defaultflags
 }
 
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 7aaf81605e69..6598580c2442 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +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 1732 BLAKE2B 79aeca3a75ad2353e9097e04146076d007f4f9f577e43bc22e248ccfe768b2fe26cb11504fe252687c52734fa1cac741e92300400f2a19545888a5827e01546f SHA512 1322dfc40d4be8353b0b8ce64006160ab7717c615351e088e359e73f6e2fb1046db35a77bf9f5a80e5907edf3ed22a3016dbb93cbe3cceb783a83f8cc500e6ee
+AUX tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch 531 BLAKE2B 45a14e0d23b1dcba9eb92465fb6d6a57c3c97f1d574a987214475c40403c554066076a16432ee68ae1a58677c22c72612c08bf91e8cbfae98d941580c0a3598f SHA512 0840be27e1742d5999531cefbc20a661136e44d44728ee5b968d96a7d82baf1d14e5e4e671f8f34fdaf37a0214dc23bd5286c914f6f579e8f4d1dd959779a5a1
+AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
+DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
+EBUILD tpm2-tss-2.4.1.ebuild 1769 BLAKE2B 7a738081fefc968dbe65457a27320b6aa8efc6890031934bb655dc714c780409900904d56ed5cad4b2f0da67bdf9904fcf0146e86d95058b8455d7b2bcf96902 SHA512 539af63e600cfa13daffe749de43ecc933601406e89390a32d1ceac2e0855d51da456924d2670270b6663f70ed1ac0421cc2a909c0f45259392fc179c08b116e
 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
deleted file mode 100644
index c916bbf0133c..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
deleted file mode 100644
index 93a1fed8a877..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dist/fapi-config.json.in b/dist/fapi-config.json.in
-index e32a3c36..4aa636e2 100644
---- a/dist/fapi-config.json.in
-+++ b/dist/fapi-config.json.in
-@@ -2,7 +2,7 @@
-      "profile_name": "P_RSA2048SHA256",
-      "profile_dir": "@sysconfdir@/tpm2-tss/fapi-profiles/",
-      "user_dir": "~/@userstatedir@/tpm2-tss/user/keystore",
--     "system_dir": "@localstatedir@/lib/tpm2-tss/system/keystore",
-+     "system_dir": "@localstatedir@/tpm2-tss/system/keystore",
-      "tcti": "",
-      "system_pcrs" : [],
-      "log_dir" : "@runstatedir@/tpm2-tss/eventlog/"
-diff --git a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-index 1793c4d7..3f0c8380 100644
---- a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-+++ b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-@@ -1,3 +1,3 @@
- #Type   Path                                           Mode User Group Age         Argument
--d       @localstatedir@/lib/tpm2-tss/system/keystore   775  tss  tss   -           -
-+d       @localstatedir@/tpm2-tss/system/keystore       775  tss  tss   -           -
- d       @runstatedir@/tpm2-tss/eventlog                775  tss  tss   -           -
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 000000000000..81c223df9576
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 85683f9b..986d4c8d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -582,8 +582,6 @@ EXTRA_DIST += dist/tpm-udev.rules
+ 
+ install-data-hook:
+ 	-mv $(DESTDIR)$(udevrulesdir)/tpm-udev.rules $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
+-	(systemd-sysusers && systemd-tmpfiles --create) || \
+-	($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
+ 
+ uninstall-local:
+ 	-rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
new file mode 100644
index 000000000000..111c3d75c690
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
@@ -0,0 +1,53 @@
+From 94cc338b0c5b97702e994ec628d684ee2c114547 Mon Sep 17 00:00:00 2001
+From: Tadeusz Struk <tadeusz.struk@intel.com>
+Date: Tue, 24 Mar 2020 16:42:14 -0700
+Subject: [PATCH] configure.ac: wrap PKG_CHECK_MODULES in braces
+
+PKG_CHECK_MODULES needs to be wrapped inside squere
+brackets when inside AS_IF, or it spit out errors:
+
+./configure: line 13054: JSONC_CFLAGS: command not found
+./configure: line 13055: C: command not found
+./configure: line 13056: JSONC_LIBS: command not found
+./configure: line 13155: CURL_CFLAGS: command not found
+./configure: line 13156: CURL_LIBS: command not found
+
+Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
+---
+ Makefile.am  | 2 +-
+ configure.ac | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 85683f9b..9144a5ad 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -467,7 +467,7 @@ src_tss2_fapi_libtss2_fapi_la_LIBADD  = $(libtss2_sys) $(libtss2_mu) $(libtss2_e
+ 
+ src_tss2_fapi_libtss2_fapi_la_SOURCES = $(TSS2_FAPI_SRC)
+ src_tss2_fapi_libtss2_fapi_la_CFLAGS  = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi
+-src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSON_C_LIBS) $(CURL_LIBS)
++src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSONC_LIBS) $(CURL_LIBS)
+ if HAVE_LD_VERSION_SCRIPT
+ src_tss2_fapi_libtss2_fapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/lib/tss2-fapi.map
+ endif # HAVE_LD_VERSION_SCRIPT
+diff --git a/configure.ac b/configure.ac
+index a202d4a6..2edf609e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,10 +165,10 @@ AS_IF([test "x$enable_fapi" != xno -a "x$with_crypto" != "xossl"],
+     AC_MSG_ERROR([FAPI has to be compiled with OpenSSL]))
+ 
+ AS_IF([test "x$enable_fapi" = xyes ],
+-    PKG_CHECK_MODULES([JSON_C], [json-c]))
++      [PKG_CHECK_MODULES([JSONC], [json-c])])
+ 
+ AS_IF([test "x$enable_fapi" = xyes ],
+-    PKG_CHECK_MODULES([CURL], [libcurl]))
++      [PKG_CHECK_MODULES([CURL], [libcurl])])
+ 
+ AC_ARG_WITH([tctidefaultmodule],
+             [AS_HELP_STRING([--with-tctidefaultmodule],
+-- 
+2.26.2
+
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
index 9f3fd54be541..fd1198b631ab 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -33,9 +33,9 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.patch"
-	"${FILESDIR}/${PN}-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch"
-	)
+	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${P}-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
+)
 
 pkg_setup() {
 	local CONFIG_CHECK=" \
@@ -52,6 +52,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--localstatedir=/var \
 		$(use_enable doc doxygen-doc) \
 		$(use_enable fapi) \
 		$(use_enable static-libs static) \