gentoo resync : 18.12.2020

19 files changed, 104 insertions, 148 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4e0d0ae308a8..c0e8d2f7e134 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index e3251feaa522..c02d961192c2 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,6 +1,6 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-2.8.7.tar.gz 206475 BLAKE2B ac1d51efac6301210ffd8b6e5ff6ed490cbf80e7dd154ec7a2ad0b6a2dd08ac73a325e332192214c964a873ba7c6f01a43a2157963d7edec9e0ec45b47e5b689 SHA512 45599f50a4a45b6fdea58d7a5759e4eb5f8e33acc53d60b264c15662e6bdc1e353af610845056fc67b127242c4ad15eaaf60a2113f2cb0245d4e4861dac6e1c3
-EBUILD acme-sh-2.8.7.ebuild 1100 BLAKE2B bb49e7ee375145152b585e38a5d64283a886cb9694f0b7167e23ad252f34863de64cc4ac6c4ec2ede86f4182ff90f7591187240d47170dd0482f0583d29ea723 SHA512 7abfd5cf5cafbb7277e8092fca9beac0cefdd20003438de9aabb132040c92192da5fde5aebf0e88d2980c08b82833a61f3906b6be7a38a47c7004a0625529fc9
+DIST acme.sh-2.8.8.tar.gz 218582 BLAKE2B bcd2fbc0ff984d7bbcf4e0ee4c1f08f868ebc4b31a5d217587cdeb5810b8991698de52dd082219194c762ef245324e981eb2a044b213e2713c0d12370be1c19b SHA512 cf601965cd5542dbd11668330d0a4e428e89ccc3af92d4d04ea3936c8a31979a5c00aa8e18a31fde07812242dddcebbfdbc06f1c29260b917dfa19f88d12fd72
+EBUILD acme-sh-2.8.8.ebuild 1100 BLAKE2B bb49e7ee375145152b585e38a5d64283a886cb9694f0b7167e23ad252f34863de64cc4ac6c4ec2ede86f4182ff90f7591187240d47170dd0482f0583d29ea723 SHA512 7abfd5cf5cafbb7277e8092fca9beac0cefdd20003438de9aabb132040c92192da5fde5aebf0e88d2980c08b82833a61f3906b6be7a38a47c7004a0625529fc9
 EBUILD acme-sh-9999.ebuild 1022 BLAKE2B 0e439fa8bfb6365f24aa4181acdad1af2ae1d0ab55abcb386348180d3ccf03e00bd9f395a96dceb252b56e29bd0a5711d027eedc7e3e23c67e9c491a9d75b66d SHA512 d370fa4197af017c61faf8b89b71e195920ebf6e970e51f86c773027fa95189491e75d94b1fe8901f02562ffc1ec9b736d82a0a21a64e31203bf6e841d2a4021
 MISC metadata.xml 457 BLAKE2B ae99692003d755e2dfcfbd0cd0b6f6094f61fed3e660e742920df93d738f6d6ad53c4e15394585e251cf082c76ae44fc004e53ce8d2df3525c82c57f803bcf1d SHA512 7f2d3a4f0ace2704bfb312ab07e483f1162ddfe6357b14a89010a1f6e45b9dc1600d2d337c6129e53f380988e543c1c5fe3203eb5018907721139882da698c32
diff --git a/app-crypt/acme-sh/acme-sh-2.8.7.ebuild b/app-crypt/acme-sh/acme-sh-2.8.8.ebuild
index af53d7dec342..af53d7dec342 100644
--- a/app-crypt/acme-sh/acme-sh-2.8.7.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.8.8.ebuild
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 49ee4bc796d3..0c025e26f6a9 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -1,5 +1,8 @@
 AUX 00_gentoo.sh 115 BLAKE2B f24fe757e45d9af58adb9417ef6dbd36c5db85bdc50af1403048a01625dac68e649fee2913ed2c9f199ec285666cb4b9100650b3b1b54929005260c2182adb49 SHA512 2092f8bffbc6b34fa806276194873fed42146d8c8a434bb68088e03ec9eb0a2e0c1862a9ade67d56a6bd553119cd00f8815353b71345e451039254708430e52b
 AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2c3b647a642bfca14f6b05161d13266983bf5672787c7fc5c44e55d953ebebf346259 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6
+AUX dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch 1179 BLAKE2B d4925675e868e24e2bd38aa0444e9b934e351fb706be5b66e71315d213186719260c20ebb976c160b1458eed1f14416ed6d27dad79a6b39b08cca50285802cb9 SHA512 2f18fa75ea6674b9b8746645395317046012f01032e35736580d87ac9a410ec4641e81c5f307d31bb238a53886b30820cde778bf83e3d04083ae1b6323777307
 DIST dehydrated-0.6.5.tar.gz 82274 BLAKE2B 3c8138bafdaab9c60db1463860d6c16dd0fb8e686f368e55a4fa010d004f350d03cdd161dde38361411506959f896a25ef802b76432c0fcd89a69d75fe1be9c9 SHA512 da8ff3ecb7ddeb25356469fa272aef4e7c3705049caf88d09656dbc4baf29e0efa135e6f154c78cec82da17a27a78f2145ee3b7bd71521a080e10550d09b8a53
+DIST dehydrated-0.7.0.tar.gz 86574 BLAKE2B 35a3b0b7592126ca65003a6c9eb8934a76584710d028057e5add7f77bb2fa3799e89a060306da3b98a62d291229a2a78f23e0f95f19e033796aee31e97b94488 SHA512 47740d2d31ca73482a4fc5ed0dfce986af907dd5449cb3a5230bf9683845686c8122fc32e6219a4439574ef11d6fb104ee09591c5ff667927a2c9c13ba005511
 EBUILD dehydrated-0.6.5.ebuild 1670 BLAKE2B a56a2e470747449996491568e960a663b9b45d58d22e0ae242ecb91d4b3b03024c4b7ba74b632cffc945094a55b2f03c25ed2b281f973e27431c4ca343b942be SHA512 619518a0d6224ac0cac0d08e796ab34d456b500f39afe54fc226c191d26bcdf2f7acaa11e50f96b798ff8e6d0930193872613b04b8ffbaf9b83370e9f1342bac
+EBUILD dehydrated-0.7.0.ebuild 1259 BLAKE2B a489aee59c6fc77010fff133552e86d178dbac6ea18014d244620e3421acf8fcb324b0071db4a1242b443f639d71553a9e79b2173023e1cdfa2b83bae6df7f94 SHA512 f2d1089bd25f484f96dd423fe4cddd5fe4e203d067f43440818641ebf496a4cc87da70e0708eb6ff2cd17b53d43f416a8bc1fc0e890bd0481d89471c5839daf6
 MISC metadata.xml 531 BLAKE2B dcd597fde3bafe2970275a99609546b1a2ef764729cd410a62389a29f8ce95e269f2155970503e041c937a28026c3d70763c86f492c4a8a3478026125eb5eecc SHA512 fe42f3b7b8ca0d2f18d389348599f468eaa80928a05fa7151bae23f5dd73d260fca6ebd3a701eed450b639438e44ca038aef420732e92ab9ddc672c0022bfbdd
diff --git a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
new file mode 100644
index 000000000000..a0b9dd29497c
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+cron"
+
+RDEPEND="acct-group/dehydrated
+	acct-user/dehydrated
+	app-shells/bash
+	net-misc/curl
+	cron? ( virtual/cron )"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-CN-extraction-for-older-openssl-versions.patch )
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/${PN}
+	doins docs/examples/{config,domains.txt,hook.sh}
+	fperms u+x /etc/${PN}/hook.sh
+	dodoc docs/*.md
+
+	insinto /etc/${PN}/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	if use cron ; then
+		insinto /etc/cron.d
+		newins "${FILESDIR}"/cron ${PN}
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		einfo "See /etc/dehydrated/config for configuration."
+
+		use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+	fi
+}
diff --git a/app-crypt/dehydrated/files/dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch b/app-crypt/dehydrated/files/dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch
new file mode 100644
index 000000000000..91188fbe3587
--- /dev/null
+++ b/app-crypt/dehydrated/files/dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch
@@ -0,0 +1,30 @@
+From 29b67962ac07d5d2b24f69c863a9ef31e8ac53ee Mon Sep 17 00:00:00 2001
+From: Lukas Schauer <lukas@schauer.so>
+Date: Fri, 11 Dec 2020 18:02:51 +0100
+Subject: [PATCH] fix CN extraction for older openssl versions
+
+---
+ dehydrated | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dehydrated b/dehydrated
+index 622165e..37e0ab6 100755
+--- a/dehydrated
++++ b/dehydrated
+@@ -926,14 +926,14 @@ extract_altnames() {
+     printf "%s" "${altnames}" | tr '\n' ' '
+   else
+     # No SANs, extract CN
+-    altnames="$( <<<"${reqtext}" grep '^[[:space:]]*Subject:' | _sed -e 's/.* CN ?= ?([^ /,]*).*/\1/' )"
++    altnames="$( <<<"${reqtext}" grep '^[[:space:]]*Subject:' | _sed -e 's/.*[ /]CN ?= ?([^ /,]*).*/\1/' )"
+     printf "%s" "${altnames}"
+   fi
+ }
+ 
+ # Get last issuer CN in certificate chain
+ get_last_cn() {
+-  <<<"${1}" _sed 'H;/-----BEGIN CERTIFICATE-----/h;$!d;x' | "${OPENSSL}" x509 -noout -issuer | head -n1 | _sed -e 's/.* CN ?= ?([^/,]*).*/\1/'
++  <<<"${1}" _sed 'H;/-----BEGIN CERTIFICATE-----/h;$!d;x' | "${OPENSSL}" x509 -noout -issuer | head -n1 | _sed -e 's/.*[ /]CN ?= ?([^/,]*).*/\1/'
+ }
+ 
+ # Create certificate for domain(s) and outputs it FD 3
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index ef573487b7a8..aa6f01b7d2f2 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 686 BLAKE2B 6a9f562dd9ae2719fccd88b93d1e462c983f5fd89b5dae041784187108585056e11271eb9edb10e3cc12257325675175306f1cdc3b55b1a187bdd4bc32a581ec SHA512 ade831ede4af178832a7b7105fd5b983878ae52cbe4d93a6493690b135f188a39b48b0e6106ccfa95a1722cd086b0ab58e6c1d35ffd1c5486eca7a6d1164544f
+EBUILD glep63-check-9.ebuild 688 BLAKE2B 4b26b2f41790e6df5e4eae060f9e667c567919d5d48e741215d2c321c4fdff00cda6b3de22607a3aace9d08385cd1477a1cfa8bddbbd7b1a582e0e46fb10a13b SHA512 701d571a58f2206d7ef1368e64f8fa6c21bd0c981eed6da3cbb21957da48bf4004a5a032a4b4e18f8e6bd1668353d167a39f41e64cba8180a56039cbb4dc5e48
 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 7efc46cc6b71..51007c547ca8 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,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 1a4c935c4222..7cb402719a16 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -2,6 +2,6 @@ DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af80
 DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
 EBUILD libmd-1.0.0-r1.ebuild 614 BLAKE2B 9d33178bd6faa47c60573c9f1b067cb4243074b42b5d7bc644f6cbfd47fd492081b0a7bcb169db21f0fab0edf3d3f8caf5e500a634ac0292a479f9ee9d766730 SHA512 aa0fdde5ba65459296370927e0c179f55a8aa9abb67ee3ee03eb803dd7760b8c695b826f5a876d89e460c0157bf0cf4f8d2fd5b81ed4ca89cce2d97b1c91aa99
 EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
-EBUILD libmd-1.0.1.ebuild 658 BLAKE2B 8ebd5931106e0ebc15c965a0b65433856ce4cccc1f9d00598ae7251e45940728423f48a07c264e105ea94b4e755d940ce1a94fe30c126a384f313e726ea79c24 SHA512 01b56857bc7118e94ec6bf321420b6eff57563b589b4f193601808009173251bc44d4958ea1db2523eca06c0d61c5f5d1e3a2655c4474072413275a6b9236adb
+EBUILD libmd-1.0.1.ebuild 656 BLAKE2B 53eae921ad0b8584cffc07c2d9ba30c2bff72a75de3e7d0df255bfbccfe5e7a8da392a93a5b2c66034cf3334899a94e5d1d4d288c1c637934a0e8b21a1e354db SHA512 486ef1462fbfdad1b2327ccf922d8d1cc910a67ecb5b82270f59da6fd6275c781ceb3ac72de440aa7a47e72921a98bfc7f653e6bdb7dee903093c28a66ccde5a
 EBUILD libmd-99999.ebuild 568 BLAKE2B f3e942f902160f0fbf840e0c082a3dd07f57c2fe1a9d785a5d7b26c429f2baf6be48e4420b65d3c6b9b15684d6043576e989b15d188a167b016f8d404669d59f SHA512 d8479e0df2f68c33deece78037021a2dd26d75ed623b3fc486837b6bb53bd33fb49d4401e9dc5f938f161a296adeb2e7da8ca6294aaed56b8f9e8adf2fb2f759
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/libmd-1.0.1.ebuild b/app-crypt/libmd/libmd-1.0.1.ebuild
index 0081b4d97e23..aa6fb0663b15 100644
--- a/app-crypt/libmd/libmd-1.0.1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 9d987c985593..36ec16ffd6b9 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,3 +1,3 @@
-DIST nwipe-0.28.tar.gz 849147 BLAKE2B de81c526edc9ce106d48297796e1d42689bafae20be8ac20f6a8eb6474c8202dffdfbad2f91c8282bf5f747921b90402a3a84e411d8a8b2adb0c2e785bfaf315 SHA512 2b6cb6dbcbb51960f726d8ec6c1629fb4675af4b3f7b39ee1fc91244fc9391f4ea23bae5c8794cc92a675ce202be60df900658b6d9a95b5bb399c0e6f009ce69
-EBUILD nwipe-0.28.ebuild 555 BLAKE2B 67a7107da39bb4a079ec50dcc278056bd0c9f39d9e6ea6a5aee585603137ecb593652595547dd11264459f069fd5336f13c067df6d085af2ce6b9cc2b5bca7f8 SHA512 1d70f17660ece4b2e85cf73a2a94eeb431f40922dd2049d49ae1430d7ad4b4f5d532aa454c7085f61f3eac13f72a510e52779c9f10d64751952f974eb43df933
+DIST nwipe-0.30.tar.gz 6358657 BLAKE2B 69fdcfaacb32aacc27b375a793bff5b7014979c8097ef3b48c2c307e4bc3a828de7c01b6a58e46346dc58a1b4beee4a408074706175098c364dff7ecf67771d3 SHA512 b6d86d78dafbe6c5e27b00b183673dc77dedcf849ecd169b616c90bcda5180bc10fe072580c13f027abaa5fd840e73034ac75af75fe1cf6eb0756273bf46975f
+EBUILD nwipe-0.30.ebuild 542 BLAKE2B 58bf4c9fb2f0280e34e8c626377f9ac49b06a94565f2bd7f75c4ed2af75040e09f1db8ce8ce894ebf0d07e4852e92fb5c89740410c37fd49f17b806e612ee0a8 SHA512 a625f460573dacd84cf11b97d87294b63753063383333183b977136d4001d4dee6f61778e337068488038e4725706aaff14070ff5882395dc214038c4d6a8f5e
 MISC metadata.xml 458 BLAKE2B a42de1e61e183e78050015563f293f8cae433af086d3afde066624dd56b024a35b590590dc728cc181e5ab0912ab94e48af4a3db9117498084423e7134a9743b SHA512 63e500333fff449b1e2e91fed9492ee3c5b33aea0116009cceca1b50d744b87cbe7a86c01a5cf19979425f56ccf746e487b8ec03c55f988f377b326c95a1dfb8
diff --git a/app-crypt/nwipe/nwipe-0.28.ebuild b/app-crypt/nwipe/nwipe-0.30.ebuild
index 3c580a709883..ab47d6428c80 100644
--- a/app-crypt/nwipe/nwipe-0.28.ebuild
+++ b/app-crypt/nwipe/nwipe-0.30.ebuild
@@ -13,8 +13,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=sys-block/parted-2.3
-	>=sys-libs/ncurses-5.7-r7:="
+RDEPEND="
+	sys-block/parted
+	sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 4ceaead5a75e..70c0782f4cda 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,7 +1,3 @@
-DIST p11-kit-0.23.19.tar.xz 822652 BLAKE2B c1750e2d0b8ebdfcf70695259401a029b2d5739d8222c37f128f94f8a4313321956e120dcba5c7cb882d16e1a6b12398f9dfa88ef601e826f0dfec5acbf438c8 SHA512 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2
-DIST p11-kit-0.23.20.tar.xz 822588 BLAKE2B adda58acc121d38d3520d20daf8f59c3c46f81afe807d9277fae70e836d194d08cfea0405d2186d548ea91be56eee63d576a318c330fa844a0cf1889960db384 SHA512 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57
-DIST p11-kit-0.23.21.tar.xz 827064 BLAKE2B 31a19b80c1ba41db0115bd3ea8381f6c0ad66b173b5d07f2b8f9e3222c83ea5703ec12539b13448e4b1b929b912ce3af88536b30a73ddf7979470282954b0efd SHA512 4c796ca2c72a650f105a7a70aa62e55edb12e1c151e91ef92bfeee6c5c68982b36023400b42c4efcb1d351b7848e8618c26607cdb0f77b48ae40e2ecfd713e3e
-EBUILD p11-kit-0.23.19-r1.ebuild 2018 BLAKE2B 890a27c5ef1e0b4d6ff362c132cc282593fd29359d4361a342e216c0a4064c26aa84df9ff6b3d2ff9ace5c9e2ae07b335862d3dd5873aa4648830deba5ea468f SHA512 8f5e4bdfd46f723625b38cba86e519eb39a14fec08be6f5becce7105de0357c040cf624f76ee3d18067e4953c8a19c3769a6b5041889b2ac7a1e4e3b97db15f1
-EBUILD p11-kit-0.23.20-r1.ebuild 2027 BLAKE2B 9845b1a32e30709b88bde8ddef685bd6a041995d7d1ae7427f0dfb2d80f89561de50f7cb9d4fa959e07e0615a0e27f894b3a2b6666901b14453058e238c8c338 SHA512 2d2a340c26a76783faf0c5f41ff96802989efa3c553dab209756d15ed5926b115d1e7501430ef19e42654f876c6ca9e376f9ce4633b8e0520bad877dac6587c5
-EBUILD p11-kit-0.23.21.ebuild 2027 BLAKE2B 9845b1a32e30709b88bde8ddef685bd6a041995d7d1ae7427f0dfb2d80f89561de50f7cb9d4fa959e07e0615a0e27f894b3a2b6666901b14453058e238c8c338 SHA512 2d2a340c26a76783faf0c5f41ff96802989efa3c553dab209756d15ed5926b115d1e7501430ef19e42654f876c6ca9e376f9ce4633b8e0520bad877dac6587c5
+DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
+EBUILD p11-kit-0.23.22.ebuild 2018 BLAKE2B 890a27c5ef1e0b4d6ff362c132cc282593fd29359d4361a342e216c0a4064c26aa84df9ff6b3d2ff9ace5c9e2ae07b335862d3dd5873aa4648830deba5ea468f SHA512 8f5e4bdfd46f723625b38cba86e519eb39a14fec08be6f5becce7105de0357c040cf624f76ee3d18067e4953c8a19c3769a6b5041889b2ac7a1e4e3b97db15f1
 MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
diff --git a/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
deleted file mode 100644
index 955332bd5e51..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asn1 debug +libffi systemd +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-}
-
-src_prepare() {
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
-		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
-		# drop to XPG6 to make feature_tests.h happy
-		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
-		# paths.h isn't available, oddly enough also not used albeit included
-		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
-		# we don't have SUN_LEN here
-		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
-			p11-kit/server.c || die
-	fi
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
-		$(use_enable debug) \
-		$(use_with libffi) \
-		$(use_with asn1 libtasn1) \
-		$(multilib_native_use_with systemd)
-
-	if multilib_is_native_abi; then
-		# re-use provided documentation
-		ln -s "${S}"/doc/manual/html doc/manual/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.21.ebuild b/app-crypt/p11-kit/p11-kit-0.23.21.ebuild
deleted file mode 100644
index 955332bd5e51..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.21.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asn1 debug +libffi systemd +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
-	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# disable unsafe tests, bug#502088
-	export FAKED_MODE=1
-}
-
-src_prepare() {
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
-		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
-		# drop to XPG6 to make feature_tests.h happy
-		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
-		# paths.h isn't available, oddly enough also not used albeit included
-		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
-		# we don't have SUN_LEN here
-		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
-			p11-kit/server.c || die
-	fi
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
-		$(use_enable debug) \
-		$(use_with libffi) \
-		$(use_with asn1 libtasn1) \
-		$(multilib_native_use_with systemd)
-
-	if multilib_is_native_abi; then
-		# re-use provided documentation
-		ln -s "${S}"/doc/manual/html doc/manual/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
index 1c0aa67dab24..1c0aa67dab24 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index f5f6d21c3ede..1d993e7bc078 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,5 +1,5 @@
 DIST ssss-0.5.6.tar.gz 20128 BLAKE2B d42fff5878e2ebcc62cd86b86f0f8a3e522c089cbb5e8fb2585cf375ff133da7d9ccf00e62cc6888e00abe5d64f87ac19ddbb3f6e6a0d86913e6a6aa5a8a1d4c SHA512 964af01610a7a269d19ae1fa1712ef12ca1afab02636ba83dd84ec5aeb185210a1247d932ee39d2869aa76e54ffb051d802800d295d17355d6fe2a8010edd509
-DIST ssss-0.5.tar.gz 17435 BLAKE2B 76aae463ce11341f8b0336526f7d19c9921025cabc05bc9e00005b0bdeb676ed5e069226962232f277de2fecb1cd71bafbd4b2fa0c03ef4faf0f66daa24599d1 SHA512 be8df1666ac61d4097b5fd54f2cee3640db8f85ec21411f1b208a35b671c5699bc692079525d8d313d1cf2500da31bfb03771829a9fdccc0bb6d806749526ec9
-EBUILD ssss-0.5-r1.ebuild 774 BLAKE2B 08fa8b0d2c88ba22cb3a74bd728a32c2e54ff9cd92b88c8345e407b035bc2916f547ed18ab90d76efb401e6cd7aa015f0262bdb9b9629039091aef5c19725dd6 SHA512 364456d49bf4625c632e42dfee4013b84cb4dee6df747b113dcc11362c4bbb9cbbc2c5b460411986c751c4fd0a4c34a288464b383601bc2eb6c331ad295224f8
-EBUILD ssss-0.5.6.ebuild 809 BLAKE2B 5025aae75562b85423ff9996c9a83da107ea53bd0e0e0485ee86a35094c64705171ee82471a99ef89ddbe896f4ad36f908ac72c78ea01f90b812462ecd2112aa SHA512 e686cfc6579e2cafa17bf03d8d03a11cae0306f16dff410792cdd8bc4dcbae1ddb6a4c8693bb1021c5d8deaa2abe45fb2ff1cc6f454cc5e920af97eeca2730b4
+DIST ssss-0.5.7.tar.gz 21774 BLAKE2B 923f9e0c46e82261dc4f293635aa318c986cee221a93e9df3d232e4b923a7828f0301c8729a5beb72b66e1646e5a0694cfa9546ea26b0e06fa16a8a0c7487ef6 SHA512 aca85b7a63e6d009fffe5540b0c8e3190c364aa2070e8d8487fd42d7ac76143e404b226b28f3630022d102679371673cc7c08b8c5d3bcf63e3676b7293d2ba00
+EBUILD ssss-0.5.6.ebuild 808 BLAKE2B 26402603e1aa64a9a9c86174ced65ec09abca823349526ed7aced8ff6b685129f80ffb4ed64c2af98b66b12626f0efdc496c036b776a5d63123cdf505172587a SHA512 7d253cebf34c72779af5467be1721615c2593275a2d888262b5b27268f40edc9ae1820b530020b58c5722c766300f32103ea9c448401738b752b519adf246cb2
+EBUILD ssss-0.5.7.ebuild 810 BLAKE2B 353efe544e4d85bf4cb3d7c400fbb9c9d351efd30aa50a276838db169add2c5c2ff01dbe742722c96dd65cef569314111305a65874422b803efda80f55274b29 SHA512 f1133c11c1c54777ab0ece70c2dabcec82cd599ba95c063648255aad6aeb2d55d6876bbace45d3aa754b08b4c1a8795bba443538aeaea7c56e86724422765efe
 MISC metadata.xml 571 BLAKE2B 8e5b2a9efdbac1e9cf15c2e7c60e6c6a9c41300a6ec65df5751043ac85536ba31ace97f033aac89e47f9792b8003c134e1b8a8c3af6513e3406e38027d413e42 SHA512 daebb2e758087ee3cb49c5c89c0bafe3bdf57e2f7c3b64e1053e465b765ad8e95594065a7e236cf8072a406f7d92702a84807393820fcaec26ff29bee73ceff6
diff --git a/app-crypt/ssss/ssss-0.5.6.ebuild b/app-crypt/ssss/ssss-0.5.6.ebuild
index 89420c41084e..4897601cb3ef 100644
--- a/app-crypt/ssss/ssss-0.5.6.ebuild
+++ b/app-crypt/ssss/ssss-0.5.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-releases-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}"
diff --git a/app-crypt/ssss/ssss-0.5-r1.ebuild b/app-crypt/ssss/ssss-0.5.7.ebuild
index 99411362aaff..724f2c160f99 100644
--- a/app-crypt/ssss/ssss-0.5-r1.ebuild
+++ b/app-crypt/ssss/ssss-0.5.7.ebuild
@@ -6,18 +6,18 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Shamir's Secret Sharing Scheme"
-HOMEPAGE="http://point-at-infinity.org/ssss/"
-SRC_URI="http://point-at-infinity.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/MrJoy/ssss"
+SRC_URI="https://github.com/MrJoy/${PN}/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-releases-v${PV}"
 
-KEYWORDS="amd64 x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}"
 BDEPEND="app-doc/xmltoman"
 
-DOCS=( "HISTORY" "THANKS" )
 HTML_DOCS=( "doc.html" "ssss.1.html" )
 
 src_prepare() {