gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /app-crypt
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
51 files changed, 397 insertions, 844 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 6f7cfe0ecf50..23d839d18a09 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index c8dd6ab0ff94..e29f8e9ecfc1 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
 DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
-EBUILD acme-1.3.0-r1.ebuild 1770 BLAKE2B dd2b344dc9157631cadafaec85f9bf220444917e71be0166a513d2eb0ac9d863aa3369f2c61c11bf4b9fb9054a1a0e59b28fe6b92aa0c686133fb4b8cbcefc71 SHA512 caba8e15d9e396d9707cf868cc1ec76be17b462d5be08508df8f02ef16c093b55ae770e8f68e97a0d19cd030a8ac087c3e980829eccb8458f5e1bf770a86d947
-EBUILD acme-1.4.0.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
+DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
+EBUILD acme-1.4.0.ebuild 1735 BLAKE2B 6672a6522b20e85a4d8e2181674bf87dde72ebeb762db91415efb051077b191c7193ba1eb55a8ea387ae09dbdf57b766423cc62909fde4a673f14d545551f5b4 SHA512 2c555871d0ed02df90b9149282dab1a0aacd5d662a9dc9d25b5887d56a3c2cc9200503197edb7b736a960fa374918813e33a826eec28f7565d883fabb613a2e7
+EBUILD acme-1.5.0.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
 EBUILD acme-9999.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-1.4.0.ebuild b/app-crypt/acme/acme-1.4.0.ebuild
index 1d83c8b8d408..a728b3c4a9ed 100644
--- a/app-crypt/acme/acme-1.4.0.ebuild
+++ b/app-crypt/acme/acme-1.4.0.ebuild
@@ -10,7 +10,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.3.0-r1.ebuild b/app-crypt/acme/acme-1.5.0.ebuild
index 279b634c1750..1d83c8b8d408 100644
--- a/app-crypt/acme/acme-1.3.0-r1.ebuild
+++ b/app-crypt/acme/acme-1.5.0.ebuild
@@ -10,7 +10,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
 
@@ -28,7 +28,6 @@ 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/mock[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/app-crypt/aespipe/Manifest b/app-crypt/aespipe/Manifest
index fcfda96aa83f..d5d5be0ca14b 100644
--- a/app-crypt/aespipe/Manifest
+++ b/app-crypt/aespipe/Manifest
@@ -1,3 +1,5 @@
 DIST aespipe-v2.4e.tar.bz2 107741 BLAKE2B 9331441214b495f042f8ac41b57203057e762156aa7b6bd9fcb8d55b3e149fb79dd0d7c06358599fefd6662d797baf4cf9ba84fc4425e637c9fef0abf1b254c7 SHA512 e038f710ac971e5ba740648c0f255e8bc9fcea9be1a6b76208a453f21f013e1662c006d4f4495fa2b2560fd9b0c236947462a9b337a120073c6a5335b29f077e
+DIST aespipe-v2.4f.tar.bz2 107663 BLAKE2B 80af945ec938307ddaeb1a1f7a91da71d4f1aeabe4cb303166cad95c36e0d0090fd8440bb636ac0245d2701d61fdea715c84e18dfacf32bfba7f4b85a2db091f SHA512 75b6b2069a0e013dbded29b07b990fc783cc04ce05fc37e6591dae7e8190485960735ec1a1af18d065be57d0b7ec23dbe520e920f92e9c01170b7a23eb32eb3f
 EBUILD aespipe-2.4e.ebuild 749 BLAKE2B f0af3d47dcf8d381891a0711a968a9d75a72136a4b52a8548b6e49d5445b2d49e1a3da595fa6ce18a3cc132ca3c90917a1fdb9440a0508f0c6f7608e6b53c222 SHA512 42d563aeb28a957534b0205aa47df96440cde79baad55b2848f9d1d7aa2fccece4d3abb06e070322016def375c8f9b3ddcb23eda7a75a1e93704d534007e6b25
-MISC metadata.xml 451 BLAKE2B c23c4255b9480af40363c626a009f59e331a7382c48ddcd54be624998076c4da02f77105acfa6b9ba590d04f9bc338ae9d2ab70a98ff8ec7597dc75b4a83ea1e SHA512 a95dcbd4c3e796d7a9fc2b5d1f4ba17e5a0be6a24318b970cdc4498a44c279fc05ef20097477bd44fcd4eefe03be2545d439966ecb88d6be4cb9c824bda19a1b
+EBUILD aespipe-2.4f.ebuild 743 BLAKE2B a6885af52b99c1f95197da318ee3c2942c179970049a745613bb78513de8f531a2a77e24c932da80fa1c22628bc72042d1153f99648437ad14c32732b4e9e7d0 SHA512 b0fad08d2d21417df8161f4e1a1c85273f4a06fd548f5eb1b2b17bab81028328483d6d82a71b39b43da94818a757209d264ceee2d8ec481acc36015bd2b14983
+MISC metadata.xml 650 BLAKE2B 4bf3cde201df3b0cd6d73e56b3502946c117d8942853ef1e919c245cde0b7f19da7a4cf6e5f95467f8235b6b3033d4897844c6142b9facb0836c92283d81d156 SHA512 73da723df8d56d8a2030bab56d830473fa66dda7f91e62f251c09db6164413dcc6c1f9c160586e383f4874aba11d21e57c44df21dedcf591d378196736136378
diff --git a/app-crypt/aespipe/aespipe-2.4f.ebuild b/app-crypt/aespipe/aespipe-2.4f.ebuild
new file mode 100644
index 000000000000..3ead8cc5fb4e
--- /dev/null
+++ b/app-crypt/aespipe/aespipe-2.4f.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Encrypts data from stdin to stdout"
+HOMEPAGE="http://loop-aes.sourceforge.net"
+SRC_URI="http://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_padlock static"
+RDEPEND="app-arch/sharutils
+	app-crypt/gnupg"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_configure() {
+	use static && append-ldflags -static
+	econf \
+		$(use_enable asm) \
+		$(use_enable cpu_flags_x86_aes intelaes) \
+		$(use_enable cpu_flags_x86_padlock padlock)
+}
diff --git a/app-crypt/aespipe/metadata.xml b/app-crypt/aespipe/metadata.xml
index cc185eaa435c..c896699a412e 100644
--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="asm">Enable assembly modules</flag>
 		<flag name="cpu_flags_x86_padlock">Use VIA padlock instructions,
diff --git a/app-crypt/asedriveiiie-serial/Manifest b/app-crypt/asedriveiiie-serial/Manifest
index c0ef93d31b23..56d5f78def6e 100644
--- a/app-crypt/asedriveiiie-serial/Manifest
+++ b/app-crypt/asedriveiiie-serial/Manifest
@@ -1,3 +1,3 @@
 DIST asedriveiiie-serial-3.5.tar.bz2 32461 BLAKE2B e63162ab6f0a03e8b48e6a2d7e653f52d1cdb5b6564ea2fe8b10cee51b9769133a6f16c4176ac208c35c78600b6a636c0e0d97d7458c912caf1052ba78829b0d SHA512 b74ea2225990c36e86d106fa7e9e844e1f99d87f9869416faf3dfaa1ecaca34b4bdd4e5887746c6b039de325e03ede3ee78aadeaf20d0fabc8deba48a72a93b3
-EBUILD asedriveiiie-serial-3.5.ebuild 1034 BLAKE2B 53a19a147bacba99f3f7e774f68b234b5163b58383ba18f6662a756be82e5d9dacc8a8c8ef48c092ba3a9e9e338b867cf993eb24c29ad29ce136dc1703088581 SHA512 477b8d5996a8ed01d71e06dca4fa1d1927ffc40fb80cb89f77c5b4ea191fb0fe099fe2f71adb453c92d0fa0382c751680c8f9f751dcd1bcd2632f6afe05abd07
+EBUILD asedriveiiie-serial-3.5.ebuild 1032 BLAKE2B 9f3515ad76bfcd612b4ee6958a2ffb744cbc83570d51bc66f9253bcf0c03c13b39c7e3101fc7b9673ca7990d268a05a123e2f3c39dc16247512ef70b2ce47d5e SHA512 aa5b837e710107e510a986cf582110c298e425bbbaddce91bc8711a10ec90dd35ef6088828659fb747fb51aae3b33d7570b1f1fa464d6ee3e990df0948828cd2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild b/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
index adf75de12b06..3df8cf53aac3 100644
--- a/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
+++ b/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="ASEDriveIIIe Serial Card Reader"
-HOMEPAGE="http://www.athena-scs.com"
+HOMEPAGE="https://www.athena-scs.com"
 SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-crypt/asedriveiiie-usb/Manifest b/app-crypt/asedriveiiie-usb/Manifest
index d0a48e22bc7f..385d7c4e0beb 100644
--- a/app-crypt/asedriveiiie-usb/Manifest
+++ b/app-crypt/asedriveiiie-usb/Manifest
@@ -1,3 +1,3 @@
 DIST asedriveiiie-usb-3.5.tar.bz2 32595 BLAKE2B 6532957e1d778a697185c08f8b1852bed53fc6c6141e4bc84f000cedbf6779c691dc92b643c619c0b6f67c39cac72f4e5dc57edf9285d3cfc4ce1b3240c4809e SHA512 aa718a1f4b28c9186e120bb8e2216389a8a9f54ac3f299a9cd72c398594fcf23229ac4a14e5358cc02e6fcd2ce3abe0e1e4125e4dac8d302bdc325a3f410744f
-EBUILD asedriveiiie-usb-3.5.ebuild 482 BLAKE2B cf346b4a5093becdc2867bf1cdd4cbb36494226b25dfc308d6eb68ea008d632f7e9c35503e50ea8df9b5b1685cba2541b2e8e8f8a7efa1f6146dd4e3e0c5a093 SHA512 e158814bb3b55883b2da86ab580685a0bdcd29596fad03097432dfbeee63f2a57da6aa45d43177b692f54ada823bc0e7604b4f1cbebf43e673519de0dde20283
+EBUILD asedriveiiie-usb-3.5.ebuild 480 BLAKE2B d48cafe64b79aefd459cecd3bb871c652e6d06013570fec07719f7938d59da40926c9f972370378a805160e76941221eb10229584fc1c649533daf027f7988bd SHA512 e245dc1d2255a48101fcc7933d4053e0e8c37e1abe4bc7c6852cc06245cd2d49e258731c46a00e7b01ecf7dcaaad71b1e8e73a10e26968b41e165c2b2f6273ca
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
index 29c177665a45..dc8b1a497bea 100644
--- a/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
+++ b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="ASEDriveIIIe USB Card Reader"
-HOMEPAGE="http://www.athena-scs.com"
+HOMEPAGE="https://www.athena-scs.com"
 SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
index ba12c0eb29bc..f7d538ac9505 100644
--- a/app-crypt/asekey/Manifest
+++ b/app-crypt/asekey/Manifest
@@ -1,4 +1,4 @@
 AUX asekey-3.7-bundle.patch 727 BLAKE2B 0758992095369eadb49e4daec62a0786e790acf7e39f980f74627440b53a4eae8ac57be07cb0cabbb898e207adda3e543631e9b398770e72cc4e38fd1e153a16 SHA512 4cc556687f59371d0f1919f8649b705801da4427cdc011a40b9627601e90cd27f3a06684a721cb25f1c51b10ec28f6ae728e33fbc30217716250d42c6c15efe2
 DIST asekey-3.7.tar.bz2 33304 BLAKE2B 95bba8ded9557105dba50a587665ee638162ae6eefe1017a4ed272364eec1da7154b21833ed2f08fa7f4c3d570971795a0a6f65efebe517124da572d0b9b7d91 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647
-EBUILD asekey-3.7.ebuild 684 BLAKE2B 94d5413cdb5b32f5bb41e6ac4bb7660cbccf50fff573428268639add9ea7b82943ab0d09aba999a01bcc9f1d0c2c29b077e6bd8917d2d9a76f799f13348c71d7 SHA512 47068530f671a9f56f09efd2ebfc1ed36c99f29357e622e52c0f23c909dbc118bd4416b5c63da18f24f4a7edcdb3e1adeb86578bb8159393431f00bc8faf0e63
+EBUILD asekey-3.7.ebuild 685 BLAKE2B 48f4d6aad57d64ad7cfdccf8e9672cc79cec4d5ae2abca06623b387448462b76eef4e00c23fd654ed71bcf12ed01b186b5414fd9cd26a7f6ba70a549334a7ff2 SHA512 6c5ae60dec8c7fa5563785c0712d559ec28a582742168abc078e1cd310db01e2f8b09255205461f751ac95aed802c2405e4d33c82b22cbe5ac7c85609643b69c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
index d895f7bfda5f..fcf24ad70acf 100644
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ b/app-crypt/asekey/asekey-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit udev
 
 DESCRIPTION="ASEKey USB SIM Card Reader"
-HOMEPAGE="http://www.athena-scs.com/"
+HOMEPAGE="https://www.athena-scs.com/"
 SRC_URI="http://www.athena-scs.com/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2"
 LICENSE="BSD LGPL-2.1"
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 2816c458d0f9..fb83cbe33735 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
 DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
-EBUILD certbot-apache-1.3.0-r1.ebuild 1103 BLAKE2B b5e48f218836b1d6ed67a7c752fba68f938cfda74e86472eaf7e518857948d091a80d8516e3459fd550252c5366082a2cf0246550145ca27cb680c303bc76815 SHA512 3a139f0e9430e2bf0fb6bb5efc4bdd055bb12a66a48f5ab19a2d540267922317cba30a84dd12d90d34b26ccecf79066fda61df0330266f7a7c1f8f1352407e2d
-EBUILD certbot-apache-1.4.0.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
+DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
+EBUILD certbot-apache-1.4.0.ebuild 1068 BLAKE2B b3f72cb67e8eb10bbfab2f4badd1a15853526f1605cf4559191a67837d49118ab4bcaaf730bbfc164679f0732835bd274e1a8fdc56cf8fd8f3bd1bf46471e019 SHA512 a3d28f9dd5ae0a3e2eabf156636aeb835a2c5957bd5868f84cf1adc0d8b69c3c084981d756e6460d1d7a8fe157625a1c9785da5cd2a28a7b4455f83bc4fbd9e1
+EBUILD certbot-apache-1.5.0.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
 EBUILD certbot-apache-9999.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.4.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.4.0.ebuild
index 6a66d1858399..cc570860a3b1 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.4.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.4.0.ebuild
@@ -10,7 +10,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.3.0-r1.ebuild b/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
index 3ef09260e724..6a66d1858399 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.3.0-r1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
@@ -10,7 +10,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
 
@@ -26,7 +26,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${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-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 09560dd364f7..55f755a5c5b9 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
 DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
-EBUILD certbot-nginx-1.3.0.ebuild 1002 BLAKE2B ce0f437e0c35c4384932b65f1f9bc68a7bb1f10b601941dddd87350d9c8745014cd1cfeb8253c8262fa07fede07a10cb42bb6584363c6a510e023b5cf40253ec SHA512 84cf0ce1e323a9f20a70f147d67465662fdc799df553dd9e74ddb35b8da4d8bf3b3d6179f23964d3145fc8d44804321352b779424b5f15c6e19626129f6a2f97
-EBUILD certbot-nginx-1.4.0.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
+DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
+EBUILD certbot-nginx-1.4.0.ebuild 967 BLAKE2B fc0874272d53d3c621d7d275096a60e3c783d68ff72dc806e19446210d9af93ef7e542fb7ee149232f95158a687a8fa29ae83176069ba22e0ad6573ab08611bf SHA512 894529f71f1515aa7971bb7487595b9276be582eb08b12af3ae2cfa8736282db68301befcd7d1d18dda00369f11e09f9b00928929ae1d2154c5e97ba37a3d4a1
+EBUILD certbot-nginx-1.5.0.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
 EBUILD certbot-nginx-9999.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.4.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.4.0.ebuild
index b6f70f8607be..788549159e45 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.4.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.4.0.ebuild
@@ -10,7 +10,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.3.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
index 30c891373fb1..b6f70f8607be 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.3.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
@@ -10,7 +10,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
 
@@ -25,9 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.4.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/Manifest b/app-crypt/certbot/Manifest
index cd426cefd3d9..371d014f481a 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
 DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
-EBUILD certbot-1.3.0.ebuild 1482 BLAKE2B c937a391b768757ed01f31fa96596da3cad08ea7394af1b5f5a9a828ef97a4a948b9315a3fc499742eb95dd3370f2d303b52886dcc6df75d2d502801a18aa62d SHA512 e7081e69f95c7d2aec45938ca6cc7e3da6dc00d038cb3d9167e1e33102b84d06e6a7a3ff13c5734c933c0b062d1e07203d6002a3a3f1609c14874679d2b3d077
-EBUILD certbot-1.4.0.ebuild 1449 BLAKE2B 33697537a8dfe539c1aee02b90745fd8da1150c94c9d842f17e3703c79f24fb5ba8b54a95a3f450d340abdc0240663e0b338c86a5a0b4e1506a591bc2a5e5a99 SHA512 a725b74a30ba0b7afd8ec12a02cdbbbb2f69054f588fc8f6da3ba47fdba481ba5b39b70f5609e1e874397d5e53319deb2a5589a2044079d009034fbdec0c3fe7
-EBUILD certbot-9999.ebuild 1449 BLAKE2B 33697537a8dfe539c1aee02b90745fd8da1150c94c9d842f17e3703c79f24fb5ba8b54a95a3f450d340abdc0240663e0b338c86a5a0b4e1506a591bc2a5e5a99 SHA512 a725b74a30ba0b7afd8ec12a02cdbbbb2f69054f588fc8f6da3ba47fdba481ba5b39b70f5609e1e874397d5e53319deb2a5589a2044079d009034fbdec0c3fe7
+DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
+EBUILD certbot-1.4.0.ebuild 1447 BLAKE2B a9aecfb2cd9dcbd70ec6e0ec1bbd0a4fef3fcfaba24a200b33cc52c8fca3f5cf3dabaee67cf2d1f7c43f05a8b9632e01fa0659d5751b035a5b8db05b3b88604e SHA512 e4b23c3304e48748c6c732a131546235aa6909eda9fa90f751b6e213ce524439f84c9057a4567e67656f641385736a3cb6d7b9e996da9491b30b24f323d33cf3
+EBUILD certbot-1.5.0.ebuild 1448 BLAKE2B 6d50286cc52e3c627a218c33f480519e1d7bb5c5969211455e00098005b59f92f4a1ecb5ce77675956375e903c89fd93f8a0540f41b67cb1270fca47b8fae819 SHA512 039f07c2098359ce63952c7cfcc7ec4db0175e7b898aa28a97ecf1237d75602f39534ce59153ccc200654b638a8c26c9d4f043683a334d9ee2214a84c26a70f6
+EBUILD certbot-9999.ebuild 1448 BLAKE2B 6d50286cc52e3c627a218c33f480519e1d7bb5c5969211455e00098005b59f92f4a1ecb5ce77675956375e903c89fd93f8a0540f41b67cb1270fca47b8fae819 SHA512 039f07c2098359ce63952c7cfcc7ec4db0175e7b898aa28a97ecf1237d75602f39534ce59153ccc200654b638a8c26c9d4f043683a334d9ee2214a84c26a70f6
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.4.0.ebuild b/app-crypt/certbot/certbot-1.4.0.ebuild
index 182f2b91d51b..1f8e090405ac 100644
--- a/app-crypt/certbot/certbot-1.4.0.ebuild
+++ b/app-crypt/certbot/certbot-1.4.0.ebuild
@@ -9,7 +9,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.3.0.ebuild b/app-crypt/certbot/certbot-1.5.0.ebuild
index 7d648b678ea2..fb33b72fd174 100644
--- a/app-crypt/certbot/certbot-1.3.0.ebuild
+++ b/app-crypt/certbot/certbot-1.5.0.ebuild
@@ -9,7 +9,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}
 
@@ -26,13 +26,12 @@ RESTRICT="!test? ( test )"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.4.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/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 182f2b91d51b..fb33b72fd174 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index d7f0edac3768..cc89c1537a71 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,5 +2,5 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
 DIST gnupg-2.2.19.tar.bz2 6754972 BLAKE2B fc1b9afb398ef78a6d239c62fc88cba7148679b1b666ac39dbd9644847e99de1a683a7938bc112cb33adafe555472319dde4f64860071446a66cd79934f7d69c SHA512 d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd
 DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
 EBUILD gnupg-2.2.19.ebuild 5324 BLAKE2B 5c294c51bd7a8866f64b1c10e8dcfe4cca8e3ba11ab17b21a057654d969bdb8b9b598461f757ed61f1a00bfdf49632b97c53642e6549c9d9a75434c2885f328a SHA512 67fbaa708dcd39a31a4d61a413e1c27eec94758e8e7dca56303c9d6dd97ea750e74a3a8ef551f42df0d5575e23e0916bb0b99d6834f9bd2930f4b72d8f1e0255
-EBUILD gnupg-2.2.20.ebuild 5116 BLAKE2B 23b115e992bd0a12f516f93766a1b67d1d7e26d1b22c11480a41276101173182bfa3cd8db2f01bea9c09409a2e6214c4846c2d84cca9cace67cbd3778bd7b2ad SHA512 7e768ea8c3304312f11a04eddec071e81a0619b0c54f49ec0fdfacfbba4e411bc9edbe9696b572993b866fd389eb09dc57ff32d93f6b482cc5fdd36dddd033dc
+EBUILD gnupg-2.2.20.ebuild 5115 BLAKE2B d6878ce455f902a1bb36428ec221f5f538870a8b691df845b2fe05cac7c5d605423d8153c4fb70bca00e4be80f97a33adf89926221252ce31849582d8ee43f0d SHA512 92d90e52c1dceb187690bf85dd55f0167ae1f4745b919afa2f91109b21dd36fce609f834e1a352c7770deadbeec8106ef2cf98a3d640375fb04c065451fca067
 MISC metadata.xml 1212 BLAKE2B 36bd1e7478abbb579b33292418dc621c65869151cfd0cbe9cb7b553adf92b606273f415db763ec5c3884e91f29929f79de1cbf15cc47626b1115b168d567790e SHA512 646ec87262b7069808976e17fae4b2101f9a8aae7ad5bbd10abce6077a5e4e741eb5692997af4383cf8cd3e6b03ded83f9dd5245ed112533c6a6e4c752b1060a
diff --git a/app-crypt/gnupg/gnupg-2.2.20.ebuild b/app-crypt/gnupg/gnupg-2.2.20.ebuild
index cd7106ae9204..05048d8c6a30 100644
--- a/app-crypt/gnupg/gnupg-2.2.20.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20.ebuild
@@ -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 ~ppc-aix ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index eb7ff2dabcf9..75d687783112 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -2,6 +2,6 @@ DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe8
 DIST libsecret-0.20.2.tar.xz 526224 BLAKE2B cae93962480f65d2c91b1c26a23321d19c256692754ef37c658e346a6cb6b91cdebe134516c3c8652c5ee502b8f7a070a8d519ed878b2f6dfc124ea7b032613f SHA512 89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857
 DIST libsecret-0.20.3.tar.xz 526388 BLAKE2B ae2e64af61c269eb109fa7840cc7ff2362ac69eab4b452074c2cb3a80b26cc88e8d341a7649e0f16fa73541943d968dfbd6f3cc802d99a37f3a7d91e8b20cfe3 SHA512 020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22
 EBUILD libsecret-0.18.8.ebuild 2652 BLAKE2B 07cbecd0bbef05c9c5538e5a212b7533ab61a39e563e5a7cec21ff75b98d61802ed66512f282ce368f5aba6093b775c00afcf48d29618074fdfc175d7667c83c SHA512 e42f531f040f7600bcdc4af20f6cc3db23a7e886e683c6202de97484fe52876e763f75b8ecb3b1a67436ca84a04fdc97625bb456b9bc414fa5ab81da54d4d54a
-EBUILD libsecret-0.20.2.ebuild 2658 BLAKE2B 2e186b496513d243af36dcf5df4da4601a2dda8579572f73ca8af7f996fc880844a888385b470f5210514a45eda0b8044616e7857ec356684e6cef34d6b7562f SHA512 f5e847b7a183c6b8dfbcee7ddad0f2b673363d4b82ff821ec64f5422b1bf6d3511f3ebac13a5ca2cd1249093f233e927348aba46d4695f952a55029c1367212c
+EBUILD libsecret-0.20.2.ebuild 2657 BLAKE2B a32a3c1996925609c2e431a015f12767830adfaa2284dd7948d748e426e3ba4311bba8a6f4ea5f30c67c4f77b69d545cf7cb824d584db3401b6121887e7d3e57 SHA512 2f87cb1ff6f8bf6583b209ec2c9877010973fcde82f51c694f8c9083705809420b3a2bebb76386fc640097e0eb66ff8f2a17b39058065545b2553f24e9ff6bca
 EBUILD libsecret-0.20.3.ebuild 2663 BLAKE2B d52f33a3a7aaba917f8ac2ca6949beebbf4cf1c9f6ce4493513030a7cdad5cb4448b904cc71a5813c28ccd518ec720d86c92665421bf9b9f3636e7644970afea SHA512 065315ebe759bb893f7adaaee0c13fe44d22d6d0b5f43023e1c9e5772d2c485d8d6ec1e3a36989ec47b0a00bf11bf17cf444a8b86d55f2b198da00367477cfe9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.20.2.ebuild b/app-crypt/libsecret/libsecret-0.20.2.ebuild
index a7358da205fc..346eb620ef31 100644
--- a/app-crypt/libsecret/libsecret-0.20.2.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.2.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index 572aa7d7fb74..40289d75fedd 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -1,4 +1,7 @@
 DIST loop-AES-v3.7j.tar.bz2 326818 BLAKE2B ca2db3162298e2e28dcc6feb5e6ba885a08097acafb9937a69898e6944c62cbb1c0ef601e13c0547550721430bf770f187ee71bc5e642d6107c982fae9d03462 SHA512 e1b59680680e2b40bb42cad9f1e89a344c7bfd0ee01fdc26151e9edea64b5111744588bc05c672de16c76ae0a3e4d6a8d4c4c9c09709a9f93bfc62a2f64ba7c7
+DIST loop-AES-v3.7q.tar.bz2 376027 BLAKE2B 7f3206196fcb7ecc928bda4cd127042f61cd5ac7f39e483fb91db388572be1c8e252d5c4adb653e6fd00ff6a7ba4c1406c35f2b2659e9cb38fd817f1bdb2a15f SHA512 103869695f6b18bcc765804865468db4b24fc2fcce3ec97d8468fdc0bd37c480386960730e280cd93c707026dddc5e79d8d25e2601c3678330e016835166ad20
 DIST util-linux-2.28.2.tar.xz 4149700 BLAKE2B da38a047b4a7dc867ba72aea149d515665375089d880d43c40f6d19a09ee33023d64b95c15073d6a83a36ee58ff6d47ef08671ab841b533bb747a337c5da6c02 SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940
+DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
 EBUILD loop-aes-losetup-2.28.2.ebuild 2393 BLAKE2B cb7536c3d6c5114fe346c1e37e1164595e31e8b3e6eeff751214d9739b21ed196e68838a7b82acc71ae50a1571cb249be00508f99ba631f4c641c40889fdcc41 SHA512 0fcf7848050017c32d1d570463187522f20b84a5f9fe6f534a72144e0e1039ac3ed4cbe0255637b3f2ffc2a12f9ce164b5777ff60b236cad492771178d797224
-MISC metadata.xml 245 BLAKE2B fd79e41fa297a3b58dc8ff27190cf2ab9bcc28d34e15eccaa176e2638761f6dd98499016f3eb2ade9785947c08bc881db8dd8d90bb7bd87e24661b73467d1429 SHA512 df5fe2c09cd46dcfecbdbe3712375aa0488dc79cbfc077cc3bf97376799609764e387a2cd6c2b0eaf60dc3c247aaa602c3197aedc119d29a79f99ae4c4e2bee6
+EBUILD loop-aes-losetup-2.35.2.ebuild 2178 BLAKE2B 107eeffbd0719d1d89a8ffba218ab9859c9b5ff06a9338d55a6feacd91126a3ebee2419ca781fa870db0c8cc2bd5dc5874cb55ccf6730efbdb964faa335e4922 SHA512 34cdf0cc74b9646bfc2b2d47d1c6c8f35cf051505db1fab8ed7285c86bd633189d29a255e7de1a874412045e7c9770d58fc6035bc2c0bcf079c5a1fdec72fd92
+MISC metadata.xml 444 BLAKE2B 0c31c7861ba6458dd10ef779ca1d7b5a71dceb156e762b8cbed70960766043aa206338561244da09335973f0e03f9b08e6fa5f1b61edf601033c434beb5b562c SHA512 b2f7754872e47e627cf7cefa9ccb1bfc70e7d2c9b36f5b9adbb3094e28b5945436381c9bbef60ba34188a029c3cfe8cadade00fa563e6e4f89afcc0f6516bb81
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.35.2.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.35.2.ebuild
new file mode 100644
index 000000000000..1c85353f16ee
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.35.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs flag-o-matic
+
+MY_PV="${PV/_/-}"
+MY_P="util-linux-${MY_PV}"
+LOOPAES_P="loop-AES-v3.7q"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Loop-AES losetup utility"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+	http://loop-aes.sourceforge.net/loop-AES/${LOOPAES_P}.tar.bz2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="nls selinux static"
+
+RDEPEND="selinux? ( >=sys-libs/libselinux-2.2.2-r4 )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+
+PATCHES=(
+	"${WORKDIR}/${LOOPAES_P}/util-linux-${PV}.diff"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c || die
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$( $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 || die) \
+		|| export ac_cv_func_fallocate=no
+	rm "${T}"/fallocate.${ABI}.c || die
+}
+
+src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-all-programs \
+		--disable-pylibmount \
+		--enable-libsmartcols \
+		--enable-losetup \
+		--without-ncurses \
+		--without-udev \
+		$(use_enable nls) \
+		$(use_with selinux) \
+		$(tc-has-tls || echo --disable-tls) \
+		$(use static && echo --enable-static-programs=losetup)
+}
+
+src_install() {
+	emake install DESTDIR="${T}/root"
+	newsbin "${T}/root/sbin/losetup" loop-aes-losetup
+	newman "${T}/root/usr/share/man/man8/losetup.8" loop-aes-losetup.8
+	use static && newsbin "${T}/root/bin/losetup.static" loop-aes-losetup.static
+}
diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index 52df7fac7210..41aceca13764 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">loop-aes</remote-id>
 	</upstream>
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
index 9830e30829ad..5c56672a9578 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1,4 +1,6 @@
 DIST minisign-0.8.tar.gz 14045 BLAKE2B 3c0cb0ebaeeacee5f56c788a48eef8d0a324c2db2fe8f63fc16a197870c327ed2cacc618cb6422f8d7d7ef35860b58aa0a2769c851e8af9b1a7a7cd9d2ca3a07 SHA512 79bf626d0c15e39ce3bdf53600038028c0b22904b648074bf516a9ea6962c9486c41244e80637a5fbac090cce1ed9b4b3d57b8a02632646e01b43aa413cd8bd9
+DIST minisign-0.9.tar.gz 15664 BLAKE2B f9f358a27b069e752894326932a8c5c51f308ade49ed7088a5f693b4e8327639fc5578607f348994a7ab7484091ed93190894c1965cadbbbf2a27e939ccc117b SHA512 7970f3e72ff759f3f02416de5d6035e1c8dd4e92ea718083cc5091c7e2355b59c4e178c60ca934985ba1e1afcd970967d4fb39a434ba54b140f3fc9be661253d
 EBUILD minisign-0.8.ebuild 570 BLAKE2B c8c52817c19759eac355ae3711bc181956e4ad9805a5cd2a9e62dab0755135bf7e34bcf79ee95bcb115e029be15ca2087c918f7fe7826f652207617ce16c0167 SHA512 d3bdae76c320a97fb762cd1923a70b1da8445c444e196245b5f35f3eac550ba01f1da7e8d1aa7c1625559b08bffd0e84d4bc4f1671f57459807a848b46f63f47
-EBUILD minisign-9999.ebuild 570 BLAKE2B c8c52817c19759eac355ae3711bc181956e4ad9805a5cd2a9e62dab0755135bf7e34bcf79ee95bcb115e029be15ca2087c918f7fe7826f652207617ce16c0167 SHA512 d3bdae76c320a97fb762cd1923a70b1da8445c444e196245b5f35f3eac550ba01f1da7e8d1aa7c1625559b08bffd0e84d4bc4f1671f57459807a848b46f63f47
+EBUILD minisign-0.9.ebuild 665 BLAKE2B 20395e22436151cbacb842badbf83ee829cdc278ac129b08db475cc87d35f7294097f87e4780a63a208d63b3f31edd244fb2da471d1de1dc95f744094c11f784 SHA512 b336ec7821b270de6f7b6a82d029cafde41ee685cd6a376d077e82451a6d223f0b0b5b6fbec6e994e009b8157b42d31c4ed7f0240b57a2877ffdb369742ff4a1
+EBUILD minisign-9999.ebuild 665 BLAKE2B 20395e22436151cbacb842badbf83ee829cdc278ac129b08db475cc87d35f7294097f87e4780a63a208d63b3f31edd244fb2da471d1de1dc95f744094c11f784 SHA512 b336ec7821b270de6f7b6a82d029cafde41ee685cd6a376d077e82451a6d223f0b0b5b6fbec6e994e009b8157b42d31c4ed7f0240b57a2877ffdb369742ff4a1
 MISC metadata.xml 681 BLAKE2B 590bbd6d73e1a9d5ac5e3381ffa5f29e8f8a0f329874e5372f52425a679c8966211b689a699d75cd6bc299e6d670f7724284fd87fc8f6ce0f8038133dfcc33eb SHA512 2840cf105039a5bb4a7564f4d10f759c1cf0f7f183a9684fabc2a1a158ea01a8dc7c552bad57991b30bf676c88b2b00d1f7304a2c565d388e798cf931e566242
diff --git a/app-crypt/minisign/minisign-0.9.ebuild b/app-crypt/minisign/minisign-0.9.ebuild
new file mode 100644
index 000000000000..6b1c1c8ca147
--- /dev/null
+++ b/app-crypt/minisign/minisign-0.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Dead simple tool to sign files and verify signatures"
+HOMEPAGE="https://github.com/jedisct1/minisign"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
+else
+	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+IUSE=""
+
+DEPEND=">=dev-libs/libsodium-1.0.16:=[-minimal]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DCMAKE_STRIP="${EPREFIX}/bin/true" )
+	cmake_src_configure
+}
diff --git a/app-crypt/minisign/minisign-9999.ebuild b/app-crypt/minisign/minisign-9999.ebuild
index 720809d52a49..6b1c1c8ca147 100644
--- a/app-crypt/minisign/minisign-9999.ebuild
+++ b/app-crypt/minisign/minisign-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Dead simple tool to sign files and verify signatures"
 HOMEPAGE="https://github.com/jedisct1/minisign"
@@ -23,3 +23,8 @@ IUSE=""
 
 DEPEND=">=dev-libs/libsodium-1.0.16:=[-minimal]"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DCMAKE_STRIP="${EPREFIX}/bin/true" )
+	cmake_src_configure
+}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index b73a3388a1e0..499ea2257d2c 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -23,6 +23,7 @@ DIST krb5-1.18.tar.gz 8706395 BLAKE2B d2b700c2f869733a7fc9ac735ec27e3973868efcf6
 EBUILD mit-krb5-1.17-r1.ebuild 4312 BLAKE2B 2ddf3073cc5e7c8f5e811a065a9d1ba7d55defcded9800090b32c31bc591d37d720ee1efbef20fe92605bbda2eb5ee938af6e5277bef1bdc24e498994577c19e SHA512 1818e9165f0d0f3afb60579351ff723aa9e8d6705fae6a52c921c71de3e89922c714b7e15432f98e7ffb789d79c7458599b39bf5b44dd947a813e0b566c23986
 EBUILD mit-krb5-1.17.1.ebuild 4348 BLAKE2B 21649609464816912876ee382b330fe8beb2ff6f63ce77e35bef5c983bc2e5a81eac9db78b2a0915487a735252f8a7bb98150cdd91655cfd21988b7f94836c53 SHA512 b4341d509c5b0ae46dfdc751f6494aa4ae9288bcb5fb5cb604cf16bd8940f2a1eaf831a50553d084ab7a68bc34493258c8ecde4d904555f1bcaf8b0ecc87d644
 EBUILD mit-krb5-1.18.1.ebuild 4338 BLAKE2B 22ec1538e980d8e590cfe65ec64e5350eca7c883c2e278c238e535080ae01a8246c343f899528111a92eb7733ab5d61807944ab127e62fd3b4659071e6c29fe0 SHA512 a9317837e3f5f80b3a602f6483632055b2337d6742be8fca209ea138ad9f8836168da11b2cc7de505721892c6db641067c88fc49eb4d1bd3940e474084ba1042
+EBUILD mit-krb5-1.18.2-r1.ebuild 4377 BLAKE2B 98a50e7baa8b9a3d138c62b485617e608e61d51533d375d1c3825a27223f04ad12d5149df6099304e3b3508b1e4bcc7a1a1264c2584284345a85c76fd99a0b9c SHA512 0163f930ea4eb9f91ce310331b6a50d7b2b887c7b5cc27146552e50b17292126eeaad30cd75bcb6386d3f0a713ef5dce40335d1363eaf7bdda9a991bba1b8a98
 EBUILD mit-krb5-1.18.2.ebuild 4336 BLAKE2B b6e2266ab5d4c5e3a1fadd5b13cd23a79a6c281317d1989648d16b8c505e35505f617c6e85a57a3420bd13c1cca88fda4add1b35f392560cc2d66c36c3517554 SHA512 04586cc2d4bf81d102e0308ead9141c5dab63d1973158dadf32cef17c44008beba810e6fb8305f3c21f4fe3ab3a17b4dae5a4162377fa750515b99fe8e50cb80
 EBUILD mit-krb5-1.18.ebuild 4359 BLAKE2B cca19a22d28b67765aa56c3c63e858312892d12053f114b34583b9330125f841bdccc2529276a8f45fb92bf0cf57c877a98c3bd4fa3e14b5c015f190172482d5 SHA512 7da11ab4c00e5551c17a1a442829a71a7e0ac01175255c22bcccb658564dad312a8f55dfb4900ab5c69e26bf549d4f3a7fc88ae364a1895fde5a43a8c290075c
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild
new file mode 100644
index 000000000000..354afa7b16ea
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_run.patch"
+	"${FILESDIR}/${PN}-1.18-libressl.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath \
+		\
+		AR="$(tc-getAR)"
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 3756d197201b..03911b6a239b 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,6 +1,6 @@
 AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
 AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
-DIST moolticute-0.43.3.tar.gz 5667511 BLAKE2B 7509a7e84979a4bd4d36728f67b9d4cdf5df74255f4f8091a647d2d7c9a3e6dc2ef1c72fe1cadcdab47ac99a7a682287c629e0e077c031ad27acde66c53ceb6d SHA512 4ea61da5068079e01ba6e6adacc87714f3fb28a2f231fad3359d88c8697b0a804005bf73b5ca9c3e48acb9cf72b21a3791752c8d747869b48b02c1b651a92f19
-EBUILD moolticute-0.43.3.ebuild 1234 BLAKE2B b084b0e2a94b272d775823e64336de19f8aa377c44aabe733866fa9eb80bccf8ab366a29b0c2d9bfb094ac28d3ce2fb0d0b47138eec8d2c20667ff9183a4a511 SHA512 67b55d0e56e7c96f45af9cf41487fc4aa40cdbc700e03d10a4441cee5b376df51986ecb8f6433e5c905f99eb93986692d582dab9477ff396dcacf04d50a4f30a
+DIST moolticute-0.43.19.tar.gz 5675421 BLAKE2B 8fbe68a86978970768870ac334c38b5cd532e97cb29e03975d6700a98074c51959747c35dee528275b41ef08cf42817f69337c8b93b8c2554729754d4ee818dd SHA512 fb343411854490f8e9bf937728889fc329d2f90274a34bafebacf711b02b3ff04ecad34480b786a59fda07a50f12f572b58fd2c397d46b63dc76df9228ad8711
+EBUILD moolticute-0.43.19.ebuild 1234 BLAKE2B b084b0e2a94b272d775823e64336de19f8aa377c44aabe733866fa9eb80bccf8ab366a29b0c2d9bfb094ac28d3ce2fb0d0b47138eec8d2c20667ff9183a4a511 SHA512 67b55d0e56e7c96f45af9cf41487fc4aa40cdbc700e03d10a4441cee5b376df51986ecb8f6433e5c905f99eb93986692d582dab9477ff396dcacf04d50a4f30a
 EBUILD moolticute-9999.ebuild 1234 BLAKE2B 1eb30c66363b678fe65906aeb0818dbd9a7dffe2e851d13ce62b71da58185e06be623db0ab0cc1368eea4d90ae117771b16d62f3d5f1d5edd6f183b8c7d10902 SHA512 75b781007c139ab687ee02af561afdcf890c0e6888949235d371bbc5e2017b65df275ef4f68a2bdd53a5c9baa5c79635585ad6b1bed08918f31daf8b8f342ebb
 MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
diff --git a/app-crypt/moolticute/moolticute-0.43.3.ebuild b/app-crypt/moolticute/moolticute-0.43.19.ebuild
index b4fd0cdb9d53..b4fd0cdb9d53 100644
--- a/app-crypt/moolticute/moolticute-0.43.3.ebuild
+++ b/app-crypt/moolticute/moolticute-0.43.19.ebuild
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index a3875a54ab24..a1188f2e7387 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,13 +1,6 @@
 AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f78819a16b57cde3dcb000ae7a23b592b390f53c528358818087c2c313716289b829c307f07dbee3c9580bd174cd0d SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901
-AUX pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch 1571 BLAKE2B 08d4b7b3db26112b2165511eaebb3664f692ea99d0999096c17b11164a222c072ff79aaa9d8d2bf7d6be94644fc2697bcbf114019d18a255bd573ce4375c01b9 SHA512 e5fce39467221865d5a40b54053745c4d7c63bfd07ae763f9e76779dd7e77252acf7627f5768e729e09c49762479692bc2f3e6474878765d80a1132193c87361
-AUX pinentry-1.0.0-build.patch 6634 BLAKE2B f5bd7f10e62ea603add875e14a69f30fbc6a2f8df463fa5c70531dd3f425a9219e36198380fcdd0906b670692bba49fb157807fae1c05a7be6f420b27e7426c0 SHA512 cd71552db3c4ab3bd7dd34d5009ad332e5a430ae1e909085cac6a04e63801086cac18916af65a37c110c2b667054c356f38dcc8af43468a23b1b562bf6dbafec
-AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615d4780af3361dd85907bf249891c108d51c001b44a5b55c697573c314e20fa2d8ec3df95c71b3aabfd2099e4efce4a0fdc3265fc483e785c3c23 SHA512 0b35900e4641c72c6b28b19bd252ffcabe14669e037c710a1057157fac0b65c709711a5667b66fd07afb433fc1c67509ec84eaddb822213d3ddc4ff7b549967e
+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.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.0.0-r2.ebuild 2847 BLAKE2B 8d93187c84bbc2ad6d5e0c26dde48d53473a17f3aacc0e7e7d500518daf30a2eb6195ff712dda8e59185201d98187852364e22fdba35afbddbd711c5cd597c61 SHA512 036c3a1cf4e526ee1934563472f7dd52776e346f9732627af02392b64e6cbd3832afcba5dc49ad8122084f3c7598c210720f8224b95e0fb8be908db02cc4fc0b
-EBUILD pinentry-1.0.0-r3.ebuild 2918 BLAKE2B c565bd9e341bd92ef915ba37820215659b04026a019a8bf035a21880611bea2844c543d3a7ccf39195eddd43f3bb610efe6e7da00eecf8d9da2e9a6950139f5b SHA512 c6ba7579ab5a52b4490d343f971224a3a21f5c0e2d930138c4fc722f26e673be25699c384152d34e38c8fa2eee7a711f131d04767da3e2375cebc6e2bead9fa7
-EBUILD pinentry-1.1.0-r1.ebuild 2769 BLAKE2B 6c82a5f1cf18bf438acdfa972d74231b890e03d6a4d561d6cc4e1b157157805da3ed1d44ef636fd8d9f8e6080e8923798257bf6881e46f4d986b08ed20216806 SHA512 4f8162867d7af98f586a65a12871e136c211dafe4edf4d46121282120f371180b684b828e0c593b7d3f0001fd723eb8c068dba3c68638f0efa49ea4b55cec7ab
-EBUILD pinentry-1.1.0-r2.ebuild 2827 BLAKE2B eb7650162db93d6fe5d98e0935d71237092395ef4610d3f879dd756791b7894c8d331f5eec642264bc0e075237024da189eff471c393819458b58bb3be19e092 SHA512 cb3ada0c71c47d4628662a94401a8e3ccc9ea3416b9dde2b61f8ee1c99a244ee8f4d8c5c7088baeb6aab6de47aea36fd366dc93efc5bb29cbf0dcb1b2ab7aa26
-EBUILD pinentry-1.1.0-r3.ebuild 3087 BLAKE2B 44d32fa76bd750fd7da7fab10d765c5f3cacf681152bffdb64b312eed6363aec3ac5a22d415d1173925aa3ad2f5f4ff1b5310f80ea7c2f447a913b12449de95d SHA512 fd784da8b021c8d9405422be5f4afd831a4a870729b51dfb3356b9e7db6d6ced9d1b5b8b1888be7abb81fe199603918038bd208aa9d3a54ba1450ab196099758
+EBUILD pinentry-1.1.0-r3.ebuild 3119 BLAKE2B 414196c2ae4e3bac606fc1916d3d36c9c50a42b531f223ae36bec3395a111375133779459adec1100917c694cd5419a10ad06d76330b3dde74d53df6dc3b241c SHA512 afc0c83658684254122d6f0bf6278d1d500ba3e9d965662db00d9b20b5999930a54b192a983986be61cf532f14c26baace400dc49da48d3e374b7f809d3771a7
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch b/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch
new file mode 100644
index 000000000000..82af67f694ae
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/718028
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,7 @@ AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
++AM_PROG_AR
+ AC_PROG_RANLIB
+ # We need to check for cplusplus here because we may not do the test
+ # for Qt and autoconf does does not allow that.
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch b/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch
deleted file mode 100644
index 7724d1beae8c..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1590b664d88be8386a4664c2994b685187d1eb25 Mon Sep 17 00:00:00 2001
-From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
-Date: Thu, 3 Aug 2017 22:56:49 +0200
-Subject: [PATCH 1/6] gtk: Disable tooltips in keyboard-grabbing mode.
-
-* gtk+-2:/pinentry-gtk-2.c (show_hide_button): Do not show the
-tooltip if we attempt to grab the keyboard.
-(create_window): Likewise.
---
-
-For unclear reasons, those tooltips may interfere with grabbing
-under some tiling window managers.
-
-GnuPG-bug-id: 3297
-Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
----
- gtk+-2/pinentry-gtk-2.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
-index d467ec5..f17a702 100644
---- a/gtk+-2/pinentry-gtk-2.c
-+++ b/gtk+-2/pinentry-gtk-2.c
-@@ -516,7 +516,10 @@ show_hide_button_toggled (GtkWidget *widget, gpointer data)
-     }
- 
-   gtk_label_set_markup (GTK_LABEL(label), text);
--  gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip);
-+  if (!pinentry->grab)
-+    {
-+      gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip);
-+    }
-   g_free (tooltip);
- }
- 
-@@ -736,7 +739,7 @@ create_window (pinentry_t ctx)
- 	  gtk_progress_bar_set_text (GTK_PROGRESS_BAR (qualitybar),
- 				     QUALITYBAR_EMPTY_TEXT);
- 	  gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (qualitybar), 0.0);
--          if (pinentry->quality_bar_tt)
-+          if (pinentry->quality_bar_tt && !pinentry->grab)
- 	    {
- #if !GTK_CHECK_VERSION (2, 12, 0)
- 	      gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), qualitybar,
--- 
-2.13.6
-
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-build.patch b/app-crypt/pinentry/files/pinentry-1.0.0-build.patch
deleted file mode 100644
index e367b8566450..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.0.0-build.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From c5c7bee68730c9f66a27f9bb0d023480623a2bfb Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Thu, 1 Dec 2016 09:10:08 +0100
-Subject: [PATCH] Fix linkage problem in tty and emacs pinentries.
-
-* emacs/pinentry-emacs.c (curses_cmd_handler): Remove var.
-* tty/pinentry-tty.c (curses_cmd_handler): Remove var.
-* pinentry/pinentry.c (flavor_flag): New local var.
-(pinentry_set_flavor_flag): New function.
-(cmd_getinfo): Use FLAVOR_FLAG for the "flavor" sub-command.
-* gnome3/pinentry-gnome3.c (main): Call pinentry_set_flavor_flag.
-* gtk+-2/pinentry-gtk-2.c (main): Ditto.
-* pinentry/pinentry-emacs.c (initial_emacs_cmd_handler): Ditto.
-* qt/main.cpp (main): Ditto.
---
-
-Fixes-commit: e4e3a9cc88704dcffac660d0b92fd1ed8abecc11
-Fixes-commit: d126036671e7dd631babc118cb4113f723f15748
-Signed-off-by: Werner Koch <wk@gnupg.org>
----
- emacs/pinentry-emacs.c    |  4 ----
- gnome3/pinentry-gnome3.c  |  3 +++
- gtk+-2/pinentry-gtk-2.c   | 10 ++++++++--
- pinentry/pinentry-emacs.c |  5 ++++-
- pinentry/pinentry.c       | 34 ++++++++++++++++++----------------
- pinentry/pinentry.h       |  4 ++++
- qt/main.cpp               |  1 +
- tty/pinentry-tty.c        |  3 ---
- 8 files changed, 38 insertions(+), 26 deletions(-)
-
-diff --git a/emacs/pinentry-emacs.c b/emacs/pinentry-emacs.c
-index b6b3eb8..3c39a96 100644
---- a/emacs/pinentry-emacs.c
-+++ b/emacs/pinentry-emacs.c
-@@ -29,10 +29,6 @@
- 
- pinentry_cmd_handler_t pinentry_cmd_handler = emacs_cmd_handler;
- 
--/* needed to link cleanly; should never be used except for comparison
-- * in pinentry/pinentry.c's cmd_getinfo(): */
--pinentry_cmd_handler_t curses_cmd_handler = NULL;
--
- 
- 
- int
-diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
-index a040f9b..d5a49d6 100644
---- a/gnome3/pinentry-gnome3.c
-+++ b/gnome3/pinentry-gnome3.c
-@@ -517,18 +517,21 @@ main (int argc, char *argv[])
-       fprintf (stderr, "No $DBUS_SESSION_BUS_ADDRESS found,"
-                " falling back to curses\n");
-       pinentry_cmd_handler = curses_cmd_handler;
-+      pinentry_set_flavor_flag ("curses");
-     }
-   else if (!pe_gcr_system_prompt_available ())
-     {
-       fprintf (stderr, "No Gcr System Prompter available,"
-                " falling back to curses\n");
-       pinentry_cmd_handler = curses_cmd_handler;
-+      pinentry_set_flavor_flag ("curses");
-     }
-   else if (pe_gnome_screen_locked ())
-     {
-       fprintf (stderr, "GNOME screensaver is locked,"
-                " falling back to curses\n");
-       pinentry_cmd_handler = curses_cmd_handler;
-+      pinentry_set_flavor_flag ("curses");
-     }
- #endif
- 
-diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
-index 6037533..473c4aa 100644
---- a/gtk+-2/pinentry-gtk-2.c
-+++ b/gtk+-2/pinentry-gtk-2.c
-@@ -938,10 +938,16 @@ main (int argc, char *argv[])
-   if (pinentry_have_display (argc, argv))
-     {
-       if (! gtk_init_check (&argc, &argv))
--	pinentry_cmd_handler = curses_cmd_handler;
-+        {
-+          pinentry_cmd_handler = curses_cmd_handler;
-+          pinentry_set_flavor_flag ("curses");
-+        }
-     }
-   else
--    pinentry_cmd_handler = curses_cmd_handler;
-+    {
-+      pinentry_cmd_handler = curses_cmd_handler;
-+      pinentry_set_flavor_flag ("curses");
-+    }
- #else
-   gtk_init (&argc, &argv);
- #endif
-diff --git a/pinentry/pinentry-emacs.c b/pinentry/pinentry-emacs.c
-index df12f1b..50ba406 100644
---- a/pinentry/pinentry-emacs.c
-+++ b/pinentry/pinentry-emacs.c
-@@ -644,7 +644,10 @@ initial_emacs_cmd_handler (pinentry_t pe)
-   if (emacs_socket < 0)
-     pinentry_cmd_handler = fallback_cmd_handler;
-   else
--    pinentry_cmd_handler = emacs_cmd_handler;
-+    {
-+      pinentry_cmd_handler = emacs_cmd_handler;
-+      pinentry_set_flavor_flag ("emacs");
-+    }
- 
-   return (* pinentry_cmd_handler) (pe);
- }
-diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
-index 322a651..a198fb3 100644
---- a/pinentry/pinentry.c
-+++ b/pinentry/pinentry.c
-@@ -67,6 +67,10 @@ static char this_pgmname[50];
- 
- struct pinentry pinentry;
- 
-+
-+static const char *flavor_flag;
-+
-+
- static void
- pinentry_reset (int use_defaults)
- {
-@@ -793,6 +797,16 @@ pinentry_parse_opts (int argc, char *argv[])
-     }
- }
- 
-+
-+/* Set the optional flag used with getinfo. */
-+void
-+pinentry_set_flavor_flag (const char *string)
-+{
-+  flavor_flag = string;
-+}
-+
-+
-+
- 
- static gpg_error_t
- option_handler (assuan_context_t ctx, const char *key, const char *value)
-@@ -1444,27 +1458,15 @@ cmd_getinfo (assuan_context_t ctx, char *line)
-     }
-   else if (!strcmp (line, "flavor"))
-     {
--      const char *flags;
--
-       if (!strncmp (this_pgmname, "pinentry-", 9) && this_pgmname[9])
-         s = this_pgmname + 9;
-       else
-         s = this_pgmname;
- 
--      if (0)
--        ;
--#ifdef INSIDE_EMACS
--      else if (pinentry_cmd_handler == emacs_cmd_handler)
--        flags = ":emacs";
--#endif
--#ifdef FALLBACK_CURSES
--      else if (pinentry_cmd_handler == curses_cmd_handler)
--        flags = ":curses";
--#endif
--      else
--        flags = "";
--
--      snprintf (buffer, sizeof buffer, "%s%s", s, flags);
-+      snprintf (buffer, sizeof buffer, "%s%s%s",
-+                s,
-+                flavor_flag? ":":"",
-+                flavor_flag? flavor_flag : "");
-       buffer[sizeof buffer -1] = 0;
-       rc = assuan_send_data (ctx, buffer, strlen (buffer));
-     }
-diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h
-index 01fb373..45d35ad 100644
---- a/pinentry/pinentry.h
-+++ b/pinentry/pinentry.h
-@@ -275,6 +275,10 @@ int pinentry_have_display (int argc, char **argv);
-    or version output is requested.  */
- void pinentry_parse_opts (int argc, char *argv[]);
- 
-+/* Set the optional flag used with getinfo. */
-+void pinentry_set_flavor_flag (const char *string);
-+
-+
- 
- /* The caller must define this variable to process assuan commands.  */
- extern pinentry_cmd_handler_t pinentry_cmd_handler;
-diff --git a/qt/main.cpp b/qt/main.cpp
-index 8284960..225c06b 100644
---- a/qt/main.cpp
-+++ b/qt/main.cpp
-@@ -308,6 +308,7 @@ main(int argc, char *argv[])
- #ifdef FALLBACK_CURSES
-     if (!pinentry_have_display(argc, argv)) {
-         pinentry_cmd_handler = curses_cmd_handler;
-+        pinentry_set_flavor_flag ("curses");
-     } else
- #endif
-     {
-diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c
-index 3d6cd5a..a509d79 100644
---- a/tty/pinentry-tty.c
-+++ b/tty/pinentry-tty.c
-@@ -556,9 +556,6 @@ tty_cmd_handler(pinentry_t pinentry)
- 
- pinentry_cmd_handler_t pinentry_cmd_handler = tty_cmd_handler;
- 
--/* needed to link cleanly; should never be used except for comparison
-- * in pinentry/pinentry.c's cmd_getinfo(): */
--pinentry_cmd_handler_t curses_cmd_handler = NULL;
- 
- 
- int
--- 
-2.8.0.rc3
-
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch b/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch
deleted file mode 100644
index f7476de1ff67..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b0e0bdeac5d40ca645afc9017778b39a26303523 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Wed, 11 Jan 2017 18:40:17 +0100
-Subject: [PATCH 01/25] gtk2: Fix a problem with fvwm
-
-* gtk+-2/pinentry-gtk-2.c (grab_pointer): Take care of
-GDK_GRAB_ALREADY_GRABBED.
---
-
-Debian-bug-id: 850708
-Co-authored-by: Vincent Lefevre <vincent@vinc17.net>
-Signed-off-by: Werner Koch <wk@gnupg.org>
----
- gtk+-2/pinentry-gtk-2.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
-index 473c4aa..e37601f 100644
---- a/gtk+-2/pinentry-gtk-2.c
-+++ b/gtk+-2/pinentry-gtk-2.c
-@@ -203,7 +203,12 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data)
-   (void)data;
- 
-   /* Change the cursor for the duration of the grab to indicate that
--     something is going on.  */
-+   * something is going on.  The fvwm window manager grabs the pointer
-+   * for a short time and thus we may end up with the already grabbed
-+   * error code.  Actually this error code should be used to detect a
-+   * malicious grabbing application but with fvwm this renders
-+   * Pinentry only unusable.  Thus we try again several times also for
-+   * that error code.  See Debian bug 850708 for details.  */
-   /* XXX: It would be nice to have a key cursor, unfortunately there
-      is none readily available.  */
-   cursor = gdk_cursor_new_for_display (gtk_widget_get_display (win),
-@@ -215,7 +220,8 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data)
-                             NULL /* confine to */,
-                             cursor,
-                             gdk_event_get_time (event));
--  while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE);
-+  while (tries++ < max_tries && (err == GDK_GRAB_NOT_VIEWABLE
-+                                 || err == GDK_GRAB_ALREADY_GRABBED));
- 
-   if (err)
-     {
--- 
-2.13.6
-
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
deleted file mode 100644
index a27f7a37b90c..000000000000
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
-
-CDEPEND="
-	app-eselect/eselect-pinentry
-	>=dev-libs/libassuan-2.1
-	>=dev-libs/libgcrypt-1.6.3
-	>=dev-libs/libgpg-error-1.17
-	caps? ( sys-libs/libcap )
-	gnome-keyring? ( app-crypt/libsecret )
-	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	gnome-keyring? ( app-crypt/gcr )
-"
-
-REQUIRED_USE="
-	gtk? ( !static )
-	qt5? ( !static )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch"
-	"${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
-	export QTLIB="$(qt5_get_libdir)"
-
-	econf \
-		--enable-pinentry-tty \
-		$(use_with caps libcap) \
-		$(use_enable emacs pinentry-emacs) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gnome-keyring pinentry-gnome3) \
-		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_enable qt5 pinentry-qt) \
-		MOC="$(qt5_get_bindir)"/moc
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/bin/pinentry || die
-
-	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
-}
-
-pkg_postinst() {
-	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
-		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
-		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
-		elog "The soft resource limit for memory locking specifies the limit an"
-		elog "unprivileged process may lock into memory. You can also use POSIX"
-		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
-		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
-		elog "your users."
-	fi
-
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
deleted file mode 100644
index f58c3ec17977..000000000000
--- a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
-
-CDEPEND="
-	app-eselect/eselect-pinentry
-	>=dev-libs/libassuan-2.1
-	>=dev-libs/libgcrypt-1.6.3
-	>=dev-libs/libgpg-error-1.17
-	caps? ( sys-libs/libcap )
-	gnome-keyring? ( app-crypt/libsecret )
-	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	gnome-keyring? ( app-crypt/gcr )
-"
-
-REQUIRED_USE="
-	gtk? ( !static )
-	qt5? ( !static )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch"
-	"${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch"
-	"${FILESDIR}/${P}-make-icon-work-under-Plasma-Wayland.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
-	export QTLIB="$(qt5_get_libdir)"
-
-	econf \
-		--enable-pinentry-tty \
-		$(use_with caps libcap) \
-		$(use_enable emacs pinentry-emacs) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gnome-keyring pinentry-gnome3) \
-		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_enable qt5 pinentry-qt) \
-		MOC="$(qt5_get_bindir)"/moc
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/bin/pinentry || die
-
-	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
-}
-
-pkg_postinst() {
-	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
-		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
-		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
-		elog "The soft resource limit for memory locking specifies the limit an"
-		elog "unprivileged process may lock into memory. You can also use POSIX"
-		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
-		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
-		elog "your users."
-	fi
-
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
deleted file mode 100644
index eafaf2f416e5..000000000000
--- a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
-
-CDEPEND="
-	app-eselect/eselect-pinentry
-	>=dev-libs/libassuan-2.1
-	>=dev-libs/libgcrypt-1.6.3
-	>=dev-libs/libgpg-error-1.17
-	caps? ( sys-libs/libcap )
-	gnome-keyring? ( app-crypt/libsecret )
-	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	gnome-keyring? ( app-crypt/gcr )
-"
-
-REQUIRED_USE="
-	gtk? ( !static )
-	qt5? ( !static )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
-	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
-	export QTLIB="$(qt5_get_libdir)"
-
-	econf \
-		--enable-pinentry-tty \
-		$(use_with caps libcap) \
-		$(use_enable emacs pinentry-emacs) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gnome-keyring pinentry-gnome3) \
-		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_enable qt5 pinentry-qt) \
-		MOC="$(qt5_get_bindir)"/moc
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/bin/pinentry || die
-
-	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
-}
-
-pkg_postinst() {
-	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
-		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
-		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
-		elog "The soft resource limit for memory locking specifies the limit an"
-		elog "unprivileged process may lock into memory. You can also use POSIX"
-		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
-		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
-		elog "your users."
-	fi
-
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
deleted file mode 100644
index b8cada19a72e..000000000000
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
-
-CDEPEND="
-	app-eselect/eselect-pinentry
-	>=dev-libs/libassuan-2.1
-	>=dev-libs/libgcrypt-1.6.3
-	>=dev-libs/libgpg-error-1.17
-	caps? ( sys-libs/libcap )
-	fltk? ( x11-libs/fltk )
-	gnome-keyring? ( app-crypt/libsecret )
-	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	gnome-keyring? ( app-crypt/gcr )
-"
-
-REQUIRED_USE="
-	gtk? ( !static )
-	qt5? ( !static )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
-	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
-	export QTLIB="$(qt5_get_libdir)"
-
-	econf \
-		--enable-pinentry-tty \
-		$(use_with caps libcap) \
-		$(use_enable emacs pinentry-emacs) \
-		$(use_enable fltk pinentry-fltk) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gnome-keyring pinentry-gnome3) \
-		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_enable qt5 pinentry-qt) \
-		MOC="$(qt5_get_bindir)"/moc
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/bin/pinentry || die
-
-	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
-}
-
-pkg_postinst() {
-	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
-		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
-		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
-		elog "The soft resource limit for memory locking specifies the limit an"
-		elog "unprivileged process may lock into memory. You can also use POSIX"
-		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
-		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
-		elog "your users."
-	fi
-
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index 0ff90bda9f48..053f01d8ca6f 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -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 ~ppc-aix ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 DEPEND="
@@ -49,6 +49,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
 	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	"${FILESDIR}/${PN}-1.0.0-AR.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/stoken/Manifest b/app-crypt/stoken/Manifest
index 8af76717363f..1155c1bd6637 100644
--- a/app-crypt/stoken/Manifest
+++ b/app-crypt/stoken/Manifest
@@ -1,3 +1,3 @@
 DIST stoken-0.92.tar.gz 117212 BLAKE2B 8d236a73b0626ab91d145d01fa07c28ba8c54a3053aaba32b64b4dacc39dc8265d5740630ec2495d678c975b1bfa480a79a5ec1115accf39170229b444673f48 SHA512 b41262320c24e487ece884fc431d835c787f057947a92e3d57ed2047bc02b576b072e8a69f4b58b47ab1f913b5ae8c3ee8108d3b55c1477f15848420b668fea3
-EBUILD stoken-0.92.ebuild 634 BLAKE2B beb51228bcf4b262ec2e2173e430e6886dbc50607d031a11b7b508da8f599046554d33f032b5f04dd2e15cd6c0cf0ceb00019fbe23362ce4c45e6d6b4469c1c0 SHA512 0eb9a2d3b7947f586bcc96a306005a102595f4e7456d17f1e8e3a5cf451a8c0ffd31d535f774d0d97f50c4a2c51da5c0c657ae6f9b104d1dbcfb95c4b2d330e3
+EBUILD stoken-0.92-r1.ebuild 669 BLAKE2B 397a158f8f39cdd17619c2c431360ff44780b1a65b68737f526841eb106efff05796426034dbfe3d0d3982abeb94656d2c37cb590bbc58a1b85c70ec0828b5f2 SHA512 d10631b3f714fa1fc8fc2e4820ce6b4b8e11f6ffb214fa99214e84c74e47a38e872d03c5886aa8769e4ba396fcb79a85c8d24061f613914f4a88d12e95953eda
 MISC metadata.xml 620 BLAKE2B 2655c4310ae4cc76e7609e4646879d81ef6ee26b9dff67b922822c89de19416c96bd63762920633ff4e018c8431fbb45f8dc93971f2fb8afbe1dd66c8ea2e318 SHA512 bda231308c073a40db47dfaca96c6af8bf194d5ef4727e8c8c99ad1492150f79a9978daeb3ffe503db03501a0a6c6c465d036bec7ad58398319f8d01d27f7931
diff --git a/app-crypt/stoken/stoken-0.92.ebuild b/app-crypt/stoken/stoken-0.92-r1.ebuild
index 5774eec2cf50..d535f81ddc4e 100644
--- a/app-crypt/stoken/stoken-0.92.ebuild
+++ b/app-crypt/stoken/stoken-0.92-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="gtk"
+IUSE="gtk static"
 
 #	|| ( dev-libs/nettle dev-libs/libtomcrypt )    libtomcrypt is not packaged
 RDEPEND="
@@ -26,5 +26,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with gtk)
+	econf $(use_with gtk) --enable-static=$(usex static)
 }
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 4a9eb254f8ec..3b0e2fbe7380 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,5 +1,3 @@
-DIST yubikey-manager-qt-1.1.3.tar.gz 13316325 BLAKE2B 765634b05fff9efdd5ec5e91e0a5de7f04144476b83f7b3ba8a0c8a1bc95ca7132f25e193afca2bec17fe377c683063a14657efc24fb047a64a8f4498c7abaed SHA512 84bcca3f74967ba8aa470b8dd6c8699ff6a93a85ce942934a1d0cd674a4c507ba297d9a5ebb40bae3476ea713965a7bb3816dad1110a045c338f070eb249f02b
 DIST yubikey-manager-qt-1.1.4.tar.gz 13318769 BLAKE2B 4ca85d8f9681f725cf9f8d547d850516c77a618c595814c8add12250677e495952229c966a2e59d449dfa33ac9c6788f6daa8494702137eab937b299f896e8dd SHA512 9e3e85a22d7be4e6ab30b3fd068fcc3406348d2b38f96e1ef8d693bf37edafaf8f16dc408cc9319173e871cc24d2cc4db5853ec3f8a0365221722504dc6fde04
-EBUILD yubikey-manager-qt-1.1.3-r1.ebuild 1470 BLAKE2B 4a6e9ba2ed294b1ff49808fa17d6b9e06cc3be46033365a611844369f1cc571b8de1a51ce0e6199038c4628cbabef2648713a189d087a423eab2ce9933a1deec SHA512 36b25fb8a6ccca5348b4cc8627066621bff2dab4ae8f508d8d9d43dbebf48a412ca38146c6e66b29658f7cff542813ad76cef1f9d2db7ba6aba1d2c0e7527014
 EBUILD yubikey-manager-qt-1.1.4-r2.ebuild 1484 BLAKE2B a6c7f1164f1c5b625620c0f129a29d78ef2326a92145edb300c6f5495b7d1edd09659c227f841fdc4fee1a8c3cb7e6d72d40b4bf5b751b5cea44735cd11b8208 SHA512 b8f5929a0fd399c67ed3fcea6a69b47444f4676a63f27c610122d26dd831db70499f5e15aa9da41ba59bbb532ce93d048443bef4e6bbeb531bf3e47f88d488a7
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
deleted file mode 100644
index 6fb3d2e0e306..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils qmake-utils python-single-r1
-
-DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=app-crypt/yubikey-manager-1.0.0[${PYTHON_MULTI_USEDEP}]
-		<app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-	doicon -s scalable resources/icons/ykman.svg
-
-	einstalldocs
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /app-crypt
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)