gentoo resync : 29.06.2021

20 files changed, 136 insertions, 164 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index de87c7fd440b..7432bd6c1875 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index f61c038b563a..9ab5822bda72 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -2,5 +2,5 @@ AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
 EBUILD efitools-1.8.1.ebuild 1221 BLAKE2B 5de949efc7615fb61d26dc892b2aef1f74fe6b0d7073cbaf88f870139cec0b1d1e951112a33ce3e379f1f4f90bc2553947e37bfe52bd3548cba99ad8c205ea26 SHA512 54f49ec77e7de52c0b246675a1456170a660d7df5c91bfb67ca141c5660faa2b58950acbccc048d51185fa1cd5a4d3b3b0146368674d4fcd924b01edf9f4cdaa
-EBUILD efitools-1.9.2.ebuild 1220 BLAKE2B 64e06d7244edd356d11fd8ecea5236debc67e9c2b05e3c7cccf1a1adf0cbbf589b7a1e6e238241fa8601ccb7084ef25d355e7f19d3412aa355c4eff9a128511e SHA512 b7b839580735fa7f2286f8c6a1df558d4e7c6fde394bb8f357ce2c2dfa45467ad4377473da1410721cf4a822544a894c759ec17a9db4da6d9cbfb9c66c11c3b7
+EBUILD efitools-1.9.2.ebuild 1333 BLAKE2B faf93582b00832f2b9745c8631b2b20b2e42aae9e9d07850425400d137e288c639612039780c1da8d192564d4d1b50fd20534f4f543b164d4001fd68671e9279 SHA512 7216fddf9b466951fdb7e77589697ea6371ff7f8dfab7ad509f0808716310dc2a43022a20e43d25fe2fbd15c06564500d4c7e554709068346069cf5dbf81d80a
 MISC metadata.xml 217 BLAKE2B 42ce05c77b1d33a62b5cd9e26a0dbc801edf537bd1482da9f3680a430e3714cd9adea45649fd6bec858e3de1863d0c855451ae8fe1e4b8aa2c6b2ae9a8e343a3 SHA512 b9ca3681462c901c78bdc3ee840596fb6f5151d6b555abd1b74c570fa83e9b5b964cc0988538c892bbf70d2963add9d39af56a6fe353ca7641a6f3aede49be82
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
index 5bdfdc911029..2f10592f3b1c 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static"
 
 LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"
@@ -38,6 +38,11 @@ src_prepare() {
 			Makefile || die
 	fi
 
+	# Let it build with clang.
+	if tc-is-clang; then
+		sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die
+	fi
+
 	# Respect users CFLAGS
 	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
 
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 574643ec0440..43997b9231fa 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,5 +1,5 @@
 AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff13fc2a0faab5c5327cea2f53ccc1bcc0e805166de93d2de8a52e8c344bdab64dae5671f238b49ecedebb657afca0823 SHA512 8207e9eb534fed58712b805df0e90bcf8406fe1c2907f91cd54500babcc49d0a72dc1d039d9fdb8077967058aaafb6c37336c1b0fcd041edfb3c4604c7cea4c2
-DIST eid-mw-5.0.14.tar.gz 8971565 BLAKE2B d1e6997c089c72f6b6b15fafefa227d7341721c1fa52e446f0334c3915b2e16d84ccb27053dc2e12c0f932bb3cb96e1cbfadc0d6b203098734f74fa0dbffc6ab SHA512 97a4e1359c853f14e91d5ec6c3b13d97b3113106da1e7125b558d724aea76f8a15b289dd06ed13391896d9318daea0133eba9269b6103fb1b922e8b55ceaf9cc
-EBUILD eid-mw-5.0.14-r1.ebuild 2677 BLAKE2B af4b6e57e28030579a1d7fec6e68d13757a84e6ec548335dde23409ce8f170d5cac4029295c97e18f26d97a4ead833716907616c3b2147451a20778cc7b08cbe SHA512 476f700cb7870bd54b1b1c5b4c1c4dec6ed06a732e7df3923c32ed4cd21cc14eab37378221b1332ce297952a08cba95453f00b7cac466129b64ef4ad7db3466e
+DIST eid-mw-5.0.23.tar.gz 13614039 BLAKE2B 5df1ad1cfd658586352800119eca17b2c57f642678cb131bd46af7b3cd3e4599e4d84b91c139d47082f07a1a80d6719f352151982085c6a577b01a75b6875782 SHA512 35be133c81cd5824dcffd9d74dae2aaf4cecffc56cf0e106832ea930d7d8a9a7ae115aab19d21cc79d011fe98108b0d67a3a69e5cb27ff3ec0ec059a9d9e0035
+EBUILD eid-mw-5.0.23.ebuild 2677 BLAKE2B af4b6e57e28030579a1d7fec6e68d13757a84e6ec548335dde23409ce8f170d5cac4029295c97e18f26d97a4ead833716907616c3b2147451a20778cc7b08cbe SHA512 476f700cb7870bd54b1b1c5b4c1c4dec6ed06a732e7df3923c32ed4cd21cc14eab37378221b1332ce297952a08cba95453f00b7cac466129b64ef4ad7db3466e
 EBUILD eid-mw-9999.ebuild 2443 BLAKE2B 45881c1380ac143b3e9cc9014251f01202abb0288bc69291f86434a85edb85f99b13bab101827195013c837dddc7f203a06d6cbdbfc19a33fb0f65f29b0568f8 SHA512 31d078692beccaeba27f6b98da558e097f82d30799026fecd28bef5d02067a52df36f085b7733435c1e1d3831e79c959366952663eeeaf893fa1984b297a4294
 MISC metadata.xml 1435 BLAKE2B 15ae2a88aec2aa102b852b307a3d4b37f72f1e824c5f179044ec3a9b9a70203b86f9fe00493b5c2723db6ffc6dd8eeadd5df63eb7e3f8ea036131abd9828fda4 SHA512 317f8eb2fdc224afeb9ea6c9030308a98636aeed7f4328d291e1a87d31321f36d1ad7d93353febe539b3e9c4427296e5ce17831c759a3645733be6ac7b759694
diff --git a/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild b/app-crypt/eid-mw/eid-mw-5.0.23.ebuild
index 364d71112644..364d71112644 100644
--- a/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.23.ebuild
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 848e7aff00b7..a35f7d6fc322 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,7 +1,5 @@
-DIST gpgme-1.14.0.tar.bz2 1678910 BLAKE2B 75051166b1f3777d630236c5afbd1786df238272b7ccfd053c5a4b2a207ba146550f6be46c1211f3bacbe19fee2f67adbc5be558d69175c19230a1a02e32d9f2 SHA512 b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668
-DIST gpgme-1.15.0.tar.bz2 1692019 BLAKE2B 4c66f24034a88e7da8a06cef3d0ac9d1d6b5eccb6d4277d36a2399d6e78f5d5f42cf0c13188c1dba72fe11d73da76a71867d3c3b13052695b868dc4a680fa85b SHA512 ab979aea6ccc6d4faf02b3b1a773ce95cb754b4d687ce7adc2ed98e218f21a284a2283d8e2429016e78fcf5a94ea863011573fd1457a71cc0ae3aadd368a98a1
 DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
-EBUILD gpgme-1.14.0.ebuild 2665 BLAKE2B b35b17b2cd54af7b5c775a3717bf80ec505fa006782d3bb5c1284db6a01dcfae3cc016a1e783e17cad296f531cb6734723e4dac637e242663604a1dc945b5657 SHA512 7996c1f90976e793594125a1530c399e503662691dc6b3a7351b12150d934ff52360eafd5663bcce3125c211a89a9f7078d1b80277f782ba93eda2d58be0c3c9
-EBUILD gpgme-1.15.0.ebuild 2679 BLAKE2B f93025454a52561180f78921be82fbfb2ab228f683d3bd69fe91abdf56f0c0bf7b1b336a1e4b3bad86ecaf36192e2cfd8f5b2e175302078d55fd8d346abf4ab7 SHA512 da19361e2ffc28cf5166ab6de263f75f97357a1053a92a3e095602c22fd4b9a70237904b2eac58bdcb1cd296fc74118676c4227996f9534681f221584840618e
+DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
 EBUILD gpgme-1.15.1.ebuild 2670 BLAKE2B 7007356262efc1db39dd9f024934e33f9851c5b120297472043e090ebf779aefe246c92cdb7c62c67fa97f78d44bd2a5a185cfef0e3d65dd8e1ec18368cafced SHA512 f7ebc23ff194ff6e652f5d1768b90299a642ffa30b6f6281d698fa0c26da32aca864fa1d68ccced41ca2db3e4b6de36dfdbb9f6563f68fbd1cda1fd4069bb678
+EBUILD gpgme-1.16.0.ebuild 2678 BLAKE2B a8c126d2fb79b1425069b6e174e2bc3f4da6c0fb82d08e11d1b6945e0bdf6e0f0131b3e21e6b5347fc6956864acd751aecbd959fdc9b166fff5800542dcda64f SHA512 25d734d2544950b307748c40370ca072f76a156f685a9b8f594bba4f5ae1efab0d566dbd0f226d487ccd4940b8617092e08707b2c6f7e0768ffc93a1cefb980d
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.14.0.ebuild b/app-crypt/gpgme/gpgme-1.14.0.ebuild
deleted file mode 100644
index 5bc323ad0812..000000000000
--- a/app-crypt/gpgme/gpgme-1.14.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs +cxx python qt5"
-
-RDEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.5.3:=
-	>=dev-libs/libgpg-error-1.29:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/qttest:5 )"
-BDEPEND="python? ( dev-lang/swig )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-do_python() {
-	if use python; then
-		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null
-	fi
-}
-
-pkg_setup() {
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
-		SKIP_TESTS=1
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b"
-	S="${WORKDIR}/b"
-}
-
-src_configure() {
-	local languages=()
-	use common-lisp && languages+=( "cl" )
-	use cxx && languages+=( "cpp" )
-	if use qt5; then
-		languages+=( "qt" )
-		#use doc ||
-		export DOXYGEN=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && make -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	[[ -z "${SKIP_TESTS}" ]] || return
-
-	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
-}
-
-src_install() {
-	default
-	do_python
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
diff --git a/app-crypt/gpgme/gpgme-1.15.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index c87f99a58840..9b99df979f9f 100644
--- a/app-crypt/gpgme/gpgme-1.15.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/jitterentropy-rngd/Manifest b/app-crypt/jitterentropy-rngd/Manifest
index 25a79d7e2ff0..8fa2b1cc26d8 100644
--- a/app-crypt/jitterentropy-rngd/Manifest
+++ b/app-crypt/jitterentropy-rngd/Manifest
@@ -1,5 +1,7 @@
 AUX jitterentropy-rngd-1.1.0-do-not-strip-and-compress.patch 581 BLAKE2B ee6f98d762fea06504ea7157ea2b13ececeaef1ee204cf0e5d63fc0932e1c41da13b2a8ad0cb8564548fcabe1989693ed16c7d461f75844323864e457e8fb804 SHA512 7c42e8deebf0d36fdd91b879cbc28eab1a92d413f64ab5f19eeaa214b51f6e96866c1bd53fdd6c2c4e335ae156cef24d2bba4c1dd6b557d96e89b61618703241
 AUX jitterentropy-rngd-initd 338 BLAKE2B a717848317980f0376058c04f53cfc7ac4e771ffbd926b36f2f5e18e121d846aa9248b38cfae7d1c6e4c2241e0c1124394d9b5b58d2d119bf455d0d8786e74df SHA512 1993262b47e703514bba9a4dff18e58ff70b6b109a2eb3097b0231467ea7f948c6fb6d0f695988de6c2d41fa2295a8a40af19124572b8e72fe09610eaf8caa39
 DIST jitterentropy-rngd-1.1.0.tar.gz 25891 BLAKE2B f711b173c68b74cbc0dbac1ae1b7a2beb5352b38e411f96172aa36ac7f720f05469f5fac2fa97b3514ec11fbe2ccfe0351ee7df8f51a8b36a566635ef93e4d08 SHA512 32835475b604e502caaab9b0d1cd9fe2920c126a27841669f6cf9c717094bfd4c11feab0f9f706ee4cf4caeedf26ced7039075499a3faaf41830c72968544646
+DIST jitterentropy-rngd-1.2.2.tar.gz 35773 BLAKE2B 5b1987108beb5db7a456f1216173598c893b1c845dfaa7594854a82257e88adda01e2bb4160b70f2605aff519b7d1ba79bcea94dda34c2fc75e412e0a031b943 SHA512 c317cfb77910b6983da7bf0733c26f28260da746b917cde59a9cdb023b95cf727cf729dd7de27c8cc308b1958ca054114d01ad7dfb9bd211c241a95b7bed83c6
 EBUILD jitterentropy-rngd-1.1.0.ebuild 605 BLAKE2B 04c2f307c31d2b26befd16f5e39d81445ae958fe7c5003363210ec25d5f00a87f0aef27f66757274f181b8303b649bf71dd0511c56eeb055bebdc94853b96d70 SHA512 7c4d42890396959d69ae8a215e9bf23ba2546655814baa7830b444208e7067fcd481cd7f3fae64b67551f457ef7fac8180e65436e44502b31be903a5599f7b4f
+EBUILD jitterentropy-rngd-1.2.2.ebuild 699 BLAKE2B 89349823ec63727a4822165659771c0b6c2fc8fa89bbf6f4d7be315a317278ecaaf3e82c855dcde58ba22e523f62d2415ee5b3de074fa9d6173def10cb68dff8 SHA512 27d875211941fcd597ad5ee78a643b4a633caab9b3ccfe61ffdd241835cc05339b171d5a1c51464adf4bcfd63aaf49d437644af629c6c2829bee500c3ff00ea6
 MISC metadata.xml 598 BLAKE2B 50854b04b1cf0b6370888000503a850d5a34b9cc49fbe917f26ff0a6d4fed2204e1b1921d06a1238c47d31fb92c82d8631a56c2fa60e6ef88b7d84aee4897aed SHA512 d13cb55c4649dff554018e04025e741c51397785f2951d1aa8ceb0f7712a2ed48c39b57ac4f6c197f8a4c96bfe8ba44023107201df5ab603d7ea2f11b0713227
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.2.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.2.ebuild
new file mode 100644
index 000000000000..653e5d0a9589
--- /dev/null
+++ b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info systemd
+
+DESCRIPTION="Jitter RNG daemon"
+HOMEPAGE="https://www.chronox.de/jent.html"
+SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-do-not-strip-and-compress.patch
+)
+
+src_configure() {
+	filter-flags '*'
+	append-cflags '-O0'
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
+		UNITDIR="$(systemd_get_systemunitdir)" install
+	newinitd "${FILESDIR}"/jitterentropy-rngd-initd jitterentropy-rngd
+}
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index c56185ffae21..bc9de79b8b6c 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,5 +1,6 @@
+AUX johntheripper-jumbo-1.9.0-gcc11.patch 1713 BLAKE2B b1f3aaf0c76f1c0fc6ad0d498dce4722994ed11a6f0547bb4ff7683083b9c9d59ce817133189853380378121515aa12db1cf08699c40b39e2fdec667045da88d SHA512 d341eeb291b5bf5721b781272ac66aa56e7d38db305f0272e65a0b77bad05ffc631cfe5fe8093f94a8545cc09020d639dfebb1b903585248bd57933661571b4f
 AUX johntheripper-jumbo-1.9.0-opencl-fix.patch 333 BLAKE2B 248ad5ecba48908a982c27c9d8162c22031cfc29f0becb05209f56c837bb850f6032c847a60d8cd05ba88a0f73ad35f27a08fefb734c6bd87f458b22f77db0ab SHA512 81f9dabc6d8ad54944be7eb9b3c7204ce426db842325c31662038e213775c0a86288c860712e6d3c24f7a9d0b7a0fd8962126a25242f45e5f242307691a97d38
 DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
-EBUILD johntheripper-jumbo-1.9.0-r2.ebuild 2993 BLAKE2B 512cba94b73d135f68d8b121ab97bde126ce124596648398d85f3b3295952b752d8c9ee56e1a56c276cdacc751e2c676274db7739a4d70d2082b7c3340c9c828 SHA512 0ace9fb01ddc9f422ce82e73d7195406b80c684308e9d7e1cd2f73434428ee0e69b612e34c8c34c00b978c46f26b3cb33892baf51c53232a27994ab39aec441c
-EBUILD johntheripper-jumbo-9999.ebuild 2822 BLAKE2B 8518dc8995437dcb38ffdba9cde0283a8f0d3fe7c4d66eea4969f327a2f7da10c54008c132d480be689f67cbf1e7065f9a944a245482543990910253d9124976 SHA512 cb20d6b7d5a70eb5ee7a8a237dd52b2a41ea7a9ae09c6e0c07ef0ad0429edf8ac89b73105b91714acbea3fb70d0be31f227903c8e5f548bc0102fe10b3a63c54
+EBUILD johntheripper-jumbo-1.9.0-r3.ebuild 3046 BLAKE2B 2573edffdbd3fd90ea3cff11197767acd593d24a99ae8a1c3f60c1b4f14b9e2e6ffb134b03a6f2e86ce850c379d4d8ce5fdeddf872e045126142a3592fd0b9c6 SHA512 5714243ca54db6aeeeb083070a419d0d93c67d24c272ecba833b4e813c605f56b5909fb663ec85f3142462113e716b1817a67e3dc8bfba511e89e30a8d37bfcc
+EBUILD johntheripper-jumbo-9999.ebuild 2842 BLAKE2B f3a248bb7713f41e9d87f0b8d751e2edd3136266c50da26419d9aeb01f0e884f52a3bf78e8c012efa26a3192552e77eee69c4bdc832817b9907c255a52403682 SHA512 b5d8625f3c3c62e0a9a7b859c8b65be7655ec4fbab5b38cb3264f444770dd23b2770dfd8dc478de2693c8b4e9dd168a4fe5edc7adca6ede5c2e4951d52fd643d
 MISC metadata.xml 472 BLAKE2B 82b4e6bd8682bd19ffc1140a8225e1766333af7a10331e4ce5a0b1306959b267a23df2429b593bd74f0bc61e73bd7df6a756cc2820438335c3a565b6208d9219 SHA512 63bf68deac15fd3e96d6ccf7d4ca4c52192c79bf1d075305d1e9757b3ce20dd5f868ef4c908dbe020d2fe6884756b236281ec8902cc4294a3eac96aa05571abf
diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch
new file mode 100644
index 000000000000..2901c5bc4bd6
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/786651
+https://github.com/openwall/john/commit/8152ac071bce1ebc98fac6bed962e90e9b92d8cf.patch
+
+From 8152ac071bce1ebc98fac6bed962e90e9b92d8cf Mon Sep 17 00:00:00 2001
+From: Ferry Huberts <ferry.huberts@pelagic.nl>
+Date: Tue, 9 Mar 2021 22:04:46 +0100
+Subject: [PATCH] Fix alignment compile errors on GCC 11
+
+Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
+---
+ src/blake2.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/blake2.h b/src/blake2.h
+index b05208117e..b4398f9e13 100644
+--- a/src/blake2.h
++++ b/src/blake2.h
+@@ -57,7 +57,7 @@ extern "C" {
+     uint8_t  personal[BLAKE2S_PERSONALBYTES];  // 32
+   } blake2s_param;
+ 
+-  JTR_ALIGN( 64 ) typedef struct __blake2s_state
++  typedef struct JTR_ALIGN( 64 ) __blake2s_state
+   {
+     uint32_t h[8];
+     uint32_t t[2];
+@@ -82,7 +82,7 @@ extern "C" {
+     uint8_t  personal[BLAKE2B_PERSONALBYTES];  // 64
+   } blake2b_param;
+ 
+-  JTR_ALIGN( 64 ) typedef struct __blake2b_state
++  typedef struct JTR_ALIGN( 64 ) __blake2b_state
+   {
+     uint64_t h[8];
+     uint64_t t[2];
+@@ -94,7 +94,7 @@ extern "C" {
+ #if defined(JOHN_NO_SIMD) || (!defined(__SSE2__) && !defined(__SSE4_1__) && !defined(__XOP__))
+   typedef struct __blake2sp_state
+ #else
+-  JTR_ALIGN( 64 ) typedef struct __blake2sp_state
++  typedef struct JTR_ALIGN( 64 ) __blake2sp_state
+ #endif
+   {
+     blake2s_state S[8][1];
+@@ -106,7 +106,7 @@ extern "C" {
+ #if defined(JOHN_NO_SIMD) || (!defined(__SSE2__) && !defined(__SSE4_1__) && !defined(__XOP__))
+   typedef struct __blake2bp_state
+ #else
+-  JTR_ALIGN( 64 ) typedef struct __blake2bp_state
++  typedef struct JTR_ALIGN( 64 ) __blake2bp_state
+ #endif
+   {
+     blake2b_state S[4][1];
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r2.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
index 12b9fbef4708..632f59d7a16f 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r2.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs pax-utils
 
-DESCRIPTION="fast password cracker"
+DESCRIPTION="Fast password cracker"
 HOMEPAGE="http://www.openwall.com/john/"
 
 MY_PN="JohnTheRipper"
@@ -28,18 +28,22 @@ SLOT="0"
 IUSE="custom-cflags kerberos mpi opencl openmp pcap"
 
 DEPEND=">=dev-libs/openssl-1.0.1:0=
+	virtual/libcrypt:=
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
 	kerberos? ( virtual/krb5 )
 	pcap? ( net-libs/libpcap )
-	dev-libs/gmp:*
+	dev-libs/gmp:=
 	sys-libs/zlib
 	app-arch/bzip2"
 
 RDEPEND="${DEPEND}
 		!app-crypt/johntheripper"
 
-PATCHES=( "${FILESDIR}/${P}-opencl-fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-opencl-fix.patch"
+	"${FILESDIR}/${P}-gcc11.patch"
+)
 
 pkg_setup() {
 	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 40bb28803b18..826ff08b2f51 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs pax-utils
 
-DESCRIPTION="fast password cracker"
+DESCRIPTION="Fast password cracker"
 HOMEPAGE="http://www.openwall.com/john/"
 
 MY_PN="JohnTheRipper"
@@ -28,11 +28,12 @@ SLOT="0"
 IUSE="custom-cflags kerberos mpi opencl openmp pcap"
 
 DEPEND=">=dev-libs/openssl-1.0.1:0=
+	virtual/libcrypt:=
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
 	kerberos? ( virtual/krb5 )
 	pcap? ( net-libs/libpcap )
-	dev-libs/gmp:*
+	dev-libs/gmp:=
 	sys-libs/zlib
 	app-arch/bzip2"
 
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
index 8e9a1eb28a2f..a38e138928ba 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1,4 +1,4 @@
 DIST minisign-0.9.tar.gz 15664 BLAKE2B f9f358a27b069e752894326932a8c5c51f308ade49ed7088a5f693b4e8327639fc5578607f348994a7ab7484091ed93190894c1965cadbbbf2a27e939ccc117b SHA512 7970f3e72ff759f3f02416de5d6035e1c8dd4e92ea718083cc5091c7e2355b59c4e178c60ca934985ba1e1afcd970967d4fb39a434ba54b140f3fc9be661253d
-EBUILD minisign-0.9.ebuild 712 BLAKE2B f05a904c1f95ecbfa0ff8ecb9bb655b219e97b1276c47ecfbd1e262920080fc425cf49106f1f1990f31623635334e65c6f6fdc34d62af9fbc88a3ebdd2b32368 SHA512 95ab9312bce7a0d1f27d60b7150099fc50ea44fa7717749d993776a8124951323660086deb0f123de8dd3ae2823fe20d91110f93cf83b89d32c166c46e22cf15
+EBUILD minisign-0.9.ebuild 719 BLAKE2B 49ba1980964454fd1a7415ce187f95d6271d58e3e3ed6390ca41ecee944d831774108647cfa8812d8fc6386c03cd6072525296924f5525d471ccbc96d33f8962 SHA512 19f85efaaa0bcbefae686763c7a98611ad75d5cb4910eba73509be9ccac5ceeca2b2b879c03502dc316352229b44e23a18caab47fc0dbe98fd3e9309dbed85e7
 EBUILD minisign-9999.ebuild 665 BLAKE2B 20395e22436151cbacb842badbf83ee829cdc278ac129b08db475cc87d35f7294097f87e4780a63a208d63b3f31edd244fb2da471d1de1dc95f744094c11f784 SHA512 b336ec7821b270de6f7b6a82d029cafde41ee685cd6a376d077e82451a6d223f0b0b5b6fbec6e994e009b8157b42d31c4ed7f0240b57a2877ffdb369742ff4a1
 MISC metadata.xml 681 BLAKE2B 590bbd6d73e1a9d5ac5e3381ffa5f29e8f8a0f329874e5372f52425a679c8966211b689a699d75cd6bc299e6d670f7724284fd87fc8f6ce0f8038133dfcc33eb SHA512 2840cf105039a5bb4a7564f4d10f759c1cf0f7f183a9684fabc2a1a158ea01a8dc7c552bad57991b30bf676c88b2b00d1f7304a2c565d388e798cf931e566242
diff --git a/app-crypt/minisign/minisign-0.9.ebuild b/app-crypt/minisign/minisign-0.9.ebuild
index cf275ac7cac2..e1ddce336437 100644
--- a/app-crypt/minisign/minisign-0.9.ebuild
+++ b/app-crypt/minisign/minisign-0.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index f1d94d0d0d69..64bea5864e70 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,6 +1,6 @@
 AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aab6b8f7cd3de53509716d48fd2f30d136279bb2a52a6a942f43a2c87e6f66db9f3470f0486255db8056da8c49b2b788048af62aa3ba SHA512 981a1fe5bf25c7a820dc5913b0384bc48b0bc50cd84e04921f0f64a4be6dd6b2a815d4cba39370b2e62c4473f2edbdc6bba7b09ce74b9e441f1b8df3166eb959
 AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
-AUX swtpm-0.5.0-fix-localca-path.patch 1318 BLAKE2B 1d8c7367cdc92232d13b4169e387afcd7247ffbdc785cad0d4e40ca9ee7710036f4a7debc1c6112afe255b19422a32b76f72efba04840136f28a72d241aa091e SHA512 e327b581dd1cf9bf92d400fc2574a585ea8708ba6b7e2c89fe368cfc990e464773900488736944b0f97cfd6e65b6aebf39e55ef22428fcc2510c8205ef77d738
-DIST swtpm-0.5.2.tar.gz 309436 BLAKE2B 0518e59b052c9224d5db1c2720f74ff15717468f73b1665e67c017581dd2b52d7a4cf28f94a932eb6068de3bc50f2e5710b8c447e4a08e6b4a31019db542d910 SHA512 4554f1b7a534829f9fbef4a09e190f1d5e91692d270f4f668bd6ef79799a4186a38db172e37a18be9f203466e2d7c9cdf3a350c0020d25ff6126128085ebe3a3
-EBUILD swtpm-0.5.2.ebuild 1671 BLAKE2B 77939c42e9a89167ed20027d27d13aa3b200d53b4d71d98fa67d8b2c10eb40e33ac90c060d83a27681ca4d289eadab7000ce125d02fd37f5f6c4acee821e7504 SHA512 6c1a9763855f4ac13233199e14e473ad941e88770541a925f05ce60707c4ab2c7a56f6b29390c4fb760a41516d8baac7575674d713d3893d1078c165c3d9a01b
-MISC metadata.xml 490 BLAKE2B efa6dc113d2c387e4fdf3b35a694c8edc3505129fdbf732f6441a68ce3195f9b45db52881a06ff3660a8309986a6298706d6aac22ec918d4c45ae45e6a401efe SHA512 cb8186df9ed31b7fb526bcca4eaeb97335385143bf303f9e42b3005d9f37e24838e9e3b874cbaa7663d0777513b52fbe1738c7c52b208c9c8dde5d5260f738e8
+AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
+DIST swtpm-0.6.0.tar.gz 326049 BLAKE2B 52b310e4da1f256f440d9e0022cb6d5f5987b10aa85c8bf2837f5a5c61bc076f7d24d0a027987ef28ba0e7983a2fb04476103b88c33e3312536777366bf9b0cd SHA512 b12bb9cc486c50d0689a5655799c0d52f85d320a1d849fd56ee5c4b497472102c61b5d368f46a81e0b9feacc63b25b434bd6229f492951097af1e9c74a37cc96
+EBUILD swtpm-0.6.0-r1.ebuild 1402 BLAKE2B 19d14d73da27d541313ec6f5890b13c50c63682d994fbe29ac173c59dc965fb178ef91713af29758b03ca649c5f1a387360ad4cbe0c247c07973d4b2ff00f801 SHA512 d90177c53ace986ad29fc8f765fcd0c6bf85da4b74b8b032a7ff2e2fc7f5030f68add33b49b0e236862293dfbe9d001d2495255c3233091c9f63287c9dcabb5a
+MISC metadata.xml 622 BLAKE2B fac6d084af4763e20d7bf965bc66f31cc8485d11b0a79169395e253730ab8cd9754ce6edc9f72f1289347497a1562bfdba083ef49bf4e13e5e99f01cb5ea7735 SHA512 c89423fcbfb975edbe115075aece42f43b833d8ebecfe86630f74e8b7de1cdc279fb3fc580fbf77d19529e8d52c657d0abbfcf95b30683df860d0b341ce3d17d
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch
index 27d29fc55aed..ae47bd5a793f 100644
--- a/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch
+++ b/app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch
@@ -1,9 +1,9 @@
 diff --git a/samples/Makefile.am b/samples/Makefile.am
-index 7d69bf8..9fb8338 100644
+index dcbc9b6..68c8adb 100644
 --- a/samples/Makefile.am
 +++ b/samples/Makefile.am
-@@ -56,10 +56,10 @@ endif
- 
+@@ -48,10 +48,10 @@ swtpm_localca_CFLAGS = \
+ 	$(GLIB_CFLAGS)
  
  install-data-local:
 -	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca
@@ -15,7 +15,7 @@ index 7d69bf8..9fb8338 100644
 +		chmod 0750 $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
  	fi
  
- # for out-of-tree builds we need to clean up
+ EXTRA_DIST= \
 diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in
 index 1f0b48d..63f1fed 100644
 --- a/samples/swtpm-localca.conf.in
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index fd9c4b51cbd0..e89388a5e44a 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="fuse">Support sys-fs/fuse based /dev/tpm interface</flag>
 	</use>
diff --git a/app-crypt/swtpm/swtpm-0.5.2.ebuild b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
index 0042a1df1f80..33fa7b5bc313 100644
--- a/app-crypt/swtpm/swtpm-0.5.2.ebuild
+++ b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools distutils-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="Libtpms-based TPM emulator"
 HOMEPAGE="https://github.com/stefanberger/swtpm"
@@ -14,44 +14,38 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="fuse gnutls seccomp test"
+IUSE="fuse +gnutls seccomp test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
-	fuse? (
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="fuse? (
 		dev-libs/glib:2
 		sys-fs/fuse:0
 	)
 	gnutls? (
 		dev-libs/libtasn1:=
-		>=net-libs/gnutls-3.1.0[tools]
+		>=net-libs/gnutls-3.1.0[tools,pkcs11]
 	)
-	dev-libs/openssl:0=
-	dev-libs/libtpms
 	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="${COMMON_DEPEND}
 	test? (
 		net-misc/socat
 		dev-tcltk/expect
 	)
-"
-
-RDEPEND="${COMMON_DEPEND}
 	acct-group/tss
 	acct-user/tss
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
+	dev-libs/openssl:0=
+	dev-libs/json-glib
+	dev-libs/libtpms
+	${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.5.0-fix-localca-path.patch"
+	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
 	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
 )
 
 src_prepare() {
 	use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
-	python_setup
 	default
 	eautoreconf
 }
@@ -66,21 +60,10 @@ src_configure() {
 		$(use_with seccomp)
 }
 
-src_compile() {
-	# We want the default src_compile, not the version distutils-r1 exports
-	default
-}
-
 src_install() {
 	default
-	python_foreach_impl python_optimize
 	fowners -R tss:root /var/lib/swtpm-localca
 	fperms 750 /var/lib/swtpm-localca
 	keepdir /var/lib/swtpm-localca
 	find "${D}" -name '*.la' -delete || die
 }
-
-src_test() {
-	# We want the default src_test, not the version distutils-r1 exports
-	default
-}