gentoo resync : 23.09.2020

24 files changed, 49 insertions, 220 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c7d6cbe595bf..9cf7eca8ff14 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 3a1ffc106556..f53ac9a1f233 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,5 @@
 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.20.2.ebuild 2636 BLAKE2B 6083e45d12586eb27132f69e3c196bee711d50738e2367a4b2e87eac0b8279d919c38ffab902e608d1bb074c59ce2817caf295cfc1c53f031403b15cfb83869d SHA512 501a7d8853cb3698e558b5cb3307a40d2dbf00820ee8da2163d73de5900c6d5a84c3a1e2aacc0e0f66cff4633a9c6499e3d5707dda0c1a8d2d2769e1899e9f58
-EBUILD libsecret-0.20.3.ebuild 2639 BLAKE2B 2851572c18a8a514d7bcf0aa58109d18c3f4b10cd5b64f4b5865c963745c143f977105a6911b5fe1be3b8a4a9f63b93e065d99a00e7f0873d818508953dd2c69 SHA512 081f160d21c93cbdc9f5c9017a05e47e2bfd5695aa8003ac87e53f3f784937b9317fda6a22ccaed78bd4580c9ad47265e309375aa3f8a2178ad88eedc2389e78
+EBUILD libsecret-0.20.3.ebuild 2637 BLAKE2B 5059338cfd2085bc32343b2614965335b0cd222eb502080afb555080e1f82b36767c4ab5cc85eebd55485233fa6a8aa45d3cf8d2d59ebf8d186b5c4c6f6ded8f SHA512 362a1e6ad2e3100ae432af0297159e3328eaef9fc1e074258b526c97dfbff26e4361b79ea21583215147c4c366528930438e1b36f6f13e01f906fe73a033d408
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.20.3.ebuild b/app-crypt/libsecret/libsecret-0.20.3.ebuild
index 07aa303ea628..e5125875d2b1 100644
--- a/app-crypt/libsecret/libsecret-0.20.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.3.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index ec3375c5f0bb..a072caa98e89 100644
--- a/app-crypt/mit-krb5-appl/Manifest
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -1,5 +1,5 @@
 AUX mit-krb5-appl-sig_t.patch 1411 BLAKE2B c2a34ada3f811459d006c1be6e79cb0811b0ab6ef7a1eb2fa6372db5b52b7db06e1cb94d7cbcd9b883fa14d9e0cf704ebfde7a441e7348728be9511ff2b6dae5 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3
-AUX mit-krb5-appl-tinfo.patch 575 BLAKE2B e79cbae98ea7848bbe11f0aeda1f192d51bb1b9440952d0b8606d91b0fb8dd6d1057c4eece722112a3a3bcd26596868cf534d49f4bf5dbfeee227b16f8adde19 SHA512 076f34d70f43ae34fa6bc5e23171b2b31f579812527b7f78ba40ac3fca0cd92000b8caa40b8773bd2f9cc3ce0f6bcc6815f83422d5f8d320d34c4feb580231ab
+AUX mit-krb5-appl-tinfo.patch 579 BLAKE2B 8db4885b88e2eb155ea80ce8d4e7f320ae39a9183e70de452081a452c51ba9ae3dfad4ea000582b3f3f361e17de02b0720cd794473c974c5551b69afde869445 SHA512 3b90b4f9539b94ddc8a0483dc156f61d33b436a01d32d8e66de13a82e653ec51c7996e3e5b4f5d8e1edf6a21d6c4fe09f4a4382e2f918edff070e71bfcee0951
 DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
-EBUILD mit-krb5-appl-1.0.3.ebuild 1639 BLAKE2B 70ac99cb842b5868542fda3db627bf948d928041c14e3827e7a4f69df5776eb75e3d77c2d3559df3bcfa7d835e9c027dbb8672463fec179aab2ebd54e30e3568 SHA512 3a110a77ca241205da721b47b721d41799296762c958197cfc5226147b45b92f8980cd36631aaea09a55fe00e4e40435b24f0fee8df562a47f2692070a098b50
+EBUILD mit-krb5-appl-1.0.3.ebuild 1635 BLAKE2B 192ab9ee291f87518bfecb86a565636470e0a7c3112da5327f9c8654e67d51b695d7e0b1dd9659f4bf90f3eec9d07ca90d50d57929575f504ad06754579fe19a SHA512 865cb3867f641a6bb1cd8a1e9afedf786a788241f6f93676f68822b20b4f57c6312684005ff85ad3a374920f787c49968df78ba8b297fd4f777b8822cb430eed
 MISC metadata.xml 240 BLAKE2B 3a20174df7c37c40098c716b97f64079f86d511e3740e43865ba8e1b1fe52de971091ee51a510543cb2a49373cff87e790f71fe397975f61eee2b308b0729e66 SHA512 57354970f719cd4e3a27f6024addadbb81919a5eaaefef094d3d2b362c44b5ab5cec740090ffce89730cc52f469bc93957c129865a71a4583e0309a93e6f970d
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
index 54c18665d336..7a81f244cfb0 100644
--- a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
+++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
@@ -1,5 +1,5 @@
---- configure.ac	2011-07-11 22:34:17.000000000 +0300
-+++ configure.ac	2013-02-28 15:12:24.693841664 +0200
+--- a/configure.ac	2011-07-11 22:34:17.000000000 +0300
++++ b/configure.ac	2013-02-28 15:12:24.693841664 +0200
 @@ -152,7 +152,8 @@
               [AC_DEFINE(TERMCAP,1,[Define if termcap library is available])
                LIBS="$LIBS -ltermcap"])
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index 73a6522b4699..6493b2d6f54e 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -1,28 +1,31 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P=${P/mit-}
-MAJOR_MINOR="$( get_version_component_range 1-2 )"
+MAJOR_MINOR="$(ver_cut 1-2)"
 DESCRIPTION="Kerberized applications split from the main MIT Kerberos V distribution"
 HOMEPAGE="http://web.mit.edu/kerberos/www/"
 SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signed.tar"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="openafs-krb5-a BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=app-crypt/mit-krb5-1.8.0
 	sys-libs/e2fsprogs-libs
 	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}/${PN}-tinfo.patch"
+	"${FILESDIR}/${PN}-sig_t.patch"
+)
 
 src_unpack() {
 	unpack ${A}
@@ -30,9 +33,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-tinfo.patch"
-	epatch "${FILESDIR}/${PN}-sig_t.patch"
-	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac
+	default
+
+	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac || die
 	eautoreconf
 }
 
@@ -44,19 +47,19 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 	for i in {telnetd,ftpd} ; do
-		mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 \
-		|| die "mv failed (man)"
-		mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} || die "mv failed"
+		mv "${ED}"/usr/share/man/man8/${i}.8 "${ED}"/usr/share/man/man8/k${i}.8 \
+			|| die "mv failed (man)"
+		mv "${ED}"/usr/sbin/${i} "${ED}"/usr/sbin/k${i} || die "mv failed"
 	done
 
 	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
-		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 \
-		|| die "mv failed (man)"
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} || die "mv failed"
+		mv "${ED}"/usr/share/man/man1/${i}.1 "${ED}"/usr/share/man/man1/k${i}.1 \
+			|| die "mv failed (man)"
+		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/k${i} || die "mv failed"
 	done
 
-	rm "${D}"/usr/share/man/man1/tmac.doc
+	rm "${ED}"/usr/share/man/man1/tmac.doc || die
 	dodoc README
 }
diff --git a/app-crypt/openpgp-keys-gentoo-auth/Manifest b/app-crypt/openpgp-keys-gentoo-auth/Manifest
index 81a92ccac34d..0b5e290a14d2 100644
--- a/app-crypt/openpgp-keys-gentoo-auth/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-auth/Manifest
@@ -1,5 +1,3 @@
-DIST gentoo-auth.asc.20191030.gz 6556 BLAKE2B 233df81a8c01ead6524fdded0c64aba7d930d0f9e6214c403e43aa97bc87502a4e1d68c6c415505db5f618d9309d5ba1279d1e9b9e068289002ad30896a500c9 SHA512 c752dc4b5d75937290e469e722ccd48a592413438a7d1c5bc5d4e07114077ae3dfb5fc3cbe6b96d672e4149737cd7db6dc8298e670e63745bdff7426e98fc03b
 DIST gentoo-auth.asc.20200704.gz 4540 BLAKE2B 8ae8a1947ae81e89aef6171b228e97a80331cc58336a0387bbda7c885ec5fff322d17b7fc462d7f3fe88a965455b94d1e16b705903843d75fa53481d525a1965 SHA512 da7d1aa76ea04f465e690560dd2d09306aa120b9f2771abc6fe06d5181c39c9e7db73ae0b9c01b864ccdd55a881a7e9c9716dd87446c809b901bb17c448878f5
-EBUILD openpgp-keys-gentoo-auth-20191030.ebuild 640 BLAKE2B ec7789879574677fd526af24da8a2c77319a35ebaecb7e9a72d4d39136512d7e999c3d46657ae0b9e65533351fbc5fdb1233884ddc1572a529cf6e72a2cca005 SHA512 d9a510f3d71117a6a2773c109d0b45bc9623de74ba6a051af9f26160fc948a1a04cf4ce2b10575c27b4202add7f31ef3005389aeda6cc3496297ebcb382aa28a
 EBUILD openpgp-keys-gentoo-auth-20200704.ebuild 787 BLAKE2B e6afcf6f1d54482cdf505e69a02db3cb266a926859a7c056470974c37491b90db68c06c530bbca800ca9b5d2b2461c5811eb76f5677cd6f83ca683622dd31c93 SHA512 a170e47edfab5095c882994f6d9a9399754e130f768c444a912c96a442af67bb9777c1dbd144d1e137e384566ac84217ffd7bbffaa8ab9a70bb960b640d48485
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild
deleted file mode 100644
index da6d195dcff1..000000000000
--- a/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20191030.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-auth.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-auth.asc.${PV}" gentoo-auth.asc
-	newins - gentoo-auth-ownertrust.txt <<-EOF
-		ABD00913019D6354BA1D9A132839FE0D796198B1:6:
-	EOF
-}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 4ac374df21fe..d9c525b30750 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,6 +1,4 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
-DIST gentoo-release.asc.20191030.gz 23981 BLAKE2B 307ceab69e309a53c2db191cf9d7a484318e852af648d93d9ad4bb2422737ab8de9257b457e5f201d86d226b348447acfbe57d259ce436150f75ccfb9f6ed60e SHA512 f3fbe0198f80f37784613c2a390c29f55e5b6291c44ee64d676806a26745017f8a9168573e13f6fc2fe93910927846c584b9f5cd017c4eac1cc875d7ed30cb8c
 DIST gentoo-release.asc.20200704.gz 17812 BLAKE2B 2173fa236db0ae08d58959732172d20fe0a6a8adc1e2ebcb33c3b9956684d26ebcf74b332a25c7d738d4820abb24c525404a6f255efcb7cedf0ab94c185a83f0 SHA512 fc5c7042570d813d906190f11869605983fcd8815cdb414d7060f8038c849d4f68426feff711a7303728c49c0515f9d836d2cc3fbbbf50811b94668194beca85
-EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1157 BLAKE2B a78923498b264e3b4451db7c2ddba9c04de0787ddc2c3b4befcba441d07c0ed1207b0041d34dca1ea5870317a9745bb3533c5ff306ffd95e2dd89f067ddcb700 SHA512 3c7ad1a6af681007e1647cbef2d8956ed9aa15067d3d7d15edaa056c85331c6525bed0b01729eae598924ba6ad1a4c755f91d238e532ceec72321b7734e81ad0
 EBUILD openpgp-keys-gentoo-release-20200704.ebuild 1347 BLAKE2B b80ac3d9f33c7154be9566964f5248ee692a63637d35ecc7ab980adf027da19aaf957baee1854f8cd7bcf4be9d3a7ef73aca35f1727bcfeb4bcf64fceeda1331 SHA512 0eea69c1d95aca657bf349db7509ce5114f7f126f2f99adb19d4e644d57217492cb1ac2268054009d50ab71f200dedd63b77b2f2c07853b782ea68851ef0c1d2
 MISC metadata.xml 271 BLAKE2B 21ff27fce9fb36fa286e0cb5324edaf0721e2315d14456c837330d40dabd66369da85b94fc33169ae0caf233d634dd6fd2c29c37c0a78e38307e4adc134381ae SHA512 fa6aa60030292b6236a4b68b26095c3eea1b8dc1decc2be6b36ebb33979c52c39915e6169bfb54ad6f3a8380b1decc23d62f079b134484d97587ab64aa2e1663
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
deleted file mode 100644
index b98ea9aebcf8..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-	local old_umask=$(umask)
-	umask 077
-
-	local -x GNUPGHOME=${T}/.gnupg
-	mkdir "${GNUPGHOME}" || die
-	einfo "Importing keys ..."
-	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-	local f
-	for f in gentoo-release-test-sigs*/*.asc; do
-		einfo "Testing ${f##*/} ..."
-		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-	done
-
-	umask "${old_umask}"
-}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 866cd0442769..4ceaead5a75e 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,7 +1,7 @@
 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 1937 BLAKE2B d0532b5fe02deba3ba019bd83e30c25fbcaecd592f5c70123110f4a602cfe7edaa5c747f0a09677d4db59a057a800d31e46ab2175547fad4c413e0afdd66f29b SHA512 b353d07e60ac0e4eb5d5dc3a8e54d4abb9c6cdcf83c4b98dda227fb84812f1af25deff68f3b325f9ce4d684e6b24dbe59c1afa50fc7a36c6bc80d5517a241e55
-EBUILD p11-kit-0.23.20-r1.ebuild 1946 BLAKE2B 4535d9c8a81dd860de328d179764e41a5b024dd52ecb112b9ab0ef486369d1c63175e530ce1c6c4d7863af98b51c50bfa5e7434b4b824d33aa7770068b08abb3 SHA512 aeca7aca4f2e0fec0f83a47b0ef1893233e2ea87c824778f7291222b55b2ed213c71348cc63c0f302108102e5a972b0dd235184ca1fc68b31d493c016fa9948c
-EBUILD p11-kit-0.23.21.ebuild 1946 BLAKE2B 4535d9c8a81dd860de328d179764e41a5b024dd52ecb112b9ab0ef486369d1c63175e530ce1c6c4d7863af98b51c50bfa5e7434b4b824d33aa7770068b08abb3 SHA512 aeca7aca4f2e0fec0f83a47b0ef1893233e2ea87c824778f7291222b55b2ed213c71348cc63c0f302108102e5a972b0dd235184ca1fc68b31d493c016fa9948c
+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
 MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
diff --git a/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
index a2ad1e3b224a..1c0aa67dab24 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
@@ -12,11 +12,12 @@ 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 +trust"
+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"
@@ -46,7 +47,8 @@ multilib_src_configure() {
 		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
 		$(use_enable debug) \
 		$(use_with libffi) \
-		$(use_with asn1 libtasn1)
+		$(use_with asn1 libtasn1) \
+		$(multilib_native_use_with systemd)
 
 	if multilib_is_native_abi; then
 		# re-use provided documentation
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
index 6ecc47004a9b..955332bd5e51 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
@@ -12,11 +12,12 @@ 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 +trust"
+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"
@@ -46,7 +47,8 @@ multilib_src_configure() {
 		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
 		$(use_enable debug) \
 		$(use_with libffi) \
-		$(use_with asn1 libtasn1)
+		$(use_with asn1 libtasn1) \
+		$(multilib_native_use_with systemd)
 
 	if multilib_is_native_abi; then
 		# re-use provided documentation
diff --git a/app-crypt/p11-kit/p11-kit-0.23.21.ebuild b/app-crypt/p11-kit/p11-kit-0.23.21.ebuild
index 6ecc47004a9b..955332bd5e51 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.21.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.21.ebuild
@@ -12,11 +12,12 @@ 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 +trust"
+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"
@@ -46,7 +47,8 @@ multilib_src_configure() {
 		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
 		$(use_enable debug) \
 		$(use_with libffi) \
-		$(use_with asn1 libtasn1)
+		$(use_with asn1 libtasn1) \
+		$(multilib_native_use_with systemd)
 
 	if multilib_is_native_abi; then
 		# re-use provided documentation
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 1a7354baf3a3..117c80985cf6 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -2,5 +2,5 @@ AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f
 AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.1.0-r3.ebuild 3119 BLAKE2B 414196c2ae4e3bac606fc1916d3d36c9c50a42b531f223ae36bec3395a111375133779459adec1100917c694cd5419a10ad06d76330b3dde74d53df6dc3b241c SHA512 afc0c83658684254122d6f0bf6278d1d500ba3e9d965662db00d9b20b5999930a54b192a983986be61cf532f14c26baace400dc49da48d3e374b7f809d3771a7
+EBUILD pinentry-1.1.0-r3.ebuild 2960 BLAKE2B 00edfd8ab672d78f279abc494ad1ea523f20b3b2f261a2fab0dd03c11179773977280f3e57a78bf2f67bb992d558a003f5449e851170e029a634e9fdc581b7f5 SHA512 6dc0e65560a78a239b5fbafc8f6623a79baac24f5bd23e6fca9017f308826b485b5ba4a4e3ce895d35c9bf5377507bef9c6f8132d07355596270c0d005ed478b
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index 053f01d8ca6f..efc797548a00 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
+IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5"
 
 DEPEND="
 	app-eselect/eselect-pinentry
@@ -29,7 +29,6 @@ DEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
-	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
 "
 RDEPEND="${DEPEND}
 	gnome-keyring? ( app-crypt/gcr )
@@ -39,11 +38,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="
-	gtk? ( !static )
-	qt5? ( !static )
-"
-
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 PATCHES=(
@@ -58,7 +52,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use static && append-ldflags -static
 	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
 
 	export QTLIB="$(qt5_get_libdir)"
diff --git a/app-crypt/quickcrypt/Manifest b/app-crypt/quickcrypt/Manifest
index 4fa8fa12f41a..323681013241 100644
--- a/app-crypt/quickcrypt/Manifest
+++ b/app-crypt/quickcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST quickcrypt_0.9.2b.tar.gz 2927 BLAKE2B ee5593ef6ee4f2b48b08713f98616220ab9170cf36ad8664fd9fadcbcdcb64ba9cc33689e9b5e79ec67493a5728de24a6cc9b86a2ff1e579b9a4c77f0ad177e7 SHA512 7b0efbe5aaf9f878233885470ed053124dd3c14fe2630902517388f3ecefda1bc89f3ec9a7edd6d7582f4108bfebf421d593f4b37ed66a7692e955c65003523e
-EBUILD quickcrypt-0.9.2b-r1.ebuild 559 BLAKE2B 8dce78764b668f7aebaa12b81f9c6b0eb589328880a13dfb6326ce1998e4f32a60c1da9c824e22aa67bfabc8a972e5ca4a501eecbf71c6731427ae48e4740ce1 SHA512 a573f28f643081e9bca5c9df6031ab262241bab6b92c7854171339208178e1693c5daa0176092ce291defb53aea1708a21c84fc9de20cdfec920f36007295e8d
+EBUILD quickcrypt-0.9.2b-r1.ebuild 561 BLAKE2B 7c7526f5809d573df10a5c04564e5113668d489df9a38f58143a401024eb67b67488b9cd5e526d4524f796a66922f6f4284eee364c4d343324062d78e24fa953 SHA512 499534dee58ef84d786dd19c1b6f2763cc2a5f0cb94f2dc5b5a9c6cc6e898f523c3bd0ba85e3d730a5c8d7fb02ba758fa1011734ee1f2227d4b6fec3ece88b73
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
index 75d58b831d0d..7ae632b049a3 100644
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="gives you a quick MD5 Password from any string"
-HOMEPAGE="http://linux.netpimpz.com/quickcrypt/"
-SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
+HOMEPAGE="https://linux.netpimpz.com/quickcrypt/"
+SRC_URI="https://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-crypt/scdrand/Manifest b/app-crypt/scdrand/Manifest
index fb8cc29d7feb..243f85cc0388 100644
--- a/app-crypt/scdrand/Manifest
+++ b/app-crypt/scdrand/Manifest
@@ -1,5 +1,3 @@
-DIST scdtools-0.3.4.tar.gz 254227 BLAKE2B d2959d1be860b4809f4b20b5b3e2b06534bb49220b6818b4ac9c8e73751c31dfa4a6c0200cc6bbb33d4a627f0d55b1c3cefda3def6a78bde925a0c58d9c0429a SHA512 ff25f6360c9bd73e63cefd8fe37103dc1ef2528d87ddf7c1006e913c921e78569ff6f12096d1407bfabf626e73376f13e25f606f8c45cba79803689176801b73
 DIST scdtools-0.3.5.tar.gz 155529 BLAKE2B 9b0791d8a5d92240968be82fbffd1838229586ce33b857d13fa40732bf3424df88c33c5f792e8178b52fbe06ff91c9c74e59ee686552973f7a8bbf8b1249589b SHA512 5c45948f7e6b6357aa6305c942bb388f9693908991049b2b279bbf1f27bb2de3df1b8278da30b1cc423975880890cf4533f10ca3de42c9dc88182aacc6466ced
-EBUILD scdrand-0.3.4.ebuild 725 BLAKE2B 4e17b08da3816d491153209c6bdec8eac2f3e81acc63134972b534fad2db20abd610a9bbb196de2a0407f35a34aff5edc5ac47bcf265be8ff245a9b2638c204e SHA512 297cc015cf40cceba7fea13b837b715698d9aaf61f9efb97efdd6ddaa0d5b82df2026686850620a99f42b35fa923897f26e7ddcbdd59a2ba499d22acc8e9d728
 EBUILD scdrand-0.3.5.ebuild 730 BLAKE2B 95794d69b38276185ba14e123d8ebd95317641fd16f3f277e9a04ffd409a10bff76ac74ea43c255c99f5cf3307b012586ecbb4ce439d3bf2a620f22cd35356c6 SHA512 03e9e4dee3bc1e0124f2c37ba7d4e9f2f6b39fc3e377c7b7203fc8923387b141a16ac665184c37b9445955439cf2c600f34d0876c89a8f6b617eef46ee549b97
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/scdrand/scdrand-0.3.4.ebuild b/app-crypt/scdrand/scdrand-0.3.4.ebuild
deleted file mode 100644
index a440b78d2180..000000000000
--- a/app-crypt/scdrand/scdrand-0.3.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=scdtools-${PV}
-DESCRIPTION="Feed kernel entropy pool from smartcard's TRNG"
-HOMEPAGE="https://incenp.org/dvlpt/scdtools.html"
-SRC_URI="https://incenp.org/files/softs/scdtools/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libgcrypt:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:="
-RDEPEND="${DEPEND}
-	app-crypt/gnupg"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake -C lib
-	emake -C src scdrand
-}
-
-src_test() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" -C man man_MANS="scdrand.1" install
-	emake DESTDIR="${D}" -C src bin_PROGRAMS="scdrand" install
-}
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
index e66c7f64cf71..c9fbbaacf219 100644
--- a/app-crypt/scrypt/Manifest
+++ b/app-crypt/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-1.3.0.tgz 380332 BLAKE2B 4bb2c5b911cd25e80444e7dd6381692a3ddd3dcd3a5f4bcda14c8cc4169f332f2c617175bfd222f03d8e48a3eefd9d01b2d7c3fd6b712b3266b2cc75bee8396b SHA512 199f58adb5231f1ad585dbe8f64d6c54920cee201bd7703bcfc7e64917bf8647f9e35b3835b78c41210fd9af5223a79938f2495e4b48e6a62bfe8721d82492c2
 DIST scrypt-1.3.1.tgz 394516 BLAKE2B 91faa22dc317927b92abe26c5e15cd52c409722716076c7cc502a0c6e4e84ceaaf60222b3ef141c6a209f36084df2d7f45d8f19482aa035c3e2442513c4283d9 SHA512 c76c29463d2a4db6b62283daca80bc4124a6272f37f983d472d44251b98da702f1edb16ad15058a8d0ea320c23bc1486892ab25d367d37ec77c38a55ad7e69fe
-EBUILD scrypt-1.3.0.ebuild 366 BLAKE2B d9e68ddbd0d8a77f930844b1f06a946885b229835aebee9dc952adbe39573d82935583417b0a863e6e7e0f1f11110466fe73d1a557ce31ede9d73862fd3d22cd SHA512 d0b4a0803ad08ac80be7c72c6f7c01f8ff447ee12e16cb69a451e618b60120bffadc397c073f99f63e28fc50eb959fb10e47b73634d3636744c6f0389d5107c2
+EBUILD scrypt-1.3.0.ebuild 365 BLAKE2B aee5437ba9e2c13c9f4f12413b0eabd8f6e546aef97a2d1dc71003ec972561e70d3bd7a63450c80682c36f4fb326165acf9d970b5d6c0425f21401191a694ea4 SHA512 d4bfe2fccf9dfecdc5b2fdb9eb845645e58ceb4833a85f5a3a8ca696b6deaead5bc66f9e1954f260a517fefd93294d262e83f9686e742be7bf9a1fde029d6d8b
 EBUILD scrypt-1.3.1.ebuild 453 BLAKE2B bd3356b596c7a690785da352e49b6727a81b50c117b53ed95a6fe7b2e4ae73407701150a07e8ea8494f46a6f14fe9349ff99cd779c3d486425a627bf7b73ccf1 SHA512 de2bf3a94eb0a20696b401505d42027ee9200f41e65c9246862bed5cee01e0157244ba88cb651f48ff831e01f89d5607b453de0cbadd9f3df10a1e133a21ed9a
 MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
diff --git a/app-crypt/scrypt/scrypt-1.3.0.ebuild b/app-crypt/scrypt/scrypt-1.3.0.ebuild
index ee6f1d1e12fe..a1b903c23e52 100644
--- a/app-crypt/scrypt/scrypt-1.3.0.ebuild
+++ b/app-crypt/scrypt/scrypt-1.3.0.ebuild
@@ -9,6 +9,6 @@ SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( FORMAT )
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 3069519f2fff..b4ff7d1c0183 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -8,6 +8,5 @@ AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227
 AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a012037945440fcae6e5040f7a7fd35a3c814df93264382a87eb06758b6042b64bef851ab3d5f5e424c2b946c0d1eaa92ebb97a733f SHA512 cc2827ed501cc29dcadd00537161804a62918c9dc703b2a773227aaf74a695d026b44c70848819a78b01cc785831117ae9dfa1d4c30133241b97dd32e8e838ba
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
-EBUILD trousers-0.3.14-r2.ebuild 1636 BLAKE2B a7d811322ebc0e5e61b7b4ae53d24a138e1e801782cc8f9b7a0ee3448163a422b92ee648f7df98d79d61ee143b012d85b74ab78e63c3a6251cd6e704bc8f46aa SHA512 2f99e83739a57b8e5114e87064e9975dd6d401842a03a08743ea115037c7847c80b5ed41f729947914304fa2a2c54db0a5b2613f449a45384503851aa5136feb
 EBUILD trousers-0.3.14-r3.ebuild 1673 BLAKE2B 4c86cb8c9764179850cb778094a3dcdcbd4775955858981e8d5ce958217f51e2d6529059e31f61149156d517fe2f3179f7d85ae9a4724f3c2f1aa9c34da6bd84 SHA512 555038110e4fe3ff35c5fbfb9d1f35e3f72345dbbd31381b0de9a4f09404c1241456088d185c5dc2d94eda55d54277820d9a8145493b8499f1734bfb7f6413e2
 MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
deleted file mode 100644
index a36ff6830733..000000000000
--- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info readme.gentoo-r1 systemd udev
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
-IUSE="doc libressl selinux" # gtk
-
-# gtk support presently does NOT compile.
-#	gtk? ( >=x11-libs/gtk+-2 )
-
-DEPEND="acct-group/tss
-	acct-user/tss
-	>=dev-libs/glib-2
-	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tcsd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-	"${FILESDIR}/${P}-fno-common.patch"
-	"${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
-)
-
-DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
-
-DOC_CONTENTS="
-	If you have problems starting tcsd, please check permissions and
-	ownership on /dev/tpm* and ~tss/system.data
-"
-S="${WORKDIR}"
-
-CONFIG_CHECK="~TCG_TPM"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# econf --with-gui=$(usex gtk gtk openssl)
-	econf --with-gui=openssl
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/tpm
-	use doc && dodoc doc/*
-	newinitd "${FILESDIR}"/tcsd.initd tcsd
-	newconfd "${FILESDIR}"/tcsd.confd tcsd
-	systemd_dounit "${FILESDIR}"/tcsd.service
-	udev_dorules "${FILESDIR}"/61-trousers.rules
-	fowners tss:tss /var/lib/tpm
-	readme.gentoo_create_doc
-}