From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 23 Mar 2018 04:19:44 +0000
Subject: gentoo resync : 23.03.2018

---
 app-crypt/Manifest.gz                              | Bin 23643 -> 23492 bytes
 app-crypt/WiRouterKeyRec/Manifest                  |   2 +-
 .../WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild     |   6 +-
 app-crypt/acme/Manifest                            |   2 +
 app-crypt/acme/acme-0.22.2.ebuild                  |  47 ++++++
 app-crypt/argon2/Manifest                          |   2 +-
 app-crypt/argon2/argon2-20171227.ebuild            |   2 +-
 app-crypt/certbot-apache/Manifest                  |   2 +
 .../certbot-apache/certbot-apache-0.22.2.ebuild    |  38 +++++
 app-crypt/certbot-nginx/Manifest                   |   2 +
 .../certbot-nginx/certbot-nginx-0.22.2.ebuild      |  34 +++++
 app-crypt/certbot/Manifest                         |   2 +
 app-crypt/certbot/certbot-0.22.2.ebuild            |  53 +++++++
 app-crypt/ekeyd/Manifest                           |   3 +-
 app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild              | 164 +++++++++++++++++++++
 app-crypt/ekeyd/files/ekeyd.service                |   2 +
 app-crypt/gnupg/Manifest                           |   4 +-
 app-crypt/gnupg/gnupg-2.2.4-r2.ebuild              |   2 +-
 app-crypt/gnupg/gnupg-2.2.5-r1.ebuild              | 131 ++++++++++++++++
 app-crypt/gnupg/gnupg-2.2.5.ebuild                 | 130 ----------------
 app-crypt/monkeysign/Manifest                      |   5 -
 .../monkeysign/files/monkeysign-1.1-basename.patch |  12 --
 app-crypt/monkeysign/files/monkeysign.desktop      |   9 --
 app-crypt/monkeysign/metadata.xml                  |   8 -
 app-crypt/monkeysign/monkeysign-2.2.3.ebuild       |  57 -------
 app-crypt/pinentry/Manifest                        |   2 +
 ...1.0.0-make-icon-work-under-Plasma-Wayland.patch |  52 +++++++
 app-crypt/pinentry/pinentry-1.0.0-r3.ebuild        | 103 +++++++++++++
 app-crypt/qca/Manifest                             |   1 +
 app-crypt/qca/qca-2.1.3-r2.ebuild                  |  93 ++++++++++++
 app-crypt/rhash/Manifest                           |   4 +
 app-crypt/rhash/files/rhash-1.3.6-no_echon.patch   |  54 +++++++
 app-crypt/rhash/files/unquote-cc.patch             |  26 ++++
 app-crypt/rhash/rhash-1.3.6-r1.ebuild              |  73 +++++++++
 34 files changed, 896 insertions(+), 231 deletions(-)
 create mode 100644 app-crypt/acme/acme-0.22.2.ebuild
 create mode 100644 app-crypt/certbot-apache/certbot-apache-0.22.2.ebuild
 create mode 100644 app-crypt/certbot-nginx/certbot-nginx-0.22.2.ebuild
 create mode 100644 app-crypt/certbot/certbot-0.22.2.ebuild
 create mode 100644 app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
 create mode 100644 app-crypt/gnupg/gnupg-2.2.5-r1.ebuild
 delete mode 100644 app-crypt/gnupg/gnupg-2.2.5.ebuild
 delete mode 100644 app-crypt/monkeysign/Manifest
 delete mode 100644 app-crypt/monkeysign/files/monkeysign-1.1-basename.patch
 delete mode 100644 app-crypt/monkeysign/files/monkeysign.desktop
 delete mode 100644 app-crypt/monkeysign/metadata.xml
 delete mode 100644 app-crypt/monkeysign/monkeysign-2.2.3.ebuild
 create mode 100644 app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch
 create mode 100644 app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
 create mode 100644 app-crypt/qca/qca-2.1.3-r2.ebuild
 create mode 100644 app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
 create mode 100644 app-crypt/rhash/files/unquote-cc.patch
 create mode 100644 app-crypt/rhash/rhash-1.3.6-r1.ebuild

(limited to 'app-crypt')

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 13cfc83db928..a1ce2f3ede73 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/WiRouterKeyRec/Manifest b/app-crypt/WiRouterKeyRec/Manifest
index 1fd0d92cfb76..16a4a17f2154 100644
--- a/app-crypt/WiRouterKeyRec/Manifest
+++ b/app-crypt/WiRouterKeyRec/Manifest
@@ -1,3 +1,3 @@
 DIST WiRouterKeyRec-1.1.2.zip 117262 BLAKE2B fe140bf19d7a1af1c8c6e04725f3d3e67c30b3f108d64f1fe706b1e28e8767d08219e30b78e67b33553a00dea03ca344acf43c8b75f3c5f7633980e08d095f2b SHA512 a3c449497e3f3fed88dfbb35a90a2cfa5937efa02393e825ec51ab390b7094ce619d3238a916afd2b48e35e0e261b454f7d7005af46d6a45d77b2e1d4faaac51
-EBUILD WiRouterKeyRec-1.1.2.ebuild 756 BLAKE2B 261552fa23ccc676909cf7607744a60456b3763d4754d440d2ffe1e6b44eee4553b251135b6030e4d4e8e884ce32d28b537d666e44ab95a8c3049f5cdcd15520 SHA512 272cd360a50a78096a67bf76087c2685ac5a604f69cccc1cb7e10080467d318d2f39cf9208bfd42267367d1e57b4913ad28e70c77d55177ee13e1ce684c658ee
+EBUILD WiRouterKeyRec-1.1.2.ebuild 758 BLAKE2B abd31022e3b03d9fc6bc29110b59978d0b3b86b068c3225652df98fa7792047375047f21d2cf3075ae20c3f00259561b884fdea3f34697bd26bee97b5fd61249 SHA512 8dd77dbeab105218d10f5ce0a28f79c57c548625816ed6aea04a5c6dca10712dcf156c2c45d6f485dc86ea56ffeb803468d73e0b78b37519e26a4ed5330a2631
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
index d9c19ac4b9d2..7167e5643698 100644
--- a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
+++ b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,8 +9,8 @@ MY_PN="WiRouter_KeyRec"
 MY_P="${MY_PN}_${PV}"
 
 DESCRIPTION="Recovery tool for wpa passphrase"
-HOMEPAGE="http://www.salvatorefresta.net"
-SRC_URI="http://tools.salvatorefresta.net/${MY_P}.zip -> ${P}.zip"
+HOMEPAGE="https://www.salvatorefresta.net"
+SRC_URI="https://tools.salvatorefresta.net/${MY_P}.zip -> ${P}.zip"
 
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 8da46cc81bf7..3f119e38047e 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -2,8 +2,10 @@ AUX 0.22.0-fix-client.patch 2178 BLAKE2B 5befa9f229c118fdd19758b7f3da05570ed685f
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605
+DIST certbot-0.22.2.tar.gz 1128517 BLAKE2B 0b95ee9ab6b69b5d511b737d1cfc1eff543f1f0abeba9e60429dfe2dc389b39e19df10c77ea7c90ad8795640ae7602a7bc239c57cd1734863bf19d1f0c5eab67 SHA512 ca26be78d29728fc5c20a5290f2dde4d1f2090b7e2829c0b312acac4741ef56440cc21a9db77e3e0cfe59ce0f1f0ab2165cb6823af8a4e2a4528060ad683ffe9
 EBUILD acme-0.20.0.ebuild 1196 BLAKE2B 6f3277f312a2d4178feb12874a72cf00c29f78bbf5a664cf3e3c6900a8945e871aba74cb291bc81ae4412c4fa2ccccf1b06d3241f6a8562d8b5afd042af7a39d SHA512 1ca1a31c541cbf073141b5b4afd0eb0080eb5543c96570497fd107832a72e8716d136f51eed1fe9021c228858ba6b1abf67ef2f268004cd3279ec9b402e64f99
 EBUILD acme-0.21.1.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
 EBUILD acme-0.22.0-r1.ebuild 1256 BLAKE2B 7527d7a2fb97118aaebc16e2a83bc7b2232e9d9db1fe205d6657f2c458b637f367aaa403f948270dfd5fa9c57912ac08649421c4fa455941e7d0d316c990a06b SHA512 165a936127bb921f6dbf5f971cfd454e90bb36ca8a82b43ffebafa9e49c3462f10355749cd5264e1ebdef88d60a91ca379ea2bd8f6beefb274a899cb5ce5912f
+EBUILD acme-0.22.2.ebuild 1205 BLAKE2B 59bf7d798bdd550ae5981ed9bb9df3d4c8d64e93a4b7157a170cfff19f95ae8d98d257f664cb043bb9ea26e508e0831d3bbb3ad52050917fc91e356af7b2879e SHA512 eb44ba59c75ea4068fdde0ba3944a5c3b906fc225713da4dc96ae3b74167242ac974d3f753df2adef9c11e8ce99ac4837ae6fd469fb57d7152c8fe4fb5b9a964
 EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.22.2.ebuild b/app-crypt/acme/acme-0.22.2.ebuild
new file mode 100644
index 000000000000..610350856377
--- /dev/null
+++ b/app-crypt/acme/acme-0.22.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 1e20d0a974db..a32f455556de 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -2,5 +2,5 @@ AUX argon2-20161029-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839
 DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
 EBUILD argon2-20161029-r1.ebuild 1059 BLAKE2B 5af6cfcc657b155477979103e641b1449c3c95430aed7594d5a7678b6c1622672e4b8581b6465721a8645065dd3bbf8c9be9bcd6d58f8f44c8844c9a4de09992 SHA512 bf74945ccbea5cd3017a91502a4ce67c5b39b02df1882b175c9d3c857b70914f3f91d41b10c7c46fc82ee4ab8e03b4b0b291e9f16a3a41f8f54f28216533ffec
-EBUILD argon2-20171227.ebuild 869 BLAKE2B 54a9530e4dcc946160b058c6252cdd9f4ab6b1ed321b817e08d8fd93fe0729f66269d4acecc153dd2735159630881a1ee05cba59853097c5cca070936a3db5d9 SHA512 4595e3d98fcfe017c655de638496df4cee7b9b44805a653f23d40b33a2fc54a8363e699298004be52b8163e126832055f14f85613e67e8f19a5eafa2c97af912
+EBUILD argon2-20171227.ebuild 870 BLAKE2B 0e6bb20eabc41ff739bf3d391a2166e768fe3d5153a24f9d8a2bc2d324f140da294b5a08befd06cbfab7147b264a4a6206122eba39d4c067bd0d279e1484e458 SHA512 8f1b1188e72c257b545a76b6a5497c93cb7eba9e4a2afd3ab5e1822b67027fbff98ae983b5fcdbb0a964960132d21a24529487296b4e134a9b8d7c9797ca895e
 MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20171227.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
index 053764e3b4b3..cba8e3f4d236 100644
--- a/app-crypt/argon2/argon2-20171227.ebuild
+++ b/app-crypt/argon2/argon2-20171227.ebuild
@@ -23,5 +23,5 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" LIBRARY_REL="$(get_libdir)" install || die
+	emake DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install || die
 }
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 6004ab1730e6..8fc4fdf35107 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,10 @@
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605
+DIST certbot-0.22.2.tar.gz 1128517 BLAKE2B 0b95ee9ab6b69b5d511b737d1cfc1eff543f1f0abeba9e60429dfe2dc389b39e19df10c77ea7c90ad8795640ae7602a7bc239c57cd1734863bf19d1f0c5eab67 SHA512 ca26be78d29728fc5c20a5290f2dde4d1f2090b7e2829c0b312acac4741ef56440cc21a9db77e3e0cfe59ce0f1f0ab2165cb6823af8a4e2a4528060ad683ffe9
 EBUILD certbot-apache-0.20.0.ebuild 1070 BLAKE2B 19111adc28465df1a887eb5d6215cae16aa6910f84343e10e400de534ed1c65347be43f4a0dc4a2ab63f28dd1cfe3b39bc21717fc234b3123796db48461738ec SHA512 28d7f90580a2efa136bd246b01833017be2f02c3a5634f06170825dff037ec9f352bffadfd46e059f70fb91d51171a6b71f8d5342341edaae3a1632ad064f5db
 EBUILD certbot-apache-0.21.1.ebuild 1070 BLAKE2B 19111adc28465df1a887eb5d6215cae16aa6910f84343e10e400de534ed1c65347be43f4a0dc4a2ab63f28dd1cfe3b39bc21717fc234b3123796db48461738ec SHA512 28d7f90580a2efa136bd246b01833017be2f02c3a5634f06170825dff037ec9f352bffadfd46e059f70fb91d51171a6b71f8d5342341edaae3a1632ad064f5db
 EBUILD certbot-apache-0.22.0.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
+EBUILD certbot-apache-0.22.2.ebuild 1076 BLAKE2B f8e3f65b1d57e8eaf3b53805c23a6701dd471137d46a8d96ce925e9f6f7f43f1cdc73ae6101e42eb58e4cf3a6ad7e03977ab4e551ccf76908fbb0678378fd7c7 SHA512 9a73ec2564bb1f7f1ba1e0bfea3a3b6aa50d1c6d653524f862d020b088d11d7835bc2888740738804b38f93d41e29a7d1d1f8996212db63d03d3556ef39e000e
 EBUILD certbot-apache-9999.ebuild 1072 BLAKE2B 6ec71a794ac98f33ce0d71fad86006da09d13ebfd708ed734f2b1376eb67ccb81252ff010648398aee622cca7e63f2667a56efc54abe36901d63fd76039c70e6 SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.22.2.ebuild b/app-crypt/certbot-apache/certbot-apache-0.22.2.ebuild
new file mode 100644
index 000000000000..2f2c9cd3e8a5
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.22.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.21.1[${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}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index c70386dac180..318bf7597409 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,10 @@
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605
+DIST certbot-0.22.2.tar.gz 1128517 BLAKE2B 0b95ee9ab6b69b5d511b737d1cfc1eff543f1f0abeba9e60429dfe2dc389b39e19df10c77ea7c90ad8795640ae7602a7bc239c57cd1734863bf19d1f0c5eab67 SHA512 ca26be78d29728fc5c20a5290f2dde4d1f2090b7e2829c0b312acac4741ef56440cc21a9db77e3e0cfe59ce0f1f0ab2165cb6823af8a4e2a4528060ad683ffe9
 EBUILD certbot-nginx-0.20.0.ebuild 1010 BLAKE2B 31d97f3e848c653447dcdb925a45f5d2d503e367a78f352d1d8bcd7afa84a2ddf8f86238c2ad861bcfcc9ae9f5af951f5a6ed19a2066889eda390b0eb11d29a1 SHA512 6b40179511b4132810140b47b92b728ec3e186682569e9eddf64d35aa1b6150b6e92d1eb4ca19cc8e503304ee5497f9a264c3b478b5c759e7d94ba3a49cb36ba
 EBUILD certbot-nginx-0.21.1.ebuild 1010 BLAKE2B 31d97f3e848c653447dcdb925a45f5d2d503e367a78f352d1d8bcd7afa84a2ddf8f86238c2ad861bcfcc9ae9f5af951f5a6ed19a2066889eda390b0eb11d29a1 SHA512 6b40179511b4132810140b47b92b728ec3e186682569e9eddf64d35aa1b6150b6e92d1eb4ca19cc8e503304ee5497f9a264c3b478b5c759e7d94ba3a49cb36ba
 EBUILD certbot-nginx-0.22.0.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
+EBUILD certbot-nginx-0.22.2.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
 EBUILD certbot-nginx-9999.ebuild 1012 BLAKE2B 136068938950b35a57ceb8b3d20bdc479c44209e968283257bab20a5541b4741ea92212d8955873a7fc303718a8743d85972302833d58efb9d343ab7679848a3 SHA512 c6bfe9fbcfd4f037e90cd32618e3b345332c8993bb3a5bebea70ba914b80ae226cae5c1b3bd3ec0c13eac26b751260ac6dd48ae05474d916cc24df4ff79de346
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.22.2.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.22.2.ebuild
new file mode 100644
index 000000000000..dd9e6e8b4372
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.22.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 6d3fc64e817a..01ba992de7f0 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,10 @@
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2
 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605
+DIST certbot-0.22.2.tar.gz 1128517 BLAKE2B 0b95ee9ab6b69b5d511b737d1cfc1eff543f1f0abeba9e60429dfe2dc389b39e19df10c77ea7c90ad8795640ae7602a7bc239c57cd1734863bf19d1f0c5eab67 SHA512 ca26be78d29728fc5c20a5290f2dde4d1f2090b7e2829c0b312acac4741ef56440cc21a9db77e3e0cfe59ce0f1f0ab2165cb6823af8a4e2a4528060ad683ffe9
 EBUILD certbot-0.20.0.ebuild 1593 BLAKE2B f59bf64316d9f8834ad592a20542c36e825b49ba7f80972e888efeae7a09cee36a3e5005a9ab8ed2ad5ac66b497cb0bb0aa15c86d38e5b2fda83da7c2c6371b2 SHA512 746e799bf353167035a9f12e52d814e5fb9208182ef3aaf023d890d0512ceeb8a07f7d41f203e5cbd2dd95e3a8f2110b0032662c84854923482df043e6203781
 EBUILD certbot-0.21.1.ebuild 1519 BLAKE2B ea147ef2b73b71a49bec0d1704dde1d16effd9f932fe3efc01b17cbb7d5053adc852be4eb0d6d1f287640a8f434ff3c680766ed009f4dbf5575f64b2f3289f0c SHA512 ab4972592fe9359bda29822033de9547429ff2dd093882123f8befdb3f3d046bda39ec6cd3b6ab7b567375f24fdae1554e383f3e7d471ee8f28cea77abd8b8cb
 EBUILD certbot-0.22.0.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
+EBUILD certbot-0.22.2.ebuild 1553 BLAKE2B 0d0bbdc14866fbb2fa2fd55bfe2f0dec53d5a3d4a8fd826c0a07b805abe39ccc25c5df41480dd7fda92d9d47516e860b9dafe7f9ffcb442499eb822ab192ffb5 SHA512 955985ab7d487375d4ac466c5e38a5e3f437f2d4e83894ce6eba582a3362316f71d43aa5431f0c295dbc80b5458f947d593b8b2e76d58720425405949db8d7d7
 EBUILD certbot-9999.ebuild 1521 BLAKE2B 023aa5f5a8ce9fde2fc521880cf6d6a4992bf36ec4c057df0d78811111be786dde21598d374b069021ac84be9b1adff567c07b582a4756a5d3e2385d4d9f4a8d SHA512 72897b2d8a3256d5ffb5fe11fabccadcc13dfb4963f3a8030dbe19d942c97f6d26225441467a8ade644fdc732c7c4dd737d62ea6383faedec75a4f156330e893
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.22.2.ebuild b/app-crypt/certbot/certbot-0.22.2.ebuild
new file mode 100644
index 000000000000..f21b72555c81
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.22.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/josepy[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v ${PN} || die
+}
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 31077d0941ad..5c6b80cb12d4 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -11,9 +11,10 @@ AUX ekeyd-1.1.5-path-fixes.patch 1918 BLAKE2B cf29e1f7fbaef728d0c4db2b71b1ac611b
 AUX ekeyd-1.1.5-remove-werror.patch 1205 BLAKE2B c10ae2dc785a3bcb98a47af002d3f96b7908046dddc091f8342a7a61d4a38278f05b677445bdf60ad3260af6d723c1a06b3bd0a279b1ba4ffb07e3a5ae2f3c5b SHA512 2ea01bbe642bd52351e8ab9b7b62147c5bec7918305dc2c5be9291e3ae98fdd90f0e6e36c450e4db6220076a45a22cf870c81b3e23beed9170f262c857acecfd
 AUX ekeyd-1.1.5-udev-rule.patch 2325 BLAKE2B 5617dd160c6f3617bb93dc97755f22c535ebcaa190cbca0abb456168ebb1579ce7b1db961167230540e03b56f92008a12e846c54200d5354711c64bc7e9c0e6d SHA512 05023ef85c454a9092cecf7f3826430caeda1e66ba5759ffe1e6f4c42f4da32048862dba6c6e19ab32febadc3a9f65cf5e1b8f0562a71fc854134b60df28a80c
 AUX ekeyd.init.2 699 BLAKE2B 4ce17a42ffc60b49232cc0bb5a19d36fecc55071df699a7ad7da6a49de352a599b8f0f11fc05fa4159d8975245e7b6181e96303182870519a7f57070a6b54da4 SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71
-AUX ekeyd.service 117 BLAKE2B 3ffc45687d2addb2fa838687d6d4d0c873ca625bebe86167535fba98e30b3f0635344a9dcdc6b5dd63263a2e3374f20e3cae0653bf877cf4bb8bc33a8445eb12 SHA512 3372ed067594cd7e1c0f02402ced141fe9e9c96e6df0dbfeae2ed707c837e48860450ec1971689245d62f79351c294c222456dcb489629095e7707a7026a878d
+AUX ekeyd.service 157 BLAKE2B d7976301d7eb0d9be05de574f3b25c13ed3767629dff7024e7621a2d29686045cfd7664e2127a87b92d32e719b470a2795159e45c310bfdcfffa75897341213f SHA512 1082a1dc58b820882015c4f09d5154691d9d8810bfe953049a6853ea5025ec7cff2377ee931ec8ceef295241083c162e582a75fd0b134f7e8789f6d470285445
 DIST ekeyd-1.1.4.tar.gz 100911 BLAKE2B 7b0c6ed31f73ed559ed0a34325680618d700d069b873e7ebc92dc8d8082c9d03e5ea2d7ddfc2b31e927914a0d2cd130faed97ce07eea4af3005f1499b1fd2d1c SHA512 40632722827e07ebc643fa32af9910b28053873329772681dba2b029ad0b3c63d1d6bba3fdd0549b84e23779d2e2ae0323a53e1fdf93eb963570bab2227b63e6
 DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a
 EBUILD ekeyd-1.1.4-r2.ebuild 5604 BLAKE2B d3d63f22f9ca5606c1648365461581a294dd6775a2cd1fbcc26bd16ad5f809152afa6164ca24ea35c328f919bcff27dce867b4c9a5dc65751219a11e920f157b SHA512 67f60f6aef075cbe8c8be460f953c66191b0e4e4c88c5b5ed98b2fce9d3cb79290eda3e79668a9b0bc3a02fffab47a4b62fbd9a4ff6c9bb8e0925917f3c12d9b
+EBUILD ekeyd-1.1.5-r1.ebuild 4877 BLAKE2B f7b49794d5c43cb8997e2074aa8ece5cf75a24baf6d2b49cf8626e2a96487b9689c887008f43cd9b3a577c8f07533b244abebd406da397baaa38242201fabea1 SHA512 5280b08daee08ee697de152a8db129c180e1d633096431a9511a03c9bfdd552411cf00e088daeef675c70621a30fac069de79ae89d63bd9f071ba134fb4dad55
 EBUILD ekeyd-1.1.5.ebuild 4865 BLAKE2B 794a77bc8907afd614d7fa23a22b76c70e193b09c47b8706a63143ae63810dd7bc6fafed6e87ca03ab63f87daf289afce6f84220dde0ce796df9363c203c878b SHA512 dd6e8b2913eb2628c70aa3d22687982fbbfad2c084a5407f693429c7bacb7c55f5d20f2ffb35df13fcd2f644b1a648c1985b2ec71bdca8c659f2fc5bda6dbce2
 MISC metadata.xml 859 BLAKE2B f300afe133b92ef4d4dd1a6f7bffebdb9ff1b152fd08484d56b327c1eaaaa2a2c5c2bf98a8f98851bd427a1143c1d84537aed47ea6048fb10bd0695ee817a202 SHA512 0b7ac8a9894b69bcf0d16bcae83146ef00c05f1a1ecb41244a03cbb5ee8d64328647eceddcac36a5900e87dd07af81c79c7e62e94f70e67244b2c8dac73f57da
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..cd17249ebd07
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib linux-info toolchain-funcs udev systemd
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/"
+SRC_URI="mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_${PV}.orig.tar.gz"
+
+LICENSE="MIT GPL-2" # GPL-2 (only) for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kernel_linux munin minimal usb"
+REQUIRED_USE="minimal? ( !munin )"
+
+EKEYD_RDEPEND="dev-lang/lua"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+	dev-lua/luasocket
+	kernel_linux? ( virtual/udev )
+	munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+	!app-crypt/ekey-egd-linux
+	virtual/service-manager"
+DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
+
+CONFIG_CHECK="~USB_ACM"
+
+pkg_setup() {
+	if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-const_char_usage.patch";
+	epatch "${FILESDIR}/${P}-enoent.patch";
+	epatch "${FILESDIR}/${P}-path-fixes.patch";
+	epatch "${FILESDIR}/${P}-udev-rule.patch";
+	epatch "${FILESDIR}/${P}-remove-werror.patch";
+	epatch "${FILESDIR}/${P}-misc.patch";
+}
+
+src_compile() {
+	local osname
+
+	# Override automatic detection: upstream provides this with uname,
+	# we don't like using uname.
+	case ${CHOST} in
+		*-linux-*)
+			osname=linux;;
+		*-freebsd*)
+			osname=freebsd;;
+		*-kfrebsd-gnu)
+			osname=gnukfreebsd;;
+		*-openbsd*)
+			osname=openbsd;;
+		*)
+			die "Unsupported operating system!"
+			;;
+	esac
+
+	# We don't slot LUA so we don't really need to have the variables
+	# set at all.
+	emake -C host \
+		CC="$(tc-getCC)" \
+		LUA_V= LUA_INC= \
+		OSNAME=${osname} \
+		OPT="${CFLAGS}" \
+		BUILD_ULUSBD=no \
+		$(use minimal && echo egd-linux)
+}
+
+src_install() {
+	exeinto /usr/libexec
+	newexe host/egd-linux   ekey-egd-linux
+	newman host/egd-linux.8 ekey-egd-linux.8
+
+	newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
+	newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
+
+	dodoc doc/* AUTHORS ChangeLog THANKS
+
+	use minimal && return
+	# from here on, install everything that is not part of the minimal
+	# support.
+
+	emake -C host \
+		DESTDIR="${D}" \
+		MANZCMD=cat MANZEXT= \
+		install-ekeyd
+
+	# We move the daemons around to avoid polluting the available
+	# commands.
+	dodir /usr/libexec
+	mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
+
+	systemd_dounit "${FILESDIR}/ekeyd.service"
+
+	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
+
+	if use kernel_linux; then
+		local rules="${FILESDIR}/90-ekeyd.rules"
+		udev_newrules ${rules} 90-${PN}.rules
+	fi
+
+	if use munin; then
+		exeinto /usr/libexec/munin/plugins
+		doexe munin/ekeyd_stat_
+
+		insinto /etc/munin/plugin-conf.d
+		newins munin/plugin-conf.d_ekeyd ekeyd
+	fi
+}
+
+pkg_postinst() {
+	elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
+	elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
+	elog "managing the key(s)."
+	elog ""
+	elog "The daemon will send more entropy to the kernel once the available pool"
+	elog "falls below the value set in the kernel.random.write_wakeup_threshold"
+	elog "sysctl entry."
+	elog ""
+	ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
+	ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
+
+	use minimal && return
+	# from here on, document everything that is not part of the minimal
+	# support.
+
+	elog ""
+	elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
+	elog "the first time, and then start the ekeyd service."
+	elog ""
+	elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
+	elog "if your system has jumps in load average, you might prefer using the"
+	elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
+	elog "starting the ekey-egd-linux service."
+	elog ""
+	elog "The same applies if you intend to provide entropy for multiple hosts"
+	elog "over the network. If you want to have the ekey-egd-linux service on"
+	elog "other hosts, you can enable the 'minimal' USE flag."
+	elog ""
+	elog "The service supports multiplexing if you wish to use multiple"
+	elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
+	elog "and it'll be looking for /etc/entropykey/identifier.conf"
+	elog ""
+
+		if use kernel_linux; then
+			elog "Some versions of Linux have a faulty CDC ACM driver that stops"
+			elog "EntropyKey from working properly; please check the compatibility"
+			elog "table at http://www.entropykey.co.uk/download/"
+		else
+			elog "Make sure your operating system supports the CDC ACM driver"
+			elog "or otherwise you won't be able to use the EntropyKey."
+		fi
+		elog ""
+		elog "If you're unsure about the working state of the CDC ACM driver"
+		elog "enable the usb USE flag and use the userland USB daemon"
+}
diff --git a/app-crypt/ekeyd/files/ekeyd.service b/app-crypt/ekeyd/files/ekeyd.service
index 637b424b703d..0529574db5cb 100644
--- a/app-crypt/ekeyd/files/ekeyd.service
+++ b/app-crypt/ekeyd/files/ekeyd.service
@@ -3,6 +3,8 @@ Description=Entropy key daemon
 
 [Service]
 ExecStart=/usr/libexec/ekeyd 
+Type=forking
+PIDFile=/var/run/ekeyd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index f98df4d00a04..cbd19bc8ac14 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -18,7 +18,7 @@ EBUILD gnupg-2.2.0.ebuild 3121 BLAKE2B abb9424fbbd74ed5d0e3a71f48af85e9d569601ec
 EBUILD gnupg-2.2.1.ebuild 3224 BLAKE2B 3e5c1fa5fdd5fbca8a5b554b09e2221ba612185415e009ebbf2e999369dfa4697139674ccf94b9be52bc2c8024b56a4a846f1803a940755a1650765325a10d17 SHA512 ebe3107c7444f4f821760d854da5376a9953b7e6781673cc55b3704ce9accf5306277140648a047f9fe705c7e5ef7922e45c0fceb8508d80edd63b6dab08b579
 EBUILD gnupg-2.2.3.ebuild 3209 BLAKE2B 44f319cfee71a4c4c38deb496f361e022e2b729b2d075e3d2c03f4276f69b5b8e42bffd90eed5a8b0cccc468bf2512cd6c6b593e6b74cf2ac9867c8f05b0b447 SHA512 4800b7469ad42721294d08c05aa32914a9f0b6d8313efc10a44d5d6b4f9e62d8ee4eb083162808aad5b9829ddc041ea4cac53a60f7b7614451fba41a69c39a28
 EBUILD gnupg-2.2.4-r1.ebuild 3206 BLAKE2B 084fd1814201be6c963a2adc262e4a8c137950cd07a15d9e021d149de752894b3db1096ccf59f04f97fe7ab1764471b6063e103e8f28bb0fc68a2d3ea04f1612 SHA512 b3112ebc907b92caa56f7786a15589701fcbcceb1de8f8ea78d22921a293d84454902f8ca11250c63b5f833936cc46d3d31d5878df712586c032b1297980c603
-EBUILD gnupg-2.2.4-r2.ebuild 3273 BLAKE2B 13216a5a47cfe1a0b1800b8327540559d52d2cc0585b4c0a35f2c196be3782f9af7d9546b03cfe1ff587e8679331fc8eb1a9ac729528120c387eaeb29baa071b SHA512 67e351ab219249f324b1968bfa15643ed26658d1b85d8581319bdef7672781100472feb71412794675e57ecaabdd333c027289ea03cc2dffd8d793df3943a2f6
+EBUILD gnupg-2.2.4-r2.ebuild 3272 BLAKE2B da1dfa3bc229cb41648d16501132669be70011ce0aceae734045a2a55418f07b12f9528ae86f020ff5e0843cf0a341af926fdbad3737cd45f1c3e775f1009ec3 SHA512 f7b9ac07f947509b2a8381d94cf92c214b21d5cf05320c25eaaf3efe66a25e6538d6160d3de67ae3225b4360dc127e50e2b2f52cd9e3f6736f737d89b5d7f8ba
 EBUILD gnupg-2.2.4.ebuild 3202 BLAKE2B 15937df613d5f8c91cf186643983659f431c8f25dbcf0d69db6dc4f02145d587c81cd6a1a62053d492fbe59f2efa921147e72e588f3da52c0a94d7b8e27cc95e SHA512 180a4dec88ac9b800db26cca8a98dba57f8624d08c2167221e90b16ad873f2c113385b98a1abe716ac3eb752d159f8f5cd95a2c69d4150ffa03cf34b7534ee79
-EBUILD gnupg-2.2.5.ebuild 3287 BLAKE2B 8d9ff8097bc965ab2709e7bb656d02f0b7d73fc8a7a10043b62b7c34324ba5d29552fa3648ea724733b4eaf8d67f7d739442044b506279dee7603d46c1d54f60 SHA512 4226eb21d5b3dfc10b1c703d5f17026457fc04a2c63dac9a146d48cf75bedba071e4e3e8c6363af98965b9e8e3098c8f3618eeaa8858982a2a8d237b6c40bbfe
+EBUILD gnupg-2.2.5-r1.ebuild 3300 BLAKE2B cb86c9046d36d8a41f8ffa2f37ed138c3e455daee643832fee76fb2fdc29ce1d32ee8f2a9d526c5d20fa0135e5a8512864d070d94929c401114f8a88f58618ad SHA512 39e7fb187c217d28b7516e5337ec316ad69d8d96882df99f88250e7da671abcb794d1fed28e90da809a2473e9e7bc764ea1365b318f6a7c4e5e0e5694f3a3cee
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
index b2051ca9001f..b7cd8565923c 100644
--- a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.4-r2.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 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.2.5-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..8adf8b70a79d
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.5-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.24
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	virtual/mta
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${PN}-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable ssl gnutls) \
+		$(use_enable nls) \
+		$(use_enable tofu) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--enable-all-tests \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.2.5.ebuild b/app-crypt/gnupg/gnupg-2.2.5.ebuild
deleted file mode 100644
index 172d9ac8f2c2..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 wks-server"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.24
-	>=dev-libs/libksba-1.3.4
-	>=net-misc/curl-7.10
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	tofu? ( >=dev-db/sqlite-3.7 )
-	"
-COMMON_DEPEND_BINS="app-crypt/pinentry
-	!app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${PN}-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable ssl gnutls) \
-		$(use_enable nls) \
-		$(use_enable tofu) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		--enable-all-tests \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/monkeysign/Manifest b/app-crypt/monkeysign/Manifest
deleted file mode 100644
index 77bc38534c43..000000000000
--- a/app-crypt/monkeysign/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX monkeysign-1.1-basename.patch 393 BLAKE2B 87224cefb77a8c1cc090a1b2c5036eea0f4567fc8f654540171f7d2e9235f606fc9d1c0e2ab39577a9e94d45031b1d4a7d5984ee9b1a87cabf5c9f11a68bbcdc SHA512 ae9e01a6aff91231c700f1e46ef7f4dabed8ba6d3d3a275bb6405b767bcb6f40c96ff7563fe693a17d76e26b63b2ccb0e66e834e910cef5bb94d2a9f9cd366d3
-AUX monkeysign.desktop 181 BLAKE2B 6e678bdc96a9bc0f9eea80588e8129b5d978debe680d0f5f8e88a3ae9947270ae775a830c372e5008dd8762041a6efe0b6f76df71e6b01c579f069c79faa0c16 SHA512 ec4442e2467700e355a3ed58cb3512119e70d76e5bf75acba4ee8109bd0fea9066cbb23ad7f93551c40a6f8f345f255e7ab73cbcfd974a878275004d8c7cfb98
-DIST monkeysign_2.2.3.tar.xz 1145852 BLAKE2B 20131f12ebf364f12f693e391908f0a6bc9e35c2256b1b4008d1a05b73b84a02a7ff5cc5308490e6f8784c18d3ec3ebe9410e9f336ae1acc81a47c7d1d1287cd SHA512 accbe2b2350ad0ba8ab05ec0da759c95d705b69c149045875cbcdcc35d4c776f13339fd8fa97203fc3ebf23e4f1c70a9776767c39e92196545b1b3905cd25caf
-EBUILD monkeysign-2.2.3.ebuild 1270 BLAKE2B a8290eaab35c953964dcfc31fa3beec3053939f90e6e8e38efcab9f228da2101b8e35f849dfe6cdcaa3c396e91d5594f4f8f78597e59e38e292122e9c61583f1 SHA512 879fc03171e33e48a91459f85385bd73c86207288410f0c8ea265ca24c85cf869737d81569b9f1e3dbec52be472d16c9401d9c685a0a308a6a2bd2403d4d2180
-MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/monkeysign/files/monkeysign-1.1-basename.patch b/app-crypt/monkeysign/files/monkeysign-1.1-basename.patch
deleted file mode 100644
index dd9011239f08..000000000000
--- a/app-crypt/monkeysign/files/monkeysign-1.1-basename.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 954b8fe8cdb2 scripts/monkeyscan
---- a/scripts/monkeyscan	Tue Oct 01 00:02:17 2013 +0200
-+++ b/scripts/monkeyscan	Tue Oct 01 00:04:27 2013 +0200
-@@ -25,7 +25,7 @@
- if directory == 'scripts':
-     sys.path.insert(0, os.path.dirname(__file__) + '/..')
- 
--if basename == 'monkeysign':
-+if basename[:10] == 'monkeysign':
-     from monkeysign.cli import MonkeysignCli as ui
- else:
-     try:
diff --git a/app-crypt/monkeysign/files/monkeysign.desktop b/app-crypt/monkeysign/files/monkeysign.desktop
deleted file mode 100644
index 6289800f2e74..000000000000
--- a/app-crypt/monkeysign/files/monkeysign.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Monkeyscan
-Comment=Monkeyscan part of monkeysign
-Categories=Network;GTK;GNOME;X-Internet;
-Exec=/usr/bin/monkeyscan
-Terminal=false
-Type=Application
-
diff --git a/app-crypt/monkeysign/metadata.xml b/app-crypt/monkeysign/metadata.xml
deleted file mode 100644
index 91439c59951d..000000000000
--- a/app-crypt/monkeysign/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>k_f@gentoo.org</email>
-		<name>Kristian Fiskerstrand</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/monkeysign/monkeysign-2.2.3.ebuild b/app-crypt/monkeysign/monkeysign-2.2.3.ebuild
deleted file mode 100644
index eb83ce43fc82..000000000000
--- a/app-crypt/monkeysign/monkeysign-2.2.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A user-friendly commandline tool to sign OpenGPG keys"
-HOMEPAGE="http://web.monkeysphere.info/monkeysign/"
-
-SRC_URI="mirror://debian/pool/main/m/monkeysign/monkeysign_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	media-gfx/zbar:0[python,gtk,imagemagick,${PYTHON_USEDEP}]
-	media-gfx/qrencode-python[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	app-arch/xz-utils
-	${CDEPEND}"
-
-RDEPEND="
-	app-crypt/gnupg
-	virtual/mta
-	${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1-basename.patch"
-	)
-
-src_prepare() {
-	sed -i "s/'rst2s5/'rst2s5.py/g" monkeysign/documentation.py || die
-	sed -i "s/'--list-dirs'/'--dry-run --list-dirs'/" monkeysign/gpg.py || die
-	rm CHANGELOG || die
-	eapply_user
-}
-
-src_compile() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	domenu "${FILESDIR}/monkeysign.desktop"
-}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 4e3e6775956f..54945141ebef 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -2,6 +2,8 @@ AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f
 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-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
 EBUILD pinentry-1.0.0-r2.ebuild 2886 BLAKE2B 27f6057b0d5d0d474397660d755c90ab8dc025a80d5573e44c71093839efee3c0a126fb5dc10fb53083946c46989cdb63aa1baf6e75f40c2e3aef6bae558bfef SHA512 32cc1cc04357afe5f0b84f1bd75af877e1b849d3a4fc70d194e627a32da883a05037d36d15b25cea67d2963563402c13d125a928278f9326fda8463b5951eb3a
+EBUILD pinentry-1.0.0-r3.ebuild 2958 BLAKE2B 350c3f20934857f72ce46dad5d8a047f5b04c10dbf4f398e346a5b1339a81fa1263296859a240fe717970840ed81b2f271a902d3e26b5d93f108bbdf3117cc20 SHA512 10c088dd6cd0efab43430856615cd795986c127765fbb47c0d324085aac9474da85bd317a8ec23aecc05fafba19f14392ccbf59b1820590223be0eb57855a2a6
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch b/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch
new file mode 100644
index 000000000000..646df1963760
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch
@@ -0,0 +1,52 @@
+From 7218becac7132c2508d4e8f42c693d69c406795a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Wed, 7 Mar 2018 15:14:22 +0100
+Subject: [PATCH] Make pinentry-qt icon work under Plasma Wayland.
+
+---
+ qt/Makefile.am                   | 2 ++
+ qt/main.cpp                      | 2 ++
+ qt/org.gnupg.pinentry-qt.desktop | 5 +++++
+ 3 files changed, 9 insertions(+)
+ create mode 100644 qt/org.gnupg.pinentry-qt.desktop
+
+diff --git a/qt/Makefile.am b/qt/Makefile.am
+index 698005e..bbf39d1 100644
+--- a/qt/Makefile.am
++++ b/qt/Makefile.am
+@@ -24,6 +24,8 @@ bin_PROGRAMS = pinentry-qt
+ 
+ EXTRA_DIST = document-encrypt.png pinentry.qrc
+ 
++desktopdir = $(datadir)/applications
++dist_desktop_DATA = org.gnupg.pinentry-qt.desktop
+ 
+ if FALLBACK_CURSES
+ ncurses_include = $(NCURSES_INCLUDE)
+diff --git a/qt/main.cpp b/qt/main.cpp
+index fe88d26..b767cb4 100644
+--- a/qt/main.cpp
++++ b/qt/main.cpp
+@@ -372,6 +372,8 @@ main(int argc, char *argv[])
+         i = argc;
+         app = new QApplication(i, new_argv);
+         app->setWindowIcon(QIcon(QLatin1String(":/document-encrypt.png")));
++        app->setOrganizationDomain(QStringLiteral("gnupg.org"));
++        app->setDesktopFileName(QStringLiteral("org.gnupg.pinentry-qt"));
+     }
+ 
+     pinentry_parse_opts(argc, argv);
+diff --git a/qt/org.gnupg.pinentry-qt.desktop b/qt/org.gnupg.pinentry-qt.desktop
+new file mode 100644
+index 0000000..0ac89aa
+--- /dev/null
++++ b/qt/org.gnupg.pinentry-qt.desktop
+@@ -0,0 +1,5 @@
++[Desktop Entry]
++Type=Application
++Name=Pinentry dialog
++Icon=document-encrypt
++NoDisplay=true
+-- 
+2.16.1
+
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
new file mode 100644
index 000000000000..86f29751d3f8
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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/qca/Manifest b/app-crypt/qca/Manifest
index 83670e69331e..1ad98e7fa14b 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -2,4 +2,5 @@ AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.1.3.tar.xz 686340 BLAKE2B 60ebf9add907632ed17426ee53c6c35a9aed279a4492012f1c174608cbe9579d366feb7ff7bff551d2e9e4ef2f271e8f340fcb4c9e1f67f209657d388567d44f SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
 EBUILD qca-2.1.3-r1.ebuild 2719 BLAKE2B cc8c3ed0071caf9c474c2ecaab4cdca0d1db9a53f0324ff2bf2741e26363a90f685a088cc7159853347387928ca466d6723f74513b486a4c543d92a0a85a6bd0 SHA512 395f82a689752d6248e64c94e535e60fe0ed78c1e5592fa78ff9ee2e52c6410520a7f37fef61fe7bcdf3a3d50797ab3edbd797923278d9c7761541c972e03f07
+EBUILD qca-2.1.3-r2.ebuild 2150 BLAKE2B 7f12cb90bcf417ec0652f2f5fd203b196aa39f86c036ac2fcbd82e90c3bad197636acb83cba7eb7236b198dbe12576915582ae2ceb961e72969a1c2babb8a9c0 SHA512 34e2dd86037f684defe4896455f233edaebfff306a07a47d377c251b61b351c8358e23c8cd6f7ecf70d3ebc238332328d5c8023d029453203cfdc9d16417d3e5
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/qca-2.1.3-r2.ebuild b/app-crypt/qca/qca-2.1.3-r2.ebuild
new file mode 100644
index 000000000000..396b23660490
--- /dev/null
+++ b/app-crypt/qca/qca-2.1.3-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	botan? ( dev-libs/botan:0 )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	gpg? ( app-crypt/gnupg )
+	nss? ( dev-libs/nss )
+	pkcs11? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+		dev-libs/pkcs11-helper
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtnetwork:5
+	doc? ( app-doc/doxygen )
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-crypt/qca-cyrus-sasl
+	!app-crypt/qca-gnupg
+	!app-crypt/qca-logger
+	!app-crypt/qca-ossl
+	!app-crypt/qca-pkcs11
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-pgp-test.patch"
+	"${FILESDIR}/${P}-c++11.patch"
+)
+
+qca_plugin_use() {
+	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
+		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
+		$(qca_plugin_use botan)
+		$(qca_plugin_use gcrypt)
+		$(qca_plugin_use gpg gnupg)
+		$(qca_plugin_use logger)
+		$(qca_plugin_use nss)
+		$(qca_plugin_use pkcs11)
+		$(qca_plugin_use sasl cyrus-sasl)
+		$(qca_plugin_use softstore)
+		$(qca_plugin_use ssl ossl)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		pushd "${BUILD_DIR}" >/dev/null || die
+		doxygen Doxyfile.in || die
+		dodoc -r apidocs/html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index f5ba2e1c7be9..21e01f315484 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,3 +1,7 @@
+AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
+AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
+DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 EBUILD rhash-1.3.5.ebuild 2622 BLAKE2B 28d39e4b2212149ba41fcda4070141b1ddb0f350520c3ebbb1e77c751179dc87b9455f3870b822b100d297c49db26e597498d937d0d3317abde71f46257c2068 SHA512 0d57acaa7876e74d2914b4ccade7a94e248f49f4ad32e21b87171a2d4a795028d88210cc1977f45d917d006e73b7dc8f5f5ad9321ac890a50a893bcd9cfb3120
+EBUILD rhash-1.3.6-r1.ebuild 1787 BLAKE2B ddd892e518ddabcaa40f0ffd324b2896a50dc060c52fb7765cd5c7974370aab42109aeaa96c5edbc6f6368716c58bfc8c7ea2ba6a79f52b0a2782935cb063dc7 SHA512 f1685bfb7c0d5f78029069aed841ae140a492d303820f2be780d0bf39d74e58287bebeb6c91cc9b72d7c837dc844174d0a6f6c5619cb8f3f853ce6ea82a4eea9
 MISC metadata.xml 843 BLAKE2B 9380d16da7ed26bc2cb455ad4e01806d54233df9ec229e67a8ed1a3944e91569cc4a478c375e75a87ea758eab6a886b89fae27dea32434e8c7f4a068d0371369 SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f
diff --git a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
new file mode 100644
index 000000000000..9b25b29a89f3
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
@@ -0,0 +1,54 @@
+From c1776248a0b34a690e99ab9a7a814c34f78088ec Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 19 Mar 2018 10:47:13 +0100
+Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shell
+
+See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n"
+with "printf '%s'".
+---
+ configure | 15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/configure b/configure
+index f480f7b..2a7d485 100755
+--- a/configure
++++ b/configure
+@@ -22,17 +22,6 @@ INSTALL_LIB_STATIC=auto
+ INSTALL_LIB_SHARED=auto
+ INSTALL_PKGCONFIGDIR="$PKG_INSTALLDIR"
+ 
+-case $(echo -n) in
+-  -n) # SysV style
+-    ECHO_N=
+-    ECHO_C='\c'
+-    ;;
+-  *) # BSD style
+-    ECHO_N='-n '
+-    ECHO_C=
+-    ;;
+-esac
+-
+ # display error message and exit
+ die () {
+   echo
+@@ -235,7 +224,7 @@ trap remove_tmpdir EXIT
+ 
+ str_concat()
+ {
+-  echo ${ECHO_N} $@ ${ECHO_C}
++  printf '%s ' $@
+ }
+ 
+ yn_nonempty()
+@@ -246,7 +235,7 @@ yn_nonempty()
+ # Use this before starting a check
+ start_check() {
+   echo "============ Checking for $1 ============" >> "$TMPLOG"
+-  echo ${ECHO_N} "Checking for $1 ... ${ECHO_C}"
++  printf '%s' "Checking for $1 ... "
+   res_comment=""
+ }
+ 
+-- 
+2.16.2
+
diff --git a/app-crypt/rhash/files/unquote-cc.patch b/app-crypt/rhash/files/unquote-cc.patch
new file mode 100644
index 000000000000..77ccc9b2c5f7
--- /dev/null
+++ b/app-crypt/rhash/files/unquote-cc.patch
@@ -0,0 +1,26 @@
+From 4558d6753611ab1bf21765017e5b451aee8409f6 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 18 Mar 2018 14:23:28 +0000
+Subject: [PATCH] configure: Don't quote $CC when calling it
+
+It might have additional arguments.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index f480f7b..8ebb929 100755
+--- a/configure
++++ b/configure
+@@ -480,7 +480,7 @@ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then
+ else
+   CC_TMP="$CC"
+   for CC in "$CC_TMP" gcc cc ; do
+-    if "$CC" -v >/dev/null 2>&1; then
++    if $CC -v >/dev/null 2>&1; then
+       cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1)
+       if test "$cc_name_tmp" = "gcc"; then
+         cc_name=$cc_name_tmp
+-- 
+2.16.1
+
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..69f97e6e47ab
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Console utility and library for computing and verifying file hash sums"
+HOMEPAGE="http://rhash.anz.ru/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls openssl static-libs"
+
+RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/RHash-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/unquote-cc.patch
+	"${FILESDIR}"/${P}-no_echon.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	set -- \
+		./configure \
+		--target="${CHOST}" \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-openssl-runtime \
+		--disable-static \
+		--enable-lib-shared \
+		$(use_enable debug) \
+		$(use_enable nls gettext) \
+		$(use_enable openssl) \
+		$(use_enable static-libs lib-static)
+
+	echo "${@}"
+	"${@}" || die "configure failed"
+}
+
+# We would add compile-gmo to the build targets but install-gmo always
+# recompiles unconditionally. :(
+
+multilib_src_install() {
+	# -j1 needed due to race condition.
+	emake DESTDIR="${D}" -j1 \
+		  install{,-pkg-config} \
+		  $(use nls && echo install-gmo) \
+		  $(use kernel_Winnt || echo install-lib-so-link)
+
+	emake DESTDIR="${D}" -j1 \
+		  -C lib${PN} install-headers
+}
+
+multilib_src_test() {
+	emake test
+}
-- 
cgit v1.2.3