gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /app-crypt
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
72 files changed, 621 insertions, 189 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e1e9c6b324bf..bd82e42c186d 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 c02d961192c2..6884cc86a591 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.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
+EBUILD acme-sh-2.8.8-r1.ebuild 1206 BLAKE2B 99e8c88d8a6f2cf8a189ec22d85cfb93397d50767873575a5e517de688820e2e52a0c50b31265e99b413ca8cf98490260dfaf59129d22cd6c16d005f1a45af42 SHA512 c9974da53271607ab45e1101f12ee7f8c0f731cc167fadff65c4fd14e2bb5d3075a20b688c6aecaf6aed7b462cfffc1f8b8d8ebeb8098f887a1eef3818483d61
+EBUILD acme-sh-9999.ebuild 1098 BLAKE2B 25a97db2f6e8cd0fafc2c07de5312ac8dd3bbfbd4e17cdfbd7c3cb11504137cc705d8ad8f286620e9d72e88bd6cdc2a10e50a53333ea6b43840ed137ac5d6c7d SHA512 2f29bda15f989b61b66bd311e0a34772db242881480e6f34dfb2056aaa5bbe92f1c26cc0eb2c7d7ac218e47088c11c5a8e2eb80f52bb6b5e2a34da3e7a0b0f3f
+MISC metadata.xml 646 BLAKE2B a06db1267cdb5269401e4493ecd5e7432eac110f5554d7627dd718b35c90320be8b9f1310c0bd6ee985023efbc3b99c8314c4ebc81cb3f39db2d5b7f4b9a1ebe SHA512 9959d771b4bd98c6fe3172150d905766b2b4d30c182b2d3cac3cbc5f3a95ef71ca7fc8930c3f42cd9907cacbb28511a40331257f68f7383f806aaf07ac4ee38c
diff --git a/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild b/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild
new file mode 100644
index 000000000000..5d51ca8d03b0
--- /dev/null
+++ b/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+inherit optfeature
+
+DESCRIPTION="A pure Unix shell script implementing ACME client protocol"
+HOMEPAGE="https://github.com/acmesh-official/acme.sh"
+SRC_URI="https://github.com/acmesh-official/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl:0
+	net-misc/curl
+	net-misc/socat
+"
+
+src_install() {
+	newdoc deploy/README.md README-deploy.md
+	newdoc dnsapi/README.md README-dnsapi.md
+	rm {deploy,dnsapi}/README.md || die
+	einstalldocs
+
+	exeinto /usr/share/acme.sh
+	doexe acme.sh
+
+	insinto /usr/share/acme.sh
+	doins -r deploy dnsapi notify
+
+	keepdir /etc/acme-sh
+	doenvd "${FILESDIR}"/99acme-sh
+
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}"/acme.sh
+
+	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
+}
+
+pkg_postinst() {
+	einfo "If you wish to use the webserver mode,"
+	einfo "you need to install a supported web server."
+	optfeature "using apache2 webserver mode." www-servers/apache
+	optfeature "using nginx webserver mode." www-servers/nginx
+}
diff --git a/app-crypt/acme-sh/acme-sh-2.8.8.ebuild b/app-crypt/acme-sh/acme-sh-2.8.8.ebuild
deleted file mode 100644
index af53d7dec342..000000000000
--- a/app-crypt/acme-sh/acme-sh-2.8.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An ACME Shell script"
-HOMEPAGE="https://github.com/Neilpang/acme.sh"
-SRC_URI="https://github.com/Neilpang/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	net-misc/curl
-	|| ( dev-libs/libressl dev-libs/openssl:0 )
-	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
-	virtual/cron
-"
-
-src_install() {
-	einstalldocs
-	newdoc dnsapi/README.md README-dnsapi.md
-	newdoc deploy/README.md README-deploy.md
-
-	keepdir /etc/acme-sh
-	doenvd "${FILESDIR}"/99acme-sh
-	insinto /etc/bash/bashrc.d
-	doins "${FILESDIR}"/acme.sh
-
-	exeinto /usr/share/acme.sh
-	doexe acme.sh
-	insinto /usr/share/acme.sh/dnsapi
-	doins -r dnsapi/*.sh
-	insinto /usr/share/acme.sh/deploy
-	doins -r deploy/*.sh
-	insinto /usr/share/acme.sh/notify
-	doins -r notify/*.sh
-
-	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
-}
diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild
index 7ff01d8cd7e6..1e6ca0155893 100644
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@@ -1,45 +1,48 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/Neilpang/${PN/-/.}.git"
+inherit git-r3 optfeature
 
-inherit git-r3
-
-DESCRIPTION="An ACME Shell script"
-HOMEPAGE="https://github.com/Neilpang/acme.sh"
-SRC_URI=""
+DESCRIPTION="A pure Unix shell script implementing ACME client protocol"
+HOMEPAGE="https://github.com/acmesh-official/acme.sh"
+EGIT_REPO_URI="https://github.com/acmesh-official/${PN/-/.}.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-RDEPEND="net-misc/curl
-	|| ( dev-libs/libressl dev-libs/openssl:0 )
-	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
-	virtual/cron"
+RDEPEND="
+	dev-libs/openssl:0
+	net-misc/curl
+	net-misc/socat
+"
 
 src_install() {
-	einstalldocs
-	newdoc dnsapi/README.md README-dnsapi.md
 	newdoc deploy/README.md README-deploy.md
+	newdoc dnsapi/README.md README-dnsapi.md
+	rm {deploy,dnsapi}/README.md || die
+	einstalldocs
+
+	exeinto /usr/share/acme.sh
+	doexe acme.sh
+
+	insinto /usr/share/acme.sh
+	doins -r deploy dnsapi notify
 
 	keepdir /etc/acme-sh
 	doenvd "${FILESDIR}"/99acme-sh
+
 	insinto /etc/bash/bashrc.d
 	doins "${FILESDIR}"/acme.sh
 
-	exeinto /usr/share/acme.sh
-	doexe acme.sh
-	insinto /usr/share/acme.sh/dnsapi
-	doins -r dnsapi/*.sh
-	insinto /usr/share/acme.sh/deploy
-	doins -r deploy/*.sh
-	insinto /usr/share/acme.sh/notify
-	doins -r notify/*.sh
-
 	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
 }
+
+pkg_postinst() {
+	einfo "If you wish to use the webserver mode,"
+	einfo "you need to install a supported web server."
+	optfeature "using apache2 webserver mode." www-servers/apache
+	optfeature "using nginx webserver mode." www-servers/nginx
+}
diff --git a/app-crypt/acme-sh/metadata.xml b/app-crypt/acme-sh/metadata.xml
index e60bd24cf641..a02acbd86b57 100644
--- a/app-crypt/acme-sh/metadata.xml
+++ b/app-crypt/acme-sh/metadata.xml
@@ -9,7 +9,12 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">Neilpang/acme.sh</remote-id>
+		<bugs-to>https://github.com/acmesh-official/acme.sh/issues</bugs-to>
+		<remote-id type="github">acmesh-official/acme.sh</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 3b201057aac6..3d5603655ee6 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
+DIST certbot-1.11.0.tar.gz 1419116 BLAKE2B 4749dcd897822d4e1981ef57334a493e7b729205f3ae808893ed4cab682b74c8779893378fa5cd2651b4ef681518c5aac751514104b64adfd7a17435946c46b7 SHA512 b744e44e8a7981d7b28064a2b7b5d1f47ac1ea465fa350b4f849004f38e6b3966e3118e5ebd8c1c83b9a4a065c31005c0e2cb33f75a0b04125fbe2ac17312a24
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
-EBUILD acme-1.10.1.ebuild 1727 BLAKE2B ac84ebb7f4297d6c2161f92ca674459aac9aff9eeabdefc5809a86821f7e93c91711380ec73748ba65440ff9e9d301e48b2f5e88ebeb4f4043bde6443962d26f SHA512 d1f1b78f04222efea90fe258cd1a45c43da90cea1d45b5158d72fb7a094c3f04d0b84a2e073fed365eaeea8a20c383fc572378d679ac37a1fd332a309d18c281
+EBUILD acme-1.10.1.ebuild 1725 BLAKE2B 1b119d0c1ef625742241bff947325e8a18ffe43d7b3055dba530e8de8f5c38be9e3c3c3f81c1f14bec9476b8502a17734152c62f84f7486e67783039292ee965 SHA512 e27739536f455a28c4848ba9b931b8ca27fac231e3e7fcf2a94dead369917beb231ea31522e7ff5b47b640ddc7933a7ace49fdf8cb8f7aeef7732fe85d28dc79
+EBUILD acme-1.11.0.ebuild 1727 BLAKE2B 462f6bba060515704cbf3fedb971c2216addca0ae4f2397316131543c7d3a8e62859b6e4ebc5cb7e474af69da404f925634a1b9ea4e9f0a8e7c53e621e250646 SHA512 1bdf493866fa662cd031d85f0b3aefd1b600e73581e59ad9f7d8337736e9facc68d85289ad4ec0bc714c81a3693a6057c679baac8631cb4eea496f9abf861de4
 EBUILD acme-1.9.0.ebuild 1721 BLAKE2B b6f1bf82f1a856659e423bf64da1e1db084e6ce9a3583cbdad5de574441b2b2a1216f23961352decd9323f8c6c115502d426312070891e1411d8632054a871ef SHA512 a017fea91a2c3b3ef8596e8a80b3bc9576e7fe80f4cea844b0be5a56c12578854a27b46c2921d0b5f32add2f4b64154a54b1183442c051366ae3764910cec668
-EBUILD acme-9999.ebuild 1723 BLAKE2B 1f9dcf588af71aa02df863c8d2704b261586fb72b088161cf4fd0643a941e7cf55f9d450c3a6c39bc9075092b63d62f7a16f2f5b295870de41c3bf409ab4e191 SHA512 cf5d3780b7dc9faf510b00ecd4342b52b6133f5852c7afe732ca50e52825cc6f8d55e3400928d3e99793e2457b86e8c0c1d199820fe3e2a086c596b4586970f0
+EBUILD acme-9999.ebuild 1727 BLAKE2B 462f6bba060515704cbf3fedb971c2216addca0ae4f2397316131543c7d3a8e62859b6e4ebc5cb7e474af69da404f925634a1b9ea4e9f0a8e7c53e621e250646 SHA512 1bdf493866fa662cd031d85f0b3aefd1b600e73581e59ad9f7d8337736e9facc68d85289ad4ec0bc714c81a3693a6057c679baac8631cb4eea496f9abf861de4
 MISC metadata.xml 376 BLAKE2B 5a7076ef341b2599d7e91af0f563af2f1e1d7d9e85a02d78af75d87ea2f57ab06f603da824cb5e256191a25869c51891d5ce4c6dbf23fff1caa891fe4672828e SHA512 c3a734211c0053c85646aaa7ab03af05b021342b345da4bef5e37941ac19530a7f122abf276a9e7cd0b00ff7f3a087892ff6e98a4bec937dacae38f142a547ec
diff --git a/app-crypt/acme/acme-1.10.1.ebuild b/app-crypt/acme/acme-1.10.1.ebuild
index e6b050a6c6a9..78ec010b08a6 100644
--- a/app-crypt/acme/acme-1.10.1.ebuild
+++ b/app-crypt/acme/acme-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-1.11.0.ebuild b/app-crypt/acme/acme-1.11.0.ebuild
new file mode 100644
index 000000000000..39bf50ccd8ac
--- /dev/null
+++ b/app-crypt/acme/acme-1.11.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	distutils-r1_src_compile
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 9c58fbb71ad7..39bf50ccd8ac 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index 59cc5ba3fdd5..765f4d57d6e6 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -1,5 +1,8 @@
 AUX aescrypt-3.0.6b-build.patch 1711 BLAKE2B df5eccdc516e0314a137b1c51e5ae05fe5e66c8defe892599b295d5720e26b3a5cde9e262b7f09faf9db0a57bc0479f3be1481b65c0f62ffcdb404db90051e5e SHA512 b19e4eba11753bb8929d14eddc4ef391c8ec62b2bb57cf63b1a74b9a27250b4719ece8f1a6b790c1f662738b92bb37da96c973dd38cdf059c7482edb3dbd0f0e
 AUX aescrypt-3.0.6b-iconv.patch 1096 BLAKE2B 91d6e74ea8b760e81887a799ee5e8709ea7afc7f499842879091dcffdca76f24cc9191ac438c03b9f7f4970f55beca1586d56f3262e5d0f1de53366464141c2e SHA512 bf8d564493ae9396f024c1e33a775a53833da9d984ff059f714362a2cc112c3e6bd575c5d64fc0f7118fd578af645f386d649483ab56c2a0cb8d9b0795161409
+AUX aescrypt-3.14-iconv.patch 1104 BLAKE2B a6b9a8f41e86c9ac6fe16427752ae20da7177e5c1aec9f42373f94606954732632d84dc06a1425508115b3fc94f54f895c671eca691442c4d3d3b9163a27934e SHA512 fb3dd6a459e1378c44ffcd6a5b109f4bd178ee2e3190eed334bbfa4387fb11c4d070105598b4f0b989428f00a28f2064cf5f5064b71c49db269f4f4b55283960
 DIST aescrypt-3.0.6b.tar.gz 28272 BLAKE2B ce5347b77d974c76dadaa820b5b90a56015019f846bbc61560c33032adad08576d5e5ddd7d9e1020878e35b40173a2c5e29578e2f6e98631725442beac6f19ac SHA512 4c88abc9bff50ae5d310be7dad8f29843941843f9b484d9846b08dc76c605940adbb375f7e8ffefd6e8236f35ff860a745f89226e9c171bfa70c28c16aa6626a
+DIST aescrypt-3.14.tgz 38742 BLAKE2B 7122cb0246e28fd1301c58c13145c47ea3e20c8af61efc4115eec8a7ade720ecf2093f2e0156c05eb6cbb6e403bbeb3624745609f0ec1f2fd477edbd876e3373 SHA512 ac06604e2121f0c0f098e87d43c493b7285c58ac7419c284e6a93218dfa7381d4ca69ee775842fde89226092e05978d662eddefe734afe38f67b28df68d87b68
 EBUILD aescrypt-3.0.6b.ebuild 607 BLAKE2B 1a411ecfc29f0de364a6d16ff86c8e9ad486cdb42d1a8137c3391bb14549a76df170140eea42d317b1d16301bbcd38a5076f8447c403a4f01d149debc3641fe4 SHA512 0fdc84b108ec79790601d14444543b5e3821e64fb02dc8bac46ef4e763d11c09f2f2181a38b2da255935ad068b86206a0e0214db98f836a48c1b999bae2201ea
+EBUILD aescrypt-3.14.ebuild 1598 BLAKE2B b6067d5911f838081f86cffbc382818151f9811aead73403c06bcd1c23295b0529ad26848a61fffc5b3ffe44203e6fd4d445bd39f38d555c0785bc5a517885ed SHA512 fca32c9baf3264ee15dafebd30d3ec9e9f737819ec0d7ba14cc9c85ce528acfd99bc972795508c4543eeb613bad4a5b975ffc3a0c512b0f8f1481aca52b45047
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
new file mode 100644
index 000000000000..78142e9a9dcb
--- /dev/null
+++ b/app-crypt/aescrypt/aescrypt-3.14.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic desktop xdg
+
+DESCRIPTION="Advanced file encryption using AES"
+HOMEPAGE="https://www.aescrypt.com/"
+SRC_URI="https://www.aescrypt.com/download/v$(ver_cut 1)/linux/${P}.tgz"
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static X"
+RDEPEND="X? (
+		|| ( gnome-extra/zenity kde-apps/kdialog )
+		dev-lang/perl
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${P}-iconv.patch" )
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i \
+		-e 's:Icon=/usr/share/aescrypt/SmallLock.png:Icon=SmallLock:' \
+		-e 's|Categories=Application;Utility;TextEditor;|Categories=Utility;TextEditor;|' \
+		gui/AESCrypt.desktop || die
+}
+
+src_compile() {
+	if use static; then
+		append-cflags "-DDISABLE_ICONV"
+		append-ldflags "-static"
+	fi
+	cd src || die
+	emake \
+		CFLAGS="${CFLAGS} -Wall -Wextra -pedantic -std=c99 -D_FILE_OFFSET_BITS=64" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+src_test() {
+	cd src || die
+	emake -j1 test \
+		CFLAGS="${CFLAGS} -Wall -Wextra -pedantic -std=c99 -D_FILE_OFFSET_BITS=64" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin src/{aescrypt,aescrypt_keygen}
+	doman man/*
+	doicon gui/SmallLock.png
+	domenu gui/AESCrypt.desktop
+	dobin gui/aescrypt-gui
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use X; then
+		einfo 'The .desktop file for aescrypt is only supposed to be used with "Open With"'
+		einfo 'to encrypt and decrypt files.'
+		einfo 'See:'
+		einfo '	https://www.aescrypt.com/linux_aes_crypt.html'
+		einfo 'for more information'
+	fi
+}
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch b/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch
new file mode 100644
index 000000000000..8232f80aebbc
--- /dev/null
+++ b/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch
@@ -0,0 +1,40 @@
+From 337cc9367a3cb4450eee245c6ceb615d0f05499d Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 2 Feb 2013 01:18:08 +0200
+Subject: [PATCH 2/2] build: support disable iconv for static build
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ password.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/password.c b/password.c
+index 9a2c1f8..dee79da 100644
+--- a/src/password.c
++++ b/src/password.c
+@@ -232,6 +232,15 @@ int passwd_to_utf16(unsigned char *in_passwd,
+     size_t ic_inbytesleft,
+            ic_outbytesleft;
+ 
++#ifdef DISABLE_ICONV
++    /* support only latin */
++    int i;
++    for (i=0;i<length+1;i++) {
++    	out_passwd[i*2] = in_passwd[i];
++	out_passwd[i*2+1] = 0;
++    }
++    return length*2;
++#else
+     /* Max length is specified in character, but this function deals
+      * with bytes.  So, multiply by two since we are going to create a
+      * UTF-16 string.
+@@ -273,5 +282,6 @@ int passwd_to_utf16(unsigned char *in_passwd,
+     }
+     iconv_close(condesc);
+     return (max_length - ic_outbytesleft);
++#endif
+ }
+ 
+-- 
+1.7.12.4
+
diff --git a/app-crypt/ccrypt/Manifest b/app-crypt/ccrypt/Manifest
index f0050ec2b5cd..8b482016d552 100644
--- a/app-crypt/ccrypt/Manifest
+++ b/app-crypt/ccrypt/Manifest
@@ -1,4 +1,4 @@
 DIST ccrypt-1.11.tar.gz 834575 BLAKE2B 6b3441f6b1c58ed63db43ddc999ee64e67afc3ce02222de2a41562bc066aad0f076e75ab496d94e7f3f1a9554b1382c083f3af04074904c1110f610cb5ac19b3 SHA512 75c2b93e855d36e717d3b7cabee7ce43ce372a21c8291beb43f24fd69e11114bb0e19e6dd03ec5d901e7e60eac9351afab65c346b7304b16054b91d392050313
-EBUILD ccrypt-1.11-r1.ebuild 474 BLAKE2B 9f80f5683b0cb3d725f9f84cc2ab423b3318776ca3c93a04f7ea008f9abb90d66de77ddf0d3d61fe9cd09c44c048ee0434b067cc0c445c6109c0bd60a730c0d1 SHA512 16fa9a9f3691d73dcf0580d6a78bbd4dacc389ee75ee17b98d688d52aaf4a7d4ae0ab693b48ff5c101c262815e0196f934aabf0ee35d1b79c7da72de2dbd9e0b
-EBUILD ccrypt-1.11.ebuild 358 BLAKE2B fc4735bb7aa9d73e3be45d96e95f1bf7008399d7ca2131210f35866c666860f0ca688b6119fb2ad3daa31eb2280fcc3698d519e95224889efeece5e280121b7c SHA512 ae6c14e585992e53f2087783d8479ea7ecb2d905276c157814cdb5378e8d0c7b911c1da0dc238ae40dd600478602b10627d48272b67fcfef2325db0a293117a2
+EBUILD ccrypt-1.11-r1.ebuild 463 BLAKE2B a282ef7669d038a3d013f69d193ae751302b5f9e9360e75e35277e8f8eb7d0fd9a6fc96210740f2a8a9217288e9b4c03473c2e96638d187cc6f9aee035ea07ba SHA512 03c7daa86121245781e3b94399135e6620f586e62b3a95dfcf552401020081ca9c4acd056e4b0b3ca31d0dbf4caa34f27ec146b0c16fd8d68bfa4bc1348f1d88
+EBUILD ccrypt-1.11.ebuild 347 BLAKE2B d2419d310f30e26b27c50cf13a78bf9e7edf40bf4c162e88fd18832a18320f6f8d23f0e75cd2d378e6d4d8d8ec51b81e8c46156fcacc7d9ff22318d2036eedb9 SHA512 3edc9047dfd857a2dea086b3cf3c55d1b9ff5d7b66a8db55a2f46d41a06732ebfb297dbc2de9c3f387e5da206ce894bfb7b78aa5b3fdc489164f362c25e16207
 MISC metadata.xml 243 BLAKE2B e3a1fc2bc4765aa2137c932351c877495ebd1c2f61e3228f866e2573362ff990930d8e54b2365dd1fa943d3fd185c10e9616be14de8bcda8f72384834620ed40 SHA512 0f0e44291b0da4bded3871068dcde7ce0e49ecfddb26f8215fe2df0977434b3b78d9b7c8920b48c86e5518f8912c9e340890a5e92ac8dd659157ac7109afaf11
diff --git a/app-crypt/ccrypt/ccrypt-1.11-r1.ebuild b/app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
index 80eb3d149de6..62799051740e 100644
--- a/app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 IUSE="emacs"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 
diff --git a/app-crypt/ccrypt/ccrypt-1.11.ebuild b/app-crypt/ccrypt/ccrypt-1.11.ebuild
index 279e8559ec7f..18b8e11e62d4 100644
--- a/app-crypt/ccrypt/ccrypt-1.11.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -8,4 +8,4 @@ HOMEPAGE="https://sourceforge.net/projects/ccrypt/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index d37c5ea79acb..f4a77393e56e 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
+DIST certbot-1.11.0.tar.gz 1419116 BLAKE2B 4749dcd897822d4e1981ef57334a493e7b729205f3ae808893ed4cab682b74c8779893378fa5cd2651b4ef681518c5aac751514104b64adfd7a17435946c46b7 SHA512 b744e44e8a7981d7b28064a2b7b5d1f47ac1ea465fa350b4f849004f38e6b3966e3118e5ebd8c1c83b9a4a065c31005c0e2cb33f75a0b04125fbe2ac17312a24
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
-EBUILD certbot-apache-1.10.1.ebuild 922 BLAKE2B ee7a35a10cef4129f766e2f77a9b32dde4d7c7b6862a2282c6321f0577aaf6f96a426aa57c94394e151d5c714c90597675e00d10fbf88e18eb4a8c19cd193295 SHA512 03f3b715ad49cb358f112ec76cb8ea50d2988de9a2f0c81ae447410fc76e08e1c56686e67e8a28dfb6e9563a8b73e6e2f6d0454bbe0de7d19bea25f05bef45aa
+EBUILD certbot-apache-1.10.1.ebuild 920 BLAKE2B 8005510d8e5ab16904f6dadd36249d4ae2e6319f24ee6e3895b90bc7ad197f0f17050347aee9cac6cee725fef7a6a435ff98756bdb4ddad894aa3bf8954bd5d7 SHA512 b14877a0a30ae4660b7a50176bbc2ac45123147cc4e55993e959e37d0475add52a4b3d9f137c8ba6f5c9b956fb65c1492cd2971e456b7881fb8184cc3c974b8d
+EBUILD certbot-apache-1.11.0.ebuild 922 BLAKE2B f2d9f1416a9a0019bf256526ad9f75da3bc453a400e95ba6330276c8f2bb59e9cc89cae7c50e82943053264ce91652883a2b96e95e2b699a0b5114811326c4cd SHA512 414e6df90c845c300d8c0fae1785a9ecd042700f4c2cdb81055f30cc2cef785af339849de9e0c179fdc38c8b5f289424b09178ec0a550d38211a9277ff23a2ba
 EBUILD certbot-apache-1.9.0.ebuild 916 BLAKE2B 366995d48952ab5d4b3b1b9afa68561097b9238c2c56a505a49854c0e0c6126d5092d81b1178d4b45ff690194ec3b8de695f4d6b88455559ea3162dcaf2a09e9 SHA512 13ddca2809910b3c044bf725b58d0d728531314b0a02e7dea7836f047469b3e79d9bf38a729c045dc3f096689c10e9f829d44a14bd647e6687021fe9bf24ec1b
-EBUILD certbot-apache-9999.ebuild 918 BLAKE2B fb5b5acbb7373042f8960130f44e384494cfba7786e4964381631da44651c1e0b88f68c331cb1d7aa614e4aeabdc11bfa38bfa15d96af7cc3ad7cf38fd44ac41 SHA512 5b9d2895c2ced803d962aaf2dfffe8e934131b7d1d6bf09169b1df997baac9e992043804e7d7370ea92440d0c40ee5c2946b80a4e4fb3b4ba26c50146986b4ea
+EBUILD certbot-apache-9999.ebuild 922 BLAKE2B f2d9f1416a9a0019bf256526ad9f75da3bc453a400e95ba6330276c8f2bb59e9cc89cae7c50e82943053264ce91652883a2b96e95e2b699a0b5114811326c4cd SHA512 414e6df90c845c300d8c0fae1785a9ecd042700f4c2cdb81055f30cc2cef785af339849de9e0c179fdc38c8b5f289424b09178ec0a550d38211a9277ff23a2ba
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.10.1.ebuild b/app-crypt/certbot-apache/certbot-apache-1.10.1.ebuild
index b7e449dda5b7..9657f60ba6f4 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.10.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-1.11.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.11.0.ebuild
new file mode 100644
index 000000000000..4ab0d77d9140
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index e52584b7e0c7..4ab0d77d9140 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index a225f7172b9b..71b1d551f443 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
+DIST certbot-1.11.0.tar.gz 1419116 BLAKE2B 4749dcd897822d4e1981ef57334a493e7b729205f3ae808893ed4cab682b74c8779893378fa5cd2651b4ef681518c5aac751514104b64adfd7a17435946c46b7 SHA512 b744e44e8a7981d7b28064a2b7b5d1f47ac1ea465fa350b4f849004f38e6b3966e3118e5ebd8c1c83b9a4a065c31005c0e2cb33f75a0b04125fbe2ac17312a24
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
-EBUILD certbot-nginx-1.10.1.ebuild 930 BLAKE2B 79cf8aeeaa3efab873a55c80e610ee949004d986b4a73459c211d5c5a673c90b0ed411bbffee6093e13ce4d2db05bb690a26c2bac2b166eed72d7cdde9082975 SHA512 623920ccfdb7b9f6dbb8245715483fe371038aa7602c99a5e19c82bd1c985359767c26c3af7e3248926f7804e63a6ca30bfed8591a5353161140da989c4b3123
+EBUILD certbot-nginx-1.10.1.ebuild 928 BLAKE2B 0b25b4ce990a818028f500ddfdfe3065f8bfe8a3d27804a37837c44b96c117811c2b60ef9bfa0c44427bdac0346a63778f548bdfe28735addd8997e5609002ef SHA512 509638cd320dc6afcab44d3b54ef712a52c7d8ceb7233a1960141618648af9511578943034160813289733856d561de82da6dd972ade87e1290af76591125033
+EBUILD certbot-nginx-1.11.0.ebuild 930 BLAKE2B 68a9bc1416feabe843c960be1d8dada196c320ee5217cbb5ad3b559ed7eecf043b408f45ff019e4ea14f4f54284276da6eb517cf00a2c7a5fdec61161b40f132 SHA512 604505b7651e11903159ea2e684c9c672086ddadd9f8521209313753e4bd304f8e439e1fd842cc392bf2a1e222847ae28693dea92fbaccc23e69550358e80081
 EBUILD certbot-nginx-1.9.0.ebuild 924 BLAKE2B d71d8e3d72d3a0f81a12474bcf4a67721b7f02fc4b8209e190cef58da3bcb3010e8b6b3384750aa2359d97950ad0169c8b016629b04b7d66f7668d48fe0d81a2 SHA512 87d6e7a796aa1ef9134fa2e35c63fd95147da73b36f0bdf4f7cb6870a9f42c7721557581aea518e5b39e8b6770f0d8e680b550b93311699b7459ddbf57ed2266
-EBUILD certbot-nginx-9999.ebuild 926 BLAKE2B c42649f6ceaeb670919b8660deb06e3380b4e971e0eedcd44db6c56a9ea88f9698e5c943b989fabcf067e8f716bc648474a5f2ad4a0f987d3e8edebbfe88f63a SHA512 0b959a25ebd24879649357928bbcf24d6de501c068a782b3ca073ba46312502480dc10ae540bd478fd4ed1979abe17dc8ca2461b5fc73686539eeb14b5dc2307
+EBUILD certbot-nginx-9999.ebuild 930 BLAKE2B 68a9bc1416feabe843c960be1d8dada196c320ee5217cbb5ad3b559ed7eecf043b408f45ff019e4ea14f4f54284276da6eb517cf00a2c7a5fdec61161b40f132 SHA512 604505b7651e11903159ea2e684c9c672086ddadd9f8521209313753e4bd304f8e439e1fd842cc392bf2a1e222847ae28693dea92fbaccc23e69550358e80081
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.10.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.10.1.ebuild
index ad7e21e944ef..acf8edf10d7f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.10.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.11.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.11.0.ebuild
new file mode 100644
index 000000000000..d4eff10c4003
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.11.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 383e16073c64..d4eff10c4003 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ea29a7de051b..7fb84c9743d0 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
+DIST certbot-1.11.0.tar.gz 1419116 BLAKE2B 4749dcd897822d4e1981ef57334a493e7b729205f3ae808893ed4cab682b74c8779893378fa5cd2651b4ef681518c5aac751514104b64adfd7a17435946c46b7 SHA512 b744e44e8a7981d7b28064a2b7b5d1f47ac1ea465fa350b4f849004f38e6b3966e3118e5ebd8c1c83b9a4a065c31005c0e2cb33f75a0b04125fbe2ac17312a24
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
-EBUILD certbot-1.10.1.ebuild 1148 BLAKE2B 09152480cb110bb45e0c133b87e1de40dffaac4e419aac8735f2500121f4fe65da64ce4bfcad4cd91a6f926a5bf6b68620b7dea00a5d9cac5fa33b514f9cf66a SHA512 629c1fec0aea8cde13a635ebd2018e269f119ecd0013dcd5618a12d0bebb6daa4d3ba37967318cfeaee70a2d0dd41823c8bf8ca65db578cf69c261332a69e706
+EBUILD certbot-1.10.1.ebuild 1146 BLAKE2B 875a04a1f4af3fc1bfb6a9572d007d994502578884aa306179073701516f883ffe0f0bfa1861e8dd6b6f0d09aa68524061e037549023e744f2a27fbe24b5026d SHA512 cd2ef4b0f8e61ab1e5e44170dbbcb3b5aa36483e7061b61b574a16d261ed4e97b5dcd368a9730d49ec72a5a1a90bf992583e207be5669b2a399d0b4b4b790314
+EBUILD certbot-1.11.0.ebuild 1148 BLAKE2B 3216d99e3cda4996eba8c3460f71df9554ca3bffa138142d66e3b1c12943f261d72e5c76036e121036c40aa99d99c39b4720596ed8bfa6207b44c6a9298918c0 SHA512 1409fc20fbc04734e2c85ea44e0cbd400cec2a60cd8c3f2293755cb23c80c1153865197a492130c1baf44126c8a22877c2949bbbf17e327c4df898699229e7a7
 EBUILD certbot-1.9.0.ebuild 1142 BLAKE2B 1f0f1256a7b81bda66c46a80129489f7f78cd30f53df771ed6fa70182f201baeb2917455fd6d9c7623d9f2b152c838d60a117fd3628436fda24bf69d75be44f4 SHA512 e12effe51a0c174441915ffd4f55dff83e22865fadf92ae6cc045b0fc05fca143dc4ad8ac0a17ccf7c71a18af850dddd60773bce0376e5ac0498b4c598e85f00
-EBUILD certbot-9999.ebuild 1144 BLAKE2B a5fc182ad4c58b23d018d63162641b27381e710d2bd2276ba9f0cdf8dc1a8fb5d222a8f0d6f248c06d70b1687e202e2a938b3176ae152ce22feceb342c7ef9a2 SHA512 6a35d2ce7faed403fb33bd345439371f277ffb2528b37b59f9130a234d4bf0bd166fde6c5e5349903b2cecc991b2deda3f054fb7c011e44094665c3e2901fab9
+EBUILD certbot-9999.ebuild 1148 BLAKE2B 3216d99e3cda4996eba8c3460f71df9554ca3bffa138142d66e3b1c12943f261d72e5c76036e121036c40aa99d99c39b4720596ed8bfa6207b44c6a9298918c0 SHA512 1409fc20fbc04734e2c85ea44e0cbd400cec2a60cd8c3f2293755cb23c80c1153865197a492130c1baf44126c8a22877c2949bbbf17e327c4df898699229e7a7
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.10.1.ebuild b/app-crypt/certbot/certbot-1.10.1.ebuild
index d6f1add60616..855e379c6350 100644
--- a/app-crypt/certbot/certbot-1.10.1.ebuild
+++ b/app-crypt/certbot/certbot-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/certbot/certbot-1.11.0.ebuild b/app-crypt/certbot/certbot-1.11.0.ebuild
new file mode 100644
index 000000000000..c43705371ceb
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.11.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index e54440941505..c43705371ceb 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index f155aedc4b23..69e6de95645c 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -1,5 +1,5 @@
 DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a7f856ce9c077445d6387b75b97dce0fc02ee9481241b246b0eb7de6b44ac014a708a8ceba629828ca9d63b8e24c SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0
 DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
-EBUILD codecrypt-1.7.2.ebuild 672 BLAKE2B 525178d3411173523afa24e0df3fd117095f34fab99ed4d8666e2be34b7408de6311b06088a8cdcdc4dfc43f179c86abc70ed769aa0dd978ae5e3ec60730d176 SHA512 a43435250a021b7418bf2e5eb1573237bfda0690bd65e6df597700dd9ef3bdf7ac316ae164bded683e8e7412fe1e57bf7428b0f629d6f614f1b2b7ef64d68f5e
-EBUILD codecrypt-1.8-r1.ebuild 713 BLAKE2B fbe2c5bcba08834f475dc9655fe6b8623f1d44a9cb2743e5762ea69f04832fcb7fbd02312ef200b628ad35e05bc3fdc5c3ea1436656943cac2ef08eab2e74030 SHA512 fcfe53551ce1fa4c5de259a162b6dc485a3efcd6a05bfe4deb66a437a4dba289d32f4de2608dbd01b2c70596a1cfba759b0326a70c785799789bc84ff9e5f811
+EBUILD codecrypt-1.7.2-r1.ebuild 672 BLAKE2B 8eff53eb6794460747a520d5a3846bc7c732f27105ecb472a1391a67ea8425f3a8c68797fb2fe1460073c586c757433bc98aa46bbc6a4c5fd1e09165f70c94f3 SHA512 a7678a94eb1240c5fe2deed6e1e5717dabd91f4a1fa6e1b279caed274e2cbb3ee61a8dd179590a3b5dd23c44366cff738fae3614feaea6d972aaedcaa6fed788
+EBUILD codecrypt-1.8-r2.ebuild 713 BLAKE2B 278aca073a6bf1d154ebf810b8c80bd49393f63354805d779bf16bf6b23be79661b1d029922217cc3d750a0709a53a05b0cde6dbc8e97279713cda9fabc4dcb4 SHA512 03d85d58d7c3bf3111853b6bd9b0c961ef9accf31fbac64ccf2051034c16e2ef634cc5481844ad6f1ae238537398b3de7d01fc70d50d24e95760d21b4a4d6511
 MISC metadata.xml 756 BLAKE2B 23c44085ef45f26b1ac4fa910594f7ccf47756ff2430e0d461d0ef86bdd92b14358f6041ce35979d3f6312da8cc3008c62691222ccdd05ff13ecae345dfec549 SHA512 b5edbcee8db2b2f57e9c8b3c2d36986e660aa9b1401e0a4dd130ee8ae43b7c899cc2652a046fe526fb58285ec45d7f022085423663b5dd37c89591bed0a6a702
diff --git a/app-crypt/codecrypt/codecrypt-1.7.2.ebuild b/app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild
index 4b370f10bca4..fa8f1c6527be 100644
--- a/app-crypt/codecrypt/codecrypt-1.7.2.ebuild
+++ b/app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,8 +13,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+cryptopp"
 
 DEPEND="dev-libs/gmp:=
-	cryptopp? ( dev-libs/crypto++ )
-	sci-libs/fftw:3.0"
+	cryptopp? ( dev-libs/crypto++:= )
+	sci-libs/fftw:3.0="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/app-crypt/codecrypt/codecrypt-1.8-r1.ebuild b/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
index effd43182526..93d82f35a94e 100644
--- a/app-crypt/codecrypt/codecrypt-1.8-r1.ebuild
+++ b/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+cryptopp"
 
 DEPEND="dev-libs/gmp:=
-	cryptopp? ( >=dev-libs/crypto++-7 )
-	sci-libs/fftw:3.0"
+	cryptopp? ( >=dev-libs/crypto++-7:= )
+	sci-libs/fftw:3.0="
 RDEPEND="${DEPEND}"
 src_prepare() {
 	default
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index b635821864a2..c10a9d6b0f2d 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,7 +1,8 @@
 AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6dc21eb74b0cfb6945572d0323d751ca8104ae981ae83759267081b6a16509cde3e8f5ad35b1a6613855461880c18 SHA512 01efa77441982a631e717a1bf720155bd38144cbe9e5b9cc192bdfa7ea3966b787e31a25a7e3c7d560fec30b19edeb662f6ab1db2d68b0a5b996af3c91342ec4
+AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff13fc2a0faab5c5327cea2f53ccc1bcc0e805166de93d2de8a52e8c344bdab64dae5671f238b49ecedebb657afca0823 SHA512 8207e9eb534fed58712b805df0e90bcf8406fe1c2907f91cd54500babcc49d0a72dc1d039d9fdb8077967058aaafb6c37336c1b0fcd041edfb3c4604c7cea4c2
 DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
-DIST eid-mw-5.0.8.tar.gz 8782476 BLAKE2B ece43bff5de108f4d92534aeda3d88c1109fbf54f99c4de0442c02958a9b0edef3e34d94015b9f3a865317d88c2bd21d1adbbf15010cd1fbd99787985190dee5 SHA512 dc9eaaec419082bc6e1f6cd11063c79c5aac0e7910027d9cbb34dbe8ede9d600c93b7b38a7e4491c5eb9a0068e537d78854b3fc3b2581d464dd4939185469e46
+DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd SHA512 2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
 EBUILD eid-mw-4.4.27.ebuild 2531 BLAKE2B 405338910850fab6119b7deb09c0b494dc294a661538173307976cc556e906d64bbd2f7a058545ef35ae22b461334d8df03cb0e21443629b2653a955cfeee97e SHA512 71e909609ed65bb8160a32030a6fb3c550a09f3a1db06015cf224c7a5ca41a76de30cdbe1fe016c3839508503ab711e0c8926a147cf8de4569b221d8138e35f3
-EBUILD eid-mw-5.0.8.ebuild 2621 BLAKE2B a14afec442a1d7ef34fdd6130f1ace9c729eb56a659fbf0c83b35fc334f588e09d9a04d6339a1b6bf542842bf0ad72532ecdf8c5f27a6ed2fcc6fdfe5435d7ed SHA512 4543c397a68122bb7b00a3cc84a3584e584df5064614c2bde18312ac80e8d160bc84e3506bfc1cff5cdb24e361473b3d05a44aec5879efabf11ec2dd55ac6190
-EBUILD eid-mw-9999.ebuild 2387 BLAKE2B 28af0cd0bd38b5448fa8523d6a599be574e88939ccf7ed20264864cbe21047859904f523e7b81e86cf3d828a021cdfa506170d7575c0da16c64a92dc4369d209 SHA512 8722191feed75b231229e50b483565f13f2472056d496716b8daf9b9db95b24f2faf02dede76c496804fa021deb5608e9fb95e2e267e2f9b41f707d9114996ac
+EBUILD eid-mw-5.0.11.ebuild 2692 BLAKE2B cadc9352ab462ef2c516321e0e189304e0a328b17a3adf66ad27351bc668cd49c31ed1d33482e04d91c813d6c8412a0154cc8e56f93eb664252c9b85d3c44dec SHA512 3afcfe20b53d1160429f47dd2e598aab97161104bf19e9b2085ce772be4af131afae72c6002a45b66e8f78fbd70470bec98a35b51feb1255c91d42d5983e27ed
+EBUILD eid-mw-9999.ebuild 2458 BLAKE2B e3a281af16221066f9b9249c224d500df889860130fe234480a06a31c39a04d1eb3e1141e5f79d32e510b1e82087aafe9123231f0684834537f79010946cdc20 SHA512 2a1d8cddaa069053de0be694b4686d618aad98022a6050590907b78d1fec015955c194dedda46178518508e968acce416fbce90a5b1b1536ec1c477922782d65
 MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98
diff --git a/app-crypt/eid-mw/eid-mw-5.0.8.ebuild b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
index 064bbcfb9d4a..b0e0654fd5b0 100644
--- a/app-crypt/eid-mw/eid-mw-5.0.8.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,6 +59,9 @@ src_prepare() {
 		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
 		configure.ac || die
 
+	# See bug #751472
+	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
 	eautoreconf
 }
 
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 19055f55bc53..5b1071332616 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,6 +53,9 @@ src_prepare() {
 		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
 		configure.ac || die
 
+	# See bug #751472
+	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
 	eautoreconf
 }
 
diff --git a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
new file mode 100644
index 000000000000..5b4ef2adc07e
--- /dev/null
+++ b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
@@ -0,0 +1,21 @@
+diff -ur a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
+--- a/plugins_tools/eid-viewer/Makefile.am	2020-08-19 15:32:50.000000000 +0200
++++ b/plugins_tools/eid-viewer/Makefile.am	2020-12-21 23:07:49.980421703 +0200
+@@ -125,13 +125,13 @@
+ SUBDIRS = . gtk/po test uml
+ 
+ resources/%.c: resources/%.png
+-	echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
++	printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+ 	gdk-pixbuf-csource --struct --extern --name `basename $^ .png` $^ >> $@
+-	echo -e "#pragma GCC diagnostic pop\n" >> $@
++	printf '%s\n' '#pragma GCC diagnostic pop' >> $@
+ resources/%.c: resources/%.jpg
+-	echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
++	printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+ 	gdk-pixbuf-csource --struct --extern --name `basename $^ .jpg` $^ >> $@
+-	echo -e "#pragma GCC diagnostic pop\n" >> $@
++	printf '%s\n' '#pragma GCC diagnostic pop' >> $@
+ 
+ BUILT_SOURCES = gtk/viewer_glade.h \
+ 		resources/coat_of_arms_nl.c \
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 8422d19df8a5..db91d40fc6b2 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,7 +4,7 @@ DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62
 DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
 DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B c930edf9259a0e1c508af8d76a86f979860adfe2c525020b37d3741679200f96483f0ad8bc1f72e2dbf7fe77696cd04d4272a2ee23e4c4abe1ed6ba88b95f365 SHA512 ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
 DIST gnupg-2.2.26.tar.bz2 7189254 BLAKE2B f51dd18f6fe327573769d1581ab49bfbca6a56973f6115a68d11e79f52f4b9bdd717ff027800cd1d52fca56abcffa80ee025b49a6af3914f60decdad1e1585ba SHA512 5e9482e126c32c836064b125a18b109f0d3c96892474d3fb47dd791350cccefc56f9a5dfbd54504716487a93d9f71de2493bdfef92e29964b5bfe28b0053c265
-EBUILD gnupg-2.2.20-r2.ebuild 4977 BLAKE2B 05485cfd7f5e7ade790b5364e777059fa29b44cb13c49268962b7ec9266cc6b98507451ee2a002899c1de7caef9ecbec22443997a8afe34cc1e08f010899b1bd SHA512 a857f8acfa6960d1884e4a9f354e169875b2d5f3304b6716b995814b17acea2206fa80d987c80750c7c9169ddbf1f877f68b5fc0183140aac241264c2b043f6f
-EBUILD gnupg-2.2.25.ebuild 5295 BLAKE2B c28c7545f52ba5d51f0387e4621768ece8cd3673ce2e43637c8b3e78ac2cb6803d37d30caa94b1b640191e139d56f216d5d52d6d6c7db35285311c1ff0c3a42a SHA512 2b598d92c6e43286d94e175c0ddc5a66d3ff837c623c7e82eb0acc214c6f1207fafc30e2af6609f77e0aad4c8130d5b73bed1718aaa6e14d0411e332d8c9a1ae
-EBUILD gnupg-2.2.26.ebuild 5187 BLAKE2B 92429b712e519b1b70dc28462ee187c917a0ce066038c77a71f8dd2905460a246ebf9be282c864e482731c71fb39c982f4c764939528fe18dc6ee532b42058c3 SHA512 836712ecdfbfa08ed563734fb1f790261f1824efc361292ca8d462d3b708f784e2875a77dca4542e952cfb7261831c6e09e5b07b3efd879a87b3bd544d1eacdd
+EBUILD gnupg-2.2.20-r2.ebuild 4966 BLAKE2B 28dbe5083ff6a9959548244afea0593f762f1b2671df62d182ccda1aed8f3f40f19ca2ecf452d6c51360b54dbc1eb2b889ead957899e7757314c128df49b3405 SHA512 56f3dc9ffa04db44d45ce9c9cdf3f64407fe6b047f9942a63f5e0b0236848b77da6c3e086814954c6b6ec9770f535a05b839bf0c93ef131708ff500988be57e7
+EBUILD gnupg-2.2.25.ebuild 5284 BLAKE2B 39a81e4191bf35b6181720f7ba476e60f322d52f960d3b8a415213c99ab3f32aa7783668a4f1f444545c3087c9b0d7e7c12b8f2eb3fadd452c1735de280d9073 SHA512 300e0b224c9ec6e1a51642d8ab0be420d82fe4035edf5fe5a721770f894749d5d3dc6dafc875bddd45d5532ebade81da9f33c48c9279ab7d9acf6075843568dd
+EBUILD gnupg-2.2.26.ebuild 5176 BLAKE2B 27f5486bc97c1f7afa8467140592986362c8e1010072d410def43f3b29c707e14edafc086e21cd8a1bde40529358aaaaf68e0a1daf9d0bb1de5a627100ee8e05 SHA512 64c0ec53a4c94071bcbc58a306ee445d44ea7bfaf6eb1c13bb36c09d1ce166eabb2403c23431d8c93b77a3483395ec931a839aefe11b0affc3d1cea13a3eba83
 MISC metadata.xml 1379 BLAKE2B e51735e46f2b9ade13d8aa53c1354b1285904933c260efef8e0d6d66e7b8a36199f33ab48cc98006e75e566a21422883dc3694d91e1dcbf1e7c413ba7dab557f SHA512 cd71918f048d081e7a223b9b09b0089b3e015aef674ef233c2aff43e1325ac61a3bd2bfa828071dd157fea0f5ec76ee719ccd339cf94539e3702d48ba6ecd5d4
diff --git a/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
index f803fc146a9d..25d0a11c4313 100644
--- a/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/gnupg/gnupg-2.2.25.ebuild b/app-crypt/gnupg/gnupg-2.2.25.ebuild
index 142bda909b5d..9abda9a73347 100644
--- a/app-crypt/gnupg/gnupg-2.2.25.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/gnupg/gnupg-2.2.26.ebuild b/app-crypt/gnupg/gnupg-2.2.26.ebuild
index ba1dc86689af..f03938727e39 100644
--- a/app-crypt/gnupg/gnupg-2.2.26.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 233d6c871bd3..27c370a19a48 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -2,9 +2,9 @@ DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c5
 DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
 DIST gpgme-1.14.0.tar.bz2 1678910 BLAKE2B 75051166b1f3777d630236c5afbd1786df238272b7ccfd053c5a4b2a207ba146550f6be46c1211f3bacbe19fee2f67adbc5be558d69175c19230a1a02e32d9f2 SHA512 b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668
 DIST gpgme-1.15.0.tar.bz2 1692019 BLAKE2B 4c66f24034a88e7da8a06cef3d0ac9d1d6b5eccb6d4277d36a2399d6e78f5d5f42cf0c13188c1dba72fe11d73da76a71867d3c3b13052695b868dc4a680fa85b SHA512 ab979aea6ccc6d4faf02b3b1a773ce95cb754b4d687ce7adc2ed98e218f21a284a2283d8e2429016e78fcf5a94ea863011573fd1457a71cc0ae3aadd368a98a1
-EBUILD gpgme-1.13.0-r1.ebuild 2673 BLAKE2B ff54cdd1d4b54b3c63d7beca5a05487fabb712f319c47608ac5d7d083d0e924c994cba1b895bab2b6114127415a534564d04e0906ee54b8e0e33bee9b18e9402 SHA512 5b6bda8a932698ed5995acc705c5a565bd9414cf0f04bfe17abac3833f3aa85036ca762dd85dd209610d4f100c42dd47f552569a0a438d8507cce4e6dde51ac3
-EBUILD gpgme-1.13.0.ebuild 2667 BLAKE2B 2a6a8ecc4e3dfa56a2f8fbc7a57b9ffa122eef195aa282a1d39acf604c5919e0cf8799eb428f541e549e567b07407bd06f3edfab6b6c0281a514da9124e39c5e SHA512 46cd9d29817cf74edc9e4b55696851cc3723ae8b718edeae012515e7be42c1cd91bc711a7b7255a792c1f4369931b5f3b5c52240fe5af2eaf86d5f2c32574b0f
-EBUILD gpgme-1.13.1.ebuild 2675 BLAKE2B 01bdd7bda6982fa4c4ad37f5a18c5b6c36fd8abc66e2905557abeb85dd3cd4d48368e8632789bbd0969a9831e6bebcff679674353e0d045ce9d1693958467e5d SHA512 212e51b8c18150a14ad83a547fa98153d7368da321e28d2b2b6e97a1f49437bda6072d9919d8c01b593fdcd44a0a813b6a5314cf92736a34a98c1e28cc4ef473
-EBUILD gpgme-1.14.0.ebuild 2678 BLAKE2B 5e104080342a978e227d62de4bd52495676a7d47131cf52e45ebe0648f786b9e5522cd1c919238693755896a5988d519d969bc6b0d94bc46311df2e98350a042 SHA512 0d9f2e3e411ba8851ff433246712e6822340bd44794b815eb9399f22188a514293377605f592dac2e720d3dd25539867fbeb933d98d308cc68c333362dfd981a
-EBUILD gpgme-1.15.0.ebuild 2692 BLAKE2B 77c3e8ad4d04ecfe24859d03e00c34b46cde1d759368aa85a9d63494b6cfff5fb850b6082816a559c6d7fff09548818bdda0279da3116dcab96dbff33f709d3f SHA512 97b2402689def522e27d039a1cba316932040aa6cfc337216ddb341038d03682ce598c909467d984cd71b3c46736d721ed56bcbcc03ac315a4e1fb4648efde86
+EBUILD gpgme-1.13.0-r1.ebuild 2662 BLAKE2B 8c97adac42c030e86676f04633c83b89bf38281b2c97a15e7e59ba1b3cbb34264d6faeaee0a381ec739fc906b355841f264218f7ef6e5391a34fceef3b8caac8 SHA512 7e76aad80f95a7a88e549e5141614d85dd10cb7b452184dbb0d92af11518f258d5d8dde2ff11c7d0cbdc158dc8dccdbe3d82c402102d1b694ede0205cda9064c
+EBUILD gpgme-1.13.0.ebuild 2656 BLAKE2B bade967221181538d83785a5c0926125479267623b08170192283ed9f3975a155386b7bab7b54b908bfccdece6fbff135590ff129e4e2053df658e94ee1bc719 SHA512 b601047174277ffff58a7e78ced4e6a461f23c8e5d992f02acc8cf7477d60ac1dd4abc4f8628a932c0b550a49ac0e4e208974c060dff8a9d689599dace59ec91
+EBUILD gpgme-1.13.1.ebuild 2664 BLAKE2B 18272d05b35a804c0586db6d2927e526bd97442155b174091917202e3b25179cec6ab7e1464edf4f2cdbc074b513ca9c1b8e68beaf4e463a5fcb58cc8d90db40 SHA512 5ca9a9c25d9aefccf78ede55d05d56e2b638b50a09a51940b7a4fc51b473017b9beca9bdf4f20f772a3c052de2342efca9a72b2bffc9b066ca03d158e1052c59
+EBUILD gpgme-1.14.0.ebuild 2667 BLAKE2B 38538209933c188dab421d0714113ed6463188f759f47a774dca1be589d658b4cb2cf92dfece06594a73a0cfea59e1e9ee1c7b7a82667fe99130db50fa417543 SHA512 d0cecd7b40962c49640784b7e50b94c3638c14c37075a2b36140d9e7a3f08fff2a63ca215339b5f0c234805b4c67a4ceca63ae9d443d35e8f65c793fb861ebf7
+EBUILD gpgme-1.15.0.ebuild 2681 BLAKE2B ef4bc531debf390e0a7cd10419ed845317117db0f2537d76b41b2d07a985874ef7e2c83ca6cc0e45e5f195d505eb7ef158c74e113c80861c6fdf545c6e7a6ef2 SHA512 c4a1e2653e60c97654dd1a1cf4ce597aa30405ca5304df016f0efe8536a417846b7540a56e8a76c814d27ee400f0cb3b92640b2c048900ff96b97b058513b9a4
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
index cc0b184d2efc..045df93213c0 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~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
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index f4c1a7f81805..3428990769b1 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
diff --git a/app-crypt/gpgme/gpgme-1.13.1.ebuild b/app-crypt/gpgme/gpgme-1.13.1.ebuild
index ebcbbf49ad9d..9897dca0c05b 100644
--- a/app-crypt/gpgme/gpgme-1.13.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
diff --git a/app-crypt/gpgme/gpgme-1.14.0.ebuild b/app-crypt/gpgme/gpgme-1.14.0.ebuild
index af8ddedf98f4..44a61e18ec53 100644
--- a/app-crypt/gpgme/gpgme-1.14.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
diff --git a/app-crypt/gpgme/gpgme-1.15.0.ebuild b/app-crypt/gpgme/gpgme-1.15.0.ebuild
index d1f20d53c008..0ac8998a2854 100644
--- a/app-crypt/gpgme/gpgme-1.15.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 56f3533ea6f3..ab9b9d4581ca 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,5 +15,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
 EBUILD heimdal-7.6.0.ebuild 4516 BLAKE2B 80a8c18e0e5d93010956cb12ab97439515d70d2b872823fcc3025f8bae14ace57a5c6a58b12456e8b2d3bc193c4248751bcbfef24d01e593ab6a15ee97167ffb SHA512 9748d83779ff348640a87045f4aafdae19566ac734b67d93cb3ac01b5fc28c4d3d777c8f5ff2f1617ddf3b7bbae0d50955f01c5568358534956f77d3a0e903c4
-EBUILD heimdal-7.7.0-r1.ebuild 4514 BLAKE2B e2ed5e52756bb4fc98669c67ac4ef87685724a29825a62beaacbf889045d017a1375737701b2164f38168b1fbbf6bb4be8fb8780cd6559841c9e2ff845c6fa2f SHA512 fd68802c2328ed2e87b283a3558e37ac1c1c82918d1409e052954d2da5716deb7f3730962468edd2ff8d5bef03b58fbe6b3392a3555c9b4d89584de7a3301c71
+EBUILD heimdal-7.7.0-r1.ebuild 4513 BLAKE2B 826663b974d14d9d4b2e352b31cdd0ea9254c9e75bdb12b73efdc4d498b38b571c27d75c679ec44bc77ab627dd6669a7912f20dd534504adbd2af69d657617f9 SHA512 f64c95f36ec6c13c77fafddeb51deb7def8c31674f81fbb7794a580497c780cf528bbfd51a509ee6d1efbe4784782268a70323b8f5eb7e9f2d24bb79c4c70ca1
 MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 52af32a12e6b..0dbea843f386 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 39e34c5ca4c8..12f13bdcb186 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -3,5 +3,5 @@ DIST JohnTheRipper-1.8.0-jumbo-1.tar.gz 32533148 BLAKE2B 15929fa2531443861989958
 DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
 EBUILD johntheripper-jumbo-1.8.0.ebuild 2896 BLAKE2B 42aaf59ab405dc2f83ee5641fe028ef63934e5ca91a91b3f04d7c148b2ea47a5df8a6b9e54b3e0a19ca54e5cf2e9722d214e1c9dd8b0d1e7cc6f5304204eecd4 SHA512 1d7856a78537ae023d0a58d57337743053147d90d25df9c4bbc0ef0249b6d06385c89cc9e4f239c388f729d82828da5e3f3d88a64162ad0c5a687cfd8941025b
 EBUILD johntheripper-jumbo-1.9.0.ebuild 2794 BLAKE2B 3dda6a008d9d76a4fc3276adc685de7d95750c51c216121964b10f584e19e584213086d3b2a1ae583419c30858ca131b67f7f4b4e54bd7dd598aa0590db90b4e SHA512 4dfcd423c747377bd071c6c44ea366f3d9381828ed44bbfcdcc305ccfa6de0affc18da841a32d92c362c043a8a98be00f15cd333338e9f1a86ea001c9e1ccb36
-EBUILD johntheripper-jumbo-9999.ebuild 2831 BLAKE2B fbf02041abd851e037644a7dae6d419ed85785290be3eb929069091751b243630c241bd494516932a520d8f3a3f59510f4e2d4da97d47878aaeca11c7a50d2f9 SHA512 b3290798831d3fc9d8d0556a41108d1bc8d6e731cfb0125df47583314c9c2eefb15e96fa9ba75b007aaed515fe29d0c5685cfc5beeb80453a34a5e9a55a50732
+EBUILD johntheripper-jumbo-9999.ebuild 2834 BLAKE2B efef4b72608d708cfb6d8bcfe2174f869a2eb7d951c89dbaa85d0a5956a117e0ed1d6617b1fc0d75af6ce9d321fcc1bc857a35dcf4fbd7fb81a5ce9b4151cf1d SHA512 a0639760f4eb776951dc4f072c138bab6b3f7b1c3aad1a13c33f6f8425254966bad075c17abe8c5e2077982253e4dfb91ed166aee12ab2eeae8ed9d1b0dfa000
 MISC metadata.xml 472 BLAKE2B 82b4e6bd8682bd19ffc1140a8225e1766333af7a10331e4ce5a0b1306959b267a23df2429b593bd74f0bc61e73bd7df6a756cc2820438335c3a565b6208d9219 SHA512 63bf68deac15fd3e96d6ccf7d4ca4c52192c79bf1d075305d1e9757b3ce20dd5f868ef4c908dbe020d2fe6884756b236281ec8902cc4294a3eac96aa05571abf
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 721d298e771e..c2ab18f15f1e 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -119,5 +119,5 @@ src_install() {
 	doins -r run/rules run/ztex
 
 	# documentation
-	dodoc doc/*
+	dodoc -r doc/*
 }
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index a02426983dbd..a18f190aabdb 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,3 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
-EBUILD johntheripper-1.8.0.ebuild 3207 BLAKE2B bcd98a80243246655b8421edf5bd47b83257a8f71d6cb07a6a044c93bc1736376f7066480f8c66958bd8ca7132740379090844220ff5eca97e8e6d6b60318ad9 SHA512 25c324d29e0b7c547115b042de3891b77b222938d393dc85f3c68571a196e08e2ef6636c69016712de872e16f7b98893904bd46d5c5dc89a234ea25aa51ef4ff
+EBUILD johntheripper-1.8.0.ebuild 3137 BLAKE2B ea9ce709f148fa885d299638c30faa8a040000a0bb9420ab63f541b4fda4b68d99a5e2dedcbd66f1c523379c98eca7f4766e87feecc7bb27f120e9e503d4975a SHA512 24d775bb037744cee25b9615834e1e2253b3ace3f151edba908eed34fbd2085c9a1a1db424f78e30fa686c4015e856037a19ab173690ad73b1947931ed8321d5
 MISC metadata.xml 408 BLAKE2B 061c3b13a1528247c36a3c97dda9b4eb044a06abb953180723a83b7c069e6b40decac9e12605a17d9a6ed4d896ada27acbf8d2c42044872e64efa4cb895b609d SHA512 cb3df73a8466c79899cc1a8c2ed2431a84300fe09dd2a930c958c9d1fd68004191f2384722fe8a96ccca305be50143170b2722c672ec807971c9265064ca0d35
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index aa12fcaa1a5d..cd23cb4e246e 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,12 +56,8 @@ get_target() {
 		fi
 	elif use ppc-macos; then
 		echo "macosx-ppc32-altivec"
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
+	elif use x64-macos; then
+		echo "macosx-x86-64"
 	elif use x86-solaris; then
 		echo "solaris-x86-any"
 	elif use x86-fbsd; then
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 955a10f8d7a5..c4836d9153d5 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,5 +1,5 @@
 AUX libb2-0.98.1-distcc.patch 473 BLAKE2B 245a73813769d12c83089893d2a82fcb9f6f7f5a284b12997132d271484a4e5ca8df1891a83514a2c9aae984bd003424290ac4700c2e24a9885694c4e5bdedc3 SHA512 9684f9358dff01b23a799c74c0e72f3af9bec1a5577e66620c24b0a0e91a0e17fd6ab426b42e238375529eed4fbd47b5974764bd136907614abccd21c13d0c65
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
-EBUILD libb2-0.98.1-r2.ebuild 1808 BLAKE2B b20f743e0ec0edd966ec8c1687a811c91c46c67dad1b066ac081ac9a33ef95ade63e7aea60719cf5717a1248eae926b074847f4ce4b0d03aeb8901538533142a SHA512 98e6f77472310acf180d7aae0bcd01881ac5c38147fd3839fdfa9c3b9d9a29fca8446094c40fdd2c40d5dd421825da0d5dffc9b2ca126580918a65ce11c75452
-EBUILD libb2-0.98.1-r3.ebuild 1862 BLAKE2B 497f383e92311492a64503af8ff15cdcce82ba0cea735b63115d19ac724fd4172d4ed1cc779d707b8cc60822e03211eb8e91fd916213455bf6e3a2e7be083ebc SHA512 8a5e4e74bffa44adcad06d76a8eb4c86d1dcd8404751ae3a82afe43c75dccd0bc0d5a2fafeda886d164408e58fff722d15bf4fe42379e5a827c0766059679715
+EBUILD libb2-0.98.1-r2.ebuild 1797 BLAKE2B 41a8df3647256da772156cf2f95b08e0eff0e9ef19d9f86ce787eb1b64e501c50339964e8c09f999e212efb05754e33a81764599495f7a8c8b2f4c300c9edb1c SHA512 4bc8ad57dfca7283149e67b0d68c640593e06cbe554a9244d19aed221075ad9e7b8443686c8670cf0cadf8993223376290d4fba534c65af544ea7afde0d4e34e
+EBUILD libb2-0.98.1-r3.ebuild 1851 BLAKE2B da6aa81c00b9aec7986a9f85eac28b141a51643beb5f8dce380f22e0cefec0cdff9743ed6a4d1aa055a2f07f86a5b6e299757d675095bb45602ca6d14a1b39cb SHA512 b42ad61f5fb71ba6a1fee7d967526cbd0f63b00f4405185e83098fdc2c3474c76d554de5f4915a0788c0904fed59eb7beb25014d518c3088c99d5c25670fdf8a
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index db16f672175a..90f130eb4c47 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 930713363bac..3470ad02948c 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 7172b8241671..541bfe38d75e 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,4 +1,6 @@
 DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
+DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
 EBUILD libmd-1.0.1.ebuild 655 BLAKE2B 277dab7e12e30f7d570cdad5f044efddb604d718d60bfddebdeb2da857b518cafaff7a3174e924ea073e666cad7ffdf6346a9a23caa73e2ddcb188810f8037a7 SHA512 c40343fc729bd8f3f2a4f793f627d970e2b5859bbb74fe9d59cd93982c886a0342fc4142f8f213173ee422f302b9c95670a6b25c5ced1698c2bd62c4b098a2bf
+EBUILD libmd-1.0.3.ebuild 591 BLAKE2B 35c36ea274fd91148976f8b116cb805a9d13c7e934843f50397981d260d3d67df49bbfd7d0df48a64447d32370d70e6aa22fe2ed05e8f34418bc059281c13fa6 SHA512 a3faf8a16e63b97c637371e128975f4bf06f6ec9eaee5851e6c91231e93d0f6be74ac07a04e19e28df34b95f6ae211fd97d2f38d5f5a6fd549fd7596d91ea754
 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.3.ebuild b/app-crypt/libmd/libmd-1.0.3.ebuild
new file mode 100644
index 000000000000..55fdb75b7caf
--- /dev/null
+++ b/app-crypt/libmd/libmd-1.0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="Message Digest functions from BSD systems"
+HOMEPAGE="https://www.hadrons.org/software/libmd/"
+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"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/$(get_libdir)/libmd.la || die
+}
diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest
index eb54cf60b324..227ac299f061 100644
--- a/app-crypt/mcrypt/Manifest
+++ b/app-crypt/mcrypt/Manifest
@@ -5,5 +5,5 @@ AUX mcrypt-2.6.8-segv.patch 1330 BLAKE2B 731b3aba84731d81d993771270c0a8d42222ad6
 AUX mcrypt-2.6.8-sprintf.patch 3617 BLAKE2B 9dc7fd48a12fbd34624ce4e02dd3e729444a8c8fd05b9a77f15cb0c7547aa21972bb4295e5ff9846530758e7994eee7dd9351ff32c03825e8d3611251ef858a5 SHA512 36163d3c782a29ab70527d0389e9ee4fc0fdb6d92300a5a576f3702c4b6a63f598e3832fd704570cd3c8da79182e2c57473b84932c26b08d3c8bd509f475a7d8
 AUX mcrypt-2.6.8-stdlib.h.patch 262 BLAKE2B 30735481ecc743554dc5a1fdf6d91d259ee2670ee39d939b90970aaaa0548c5edbe88fd5820f1cce4f7d4442d293258c5528f8c01d485a14fdda4cf060b27019 SHA512 6f20fe8982cca9fb448ace79c8b8b04260dc63f6a372da4cbf8a7a5d7458f32527e0f31d32387c9f326906fe6fe98013dc49a388b1c987ccca096c9796b409fd
 DIST mcrypt-2.6.8.tar.gz 471915 BLAKE2B 63bb51d2e0fac138ad1cadd6c0842b5c13e604a0a6dd134b85c1e4f4a3af2758955c09a032641f34861a52dee5b0ce138b22e849a26a6e3c27bc0838999718fc SHA512 eae5f831e950df69eb93efc8314100b4b5dc8a535b1d00f500e6b25382efcec321346776a92dadf101b878ef46a47de2e9e81f5ddf5c73563ece4741f169c8d1
-EBUILD mcrypt-2.6.8-r3.ebuild 706 BLAKE2B 1e2c4a33de9a9aafcbfdd5202c7e68eb5d812bb7733460d280f5980987fc8b68918e52f1695f82e8cd172e32454c49799f5be135631c9d9249f85b136effddad SHA512 9e35447105cfb0293415891a738b843ec93c29c39047c3c745db1d9f6d44665c1e4200f3c0685ca8cf7e5e6c15201ee8d0bc94e7614f4c37e64b661d434bcbd5
+EBUILD mcrypt-2.6.8-r3.ebuild 692 BLAKE2B 0ab50a516660ec1e5a9847663c8fb060b667021a7f8979d1760fa2b3f08fe04dc334d38d80e73fc6099f6ed264144d8c8ce30b3c3a6fc9ad998172a4102a920b SHA512 224822acd4e64cc9ab98511abf3ee33a2e885361ef8e70bde97f86e96afdeba2c294f5b36c35aaac206b9346bbee97a9f0a5ad9b840fe8e9dae919815b7dd72c
 MISC metadata.xml 243 BLAKE2B 7891de6465eeb439f99ecbac5b66fb85e295e8d0e3eb7898d7d1123bc7fd48226ae2fdfef3b0d5444d6775fa6bf7c95f8a7ffb7f32241bdc5117dbfdc39d5799 SHA512 386e677afb96c239287efdaddd9f759ff89b837c45fe43c656435f9f8d29820528a07406ae494f3261d6a194e9906b79322b83fdf5ebeafaba65421488ffd7b7
diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
index 4db26ac6ea89..f9bd690e5488 100644
--- a/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
+++ b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-macos"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/libmcrypt-2.5.8
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 3fc4e4342d86..b4d01513a0f2 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -7,5 +7,5 @@ AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e33
 AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
 AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1413 BLAKE2B eb9e28079c63199ffbe39989771029e87ef50285cd751b0622e69f097c923c8d7bc705ea398affa48ab33c74051f3f48b9b19e2318fadc39ab53f0593b19c2a8 SHA512 00a2587dd4d163d6aacca4038788574cbc6ed9e8e26f82a84a7d6e5c2cd311eed64cea3950b3e29b73523e39112233b3089304f07874899b517a8f5fac4d4d99
+EBUILD mhash-0.9.9.9-r2.ebuild 1402 BLAKE2B 665c30a0c01fb73cb6dabca7c1356e063b7dd9410f9f8fcb82542aa4ced5d9c63d2a9551e730a75c41e27619de993e59e6d141212265f6c7ec5c955be870a145 SHA512 7d3c35c1bd18eaafdd33456048bc27bcc19034a583f5418ad6769b75a24de2dc61fe859c09106a06170ea531f21f9dd015e9e2692af6012bfa9ab5e413606b95
 MISC metadata.xml 240 BLAKE2B 930f7f4d63cd589f337e5fb82f0fd568e7b12917c1fbb663af43acb523311b683b7bd3e144af0673749143a5d7fa86f57e8bed96f87c32e054c28ae6bf8d768f SHA512 46b4040c549d189f732ec0752339b86521d8351f8d5529f272050722cb466e161772e5fd05db097e29a528786150aea5d78d80232d84cbf99521f4ff697d7a4a
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index 649d9885c142..7e884b399b2c 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl" # pod2html
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 70c0782f4cda..cd8f95b15c7c 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1,3 @@
 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
+EBUILD p11-kit-0.23.22.ebuild 2007 BLAKE2B 83ef4fbea91e9fde8324a6a490055a7af92c0cb21550f832242ab9e6fdf9762d315385fedf38b450e0a8ffb076cb7c872b3694b02fb2d6031bdc9afb0bc67061 SHA512 97a4d243b6a053c7a1008906aaa5143de852438cd71e689c415f7de3a16febdb2c5b2fa4485913ea696bd184b1df804a3d7658ea96f69ae49693f774eb569652
 MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
diff --git a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
index 1c0aa67dab24..f373dac47efa 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi systemd +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index bfa6b7cde3c3..1ebefdccf8d6 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 2951 BLAKE2B 20bca1978bb4164ad07bb0fe96d614a97b811f19880f38190442b94d2b9c8924553c1ef3a7009b8b86cd6ec0f1f2d990c183ffe28fa0cfd54ed0e308e114103d SHA512 16fbee43dadd7454ccdfe92cc5c71d4d59ca9da82dd833a0747a4b9601e62525ec7e39f02cf9f790087a27e072c2c8f904d9a9fa314c6f7b674c38a3675c6a9a
+EBUILD pinentry-1.1.0-r3.ebuild 2940 BLAKE2B 91a208d122d53ad83ed32c1fb6251ca089057e043aba3d25e5a4c2edf03a14f2dbe8eaef600a41d0d07eb976e904799ea4b1c3733d8e592b4872e6485b58251d SHA512 b7d17b817274be6fd14a03bbc3a40b6d9ef13f3884a008bdba2ba86e0a81f019ff900452c611add0deba846facfcca783da743228616058a4a4987fcd7a37836
 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 0a6eb6d4c569..b1f94a63c96a 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5"
 
 DEPEND="
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 10b833c7a727..38c939fc33e1 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -4,6 +4,8 @@ AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc45198
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.4.0-src.tar.gz 406433 BLAKE2B 2af437cd3a049bb9473825026f8a6476c81b4400a47638c62ee3ecb3d3984f7f9fe97def91488094a2919e5baad967d3f49ec7d95363896e270251ad085bacac SHA512 2f02487fffe8d1bc70c4454829bbd250a15fbd09db5ef85c54d3e8ad1008e84616ea54483292deae45047a27964e27b26d9b3da8447e7c37dac1e2ce18a63a07
-EBUILD rhash-1.3.6-r1.ebuild 1906 BLAKE2B 2b42abc2249717d46bf80a29ec189ce359dd414226ad895711fb91fcd11f30d8adfd695b0a58150ed810da03c5b859fec103691038b94d8f3c785ad63d1fcf4d SHA512 372d233a7507b52c8dd1a919afda5d4d61ba3bf6049f744d98e417570739491d8f6079723d7c86bc763cc31fe4dc408304148297bf079f34f02439c66b2851ab
-EBUILD rhash-1.4.0.ebuild 1945 BLAKE2B e83ac65e2b39812c7788c2f4ce4808f0643a856ad4fbbf5c6e5c738ab375316441db36978eaac7a202631dc450c40f9394c4a3a2ee034ce02b317a7256e54d9f SHA512 c5b69afb6517a2a4ab5d036b86815332e532dc5e74b67ddc9957ce0596a77aa9c564161ba95613f6ead781f416704c8eb626e0bf043fca2d53508f7982657518
+DIST rhash-1.4.1-src.tar.gz 413274 BLAKE2B 2027bccc677e8a1766f0624e67f475713653ddb4be457f9c8434c45019bc730934ca860e69f8b8e1fec349e724b1a366df0f5fb98501c825b44f9b8105068ff7 SHA512 30bbef7ce7815ee4ac062c537206a0b895845f61de4b1fdc0c0494f66284d9f3c1b06f812ea913fa35a3342d230d25d0986a1db644c7b4464bc1185997beb638
+EBUILD rhash-1.3.6-r1.ebuild 1895 BLAKE2B 53b459d4c1d7216500306eb71228087bf8df76e24a899709eb846f8e01deb8fd5e499fc119be30805ad966d2e1b619a438caee7c6540af2c89353123891f1763 SHA512 b25db77839d64bb70e6e53f13e2e726453f7c817724e2df66d470118c01f5c253d2c74e338f590c5b30e0b72c75f4b923cef2d9114c8ea9b22f50d3f66da0fcd
+EBUILD rhash-1.4.0.ebuild 1934 BLAKE2B 34ab1bfe7b69a38f92c3eb4b3d86253a638fe1e6185ff394f800281ca5f073d938464348cbcfa756f2f570ce043de6d1f28437e9b975a7042144f196b842bdc0 SHA512 c034859f7681bfae06503384d293463e93f08cfc40d7c767b6765ff31060408219229fe408e0d8203f07abce50d109ddeacfef3b623f8123e0fc79bc15209ebc
+EBUILD rhash-1.4.1.ebuild 1934 BLAKE2B 34ab1bfe7b69a38f92c3eb4b3d86253a638fe1e6185ff394f800281ca5f073d938464348cbcfa756f2f570ce043de6d1f28437e9b975a7042144f196b842bdc0 SHA512 c034859f7681bfae06503384d293463e93f08cfc40d7c767b6765ff31060408219229fe408e0d8203f07abce50d109ddeacfef3b623f8123e0fc79bc15209ebc
 MISC metadata.xml 816 BLAKE2B bb6057383b42281881b70331deed4070724bf10bdd00eb8329d3f3133329aa47d8d64ea66c70500dbeb8f92995f527b012dfeadd96d5c2a1eb73ff0ceb20f43a SHA512 ef3d1b671c08f7f1e1394675f626fc399a7a07dbefaa1a4ef1201052db524f2063efca3470b0d4f58a03cb8a49bb086e37b0bb8357cfc761107b1d6563e79263
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index 44d587216112..1aae5aeadcb8 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.0.ebuild b/app-crypt/rhash/rhash-1.4.0.ebuild
index 88a8e3ebfe3f..84b05ebc648f 100644
--- a/app-crypt/rhash/rhash-1.4.0.ebuild
+++ b/app-crypt/rhash/rhash-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.1.ebuild b/app-crypt/rhash/rhash-1.4.1.ebuild
new file mode 100644
index 000000000000..84b05ebc648f
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.4.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Console utility and library for computing and verifying file hash sums"
+HOMEPAGE="http://rhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls libressl ssl static-libs"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+)"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/RHash-${PV}"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
+		# we lack posix_memalign
+		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
+			librhash/util.h || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	set -- \
+		./configure \
+		--target="${CHOST}" \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-openssl-runtime \
+		--disable-static \
+		--enable-lib-shared \
+		$(use_enable debug) \
+		$(use_enable nls gettext) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs lib-static)
+
+	echo "${@}"
+	"${@}" || die "configure failed"
+}
+
+# We would add compile-gmo to the build targets but install-gmo always
+# recompiles unconditionally. :(
+
+multilib_src_install() {
+	# -j1 needed due to race condition.
+	emake DESTDIR="${D}" -j1 \
+		install{,-lib-headers,-pkg-config} \
+		$(use nls && echo install-gmo) \
+		$(use kernel_Winnt || echo install-lib-so-link)
+}
+
+multilib_src_test() {
+	emake test
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index c2f4f155ccdc..d875a0bdd169 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -2,7 +2,7 @@ AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38
 DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07
 DIST xca-2.2.1.tar.gz 1339412 BLAKE2B 5d3e33a711919d85bc3457ddd596f2272f0136d96290aeb31e6d03ea86faff00be3590862e4c96d9214542db1bd536d0d22c6c04cd5071b253bbefe3ab3f4f56 SHA512 90eaf4a859779d57a4c0201dc403d67e005bd540145b9f543e13b8d5c42199f2ea05543de24b071d19a0db8e5b1e9f3bef2aea4bfe9f71f81007a5f5bb3ba406
 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
-EBUILD xca-2.1.2.ebuild 1455 BLAKE2B 1aea6cd367a144b64aba3439204e81d2afdbac0e506596eeb02731b439c4b4812a6e3b572f2b974a881a3765832edda9a87301eb593d7c1f569543425d55ffc9 SHA512 d3156e68bd839e5d332190389605759db233c00cb70485b2f8238b4c684473836e817f0af8da44c87d9ff6b736ac6464479b2216572594a5eb7a53881ceab5a2
-EBUILD xca-2.2.1.ebuild 1455 BLAKE2B dd8fac4045b49c7521b5df82c966506aef2824a9233b4f1c06e0b99001a1d81e2ef23f1b2c5355f70d9aec237cc44f08425121c926f14f9dae8f2e0b0850d9d9 SHA512 36d5f5d6461a04fed506053de5d2a64b5f5f108d0a4f71ec833e42c06b3a9cb38598c4f794fdb9b7994f7901e7c75f975b17e2ef68c32bb6b2094dd4acc75b09
-EBUILD xca-2.3.0.ebuild 1522 BLAKE2B 2bb1eef06734ad3ed22b284b6232f6b26b49f544f2b65afe5f5b627f45f6423e230a3986f1335c344bb77b0c43c8207ead2e9a10e1ba714b6d4bead9e361379c SHA512 2cbd68d3d174f01c2f3f2466b93ea5fab292f00b6a1dac4f07b423d68fbdc109d3bedf775319b15133d365c7edceeeb70d4892c701f22bacedb29baf6f864aeb
+EBUILD xca-2.1.2.ebuild 1444 BLAKE2B b349a5611dfffcd352eb3382cc731059424a37c553c5a859eb32c27bce8de5375f96ba4537d2945d96cecd2b0603200f45f8139a512c36dd1e9ab83ff3e25a3d SHA512 a87593bd09dab9e2afb41340f6e8d4383ae68a1ba9f8d5d122246b09c148efb62e25719823409b34d3d48103d4dc45e4d0b66aa3f87390b45d8ab25f5f72cabb
+EBUILD xca-2.2.1.ebuild 1444 BLAKE2B d10ee7eb680077f40b7ba85a39c3f3d835171058d74d3b16f78f84caa588bebe2b7c7b1f483d5903f0d251349ec38fa03888eec6cc80626246375bb1926eaf9f SHA512 c6650b27b3fda7337e3a298eb84a9d0a2cb59e50f9ebcae6f8d08f582f10edccec400bf71cb842a1a4a93a8d7fbb9febd77ced3749480dcd25feb769fe37007b
+EBUILD xca-2.3.0.ebuild 1511 BLAKE2B d1b2054d3a81c62aaa718faaae9f0109fd277f4387691f364b1f9d2dfd501508394aec536b905d4ee99e04ca61ba001593ac50cea9a202a80d0677e85ad990bc SHA512 9f89e3e30481472796403ac8567b87ba4203828d24cc1b329e426cd7e79f3a61c2a5888d75faf71830c758130f47f59afd313dad9df9370a4e38458dfb322601
 MISC metadata.xml 350 BLAKE2B 825e045b03a40c1b9a3c5af631d1748532ad4c84e83d0efd1d4866c5cc1284afab67f1e3e00a2c31a376a19d4e4608404a5830ab1a8a738079a3b6128f5c9bad SHA512 fd4e95bcd679b22bdfa620896e81e0a63bc6f084c60bf42caa853f9dcef2c797ff640801f206caceb6969ee4e347492200b37af4920c50c9764a3bac48910cf3
diff --git a/app-crypt/xca/xca-2.1.2.ebuild b/app-crypt/xca/xca-2.1.2.ebuild
index ed4c28eb1c00..42650c37c676 100644
--- a/app-crypt/xca/xca-2.1.2.ebuild
+++ b/app-crypt/xca/xca-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bindist doc libressl"
 
 RDEPEND="
diff --git a/app-crypt/xca/xca-2.2.1.ebuild b/app-crypt/xca/xca-2.2.1.ebuild
index e8d94c254cf3..321c828980ab 100644
--- a/app-crypt/xca/xca-2.2.1.ebuild
+++ b/app-crypt/xca/xca-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bindist doc libressl"
 
 RDEPEND="
diff --git a/app-crypt/xca/xca-2.3.0.ebuild b/app-crypt/xca/xca-2.3.0.ebuild
index 0473f9f3358c..c13f1050b141 100644
--- a/app-crypt/xca/xca-2.3.0.ebuild
+++ b/app-crypt/xca/xca-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bindist doc libressl"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /app-crypt
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)