gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-crypt
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
966 files changed, 21597 insertions, 3177 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4e2184a4e51a..8e50503ecc31 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/WiRouterKeyRec-1.1.2 b/app-crypt/WiRouterKeyRec-1.1.2
deleted file mode 100644
index 15693001a1db..000000000000
--- a/app-crypt/WiRouterKeyRec-1.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Recovery tool for wpa passphrase
-EAPI=5
-HOMEPAGE=https://www.salvatorefresta.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://tools.salvatorefresta.net/WiRouter_KeyRec_1.1.2.zip -> WiRouterKeyRec-1.1.2.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c7b2f1736287c7415bb0f6ea5cc2e3e1
diff --git a/app-crypt/WiRouterKeyRec/Manifest b/app-crypt/WiRouterKeyRec/Manifest
new file mode 100644
index 000000000000..16a4a17f2154
--- /dev/null
+++ b/app-crypt/WiRouterKeyRec/Manifest
@@ -0,0 +1,3 @@
+DIST WiRouterKeyRec-1.1.2.zip 117262 BLAKE2B fe140bf19d7a1af1c8c6e04725f3d3e67c30b3f108d64f1fe706b1e28e8767d08219e30b78e67b33553a00dea03ca344acf43c8b75f3c5f7633980e08d095f2b SHA512 a3c449497e3f3fed88dfbb35a90a2cfa5937efa02393e825ec51ab390b7094ce619d3238a916afd2b48e35e0e261b454f7d7005af46d6a45d77b2e1d4faaac51
+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
new file mode 100644
index 000000000000..7167e5643698
--- /dev/null
+++ b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+MY_PN="WiRouter_KeyRec"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="Recovery tool for wpa passphrase"
+HOMEPAGE="https://www.salvatorefresta.net"
+SRC_URI="https://tools.salvatorefresta.net/${MY_P}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare () {
+	sed -i "s:wirouterkeyrec:${PN}:" src/*.h || die
+}
+
+src_compile () {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install () {
+	newbin build/wirouterkeyrec ${PN}
+	insinto /etc/${PN}
+	doins config/agpf_config.lst config/teletu_config.lst
+}
diff --git a/app-crypt/WiRouterKeyRec/metadata.xml b/app-crypt/WiRouterKeyRec/metadata.xml
new file mode 100644
index 000000000000..4eceb317f22e
--- /dev/null
+++ b/app-crypt/WiRouterKeyRec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ago@gentoo.org</email>
+		<name>Agostino Sarubbo</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/acme-0.23.0 b/app-crypt/acme-0.23.0
deleted file mode 100644
index edd37e87ccbb..000000000000
--- a/app-crypt/acme-0.23.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.23.0.tar.gz -> certbot-0.23.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23b04df47634a50e31466fa2eef8b826
diff --git a/app-crypt/acme-0.24.0 b/app-crypt/acme-0.24.0
deleted file mode 100644
index d27541b8ba83..000000000000
--- a/app-crypt/acme-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23b04df47634a50e31466fa2eef8b826
diff --git a/app-crypt/acme-0.25.0 b/app-crypt/acme-0.25.0
deleted file mode 100644
index 94fd1ada0ed4..000000000000
--- a/app-crypt/acme-0.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.25.0.tar.gz -> certbot-0.25.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1a7abec592349f646d918532d93eb3f
diff --git a/app-crypt/acme-0.25.1 b/app-crypt/acme-0.25.1
deleted file mode 100644
index ab50aac79f8e..000000000000
--- a/app-crypt/acme-0.25.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.25.1.tar.gz -> certbot-0.25.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1a7abec592349f646d918532d93eb3f
diff --git a/app-crypt/acme-0.26.0 b/app-crypt/acme-0.26.0
deleted file mode 100644
index fa2c12b08249..000000000000
--- a/app-crypt/acme-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1a7abec592349f646d918532d93eb3f
diff --git a/app-crypt/acme-9999 b/app-crypt/acme-9999
deleted file mode 100644
index d2990b124763..000000000000
--- a/app-crypt/acme-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1571888aef854a3e1f7e1cd74c71a2ed
diff --git a/app-crypt/acme-client-0.1.16 b/app-crypt/acme-client-0.1.16
deleted file mode 100644
index 06073ab9474f..000000000000
--- a/app-crypt/acme-client-0.1.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libressl dev-libs/libbsd
-DESCRIPTION=a secure ACME client
-EAPI=6
-HOMEPAGE=https://kristaps.bsd.lv/acme-client
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=dev-libs/libressl dev-libs/libbsd
-SLOT=0
-SRC_URI=https://kristaps.bsd.lv/acme-client/snapshots/acme-client-portable-0.1.16.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=930601e638d964e15d024c54d0f68e77
diff --git a/app-crypt/acme-client/Manifest b/app-crypt/acme-client/Manifest
new file mode 100644
index 000000000000..d871368d2c38
--- /dev/null
+++ b/app-crypt/acme-client/Manifest
@@ -0,0 +1,3 @@
+DIST acme-client-portable-0.1.16.tgz 53129 BLAKE2B ece1ce752fc2f0828264ed15a454f1b1e91c0e8041add10acc6fe385566b32fafa07c530f5b88dfe73a351a2ec4e427096d2e8a2714f8eea1eee71c0cc721102 SHA512 730c20bdf9d72b24e66c54b009a282e04da3ea8ce3b9eb053750672c53c9586b2879d87a565ddbab033d7ba6a577dd6399313b20cf654b185905db4de988b6b7
+EBUILD acme-client-0.1.16.ebuild 611 BLAKE2B bff00297ac2a3a1fcd972196f4711e0378570860bd8aab91a87395ba57acb8ec9fd90a90b6d8233c9cb37bfd84fe7e1bbcc0062728b2092546e123aed5f5dd43 SHA512 7dd8c35117b0fd66ee1dfbcbf83cf36407b547b9c47cf124227f5532a63e6044715db69a688f98910d35768f36b504d02cbc128e2782d554ef0786dcf9ab237e
+MISC metadata.xml 500 BLAKE2B 2fe75ff442811bc3141c050cc66a14418d2a3eadfdb69faf03dd2c3d944ad33581b5d4dbe8f50a446f144f095ea71da525873c8888e75759d95b15d42013eb7b SHA512 a07671d8912b83c15baebd76cfd41b8e023f8796a18a4487f6af712f3dad1967b90e35f366e1751cb1574b1b94f6746e464240ff2974cdb033895c8a8fd8c80c
diff --git a/app-crypt/acme-client/acme-client-0.1.16.ebuild b/app-crypt/acme-client/acme-client-0.1.16.ebuild
new file mode 100644
index 000000000000..938a037ee398
--- /dev/null
+++ b/app-crypt/acme-client/acme-client-0.1.16.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a secure ACME client"
+HOMEPAGE="https://kristaps.bsd.lv/acme-client"
+SRC_URI="https://kristaps.bsd.lv/acme-client/snapshots/${PN}-portable-${PV}.tgz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libressl
+	dev-libs/libbsd"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-portable-${PV}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	DESTDIR="${D}" PREFIX="/usr" MAN1DIR="/usr/share/man/man1" emake install
+	dodoc ChangeLog
+}
diff --git a/app-crypt/acme-client/metadata.xml b/app-crypt/acme-client/metadata.xml
new file mode 100644
index 000000000000..86cb5dc28cec
--- /dev/null
+++ b/app-crypt/acme-client/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+		<name>Cédric Krier</name>
+	</maintainer>
+	<longdescription lang="en">
+		acme-client is a client for Let's Encrypt users, but one designed for
+		security. No Python. No Ruby. No Bash. A straightforward, open source
+		implementation in C that isolates each step of the sequence.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/acme-tiny-4.0.3 b/app-crypt/acme-tiny-4.0.3
deleted file mode 100644
index e57386386871..000000000000
--- a/app-crypt/acme-tiny-4.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A tiny, auditable script for Let's Encrypt's ACME Protocol
-EAPI=6
-HOMEPAGE=https://github.com/diafygi/acme-tiny
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/openssl:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/diafygi/acme-tiny/archive/4.0.3.tar.gz -> acme-tiny-4.0.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef1cb9643ad314b134f8203d6af5a7ba
diff --git a/app-crypt/acme-tiny-9999 b/app-crypt/acme-tiny-9999
deleted file mode 100644
index b338efd9628e..000000000000
--- a/app-crypt/acme-tiny-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A tiny, auditable script for Let's Encrypt's ACME Protocol
-EAPI=6
-HOMEPAGE=https://github.com/diafygi/acme-tiny
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=MIT
-RDEPEND=dev-libs/openssl:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef1cb9643ad314b134f8203d6af5a7ba
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
new file mode 100644
index 000000000000..0cfb5b9b03f6
--- /dev/null
+++ b/app-crypt/acme-tiny/Manifest
@@ -0,0 +1,4 @@
+DIST acme-tiny-4.0.3.tar.gz 12662 BLAKE2B 6a17d0597731a5c8c1b260fa47396cb5bf8a223f44c8e498532b6e90a2ded35c5fcae058a8682e59ab060c1eeb27e09c8db8588e1d72cfd75b65f867d3e94f9a SHA512 bd37d4f878f2851c8e88acb78699b855cfd306928e2d70ef1d35dc9883d44dae3c7622e2114b1d5c4e0c5865b61ad3958a776467ab45eaedb0cf612530ca5dc7
+EBUILD acme-tiny-4.0.3.ebuild 1140 BLAKE2B cb18452f2f0c95e4b44e66cc78ffb0ede2f91c08b3a672bb3d58185c655c3e7f4e2e8f51c2e7a0e98baf2c5b4ebaf4872e978877fd54c84ec033d342f14e41b1 SHA512 8c1e7e5596061aea3fdf3a7ee875ba9d6ce9cd87d9f70c8f7b5d38b0bf6d83a58284ae21355d0f956743bad5c3408cc9f4ade13547969ba2067e174482f59f1a
+EBUILD acme-tiny-9999.ebuild 1140 BLAKE2B cb18452f2f0c95e4b44e66cc78ffb0ede2f91c08b3a672bb3d58185c655c3e7f4e2e8f51c2e7a0e98baf2c5b4ebaf4872e978877fd54c84ec033d342f14e41b1 SHA512 8c1e7e5596061aea3fdf3a7ee875ba9d6ce9cd87d9f70c8f7b5d38b0bf6d83a58284ae21355d0f956743bad5c3408cc9f4ade13547969ba2067e174482f59f1a
+MISC metadata.xml 429 BLAKE2B 101ebd6c130b6955951254d1c7e759dbf7d5dc08d899c2bf1793e3e73ad2aec4761782d9bcbd708a42a0217cda22255fb645cc6f88792aa0a5445c6b2df79289 SHA512 7c0ff5126424ad18a75bd73fdab208397aedf79df6c6a3fc776efe1000ac9f41e3cd056e65da68fbba507940328c0308074ce9335c4be38a8197f7545728d9da
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
new file mode 100644
index 000000000000..b9815c348094
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
@@ -0,0 +1,48 @@
+# 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} )
+inherit distutils-r1 eapi7-ver
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	fi
+}
+
+src_prepare() {
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
new file mode 100644
index 000000000000..b9815c348094
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -0,0 +1,48 @@
+# 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} )
+inherit distutils-r1 eapi7-ver
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	fi
+}
+
+src_prepare() {
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}
diff --git a/app-crypt/acme-tiny/metadata.xml b/app-crypt/acme-tiny/metadata.xml
new file mode 100644
index 000000000000..1e492cbeec20
--- /dev/null
+++ b/app-crypt/acme-tiny/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>NP-Hardass@gentoo.org</email>
+		<name>NP-Hardass</name>
+	</maintainer>
+	<longdescription>
+		A tiny, auditable script for Let's Encrypt's ACME Protocol
+	</longdescription>
+	<upstream>
+		<remote-id type="github">diafygi/acme-tiny</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
new file mode 100644
index 000000000000..eb9e1d366d83
--- /dev/null
+++ b/app-crypt/acme/Manifest
@@ -0,0 +1,12 @@
+DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
+DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
+DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
+EBUILD acme-0.23.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
+EBUILD acme-0.24.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
+EBUILD acme-0.25.0.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
+EBUILD acme-0.25.1.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
+EBUILD acme-0.26.0.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
+EBUILD acme-9999.ebuild 1261 BLAKE2B fd84623bd4510a088e0d27017f4e30a9b5214d1983298905163a4d944fb63bb1240b650a0ae1079398ccdd3c232fa58672b80f260deff64da0d62ef72c9d6a6f SHA512 0da048ccbf900d3dbde6b3d175a435e1337316d29bb900127c0429c434585a0f864aea1ba8af8262c1878ce77203d52d032614ca9722c063d7bf73607ea41cc0
+MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.23.0.ebuild b/app-crypt/acme/acme-0.23.0.ebuild
new file mode 100644
index 000000000000..1011932ad110
--- /dev/null
+++ b/app-crypt/acme/acme-0.23.0.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/acme/acme-0.24.0.ebuild b/app-crypt/acme/acme-0.24.0.ebuild
new file mode 100644
index 000000000000..1011932ad110
--- /dev/null
+++ b/app-crypt/acme/acme-0.24.0.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/acme/acme-0.25.0.ebuild b/app-crypt/acme/acme-0.25.0.ebuild
new file mode 100644
index 000000000000..7c82dc6d67c0
--- /dev/null
+++ b/app-crypt/acme/acme-0.25.0.ebuild
@@ -0,0 +1,48 @@
+# 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/requests-toolbelt-0.3.0[${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/acme/acme-0.25.1.ebuild b/app-crypt/acme/acme-0.25.1.ebuild
new file mode 100644
index 000000000000..7c82dc6d67c0
--- /dev/null
+++ b/app-crypt/acme/acme-0.25.1.ebuild
@@ -0,0 +1,48 @@
+# 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/requests-toolbelt-0.3.0[${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/acme/acme-0.26.0.ebuild b/app-crypt/acme/acme-0.26.0.ebuild
new file mode 100644
index 000000000000..7c82dc6d67c0
--- /dev/null
+++ b/app-crypt/acme/acme-0.26.0.ebuild
@@ -0,0 +1,48 @@
+# 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/requests-toolbelt-0.3.0[${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/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
new file mode 100644
index 000000000000..d408adeca31b
--- /dev/null
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 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/requests-toolbelt-0.3.0[${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/acme/metadata.xml b/app-crypt/acme/metadata.xml
new file mode 100644
index 000000000000..d18839cc8dac
--- /dev/null
+++ b/app-crypt/acme/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">letsencrypt/letsencrypt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/acr38u-1.7.11-r3 b/app-crypt/acr38u-1.7.11-r3
deleted file mode 100644
index 0fdbb94034aa..000000000000
--- a/app-crypt/acr38u-1.7.11-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=sys-apps/pcsc-lite-1.6.4 virtual/libusb:0 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Non CCID driver for ACR38 AC1038-based Smart Card Reader
-EAPI=6
-HOMEPAGE=https://www.acs.com.hk
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/pcsc-lite-1.6.4 virtual/libusb:0
-SLOT=0
-SRC_URI=https://www.linuxunderground.be/ACR38_LINUX_100711_P.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f67053d770658fd55736ba830be53a2c
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
new file mode 100644
index 000000000000..16a73738857f
--- /dev/null
+++ b/app-crypt/acr38u/Manifest
@@ -0,0 +1,5 @@
+AUX 1.7.11-bis.rules 590 BLAKE2B 8604b9d067bac53501127f7d6ed8b6ef226e6faee64cd89cb0f53f66a89dcbb62e3de71743845c48e5326254f69ab1b07a207375614224066980df672b1bf5f6 SHA512 9e2d806a13a978f1a27a9b3bb6bf4f63809bc3cd03057b513f48bee0d2f2589f75484ff4e0e18dcf8b1b37b9af2465014fc3bcf87b48dd330a375fee3baef52f
+AUX acr38u-1.7.11-build.patch 6299 BLAKE2B 4c18a2c36f980d1ab381373b0312b0049b94d7a8568827f44bde3381018998ef4ad059e3cb8e355da55ec539ce9c303569c1fb29364b0fe06a730c326c4871c7 SHA512 9979ca060a4dc4da526e0a0fbbe45a09e5e261cfde4f928f0dbc514af7d799796a2edf2f81d4015f512d9a374aeab57e971ce34f62cd7b0ac024ec2662c4a029
+DIST ACR38_LINUX_100711_P.tar.bz2 274137 BLAKE2B 0087cc63ee3af898824fd7cfe31f8b1f922ca4dded22215196b2bdaf1296cd50319d4923735fd2ecdb3cc329dee0df7f288a70e875417b02eb0803d19b1613af SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7
+EBUILD acr38u-1.7.11-r3.ebuild 1427 BLAKE2B 5284cca8d7b496b63e3078153038e03fa65e92f2c546fadbeaebb1e7fdd71b6f5b4e21840a41f3eaf456bf83cd5975feba2da8a8cce2feee708ea61c792d2250 SHA512 d7707ef223b52136953520a40b20b7365a5cfdb4623ff097500e8c6f312d6f1e004aa9a2e5c214c7d41f955c75a53370b3689c0a705804bed6e81dee65d90063
+MISC metadata.xml 460 BLAKE2B 67621bd05f882e269bd7d756f61412917070d57b3a328676bdb3e725b0b1bb55f3723f2ead4f8f1e84a83779ea8c8c0ef4c59c49f4dcd80874aaea15e08df6f8 SHA512 ee27e065eecd06d74c8c44d29214ccf96bf1ed980701734f8a7fe0e1a427b486ef554368e74ce3ee1ecb5d86afbf3adb13d08b3e5162ef5c17cc378cbcd19afe
diff --git a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
new file mode 100644
index 000000000000..a75e10f43dcf
--- /dev/null
+++ b/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune versionator toolchain-funcs udev
+
+MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
+
+#SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
+# tarball release is encapsuled in a .zip file :-(
+# http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
+# I'm waiting an answer from info@acs.com.hk about that !
+SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.acs.com.hk"
+
+# Make this safe from collisions, require a version of pcsc-lite that
+# uses libusb-1.0 and use the wrapper library instead.
+# Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
+# libusb-compat is marked stable and primary in the virtual. -ssuominen
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+	virtual/libusb:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	# note: for eudev support this pkg may always need to install rules to /usr
+	udev_newrules "${FILESDIR}"/${PV}-bis.rules 92-pcscd-acr38u.rules
+}
diff --git a/app-crypt/acr38u/files/1.7.11-bis.rules b/app-crypt/acr38u/files/1.7.11-bis.rules
new file mode 100644
index 000000000000..784c606f4044
--- /dev/null
+++ b/app-crypt/acr38u/files/1.7.11-bis.rules
@@ -0,0 +1,15 @@
+# udev rules to set the access rights of non CCID ACR38u smart card readers
+# so they can be used by pcscd
+
+ACTION!="add", GOTO="pcscd_acr38u_rules_end"
+SUBSYSTEM!="usb", GOTO="pcscd_acr38u_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="pcscd_acr38u_rules_end"
+
+# change group from default "root" to "pcscd"
+ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
+
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="9000", ENV{PCSCD}="1"
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="9006", ENV{PCSCD}="1"
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="90CF", ENV{PCSCD}="1"
+
+LABEL="pcscd_acr38u_rules_end"
diff --git a/app-crypt/acr38u/files/acr38u-1.7.11-build.patch b/app-crypt/acr38u/files/acr38u-1.7.11-build.patch
new file mode 100644
index 000000000000..374ca2822c1d
--- /dev/null
+++ b/app-crypt/acr38u/files/acr38u-1.7.11-build.patch
@@ -0,0 +1,178 @@
+Index: ACR38_LINUX_100711_P/configure.ac
+===================================================================
+--- ACR38_LINUX_100711_P.orig/configure.ac
++++ ACR38_LINUX_100711_P/configure.ac
+@@ -58,74 +58,21 @@ if test x${debug} = xtrue ; then
+ 	AC_DEFINE(USBDEBUG, 1, [enable USB debug messaging.])
+ fi
+ 
+-# --enable-pcscdropdir=DIR	; pcsclite installation directory
+-AC_ARG_ENABLE([pcscdropdir],
+-            AS_HELP_STRING([--enable-pcscdropdir=DIR],
+-                           [installation directory of PCSCLITE (default to PREFIX)]),
+-            [pcscdropdir=$enableval],
+-            [pcscdropdir=false])
+-
+-if test "${pcscdropdir}" = false ; then
+-	if test "$prefix" = NONE ; then
+-		pcscdropdir="$ac_default_prefix"
+-	else
+-		pcscdropdir="$prefix"
+-	fi
+-fi
+-
+-# removed by ZETES
+-# AC_SUBST([PKG_PCSC_CONFIG_PATH],[$pcscdropdir/lib/pkgconfig])
+-# removed by ZETES
+-# AC_SUBST([PKG_PCSCLITE],[$pcscdropdir/lib/pkgconfig/libpcsclite.pc])
+-
+-# added by ZETES ...
+-PKG_PCSCLITE="libpcsclite"
+-# ... added by ZETES
+-
+-# Check if pkg-config exists
+-AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes])
+-if test "$PKGCONFIG" = "yes"; then
+-	if ! `pkg-config --print-errors --atleast-version=1.2.0 $PKG_PCSCLITE`
+-	then
+-		AC_MSG_ERROR([install pcsc-lite 1.2.0 or later])
+-	fi
+-fi
+-
+-# Check for libusb 0.1.12
+-PKG_LIBUSB="libusb"
+-if test "$PKGCONFIG" = "yes"; then
+-	if ! `pkg-config --print-errors --atleast-version=0.1.12 $PKG_LIBUSB`
+-	then
+-		AC_MSG_ERROR([install libusb 0.1.12 or later])
+-	fi
+-fi
++PKG_INSTALLDIR()
+ 
+-# --enable-usbdropdir=DIR
+-AC_ARG_ENABLE([usbdropdir],
+-			AC_HELP_STRING([--enable-usbdropdir=DIR],
+-						   [directory containing USB drivers (default to pcscd config or $(prefix)/pcsc/drivers)]),
+-			[usbdropdir="${enableval}"],
+-			[usbdropdir=false])
+-
+-if test "${usbdropdir}" = false ; then
+-	if test "$PKGCONFIG" = yes ; then
+-		usbdropdir=`pkg-config $PKG_PCSCLITE --variable=usbdropdir`
+-	else
+-		usbdropdir=""
+-	fi
+-	if test -z "$usbdropdir" ; then
++PKG_CHECK_MODULES([PCSCLITE], [libpcsclite >= 1.2.0])
++PKG_CHECK_VAR([USBDROPDIR], [libpcsclite], [usbdropdir], [], [
+ 		if test "$prefix" = NONE ; then
+-			usbdropdir="$ac_default_prefix/pcsc/drivers"
++			USBDROPDIR="$ac_default_prefix/pcsc/drivers"
+ 		else
+-			usbdropdir="$prefix/pcsc/drivers"
++			USBDROPDIR="$prefix/pcsc/drivers"
+ 		fi
+-	fi
+-fi
++	      ])
+ 
+-AC_SUBST(usbdropdir)
++# Check for libusb 0.1.12
++PKG_CHECK_MODULES([LIBUSB], [libusb >= 0.1.12])
+ 
+-AC_MSG_RESULT([USB drop directory      : $usbdropdir])
+-AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$usbdropdir", [directory containing USB drivers])
++AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$USBDROPDIR", [directory containing USB drivers])
+ 
+ #AC_SUBST(CTRLLIBCFLAGS)
+ #AC_SUBST(CTRLLIBLIBS)
+@@ -141,7 +88,7 @@ AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR,
+ 
+ # Checks for programs.
+ AC_PROG_CC
+-AC_PROG_LIBTOOL
++AC_PROG_LIBTOOL([disable-static])
+ 
+ # Checks for libraries.
+ # FIXME: Replace `main' with a function in `-lpcsclite':
+@@ -164,8 +111,8 @@ AC_CHECK_HEADERS([fcntl.h limits.h mallo
+ 
+ # Setup the compiler and linker flag
+ OLD_CFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_PCSCLITE`"
+-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_LIBUSB`"
++CFLAGS="$CFLAGS $PCSCLITE_CFLAGS"
++CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+ 
+ # Check for pcsclite header files
+ # removed by ZETES NO_PCSC_MSG="Please install PCSCLITE 1.2.0 or later before building the driver!!"
+@@ -173,12 +120,6 @@ CFLAGS="$CFLAGS `pkg-config --cflags $PK
+ 
+ # removed by ZETES CFLAGS=$OLD_CFLAGS
+ 
+-AC_SUBST(LIBPCSCLITE)
+-LIBPCSCLITE=`pkg-config --libs $PKG_PCSCLITE`
+-
+-AC_SUBST(LIBUSB)
+-LIBUSB=`pkg-config --libs $PKG_LIBUSB`
+-
+ # Select OS specific versions of source files.
+ AC_SUBST(BUNDLE_HOST)
+ AC_SUBST(DYN_LIB_EXT)
+Index: ACR38_LINUX_100711_P/src/controllib/Makefile.am
+===================================================================
+--- ACR38_LINUX_100711_P.orig/src/controllib/Makefile.am
++++ ACR38_LINUX_100711_P/src/controllib/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ ACR38_CONTROLLIB = libacr38ucontrol.$(DYN_LIB_EXT)
+ 
+-AM_CPPFLAGS = -I../driver `pkg-config libpcsclite --cflags` 
++AM_CPPFLAGS = -I$(srcdir)/../driver $(PCSCLITE_CFLAGS)
+ 
+ lib_LTLIBRARIES = libacr38ucontrol.la
+ include_HEADERS = ACS38DrvTools.h
+@@ -16,8 +16,6 @@ SRC_CONTROLLIB = ACS38DrvTools.c		\
+ 				 ACS38DrvTools.h
+ 
+ libacr38ucontrol_la_SOURCES = $(SRC_CONTROLLIB)
+-libacr38ucontrol_la_CFLAGS = `pkg-config libpcsclite --cflags`
++libacr38ucontrol_la_CFLAGS = $(PCSCLITE_CFLAGS)
+ 
+-#pcdir= $(PKG_PCSC_CONFIG_PATH)
+-pcdir= @prefix@/lib/pkgconfig
+-pc_DATA = libacr38ucontrol.pc
++pkgconfig_DATA = libacr38ucontrol.pc
+Index: ACR38_LINUX_100711_P/src/driver/Makefile.am
+===================================================================
+--- ACR38_LINUX_100711_P.orig/src/driver/Makefile.am
++++ ACR38_LINUX_100711_P/src/driver/Makefile.am
+@@ -9,7 +9,7 @@ DRIVER_LIB_NAME = lib$(DRIVER_NAME).$(DY
+ DRIVER_BUNDLE_DIR = $(DRIVER_NAME).bundle
+ DRIVER_INSTALL_HOME_DIR = pcsc/drivers/$(DRIVER_LIB_NAME).bundle/Contents/Linux
+ 
+-AM_CPPFLAGS = `pkg-config libpcsclite --cflags`
++AM_CPPFLAGS = $(PCSCLITE_CFLAGS)
+ 
+ EXTRA_DIST = Info.plist
+ 
+@@ -34,13 +34,13 @@ SRC_USB = usbserial_linux.c \
+ 	usbserial_linux.h
+ 
+ libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
+-libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @LIBUSB@ @COREFOUNDATION@ @IOKIT@
++libACR38UDriver_la_LIBADD = @PCSCLITE_LIBS@ @LIBUSB_LIBS@ @COREFOUNDATION@ @IOKIT@
+ 
+ install: libACR38UDriver.la
+-	$(mkinstalldirs) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/
+-	$(INSTALL) .libs/$(DRIVER_LIB_NAME) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_NAME)
+-	$(INSTALL) Info.plist $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents
+-#	chmod 755 $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_LIB_NAME)
++	$(MKDIR_P) $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/
++	$(INSTALL) .libs/$(DRIVER_LIB_NAME) $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_NAME)
++	$(INSTALL) $(srcdir)/Info.plist $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents
++#	chmod 755 $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_LIB_NAME)
+ 
+ uninstall:
+-	rm -rf $(usbdropdir)/$(DRIVER_BUNDLE_DIR)
++	rm -rf $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)
diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
new file mode 100644
index 000000000000..b7f98870cc26
--- /dev/null
+++ b/app-crypt/acr38u/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>vincent.hardy.be@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/aescrypt-3.0.6b b/app-crypt/aescrypt-3.0.6b
deleted file mode 100644
index f53b0ff163fb..000000000000
--- a/app-crypt/aescrypt-3.0.6b
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile
-DESCRIPTION=Advanced file encryption using AES
-EAPI=6
-HOMEPAGE=https://www.aescrypt.com/
-IUSE=static
-KEYWORDS=~amd64
-LICENSE=BSD GPL-2
-SLOT=0
-SRC_URI=https://www.aescrypt.com/download/v3/aescrypt-3.0.6b.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=178adbf5ed4aa1ed2be9af3e8a5c0770
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
new file mode 100644
index 000000000000..bc126f16a159
--- /dev/null
+++ b/app-crypt/aescrypt/Manifest
@@ -0,0 +1,5 @@
+AUX aescrypt-3.0.6b-build.patch 1711 BLAKE2B df5eccdc516e0314a137b1c51e5ae05fe5e66c8defe892599b295d5720e26b3a5cde9e262b7f09faf9db0a57bc0479f3be1481b65c0f62ffcdb404db90051e5e SHA512 b19e4eba11753bb8929d14eddc4ef391c8ec62b2bb57cf63b1a74b9a27250b4719ece8f1a6b790c1f662738b92bb37da96c973dd38cdf059c7482edb3dbd0f0e
+AUX aescrypt-3.0.6b-iconv.patch 1096 BLAKE2B 91d6e74ea8b760e81887a799ee5e8709ea7afc7f499842879091dcffdca76f24cc9191ac438c03b9f7f4970f55beca1586d56f3262e5d0f1de53366464141c2e SHA512 bf8d564493ae9396f024c1e33a775a53833da9d984ff059f714362a2cc112c3e6bd575c5d64fc0f7118fd578af645f386d649483ab56c2a0cb8d9b0795161409
+DIST aescrypt-3.0.6b.tar.gz 28272 BLAKE2B ce5347b77d974c76dadaa820b5b90a56015019f846bbc61560c33032adad08576d5e5ddd7d9e1020878e35b40173a2c5e29578e2f6e98631725442beac6f19ac SHA512 4c88abc9bff50ae5d310be7dad8f29843941843f9b484d9846b08dc76c605940adbb375f7e8ffefd6e8236f35ff860a745f89226e9c171bfa70c28c16aa6626a
+EBUILD aescrypt-3.0.6b.ebuild 638 BLAKE2B 2b7d10d3a0fde0d8a98c991328a694906a90613b63bfed50db342f66071d45e09a642bc1974bd8a1d98868b6888cdeda9cfa3591525438206dc46d12a39ec1cc SHA512 00bce3b1a9526fa1144e234cd4326ea4afdcaec7a9f29d62e1f532bfd2f6dec19ecf868fa92ce7c1dfbf66e5063d0762037c6b1b267857280158b57562842993
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild b/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
new file mode 100644
index 000000000000..73d76b66a2db
--- /dev/null
+++ b/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Advanced file encryption using AES"
+HOMEPAGE="https://www.aescrypt.com/"
+SRC_URI="https://www.aescrypt.com/download/v3/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-iconv.patch"
+)
+
+src_compile() {
+	if use static; then
+		append-cflags "-DDISABLE_ICONV"
+		append-ldflags "-static"
+	fi
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
diff --git a/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch b/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch
new file mode 100644
index 000000000000..8dac5b4e6f47
--- /dev/null
+++ b/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch
@@ -0,0 +1,62 @@
+From ab74ea544739ab044af1e9b398770d31add3b435 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 2 Feb 2013 01:16:03 +0200
+Subject: [PATCH 1/2] build: respect CFLAGS, DESTDIR and permissions
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ac661a8..abcdcc4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,8 @@ CC=gcc
+ 
+ #The below line is for debugging
+ #CFLAGS=-I. -ggdb -Wall -D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -D_FILE_OFFSET_BITS=64
++CFLAGS=-Wall
++EXTRA_CFLAGS=-D_FILE_OFFSET_BITS=64
+ 
+ LIBS=
+ 
+@@ -27,10 +28,10 @@ LIBS=
+ all: aescrypt aescrypt_keygen
+ 
+ aescrypt: aescrypt.o aes.o sha256.o password.o keyfile.o
+-	$(CC) $(CFLAGS) $(LIBS) -o $@ $^
++	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $^
+ 
+ aescrypt_keygen: aescrypt_keygen.o password.o
+-	$(CC) $(CFLAGS) $(LIBS) -o $@ $^
++	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $^
+ 
+ test:
+ 	@$(CC) -DTEST -o sha.test sha256.c
+@@ -48,15 +49,16 @@ testfile: aescrypt
+ 	cmp test.orig.txt test.txt
+ 
+ %.o: %.c %.h
+-	$(CC) $(CFLAGS) -c $*.c
++	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $*.c
+ 
+ install: aescrypt
+-	install -o root -g root -m 755 aescrypt /usr/bin
+-	install -o root -g root -m 755 aescrypt_keygen /usr/bin
++	install -m 755 -d $(DESTDIR)/usr/bin
++	install -m 755 aescrypt $(DESTDIR)/usr/bin
++	install -m 755 aescrypt_keygen $(DESTDIR)/usr/bin
+ 
+ uninstall:
+-	rm -f /usr/bin/aescrypt
+-	rm -f /usr/bin/aescrypt_keygen
++	rm -f $(DESTDIR)/usr/bin/aescrypt
++	rm -f $(DESTDIR)/usr/bin/aescrypt_keygen
+ 
+ clean:
+ 	rm -f *.o aescrypt aescrypt_keygen test* *test
+-- 
+1.7.12.4
+
diff --git a/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch b/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch
new file mode 100644
index 000000000000..616e87e38d61
--- /dev/null
+++ b/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch
@@ -0,0 +1,40 @@
+From 337cc9367a3cb4450eee245c6ceb615d0f05499d Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 2 Feb 2013 01:18:08 +0200
+Subject: [PATCH 2/2] build: support disable iconv for static build
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ password.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/password.c b/password.c
+index 9a2c1f8..dee79da 100644
+--- a/password.c
++++ b/password.c
+@@ -232,6 +232,15 @@ int passwd_to_utf16(unsigned char *in_passwd,
+     size_t ic_inbytesleft,
+            ic_outbytesleft;
+ 
++#ifdef DISABLE_ICONV
++    /* support only latin */
++    int i;
++    for (i=0;i<length+1;i++) {
++    	out_passwd[i*2] = in_passwd[i];
++	out_passwd[i*2+1] = 0;
++    }
++    return length*2;
++#else
+     /* Max length is specified in character, but this function deals
+      * with bytes.  So, multiply by two since we are going to create a
+      * UTF-16 string.
+@@ -273,5 +282,6 @@ int passwd_to_utf16(unsigned char *in_passwd,
+     }
+     iconv_close(condesc);
+     return (max_length - ic_outbytesleft);
++#endif
+ }
+ 
+-- 
+1.7.12.4
+
diff --git a/app-crypt/aescrypt/metadata.xml b/app-crypt/aescrypt/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/aescrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/aespipe-2.4e b/app-crypt/aespipe-2.4e
deleted file mode 100644
index 99c372045e18..000000000000
--- a/app-crypt/aespipe-2.4e
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Encrypts data from stdin to stdout
-EAPI=6
-HOMEPAGE=http://loop-aes.sourceforge.net
-IUSE=+asm cpu_flags_x86_aes cpu_flags_x86_padlock static
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=app-arch/sharutils app-crypt/gnupg
-SLOT=0
-SRC_URI=http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4e.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df7a91ebdd82ec15a1fca6864939954c
diff --git a/app-crypt/aespipe/Manifest b/app-crypt/aespipe/Manifest
new file mode 100644
index 000000000000..2649a85bc577
--- /dev/null
+++ b/app-crypt/aespipe/Manifest
@@ -0,0 +1,3 @@
+DIST aespipe-v2.4e.tar.bz2 107741 BLAKE2B 9331441214b495f042f8ac41b57203057e762156aa7b6bd9fcb8d55b3e149fb79dd0d7c06358599fefd6662d797baf4cf9ba84fc4425e637c9fef0abf1b254c7 SHA512 e038f710ac971e5ba740648c0f255e8bc9fcea9be1a6b76208a453f21f013e1662c006d4f4495fa2b2560fd9b0c236947462a9b337a120073c6a5335b29f077e
+EBUILD aespipe-2.4e.ebuild 749 BLAKE2B bcd83aee8746f3f8715bcf91f356deb535cddd59a56552157f5ad34e0fb701bfd468d8b1e5afacb8946c6d54d6a95266f255f15284267189c60a479435c44400 SHA512 aee20bf51f635afc122eb35e88038cf0441d5bc80cd13d676d2877644422dc762f9a5f73c253d235367a2a06a5e6ece931be14d55fb842f7b89861ba8b6fbac2
+MISC metadata.xml 524 BLAKE2B fa8c7f3af8af1e270a415b22b8d79ba56968a4796f8aadb6891bde03dfb1bd00f970bcd6625f44d0d85af033c5e70cdd89be85aec0fdea953d455009d9c2bf1e SHA512 f4f83f8a2e74c242163be7fc553e522b0fc6c910718658d1ffce1767193a042c5a4e86bd7ccbf8bc6cd37d68f71ee763dd02bf4df2a73845e83eee0dac6db8b5
diff --git a/app-crypt/aespipe/aespipe-2.4e.ebuild b/app-crypt/aespipe/aespipe-2.4e.ebuild
new file mode 100644
index 000000000000..56384993c289
--- /dev/null
+++ b/app-crypt/aespipe/aespipe-2.4e.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+DEPEND=""
+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
new file mode 100644
index 000000000000..f7a9049e7d05
--- /dev/null
+++ b/app-crypt/aespipe/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<use>
+		<flag name="asm">Enable assembly modules</flag>
+		<flag name="cpu_flags_x86_padlock">Use VIA padlock instructions,
+		detected at run time, code still works on non-padlock processors</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">loop-aes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/af_alg-0.0.1 b/app-crypt/af_alg-0.0.1
deleted file mode 100644
index df7fc052af89..000000000000
--- a/app-crypt/af_alg-0.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/linux-sources !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=af_alg is an openssl crypto engine kernel interface thing
-EAPI=5
-HOMEPAGE=https://github.com/sarnold/af_alg
-IUSE=libressl kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=openssl
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/af_alg-0.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e069a3c7ff19db2a2ee1a528f35a9526
diff --git a/app-crypt/af_alg-0_pre20120229 b/app-crypt/af_alg-0_pre20120229
deleted file mode 100644
index 3c9b38701469..000000000000
--- a/app-crypt/af_alg-0_pre20120229
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=AF_ALG for OpenSSL
-EAPI=5
-HOMEPAGE=http://carnivore.it/2011/04/23/openssl_-_af_alg
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=openssl
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=http://src.carnivore.it/users/common/af_alg/snapshot/af_alg-7b13512edbd77c35d20edb4e53d5d83eeaf05d52.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5dd0a88d5aaeac512301a1ac95065e70
diff --git a/app-crypt/af_alg/Manifest b/app-crypt/af_alg/Manifest
new file mode 100644
index 000000000000..87d87e5e94f2
--- /dev/null
+++ b/app-crypt/af_alg/Manifest
@@ -0,0 +1,5 @@
+DIST af_alg-0.0.1.tar.gz 332007 BLAKE2B 05d26e08c5ed56bc94626bfd6883fce99a1e630fb3f8b7f4f2847889308df57279f347f5e847cfa65d1356fac606eb1a4798d07ce093415dd900328710e32975 SHA512 10860268dbff65e20d78c7d251b5ac4e63342e01c30af72894baa63a625f11900a77a8d0cca29d93bd3a06ae29c16c5fc4d71843e7379b7d948ad1b6e6b58b5b
+DIST af_alg-7b13512edbd77c35d20edb4e53d5d83eeaf05d52.tar.gz 5362 BLAKE2B 7d2423de81eae776b8f744747458c71b794656351cef56b7a4b4ffed049033a8367b598b075ac758f2e9e977d724d5a0b86c7c242ecb507d7d318bc7610071eb SHA512 c897a64ce12c5ecbdf8147a8776b646b9fed7d012cbc913e1f047eff4dd81fe1783733d64e711ab3702923b57055e4ca923cdf4f90bef6a4868f803be11239ca
+EBUILD af_alg-0.0.1.ebuild 1004 BLAKE2B 5f4a9166fb1f7a82b5451632448674f8307a2b9ff423b5e0758ec3fc4affe3c5fe34e67967b81c0d794ba6d01e83ab52b1e8f01a92f8783a68971e7a3886997a SHA512 e866279daa5ea16c83bd8b0135a68f069b9256e7da41992e84e86504f92ee3de8f761377f7ef0bff40c3822e1c453bab2a2a1d046115e6190b4f293ff9a3d42a
+EBUILD af_alg-0_pre20120229.ebuild 839 BLAKE2B 5684c4abbcc49ff0d75012cf9bea7c31eae0f460395170f540065c39da691889b312771273ddeeee9716fda2271d43bec25cdd9251414485035477ba896f02b3 SHA512 f0cdf0c4d7639ccbe3007feab6d321afa3620122095fd7eb90af4ac0e547ad4958cefd34aee2158db88dbcc21f11e9d4b678eaab110dce55a9319dca4c656ef8
+MISC metadata.xml 775 BLAKE2B 0fe9a6f6286366322ac68be18d4fd5bbf20b7f5ec303cc90f08f88742684c14243a8c0f3f6804335950ec35758f3fe646399a4c3f392f3e30713e6644842efbe SHA512 0e58d079d14a8559c56780c77eb6221ef1abba227b5b2c32306eed7d9b562b84724868488680adc2b21c3e810cd8700649d89cff0821583657b619c1a5ae4671
diff --git a/app-crypt/af_alg/af_alg-0.0.1.ebuild b/app-crypt/af_alg/af_alg-0.0.1.ebuild
new file mode 100644
index 000000000000..5494c4339d9c
--- /dev/null
+++ b/app-crypt/af_alg/af_alg-0.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="af_alg"
+
+inherit autotools eutils libtool linux-info versionator
+
+DESCRIPTION="af_alg is an openssl crypto engine kernel interface thing"
+HOMEPAGE="https://github.com/sarnold/af_alg"
+SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="virtual/linux-sources
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND=""
+
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+CONFIG_CHECK="~CRYPTO_USER_API"
+WARNING_CRYPTO_USER_API="You need to enable CONFIG_CRYPTO_USER_API in order to use this package."
+
+src_prepare() {
+	sed -i -e "s|ssl/engines|engines|" "${S}"/configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-pic
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README.rst
+
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/af_alg/af_alg-0_pre20120229.ebuild b/app-crypt/af_alg/af_alg-0_pre20120229.ebuild
new file mode 100644
index 000000000000..1ca991a06c2c
--- /dev/null
+++ b/app-crypt/af_alg/af_alg-0_pre20120229.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib
+
+COMMIT_ID=7b13512edbd77c35d20edb4e53d5d83eeaf05d52
+
+DESCRIPTION="AF_ALG for OpenSSL"
+HOMEPAGE="http://carnivore.it/2011/04/23/openssl_-_af_alg"
+
+MY_P="$PN-${COMMIT_ID}"
+SRC_URI="http://src.carnivore.it/users/common/af_alg/snapshot/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wall -fPIC \
+		-shared -Wl,-soname,libaf_alg.so -lcrypto -o libaf_alg.so \
+		e_af_alg.c
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/engines
+	doexe libaf_alg.so
+	dodoc README
+}
diff --git a/app-crypt/af_alg/metadata.xml b/app-crypt/af_alg/metadata.xml
new file mode 100644
index 000000000000..311413031703
--- /dev/null
+++ b/app-crypt/af_alg/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>nerdboy@gentoo.org</email>
+	<name>Stephen Arnold</name>
+</maintainer>
+<longdescription lang="en">
+af_alg implements an OpenSSL engine that uses the AF_ALG functionailty found in
+kernel &gt;= 2.6.38 for crypto offload. Be sure to actually check if it's faster,
+as for many modern systems, userspace software implementations are actually
+faster, as they avoid a kernel context switch. However, on embedded systems and
+others with crypto hardware, AF_ALG may be faster.  The upstream readme has more
+details.
+</longdescription>
+<upstream>
+	<remote-id type="github">sarnold/af_alg</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-crypt/argon2-20161029-r1 b/app-crypt/argon2-20161029-r1
deleted file mode 100644
index 588af839d3be..000000000000
--- a/app-crypt/argon2-20161029-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Password hashing software that won the Password Hashing Competition (PHC)
-EAPI=6
-HOMEPAGE=https://github.com/P-H-C/phc-winner-argon2
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( Apache-2.0 CC0-1.0 )
-SLOT=0/0
-SRC_URI=https://github.com/P-H-C/phc-winner-argon2/archive/20161029.tar.gz -> argon2-20161029.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=298a05ebd204437ae73bb4f8960df6dc
diff --git a/app-crypt/argon2-20171227 b/app-crypt/argon2-20171227
deleted file mode 100644
index 8f0b99e94064..000000000000
--- a/app-crypt/argon2-20171227
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Password hashing software that won the Password Hashing Competition (PHC)
-EAPI=6
-HOMEPAGE=https://github.com/P-H-C/phc-winner-argon2
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( Apache-2.0 CC0-1.0 )
-SLOT=0/1
-SRC_URI=https://github.com/P-H-C/phc-winner-argon2/archive/20171227.tar.gz -> argon2-20171227.tar.gz
-_md5_=ce5876bb92834b641878c6b61c1093d7
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
new file mode 100644
index 000000000000..a32f455556de
--- /dev/null
+++ b/app-crypt/argon2/Manifest
@@ -0,0 +1,6 @@
+AUX argon2-20161029-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839ba243a821ab4ba2a40708e8a4dd30be4f264b6280375defa716b430cd4a029f047e08a06a8a29ab4a07abbec50619155fa5e015bd59b48e SHA512 de2e9e0f5b378700aa01004684f7aa9fc60d6e49cd6f994663bb8bb7c357732cbf19c31a563c44b485d5b85a75ea76c283f606ce1d453864b987febd2cbeaa27
+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 870 BLAKE2B 0e6bb20eabc41ff739bf3d391a2166e768fe3d5153a24f9d8a2bc2d324f140da294b5a08befd06cbfab7147b264a4a6206122eba39d4c067bd0d279e1484e458 SHA512 8f1b1188e72c257b545a76b6a5497c93cb7eba9e4a2afd3ab5e1822b67027fbff98ae983b5fcdbb0a964960132d21a24529487296b4e134a9b8d7c9797ca895e
+MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20161029-r1.ebuild b/app-crypt/argon2/argon2-20161029-r1.ebuild
new file mode 100644
index 000000000000..1af92a371835
--- /dev/null
+++ b/app-crypt/argon2/argon2-20161029-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib
+
+DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
+HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
+SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 CC0-1.0 )"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static-libs"
+
+S="${WORKDIR}/phc-winner-${P}"
+PATCHES=(
+	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"
+	)
+src_prepare() {
+	default
+	if ! use static-libs; then
+		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
+	fi
+	sed -i -e 's/-O3 //' Makefile || die "sed failed"
+	sed -i -e 's/-g //' Makefile || die "sed failed"
+	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
+	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBRARY_REL=$(get_libdir) install || die
+}
diff --git a/app-crypt/argon2/argon2-20171227.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
new file mode 100644
index 000000000000..cba8e3f4d236
--- /dev/null
+++ b/app-crypt/argon2/argon2-20171227.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
+HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
+SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 CC0-1.0 )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static-libs"
+
+S="${WORKDIR}/phc-winner-${P}"
+
+src_prepare() {
+	default
+	if ! use static-libs; then
+		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
+	fi
+	sed -i -e 's/-O3 //' -e 's/-g //' -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install || die
+}
diff --git a/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch
new file mode 100644
index 000000000000..11892de11158
--- /dev/null
+++ b/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile b/Makefile
+index 1838c13..85aa710 100644
+--- a/Makefile
++++ b/Makefile
+@@ -87,8 +87,10 @@ endif
+ endif
+ 
+ LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
++LIB_SH_VERSION := $(LIB_SH).0
+ LIB_ST := lib$(LIB_NAME).a
+ LIBRARIES = $(LIB_SH) $(LIB_ST)
++INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
+ HEADERS = include/argon2.h
+ 
+ INSTALL = install
+@@ -153,9 +155,11 @@ format:
+ 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
+ 
+ install: $(RUN) libs
++	mv $(LIB_SH) $(LIB_SH_VERSION)
++	ln -sf $(LIB_SH_VERSION) $(LIB_SH)
+ 	$(INSTALL) -d $(INST_INCLUDE)
+ 	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
+ 	$(INSTALL) -d $(INST_LIBRARY)
+-	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
++	$(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
+ 	$(INSTALL) -d $(INST_BINARY)
+ 	$(INSTALL) $(RUN) $(INST_BINARY)
diff --git a/app-crypt/argon2/metadata.xml b/app-crypt/argon2/metadata.xml
new file mode 100644
index 000000000000..b877484ca660
--- /dev/null
+++ b/app-crypt/argon2/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>simon-bgo@slevermann.de</email>
+		<name>Simon Levermann</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Argon2 is a password hashing tool and library that won the Password Hashing Competition (PHC)</longdescription>
+	<slots>
+		<subslots>Reflect ABI of libargon2.so.</subslots>
+	</slots>
+	<upstream>
+		<remote-id type="github">P-H-C/phc-winner-argon2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/asedriveiiie-serial-3.5 b/app-crypt/asedriveiiie-serial-3.5
deleted file mode 100644
index 3992ee2fdd61..000000000000
--- a/app-crypt/asedriveiiie-serial-3.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=sys-apps/pcsc-lite-1.3.0 virtual/pkgconfig
-DESCRIPTION=ASEDriveIIIe Serial Card Reader
-EAPI=6
-HOMEPAGE=http://www.athena-scs.com
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=sys-apps/pcsc-lite-1.3.0
-SLOT=0
-SRC_URI=http://www.athena-scs.com/downloads/asedriveiiie-serial-3.5.tar.bz2
-_md5_=20ab2c00e690848dcf7cb69724d0e163
diff --git a/app-crypt/asedriveiiie-serial/Manifest b/app-crypt/asedriveiiie-serial/Manifest
new file mode 100644
index 000000000000..2458527b7959
--- /dev/null
+++ b/app-crypt/asedriveiiie-serial/Manifest
@@ -0,0 +1,3 @@
+DIST asedriveiiie-serial-3.5.tar.bz2 32461 BLAKE2B e63162ab6f0a03e8b48e6a2d7e653f52d1cdb5b6564ea2fe8b10cee51b9769133a6f16c4176ac208c35c78600b6a636c0e0d97d7458c912caf1052ba78829b0d SHA512 b74ea2225990c36e86d106fa7e9e844e1f99d87f9869416faf3dfaa1ecaca34b4bdd4e5887746c6b039de325e03ede3ee78aadeaf20d0fabc8deba48a72a93b3
+EBUILD asedriveiiie-serial-3.5.ebuild 1033 BLAKE2B 5eccc4036fc4c6f1fd00dbefd81157a90ec3cbda9c2923e8cfe9e72d78b795c958fb44ae0943919745fc4722d61d6977005b28ca241d42571050b9862beb48e6 SHA512 86ae19c705189914c94ce4be71648ba55554c5f6b8f037d3d8dc6ffb0de90036aa128d93629a68bfe6ae32bd2c116ae3ce2258e9b05f4cfa49d688bb10114193
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild b/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
new file mode 100644
index 000000000000..f4fe0e818025
--- /dev/null
+++ b/app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="ASEDriveIIIe Serial Card Reader"
+HOMEPAGE="http://www.athena-scs.com"
+SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+RDEPEND=">=sys-apps/pcsc-lite-1.3.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	default
+
+	local conf="/etc/reader.conf.d/${PN}.conf"
+
+	dodir "$(dirname "${conf}")"
+	insinto "$(dirname "${conf}")"
+	newins "etc/reader.conf" "$(basename "${conf}")"
+}
+
+pkg_postinst() {
+	elog "NOTICE:"
+	elog "1. Update ${conf} file"
+	elog "2. Run update-reader.conf, yes this is a command..."
+	elog "3. Restart pcscd"
+}
+
+pkg_postrm() {
+	#
+	# Without this, pcscd will not start next time.
+	#
+	local conf="/etc/reader.conf.d/${PN}.conf"
+	if ! [ -f "$(grep LIBPATH "${conf}" | sed 's/LIBPATH *//' | sed 's/ *$//g' | head -n 1)" ]; then
+		rm "${conf}"
+		update-reader.conf
+		elog "NOTICE:"
+		elog "You need to restart pcscd"
+	fi
+}
diff --git a/app-crypt/asedriveiiie-serial/metadata.xml b/app-crypt/asedriveiiie-serial/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/asedriveiiie-serial/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/asedriveiiie-usb-3.5 b/app-crypt/asedriveiiie-usb-3.5
deleted file mode 100644
index aab6769f62c1..000000000000
--- a/app-crypt/asedriveiiie-usb-3.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DEPEND=>=sys-apps/pcsc-lite-1.3.0 virtual/libusb:0 virtual/pkgconfig
-DESCRIPTION=ASEDriveIIIe USB Card Reader
-EAPI=6
-HOMEPAGE=http://www.athena-scs.com
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=sys-apps/pcsc-lite-1.3.0 virtual/libusb:0
-SLOT=0
-SRC_URI=http://www.athena-scs.com/downloads/asedriveiiie-usb-3.5.tar.bz2
-_md5_=605348e34406ead4e99389cec889b2c4
diff --git a/app-crypt/asedriveiiie-usb/Manifest b/app-crypt/asedriveiiie-usb/Manifest
new file mode 100644
index 000000000000..36511ae2f9be
--- /dev/null
+++ b/app-crypt/asedriveiiie-usb/Manifest
@@ -0,0 +1,3 @@
+DIST asedriveiiie-usb-3.5.tar.bz2 32595 BLAKE2B 6532957e1d778a697185c08f8b1852bed53fc6c6141e4bc84f000cedbf6779c691dc92b643c619c0b6f67c39cac72f4e5dc57edf9285d3cfc4ce1b3240c4809e SHA512 aa718a1f4b28c9186e120bb8e2216389a8a9f54ac3f299a9cd72c398594fcf23229ac4a14e5358cc02e6fcd2ce3abe0e1e4125e4dac8d302bdc325a3f410744f
+EBUILD asedriveiiie-usb-3.5.ebuild 473 BLAKE2B 103f1ac65d98424038ff90019e7b5d415580090f5d47e1c88a6559b454ad3ab875a5848b6ecffde57ba9e3e5864ab4d9b7e1e17e7a6efb7f448bec6cbed061a7 SHA512 8bd16c54f44e8a69b51d79d8c9cb59539ff61a33333a6e339ecada178b30332bd7e857e582a142fe709d01fe8cc7a97f721dee46a6609287c0aca4f92844622d
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
new file mode 100644
index 000000000000..6eb55016bf55
--- /dev/null
+++ b/app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="ASEDriveIIIe USB Card Reader"
+HOMEPAGE="http://www.athena-scs.com"
+SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+RDEPEND=">=sys-apps/pcsc-lite-1.3.0
+	virtual/libusb:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	elog "NOTICE:"
+	elog "You should restart pcscd."
+}
diff --git a/app-crypt/asedriveiiie-usb/metadata.xml b/app-crypt/asedriveiiie-usb/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/asedriveiiie-usb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/asekey-3.7 b/app-crypt/asekey-3.7
deleted file mode 100644
index 5c240b265ccc..000000000000
--- a/app-crypt/asekey-3.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-apps/pcsc-lite[udev] virtual/libusb:0 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=ASEKey USB SIM Card Reader
-EAPI=6
-HOMEPAGE=http://www.athena-scs.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD LGPL-2.1
-RDEPEND=sys-apps/pcsc-lite[udev] virtual/libusb:0
-SLOT=0
-SRC_URI=http://www.athena-scs.com//docs/reader-drivers/asekey-3-7-tar.bz2 -> asekey-3.7.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
-_md5_=0290adbc85b83606ec7185142d125284
diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
new file mode 100644
index 000000000000..1927e64c6c94
--- /dev/null
+++ b/app-crypt/asekey/Manifest
@@ -0,0 +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 695 BLAKE2B 6300b3cd2068f97b05a58ad5f80ed14607f983d31ca30b14e964ecb9870210658246a27cce5da5e42436ccef5467dc32619dcdc57820e27e1c7d81045026a8f7 SHA512 ce08ce55c3469ffeea99c6b9532cae49abd820b473f659ed0a15ead69629774a2aceb25a8007935616e52c3fd6eeb90c071f24a320fe6199905f6fe8aca2f047
+MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
new file mode 100644
index 000000000000..4c35c71eb638
--- /dev/null
+++ b/app-crypt/asekey/asekey-3.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev
+
+DESCRIPTION="ASEKey USB SIM Card Reader"
+HOMEPAGE="http://www.athena-scs.com/"
+SRC_URI="${HOMEPAGE}/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2"
+LICENSE="BSD LGPL-2.1"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-apps/pcsc-lite[udev]"
+RDEPEND="${RDEPEND}
+	virtual/libusb:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-bundle.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's/GROUP="pcscd"/ENV{PCSCD}="1"/' "92_pcscd_${PN}.rules" || die
+}
+
+src_configure() {
+	econf --with-udev-rules-dir="$(get_udevdir)/rules.d"
+}
diff --git a/app-crypt/asekey/files/asekey-3.7-bundle.patch b/app-crypt/asekey/files/asekey-3.7-bundle.patch
new file mode 100644
index 000000000000..fd233001718e
--- /dev/null
+++ b/app-crypt/asekey/files/asekey-3.7-bundle.patch
@@ -0,0 +1,24 @@
+diff --git a/Info.plist b/Info.plist
+index ed473da..9d59815 100644
+--- a/Info.plist
++++ b/Info.plist
+@@ -14,6 +14,7 @@
+         <string>ASEKey</string>
+         <string>ASEKey</string>
+     </array>
++    <key>CFBundleExecutable</key>
+     <array>
+         <string>libASEKey.so</string>
+         <string>libASEKey.so</string>
+diff --git a/Makefile b/Makefile
+index 285ceff..1b06fd1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,6 @@ clean:
+ 
+ install:	all
+ 	install -c -d "${DRIVER_DIR}/Contents/${KERNEL_NAME}"
+-	install -c -m 0755 libASEKey.so "${DRIVER_DIR}"
+ 	install -c -m 0644 Info.plist "${DRIVER_DIR}/Contents/"
+ 	install -c -m 0755 libASEKey.so "${DRIVER_DIR}/Contents/${KERNEL_NAME}"
+ 	install -c -d "${UDEV_DIR}"
diff --git a/app-crypt/asekey/metadata.xml b/app-crypt/asekey/metadata.xml
new file mode 100644
index 000000000000..040cba5f7c5b
--- /dev/null
+++ b/app-crypt/asekey/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/bcwipe-1.9.13 b/app-crypt/bcwipe-1.9.13
deleted file mode 100644
index 0b26aaf1d233..000000000000
--- a/app-crypt/bcwipe-1.9.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst test
-DESCRIPTION=Secure file removal utility
-EAPI=6
-HOMEPAGE=http://www.jetico.com/
-IUSE=doc
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=bestcrypt
-SLOT=0
-SRC_URI=https://www.jetico.com/linux/BCWipe-1.9-13.tar.gz doc? ( http://www.jetico.com/linux/BCWipe.doc.tgz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=602d8b75c983e92395aec82a77529bf4
diff --git a/app-crypt/bcwipe/Manifest b/app-crypt/bcwipe/Manifest
new file mode 100644
index 000000000000..1aaeb251bda6
--- /dev/null
+++ b/app-crypt/bcwipe/Manifest
@@ -0,0 +1,6 @@
+AUX bcwipe-1.9.7-fix_warnings.patch 415 BLAKE2B ae41040cbc9343e06eaee372b8bdb656eaac711faa2cc437ac59043c9dd58950234ff67637d5e8b0faba4c9a18bba270f53255fd87590ed7ee753d47b3818630 SHA512 504487c91ba3ed47f5d32ff5c4084bfcc10999d5ab42018d233ca160f55631daf466015e8aa81f644b834c00529a984ec026a05f28d7401162bc786a8bdcd5ad
+AUX bcwipe-1.9.8-fix-flags.patch 603 BLAKE2B 094af104ff114c4fce3907215ab06db51af2fad2f000f9bfc391dd056432a2c6c5a988561d7c462f6fc99411fc26c9445f81a250db29899f76ee1c0672b9e602 SHA512 9141f81dd722bfe59466bab3d547869aca9178d27912edc61f9ab95044d0e57151870400a1550fe59e0f3c252878b6971486d0b38e2fb24da3241b0dca00ca87
+DIST BCWipe-1.9-13.tar.gz 141092 BLAKE2B 0d7e8f5841b388bb9e200ae533f8706d951e017923a69314173d44fcbec2ac2f3ab8c0c97de9054e12f1560f075e5af0e32ddac855df8f9bc28fb1bb637edbc6 SHA512 801b6d3c55d82915da14b3136c9ddba7fc947b40c07ba135c410e1e2703f74735d32ebb043d44325f615005631930ce48b4075885f1a928cf8f4a2d4c67ca5cc
+DIST BCWipe.doc.tgz 21218 BLAKE2B 02ce8b5c767ed9d45615fa26b5c0172c5431209cbd7ca94bfed4345206b401db50e02a163eef14359a01d16cc4a1b26b121081611cc7854833e7cbd917ae947c SHA512 5aa402669ded46b6dc680293f18aea4ab20a7d6b7d9d7bf8e63003e557b953e8f8019431ea69d96d2236121e754bc456b3700a0895f4fff0573d2e9bac2e2ee3
+EBUILD bcwipe-1.9.13.ebuild 1036 BLAKE2B 4c4c433068bfe57df1c4d0e6bf03c4f84b9e8082740bdf06b03bf8d3a2b26faf00b5915f5554927261838c3533fce2e46488d960a3c185609e3e2453ed29793a SHA512 7a68bfbf12923948a6bebf5ddd1f6d111f2c3d2870a2f4e7f40b67179cd1aca58e6d8e9de01c3705eb7118cbcd8e2059908e5d3297f4753a134e509f4c5fb38a
+MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
new file mode 100644
index 000000000000..21e09193785c
--- /dev/null
+++ b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit versionator
+
+MY_PV="$(replace_version_separator 2 -)"
+
+DESCRIPTION="Secure file removal utility"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="https://www.jetico.com/linux/BCWipe-${MY_PV}.tar.gz
+	doc? ( http://www.jetico.com/linux/BCWipe.doc.tgz )"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="amd64 ~arm ppc x86"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.7-fix_warnings.patch"
+	"${FILESDIR}/${PN}-1.9.8-fix-flags.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_test() {
+	echo "abc123" >> testfile
+	./bcwipe -f testfile || die "bcwipe test failed"
+	[[ -f testfile ]] && die "test file still exists. bcwipe should have deleted it"
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r ../bcwipe-help
+}
+
+pkg_postinst() {
+	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
+	ewarn "http://www.jetico.com/"
+	ewarn "full details /usr/share/doc/${PF}/bcwipe-help/wu_licen.htm"
+}
diff --git a/app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch b/app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch
new file mode 100644
index 000000000000..e2b9eed3b3eb
--- /dev/null
+++ b/app-crypt/bcwipe/files/bcwipe-1.9.7-fix_warnings.patch
@@ -0,0 +1,20 @@
+--- a/schemes.c
++++ b/schemes.c
+@@ -15,6 +15,7 @@
+  *
+  *******************************************************************/
+ #include "config.h"
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+--- a/wipe.c
++++ b/wipe.c
+@@ -42,6 +42,7 @@
+ #include <sys/ioctl.h>
+ #include <signal.h>
+ #include <time.h>
++#include <sys/time.h>
+ #include <ctype.h>
+ 
+ #if HAVE_SYS_DISKIO_H /* HP-UX */
diff --git a/app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch b/app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch
new file mode 100644
index 000000000000..e4c5cff39ed1
--- /dev/null
+++ b/app-crypt/bcwipe/files/bcwipe-1.9.8-fix-flags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2011-02-23 01:07:29.841894634 +0100
++++ b/Makefile.in	2011-02-23 01:07:46.626793943 +0100
+@@ -174,7 +174,7 @@
+ bcwipe_SOURCES = wipe.c wipe.h options.c options.h schemes.c schemes.h sha1.c sha1.h sha1random.c sha1random.h log.c log.h standard.h rand.h rand.c prng.c
+ man_MANS = bcwipe.1
+ EXTRA_DIST = $(man_MANS) bcwipe.spec.in osxpkg.sh.in
+-AM_CFLAGS = -g -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
++AM_CFLAGS =    -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
diff --git a/app-crypt/bcwipe/metadata.xml b/app-crypt/bcwipe/metadata.xml
new file mode 100644
index 000000000000..040cba5f7c5b
--- /dev/null
+++ b/app-crypt/bcwipe/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/bestcrypt-2.0.11 b/app-crypt/bestcrypt-2.0.11
deleted file mode 100644
index 3d2930a76178..000000000000
--- a/app-crypt/bestcrypt-2.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=virtual/linux-sources app-shells/bash kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=commercially licensed transparent filesystem encryption
-EAPI=6
-HOMEPAGE=http://www.jetico.com/
-IUSE=kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=bestcrypt
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://www.jetico.com/linux/BestCrypt-2.0.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d43b053b3a0b54738b841bc40a8bb8a4
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
new file mode 100644
index 000000000000..eaa6ef5a3fab
--- /dev/null
+++ b/app-crypt/bestcrypt/Manifest
@@ -0,0 +1,5 @@
+AUX bcrypt3 3197 BLAKE2B 5e9d721a5b4213fcc0e5eb4325c009685dee5bd8dd61f8b47ee1ca29e52faa12b3c6f3c9ab1bc283d7944f4f4178dc831a95348971bde439a7ae77f213df20dc SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b
+AUX bestcrypt-2.0.6-build.patch 10878 BLAKE2B e7ab526bb514a7a28415cb8e7f109d224ddddc10bd09e9539a2f289b5933abb3fc90378c0a10275113b47d90f18578b8285aacfeb087a5052afd34c9407a6180 SHA512 34e150087fadfcdba5c05c0a4e1d2bfadbc448fe3214663c86ef3a692ec924da011ba11da3fb8f26692c2a52a6ce8c5edd8f20549de42c8dedf965cf3b74d530
+DIST BestCrypt-2.0.11.tar.gz 2191182 BLAKE2B 5fe6d18b0c89273491fbcdb9bf7c73332342fca77cdf457c83f106f5cca693532eea6668e04f7c93828b3d5dc4419872066eda22fb10c780a838ddd78cf79255 SHA512 f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2
+EBUILD bestcrypt-2.0.11.ebuild 1791 BLAKE2B eebcc1898f07df120ae5ae0fcbef08971ba7abd93e9ca79520717cecbaaba1f4c7dd20515706e28ec23e762eb34caddd7ee56f11a5be2986bc2b1bcd2adf8749 SHA512 c15210495dccb9d40117d74b80a6e1d991f88916c7293207fcf1c16879b9379a6d486feeee8f6663d0be40026834521070a90d9c8433394a89d4a4cc20f25b98
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
new file mode 100644
index 000000000000..4ab00f225f3f
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-mod toolchain-funcs versionator
+
+MY_PN="BestCrypt"
+DESCRIPTION="commercially licensed transparent filesystem encryption"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="http://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/linux-sources
+	app-shells/bash"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=(
+	HIDDEN_PART README
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.6-build.patch"
+)
+
+pkg_setup() {
+	CONFIG_CHECK="MODULES"
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="bestcrypt(block::kernel/kmod)
+		bc_3des(crypto::kernel/kmod/crypto/algs/3des)
+		bc_bf128(crypto::kernel/kmod/crypto/algs/bf128)
+		bc_bf448(crypto::kernel/kmod/crypto/algs/bf448)
+		bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish)
+		bc_cast(crypto::kernel/kmod/crypto/algs/cast)
+		bc_des(crypto::kernel/kmod/crypto/algs/des)
+		bc_gost(crypto::kernel/kmod/crypto/algs/gost)
+		bc_idea(crypto::kernel/kmod/crypto/algs/idea)
+		bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)"
+	BUILD_TARGETS="module"
+	BUILD_PARAMS=" \
+		BC_KERNEL_DIR=\"${KERNEL_DIR}\""
+}
+
+src_compile() {
+	MAKEOPTS="-j1" linux-mod_src_compile \
+		CXX="$(tc-getCXX)"
+	MAKEOPTS="-j1" emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	emake install PREFIX="${ED}" install
+
+	newinitd "${FILESDIR}/bcrypt3" bcrypt
+	sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
+	ewarn "http://www.jetico.com/"
+	ewarn
+
+	linux-mod_pkg_postinst
+}
diff --git a/app-crypt/bestcrypt/files/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3
new file mode 100644
index 000000000000..b1b6979e63e0
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bcrypt3
@@ -0,0 +1,104 @@
+#!/sbin/openrc-run
+#
+# bestcrypt         Encrypted File Systems.
+#
+# Version:      1.2
+#
+# Revision:    $Id$
+#
+# Author:       Jetico Inc. (support@jetico.com)
+#
+# Modified by Stefan Tittel (with thanks to steveb) to work around
+# the "xargs: environment too large for exec"-error occuring in
+# the gentoo 1.4 linux distribution.
+
+# chkconfig: 2345 85 98
+# description: BestCrypt init script
+
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+# See how we were called.
+
+KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
+
+start() {
+	ebegin "Initializing BestCrypt"
+	declare -i status=0
+	rm -rf /dev/bcrypt?* 2>/dev/null
+        if [ $KERNEL_VERSION = "2.2" ]; then
+         mknod -m 666 /dev/bcrypt0 b 7 128
+         mknod -m 666 /dev/bcrypt1 b 7 129
+         mknod -m 666 /dev/bcrypt2 b 7 130
+         mknod -m 666 /dev/bcrypt3 b 7 131
+         mknod -m 666 /dev/bcrypt4 b 7 132
+         mknod -m 666 /dev/bcrypt5 b 7 133
+         mknod -m 666 /dev/bcrypt6 b 7 134
+         mknod -m 666 /dev/bcrypt7 b 7 135
+         mknod -m 666 /dev/bcrypt8 b 7 136
+         mknod -m 666 /dev/bcrypt9 b 7 137
+         mknod -m 666 /dev/bcrypt10 b 7 138
+         mknod -m 666 /dev/bcrypt11 b 7 139
+         mknod -m 666 /dev/bcrypt12 b 7 140
+         mknod -m 666 /dev/bcrypt13 b 7 141
+         mknod -m 666 /dev/bcrypt14 b 7 142
+         mknod -m 666 /dev/bcrypt15 b 7 143
+        else
+	  if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
+	  then
+            mknod -m 666 /dev/bcrypt0 b 188 0
+            mknod -m 666 /dev/bcrypt1 b 188 1
+            mknod -m 666 /dev/bcrypt2 b 188 2
+            mknod -m 666 /dev/bcrypt3 b 188 3
+            mknod -m 666 /dev/bcrypt4 b 188 4
+            mknod -m 666 /dev/bcrypt5 b 188 5
+            mknod -m 666 /dev/bcrypt6 b 188 6
+            mknod -m 666 /dev/bcrypt7 b 188 7
+            mknod -m 666 /dev/bcrypt8 b 188 8
+            mknod -m 666 /dev/bcrypt9 b 188 9
+            mknod -m 666 /dev/bcrypt10 b 188 10
+            mknod -m 666 /dev/bcrypt11 b 188 11
+            mknod -m 666 /dev/bcrypt12 b 188 12
+            mknod -m 666 /dev/bcrypt13 b 188 13
+            mknod -m 666 /dev/bcrypt14 b 188 14
+            mknod -m 666 /dev/bcrypt15 b 188 15
+          fi
+	fi
+	modprobe bc || status=1
+	modprobe bc_blowfish || status=1
+	modprobe bc_des || status=1
+	modprobe bc_gost || status=1
+	modprobe bc_twofish || status=1
+	modprobe bc_bf448 || status=1
+	modprobe bc_bf128 || status=1
+	modprobe bc_3des || status=1
+	modprobe bc_idea || status=1
+	modprobe bc_rijn || status=1
+	modprobe bc_cast || status=1
+	modprobe bc_rc6 || status=1
+	modprobe bc_serpent || status=1
+	eend ${status}
+}
+
+stop() {
+	ebegin "Unmounting encrypted filesystems"
+
+# The original line causing the "xargs: environment too large for exec error".	
+	# grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount
+
+# The line for which it work's fine now.
+	for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done
+
+	eend $?
+	ebegin "Shutting down BestCrypt modules"
+	for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do 
+		rmmod $i
+	done
+	if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
+	then
+		rm -f /dev/bcrypt?* 2>/dev/null
+	fi
+	rmmod bc
+	eend $?
+}
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch
new file mode 100644
index 000000000000..966053072d32
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch
@@ -0,0 +1,341 @@
+From 4bce59bd9bc5a201caf5f2ff3e2080e7e5a01733 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jul 2014 21:34:21 +0300
+Subject: [PATCH 3/3] build: do not auto build/install module
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3cd36fd..a3fd59e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -98,5 +98,5 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests
+ 
+ # default target builds console tool with modules
+-all: Makefile helpers module console
++all: Makefile helpers console
+ 	true
+  
+@@ -226,5 +226,5 @@ module-clean: force-look
+  
+ # install for default target
+-install: module-install console-install helpers-install
++install: console-install helpers-install
+ 	true
+ 
+-- 
+1.8.5.5
+
+From f7f71ec155385aea3dec495d46d07452943fe729 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 17 Mar 2015 21:05:22 +0200
+Subject: [PATCH] build: allow override programs
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile                            | 11 +++++++----
+ certificate/CertificateLib/Makefile |  4 +++-
+ disk/Makefile                       |  6 ++++--
+ fslib/Makefile                      | 16 +++++++++-------
+ kernel/Makefile                     |  5 +++--
+ keygens/kgghost/Makefile            |  7 +++++--
+ keygens/kgsha/Makefile              |  7 +++++--
+ mount/Makefile                      |  9 +++++----
+ spacemap/Makefile                   |  6 ++++--
+ tests/Makefile                      | 12 ++++++------
+ 10 files changed, 51 insertions(+), 32 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6af2319..359d022 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,6 +56,9 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a
+ KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a
+ SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a
+ 
++CC = gcc
++CXX = g++
++
+ BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ BC_EXTRA_LDFLAGS = $(LDFLAGS)
+ 
+@@ -125,7 +128,7 @@ helpers: create-dirs
+ console: spacemap-lib certificate-lib fs-lib kernel-lib keygen-libs $(TARGET)
+ 	true
+ $(TARGET): $(BCTOOL_OBJS)
+-	g++ $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
++	$(CXX) $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
+ 
+ # GUI executable only (w/o console and helpers)
+ panel: certificate-lib kernel-lib keygen-libs fs-lib
+@@ -339,10 +342,10 @@ module-uninstall:
+ 	bash ./scripts/remove_mods
+ 
+ %.o:%.cpp
+-	g++ -c $(BCTOOL_CFLAGS) $< -o $@
++	$(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
+ 
+ %.o:%.cc
+-	g++ -c $(BCTOOL_CFLAGS) $< -o $@
++	$(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
+ 
+ %.o:%.c
+-	gcc -c $(BCTOOL_CFLAGS) $< -o $@
++	$(CC) -c $(BCTOOL_CFLAGS) $< -o $@
+diff --git a/certificate/CertificateLib/Makefile b/certificate/CertificateLib/Makefile
+index d28ccc7..810a30a 100644
+--- a/certificate/CertificateLib/Makefile
++++ b/certificate/CertificateLib/Makefile
+@@ -1,5 +1,7 @@
+ 
+-CP = cp
++CC = gcc
++CXX = g++
++AR = ar
+ CFLAGS += -Wall -fno-strict-aliasing -O3
+ #-Werror
+ 
+diff --git a/disk/Makefile b/disk/Makefile
+index e3915b0..1a9ff01 100644
+--- a/disk/Makefile
++++ b/disk/Makefile
+@@ -1,14 +1,16 @@
+ DISKMON_OBJS = disk.o diskmon.o
++
++CXX = g++
+ CFLAGS += -Wall -I. -I../ -p -gdwarf-2 #-DBC_DEBUG
+ LDFLAGS += -ludev
+ 
+ all:diskmon Makefile
+ 
+ diskmon:$(DISKMON_OBJS)
+-	g++ $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
++	$(CXX) $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
+ 
+ %.o:%.cc
+-	g++ $(CFLAGS) -c $< -o $@
++	$(CXX) $(CFLAGS) -c $< -o $@
+ 
+ clean:
+ 	rm -rf diskmon *.o
+diff --git a/fslib/Makefile b/fslib/Makefile
+index a6f96f4..bbe6cae 100644
+--- a/fslib/Makefile
++++ b/fslib/Makefile
+@@ -1,3 +1,5 @@
++CC = gcc
++AR = ar
+ 
+ FSLIB_CFLAGS = $(CFLAGS) -Wall -O0 -DFSLIB_DEBUG -g  # -O3 
+ FSLIB_CFLAGS += -I. -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 #-fvisibility=hidden
+@@ -15,25 +17,25 @@ FSLIB_TOOLS = file_hfs test_hfs test_info test_free_space diskinfo
+ all: Makefile $(FSLIB) $(FSLIB_TOOLS)
+ 
+ $(FSLIB): $(OBJS)
+-	ar rcs $(FSLIB) $(OBJS)
++	$(AR) rcs $(FSLIB) $(OBJS)
+ 
+ test_hfs: $(FSLIB) test/test_hfs.o
+-	gcc test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
++	$(CC) test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
+ 
+ file_hfs: $(FSLIB) test/file_hfs.o
+-	gcc test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
++	$(CC) test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
+ 
+ test_info: $(FSLIB) test/test_info.o
+-	gcc test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
++	$(CC) test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
+ 	
+ test_free_space: $(FSLIB) test/test_free_space.o
+-	gcc test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
++	$(CC) test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
+ 	
+ diskinfo: $(FSLIB) test/diskinfo.o
+-	gcc test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g  -o diskinfo
++	$(CC) test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g  -o diskinfo
+ 
+ .c.o:
+-	gcc $(FSLIB_CFLAGS) -c $< -o $@
++	$(CC) $(FSLIB_CFLAGS) -c $< -o $@
+ 	
+ clean:
+ 	rm -rf *~ *.o test/*.o $(OBJS) $(FSLIB) $(FSLIB_TOOLS)
+diff --git a/kernel/Makefile b/kernel/Makefile
+index 1a71617..4f9760d 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -3,6 +3,7 @@ OBJECTS = $(SOURCES:.cc=.o)
+ TARGET_DIR = ./build/
+ TARGET = $(TARGET_DIR)/libbckernel.a
+ BC_CFLAGS = $(BC_EXTRA_CFLAGS) -fPIC -c -Wall -ludev -L../build/ -lspacemap -I../ -fvisibility=hidden #-fvisibility-inlines-hidden
++CXX = g++
+ 
+ 
+ ### Build ###
+@@ -21,12 +22,12 @@ module: create-dirs force_look
+ 
+ kernel-lib: create-dirs $(TARGET)
+ $(TARGET): $(OBJECTS)
+-	ar rcs $(TARGET) $(OBJECTS)
++	$(AR) rcs $(TARGET) $(OBJECTS)
+ 
+ $(OBJECTS): Makefile $(SOURCES) BCKernel.h
+ 	set -e; \
+ 	for i in $(SOURCES); do \
+-		g++ -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
++		$(CXX) -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
+ 	done
+ 
+ create-dirs: $(TARGET_DIR)
+diff --git a/keygens/kgghost/Makefile b/keygens/kgghost/Makefile
+index 8f6cc59..fe59ac7 100644
+--- a/keygens/kgghost/Makefile
++++ b/keygens/kgghost/Makefile
+@@ -5,10 +5,13 @@ KGGHOST_OBJS = hash.o pbe.o keyblock.o datablock.o kgghost.o
+ KGGHOST_CFLAGS = -Wall -p -ggdb -I. -I../../ -I../../certificate -DBC_LINUX
+ KGGHOST_CFLAGS += $(BC_EXTRA_CFLAGS)
+ 
++CXX = g++
++AR = ar
++
+ all: $(KGGHOST) Makefile
+ 
+ $(KGGHOST):$(KGGHOST_OBJS) $(CERTIFICATE_LIB)
+-	ar rcs $(KGGHOST) $(KGGHOST_OBJS)
++	$(AR) rcs $(KGGHOST) $(KGGHOST_OBJS)
+ 
+ $(CERTIFICATE_LIB):
+ 	make -C ../../certificate/CertificateLib
+@@ -17,7 +20,7 @@ $(KERNEL_LIB):
+ 	make -C ../../kernel/build
+ 
+ %.o:%.cpp
+-	g++ $(KGGHOST_CFLAGS) -c -o $@ $<
++	$(CXX) $(KGGHOST_CFLAGS) -c -o $@ $<
+ 
+ clean:
+ 	rm -f *.o *.ver *~ $(KGGHOST)
+diff --git a/keygens/kgsha/Makefile b/keygens/kgsha/Makefile
+index f1a89f9..57f55ca 100644
+--- a/keygens/kgsha/Makefile
++++ b/keygens/kgsha/Makefile
+@@ -10,10 +10,13 @@ KGSHA_OBJS = hash.o datablock.o kgsha.o
+ KGSHA_CFLAGS = -Wall -p -gdwarf-2 -I. -I../../ -I../../certificate -DBC_LINUX
+ KGSHA_CFLAGS += $(EXTRA_CFLAGS)
+ 
++CXX = g++
++AR = ar
++
+ all: $(KGSHA) $(KGSHA_OBJS) Makefile hidden_sector.h defs.h datablock.h
+ 
+ $(KGSHA): $(KGSHA_OBJS) $(CERTIFICATE_LIB) $(KERN_LIB)
+-	ar rcs $(KGSHA) $(KGSHA_OBJS)
++	$(AR) rcs $(KGSHA) $(KGSHA_OBJS)
+ 
+ $(CERT_LIB):
+ 	make -C ../../certificate/CertificateLib
+@@ -22,7 +25,7 @@ $(KERN_LIB):
+ 	make -C ../../kernel/
+ 
+ %.o:%.cpp
+-	g++ $(KGSHA_CFLAGS) -c -o $@ $<
++	$(CXX) $(KGSHA_CFLAGS) -c -o $@ $<
+ 
+ clean:
+ 	rm -f *.o *.ver *~ $(KGSHA)
+diff --git a/mount/Makefile b/mount/Makefile
+index 7a3d66b..0e60095 100644
+--- a/mount/Makefile
++++ b/mount/Makefile
+@@ -1,22 +1,23 @@
+ 
+ HELPERS = bcrrpart_helper bcmount_helper bcumount_helper
+ 
++CC = gcc
+ OBJS = common.o
+ CFLAGS += -Wall -O3
+ 
+ all: $(HELPERS) Makefile
+ 
+ bcrrpart_helper: $(OBJS) rrpart.o
+-	gcc $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
++	$(CC) $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
+ 
+ bcmount_helper: $(OBJS) mount.o
+-	gcc $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
++	$(CC) $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
+ 
+ bcumount_helper: $(OBJS) umount.o
+-	gcc $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
++	$(CC) $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
+ 	
+ %.o:%.c
+-	gcc $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 	
+ clean:
+ 	rm -f *.o *.ver *~ $(HELPERS)
+diff --git a/spacemap/Makefile b/spacemap/Makefile
+index 6dff240..7dd2ad9 100644
+--- a/spacemap/Makefile
++++ b/spacemap/Makefile
+@@ -5,17 +5,19 @@ LIB_NAME = spacemap
+ STATIC_TARGET = lib$(LIB_NAME).a
+ OBJECT_CFLAGS = -fPIC -g -c -Wall -ludev -fvisibility=hidden #-fvisibility-inlines-hidden
+ 
++CXX = g++
++AR = ar
+ 
+ all: static
+ 	true
+ 
+ static: $(OBJECTS)
+-	ar rcs $(STATIC_TARGET) $(OBJECTS)
++	$(AR) rcs $(STATIC_TARGET) $(OBJECTS)
+ 
+ $(OBJECTS): $(SOURCES)
+ 	set -e; \
+ 	for i in $(SOURCES); do \
+-		g++ $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
++		$(CXX) $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
+ 	done
+ 
+ clean:
+diff --git a/tests/Makefile b/tests/Makefile
+index c6d78f0..419020b 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -2,8 +2,8 @@ TESTS_PWD = ../build/tests/
+ TESTS_TARGET = $(TESTS_PWD)/bctool-tests
+ TESTS_SOURCES = tests-main.c ../container/cipher.cc ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/linux/file.cpp
+ TESTS_CFLAGS = -I../ -I../certificate/ -L../build/ -L../build/kernel/ -DBC_LINUX -ludev -g
+-CP = gcc
+-CPP = g++
++CC = gcc
++CXX = g++
+ CERT_LIB_NAME = certificate
+ KERN_LIB_NAME = bckernel
+ SPACEMAP_LIB_NAME = spacemap
+@@ -15,11 +15,11 @@ all: $(TESTS_TARGET)
+ 	cp insert-modules.sh remove-modules.sh bcmod-loaded.sh $(TESTS_PWD)
+ 
+ $(TESTS_TARGET): $(TESTS_SOURCES) Makefile
+-	$(CPP) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
++	$(CXX) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
+ 	cp kernel/print-struct-size.c $(TESTS_PWD)
+-	$(CP) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
+-	$(CPP) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc  $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
+-	$(CP) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
++	$(CC) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
++	$(CXX) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc  $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
++	$(CC) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
+ 
+ clean:
+ 	rm -rf $(TESTS_PWD)
+-- 
+2.0.5
+
diff --git a/app-crypt/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/bestcrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/bsign-0.4.5-r1 b/app-crypt/bsign-0.4.5-r1
deleted file mode 100644
index 5529355c8f4b..000000000000
--- a/app-crypt/bsign-0.4.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files
-EAPI=6
-HOMEPAGE=http://packages.debian.org/sid/bsign
-IUSE=static-libs
-KEYWORDS=~amd64 ppc ~x86 ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/b/bsign/bsign_0.4.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32220a817e2183dadaa4387fa48ca3f2
diff --git a/app-crypt/bsign/Manifest b/app-crypt/bsign/Manifest
new file mode 100644
index 000000000000..9038927071b8
--- /dev/null
+++ b/app-crypt/bsign/Manifest
@@ -0,0 +1,6 @@
+AUX bsign-0.4.5-build.patch 993 BLAKE2B e126f5082cdba6665c9bba9d3138ffdb060ecac7811b5811bdabc8ffee48e421edb3eae8ca2c5ef01df94d6688924626d9f1dc2a45ce16d274443c6137212411 SHA512 367596ffc688f679bfe160731a57e191894794f7de522f3390dd494fa0757b8bcf1da2d7618e4652b355b18dedc69d402abb0879b440d41227ce4b2b3b384d8e
+AUX bsign-0.4.5-non-gnu.patch 1409 BLAKE2B 3975f1d0e6d70c30f1fa01444ff6dd547f5d0509e594ac9bbea0ac721de05a7d8d4fe59414a71f268564a9143f85b7b3ef34f4de5193ab3d70ee926c18ce490f SHA512 800e04dfe4c6242c250167076eaa360e626cdff9beb63ab2043611a10331a20f9354380bda2b387f0bb63a06fac9372502166bf49ec025945be1c2dc84ce0c88
+AUX bsign-0.4.5-scripts.patch 2172 BLAKE2B e39883e0f89bcf28ce9f0b7b5c65d2756bf9f6c1a98b7ce50097724e93d92661b65a5fd7b6bd889d0f3bffa44152a22869b4fecd5477b5a6e18c20c98c955b55 SHA512 fbf7e3fadbbcc82b6647f77232715d7baaef5d0ead5065e27e10f038e9cf5734808d29e8814762014d3d26ec4473a86ab9da139dc7f2d1b16770db3e7ddfb494
+DIST bsign_0.4.5.tar.gz 77471 BLAKE2B 6d9a386d608a75443e7ccd5c8d284f773ac7568754b4bdc96c6a6de0f77aad53a9bdaa6a3cec4701668d1de902a226f1e193599545c96abc21abb2b598e4d74b SHA512 a4dba37d648f683bb5b14bc9aafeb72fb0bd06e21cedb1a4bbd73dfc0a5f7bb22b5b33ef8727b5070d727afb2d97489ed4b9be28bf1025c9e618ccf47f1ef634
+EBUILD bsign-0.4.5-r1.ebuild 872 BLAKE2B 461b17c8474da0d1c834d7ded3c2ccdec28274096ae87bad719b27a3f45ca38472cc921d79b2f4e999ff57bafea1e3e08050f15d30cefa987ea6e86c414ed97b SHA512 4d52c7a8148f76d0b9566e16c717638768b004c5643221146a55f85ebb38fde93eb9631f4caedf9b698c6f2f17973023a486b4bea375ba29fcf9b16ca9a09471
+MISC metadata.xml 645 BLAKE2B 96fd50b4433323b224ceea3389b8dcb5e9b4cf88efe559198dc49477b18ec7b639dac61ee951ff9ba0b0c334adb078563d3507270cddfff6225ad5cd246e28d5 SHA512 2201dd583881aa72a4cff33b4a6d226dab5e1fbf49d9ea52dd85ad9437fd2bc54858824aa361ea9b473df43d211bddc96830c83fb8275c4db7a91cb3735d4919
diff --git a/app-crypt/bsign/bsign-0.4.5-r1.ebuild b/app-crypt/bsign/bsign-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..11ef50052dbb
--- /dev/null
+++ b/app-crypt/bsign/bsign-0.4.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files"
+HOMEPAGE="http://packages.debian.org/sid/bsign"
+SRC_URI="mirror://debian/pool/main/b/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~x86 ~x86-linux ~ppc-macos"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-non-gnu.patch # for Darwin, BSD, Solaris, etc.
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-scripts.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	use static-libs && append-ldflags -static
+	default
+}
+
+src_install() {
+	einstalldocs
+	dobin bsign_sign bsign_verify bsign_hash bsign_check
+	newbin o/bsign-unstripped bsign
+	doman bsign.1
+}
diff --git a/app-crypt/bsign/files/bsign-0.4.5-build.patch b/app-crypt/bsign/files/bsign-0.4.5-build.patch
new file mode 100644
index 000000000000..c6e40ada4cb2
--- /dev/null
+++ b/app-crypt/bsign/files/bsign-0.4.5-build.patch
@@ -0,0 +1,31 @@
+diff -urNp bsign-0.4.5/configure.in bsign-0.4.5.new/configure.in
+--- bsign-0.4.5/configure.in	2002-01-18 03:16:44.000000000 +0200
++++ bsign-0.4.5.new/configure.in	2013-06-16 00:54:36.470673947 +0300
+@@ -14,12 +14,8 @@ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ 
+-CFLAGS=-g
+-CXXFLAGS=-g
+-
+ if test "${GXX}" = "yes" ; then 
+  CFLAGS_W=" -Wall -Wno-parentheses -Wno-unused" 
+- CFLAGS="${CFLAGS}"
+ fi
+ 
+ dnl Checks for header files.
+diff -urNp bsign-0.4.5/Makefile.in bsign-0.4.5.new/Makefile.in
+--- bsign-0.4.5/Makefile.in	2002-01-27 22:56:56.000000000 +0200
++++ bsign-0.4.5.new/Makefile.in	2013-06-16 00:56:30.254676986 +0300
+@@ -56,9 +56,8 @@ CFLAGS=@CFLAGS@ @DEFS@
+ #CFLAGS_O=-O2 -fomit-frame-pointer
+ #CFLAGS_P=$(CFLAGS) -pg
+ CFLAGS_=-g $(CFLAGS_I)@CFLAGS_W@ $(CFLAGS_O) $(CFLAGS_P)
+-CXXFLAGS=$(CFLAGS)
+-CXXFLAGS_=$(CFLAGS_)
+-LFLAGS=-g -static @LDFLAGS@ @LIBS@
++CXXFLAGS=@CXXFLAGS@ @DEFS@
++LFLAGS=-g @LDFLAGS@ @LIBS@
+ #LFLAGS=-g @LDFLAGS@ @LIBS@
+ #LFLAGS=-pg ${LFLAGS}
+ DEPEND=depend.m
diff --git a/app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch b/app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch
new file mode 100644
index 000000000000..3ba133b4f869
--- /dev/null
+++ b/app-crypt/bsign/files/bsign-0.4.5-non-gnu.patch
@@ -0,0 +1,42 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -62,7 +62,7 @@
+ #LFLAGS=-g @LDFLAGS@ @LIBS@
+ #LFLAGS=-pg ${LFLAGS}
+ DEPEND=depend.m
+-ECHO=@/bin/echo
++ECHO=@echo
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+ INSTALL_DATA=@INSTALL_DATA@
+@@ -192,11 +192,11 @@
+ #
+ 
+ .version: .version_major .version_minor .version_patch
+-	@/bin/echo -n `cat .version_major`.`cat .version_minor`.`cat \
++	@printf "%s" `cat .version_major`.`cat .version_minor`.`cat \
+ 		.version_patch`  > .version
+ 
+ _version.h: .version
+-	@/bin/echo -e \#define SZ_VERSION \"`cat .version`\"  > _version.h
++	@echo "#define SZ_VERSION \"`cat .version`\""  > _version.h
+ 
+ .PHONY: transmit
+ transmit: # distribution-archive
+@@ -209,12 +209,12 @@
+ 
+ version.sed: _version.h
+ 	@echo Creating version-specific sed script...
+-	@/bin/echo s/\<\<version\>\>/`cat .version`/ > version.sed
+-	@/bin/echo s/\<\<date\>\>/`date +"%d%b%y" \
++	@echo s/\<\<version\>\>/`cat .version`/ > version.sed
++	@echo s/\<\<date\>\>/`date +"%d%b%y" \
+ 	 | sed -e y/abceglnoprtuvy/ABCEGLNOPRTUVY/`/ >> version.sed
+-	@/bin/echo s/\<\<tar-file\>\>/${PACKAGE}-`cat .version`.tar.gz/ \
++	@echo s/\<\<tar-file\>\>/${PACKAGE}-`cat .version`.tar.gz/ \
+ 	 >> version.sed
+-	@/bin/echo s/\<\<lsm-file\>\>/${PACKAGE}-`cat .version`.lsm/ >> version.sed
++	@echo s/\<\<lsm-file\>\>/${PACKAGE}-`cat .version`.lsm/ >> version.sed
+ 
+ .PHONY: ${PACKAGE}.lsm
+ ${PACKAGE}.lsm: version.sed LSM
diff --git a/app-crypt/bsign/files/bsign-0.4.5-scripts.patch b/app-crypt/bsign/files/bsign-0.4.5-scripts.patch
new file mode 100644
index 000000000000..97f79e68e29c
--- /dev/null
+++ b/app-crypt/bsign/files/bsign-0.4.5-scripts.patch
@@ -0,0 +1,48 @@
+diff -urNp bsign-0.4.5/bsign_check bsign-0.4.5.new2/bsign_check
+--- bsign-0.4.5/bsign_check	2002-01-27 22:49:04.000000000 +0200
++++ bsign-0.4.5.new2/bsign_check	2013-06-16 01:00:55.862655310 +0300
+@@ -9,7 +9,7 @@
+ # LOCATIONS gives the path includes and excludes that guide where
+ #   bsign looks for input files.  
+ 
+-LOCATIONS=-i / -e /boot  -e /cdrom -e /dev -e /proc -e $BASE_PATH
++LOCATIONS="-i / -e /boot  -e /cdrom -e /dev -e /proc -e $BASE_PATH"
+ 
+ # MAIL_TO is the list of email addresses that will receive email when
+ #   this script terminates.  The mail will contain the output of
+diff -urNp bsign-0.4.5/bsign_hash bsign-0.4.5.new2/bsign_hash
+--- bsign-0.4.5/bsign_hash	2002-01-27 22:49:04.000000000 +0200
++++ bsign-0.4.5.new2/bsign_hash	2013-06-16 01:00:43.543657092 +0300
+@@ -9,7 +9,7 @@
+ # LOCATIONS gives the path includes and excludes that guide where
+ #   bsign looks for input files.  
+ 
+-LOCATIONS=-i / -e /boot  -e /cdrom -e /dev -e /proc
++LOCATIONS="-i / -e /boot  -e /cdrom -e /dev -e /proc"
+ 
+ # --- End of customization macros
+ 
+diff -urNp bsign-0.4.5/bsign_sign bsign-0.4.5.new2/bsign_sign
+--- bsign-0.4.5/bsign_sign	2002-01-27 20:44:09.000000000 +0200
++++ bsign-0.4.5.new2/bsign_sign	2013-06-16 01:00:17.737660680 +0300
+@@ -23,7 +23,7 @@ KEY_PATH=$BASE_PATH
+ # LOCATIONS gives the path includes and excludes that guide where
+ #   bsign looks for input files.  
+ 
+-LOCATIONS=-i / -e /boot  -e /cdrom -e /dev -e /proc -e $BASE_PATH
++LOCATIONS="-i / -e /boot  -e /cdrom -e /dev -e /proc -e $BASE_PATH"
+ 
+ # --- End of customization macros
+ 
+diff -urNp bsign-0.4.5/bsign_verify bsign-0.4.5.new2/bsign_verify
+--- bsign-0.4.5/bsign_verify	2002-01-27 20:44:09.000000000 +0200
++++ bsign-0.4.5.new2/bsign_verify	2013-06-16 01:00:28.114659254 +0300
+@@ -23,7 +23,7 @@ KEY_PATH=$BASE_PATH
+ # LOCATIONS gives the path includes and excludes that guide where
+ #   bsign looks for input files.  
+ 
+-LOCATIONS=-i / -e /boot  -e /cdrom -e /dev -e /proc -e $BASE_PATH
++LOCATIONS="-i / -e /boot  -e /cdrom -e /dev -e /proc -e $BASE_PATH"
+ #LOCATIONS=-i /bin -i /sbin -i /usr/bin -i /usr/sbin
+ 
+ # MAIL_TO is the list of email addresses that will receive email when
diff --git a/app-crypt/bsign/metadata.xml b/app-crypt/bsign/metadata.xml
new file mode 100644
index 000000000000..a79daae298c8
--- /dev/null
+++ b/app-crypt/bsign/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<longdescription>
+		This package embeds secure hashes (SHA1) and digital signatures (GNU 
+		Privacy Guard) into files for verification and authentication. 
+		Currently, target file types are all ELF format: executables, kernel
+		modules, schared and static link libraries. This program has
+		functionality similar to tripwire and integrit without the need to
+		maintain a database. 
+	</longdescription> 
+</pkgmetadata>
diff --git a/app-crypt/cardpeek-0.7.2 b/app-crypt/cardpeek-0.7.2
deleted file mode 100644
index 958745ed3942..000000000000
--- a/app-crypt/cardpeek-0.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=x11-libs/gtk+-2.12:2 sys-apps/pcsc-lite dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/pkgconfig
-DESCRIPTION=Tool to read the contents of smartcards
-EAPI=6
-HOMEPAGE=http://pannetrat.com/Cardpeek
-IUSE=libressl
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-2.12:2 sys-apps/pcsc-lite dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://cardpeek.googlecode.com/files/cardpeek-0.7.2.tar.gz
-_md5_=938b797d442c3187846e65547c8ac2ba
diff --git a/app-crypt/cardpeek-0.8.4 b/app-crypt/cardpeek-0.8.4
deleted file mode 100644
index f660d19848a4..000000000000
--- a/app-crypt/cardpeek-0.8.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=sys-apps/pcsc-lite dev-lang/lua:5.2 x11-libs/gtk+:3 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/pkgconfig
-DESCRIPTION=Tool to read the contents of smartcards
-EAPI=6
-HOMEPAGE=http://pannetrat.com/Cardpeek
-IUSE=libressl
-LICENSE=GPL-3
-RDEPEND=sys-apps/pcsc-lite dev-lang/lua:5.2 x11-libs/gtk+:3 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=http://downloads.pannetrat.com/install/cardpeek-0.8.4.tar.gz
-_md5_=915caf4380fcfd81fc52ce8ce60079ff
diff --git a/app-crypt/cardpeek/Manifest b/app-crypt/cardpeek/Manifest
new file mode 100644
index 000000000000..446b1c973b9d
--- /dev/null
+++ b/app-crypt/cardpeek/Manifest
@@ -0,0 +1,5 @@
+DIST cardpeek-0.7.2.tar.gz 1130295 BLAKE2B c2aec139c8834947dd2e04fe384719bccdbce9b75b24f791136d5afb5873e6e0afb8306ebb2ddf6fa4e8b4cb46078667fae8eb962b425278351172292df6faaf SHA512 9fd1790794b8d092859670bb36a0cdd235e7d098d563032ccdb8143eac00bb77532f1ab918897c4b753afd184079975de34a6f645e31eadb28b6c5a81d344ecd
+DIST cardpeek-0.8.4.tar.gz 1520613 BLAKE2B f31a0298ab8423b384b0ad62abb0599da75fd968385e9e6c9a5982e6fbaf7bec8a6098e3e7a5c30ce6634c65e05db084772f4a33c7ef5d6fdcdee0022cc56b86 SHA512 f6eebc7a17f270dd56529ee36815fee72b2f9d62b24d6cc90060f20c7604b9b99ab76858d9c04c60aaec838b02b8db76476a91ee22a4e10f01f852cd1f536efb
+EBUILD cardpeek-0.7.2.ebuild 510 BLAKE2B cef9e0eb1936b140d637f014ab05b6e6f4ee7b773e194b2ead92f21269e1e2b58015367ee4caa86436b615aebcb5ec472dfe56e91b5eb7e3c45ac55be4fc9a00 SHA512 464920c4eea13c1273f6a55a3e1075befee15d7530f703bac877e807873861d8ce50d5a1466a4821c766f9ba54755107f0ca0e4829b086a2e8fa3e2c2092ba04
+EBUILD cardpeek-0.8.4.ebuild 518 BLAKE2B 79938b3b5cbc0081fb6e3a20c70259b6c30c3db1f4ac2a578041b0f1552902199f60b402a88d7a52f4cf397c766e384c6b553b772eec5030caaf498e8ccf9ebb SHA512 a87e453287923528bfbe8f2b404386c303612d699727e4330edbea63607cd84859030c3faf53ce9dc23b0602ca35c2436568987abf07835ca83d716b67088e93
+MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
new file mode 100644
index 000000000000..9bae2cd41839
--- /dev/null
+++ b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to read the contents of smartcards"
+HOMEPAGE="http://pannetrat.com/Cardpeek"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl"
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+	sys-apps/pcsc-lite
+	dev-lang/lua:0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
new file mode 100644
index 000000000000..e7fbff7caac9
--- /dev/null
+++ b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to read the contents of smartcards"
+HOMEPAGE="http://pannetrat.com/Cardpeek"
+SRC_URI="http://downloads.pannetrat.com/install/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="libressl"
+
+RDEPEND="sys-apps/pcsc-lite
+	dev-lang/lua:5.2
+	x11-libs/gtk+:3
+	net-misc/curl
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-crypt/cardpeek/metadata.xml b/app-crypt/cardpeek/metadata.xml
new file mode 100644
index 000000000000..4f6e28828f65
--- /dev/null
+++ b/app-crypt/cardpeek/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/ccid-1.4.27 b/app-crypt/ccid-1.4.27
deleted file mode 100644
index 751fd40752bf..000000000000
--- a/app-crypt/ccid-1.4.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 ) kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
-DESCRIPTION=CCID free software driver
-EAPI=6
-HOMEPAGE=https://ccid.apdu.fr/
-IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
-SLOT=0
-SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.27.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
-_md5_=1d8069d1fd9bac81f116d75166549513
diff --git a/app-crypt/ccid-1.4.29 b/app-crypt/ccid-1.4.29
deleted file mode 100644
index 6ac6a1f0ea39..000000000000
--- a/app-crypt/ccid-1.4.29
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 ) kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
-DESCRIPTION=CCID free software driver
-EAPI=6
-HOMEPAGE=https://ccid.apdu.fr/
-IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
-SLOT=0
-SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.29.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
-_md5_=2a93a1d1f9643a2e950da47486b1a05b
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
new file mode 100644
index 000000000000..a9603bd12b03
--- /dev/null
+++ b/app-crypt/ccid/Manifest
@@ -0,0 +1,6 @@
+AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
+DIST ccid-1.4.27.tar.bz2 632817 BLAKE2B a18de0594c9535c4564bc27886fc69a0edc54343941d77b9558f331a932d12d2b58303ae3994337e380f16648f7bb2a8aa90c00aae4c7cffe242e000003c5dcd SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522
+DIST ccid-1.4.29.tar.bz2 635761 BLAKE2B ff14bc6e181a6d44b8ef463a2255d0362842f6e1e7c79e0a01caaba0a88892f7b0f2bd9d2dadae7be8b0655d2502e5471cff29e582928d62235fa070f2eb1ba8 SHA512 9ff37acad086e959f660069b245fe06ecada140623025a19dfbff55edec71e1e72bce09ac4fc506ad985dd0831dafc6b12f5a5b109b38bf9ba7583856eb19418
+EBUILD ccid-1.4.27.ebuild 1492 BLAKE2B 23f38ec767ff61b9da25eb292439956069b64ad2d162ada3454eeb2fe4db4d2436458a85e7f1858719d268a64e0d9db4bfc4c4062a5dea853e6075876dd4c16d SHA512 37a42df7ba9eeb766ad42f3e79d1bd85b80a753f11f7a4ebb0b088a95498212ea0d6fd98d541e28da0a39698d3446c6429416cc9fabedd9bf176bb0f9ea5add3
+EBUILD ccid-1.4.29.ebuild 1497 BLAKE2B e01d89f17e0f2d4932d92aa80f23143a5bc6bfd02566dfbbdc7730f8a2fd96f39064f898d6732c0f071be65ad9bf588e52bc01e0e2f447c5fce68940ee6eb74f SHA512 946b90228ee7f78abc5a825bb89df3c1d626bbff046e7833bd89eefc6b80b17b881606984b66dbb1fdeeeadb27cc19a5535102253fd5122bfa2e4b2928ca0c3b
+MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
diff --git a/app-crypt/ccid/ccid-1.4.27.ebuild b/app-crypt/ccid/ccid-1.4.27.ebuild
new file mode 100644
index 000000000000..cb96feb53855
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.27.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
diff --git a/app-crypt/ccid/ccid-1.4.29.ebuild b/app-crypt/ccid/ccid-1.4.29.ebuild
new file mode 100644
index 000000000000..96196218e361
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.29.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
diff --git a/app-crypt/ccid/files/92_pcscd_ccid-2.rules b/app-crypt/ccid/files/92_pcscd_ccid-2.rules
new file mode 100644
index 000000000000..ca4d1ce1b729
--- /dev/null
+++ b/app-crypt/ccid/files/92_pcscd_ccid-2.rules
@@ -0,0 +1,50 @@
+# udev rules to set the access rights of CCID smart card readers
+# so they can be used by pcscd
+
+# $Id: 92_pcscd_ccid.rules 6587 2013-04-05 16:31:55Z rousseau $
+
+# Gemplus PCMCIA Card
+#SUBSYSTEMS=="pcmcia", DRIVERS=="serial_cs", ACTION=="add", ATTRS{prod_id1}=="Gemplus", ATTRS{prod_id2}=="SerialPort", ATTRS{prod_id3}=="GemPC Card", RUN+="/usr/sbin/pcscd --hotplug" 
+
+# If not adding the device, go away
+ACTION!="add", GOTO="pcscd_ccid_rules_end"
+SUBSYSTEM!="usb", GOTO="pcscd_ccid_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="pcscd_ccid_rules_end"
+
+# Kobil mIDentity
+ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="4081", RUN+="/usr/sbin/Kobil_mIDentity_switch"
+
+# generic CCID device (bInterfaceClass = 0x0b)
+# change group from default "root" to "pcscd"
+ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
+
+# set USB power management to auto. "power/level" has been deprecated in
+# Linux 2.6.35 and replaced by "power/control"
+ENV{ID_USB_INTERFACES}==":0b0000:", RUN+="/bin/sh -c 'if test -e /sys/$env{DEVPATH}/power/control; then echo auto > /sys/$env{DEVPATH}/power/control; elif test -e /sys/$env{DEVPATH}/power/level; then echo auto > /sys/$env{DEVPATH}/power/level; fi'"
+
+# non CCID generic (InterfaceClass: 0xFF)
+# CherrySmartTerminalST2XXX.txt
+ATTRS{idVendor}=="046a", ATTRS{idProduct}=="003e", ENV{PCSCD}="1"
+# DellSK-3106.txt
+ATTRS{idVendor}=="413c", ATTRS{idProduct}=="2100", ENV{PCSCD}="1"
+# MySmartPad.txt
+ATTRS{idVendor}=="09be", ATTRS{idProduct}=="0002", ENV{PCSCD}="1"
+# SCR3310-NTTCom USB SmartCard Reader
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="511a", ENV{PCSCD}="1"
+# SCR331-DI USB Smart Card Reader
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5120", ENV{PCSCD}="1"
+# SCR331-DI.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111", ENV{PCSCD}="1"
+# SDI010.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5121", ENV{PCSCD}="1"
+# SPR532.txt
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="e003", ENV{PCSCD}="1"
+# Verisign_secure_storage_token.txt
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="1359", ENV{PCSCD}="1"
+# Verisign_secure_token.txt
+ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="ace0", ENV{PCSCD}="1"
+# SchlumbergerSema Cyberflex Access e-gate
+ATTRS{idVendor}=="0973", ATTRS{idProduct}=="0003", ENV{PCSCD}="1"
+
+# All done
+LABEL="pcscd_ccid_rules_end"
diff --git a/app-crypt/ccid/metadata.xml b/app-crypt/ccid/metadata.xml
new file mode 100644
index 000000000000..6a1239505f77
--- /dev/null
+++ b/app-crypt/ccid/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<use>
+		<flag name="kobil-midentity">Build and install Kobil_mIDentity_switch tool</flag>
+		<flag name="twinserial">Enable twinserial reader</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/ccrypt-1.10 b/app-crypt/ccrypt-1.10
deleted file mode 100644
index 907781d6a8ef..000000000000
--- a/app-crypt/ccrypt-1.10
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Encryption and decryption
-EAPI=6
-HOMEPAGE=http://ccrypt.sourceforge.net
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://ccrypt.sourceforge.net/download/ccrypt-1.10.tar.gz
-_md5_=cac90eceb615da04785f513f2fbd1a2d
diff --git a/app-crypt/ccrypt/Manifest b/app-crypt/ccrypt/Manifest
new file mode 100644
index 000000000000..464116ed19eb
--- /dev/null
+++ b/app-crypt/ccrypt/Manifest
@@ -0,0 +1,3 @@
+DIST ccrypt-1.10.tar.gz 669491 BLAKE2B 61aabe48fd3e368c4915697acc4a63837cb97246e31c2268385e419fc6912a1d0bf3f3773c78266bde0d648bb10f739628a55560e0eedbd397c5826b5019b602 SHA512 b0130998f9830f63e8181340b3138260ab3c2014174e74fbcca77299dc9e0f807471fbfb7cc403dec7d0809f136e8afcb4c9bfd4ee5e43a1b3cc7185e14c3188
+EBUILD ccrypt-1.10.ebuild 364 BLAKE2B 816ee180fab03204a4f9a204a16ee43769c55a4cb5cdb8a2c06a317df9e017318d32c290125045ce8bc0325e9a666361344b51a0d8de57f5b75ee3b15a4e6c4a SHA512 fb7b156727d9de9bed8812141e6ee036ea4c5a470cc494cad4f5aed2d86fb2d2ad8b0ef55503ea807e2af84425482c880349c2e2aac6085c9b637e41e4996c8d
+MISC metadata.xml 316 BLAKE2B b3ea9516824d2d6abce5b52bff59ef3935be62158f4b5f35c4946ac46ad6cbce01637f82979c0c7bc0d881b385dbef860b4ee1aaa28cba9121d388640ced2f11 SHA512 fd88aee15282c7205e31caa296006cb6e6d887843b5757676c00d7a0ed054046d9285c9d01ddf120131463eb03cef1ad7e9835a01f4fd71d9483bae2ecde296b
diff --git a/app-crypt/ccrypt/ccrypt-1.10.ebuild b/app-crypt/ccrypt/ccrypt-1.10.ebuild
new file mode 100644
index 000000000000..169bce5ebc2b
--- /dev/null
+++ b/app-crypt/ccrypt/ccrypt-1.10.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Encryption and decryption"
+HOMEPAGE="http://ccrypt.sourceforge.net"
+SRC_URI="http://ccrypt.sourceforge.net/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
diff --git a/app-crypt/ccrypt/metadata.xml b/app-crypt/ccrypt/metadata.xml
new file mode 100644
index 000000000000..05b829a9bab6
--- /dev/null
+++ b/app-crypt/ccrypt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ccrypt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/certbot-0.23.0 b/app-crypt/certbot-0.23.0
deleted file mode 100644
index 0b63e55cb7dd..000000000000
--- a/app-crypt/certbot-0.23.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.23.0.tar.gz -> certbot-0.23.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc4373e421ce8bc7bf2afb23fff184c5
diff --git a/app-crypt/certbot-0.24.0 b/app-crypt/certbot-0.24.0
deleted file mode 100644
index 20d5a5e21243..000000000000
--- a/app-crypt/certbot-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc4373e421ce8bc7bf2afb23fff184c5
diff --git a/app-crypt/certbot-0.25.0 b/app-crypt/certbot-0.25.0
deleted file mode 100644
index a396a7e7b429..000000000000
--- a/app-crypt/certbot-0.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.25.0.tar.gz -> certbot-0.25.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f03ce6884e526b8fbc63855e6dbdf67c
diff --git a/app-crypt/certbot-0.25.1 b/app-crypt/certbot-0.25.1
deleted file mode 100644
index 974bfc1d7cfb..000000000000
--- a/app-crypt/certbot-0.25.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.25.1.tar.gz -> certbot-0.25.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f03ce6884e526b8fbc63855e6dbdf67c
diff --git a/app-crypt/certbot-0.26.0 b/app-crypt/certbot-0.26.0
deleted file mode 100644
index 5c1e85f06cae..000000000000
--- a/app-crypt/certbot-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=188004de7038c831c043aa7890e5023e
diff --git a/app-crypt/certbot-9999 b/app-crypt/certbot-9999
deleted file mode 100644
index ca3b2bcb5947..000000000000
--- a/app-crypt/certbot-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=188004de7038c831c043aa7890e5023e
diff --git a/app-crypt/certbot-apache-0.23.0 b/app-crypt/certbot-apache-0.23.0
deleted file mode 100644
index 717425b48dee..000000000000
--- a/app-crypt/certbot-apache-0.23.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.23.0.tar.gz -> certbot-0.23.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d87198043c9a15f93e724bcb070e9d60
diff --git a/app-crypt/certbot-apache-0.24.0 b/app-crypt/certbot-apache-0.24.0
deleted file mode 100644
index 49d2cfc2f45b..000000000000
--- a/app-crypt/certbot-apache-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d87198043c9a15f93e724bcb070e9d60
diff --git a/app-crypt/certbot-apache-0.25.0 b/app-crypt/certbot-apache-0.25.0
deleted file mode 100644
index b2a041d2b720..000000000000
--- a/app-crypt/certbot-apache-0.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.25.0.tar.gz -> certbot-0.25.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f45456e108ae7eaddd92fccf1672c69a
diff --git a/app-crypt/certbot-apache-0.25.1 b/app-crypt/certbot-apache-0.25.1
deleted file mode 100644
index 4d31acdc493c..000000000000
--- a/app-crypt/certbot-apache-0.25.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.25.1.tar.gz -> certbot-0.25.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f45456e108ae7eaddd92fccf1672c69a
diff --git a/app-crypt/certbot-apache-0.26.0 b/app-crypt/certbot-apache-0.26.0
deleted file mode 100644
index 894d90976d7f..000000000000
--- a/app-crypt/certbot-apache-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d06eaba6604e6d3852e1619759ed996
diff --git a/app-crypt/certbot-apache-9999 b/app-crypt/certbot-apache-9999
deleted file mode 100644
index 2aa49f6704f8..000000000000
--- a/app-crypt/certbot-apache-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d06eaba6604e6d3852e1619759ed996
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
new file mode 100644
index 000000000000..612fecfc5a17
--- /dev/null
+++ b/app-crypt/certbot-apache/Manifest
@@ -0,0 +1,12 @@
+DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
+DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
+DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
+EBUILD certbot-apache-0.23.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
+EBUILD certbot-apache-0.24.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
+EBUILD certbot-apache-0.25.0.ebuild 1075 BLAKE2B 9348daf5bb723ad14a97eabb5cfb751a141a705164efc7926998388b43eb66c8c69355aa189b4813d4aff5b995bafe34c69fe8d4d6002401ef5634ea4a719351 SHA512 3eb9691a553afa71ccbcfa0878710a04925c9f9cbed44b414548206668793731a10179b931081e590cbcbe209de9786aa75f03075b995736a32c7da71b25c561
+EBUILD certbot-apache-0.25.1.ebuild 1075 BLAKE2B 9348daf5bb723ad14a97eabb5cfb751a141a705164efc7926998388b43eb66c8c69355aa189b4813d4aff5b995bafe34c69fe8d4d6002401ef5634ea4a719351 SHA512 3eb9691a553afa71ccbcfa0878710a04925c9f9cbed44b414548206668793731a10179b931081e590cbcbe209de9786aa75f03075b995736a32c7da71b25c561
+EBUILD certbot-apache-0.26.0.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
+EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
+MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.23.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.23.0.ebuild
new file mode 100644
index 000000000000..600149c82dd4
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.23.0.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-apache/certbot-apache-0.24.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
new file mode 100644
index 000000000000..600149c82dd4
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.24.0.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-apache/certbot-apache-0.25.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.25.0.ebuild
new file mode 100644
index 000000000000..243b9c52b64b
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.25.0.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.24.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}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.25.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.25.1.ebuild
new file mode 100644
index 000000000000..243b9c52b64b
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.25.1.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.24.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}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild
new file mode 100644
index 000000000000..ab98ef4612cf
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.26.0.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.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.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}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
new file mode 100644
index 000000000000..ab98ef4612cf
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-9999.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.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.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}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-apache/metadata.xml b/app-crypt/certbot-apache/metadata.xml
new file mode 100644
index 000000000000..264684bb16c6
--- /dev/null
+++ b/app-crypt/certbot-apache/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">certbot/certbot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/certbot-nginx-0.23.0 b/app-crypt/certbot-nginx-0.23.0
deleted file mode 100644
index 9d83db11d5ef..000000000000
--- a/app-crypt/certbot-nginx-0.23.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.23.0.tar.gz -> certbot-0.23.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e219872a7ef1b564e3c8ff0d3f710d4b
diff --git a/app-crypt/certbot-nginx-0.24.0 b/app-crypt/certbot-nginx-0.24.0
deleted file mode 100644
index dc91fa857fec..000000000000
--- a/app-crypt/certbot-nginx-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d10a6ca3b06619b627a8f374462c332
diff --git a/app-crypt/certbot-nginx-0.25.0 b/app-crypt/certbot-nginx-0.25.0
deleted file mode 100644
index d604fc1d504e..000000000000
--- a/app-crypt/certbot-nginx-0.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.25.0.tar.gz -> certbot-0.25.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c082bef19a5aa2797c0b4f6537e30186
diff --git a/app-crypt/certbot-nginx-0.25.1 b/app-crypt/certbot-nginx-0.25.1
deleted file mode 100644
index 9375eb81b642..000000000000
--- a/app-crypt/certbot-nginx-0.25.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.25.1.tar.gz -> certbot-0.25.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df4614df5d28a1f2ae03c99ca7588043
diff --git a/app-crypt/certbot-nginx-0.26.0 b/app-crypt/certbot-nginx-0.26.0
deleted file mode 100644
index 6c84d1739ba6..000000000000
--- a/app-crypt/certbot-nginx-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a22d3ab5aebaf2d3ded91c3fb7caa9f
diff --git a/app-crypt/certbot-nginx-9999 b/app-crypt/certbot-nginx-9999
deleted file mode 100644
index eaf1c8f312a1..000000000000
--- a/app-crypt/certbot-nginx-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a22d3ab5aebaf2d3ded91c3fb7caa9f
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
new file mode 100644
index 000000000000..6e5ed5fadd01
--- /dev/null
+++ b/app-crypt/certbot-nginx/Manifest
@@ -0,0 +1,12 @@
+DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
+DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
+DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
+EBUILD certbot-nginx-0.23.0.ebuild 1006 BLAKE2B fa6f8d964f53d9c2e27f7d7392ed5694d0828f7820518a4505902842a41b69afd30345c33d439a412b9ccc501c3524f5478b2f6ed5cda733ebbc2aa10fade0de SHA512 92201d17d53635f1978dceb67bca39abaa529da052fd4d49480041496b6511cebfa3e1d56e242b0cfe294caa154997126c0fbb705e0cb50ae9ec4758f5b828b8
+EBUILD certbot-nginx-0.24.0.ebuild 1008 BLAKE2B ac4f94a0747dd797fb853dda9bb1a48791e030c027776cd65bc2f0bc491c5753b19392d77454c12fd216e6eb7ad087fa1ef03323e7cdcbb334684ef8e20b91d3 SHA512 319deb49333190fe536ec3ac8b97ecb78c10f9987fe6f725188b0a357e2eedc7ea83a84e1c80efb3c1deed328b97feed049b461a198fbd87327dd46695b3fda6
+EBUILD certbot-nginx-0.25.0.ebuild 1010 BLAKE2B d8e9e86c18dca8c2cb01e9b0d5302c838636c56110a3966a4fb901047cb21dac5e19d28e580377f4680d4b02e8ddd102a7d82756b307706528a5e569f175e848 SHA512 29731b83cb758729bf915d690ce4b43e4ab9e6f873599dfdfe7a6d2bead23e244dced05487e88143441a472f1284dcfd1982e18feceab5781ad4a43e16ae9fa6
+EBUILD certbot-nginx-0.25.1.ebuild 1010 BLAKE2B ae0cb79945bbafdb6c8e92a2b6727acb5878ff815721f5b5748e18a26fec5bc4fb007eb5d54898ae543b596091c08ca84067c8a16a6ef783d8335a401ae09333 SHA512 908f0ef63246fbaab7d2acc99b606d6aa96b271dca4564a037a99f35df58646cb72dbc790cbfe1e61fd4ec246fcc2b5097817c4bd79bbfacb5d511d1eb5e2cd7
+EBUILD certbot-nginx-0.26.0.ebuild 1010 BLAKE2B 61d9476418271ad692d76133e2a4ed7f4ddb41c6b952e7915dcb009e885305efbe9e70aba04cb43c8e1509a3f6a801ffd53de09c518d9eba68dd81c881c15de1 SHA512 d824ecb5938fa25e248e476cfc95724aceea8ae9c5c30c18b6b392a3005c4e807469d37e1b806e1f7673a30058c10ffe73cbd8864ebc32f6b7d65043a03c4375
+EBUILD certbot-nginx-9999.ebuild 1010 BLAKE2B 61d9476418271ad692d76133e2a4ed7f4ddb41c6b952e7915dcb009e885305efbe9e70aba04cb43c8e1509a3f6a801ffd53de09c518d9eba68dd81c881c15de1 SHA512 d824ecb5938fa25e248e476cfc95724aceea8ae9c5c30c18b6b392a3005c4e807469d37e1b806e1f7673a30058c10ffe73cbd8864ebc32f6b7d65043a03c4375
+MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.23.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.23.0.ebuild
new file mode 100644
index 000000000000..f288f9b0768e
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.23.0.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/acme-0.21.1[${PYTHON_USEDEP}]
+	>app-crypt/certbot-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-nginx/certbot-nginx-0.24.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild
new file mode 100644
index 000000000000..57e3232d555f
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.24.0.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-nginx/certbot-nginx-0.25.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.25.0.ebuild
new file mode 100644
index 000000000000..dd9e6e8b4372
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.25.0.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-nginx/certbot-nginx-0.25.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.25.1.ebuild
new file mode 100644
index 000000000000..6b2c25e91cf6
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.25.1.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.25.0[${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-nginx/certbot-nginx-0.26.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild
new file mode 100644
index 000000000000..bda8ab5ae6d7
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.26.0.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.22.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${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-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
new file mode 100644
index 000000000000..bda8ab5ae6d7
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.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.22.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${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-nginx/metadata.xml b/app-crypt/certbot-nginx/metadata.xml
new file mode 100644
index 000000000000..264684bb16c6
--- /dev/null
+++ b/app-crypt/certbot-nginx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">certbot/certbot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
new file mode 100644
index 000000000000..44b75fc403f9
--- /dev/null
+++ b/app-crypt/certbot/Manifest
@@ -0,0 +1,12 @@
+DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf8c06ccb93c80a277a69074a6ab3bac3451f4e8f9af6c1c36edd9d871e10de9240d847e6eeac5fb8e0fbcdb3cdcb SHA512 397562fa7f5ef5daea8ccf70dc21898f8b792dc6a07aa24035fa378da8af3dd5d0734c3fbf6080c28d17f050db46ec0ea637be81d4ce648fa5ab2add2cfd41ed
+DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
+DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
+DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
+EBUILD certbot-0.23.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
+EBUILD certbot-0.24.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
+EBUILD certbot-0.25.0.ebuild 1553 BLAKE2B 5ebfd6bbb0a4f13b9b81742322af2e71907039a63168dc6dcc46f97e00840beba308e113bf4188c7df03c18212339ca508f32cdc6408822683233983a1316117 SHA512 c5541ddcfb5b4e018a78b9f5184dc0cd05041b46b7eedd96d761478822e3e8a7251877790b35d641c692705512d22dfcd6d24dff2914b9893648f400cd8d6a16
+EBUILD certbot-0.25.1.ebuild 1553 BLAKE2B 5ebfd6bbb0a4f13b9b81742322af2e71907039a63168dc6dcc46f97e00840beba308e113bf4188c7df03c18212339ca508f32cdc6408822683233983a1316117 SHA512 c5541ddcfb5b4e018a78b9f5184dc0cd05041b46b7eedd96d761478822e3e8a7251877790b35d641c692705512d22dfcd6d24dff2914b9893648f400cd8d6a16
+EBUILD certbot-0.26.0.ebuild 1553 BLAKE2B a9167ba71ebda3d61452d3c5b335660e587d166853efe3a400008b59b8df56aeaa378d8d7862096d17ab8f6d787bba172129deb6fe6bef4dfe6c7d750fcfb414 SHA512 0e45b16bdb0ccdb1af6a8d238f1284c7d6d7b27328b5880584bbff3e64367636926563bbc6e0c7101256df076183576b05cdfc16ec42822a785a331f85432ba4
+EBUILD certbot-9999.ebuild 1553 BLAKE2B a9167ba71ebda3d61452d3c5b335660e587d166853efe3a400008b59b8df56aeaa378d8d7862096d17ab8f6d787bba172129deb6fe6bef4dfe6c7d750fcfb414 SHA512 0e45b16bdb0ccdb1af6a8d238f1284c7d6d7b27328b5880584bbff3e64367636926563bbc6e0c7101256df076183576b05cdfc16ec42822a785a331f85432ba4
+MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.23.0.ebuild b/app-crypt/certbot/certbot-0.23.0.ebuild
new file mode 100644
index 000000000000..ba4271ffa17c
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.23.0.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/certbot/certbot-0.24.0.ebuild b/app-crypt/certbot/certbot-0.24.0.ebuild
new file mode 100644
index 000000000000..ba4271ffa17c
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.24.0.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/certbot/certbot-0.25.0.ebuild b/app-crypt/certbot/certbot-0.25.0.ebuild
new file mode 100644
index 000000000000..cf9f45f6fe8d
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.25.0.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.24.0[${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/certbot/certbot-0.25.1.ebuild b/app-crypt/certbot/certbot-0.25.1.ebuild
new file mode 100644
index 000000000000..cf9f45f6fe8d
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.25.1.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.24.0[${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/certbot/certbot-0.26.0.ebuild b/app-crypt/certbot/certbot-0.26.0.ebuild
new file mode 100644
index 000000000000..021424b910a3
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.26.0.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.25.0[${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/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
new file mode 100644
index 000000000000..021424b910a3
--- /dev/null
+++ b/app-crypt/certbot/certbot-9999.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.25.0[${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/certbot/metadata.xml b/app-crypt/certbot/metadata.xml
new file mode 100644
index 000000000000..0a55369a680b
--- /dev/null
+++ b/app-crypt/certbot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">certbot/certbot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/cfssl-1.3.2 b/app-crypt/cfssl-1.3.2
deleted file mode 100644
index 92b065eed082..000000000000
--- a/app-crypt/cfssl-1.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Cloudflare's PKI and TLS toolkit
-EAPI=6
-HOMEPAGE=https://github.com/cloudflare/cfssl
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=!!dev-lang/mono
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cloudflare/cfssl/archive/1.3.2.tar.gz -> cfssl-1.3.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f07aea9d578db832f0deccb9c56ac19b
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
new file mode 100644
index 000000000000..ee728fdb267e
--- /dev/null
+++ b/app-crypt/cfssl/Manifest
@@ -0,0 +1,3 @@
+DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
+EBUILD cfssl-1.3.2.ebuild 754 BLAKE2B b7e10271d0901f3caf57b8549aa6f1d8c9ab5dec8061552f1dc51fa60d671ea8b309db06717dfc74867e61560e7243850e36b4d7ef13515ef78c72b84ec3b087 SHA512 878de06fbe027df328ec2af15bbf0b7a526ef03acd4e754028403b6d338d182d7711da861d4336a028d7192f744d176e5ee14b236a773efa9e0b69f5a4bdc916
+MISC metadata.xml 326 BLAKE2B 519dd19dc05c50ee2b35580a1ca47b6be4438fcd5737775b098f2bf7cebd7ec3ff88a3d5c9c27a256cedaaddac4b6eeb20f1dfb442d651a7ec31453c309c7c52 SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa
diff --git a/app-crypt/cfssl/cfssl-1.3.2.ebuild b/app-crypt/cfssl/cfssl-1.3.2.ebuild
new file mode 100644
index 000000000000..6b1f640b3abc
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Cloudflare's PKI and TLS toolkit"
+HOMEPAGE="https://github.com/cloudflare/cfssl"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="hardened"
+
+RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	pushd src/${EGO_PN} || die
+	dodoc CHANGELOG README.md
+	popd || die
+}
diff --git a/app-crypt/cfssl/metadata.xml b/app-crypt/cfssl/metadata.xml
new file mode 100644
index 000000000000..c1d955e20a40
--- /dev/null
+++ b/app-crypt/cfssl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cloudflare/cfssl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/chntpw-140201 b/app-crypt/chntpw-140201
deleted file mode 100644
index 6fc4b401bf2f..000000000000
--- a/app-crypt/chntpw-140201
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) app-arch/unzip static? ( dev-libs/openssl:0[static-libs] )
-DESCRIPTION=Offline Windows NT Password & Registry Editor
-EAPI=6
-HOMEPAGE=http://pogostick.net/~pnh/ntpasswd/
-IUSE=libressl static
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=http://pogostick.net/~pnh/ntpasswd/chntpw-source-140201.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=77356ef8569a0524274709cd9413055c
diff --git a/app-crypt/chntpw/Manifest b/app-crypt/chntpw/Manifest
new file mode 100644
index 000000000000..0db1319954b3
--- /dev/null
+++ b/app-crypt/chntpw/Manifest
@@ -0,0 +1,3 @@
+DIST chntpw-source-140201.zip 1404098 BLAKE2B 86c93861983613496fcd82879a5b000537d4a7ee2add466aa26c67feabefdb5363f610234f99615139997a04aedb448468ef8b29cc6c4bf49b2e295f41308644 SHA512 a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa
+EBUILD chntpw-140201.ebuild 1043 BLAKE2B fb8c580f94825c28ceef29fd7a963b3735ec5bc1af862184afb3a471132c553c4f861ebafc65b3c166331427601f4dc54802743b06c40c4946fe91c942a54ff3 SHA512 606c62f15973aabbedf2a7912cb248ef0f53d5cc3975abe9003b239fb2e4393a7cb8033671457960d61d5fed665b001ca60c41183c84c4eb093194241e8e6557
+MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/app-crypt/chntpw/chntpw-140201.ebuild b/app-crypt/chntpw/chntpw-140201.ebuild
new file mode 100644
index 000000000000..f6c8a6b06250
--- /dev/null
+++ b/app-crypt/chntpw/chntpw-140201.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Offline Windows NT Password & Registry Editor"
+HOMEPAGE="http://pogostick.net/~pnh/ntpasswd/"
+SRC_URI="http://pogostick.net/~pnh/ntpasswd/${PN}-source-${PV}.zip"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl static"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	static? ( dev-libs/openssl:0[static-libs] )"
+
+DOCS=(
+	HISTORY.txt README.txt regedit.txt WinReg.txt
+)
+
+src_prepare() {
+	default
+	sed -i -e '/-o/s:$(CC):$(CC) $(LDFLAGS):' Makefile || die
+
+	if ! use static ; then
+		sed -i -e "/^all:/s/ \(chntpw\|reged\).static//g" Makefile || die
+	fi
+
+	emake clean
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -DUSEOPENSSL -Wall" \
+		LIBS="-lcrypto"
+}
+
+src_install() {
+	einstalldocs
+	dobin chntpw cpnt reged
+
+	if use static; then
+		dobin {chntpw,reged}.static
+	fi
+}
diff --git a/app-crypt/chntpw/metadata.xml b/app-crypt/chntpw/metadata.xml
new file mode 100644
index 000000000000..040cba5f7c5b
--- /dev/null
+++ b/app-crypt/chntpw/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/ckpass-0.2-r1 b/app-crypt/ckpass-0.2-r1
deleted file mode 100644
index e4d98b508908..000000000000
--- a/app-crypt/ckpass-0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/libkpass-6 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=ncurses based password database client compatible with KeePass 1.x databases
-EAPI=6
-HOMEPAGE=http://ckpass.sourceforge.net/
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/libkpass-6
-SLOT=0
-SRC_URI=mirror://sourceforge/ckpass/ckpass-0.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dc52b059700596b6176c307b55353509
diff --git a/app-crypt/ckpass/Manifest b/app-crypt/ckpass/Manifest
new file mode 100644
index 000000000000..7f97ead6dc38
--- /dev/null
+++ b/app-crypt/ckpass/Manifest
@@ -0,0 +1,4 @@
+AUX ckpass-0.2-tinfo.patch 417 BLAKE2B a99959b8c4430aa29868eee1a85d0a3868c73cab7e32861216391f73c4fcad02f3f37801aba7c33285da42208924f8e1b51b7439f87d40cfddb8cd2e565afd37 SHA512 172753fa8d0cc6050e06010e721a69c99aab3d743af80a9b63949ed0a79a4c39fefce9cc34fe711caab89c20715b982142379d57f6acac92a762d19fdb805220
+DIST ckpass-0.2.tar.gz 95921 BLAKE2B f1a03e293bf9e2f26c28c63a41cfc319f938ef10bcbae1c578da5cdeb322c31649fd060e2f45a3144bee15fe6050d3f00f499f924c34305942cd6f79afdbfb87 SHA512 aca439caea2e3736539f5ec6bb235e51c59fed627eb9b414e629ad246c301e6f1dc90594826f6d95be9963aa4af0dae64419d08a44beb0a02d16a9fdf42a9a0b
+EBUILD ckpass-0.2-r1.ebuild 498 BLAKE2B bbd9a931609f6cb919dcbc6ca4e2e96fa05ffeb6026c55a9b44de3e401d62011d738c5476fd94911d2dab1c34bf536eb7f6ac0500c1b8e4df2395f5eaceaddac SHA512 24de0a86d026ae6e92fcc86dd725c7c03401bc6631ef54759bf5549dc1b2c739cdc7faa5eb3e4ec6a7cef4c8b247dda33bb7f3509929d06533181094ba7821e6
+MISC metadata.xml 243 BLAKE2B ed72a20ca55c34314c109963e70f2d9f84c6b163187aa1aadfdd381d6a72cf50cf0aa70aca283bd067459cf5be9e1d1efe49ce1a05390e5d4f82c833e94ae573 SHA512 c1819159451450ef4228df48702ae486aa5caca6ba53523f4c667fb76cc8a36388697ded12851290f2698596803a64025862b8dc5aa5c22ea0c328359d2c5014
diff --git a/app-crypt/ckpass/ckpass-0.2-r1.ebuild b/app-crypt/ckpass/ckpass-0.2-r1.ebuild
new file mode 100644
index 000000000000..4b1f070d0852
--- /dev/null
+++ b/app-crypt/ckpass/ckpass-0.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="ncurses based password database client compatible with KeePass 1.x databases"
+HOMEPAGE="http://ckpass.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-libs/libkpass-6"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch b/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch
new file mode 100644
index 000000000000..8d99bc93ad8f
--- /dev/null
+++ b/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,7 @@
+ 
+ AC_CHECK_LIB([c], [main], [], AC_MSG_ERROR(requires libc))
+ AC_CHECK_LIB([ncurses], [main], [], AC_MSG_ERROR(requires libncurses))
++AC_SEARCH_LIBS([acs_map],[tinfo], [], AC_MSG_ERROR(requires a library providing acs_map))
+ AC_CHECK_LIB([form], [main], [], AC_MSG_ERROR(requires libform))
+ AC_CHECK_LIB([kpass], [main], [], AC_MSG_ERROR(requires libkpass))
+ 
diff --git a/app-crypt/ckpass/metadata.xml b/app-crypt/ckpass/metadata.xml
new file mode 100644
index 000000000000..909bd919859d
--- /dev/null
+++ b/app-crypt/ckpass/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">ckpass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/codecrypt-1.7.2 b/app-crypt/codecrypt-1.7.2
deleted file mode 100644
index 435aa047454c..000000000000
--- a/app-crypt/codecrypt-1.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/gmp:= cryptopp? ( dev-libs/crypto++ ) sci-libs/fftw:3.0
-DESCRIPTION=Post-quantum cryptography tool
-EAPI=6
-HOMEPAGE=http://e-x-a.org/codecrypt/
-IUSE=+cryptopp
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-libs/gmp:= cryptopp? ( dev-libs/crypto++ ) sci-libs/fftw:3.0
-SLOT=0
-SRC_URI=http://e-x-a.org/codecrypt/files/codecrypt-1.7.2.tar.gz
-_md5_=76fa7a33331fea1a5826c83ce02f1d4c
diff --git a/app-crypt/codecrypt-1.8 b/app-crypt/codecrypt-1.8
deleted file mode 100644
index 1af7d2d7069d..000000000000
--- a/app-crypt/codecrypt-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/gmp:= cryptopp? ( dev-libs/crypto++ ) sci-libs/fftw:3.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Post-quantum cryptography tool
-EAPI=6
-HOMEPAGE=http://e-x-a.org/codecrypt/
-IUSE=+cryptopp
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-libs/gmp:= cryptopp? ( dev-libs/crypto++ ) sci-libs/fftw:3.0
-SLOT=0
-SRC_URI=http://e-x-a.org/codecrypt/files/codecrypt-1.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=81797d48020058a2cec2d52f03d2c935
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
new file mode 100644
index 000000000000..b87f69c22d96
--- /dev/null
+++ b/app-crypt/codecrypt/Manifest
@@ -0,0 +1,5 @@
+DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a7f856ce9c077445d6387b75b97dce0fc02ee9481241b246b0eb7de6b44ac014a708a8ceba629828ca9d63b8e24c SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0
+DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
+EBUILD codecrypt-1.7.2.ebuild 672 BLAKE2B 525178d3411173523afa24e0df3fd117095f34fab99ed4d8666e2be34b7408de6311b06088a8cdcdc4dfc43f179c86abc70ed769aa0dd978ae5e3ec60730d176 SHA512 a43435250a021b7418bf2e5eb1573237bfda0690bd65e6df597700dd9ef3bdf7ac316ae164bded683e8e7412fe1e57bf7428b0f629d6f614f1b2b7ef64d68f5e
+EBUILD codecrypt-1.8.ebuild 698 BLAKE2B 1503c168832401752ed9c97900c491c6656facd16deb7864374fd6de64340d741b80b27ce1bd26d65ab15cf0079efccbaff6c0d3e1e462cd38eaec47ba09bad2 SHA512 2ee7d6740af6fd54cc77eb8dd3bb79b787c6a09256cc426a27bdece3c30735fb3d63b8dde6919ddaac5bb1bfe0ed7e1eb347b22f407682fb79f42a2962e7f874
+MISC metadata.xml 757 BLAKE2B 5346ca41ed3210ef96baa63fc22e5733d47d8998f7b0cca37cd0aed53b67a7adf5bd8cbedd68d4194476ec7ff0fe83196038766cdbb3580b185566abca76ad9e SHA512 f7e7f6a747c42a666bd0b5de69999fd377374da728c9c98f8e57fa4c7fd93e97a7a7a721c568ba920c4cbe5f5591f4174db99d89fd209df7aecbad06f59f75a3
diff --git a/app-crypt/codecrypt/codecrypt-1.7.2.ebuild b/app-crypt/codecrypt/codecrypt-1.7.2.ebuild
new file mode 100644
index 000000000000..4b370f10bca4
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.7.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Post-quantum cryptography tool"
+HOMEPAGE="http://e-x-a.org/codecrypt/"
+SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cryptopp"
+
+DEPEND="dev-libs/gmp:=
+	cryptopp? ( dev-libs/crypto++ )
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	# workaround -- gentoo is missing crypto++ pkg-config file
+	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac
+	./autogen.sh
+}
+
+src_configure() {
+	econf \
+		$(use_with cryptopp )
+}
diff --git a/app-crypt/codecrypt/codecrypt-1.8.ebuild b/app-crypt/codecrypt/codecrypt-1.8.ebuild
new file mode 100644
index 000000000000..f885b161e891
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Post-quantum cryptography tool"
+HOMEPAGE="http://e-x-a.org/codecrypt/"
+SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cryptopp"
+
+DEPEND="dev-libs/gmp:=
+	cryptopp? ( dev-libs/crypto++ )
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	# workaround -- gentoo is missing crypto++ pkg-config file
+	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with cryptopp )
+}
diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
new file mode 100644
index 000000000000..ec617cd817af
--- /dev/null
+++ b/app-crypt/codecrypt/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>exa.exa@gmail.com</email>
+		<name>Mirek Kratochvil</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+		<name>Amy Winston</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is a GnuPG-like unix program for encryption and signing
+		that uses only quantum-computer-resistant algorithms
+	</longdescription>
+	<use>
+		<flag name="cryptopp">Build algorithms that need Crypto++ support <pkg>dev-libs/crypto++</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/codegroup-20080907-r1 b/app-crypt/codegroup-20080907-r1
deleted file mode 100644
index 91112602e2b6..000000000000
--- a/app-crypt/codegroup-20080907-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip
-DESCRIPTION=encode / decode binary file as five letter codegroups
-EAPI=6
-HOMEPAGE=http://www.fourmilab.ch/codegroup/
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.fourmilab.ch/codegroup/codegroup.zip -> codegroup-20080907.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3ee88048c2a35aea0e841a66ba7528e8
diff --git a/app-crypt/codegroup/Manifest b/app-crypt/codegroup/Manifest
new file mode 100644
index 000000000000..456148579d0d
--- /dev/null
+++ b/app-crypt/codegroup/Manifest
@@ -0,0 +1,4 @@
+AUX codegroup-20080907-Makefile.patch 340 BLAKE2B cda48d034696257aa1f6852fb59109fe7ded48932198b9a583def8fafeabcca2493008d10da7002c7c808abe246cacae78a917a68198ac547d9f37baa426796e SHA512 55a4b8f9c8be54d48ce4f85839343c8cbb3a6dfdcf57b9552a66c111d5e48e1c6868e98f29622c4a7df58cb6ebf75f1e8748f7bf0996c05ab3c41f10ac504353
+DIST codegroup-20080907.zip 69123 BLAKE2B 06bf14527c641c9df16d60a00044b0acbceb912df9641f73280e958d35a7ca4998aa4d5bd411e432780ef715529532b3d4ce645e146143a833cc57bef5d799fd SHA512 3cf7816fe1c4c3b70cabb6e8518f6057cd04e735bef5569aff4b8753005ab33e5c4ac80bc434a45fef75267964ffe25fbfae9d72cffe6db075b4cafeb2b80e93
+EBUILD codegroup-20080907-r1.ebuild 602 BLAKE2B 2b694061ecd11efbec7399df525fc9f6d30ce052f612715879461c8e4ebb578c9103f76a93d924da68788c1f63bfcb05b1cb263cda420b50e4aefd4486ff70d1 SHA512 9d38ae2b8e6321a23d95df90f831584df819b88cd98ddabf9dedb013d77aa2a80094d6256906053b60a41cb75e8a2b4210b3d530556639636bd4362b1de3eddc
+MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
diff --git a/app-crypt/codegroup/codegroup-20080907-r1.ebuild b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
new file mode 100644
index 000000000000..cf15b9cc4d11
--- /dev/null
+++ b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="encode / decode binary file as five letter codegroups"
+HOMEPAGE="http://www.fourmilab.ch/codegroup/"
+SRC_URI="http://www.fourmilab.ch/${PN}/${PN}.zip -> ${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+
+	doman ${PN}.1
+	dodoc ${PN}.{html,jpg}
+}
diff --git a/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch b/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch
new file mode 100644
index 000000000000..8bee7abe9842
--- /dev/null
+++ b/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,5 @@
+  
+ PROGS = codegroup
+-CFLAGS = -O -Wall
+ PAGER = more
+ 
+ all:	$(PROGS)
+@@ -8,9 +7,6 @@
+ clean:
+ 	rm -f $(PROGS) *.o *.bak *.zip core code.* *.out
+ 
+-codegroup: codegroup.o
+-	$(CC) codegroup.o -o codegroup $(CFLAGS)
+-
+ #   Create zipped archive
+ 
+ RELFILES = Makefile codegroup.1 codegroup.c \
diff --git a/app-crypt/codegroup/metadata.xml b/app-crypt/codegroup/metadata.xml
new file mode 100644
index 000000000000..3c3d5ced6412
--- /dev/null
+++ b/app-crypt/codegroup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/coolkey-1.1.0-r7 b/app-crypt/coolkey-1.1.0-r7
deleted file mode 100644
index 794b77066e05..000000000000
--- a/app-crypt/coolkey-1.1.0-r7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure postinst postrm setup
-DEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/nss[utils] sys-libs/zlib >=app-crypt/ccid-1.4.0 virtual/pkgconfig
-DESCRIPTION=Linux Driver support for the CoolKey and CAC products
-EAPI=6
-HOMEPAGE=https://directory.fedora.redhat.com/wiki/CoolKey
-IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/pcsc-lite-1.6.4 dev-libs/nss[utils] sys-libs/zlib
-SLOT=0
-SRC_URI=https://directory.fedora.redhat.com/download/coolkey/coolkey-1.1.0.tar.gz mirror://gentoo/coolkey-1.1.0-patches-003.tar.gz
-_md5_=4a1e4c677672b3837175a484d03d92c7
diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest
new file mode 100644
index 000000000000..e9d22c5ef9f1
--- /dev/null
+++ b/app-crypt/coolkey/Manifest
@@ -0,0 +1,4 @@
+DIST coolkey-1.1.0-patches-003.tar.gz 21263 BLAKE2B 27025b8aa24df45f8efa872122a1c3699db6d0d627861182c7eb1d61b921d026d7e3355d1b3d12608747ed1d214eee764b53dbbc5599c452b347e191e1516eca SHA512 25a5fac68ca041fcf9e927d134d0179fa286e6de75019e7bbf205edeaf73222d9fb9fd3861a8f6e0d933d1a09229e3e727278c3a9b3cc63390ef07774c46390d
+DIST coolkey-1.1.0.tar.gz 432808 BLAKE2B 7e443cdb0dedcec5de32cf5c7cc5eb2d81f1d51fbc2e580fda302153d3f8a919bc89d2308b8799cf395c89d16150e09bd33bc76eacb8af855c54b961bb5d082a SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b
+EBUILD coolkey-1.1.0-r7.ebuild 1947 BLAKE2B 679cfab4ae924f31d97aae3239fe459979aefeef778fbd7581ecc8e92dc1163f3fe2768b44016262fe34697b2561c912fca012d2b6083d5db8f1c3413db95d43 SHA512 7997511e43ffa4969a05523cbdfe5c757ed5bc80ca284bc072f5f78ba4ba9841df04835e2cf90a3142d8d2f8a2dde22becc37be3590462387c44aadcd09b8f35
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
new file mode 100644
index 000000000000..79c08285e155
--- /dev/null
+++ b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHVER="003"
+
+DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
+HOMEPAGE="https://directory.fedora.redhat.com/wiki/CoolKey"
+SRC_URI="https://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+	dev-libs/nss[utils]
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	>=app-crypt/ccid-1.4.0
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}/${PN}-patches"
+)
+
+pkg_setup() {
+	pk="pk11install"
+	dbdir="/etc/pki/nssdb"
+	ck_mod_name="CoolKey PKCS #11 Module"
+
+	if ! [[ -x $dbdir ]]; then
+		ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
+		ewarn "follow the suggested commands using the correct path."
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-pk11install \
+		$(use_enable debug)
+}
+
+src_compile() {
+	emake CFLAGS+="-fno-strict-aliasing" -j1
+}
+
+pkg_postinst() {
+	if [[ -x $dbdir ]]; then
+		if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+			elog "You still need to install libcoolkey in your PKCS11 library:"
+			elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
+
+		fi
+	else
+		elog ""
+		elog "You still need to setup your PKCS11 library, or at least"
+		elog "find where it is (perhaps \$HOME/.pki/nssdb).  Once you"
+		elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
+		elog "libcoolkeypk11.so, and if not found, add it using:"
+		elog ""
+		elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
+		elog ""
+		elog "where \$db is the full path to your pki/nssdb directory."
+		elog ""
+	fi
+}
+
+pkg_postrm() {
+	if [[ -x $dbdir ]]; then
+		if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+			elog "You should remove libcoolkey from your PKCS11 library."
+		fi
+	fi
+}
diff --git a/app-crypt/coolkey/metadata.xml b/app-crypt/coolkey/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/coolkey/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/crackpkcs12-0.2.10 b/app-crypt/crackpkcs12-0.2.10
deleted file mode 100644
index bf9645e720bf..000000000000
--- a/app-crypt/crackpkcs12-0.2.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=multithreaded program to crack PKCS#12 files
-EAPI=5
-HOMEPAGE=http://crackpkcs12.sourceforge.net/
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=mirror://sourceforge/crackpkcs12/crackpkcs12-0.2.10.tar.gz
-_md5_=d5718189004e65d980d9104e775ba129
diff --git a/app-crypt/crackpkcs12/Manifest b/app-crypt/crackpkcs12/Manifest
new file mode 100644
index 000000000000..4d268e058aa0
--- /dev/null
+++ b/app-crypt/crackpkcs12/Manifest
@@ -0,0 +1,3 @@
+DIST crackpkcs12-0.2.10.tar.gz 94473 BLAKE2B 4e83dddfae5c861d442e7d040f4ba7065e1b89b1e7487c554acd871a11445de16fbd25787d581ce4c903ba6eb63d458902fd41711e72aee2ccfa2188031aa65a SHA512 5a2217e7809bef90a983cf8b7efff394bf59dac8ebea2b44c241b27ff07af59c86ce72db77ca1c9b1cbea15245165c200711bcb0bb64ccd4f3b38d3a2dfecbc5
+EBUILD crackpkcs12-0.2.10.ebuild 441 BLAKE2B d04ddd295677c2266e4be3f6b0b83ada4bcbb52e8135cdc1b4e79b73e410a7a20b84a5ee97dea15410082b71b164924ba625e04278ee597a28a943c21a54607b SHA512 d90673a093059df5f5373cdabde7fbca1cdc75210191351b6085dca899dc7fdb99d63f20be41440edb6ff9d65d466c72a32612250ab1741da2e04ce68f51c08f
+MISC metadata.xml 248 BLAKE2B 92bae9007a115537d0d20f1fc65f4459c6a67e76724cb4520d9f64c0c5b252fa355980191e2a2a1c750d0f7132a139cd8bef554ef3db43a9d5617189c338031c SHA512 2120a5e35e0df9ec55b65c09988f9bc4bdd2e3b3e7dd0fb540a6d2457cd00d80349990ab1368e615bb0ddcf4b11bb39e113df98c65ef309cfa6559647f8c076f
diff --git a/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild b/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
new file mode 100644
index 000000000000..e120fce2d803
--- /dev/null
+++ b/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="multithreaded program to crack PKCS#12 files"
+HOMEPAGE="http://crackpkcs12.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
diff --git a/app-crypt/crackpkcs12/metadata.xml b/app-crypt/crackpkcs12/metadata.xml
new file mode 100644
index 000000000000..f8dfe46c28b3
--- /dev/null
+++ b/app-crypt/crackpkcs12/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">crackpkcs12</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/debian-archive-keyring-2014.3 b/app-crypt/debian-archive-keyring-2014.3
deleted file mode 100644
index b1ef6a270150..000000000000
--- a/app-crypt/debian-archive-keyring-2014.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GnuPG archive keys of the Debian archive
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/debian-archive-keyring
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2014.3_all.deb
-_eclasses_=unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=598a1645bbb355b6fc9936a9f57607a7
diff --git a/app-crypt/debian-archive-keyring-2017.5 b/app-crypt/debian-archive-keyring-2017.5
deleted file mode 100644
index 9a29b9d7ae1b..000000000000
--- a/app-crypt/debian-archive-keyring-2017.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GnuPG archive keys of the Debian archive
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/debian-archive-keyring
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2017.5_all.deb
-_eclasses_=unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=598a1645bbb355b6fc9936a9f57607a7
diff --git a/app-crypt/debian-archive-keyring-2017.6 b/app-crypt/debian-archive-keyring-2017.6
deleted file mode 100644
index 1ec0b841cf2e..000000000000
--- a/app-crypt/debian-archive-keyring-2017.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GnuPG archive keys of the Debian archive
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/debian-archive-keyring
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2017.6_all.deb
-_eclasses_=unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=598a1645bbb355b6fc9936a9f57607a7
diff --git a/app-crypt/debian-archive-keyring-2017.7 b/app-crypt/debian-archive-keyring-2017.7
deleted file mode 100644
index aec80d297c55..000000000000
--- a/app-crypt/debian-archive-keyring-2017.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GnuPG archive keys of the Debian archive
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/debian-archive-keyring
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2017.7_all.deb
-_eclasses_=unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=cf010370359633d1d7016658aed6a0ea
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
new file mode 100644
index 000000000000..8b1dfc9a357b
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -0,0 +1,9 @@
+DIST debian-archive-keyring_2014.3_all.deb 40060 BLAKE2B 8cc046e484ec2f0f1028a36475c60ea6b2f70b43d3a1a187c6bde7c731c87a19bc9ebd4fbf63055accdf7ede31fba89c34806692a10158def2c95448e7ff037b SHA512 7a24596f250eafb6e62d19523cd13c3b1809bea3f694bd92f3d427f67cd840e0292200e6b033b5c5c5cf41ab40233ae17d133a846be483afa1da3b67cac72931
+DIST debian-archive-keyring_2017.5_all.deb 56438 BLAKE2B 3dfe5e2fc1397eda72491b32eb1bc77a7b2f197a880fc5ca4a8aa79d54d6ecd3d080fca234ca5b418d96123af680ff2fe915af7b6050740f86a2d6f57f9a0fd7 SHA512 8e7dafd850a7ad0a322790e41ace819ad51c1a17be4bd506c5790ccef97f1a0dc0cb78841225b4c6a85c20d502800fbfe991ea9c8c48a5bb58598754dcbd6173
+DIST debian-archive-keyring_2017.6_all.deb 56618 BLAKE2B f16e0ad9e7a86b57e5011495747acecedd6901919a3b267bca3a41a3f0b212f8158a552c374d8e8a43a7260fec3c64d4634ee8c49ed2155fab9edd168d72505e SHA512 728252b029dc72ff341b5eaa1bcd1b7e0669c1e0f0cf120ad4cb5ec36e600ffb7d344e9b24d1daa964272f07c90e3ed70a1b7fb9b8507da0778a8370a4b18029
+DIST debian-archive-keyring_2017.7_all.deb 56940 BLAKE2B eac1f8399e6f3176721f4b6f8463849053f5dffaac0cd9d297e5774a62582a30caf9281614d71de6f302a15784082b99963eff910d253cdbeef26ad66337bdf2 SHA512 9802058a9de69d941eab9ebf7a8370b1b5af0130444ca8fd46996d1699f940775fec2820f7963fdcf70e49a467682d1ac023a1da72e34f90cf3c09a04dface74
+EBUILD debian-archive-keyring-2014.3.ebuild 432 BLAKE2B 289363d69c61a3398570843275c3139a6d7da37d5cec506f566d0dacf73353c3e0bee4e459ea0000c1a3ae6601c01c9303479cca8782f97bf4ead03f7f883716 SHA512 f1f30dd36d9ebc007f616d8f47530e73440556c1607c31542c66671a5d15ee8c28ca76d2036bf379a1600acaf1db805fc8af5090308873e621b13587c20a45ad
+EBUILD debian-archive-keyring-2017.5.ebuild 432 BLAKE2B 289363d69c61a3398570843275c3139a6d7da37d5cec506f566d0dacf73353c3e0bee4e459ea0000c1a3ae6601c01c9303479cca8782f97bf4ead03f7f883716 SHA512 f1f30dd36d9ebc007f616d8f47530e73440556c1607c31542c66671a5d15ee8c28ca76d2036bf379a1600acaf1db805fc8af5090308873e621b13587c20a45ad
+EBUILD debian-archive-keyring-2017.6.ebuild 432 BLAKE2B 289363d69c61a3398570843275c3139a6d7da37d5cec506f566d0dacf73353c3e0bee4e459ea0000c1a3ae6601c01c9303479cca8782f97bf4ead03f7f883716 SHA512 f1f30dd36d9ebc007f616d8f47530e73440556c1607c31542c66671a5d15ee8c28ca76d2036bf379a1600acaf1db805fc8af5090308873e621b13587c20a45ad
+EBUILD debian-archive-keyring-2017.7.ebuild 432 BLAKE2B 34deacf36b65c15a0c8274ae20efe2d16189f5a9dc739f561a5c53a8c2705ef8877ea985637421ed011ee87a0c2e98ab407e9252a2cd0f4f2912e9f9db5f9237 SHA512 d102d6d8dfe899e516f33ee824f2842ec36a5280082ab243f1d7d7960bf8afd7b603284fc61b0b857985a64627abd7579fb73c7ae8525c9a249bf3c380587847
+MISC metadata.xml 255 BLAKE2B 4c7bf34bcfa727317b7cc808eb50bbfd3d1aae64fa098b599480cc8ae6cfc527956a0d593db2ecc55b1b3cea48c5ce46642b64cda5b40753d6fe5e883129147b SHA512 92faa797311ee8b7bab9f5f5070d5fa6b75ca5f3a07643f8fc4d67a28d50d746e904009b7fb1a8214c4b0fc296b4b3ab3f695786103dc6c26479c5542165a587
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
new file mode 100644
index 000000000000..bdd070ab72dd
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r .
+}
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.5.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.5.ebuild
new file mode 100644
index 000000000000..bdd070ab72dd
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r .
+}
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.6.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.6.ebuild
new file mode 100644
index 000000000000..bdd070ab72dd
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r .
+}
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.7.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.7.ebuild
new file mode 100644
index 000000000000..9e4c17ad39d7
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2017.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r .
+}
diff --git a/app-crypt/debian-archive-keyring/metadata.xml b/app-crypt/debian-archive-keyring/metadata.xml
new file mode 100644
index 000000000000..75493d77fb70
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>sping@gentoo.org</email>
+    <name>Sebastian Pipping</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/dehydrated-0.4.0-r3 b/app-crypt/dehydrated-0.4.0-r3
deleted file mode 100644
index 9d1f6cb41d2a..000000000000
--- a/app-crypt/dehydrated-0.4.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst
-DEPEND=virtual/cron
-DESCRIPTION=a client for signing certificates with an ACME-server
-EAPI=6
-HOMEPAGE=https://github.com/lukas2511/dehydrated
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/cron app-shells/bash
-SLOT=0
-SRC_URI=https://github.com/lukas2511/dehydrated/archive/v0.4.0.tar.gz -> dehydrated-0.4.0.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=37f45bdcbea0211bf6d4a094092c42eb
diff --git a/app-crypt/dehydrated-0.6.1 b/app-crypt/dehydrated-0.6.1
deleted file mode 100644
index 56c9d709f77e..000000000000
--- a/app-crypt/dehydrated-0.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst
-DEPEND=virtual/cron
-DESCRIPTION=a client for signing certificates with an ACME-server
-EAPI=6
-HOMEPAGE=https://github.com/lukas2511/dehydrated
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/cron app-shells/bash net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/lukas2511/dehydrated/archive/v0.6.1.tar.gz -> dehydrated-0.6.1.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4ad9d5fcbb638a40655c538fc9755838
diff --git a/app-crypt/dehydrated-0.6.2 b/app-crypt/dehydrated-0.6.2
deleted file mode 100644
index 9b825f0e28dd..000000000000
--- a/app-crypt/dehydrated-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst
-DEPEND=virtual/cron
-DESCRIPTION=a client for signing certificates with an ACME-server
-EAPI=6
-HOMEPAGE=https://github.com/lukas2511/dehydrated
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/cron app-shells/bash net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/lukas2511/dehydrated/archive/v0.6.2.tar.gz -> dehydrated-0.6.2.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4ad9d5fcbb638a40655c538fc9755838
diff --git a/app-crypt/dehydrated-0.6.2-r1 b/app-crypt/dehydrated-0.6.2-r1
deleted file mode 100644
index b55e324148d3..000000000000
--- a/app-crypt/dehydrated-0.6.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst
-DEPEND=cron? ( virtual/cron )
-DESCRIPTION=a client for signing certificates with an ACME-server
-EAPI=6
-HOMEPAGE=https://github.com/lukas2511/dehydrated
-IUSE=+cron
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=cron? ( virtual/cron ) app-shells/bash net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/lukas2511/dehydrated/archive/v0.6.2.tar.gz -> dehydrated-0.6.2.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=afb0402c23be05a0111d656570fca3b9
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
new file mode 100644
index 000000000000..422e354f5068
--- /dev/null
+++ b/app-crypt/dehydrated/Manifest
@@ -0,0 +1,10 @@
+AUX 00_gentoo.sh 115 BLAKE2B f24fe757e45d9af58adb9417ef6dbd36c5db85bdc50af1403048a01625dac68e649fee2913ed2c9f199ec285666cb4b9100650b3b1b54929005260c2182adb49 SHA512 2092f8bffbc6b34fa806276194873fed42146d8c8a434bb68088e03ec9eb0a2e0c1862a9ade67d56a6bd553119cd00f8815353b71345e451039254708430e52b
+AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2c3b647a642bfca14f6b05161d13266983bf5672787c7fc5c44e55d953ebebf346259 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6
+DIST dehydrated-0.4.0.tar.gz 74005 BLAKE2B ad55b7c53be0bc0c08ff372171638e9739a6213062b45c36e6ca5bce205b35d097bcffb6d1db6cd9c01f46a6ea31143cd2713bffb5e19f91041969e96a3cc337 SHA512 3c8c0f2fab57a432b69451f8372c02666dd953985679d12a2af9f6b917335b5b10a1196699106e317660039178ce1139a4d5455d4825a152b6911596fba16738
+DIST dehydrated-0.6.1.tar.gz 76693 BLAKE2B 5ecca2942aedc024e87e7b5aac05d836adbbc8bb1dfb38bfcd396a63e9d3e8637d625e279c4e5a47514c0b4f27006226dad7257a620da49c426c256e5267a33d SHA512 c3ef92da4e0e12100d267422eb2667607842f6fb0fe10cbc4d10aee9b5137d292db2348eca34b1f492e21c6c325dcbb595a9ab4de634e4d4a43346be1e2ce0ad
+DIST dehydrated-0.6.2.tar.gz 77819 BLAKE2B 5a1cc097b42d5c4d9513b5a13c86f0b101b3442fb6cfbe54563357095619764724a2158e050a8e8b13a60a9effe83a5339ec647ef5a93622c8d63f1fcdb72be8 SHA512 97cce8f4936482d6b3a7d4227d8735b1c91f3b6cb7c728669a4a5139605932a88171c7e5d715d269782f260454d06ee95a0f6cd2735521e22c4f69bdc3e38f86
+EBUILD dehydrated-0.4.0-r3.ebuild 1554 BLAKE2B 3fbd4b2d0eda6858f085d2644709897faefbfab26855e37682b7f45a4d262bf80c8a72f8d757df94179f72b7b9a94e7b163cdfcde7d8a72f5e5cf655e05b2e4d SHA512 619e37279c8f7070d2e74f15033d7b6d098479b1837d73cdc9789b6a810160643b2561f268a63acc712abad365ee645150c76bd8c6f5c35e75d734dd3ec280c4
+EBUILD dehydrated-0.6.1.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
+EBUILD dehydrated-0.6.2-r1.ebuild 1630 BLAKE2B 637aebbef3fa97dae78a182ed9cc2e6feeb09c6e15ef6588b485ca16b86f530f8c210086d3df53adcb756845532d2d8c76ce164b61a88495a09336dde8efd381 SHA512 3ee7b5cc1303b797cd574f24030a7eb8413c8c39e039ebf18141fb7711390b6f56195d8140ea957b37abc10bd51be6a48911425910eb7776f74d7ec96af99bf1
+EBUILD dehydrated-0.6.2.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
+MISC metadata.xml 531 BLAKE2B dcd597fde3bafe2970275a99609546b1a2ef764729cd410a62389a29f8ce95e269f2155970503e041c937a28026c3d70763c86f492c4a8a3478026125eb5eecc SHA512 fe42f3b7b8ca0d2f18d389348599f468eaa80928a05fa7151bae23f5dd73d260fca6ebd3a701eed450b639438e44ca038aef420732e92ab9ddc672c0022bfbdd
diff --git a/app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild b/app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild
new file mode 100644
index 000000000000..04a980e238ad
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/cron"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+"
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin "${PN}"
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+
+	insinto /etc/"${PN}"/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	insinto "/etc/cron.d"
+	newins "${FILESDIR}"/cron "${PN}"
+
+	dodir /etc/"${PN}"/config.d
+	keepdir /etc/"${PN}"/config.d
+
+	default
+}
+
+pkg_preinst() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
+		ewarn ""
+		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
+		ewarn "Please consider migrating your data with a command like"
+		ewarn ""
+		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
+		ewarn ""
+		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
+		ewarn ""
+	fi
+	einfo "See /etc/dehydrated/config for configuration."
+	einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+}
diff --git a/app-crypt/dehydrated/dehydrated-0.6.1.ebuild b/app-crypt/dehydrated/dehydrated-0.6.1.ebuild
new file mode 100644
index 000000000000..a04c83040fd4
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.6.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/cron"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	net-misc/curl
+"
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin "${PN}"
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+
+	insinto /etc/"${PN}"/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	insinto "/etc/cron.d"
+	newins "${FILESDIR}"/cron "${PN}"
+
+	dodir /etc/"${PN}"/config.d
+	keepdir /etc/"${PN}"/config.d
+
+	default
+}
+
+pkg_preinst() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
+		ewarn ""
+		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
+		ewarn "Please consider migrating your data with a command like"
+		ewarn ""
+		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
+		ewarn ""
+		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
+		ewarn ""
+	fi
+	einfo "See /etc/dehydrated/config for configuration."
+	einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+}
diff --git a/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild b/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..328af1a4cfb7
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cron"
+
+DEPEND="cron? ( virtual/cron )"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	net-misc/curl
+"
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin "${PN}"
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+
+	insinto /etc/"${PN}"/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	if use cron ; then
+		insinto "/etc/cron.d"
+		newins "${FILESDIR}"/cron "${PN}"
+	fi
+
+	dodir /etc/"${PN}"/config.d
+	keepdir /etc/"${PN}"/config.d
+
+	default
+}
+
+pkg_preinst() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
+		ewarn ""
+		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
+		ewarn "Please consider migrating your data with a command like"
+		ewarn ""
+		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
+		ewarn ""
+		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
+		ewarn ""
+	fi
+	einfo "See /etc/dehydrated/config for configuration."
+	use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+}
diff --git a/app-crypt/dehydrated/dehydrated-0.6.2.ebuild b/app-crypt/dehydrated/dehydrated-0.6.2.ebuild
new file mode 100644
index 000000000000..a04c83040fd4
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.6.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/cron"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	net-misc/curl
+"
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin "${PN}"
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+
+	insinto /etc/"${PN}"/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	insinto "/etc/cron.d"
+	newins "${FILESDIR}"/cron "${PN}"
+
+	dodir /etc/"${PN}"/config.d
+	keepdir /etc/"${PN}"/config.d
+
+	default
+}
+
+pkg_preinst() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
+		ewarn ""
+		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
+		ewarn "Please consider migrating your data with a command like"
+		ewarn ""
+		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
+		ewarn ""
+		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
+		ewarn ""
+	fi
+	einfo "See /etc/dehydrated/config for configuration."
+	einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+}
diff --git a/app-crypt/dehydrated/files/00_gentoo.sh b/app-crypt/dehydrated/files/00_gentoo.sh
new file mode 100644
index 000000000000..cab73dbfa8e2
--- /dev/null
+++ b/app-crypt/dehydrated/files/00_gentoo.sh
@@ -0,0 +1,3 @@
+# base config required for gentoo defaults
+BASEDIR="/var/lib/dehydrated"
+DOMAINS_TXT="/etc/dehydrated/domains.txt"
diff --git a/app-crypt/dehydrated/files/cron b/app-crypt/dehydrated/files/cron
new file mode 100644
index 000000000000..df03b5fcee13
--- /dev/null
+++ b/app-crypt/dehydrated/files/cron
@@ -0,0 +1,2 @@
+# dehydrated cron job
+#0 2 * * * dehydrated /usr/bin/dehydrated --cron
diff --git a/app-crypt/dehydrated/metadata.xml b/app-crypt/dehydrated/metadata.xml
new file mode 100644
index 000000000000..f2198d055c2f
--- /dev/null
+++ b/app-crypt/dehydrated/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<use>
+		<flag name="cron">Install cron job to sign/renew non-existent/changed/expiring certificates</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">lukas2511/dehydrated</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/dieharder-3.31.1-r1 b/app-crypt/dieharder-3.31.1-r1
deleted file mode 100644
index 63bf023aebf6..000000000000
--- a/app-crypt/dieharder-3.31.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=sci-libs/gsl doc? ( dev-tex/latex2html )
-DESCRIPTION=An advanced suite for testing the randomness of RNG's
-EAPI=6
-HOMEPAGE=http://www.phy.duke.edu/~rgb/General/dieharder.php
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sci-libs/gsl
-SLOT=0
-SRC_URI=http://www.phy.duke.edu/~rgb/General/dieharder/dieharder-3.31.1.tgz
-_md5_=06f4e2952e2b70a8581048c0351453e0
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
new file mode 100644
index 000000000000..c5bb583afb67
--- /dev/null
+++ b/app-crypt/dieharder/Manifest
@@ -0,0 +1,4 @@
+AUX dieharder-3.31.1-build.patch 623 BLAKE2B a914f3b8f805725db9d30687b9265814661c9d00a5bc6246785eaab304e130dce417025153cd8b530ad0d3ed179583d865133c9bca3bee6ec2b427e78c1d527c SHA512 8d98efdcbfd4cea06d1cae1a1fbea1305e366c030c99b3abb944d1a47543e9b592304f60cd8dbfe9b3fa77ec9ee61c2537bf2390f072ced7d36ad7eb9550e4ea
+DIST dieharder-3.31.1.tgz 1149780 BLAKE2B 12937b54e713ce87d6cb815b9b1e00989085b7661538316649caea4a514518528039441d0d42f377c363c62db179f362feb9d64612a75f724ac363744f884a47 SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5
+EBUILD dieharder-3.31.1-r1.ebuild 925 BLAKE2B 0f2d51c0f5657b129ce0e8c5903f1e3b5186806cce815dfe1dc3db8a45350ad135e0edd618f7614019584a6930f37055a71a11eb246771fc1fc079737a854544 SHA512 c80e3e7ada89738c3cbed358859c8c89e8752c35b7a8c86a99a1417057f304517e1d8a056207907b664a4855e8eb2916d11efd7457196e82d9ed85715ca76675
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
new file mode 100644
index 000000000000..7a783bb23e83
--- /dev/null
+++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An advanced suite for testing the randomness of RNG's"
+HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
+SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="sci-libs/gsl"
+DEPEND="${RDEPEND}
+	doc? ( dev-tex/latex2html )"
+
+DOCS=(
+	NOTES
+)
+HTML_DOCS=()
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	use doc && DOCS+=(
+		ChangeLog
+		manual/dieharder.pdf manual/dieharder.ps
+	)
+	use doc && HTML_DOCS+=(
+		dieharder.html
+	)
+}
+
+src_compile() {
+	emake -j1
+	use doc && emake -C manual
+}
+
+src_install() {
+	default
+
+	docinto "dieharder"
+	dodoc dieharder/README dieharder/NOTES
+	docinto "libdieharder"
+	dodoc libdieharder/README libdieharder/NOTES
+}
diff --git a/app-crypt/dieharder/files/dieharder-3.31.1-build.patch b/app-crypt/dieharder/files/dieharder-3.31.1-build.patch
new file mode 100644
index 000000000000..4cbd5021c77c
--- /dev/null
+++ b/app-crypt/dieharder/files/dieharder-3.31.1-build.patch
@@ -0,0 +1,27 @@
+diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h
+index 2138ebf..f6d471b 100644
+--- a/include/dieharder/libdieharder.h
++++ b/include/dieharder/libdieharder.h
+@@ -6,6 +6,8 @@
+ 
+ #include "copyright.h"
+ 
++#define _GNU_SOURCE
++
+ /* To enable large file support */
+ #define _FILE_OFFSET_BITS 64
+ 
+@@ -16,13 +18,11 @@
+ #include <sys/time.h>
+ 
+ /* This turns on uint macro in c99 */
+-#define __USE_MISC 1
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+ /* This turns on M_PI in math.h */
+-#define __USE_BSD 1
+ #include <math.h>
+ #include <limits.h>
+ #include <gsl/gsl_rng.h>
diff --git a/app-crypt/dieharder/metadata.xml b/app-crypt/dieharder/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/dieharder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/easy-rsa-3.0.1-r1 b/app-crypt/easy-rsa-3.0.1-r1
deleted file mode 100644
index e294834e1c22..000000000000
--- a/app-crypt/easy-rsa-3.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl )
-DESCRIPTION=Small RSA key management package, based on OpenSSL
-EAPI=5
-HOMEPAGE=https://openvpn.net/
-IUSE=libressl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-vpn/openvpn-2.3
-SLOT=0
-SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/3.0.1/EasyRSA-3.0.1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b4612f426814732a6e309820b1a626e
diff --git a/app-crypt/easy-rsa-3.0.3 b/app-crypt/easy-rsa-3.0.3
deleted file mode 100644
index d4bdba7acc26..000000000000
--- a/app-crypt/easy-rsa-3.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl )
-DESCRIPTION=Small RSA key management package, based on OpenSSL
-EAPI=5
-HOMEPAGE=https://openvpn.net/
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-vpn/openvpn-2.3
-SLOT=0
-SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.3/EasyRSA-3.0.3.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4365e1a0c23b760a9c7aace449e112a8
diff --git a/app-crypt/easy-rsa-3.0.4 b/app-crypt/easy-rsa-3.0.4
deleted file mode 100644
index 5c3789f82c9a..000000000000
--- a/app-crypt/easy-rsa-3.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl )
-DESCRIPTION=Small RSA key management package, based on OpenSSL
-EAPI=7
-HOMEPAGE=https://openvpn.net/
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-vpn/openvpn-2.3
-SLOT=0
-SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.4/EasyRSA-3.0.4.tgz
-_md5_=264190f4a4f93d62f8fa4fd6efc015fc
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
new file mode 100644
index 000000000000..342ed55bca5b
--- /dev/null
+++ b/app-crypt/easy-rsa/Manifest
@@ -0,0 +1,8 @@
+AUX 65easy-rsa 37 BLAKE2B 4a53c21a6027a9c5857d93e23703651b3d2642f54ce4519e727dd421230662f27f2ab45761041cf5b6b6cd654831d33297f1656eab26c496ee3e4f9d39f6ac3d SHA512 2f8c4f489ebd2ad2e5a0d45351361ecfc06a9481d9e15ea48215addb82ddf2083a85acb0a5c171d0c7e5406152d3679a5a7835e22ba9953e554614d94026d778
+DIST EasyRSA-3.0.1.tgz 40960 BLAKE2B 8f1be521da9c57abc911b771188bd6e3e0732fa03445de2ca5815ac4d16cd59993e2dcc7c714c6bf1ff151ab9e95b5c9578504ece3787996d30ed37972ec6047 SHA512 d20f646e33ec803444dfcd446553f1d6001227fedec93280c212b34cccee11b184599f1b2ae6a3ce9cf6c9ac52f2b840ebb645536df6ddf55382fa25c22df81f
+DIST EasyRSA-3.0.3.tgz 40960 BLAKE2B 1ada3a467bda797d35204d5a03b94a750e339a7ec8a7806007eee4b6b5442e76a2472a404fb7e963fefc42385474a0197eeaec8fa27c2b737f7f4ff55b4e2878 SHA512 c8cdc31d67e63f9e8338095fa4534bb141d857a8a9f510bef1af32270b8421952e569253bc8b7a51ebf1b443a6ad5c7cd011b258d7c9f56426ecd3f2b710b6f9
+DIST EasyRSA-3.0.4.tgz 37721 BLAKE2B 84d81eb86dfee42f6de935cbd308262d36626170880a24d260dd8ae708d6340feb63866cb1704c9209675112eef4a251399e19948e88067e90b410c00707a770 SHA512 0bc145e510891af022c05427436c3ec7a29fce9d83e022954acd0cc470c88c43f5549af0b6263b46e8dc5fd167621a118cba0c01a514c51032cea8f1efbb9787
+EBUILD easy-rsa-3.0.1-r1.ebuild 857 BLAKE2B 3fb4a7174f5ac361e72cbfcf477a1cf8f9ea052ab80503374915f6b908bc8efff58063dcca123b3f2473e16d16a7aae9dc25b1ee05ac195cbf17d4f75ce633f8 SHA512 59d2982e230e6273415ca420b37ef63708799501b6d828397f857351439841935321aba0d2bb7700842f9c46db7a24b4266a8f8745a4163406e3a49d39bb0d8c
+EBUILD easy-rsa-3.0.3.ebuild 863 BLAKE2B 84e876775df4eb074580586cabca63b71a689a74bd09914697a94fb45ffd074d3f4c56a73c0c87f6a927cd4e012fefad4cccdd103ebb7132eb4a7c496d85aa46 SHA512 54e54180274a49c87acc6cfe1db7e5299eaef5b151e2192492af21a2b268b4196333b66d9e5d1166cddf32bc5a6270d82a8bed1fe06dee639b1e7bfd4b243d6f
+EBUILD easy-rsa-3.0.4.ebuild 851 BLAKE2B a1d4d2c8a7a1ec9d88098b012f64a0dbdc82ab757ca0ca642983aa239da5736eaab565c8eff692c0fd2823a56e0a7e4f5583a3f3d25df09ae34eb6b37b6b330c SHA512 f2a8da4b971f04b8becce8ef5367fb1fa45fb6d83071a2a23b4a27197551b8e51ea87ed868b272b056f879a18ae99d9623e2a95b88c256d5afd3496f210909cb
+MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..949a6813ce01
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_P="EasyRSA-${PV}"
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="https://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+	libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+	!<net-vpn/openvpn-2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	exeinto /usr/share/easy-rsa
+	doexe easyrsa
+	insinto /usr/share/easy-rsa
+	doins -r vars.example openssl-1.0.cnf x509-types
+	dodoc README.quickstart.md ChangeLog
+	dodoc -r doc
+	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild
new file mode 100644
index 000000000000..5604cb713a69
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_P="EasyRSA-${PV}"
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="https://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/v${PV}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+	libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+	!<net-vpn/openvpn-2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	exeinto /usr/share/easy-rsa
+	doexe easyrsa
+	insinto /usr/share/easy-rsa
+	doins -r vars.example openssl-1.0.cnf x509-types
+	dodoc README.quickstart.md ChangeLog
+	dodoc -r doc
+	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
new file mode 100644
index 000000000000..d9ada0b6cb9a
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="EasyRSA-${PV}"
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="https://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/v${PV}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+	libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+	!<net-vpn/openvpn-2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	exeinto /usr/share/easy-rsa
+	doexe easyrsa
+	insinto /usr/share/easy-rsa
+	doins -r vars.example openssl-easyrsa.cnf x509-types
+	dodoc README.quickstart.md ChangeLog
+	dodoc -r doc
+	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/easy-rsa/files/65easy-rsa b/app-crypt/easy-rsa/files/65easy-rsa
new file mode 100644
index 000000000000..cc8b42e22ea5
--- /dev/null
+++ b/app-crypt/easy-rsa/files/65easy-rsa
@@ -0,0 +1 @@
+CONFIG_PROTECT="/usr/share/easy-rsa"
diff --git a/app-crypt/easy-rsa/metadata.xml b/app-crypt/easy-rsa/metadata.xml
new file mode 100644
index 000000000000..c870b4c79275
--- /dev/null
+++ b/app-crypt/easy-rsa/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">OpenVPN/easy-rsa</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-crypt/efitools-1.7.0 b/app-crypt/efitools-1.7.0
deleted file mode 100644
index ae95c892ce26..000000000000
--- a/app-crypt/efitools-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man >=sys-boot/gnu-efi-3.0u app-crypt/sbsigntools virtual/pkgconfig dev-perl/File-Slurp
-DESCRIPTION=Tools for manipulating UEFI secure boot platforms
-EAPI=5
-HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git
-IUSE=libressl
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v1.7.0.tar.bz2 -> efitools-1.7.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a266fa0be491d0be16e8149531d4c12
diff --git a/app-crypt/efitools-1.8.1 b/app-crypt/efitools-1.8.1
deleted file mode 100644
index bf8423300270..000000000000
--- a/app-crypt/efitools-1.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-apps/util-linux app-crypt/sbsigntools dev-perl/File-Slurp static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
-DESCRIPTION=Tools for manipulating UEFI secure boot platforms
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git
-IUSE=libressl static
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-apps/util-linux
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.8.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97b5fec7316f5ef98f628d62159a8214
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
new file mode 100644
index 000000000000..09a8bca846fe
--- /dev/null
+++ b/app-crypt/efitools/Manifest
@@ -0,0 +1,7 @@
+AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
+AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
+DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
+DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
+EBUILD efitools-1.7.0.ebuild 787 BLAKE2B 9c2daade67b20bb4fb7b38413ff174695a40889e509c0828f68fc8d1eb1a0d0c7ed2cdc32d05608cff53317c4ca4db3133ec041cb86ffdac2b1d1287c00c3043 SHA512 66b40139afd0f071db68891152a25c9d6993be948e100817b26eb3fa547d09580bd4e9bfff8916c58a7f2bd38bfe4221edd1452d58a59e251629f5689f88740e
+EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild b/app-crypt/efitools/efitools-1.7.0.ebuild
new file mode 100644
index 000000000000..c47c9b03a9e0
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	>=sys-boot/gnu-efi-3.0u
+	app-crypt/sbsigntools
+	virtual/pkgconfig
+	dev-perl/File-Slurp"
+
+S=${WORKDIR}/v${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.7.0-Make.rules.patch"
+	epatch_user
+}
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
new file mode 100644
index 000000000000..94d636eec260
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl static"
+
+LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	sys-apps/util-linux"
+
+DEPEND="${RDEPEND}
+	app-crypt/sbsigntools
+	dev-perl/File-Slurp
+	static? ( ${LIB_DEPEND} )
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/1.7.0-Make.rules.patch"
+	"${FILESDIR}/${P}-libressl-compatibility.patch"
+)
+
+src_prepare() {
+	if use static; then
+		append-ldflags -static
+		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
+			Makefile || die
+	fi
+
+	# Respect users CFLAGS
+	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
+
+	# Respect users LDFLAGS
+	sed -i -e 's/LDFLAGS/LIBS/g' Make.rules || die
+	sed -i -e 's/\$(CC)/& $(LDFLAGS)/g' Makefile || die
+
+	# Run 'default', to apply user patches
+	default
+}
diff --git a/app-crypt/efitools/files/1.7.0-Make.rules.patch b/app-crypt/efitools/files/1.7.0-Make.rules.patch
new file mode 100644
index 000000000000..89665ab3b690
--- /dev/null
+++ b/app-crypt/efitools/files/1.7.0-Make.rules.patch
@@ -0,0 +1,11 @@
+--- a/Make.rules
++++ b/Make.rules
+@@ -71,7 +71,7 @@
+ %.hash: %.efi hash-to-efi-sig-list
+ 	./hash-to-efi-sig-list $< $@
+ 
+-%-blacklist.esl: %.crt cert-to-efi-hash-list
++%-blacklist.esl: %.crt cert-to-efi-sig-list
+ 	./cert-to-efi-sig-list $< $@
+ 
+ %-hash-blacklist.esl: %.crt cert-to-efi-hash-list
diff --git a/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
new file mode 100644
index 000000000000..876baae16f81
--- /dev/null
+++ b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/cert-to-efi-hash-list.c	2018-04-21 20:59:24.814748503 +0200
++++ b/cert-to-efi-hash-list.c	2018-04-21 20:59:51.868581307 +0200
+@@ -135,7 +135,7 @@
+         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
+ 	unsigned char *cert_buf = NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
+ #else
+ 	int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-crypt/efitools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/eid-mw-4.3.6 b/app-crypt/eid-mw-4.3.6
deleted file mode 100644
index d27015fc89a0..000000000000
--- a/app-crypt/eid-mw-4.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
-EAPI=6
-HOMEPAGE=https://eid.belgium.be
-IUSE=+dialogs +gtk p11-kit +xpi
-KEYWORDS=~x86 ~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
-REQUIRED_USE=dialogs? ( gtk )
-SLOT=0
-SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.3.6 -> eid-mw-4.3.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24ed6fa7f47d75595f0a7690fa94ee51
diff --git a/app-crypt/eid-mw-4.4.1 b/app-crypt/eid-mw-4.4.1
deleted file mode 100644
index f14d8594c022..000000000000
--- a/app-crypt/eid-mw-4.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
-EAPI=6
-HOMEPAGE=https://eid.belgium.be
-IUSE=+dialogs +gtk p11-kit
-KEYWORDS=~x86 ~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit )
-REQUIRED_USE=dialogs? ( gtk )
-SLOT=0
-SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.4.1 -> eid-mw-4.4.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c5cabd31324c6e83754ac1a86b24efd
diff --git a/app-crypt/eid-mw-9999 b/app-crypt/eid-mw-9999
deleted file mode 100644
index 35c7b8dc3d10..000000000000
--- a/app-crypt/eid-mw-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
-EAPI=6
-HOMEPAGE=https://eid.belgium.be
-IUSE=+dialogs +gtk p11-kit +xpi
-LICENSE=LGPL-3
-RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
-REQUIRED_USE=dialogs? ( gtk )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f647d5e99a0095d76d77eb63a4c915a
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
new file mode 100644
index 000000000000..42cf256d82ab
--- /dev/null
+++ b/app-crypt/eid-mw/Manifest
@@ -0,0 +1,6 @@
+DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c SHA512 336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b
+DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
+EBUILD eid-mw-4.3.6.ebuild 2376 BLAKE2B 83e666feb86ac93a1a3e4d3047cf871e6c62f04158767c6006c56d264c3327dabcb4059284857451431e22ac092aed3e5e47a4b9b6438f72dabec47d45008c58 SHA512 254c74676ceee8b5d7f3ccfe6efbc77fc3ce0a663f824ae91eb48a604354918da30b2c9ef48c4ffbe5cbab681c582bda94c1e8abf976898d8ba3513acca5d03b
+EBUILD eid-mw-4.4.1.ebuild 2109 BLAKE2B 2f9f1eec44db4c236d8a94a0e1e23a11b0c8bb204d8dff6de0a62314a687bbb5216a4cf4fbfd5418d1ef2e991bec479a517b6c1efd4e3ba31fb55d570a5130bb SHA512 2c6f5760f4a4501b3c4a5f591d9962b74147d30f14c645a54fce70558b1bec4cd93c89317525a843e32f594c118e3d1201701a02bb49c21428072c06c5560026
+EBUILD eid-mw-9999.ebuild 2500 BLAKE2B 47067bc95c8983684ae00c5f1b98c174e52526ca895dca8141b6578957a45a457abc9d55b2fb23ec4d8ac0180f79933474af28084ea6220e9f427a59943918ba SHA512 9d5d96e062832820be1a6290507a1e91041a32c219df205f60168f57e54d92367f24a3f1bb8dc438850f0fab3a912f6a38b823def485af02abf668691f6899f2
+MISC metadata.xml 1464 BLAKE2B 6f179b170658fc6b084e4ef8c6a89443b1dc39307b9d52083214d75fdb386ec3c3c9f0a6522e6a52eb6c33c792216db27115f017eff6ad922254d1ffcb671c0b SHA512 ed78298a9b246f9f8f9591dbb9fe54ab311d525db86166bcf66574c9e365f1476234d5bac3180226dfbdb5c4014dd5dae4598b670cd7c6c9538282940a0fa9eb
diff --git a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
new file mode 100644
index 000000000000..322eaafd9ef6
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools mozextension gnome2-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	default
+
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	else
+		rm -r "${ED}"/usr/lib/mozilla || die
+	fi
+	rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use gtk; then
+		rm -r "${ED}/usr/include/eid-util" || die
+	fi
+}
+
+pkg_postinst(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild b/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
new file mode 100644
index 000000000000..26f6f9f8d33e
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE="+dialogs +gtk p11-kit"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	p11-kit? ( app-crypt/p11-kit )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# Buggy internal versioning when autoreconf a tarball release.
+	# Weird numbering is required otherwise we get a seg fault in
+	# about-eid-mw program.
+	echo "${PV}-v${PV}" > .version
+	sed -i \
+		-e '/^GITDESC/ d' \
+		-e '/^VERCLEAN/ d' \
+		scripts/build-aux/genver.sh
+
+	# legacy xpi module : we don't want it anymore
+	sed -i -e 's:plugins_tools/xpi$::' Makefile.am || die
+	sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+	if use gtk; then
+		domenu plugins_tools/eid-viewer/eid-viewer.desktop
+		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
+	fi
+}
+
+pkg_postinst(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
new file mode 100644
index 000000000000..9c2c887e6186
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-9999.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 mozextension gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+fi
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	default
+
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	else
+		rm -r "${ED}"/usr/lib/mozilla || die
+	fi
+	rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use gtk; then
+		rm -r "${ED}/usr/include/eid-util" || die
+	fi
+}
+
+pkg_postinst(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
new file mode 100644
index 000000000000..5a0c5666c030
--- /dev/null
+++ b/app-crypt/eid-mw/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>vincent.hardy.be@gmail.com</email>
+</maintainer>
+<maintainer type="project">
+   <email>proxy-maint@gentoo.org</email>
+   <name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+eid-mw is Belgian Electronic Identity Card (eID) middleware supplied by the Belgian Federal Government.
+
+With your eID, you can:
+- identify yourself when necessary. All you have to do is insert the card in the reader. All your details then appear automatically on the PC screen.
+- authenticate yourself. This is a way of checking that you are who you say you are. That can be handy on the internet or to enable your children to chat in safety.
+- place a legally binding electronic signature on electronic documents.
+
+These three functions form the basis of the countless applications for your eID. Go to https://my.belgium.be and check out what can you do with it? and discover all the things you can use the eID for.
+</longdescription>
+<use>
+  <flag name="gtk">
+    All dialogs are available, by using <pkg>x11-libs/gtk+</pkg>
+  </flag>
+  <flag name="dialogs">
+    Enable "askaccess" dialog box, by using <pkg>x11-libs/gtk+</pkg>
+  </flag>
+   <flag name="xpi">
+    Build and install an extension for Mozilla browsers.
+  </flag>
+  <flag name="p11-kit">
+    Support for app-crypt/p11-kit.
+  </flag>
+</use>
+</pkgmetadata>
diff --git a/app-crypt/ekeyd-1.1.4-r2 b/app-crypt/ekeyd-1.1.4-r2
deleted file mode 100644
index 8b12554432ea..000000000000
--- a/app-crypt/ekeyd-1.1.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!minimal? ( dev-lang/lua usb? ( virtual/libusb:0 ) ) virtual/pkgconfig
-DESCRIPTION=Entropy Key userspace daemon
-EAPI=4
-HOMEPAGE=http://www.entropykey.co.uk/
-IUSE=usb kernel_linux munin minimal kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT GPL-2
-RDEPEND=!minimal? ( dev-lang/lua usb? ( virtual/libusb:0 ) dev-lua/luasocket kernel_linux? ( virtual/udev ) usb? ( !kernel_linux? ( sys-apps/usbutils ) ) munin? ( net-analyzer/munin ) ) !app-crypt/ekey-egd-linux sys-apps/openrc
-REQUIRED_USE=minimal? ( !munin !usb )
-SLOT=0
-SRC_URI=http://www.entropykey.co.uk/res/download/ekeyd-1.1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e40ad0dd489383040576c38f1b449860
diff --git a/app-crypt/ekeyd-1.1.5 b/app-crypt/ekeyd-1.1.5
deleted file mode 100644
index bea04d010bcd..000000000000
--- a/app-crypt/ekeyd-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!minimal? ( dev-lang/lua ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Entropy Key userspace daemon
-EAPI=4
-HOMEPAGE=http://www.entropykey.co.uk/
-IUSE=kernel_linux munin minimal kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT GPL-2
-RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev ) munin? ( net-analyzer/munin ) ) !app-crypt/ekey-egd-linux sys-apps/openrc
-REQUIRED_USE=minimal? ( !munin )
-SLOT=0
-SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa6826ad0a375a1eb18214ff83571967
diff --git a/app-crypt/ekeyd-1.1.5-r1 b/app-crypt/ekeyd-1.1.5-r1
deleted file mode 100644
index f510e4e85d50..000000000000
--- a/app-crypt/ekeyd-1.1.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!minimal? ( dev-lang/lua ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Entropy Key userspace daemon
-EAPI=5
-HOMEPAGE=http://www.entropykey.co.uk/
-IUSE=kernel_linux munin minimal usb kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT GPL-2
-RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev ) munin? ( net-analyzer/munin ) ) !app-crypt/ekey-egd-linux virtual/service-manager
-REQUIRED_USE=minimal? ( !munin )
-SLOT=0
-SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4ab23db1c80ae14668711bdc8c633f99
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
new file mode 100644
index 000000000000..5c6b80cb12d4
--- /dev/null
+++ b/app-crypt/ekeyd/Manifest
@@ -0,0 +1,20 @@
+AUX 90-ekeyd.rules 691 BLAKE2B 8c36ca2a6228e2fd6b203513a5f23f3e9b44193c46127c46def7110b0a3a3e020e6959cb4c3dd8bdbe0c057e389c37326011083aae0104b91f247a2932a3c915 SHA512 12d949e90af31992ac671ae42172a2169592dfba9b921ed684a37e7fe330bef44abb2c0a1a5df63ddde940b00fb10fa9cfba493c69614ce0f10aba4de78ea6d3
+AUX ekey-egd-linux.conf.2 266 BLAKE2B 387aa2985ddd362f2c0d9eedbfcd23b24a52b210d853671e3670819e730648b12658b8364fafc39b41cdd1601a8ba1471c7f23b1c8cd9a330a7169049e890420 SHA512 3e8db66552a5c04045226debbf6a7add01301bf98bb26c48033f4bceacde82f25e449fced2d46667009165e9d2f327134e6c963142295d7ef065eaa47b383393
+AUX ekey-egd-linux.init.2 456 BLAKE2B d4e7900bc0e2a089744cc1bf49084cf83c2d8f8ade84bbdea39d6c21f7896bc22e8ef7b650a2efb198b19bea5abb983b20dbafde019d8fc1ec3d57171f491a9f SHA512 55e7be6464b685aa5b290bd310020f4a01926d07a9cb071fc117081bc751a902ebbb9db51a81a5168a34cebc2ecc02360b4917356e25a2e205f57491739ff190
+AUX ekey-ulusbd.conf.2 495 BLAKE2B 16ff2a3dec83f6623a2ed714e18db8c21885014c99d6409c39ec0745979b3ef10ae693114acdcda6697e1bfce9d9ed3cceed8abb2b4319f8ae29904c6e69a369 SHA512 9d4b5d594790d34ed4b513a00b60518c0770ccba87b159e1f9eaac382275658e53f5274ee24743e8d103bbe4a2351ce865157013e0dfeefa32e37fe4d2348677
+AUX ekey-ulusbd.init.2 900 BLAKE2B a9aa95448ff5d65d18689489bc14a2ddedc8f5ac858d28d569a58ae960196342c86893f903975bbe86fd9ea8a27950bbd36df91061fd8f8e146285bb18d27e51 SHA512 cae15995b8d8b66ef4209fe3cd8a14edcc2645b10dbb6f4da54e929a9347db675abcf9232841863c14a450789768247eda5929667021b5bada041365fbc1470d
+AUX ekeyd-1.1.4-gentoo.patch 6565 BLAKE2B b7fc5fe83eeb0d8f56d2d2a4ed00970502cac53d5c5e4c485b2b25af672b74f3c263c944a4b2abb2b710655f80276ed6aceec59b22ed76d72d6b280ffd1731d6 SHA512 f65a1cef8bd4e280a8dd8ce51f23661286ed3fd688d34943793eb326d417016a53312c6b344aab3465a8930c7de8cd10d6d572bd67f92cf8f65386f2f5ca1875
+AUX ekeyd-1.1.5-const_char_usage.patch 1094 BLAKE2B e19d837be0652844c95cf87af8381a09f1913471609616ded55e6e3d7e0876f8996d31909e72c0ec759b324e54cc785bbde77c4eaf4f87e81935521d71427176 SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5
+AUX ekeyd-1.1.5-enoent.patch 863 BLAKE2B ec953667eaa23dcf91b15b01689c4be6315641dadaf9021240d67039ed88f651a3fe131581b60e71da8a4d9776952bed9db144c1340c98cf119e5746b53a16c9 SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50
+AUX ekeyd-1.1.5-misc.patch 1245 BLAKE2B 555c6406461226ec8867f226e88bb9ca4f39d0a726c241c1638dd3339434b9f1d34620319de42c62e034da12cabebb739c92cc5df96ec9d3c79b339be839d6a2 SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04
+AUX ekeyd-1.1.5-path-fixes.patch 1918 BLAKE2B cf29e1f7fbaef728d0c4db2b71b1ac611ba5905c16b20b511f282a649359a0e458d44e0ca9b46db9b9abbd1da8935caa5605312314fb6027589ba03aa23f9759 SHA512 aba7b1cba96e678725fc8b47b56d815d59ce015ff6a4f72eaaf5fe8b7a99ddedf05ef3534a51772330209fb3cef235d76207103ee1e7a1f3315f4a52d2c0c2be
+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 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.4-r2.ebuild b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..70403d447d8e
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib linux-info toolchain-funcs udev
+
+DESCRIPTION="Entropy Key userspace daemon"
+HOMEPAGE="http://www.entropykey.co.uk/"
+SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz"
+
+LICENSE="MIT GPL-2" # GPL-2 (only) for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="usb kernel_linux munin minimal"
+REQUIRED_USE="minimal? ( !munin !usb )"
+
+EKEYD_RDEPEND="dev-lang/lua
+		usb? ( virtual/libusb:0 )"
+EKEYD_DEPEND="${EKEYD_RDEPEND}"
+EKEYD_RDEPEND="${EKEYD_RDEPEND}
+	dev-lua/luasocket
+	kernel_linux? ( virtual/udev )
+	usb? ( !kernel_linux? ( sys-apps/usbutils ) )
+	munin? ( net-analyzer/munin )"
+
+RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
+	!app-crypt/ekey-egd-linux
+	sys-apps/openrc"
+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}-gentoo.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=$(use usb && echo yes || echo 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 $(use usb && echo install-ekey-ulusbd)
+
+	# We move the daemons around to avoid polluting the available
+	# commands.
+	dodir /usr/libexec
+	mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
+
+	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
+
+	if use usb && ! use kernel_linux; then
+		newinitd "${FILESDIR}"/ekey-ulusbd.init.2 ekey-ulusbd
+		newconfd "${FILESDIR}"/ekey-ulusbd.conf.2 ekey-ulusbd
+	fi
+
+	if use kernel_linux; then
+		local rules=udev/fedora15/60-entropykey.rules
+		use usb && rules=udev/fedora15/60-entropykey-uds.rules
+
+		udev_newrules ${rules} 70-${PN}.rules
+
+		exeinto "$(get_udevdir)"
+		doexe udev/entropykey.sh
+	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 usb; then
+		if use kernel_linux; then
+			elog "You're going to use the userland USB daemon, the udev rules"
+			elog "will be used accordingly. If you want to use the CDC driver"
+			elog "please disable the usb USE flag."
+		else
+			elog "You're going to use the userland USB daemon, since your OS"
+			elog "does not support udev, you should start the ekey-ulusbd"
+			elog "service before ekeyd."
+		fi
+
+		ewarn "The userland USB daemon has multiple known issues. If you can,"
+		ewarn "please consider disabling the 'usb' USE flag and instead use the"
+		ewarn "CDC-ACM access method."
+	else
+		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"
+	fi
+}
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/ekeyd-1.1.5.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5.ebuild
new file mode 100644
index 000000000000..f03ac2d0a62f
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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"
+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
+	sys-apps/openrc"
+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/90-ekeyd.rules b/app-crypt/ekeyd/files/90-ekeyd.rules
new file mode 100644
index 000000000000..2532ba852efc
--- /dev/null
+++ b/app-crypt/ekeyd/files/90-ekeyd.rules
@@ -0,0 +1,16 @@
+# Entropy key udev rules
+#
+# Centos/RHEL 6 rules for udev version 147
+# 
+# These rules create devices under /dev/entropykey/<serialnumber>
+#
+# Copyright 2011-2014 Simtec Electronics
+#
+# For licence terms refer to the COPYING file distributed with the source.
+
+ACTION=="add", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", SYMLINK+="entropykey/$env{ID_SERIAL_SHORT}"
+
+ACTION=="add", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", RUN+="/usr/sbin/ekeydctl add /dev/entropykey/$env{ID_SERIAL_SHORT}"
+
+ACTION=="remove", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", RUN+="/usr/sbin/ekeydctl remove $env{ID_SERIAL_SHORT}"
+
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.conf.2 b/app-crypt/ekeyd/files/ekey-egd-linux.conf.2
new file mode 100644
index 000000000000..8c0b089d94b5
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-egd-linux.conf.2
@@ -0,0 +1,10 @@
+# Configuration file for ekey-egd-linux
+
+# Hostname or IP address to connect to.
+#HOST="localhost"
+# Port number to connect to.
+#PORT="8888"
+# Time  between reconnect attempts.
+#RECONNECTINTERVAL=10
+# Set the number of 1024 bit blocks to request each time
+#BLOCKS=2
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.init.2 b/app-crypt/ekeyd/files/ekey-egd-linux.init.2
new file mode 100644
index 000000000000..4aac23e59507
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-egd-linux.init.2
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${HOST:=localhost}
+: ${PORT:=8888}
+: ${RECONNECTINTERVAL:=10}
+: ${BLOCKS:=2}
+
+description="EntropyKey EGD client"
+
+pidfile=/var/run/$SVCNAME.pid
+
+command=/usr/libexec/ekey-egd-linux
+command_args="-H ${HOST} -p ${PORT} -r ${RECONNECTINTERVAL} -b ${BLOCKS} -D ${pidfile}"
+
+depend() {
+	 use net
+	 after ekeyd
+
+	 provide entropy
+}
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.conf.2 b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
new file mode 100644
index 000000000000..15a641fa3ffe
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
@@ -0,0 +1,16 @@
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# The userland USB daemon has to know the USB path of the EntopyKey to
+# work properly; in alternative to providing these statically, they
+# can be found by giving the serial of the key.
+#
+# The serial will also be used to set the default path to open the
+# socket to.
+
+EKEY_SERIAL=""
+#USB_BUS=""
+#USB_DEV=""
+
+# this is set by default
+# SOCKET_PATH="/var/run/ekey-ulusbd-${EKEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.init.2 b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
new file mode 100644
index 000000000000..ef52db2a6685
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+INSTANCE="${SVCNAME#*.}"
+if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekey-ulusbd" ]; then
+	INSTANCE="ekey-ulusbd"
+fi
+
+: ${SOCKET_PATH:=/var/run/ekey-ulusbd-${EKEY_SERIAL}}
+
+description="EntropyKey Userland USB Daemon"
+
+pidfile=/var/run/$SVCNAME.pid
+command=/usr/libexec/ekey-ulusbd
+command_args="-P ${pidfile} -p ${SOCKET_PATH}"
+
+depend() {
+	 need localmount
+}
+
+start() {
+	if [ -z ${USB_BUS} ]; then
+		set -- $(lsusb -v -d 20df:0001 | \
+			egrep '(^Bus|iSerial)' | \
+			grep -B1 "${EKEY_SERIAL}" | \
+			head -n 1 | \
+			cut -c 5-7,15-18)
+		USB_BUS=$1
+		USB_DEV=$2
+	fi
+
+	ebegin "Starting ${description}"
+	start-stop-daemon \
+		--start --pidfile ${pidfile} \
+		--exec ${command} -- \
+		${command_args} \
+		-b $(printf %03d ${USB_BUS}) -d $(printf %03d ${USB_DEV}) -D
+	eend $?
+}
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
new file mode 100644
index 000000000000..f1491362e83f
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch
@@ -0,0 +1,133 @@
+Index: ekeyd-1.1.4/host/ekeyd.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekeyd.c
++++ ekeyd-1.1.4/host/ekeyd.c
+@@ -209,7 +209,7 @@ open_foldback_output(void)
+     return (output_stream != NULL);
+ }
+ 
+-static const char *usage=
++static const char usage[]=
+     "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
+     "Entropy Key Daemon\n\n"
+     "\t-f Read configuration from configfile\n"
+Index: ekeyd-1.1.4/host/ekey-setkey.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekey-setkey.c
++++ ekeyd-1.1.4/host/ekey-setkey.c
+@@ -79,7 +79,7 @@ calc_mac(uint8_t *snum, uint8_t *mkey, u
+     return mac;
+ }
+ 
+-static const char *usage =
++static const char usage[] =
+     "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
+     "       [-s <serial>] <path>\n"
+     "Entropy key device long term session key tool\n\n"
+Index: ekeyd-1.1.4/host/ekey-ulusbd.c
+===================================================================
+--- ekeyd-1.1.4.orig/host/ekey-ulusbd.c
++++ ekeyd-1.1.4/host/ekey-ulusbd.c
+@@ -100,7 +100,8 @@ find_usb_device(char *busmatch, char *de
+ 
+ #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
+     if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
+-        if (r != -ENODATA) {
++        /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
++        if (r != -ENODATA && r != -ENOENT) {
+             fprintf(stderr, 
+                     "Unable to detach Entropy Key at %s/%s from kernel\n", 
+                     busmatch, devmatch);
+Index: ekeyd-1.1.4/udev/entropykey.sh
+===================================================================
+--- ekeyd-1.1.4.orig/udev/entropykey.sh
++++ ekeyd-1.1.4/udev/entropykey.sh
+@@ -19,9 +19,9 @@ wait_for_usb () {
+     COUNTER=$(( ${COUNTER} + 1 ))
+     test ${COUNTER} -ge 10 && exit 1
+   done
+-  $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
++  /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
+   sleep 1
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   exit 0
+ }
+ 
+@@ -34,18 +34,18 @@ else
+     if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
+       exit 0
+     fi
+-    if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
+-      kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
++    if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
++      kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
+     fi
+-    mkdir -p /var/run/entropykeys
++    mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
+     wait_for_usb &
+     exit 0
+   fi
+   # Update ekeyd with device operation
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   if test "x$ACTION" = "xremove"; then
+-    rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
+-    rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
++    rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
++    rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
+   fi
+ fi
+ 
+Index: ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
+===================================================================
+--- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey.rules
++++ ekeyd-1.1.4/udev/fedora15/60-entropykey.rules
+@@ -9,10 +9,10 @@
+ # For licence terms refer to the COPYING file distributed with the source.
+ 
+ # Detect an Entropy Key being inserted and add info values to environment
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
+ 
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
+ 
+ # Add the /dev/entropykey/<serialnumber> symbolic link
+ ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
+Index: ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
+===================================================================
+--- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey-uds.rules
++++ ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules
+@@ -9,7 +9,7 @@
+ # For licence terms refer to the COPYING file.
+ 
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
++ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
+ 
+ # And tell the ekeyd about the device action.
+ ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
+Index: ekeyd-1.1.4/host/Makefile
+===================================================================
+--- ekeyd-1.1.4.orig/host/Makefile
++++ ekeyd-1.1.4/host/Makefile
+@@ -107,7 +107,7 @@ OPT ?= -O2
+ CFLAGS += $(INCLUDES)
+ CFLAGS += -g -Wall $(OPT)
+ CFLAGS += -fno-strict-aliasing
+-CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
++CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
+ CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
+ CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
+ CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
+@@ -148,7 +148,7 @@ daemonise_ulusbd.o: daemonise.c
+ 	$(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
+ 
+ egd-linux: egd-linux.o daemonise.o
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch
new file mode 100644
index 000000000000..81ad8e6a5337
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User kristianf
+# Date 1382916823 -3600
+#      Mon Oct 28 00:33:43 2013 +0100
+# Node ID 0d99149615ec5ec70a6d03c685291ddc55babff6
+# Parent  fd192324ff9ae4c4c92cdb9c27f5ae100da136a6
+Rewrite static const char *usage
+
+diff -r fd192324ff9a -r 0d99149615ec host/ekey-setkey.c
+--- a/host/ekey-setkey.c	Mon Oct 28 00:31:59 2013 +0100
++++ b/host/ekey-setkey.c	Mon Oct 28 00:33:43 2013 +0100
+@@ -79,7 +79,7 @@
+     return mac;
+ }
+ 
+-static const char *usage =
++static const char usage[] =
+     "This is a low level tool. You probably wanted to use ekey-rekey instead.\n\n"
+     "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
+     "       [-s <serial>] <path>\n"
+diff -r fd192324ff9a -r 0d99149615ec host/ekeyd.c
+--- a/host/ekeyd.c	Mon Oct 28 00:31:59 2013 +0100
++++ b/host/ekeyd.c	Mon Oct 28 00:33:43 2013 +0100
+@@ -209,7 +209,7 @@
+     return (output_stream != NULL);
+ }
+ 
+-static const char *usage=
++static const char usage[] =
+     "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
+     "Entropy Key Daemon\n\n"
+     "\t-f Read configuration from configfile\n"
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch
new file mode 100644
index 000000000000..2d4cccbafafa
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User kristianf
+# Date 1382916946 -3600
+#      Mon Oct 28 00:35:46 2013 +0100
+# Node ID 0a9e41a05aafb98cc8c21562931cb1cbb5e30c1f
+# Parent  0d99149615ec5ec70a6d03c685291ddc55babff6
+libusb_compat
+
+diff -r 0d99149615ec -r 0a9e41a05aaf host/ekey-ulusbd.c
+--- a/host/ekey-ulusbd.c	Mon Oct 28 00:33:43 2013 +0100
++++ b/host/ekey-ulusbd.c	Mon Oct 28 00:35:46 2013 +0100
+@@ -100,8 +100,9 @@
+ 
+ #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
+     if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
+-        if (r != -ENODATA) {
+-            fprintf(stderr, 
++        /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
++	if (r != -ENODATA && r != -ENOENT) {
++	      fprintf(stderr, 
+                     "Unable to detach Entropy Key at %s/%s from kernel\n", 
+                     busmatch, devmatch);
+             usb_close(devh);
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch
new file mode 100644
index 000000000000..660f0bacf0ac
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch
@@ -0,0 +1,50 @@
+diff -r 724cf5abf164 host/Makefile
+--- a/host/Makefile	Mon Oct 28 00:43:49 2013 +0100
++++ b/host/Makefile	Mon Oct 28 00:54:01 2013 +0100
+@@ -19,7 +19,7 @@
+ RM ?= rm -f
+ LUA_V ?= 5.1
+ EXTRA_INC ?=
+-LUA_INC ?= -I/usr/include/lua5.1
++LUA_INC ?= -I/usr/include
+ LIBDL ?= -ldl
+ PTHFLAGS ?=
+ PTHLIBS ?= -lpthread
+@@ -31,7 +31,7 @@
+ MANZEXT := .gz
+ 
+ # Current tool version as returned from tools
+-EKEYD_VERSION_S="1.1.4"
++EKEYD_VERSION_S="1.1.5"
+ 
+ # Attempt to detect an OS and set build options as appropriate
+ OSNAME=$(shell uname -s | tr A-Z a-z | tr -d /)
+@@ -91,10 +91,7 @@
+ override MANZCMD:=cat
+ override MANZEXT:=
+ endif
+-override LUA_INC:=-I/usr/local/include/lua51
+ override LIBDL:=
+-LIBDIRS += -L/usr/local/lib
+-INCLUDES += -I/usr/local/include
+ endif
+ endif
+ endif
+@@ -114,7 +111,7 @@
+ CFLAGS += '-DEKEYD_VERSION_S=""$(EKEYD_VERSION_S)""'
+ CFLAGS += $(EXTRA_CFLAGS)
+ 
+-LIBS += -llua$(LUA_V) -lm $(LIBDL)
++LIBS += -llua -lm $(LIBDL)
+ LDFLAGS += $(LIBDIRS)
+ 
+ 
+@@ -157,7 +154,7 @@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ control.inc: bin2c.lua control.lua
+-	lua$(LUA_V) bin2c.lua +control.lua result > control.inc.new
++	lua bin2c.lua +control.lua result > control.inc.new
+ 	mv control.inc.new control.inc
+ 
+ lstate.o: lstate.c control.inc
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch
new file mode 100644
index 000000000000..0a9a59186d1d
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch
@@ -0,0 +1,49 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917171 -3600
+#      Mon Oct 28 00:39:31 2013 +0100
+# Node ID d96c42b36cb125e6e52cff623b7bdad1910284b4
+# Parent  0a9e41a05aafb98cc8c21562931cb1cbb5e30c1f
+entropykey.sh
+
+diff -r 0a9e41a05aaf -r d96c42b36cb1 udev/entropykey.sh
+--- a/udev/entropykey.sh	Mon Oct 28 00:35:46 2013 +0100
++++ b/udev/entropykey.sh	Mon Oct 28 00:39:31 2013 +0100
+@@ -19,9 +19,10 @@
+     COUNTER=$(( ${COUNTER} + 1 ))
+     test ${COUNTER} -ge 10 && exit 1
+   done
+-  $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
++  /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
++
+   sleep 1
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   exit 0
+ }
+ 
+@@ -34,18 +35,18 @@
+     if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
+       exit 0
+     fi
+-    if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
+-      kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
++    if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
++      kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
+     fi
+-    mkdir -p /var/run/entropykeys
++    mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
+     wait_for_usb &
+     exit 0
+   fi
+   # Update ekeyd with device operation
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   if test "x$ACTION" = "xremove"; then
+-    rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
+-    rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
++    rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
++    rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
+   fi
+ fi
+ 
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch
new file mode 100644
index 000000000000..bb5862dee986
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917429 -3600
+#      Mon Oct 28 00:43:49 2013 +0100
+# Node ID 724cf5abf164dd5889a7c72916aa524c3822b8bd
+# Parent  902b9c6908618864319835d69981f9ea902be324
+Makefile
+
+diff -r 902b9c690861 -r 724cf5abf164 host/Makefile
+--- a/host/Makefile	Mon Oct 28 00:41:59 2013 +0100
++++ b/host/Makefile	Mon Oct 28 00:43:49 2013 +0100
+@@ -107,7 +107,7 @@
+ CFLAGS += $(INCLUDES)
+ CFLAGS += -g -Wall $(OPT)
+ CFLAGS += -fno-strict-aliasing
+-CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
++CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
+ CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
+ CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
+ CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
+@@ -148,7 +148,7 @@
+ 	$(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
+ 
+ egd-linux: egd-linux.o daemonise.o
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch b/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch
new file mode 100644
index 000000000000..c4b53a802bf6
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User kristianf
+# Date 1382917319 -3600
+#      Mon Oct 28 00:41:59 2013 +0100
+# Node ID 902b9c6908618864319835d69981f9ea902be324
+# Parent  d96c42b36cb125e6e52cff623b7bdad1910284b4
+udev rule
+
+diff -r d96c42b36cb1 -r 902b9c690861 udev/fedora15/60-entropykey-uds.rules
+--- a/udev/fedora15/60-entropykey-uds.rules	Mon Oct 28 00:39:31 2013 +0100
++++ b/udev/fedora15/60-entropykey-uds.rules	Mon Oct 28 00:41:59 2013 +0100
+@@ -9,7 +9,7 @@
+ # For licence terms refer to the COPYING file.
+ 
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
++ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c /bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
+ 
+ # And tell the ekeyd about the device action.
+ ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
+diff -r d96c42b36cb1 -r 902b9c690861 udev/fedora15/60-entropykey.rules
+--- a/udev/fedora15/60-entropykey.rules	Mon Oct 28 00:39:31 2013 +0100
++++ b/udev/fedora15/60-entropykey.rules	Mon Oct 28 00:41:59 2013 +0100
+@@ -9,10 +9,10 @@
+ # For licence terms refer to the COPYING file distributed with the source.
+ 
+ # Detect an Entropy Key being inserted and add info values to environment
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{builtin}="usb_id"
+ 
+ # Detect an Entropy Key being inserted and extract serial number
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c /bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
+ 
+ # Add the /dev/entropykey/<serialnumber> symbolic link
+ ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekeyd.init.2 b/app-crypt/ekeyd/files/ekeyd.init.2
new file mode 100644
index 000000000000..5c8bc7658af1
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd.init.2
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+INSTANCE="${SVCNAME#*.}"
+if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekeyd" ]; then
+	INSTANCE="ekeyd"
+fi
+
+description="EntropyKey daemon"
+
+pidfile=/var/run/$SVCNAME.pid
+cfgfile=/etc/entropykey/${INSTANCE}.conf
+
+command=/usr/libexec/ekeyd
+command_args="-f ${cfgfile} -p ${pidfile}"
+
+depend() {
+	 config $cfgfile
+
+	 use udev ekey-ulusbd
+	 need localmount
+
+	 # quickly parse the configuration file; we only provide entropy
+	 # if we're not using the egd server/client split method.
+	 if sed -e 's:--.*::' "${cfgfile}" | grep -q SetOutputToKernel; then
+		 provide entropy
+	 fi
+}
diff --git a/app-crypt/ekeyd/files/ekeyd.service b/app-crypt/ekeyd/files/ekeyd.service
new file mode 100644
index 000000000000..0529574db5cb
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd.service
@@ -0,0 +1,10 @@
+[Unit]
+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/ekeyd/metadata.xml b/app-crypt/ekeyd/metadata.xml
new file mode 100644
index 000000000000..3e3574ab1036
--- /dev/null
+++ b/app-crypt/ekeyd/metadata.xml
@@ -0,0 +1,25 @@
+<?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>
+	<use>
+		<flag name="usb">
+			Build the libusb-based userland daemon for accessing the
+			EntropyKey (alternative to the CDC USB driver). It is suggested
+			to use this option by default, as the CDC driver in the kernel
+			often seems to be fragile (or the gadget implementation on the
+			EntropyKey is too buggy), and can cause various problems.
+		</flag>
+		<flag name="munin">
+			Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
+			statistical data from ekeyd.
+		</flag>
+		<flag name="minimal">
+			Only install the ekey-egd-linux service rather than the full
+			ekeyd package.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/elettra-1.0 b/app-crypt/elettra-1.0
deleted file mode 100644
index 783e2433cb38..000000000000
--- a/app-crypt/elettra-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/zlib app-crypt/mhash dev-libs/libmcrypt
-DESCRIPTION=Plausible deniable file cryptography
-EAPI=0
-HOMEPAGE=http://www.winstonsmith.info/julia/elettra/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=sys-libs/zlib app-crypt/mhash dev-libs/libmcrypt
-SLOT=0
-SRC_URI=http://www.winstonsmith.info/julia/elettra/elettra-src-1.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8fa729e98817247e5a0ac92b5eb516b6
diff --git a/app-crypt/elettra/Manifest b/app-crypt/elettra/Manifest
new file mode 100644
index 000000000000..4dd54a679a46
--- /dev/null
+++ b/app-crypt/elettra/Manifest
@@ -0,0 +1,3 @@
+DIST elettra-src-1.0.tar.gz 16102 BLAKE2B 7499bbb043f59f483f8496b94fe09076bc338125b18f64b859c008a64ec811a80d1accbe8ddf8bd505d1eac4ce971f7c0cd00e6ec37c9c2d3d861913c9aafeeb SHA512 341a83436d9c163391eabbc06600b29e8ee837bb805f2f9ea922ffa8d8dcb9ec53e50ae475e13e2810ac69419b86072cd7e6c44d13c80e43ee67071e6864d5b3
+EBUILD elettra-1.0.ebuild 770 BLAKE2B d0bd1bbfd4e14e5f000bb05bc7aa03763b890444ff425e35596e6d18a784b9064ff80003f3107cc08ec8a6fd5ea544b9b7ab919be1f499787807d45c86ba6f7e SHA512 368d2db52e4f601177d02465e3c921a61b0a0cb96d910d4b0b39f6c648d2cfa400715c50c15e62f47df70f09079743d721f37fc15ca29fbdf5be04a4b36dac06
+MISC metadata.xml 215 BLAKE2B 416b347b470da55cc38463c877ac944c5530bf47ca6a73b56dff8f174db2572d6e5b2e87fa838e0acffd4d81d850b353f59fa0008b934d896b926fb79bf5e015 SHA512 49695b6fe6c6840d991013455f167da37a67fa9fd326f2241778caeab2b7ab38bbb36b2f383ca6736c465b65cce7338ebb90468ceb30bdf5b5989449bb2d2ebd
diff --git a/app-crypt/elettra/elettra-1.0.ebuild b/app-crypt/elettra/elettra-1.0.ebuild
new file mode 100644
index 000000000000..4e47c0f1db08
--- /dev/null
+++ b/app-crypt/elettra/elettra-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit toolchain-funcs
+
+MY_P="${PN}-src-${PV}"
+
+DESCRIPTION="Plausible deniable file cryptography"
+HOMEPAGE="http://www.winstonsmith.info/julia/elettra/"
+SRC_URI="http://www.winstonsmith.info/julia/elettra/${MY_P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+		 app-crypt/mhash
+		 dev-libs/libmcrypt"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -I. src/*.c \
+		-lz `libmcrypt-config --cflags --libs` -lmhash \
+		-o elettra || die "compilation failed"
+}
+
+src_install() {
+	dobin elettra || die "dobin failed"
+	dodoc README || die "dodoc failed"
+}
diff --git a/app-crypt/elettra/metadata.xml b/app-crypt/elettra/metadata.xml
new file mode 100644
index 000000000000..dccede93222c
--- /dev/null
+++ b/app-crypt/elettra/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>lu_zero@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/envchain-1.0.0 b/app-crypt/envchain-1.0.0
deleted file mode 100644
index bff6e07e2502..000000000000
--- a/app-crypt/envchain-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-libs/readline:0= app-crypt/libsecret
-DESCRIPTION=Save environment variables in a secret vault
-EAPI=6
-HOMEPAGE=https://github.com/sorah/envchain
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-libs/readline:0= app-crypt/libsecret
-SLOT=0
-SRC_URI=https://github.com/sorah/envchain/archive/v1.0.0.tar.gz -> envchain-1.0.0.tar.gz
-_md5_=708cef91978635241d9d0cfeada8f412
diff --git a/app-crypt/envchain/Manifest b/app-crypt/envchain/Manifest
new file mode 100644
index 000000000000..9fe052ceeff9
--- /dev/null
+++ b/app-crypt/envchain/Manifest
@@ -0,0 +1,3 @@
+DIST envchain-1.0.0.tar.gz 8252 BLAKE2B 5b4e07421d47eede180ddbd1968090050ec4b25e887d235f2714604ed0d4439f1a36b72f0d277c53e3b9f010ee9c6bb61f598daec330641384c21b00802feadd SHA512 0c7e129509fa60adbbedd995c30a11e981171b85dfce60385a0fd4a3d8264f1a2d65300f882e45075556490dfff0255eb6a6688066455809653b81e83d29c514
+EBUILD envchain-1.0.0.ebuild 476 BLAKE2B c424c556f180f755c75db9bb650be9e375f94950bac6f83c114d3f14667f5c0818bf35c98c4c94c3fce098f51c65f1a42791605109ddf279a519a6446994fe7f SHA512 09f8a61e03ad2115a5db8005f4fbd90bb7599c51e6d8bcbda7baffe399116e36a89b07ee7176a13039ff67548a9ae5f51a19967701ef37dc0c7220e5d0f30e2a
+MISC metadata.xml 766 BLAKE2B 671428041ffadfe0fd1df8655d476e8f29912786cf8dd7fed354b04a40295335e04dbbb381f8affded0b3ca91d9f86bb8d8912f8cb60f4686fa802f1187faf4f SHA512 d9896d24c0ba5a9b7750d907277946a3b592e9dafe4d162544a8f202ed6b01aa936159f5520d7eb79e01d169c2cde04db9e84d91164c2dffade31785f4102839
diff --git a/app-crypt/envchain/envchain-1.0.0.ebuild b/app-crypt/envchain/envchain-1.0.0.ebuild
new file mode 100644
index 000000000000..ce7a32c6d46b
--- /dev/null
+++ b/app-crypt/envchain/envchain-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Save environment variables in a secret vault"
+HOMEPAGE="https://github.com/sorah/envchain"
+SRC_URI="https://github.com/sorah/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	sys-libs/readline:0=
+	app-crypt/libsecret"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}/usr" install
+}
diff --git a/app-crypt/envchain/metadata.xml b/app-crypt/envchain/metadata.xml
new file mode 100644
index 000000000000..9cbc0acedef6
--- /dev/null
+++ b/app-crypt/envchain/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>her@sorah.jp</email>
+    <name>Sorah Fukumori</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+    Set environment variables with OS X keychain or D-Bus secret service.
+    Envchain allows you to save credentials in a secure vault to use as
+    environment variables only when you need them.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">sorah/envchain</remote-id>
+    <bugs-to>https://github.com/sorah/envchain/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/etcd-ca-0_p20140903 b/app-crypt/etcd-ca-0_p20140903
deleted file mode 100644
index 2508077205b9..000000000000
--- a/app-crypt/etcd-ca-0_p20140903
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/go-1.2
-DESCRIPTION=A simple certificate manager written in Go. Easy to use with limited capability
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcd-ca
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd-ca/archive/812f3626796be16d9db052720ce9c54f5a40bb26.zip -> etcd-ca-0_p20140903.zip
-_md5_=50a64c233b7f9e3666ab4d97261b138f
diff --git a/app-crypt/etcd-ca-0_p20150423 b/app-crypt/etcd-ca-0_p20150423
deleted file mode 100644
index 4895440c6e33..000000000000
--- a/app-crypt/etcd-ca-0_p20150423
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/go-1.2
-DESCRIPTION=A simple certificate manager written in Go. Easy to use with limited capability
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcd-ca
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd-ca/archive/31fef42f75294cf8bf1e7facf82648de0c2d87a3.tar.gz -> etcd-ca-0_p20150423.tar.gz
-_md5_=85146d42a37045e70074957b7f67a861
diff --git a/app-crypt/etcd-ca-0_p20150423-r1 b/app-crypt/etcd-ca-0_p20150423-r1
deleted file mode 100644
index f626af2154be..000000000000
--- a/app-crypt/etcd-ca-0_p20150423-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/go-1.2:=
-DESCRIPTION=A simple certificate manager written in Go. Easy to use with limited capability
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcd-ca
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd-ca/archive/31fef42f75294cf8bf1e7facf82648de0c2d87a3.tar.gz -> etcd-ca-0_p20150423.tar.gz
-_md5_=7483089e0eeab6b02e61607dc7beb23f
diff --git a/app-crypt/etcd-ca/Manifest b/app-crypt/etcd-ca/Manifest
new file mode 100644
index 000000000000..62b1dfbb490b
--- /dev/null
+++ b/app-crypt/etcd-ca/Manifest
@@ -0,0 +1,6 @@
+DIST etcd-ca-0_p20140903.zip 1178338 BLAKE2B 03cbed5111037f547391281e65d5bc9e9e61fbc1c5ddceb9e3ccba2a3714c964304e230407ba3dc6eebae695f3ed51c29dbb0babbf913ef02f10d3650a781bca SHA512 f421be2c835e7ed701f698d8a48cf25fe011ba3a831ff8fa3a80f5f074f6b70fed7f71d64c488cce5e12af8b8ae29685a1b19f8f2cd487954019d483d90f5e1c
+DIST etcd-ca-0_p20150423.tar.gz 55031 BLAKE2B 39f12fe140a5490e512e9d14c58c58f452769788f0c4c6a8a521590d19a254009c28e134611a10a40c8edc2820c4a333e9c2676e7ace2ad5af88e4245d23432a SHA512 8c7ecb80e056da77997283ff2defb6df9a9acef250b0fac8e18c2bca71cccfedf6d782b7c9bf6491574d88ac5fa358f9bc5f540aa718a2470655d75f2f54fff4
+EBUILD etcd-ca-0_p20140903.ebuild 929 BLAKE2B 2c6f8694dd500aeff35c1925b373134296577d0942affad0e0acde462c512d58604d457d90325d7d23f2c070d4aa8f16985cd46f88dc8f5cb31f7d725bc9204e SHA512 98a1776ec66eabf0ef6affb98d8b776f2daad41ff8720f250544244771e84527dbc98696d3e0a72ea65f6566b5bbc6fe3b5d025866637af3f1b10c1bc66c1454
+EBUILD etcd-ca-0_p20150423-r1.ebuild 937 BLAKE2B ac39f3eb6727c70ee40fabbe66c182cc717f74babe50d9dbd801e7f4f41647184bebc01dd74f4678fefde0ab9be517022e17ab3bf3a653489cf9ad10a9499aa9 SHA512 ed1420735f5e2cbf8d1e7c046ddc0173106df26dd6582c966c85c896db89de314f69917cafad5745f9a823f4457b742a6ada32297371cd77b65e39167d0b9cc8
+EBUILD etcd-ca-0_p20150423.ebuild 935 BLAKE2B 338b801ffdd4b8d935f173188cabdcf6365f167cdee0cfa306e3f37f88a5a77aef7fceeb343e88bd14d02aa2c8db864ab44ebe0ecb98a744d4d1d38f8b0db76e SHA512 604b68e2d014312880926d96c60ad2449c778212da665c8dbe7c80df8037a6a4ffe2f0a5f5907965d43bbaa50bdd52e1e23c60233091557db469fb16f692c494
+MISC metadata.xml 516 BLAKE2B 01fc47d377c8b962727968e132a8ef1bf86da96ed28dde03bad5dd6210918a7d5ed8edc5f8ead6a0a7782f5cf4976cc5bde402101870f2790acccc10732bc29c SHA512 9ff6311f1a9df79aacd48286034c31cbdfd7adad917b3e0206d457b2ea42524b7690e48e9dce982d7661407b3e8ea1237f7321f75048d9439ae89c0f759c159b
diff --git a/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild b/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild
new file mode 100644
index 000000000000..7a2e5a7d05d4
--- /dev/null
+++ b/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
+HOMEPAGE="https://github.com/coreos/etcd-ca"
+EGIT_COMMIT="812f3626796be16d9db052720ce9c54f5a40bb26"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.2"
+RDEPEND=""
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
+		-i build || die
+}
+
+src_compile() {
+	CGO_CFLAGS="${CFLAGS}" ./build || die
+}
+
+# go tool: no such tool "cover"; to install:
+#    go get code.google.com/p/go.tools/cmd/cover
+#src_test() {
+#	./test || die
+#}
+
+src_install() {
+	dobin "${S}"/bin/${PN}
+	dodoc README.md
+	use doc && dodoc -r Documentation
+}
diff --git a/app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild b/app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild
new file mode 100644
index 000000000000..7ffc96967ebc
--- /dev/null
+++ b/app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
+HOMEPAGE="https://github.com/coreos/etcd-ca"
+EGIT_COMMIT="31fef42f75294cf8bf1e7facf82648de0c2d87a3"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.2:="
+RDEPEND=""
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
+		-i build || die
+}
+
+src_compile() {
+	CGO_CFLAGS="${CFLAGS}" ./build || die
+}
+
+# go tool: no such tool "cover"; to install:
+#    go get code.google.com/p/go.tools/cmd/cover
+#src_test() {
+#	./test || die
+#}
+
+src_install() {
+	dobin "${S}"/bin/${PN}
+	dodoc README.md
+	use doc && dodoc -r Documentation
+}
diff --git a/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild b/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild
new file mode 100644
index 000000000000..a2f532734373
--- /dev/null
+++ b/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
+HOMEPAGE="https://github.com/coreos/etcd-ca"
+EGIT_COMMIT="31fef42f75294cf8bf1e7facf82648de0c2d87a3"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.2"
+RDEPEND=""
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
+		-i build || die
+}
+
+src_compile() {
+	CGO_CFLAGS="${CFLAGS}" ./build || die
+}
+
+# go tool: no such tool "cover"; to install:
+#    go get code.google.com/p/go.tools/cmd/cover
+#src_test() {
+#	./test || die
+#}
+
+src_install() {
+	dobin "${S}"/bin/${PN}
+	dodoc README.md
+	use doc && dodoc -r Documentation
+}
diff --git a/app-crypt/etcd-ca/metadata.xml b/app-crypt/etcd-ca/metadata.xml
new file mode 100644
index 000000000000..b81d9fd5bac8
--- /dev/null
+++ b/app-crypt/etcd-ca/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <bugs-to>https://github.com/coreos/etcd-ca/issues</bugs-to>
+    <changelog>https://github.com/coreos/etcd-ca/commits/master</changelog>
+    <doc>https://github.com/coreos/etcd-ca/blob/master/README.md</doc>
+    <remote-id type="github">coreos/etcd-ca</remote-id>
+  </upstream>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/fcrackzip-1.0 b/app-crypt/fcrackzip-1.0
deleted file mode 100644
index c47a109b6982..000000000000
--- a/app-crypt/fcrackzip-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=a zip password cracker
-EAPI=6
-HOMEPAGE=http://oldhome.schmorp.de/marc/fcrackzip.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip
-SLOT=0
-SRC_URI=http://oldhome.schmorp.de/marc/data/fcrackzip-1.0.tar.gz
-_md5_=f097223c960b6fee06616dc0eb609d3a
diff --git a/app-crypt/fcrackzip/Manifest b/app-crypt/fcrackzip/Manifest
new file mode 100644
index 000000000000..693d62436adc
--- /dev/null
+++ b/app-crypt/fcrackzip/Manifest
@@ -0,0 +1,3 @@
+DIST fcrackzip-1.0.tar.gz 114786 BLAKE2B b5eb3071e7c858949079c8df79502aeb744a46b06b18408ba8cdc3c5b980e3b740acb597ba12196cd0d4f737e2aa3fbeb10e9d81c5d78a8244af1d3cb6b8eaa6 SHA512 c18d45b5a4ec46411d455a0c10cb9faa7a1060a48936a820fff9b1f8af7f7158ac09da44d39673e4bdfaf0f370ee425e8df0a0dbe98a2a930049ecc2a1419048
+EBUILD fcrackzip-1.0.ebuild 510 BLAKE2B b9e245452750a1cae4ed68a6468ed94b0804a97544db4880478c7fe2b42555768d23c947d9b7e3ae339b5c2fbc5de64ef6439ab0f31abf350ca7c07a3f7a3414 SHA512 1844a2dc97fc09eb389a185aee3b1b05e4a86503868d1b306363edd612a7f43478764e7caed933e7c4c8a55fe4c20fe13c6efba8578e94722e9561f119dc8afc
+MISC metadata.xml 244 BLAKE2B b58da0bab96619cd4e3c76252a9aa93cd62ec8daa7a1bbc4568f5c4f89ebd955d202698a8cd25489689abf0c7a2acbc2c987b05c0f5be1815484e02b7fa1a74c SHA512 369af9aeb291abf5f4ad1e75411ea1988671f116f7e44e8d5fc58fc2e2a8bde047783c23a71f2b2b5445b20873e5c38265714332dce289dec4e21d0b2cd76e44
diff --git a/app-crypt/fcrackzip/fcrackzip-1.0.ebuild b/app-crypt/fcrackzip/fcrackzip-1.0.ebuild
new file mode 100644
index 000000000000..a874133ce6a6
--- /dev/null
+++ b/app-crypt/fcrackzip/fcrackzip-1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a zip password cracker"
+HOMEPAGE="http://oldhome.schmorp.de/marc/fcrackzip.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/unzip"
+DEPEND=""
+
+src_prepare() {
+	default
+	sed -i -e '/funroll/d' configure || die
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/bin/{zipinfo,fcrack-zipinfo} || die
+}
diff --git a/app-crypt/fcrackzip/metadata.xml b/app-crypt/fcrackzip/metadata.xml
new file mode 100644
index 000000000000..84575d506dc9
--- /dev/null
+++ b/app-crypt/fcrackzip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gcr-3.20.0 b/app-crypt/gcr-3.20.0
deleted file mode 100644
index 64bcf8965918..000000000000
--- a/app-crypt/gcr-3.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/gobject-introspection-common dev-libs/libxslt dev-libs/vala-common dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gcr
-IUSE=debug gtk +introspection vala test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) !<gnome-base/gnome-keyring-3.3
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c022cdb35e791d1e6d43436b6f825dd
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
new file mode 100644
index 000000000000..f012006f8940
--- /dev/null
+++ b/app-crypt/gcr/Manifest
@@ -0,0 +1,3 @@
+DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
+EBUILD gcr-3.20.0.ebuild 1862 BLAKE2B a7ea202af7bb711d0fe024ef95c7d6a9c89cbf5fd8b98d2f8d1cbc0ac1372d6a890f6c17e6430176c8cbd841e5d235e3d9010ae67d9deb1abc9ff0360dd28716 SHA512 b66e96c94fa8a8d19f3c4fb26b5c3902a56baffd21fd883fb4971a88341ca2c62257db86679c3d2eaf054ea40ec284929adba5b174dc566471965e162d589713
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.20.0.ebuild b/app-crypt/gcr/gcr-3.20.0.ebuild
new file mode 100644
index 000000000000..b5dec6d72c6a
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.20.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://git.gnome.org/browse/gcr"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+	>=app-crypt/p11-kit-0.19
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=dev-libs/libtasn1-1:=
+	>=sys-apps/dbus-1
+	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-keyring-3.3
+"
+# gcr was part of gnome-keyring until 3.3
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-libs/vala-common
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+#	dev-libs/gobject-introspection-common
+#	dev-libs/vala-common
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid flag changes
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with gtk) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(usex debug --enable-debug=yes --enable-debug=default) \
+		--disable-update-icon-cache \
+		--disable-update-mime
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-crypt/gcr/metadata.xml b/app-crypt/gcr/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-crypt/gcr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gentoo-keys-201807020151 b/app-crypt/gentoo-keys-201807020151
deleted file mode 100644
index cba325b98e04..000000000000
--- a/app-crypt/gentoo-keys-201807020151
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A OpenPGP/GPG keyring of official Gentoo release media GPG keys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/keyrings/gentoo-keys-201807020151.tar.xz
-_md5_=a8229e1a147f22ef1267e099c25cddf2
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
new file mode 100644
index 000000000000..ba91833f7fd7
--- /dev/null
+++ b/app-crypt/gentoo-keys/Manifest
@@ -0,0 +1,3 @@
+DIST gentoo-keys-201807020151.tar.xz 53024 BLAKE2B 351f42e70ca44ac0020d7a18cf7fc6792ff0baa539daa2248a2b45b0c70e0048d4bddfd970e864b4cfc60940eb6e45a733cfd2dc3244bc21483f045c1421eca4 SHA512 b669735427f877c74b317e469d655501dd930c17e6a25920f38f7d96d0f7ce7c3ced4dd2e9f236877e9ae1131904c488925f9464bc402f835efaf827aef67dba
+EBUILD gentoo-keys-201807020151.ebuild 575 BLAKE2B 164315bb7f8aaf7e9e9be5a17cde523395c889b09f7ec03997794d345ec745f4c34f7fa0163f7b96b039f97687a02aa3cb1301ed1e6d567b7df838f206d61133 SHA512 d5d742618b419f79b5bf9363313ffeba0225dc5e6a4ccaf183ebf5de4eca55a181c352465cd3147fff3cde41bab0c59533cc7ee57af478aa4eccb5e22e6d08a8
+MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201807020151.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201807020151.ebuild
new file mode 100644
index 000000000000..50b441af5487
--- /dev/null
+++ b/app-crypt/gentoo-keys/gentoo-keys-201807020151.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2014-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="A OpenPGP/GPG keyring of official Gentoo release media GPG keys"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /var/lib/gentoo/gkeys/keyrings
+	doins -r gentoo
+}
diff --git a/app-crypt/gentoo-keys/metadata.xml b/app-crypt/gentoo-keys/metadata.xml
new file mode 100644
index 000000000000..1937e8c82b4b
--- /dev/null
+++ b/app-crypt/gentoo-keys/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gkeys@gentoo.org</email>
+		<name>Gentoo-keys Project Team</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gifshuffle-2.0-r1 b/app-crypt/gifshuffle-2.0-r1
deleted file mode 100644
index e85c9819d4ef..000000000000
--- a/app-crypt/gifshuffle-2.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=GIF colourmap steganography
-EAPI=6
-HOMEPAGE=http://www.darkside.com.au/gifshuffle/
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.darkside.com.au/gifshuffle/gifshuffle.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d72fc20fb3ba744fe8ca76e1e533c4d6
diff --git a/app-crypt/gifshuffle/Manifest b/app-crypt/gifshuffle/Manifest
new file mode 100644
index 000000000000..425de24a3105
--- /dev/null
+++ b/app-crypt/gifshuffle/Manifest
@@ -0,0 +1,3 @@
+DIST gifshuffle.tar.gz 21509 BLAKE2B a07490c2f6a29782d7d25219eefbf49393ccb06b1fbb260927dce741450934990673cc86168285ec9d0bc2ef258a64d98d623f143b464b48c9955b13a808822d SHA512 0a0521f924c508c80c11309203e64cbd948945ddd557f01008a39987602320be780c1710dfcaa8ec9886fff4e9745465f2f242919ede4cedb2af9f73e5cc54be
+EBUILD gifshuffle-2.0-r1.ebuild 607 BLAKE2B 32b69f77ef8f1fe46ba7c42c694c7bd246a3055de550493b4ab63a263acce8af6d34bdb71d835444088c30fd9c98949dd49b3b22b1068a542c545f4e6eccccce SHA512 c177eb84a8386c33163d9d47b1952c86b1a9963dd4c8c347d2fc4df24408fd26254270331df80873a0f5af145fc6012e75feddeec0d98d21d3068a86424938da
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild b/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
new file mode 100644
index 000000000000..c2a8cfb2d9de
--- /dev/null
+++ b/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="GIF colourmap steganography"
+HOMEPAGE="http://www.darkside.com.au/gifshuffle/"
+SRC_URI="http://www.darkside.com.au/gifshuffle/${PN}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	echo $(tc-getCC) -o ${PN} ${CFLAGS} ${LDFLAGS} *.c || die
+	$(tc-getCC) -o ${PN} ${CFLAGS} ${LDFLAGS} *.c || die "Cannot compile ${PN}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc gshuf.txt
+}
diff --git a/app-crypt/gifshuffle/metadata.xml b/app-crypt/gifshuffle/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-crypt/gifshuffle/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/gkeys-0.2 b/app-crypt/gkeys-0.2
deleted file mode 100644
index a5a1af3751fd..000000000000
--- a/app-crypt/gkeys-0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An OpenPGP/GPG key management tool for seed files and keyrings
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg >=dev-python/pyGPG-0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ssl-fetch-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/snakeoil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/gentoo-keys-201501052117 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/gkeys/gkeys-0.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e63225bcb144cd2521312dca4a2fdd96
diff --git a/app-crypt/gkeys-9999 b/app-crypt/gkeys-9999
deleted file mode 100644
index 49ed49c4890b..000000000000
--- a/app-crypt/gkeys-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=An OpenPGP/GPG key management tool and python libs
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg =dev-python/pyGPG-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/ssl-fetch-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snakeoil-0.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/gentoo-keys-201501052117 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba79912344aef74571dd7b04a1467eb1
diff --git a/app-crypt/gkeys-gen-0.2 b/app-crypt/gkeys-gen-0.2
deleted file mode 100644
index e16ccec694d5..000000000000
--- a/app-crypt/gkeys-gen-0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Tool for generating OpenPGP/GPG keys using a specifications file
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg dev-python/snakeoil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygpgme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =app-crypt/gkeys-0.2*[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/gkeys-gen/gkeys-gen-0.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0fc01269f05e911f21f25f36f86d714f
diff --git a/app-crypt/gkeys-gen-9999 b/app-crypt/gkeys-gen-9999
deleted file mode 100644
index 1f63e7252bc2..000000000000
--- a/app-crypt/gkeys-gen-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Tool for generating OpenPGP/GPG keys using a specifications file
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg dev-python/snakeoil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygpgme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =app-crypt/gkeys-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eaf9712d3b809aa84c018621f4bcc6f0
diff --git a/app-crypt/gkeys-gen/Manifest b/app-crypt/gkeys-gen/Manifest
new file mode 100644
index 000000000000..aa46a0446a01
--- /dev/null
+++ b/app-crypt/gkeys-gen/Manifest
@@ -0,0 +1,4 @@
+DIST gkeys-gen-0.2.tar.bz2 19160 BLAKE2B db8ab42b7001cc9189a34291bb22f36344dd1d5a74030269e4675cde83c511cf497f412e8194564c945e322adac421d79441a3914520ee0af39725f4162db65a SHA512 ca46d8cc32f80ac98dfafc0b6ab3e543dc0cb4ee6db2938917d4c6f4fada980996e1ddd48f3ffe563893b973b5763e7016a66f67d4a2f8eb57ee227b1e71a1c2
+EBUILD gkeys-gen-0.2.ebuild 1079 BLAKE2B c6c69e80abf52bcba0aa4e2a847469b71a77c88cc5922c9d8a183ffdf00e4a0d559efb36ad618bda2439d55b1eb0a3082d1a14870c0c9b2749832d083143fb2b SHA512 6d54c3cd59f2e6611560618a4c882f0f3ef8b0089ab177a333ebb3489b3232a673d9b5a71409c1e2812b7fb88dcb3ae7f5d5d994be867938402be326f000c3cc
+EBUILD gkeys-gen-9999.ebuild 1463 BLAKE2B 4e8e5dcaad669a3120fb00303b6b25fb3fe9b057cabba41c81e5cba32ab6fcf0dc926e6f484ac1389bf584af067417f711941d21d52f41c9cdf87f7129895afc SHA512 346dd2dff96e942a89ba549509465ace606421a427593075500f02cc3cf98b158cc1148dd6d919432c9a52931f910f82799f0c8b51cd23a22d9ee450e07ae6cb
+MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild b/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
new file mode 100644
index 000000000000..b6b52f863d31
--- /dev/null
+++ b/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for generating OpenPGP/GPG keys using a specifications file"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	dev-python/snakeoil[${PYTHON_USEDEP}]
+	dev-python/pygpgme[${PYTHON_USEDEP}]
+	=app-crypt/gkeys-0.2*[${PYTHON_USEDEP}]
+	"
+
+pkg_postinst() {
+	einfo "This is experimental software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://bugs.gentoo.org"
+	einfo "We are also on IRC @ #gentoo-keys of the Freenode network"
+	einfo
+	ewarn "There may be some Python 3 compatibility issues still."
+	ewarn "Please help us debug, fix and report them in Bugzilla."
+}
diff --git a/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild b/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild
new file mode 100644
index 000000000000..e72ae2a0bd3a
--- /dev/null
+++ b/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+EGIT_BRANCH="master"
+#EGIT_BRANCH="gen-update"
+
+inherit distutils-r1 git-r3
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoo-keys.git"
+#EGIT_REPO_URI="https://github.com/gentoo/gentoo-keys.git"
+
+DESCRIPTION="Tool for generating OpenPGP/GPG keys using a specifications file"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	dev-python/snakeoil[${PYTHON_USEDEP}]
+	dev-python/pygpgme[${PYTHON_USEDEP}]
+	=app-crypt/gkeys-9999[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/$P/gkeys-gen"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# copy these 2 into our subdir from the master level
+	cp ../LICENSE ./ || die "cp LICENSE failed"
+	cp ../README.md ./ || die "cp README.me failed"
+	cp -R ../py2man ./ || die "cp-R py2man failed"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This is experimental software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://bugs.gentoo.org"
+	einfo "We are also on IRC @ #gentoo-keys of the freenode network"
+	einfo
+	ewarn "There may be some python 3 compatibility issues still."
+	ewarn "Please help debug/fix/report them in bugzilla."
+}
diff --git a/app-crypt/gkeys-gen/metadata.xml b/app-crypt/gkeys-gen/metadata.xml
new file mode 100644
index 000000000000..1937e8c82b4b
--- /dev/null
+++ b/app-crypt/gkeys-gen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gkeys@gentoo.org</email>
+		<name>Gentoo-keys Project Team</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gkeys/Manifest b/app-crypt/gkeys/Manifest
new file mode 100644
index 000000000000..e6c4e2442a7f
--- /dev/null
+++ b/app-crypt/gkeys/Manifest
@@ -0,0 +1,4 @@
+DIST gkeys-0.2.tar.bz2 47726 BLAKE2B f85fcad78251ce8e4b49d452332af869140611161256663310c3a050f7a3c5313f6e37836d90c5a40b1abb043ff7412cea3b5decd3f1c6db24ff5811dd1b9709 SHA512 0c594b5f451329e5e85998bb96243812e0c6e7ef7fa4db0f276a870148adffcf41acc31631fb28c44c473690f154e130ddcb10b986d4546ca19e2cc8cda95036
+EBUILD gkeys-0.2.ebuild 1695 BLAKE2B bc828662f5fe44bc4be7023400046a46795136f3f2887aeea46c3119aa81ac5c6db69788d852b425162cb578955c28db1b69c37dce7c1729b39715e2b81e4963 SHA512 5d5f50b3b660fa70a73df0c31c290280d7995bc6474a0cfaa48fba0778e4f5b00a29bcae8af3a267e04b08e0e93cf500e940a6ad3b64179a3f4415fe392f6496
+EBUILD gkeys-9999.ebuild 1616 BLAKE2B 2cc22c233eea764f86fccea3ded59745a50010ddf22fd1210f0ea8bf0b30b43f1ceb2b3b2b16ed5db890f35fffa8acd97fb5ee06177c11fbb77cdae9502e255d SHA512 b564c3d2806de902f6e4b5308dc9b45d05c1718cb9db7bf3e344bbef5ed5300cbedb342f5b064e58db1c835ce832cfee86d58754a2c900c616958e3d9bfa792a
+MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gkeys/gkeys-0.2.ebuild b/app-crypt/gkeys/gkeys-0.2.ebuild
new file mode 100644
index 000000000000..82fd2a17cd93
--- /dev/null
+++ b/app-crypt/gkeys/gkeys-0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="An OpenPGP/GPG key management tool for seed files and keyrings"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	>=dev-python/pyGPG-0.2[${PYTHON_USEDEP}]
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+	dev-python/snakeoil[${PYTHON_USEDEP}]
+	>=app-crypt/gentoo-keys-201501052117
+	"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /var/log/gkeys
+	fperms g+w /var/log/gkeys
+}
+
+pkg_preinst() {
+	chgrp users "${D}"/var/log/gkeys
+}
+
+pkg_postinst() {
+	einfo "This is experimental software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "This version includes a new gkeys-gpg command"
+	einfo "It can be used as an alternate gpg command for git"
+	einfo "It will set the correct keyring to verify signed commits"
+	einfo "provided the key it needs to verify against is part of the gkeys"
+	einfo "keyring system.   It only works for verification, any other call "
+	einfo "to it will re-direct directly to the normal gpg command."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://bugs.gentoo.org"
+	einfo "We are also on IRC @ #gentoo-keys of the Freenode network"
+	einfo
+	ewarn "There may be some Python 3 compatibility issues still."
+	ewarn "Please help us debug, fix and report them in Bugzilla."
+}
diff --git a/app-crypt/gkeys/gkeys-9999.ebuild b/app-crypt/gkeys/gkeys-9999.ebuild
new file mode 100644
index 000000000000..7ab5b3f58306
--- /dev/null
+++ b/app-crypt/gkeys/gkeys-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+#EGIT_PROJECT="gentoo-keys.git"
+EGIT_BRANCH="master"
+
+inherit distutils-r1 git-r3
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-keys.git"
+
+DESCRIPTION="An OpenPGP/GPG key management tool and python libs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	=dev-python/pyGPG-9999[${PYTHON_USEDEP}]
+	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	>=app-crypt/gentoo-keys-201501052117
+	"
+
+S="${WORKDIR}/$P/gkeys"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# copy these 2 into our subdir from the master level
+	cp ../LICENSE ./ || die "cp LICENSE failed"
+	cp ../README.md ./ || die "cp README.me failed"
+	cp -R ../py2man ./ || die "cp-R py2man failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /var/log/gkeys
+	fperms g+w /var/log/gkeys
+}
+
+pkg_preinst() {
+	chgrp users "${D}"/var/log/gkeys
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This is experimental software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://bugs.gentoo.org"
+	einfo "We are also on IRC @ #gentoo-keys of the freenode network"
+	einfo
+	ewarn "There may be some python 3 compatibility issues still."
+	ewarn "Please help debug/fix/report them in bugzilla."
+}
diff --git a/app-crypt/gkeys/metadata.xml b/app-crypt/gkeys/metadata.xml
new file mode 100644
index 000000000000..1937e8c82b4b
--- /dev/null
+++ b/app-crypt/gkeys/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gkeys@gentoo.org</email>
+		<name>Gentoo-keys Project Team</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/glep63-check-1 b/app-crypt/glep63-check-1
deleted file mode 100644
index 1ccc845849b7..000000000000
--- a/app-crypt/glep63-check-1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=GLEP 63 compliance checker for OpenPGP keys
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/glep63-check/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-crypt/gnupg
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/glep63-check/archive/v1.tar.gz -> glep63-check-1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7b1a03b2600f26a6455119517b18be25
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
new file mode 100644
index 000000000000..f6f2e08b8466
--- /dev/null
+++ b/app-crypt/glep63-check/Manifest
@@ -0,0 +1,3 @@
+DIST glep63-check-1.tar.gz 4632 BLAKE2B 3632199ca9ca8516a833aa6d93885f40a761c47ab5bc5685582c6c8e294af0d5a6e258656208c9a65c1c5d4852d5e32374a77b39a0dcf491605df4b733d2c162 SHA512 16e3031b9b04af09ba446c76e8776d802d197d2d1f934c9a409509a81fd299306b451ea3e52d1ac5b75c9d0c9a0d7f93b73e26732ecf51c5c3afe53f0c0868aa
+EBUILD glep63-check-1.ebuild 599 BLAKE2B 57129139a3c4999c93ddcfb915459471963e5fe70029ead8f91d3b5fbfcc7a13ea49bff7c24b50cfbcd3930aef2b8eba5d2cc107f4dd59030a61d58b2f93d6c4 SHA512 104d354b826ab4c9c4c01b587410de5a136239d8e1073d6aa8c5e97b28ac7e5d5e039154b72a913c1557035fe74b2b1988f4fbbc16bfa17efa01393d65f30da1
+MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
diff --git a/app-crypt/glep63-check/glep63-check-1.ebuild b/app-crypt/glep63-check/glep63-check-1.ebuild
new file mode 100644
index 000000000000..1ffa43933fbc
--- /dev/null
+++ b/app-crypt/glep63-check/glep63-check-1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit python-single-r1
+
+DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
+HOMEPAGE="https://github.com/mgorny/glep63-check/"
+SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-crypt/gnupg"
+
+src_compile() {
+	python_fix_shebang glep63-check
+}
+
+src_install() {
+	dobin glep63-check
+}
diff --git a/app-crypt/glep63-check/metadata.xml b/app-crypt/glep63-check/metadata.xml
new file mode 100644
index 000000000000..3c8bc0ae71d4
--- /dev/null
+++ b/app-crypt/glep63-check/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://github.com/mgorny/glep63-check/issues/</bugs-to>
+		<remote-id type="github">mgorny/glep63-check</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/gnupg-1.4.21 b/app-crypt/gnupg-1.4.21
deleted file mode 100644
index 3bc389cbc9c7..000000000000
--- a/app-crypt/gnupg-1.4.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline:0= ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) dev-lang/perl nls? ( sys-devel/gettext )
-DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
-EAPI=5
-HOMEPAGE=http://www.gnupg.org/
-IUSE=bzip2 curl ldap mta nls readline selinux smartcard static usb zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline:0= ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) ) selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.21.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26a82bba0b9f4d5bcede328afc6697be
diff --git a/app-crypt/gnupg-2.2.8 b/app-crypt/gnupg-2.2.8
deleted file mode 100644
index 24e0429f2f3d..000000000000
--- a/app-crypt/gnupg-2.2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=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 app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo ) virtual/pkgconfig
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=6
-HOMEPAGE=http://www.gnupg.org/
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server
-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
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=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 app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.8.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=935b99b8c282e68c68af4e081691f882
diff --git a/app-crypt/gnupg-pkcs11-scd-0.9.1 b/app-crypt/gnupg-pkcs11-scd-0.9.1
deleted file mode 100644
index 38cdb45df283..000000000000
--- a/app-crypt/gnupg-pkcs11-scd-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libassuan:= >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:= virtual/pkgconfig
-DESCRIPTION=PKCS#11 support for GnuPG
-EAPI=6
-HOMEPAGE=http://gnupg-pkcs11.sourceforge.net
-IUSE=libressl proxy
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libassuan:= >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:=
-SLOT=0
-SRC_URI=https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-0.9.1/gnupg-pkcs11-scd-0.9.1.tar.bz2
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9129bb4211950a64b9f47ec3451ed480
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
new file mode 100644
index 000000000000..5592d0db6447
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -0,0 +1,5 @@
+AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf9783e32defe4c571a64e00754565666c4f379956ff4b1db713d496ebb838ff599d2b25223fb66652dd7d727812ef4f SHA512 15a4e6534e5069a9f02050e0d7dc5a27609065fafa789985a2ab448033811c9099fbc00ded558b98797b6191c5ced94cbd1bda626a1dab85cde747a856ed1ecf
+AUX gnupg-pkcs11-scd-proxy.initd 716 BLAKE2B 05f2057b6a2bc1824eef62139a70b193152bdf9b92c97244d5574d81d010a19978b2905f952539f0eded8b64e045053c7b0995aa2594dbcbee3eb8e44b149cd5 SHA512 b1719720150d7380c96e987bfa0f7932bdd30aa9462f9c11d9ac06ed58efbb0ef8c60df27b50dceed812a238ee01007abccd99edf7dbea0efcf0de2d35d032bf
+DIST gnupg-pkcs11-scd-0.9.1.tar.bz2 145814 BLAKE2B 53f0c11d401071dc9beef10630c07f2da6c9a70a0cb020c4430613c1c2f6ba7447bd95c490098ec688e5c73260c42a0285ed045a54d8397018611f00d5406b27 SHA512 66ac4b2d4ed2106bb0bfe40bac00cdffc36f7f10ace15a232ba475d1a152439fca2bde3f7a6eaaae8b9f17fb3e6371207f2e689d3d9557817ef54984858a3489
+EBUILD gnupg-pkcs11-scd-0.9.1.ebuild 1098 BLAKE2B cc74007e88fea91e79ce527505a5147bb7524739585b92deda4b7c9ee706070859440b5e2309e96e33d9573d7ac7471b35e5c13eafcf5dc5352453b21cc874eb SHA512 85b6db37a0d6b04a5cc2c0ec2a3d638f616e4230d337905dd740e05132076cdf8c86d5d2165c0a3d610163d55d3fdf37cfe109506fa060a4efe6f5ccd026ee2f
+MISC metadata.xml 563 BLAKE2B 67baabaaddb15da69e52484964c335ace26f38e96cf539f7f959a9d34de52f52dd6a12890ca2ad2d181c61e4a958cefb97b8abda27d3b75c930bd1a01c0dd014 SHA512 6ba21eb5bd095961e91f699864f08d07ef78207d656ea6f89a3b7c49d0b2a6aedfe1b912315b9730c3f2615428ec4bedb0f03599c5a76739b8bfd51735ab8c20
diff --git a/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.confd b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.confd
new file mode 100644
index 000000000000..702cf615fa6d
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.confd
@@ -0,0 +1 @@
+SCD_CONFIG=/etc/gnupg-pkcs11-scd.conf
diff --git a/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd
new file mode 100644
index 000000000000..50b324882400
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="gnupg-pkcs11-scd proxy."
+
+GNUPG_PKCS11_GROUP="${GNUPG_PKCS11_GROUP:-gnupg-pkcs11}"
+
+command="/usr/bin/gnupg-pkcs11-scd-proxy-server"
+command_args="--scd-config='${SCD_CONFIG}' --socket-group=${GNUPG_PKCS11_GROUP} ${EXTRA_OPTS}"
+pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
+user=${USER:-gnupg-pkcs11-scd-proxy}
+group=${GROUP:-gnupg-pkcs11-scd-proxy}
+start_stop_daemon_args="--user ${user} --group ${group} --background --make-pidfile"
+
+depend() {
+	need localmount
+	after bootmisc
+}
+
+start_pre() {
+	checkpath -o ${user}:${GNUPG_PKCS11_GROUP} -m 0750 -d /run/gnupg-pkcs11-scd-proxy
+}
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild
new file mode 100644
index 000000000000..2a66c188bd0c
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user
+
+DESCRIPTION="PKCS#11 support for GnuPG"
+HOMEPAGE="http://gnupg-pkcs11.sourceforge.net"
+SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl proxy"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libassuan:=
+	>=dev-libs/libgcrypt-1.2.2:=
+	>=dev-libs/libgpg-error-1.3:=
+	>=dev-libs/pkcs11-helper-1.02:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use proxy; then
+		enewgroup gnupg-pkcs11
+		enewgroup gnupg-pkcs11-scd-proxy
+		enewuser gnupg-pkcs11-scd-proxy -1 -1 / gnupg-pkcs11-scd-proxy,gnupg-pkcs11
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable proxy) \
+		--with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
+}
+
+src_install() {
+	default
+	if use proxy; then
+		newinitd "${FILESDIR}/gnupg-pkcs11-scd-proxy.initd" gnupg-pkcs11-scd-proxy
+		newconfd "${FILESDIR}/gnupg-pkcs11-scd-proxy.confd" gnupg-pkcs11-scd-proxy
+	fi
+}
diff --git a/app-crypt/gnupg-pkcs11-scd/metadata.xml b/app-crypt/gnupg-pkcs11-scd/metadata.xml
new file mode 100644
index 000000000000..c81bfe31ed58
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<longdescription>
+		GnuPG scd replacement that enables the use of PKCS#11 tokens.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gnupg-pkcs11</remote-id>
+		<remote-id type="github">alonbl/gnupg-pkcs11-scd</remote-id>
+	</upstream>
+	<use>
+		<flag name="proxy">Build the gnupg-pkcs11-scd-prox</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
new file mode 100644
index 000000000000..2e0abd6d2d02
--- /dev/null
+++ b/app-crypt/gnupg/Manifest
@@ -0,0 +1,6 @@
+AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
+DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
+DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007
+EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
+EBUILD gnupg-2.2.8.ebuild 3209 BLAKE2B 59e3d8e013e62af26653917e524a51ea1804dc77bbf164157ec85344f0df4655bd60c090487790820717bf3fc7864da76dc5edf5709d50446afbc1bb81bac737 SHA512 ebfc7525a171336c97b957102ec798f87f454296ce3f6904f8dad6e2f9a5b00c689663120c8eede207f520660ba2ee12c52065b6f65f788d8c29e5fd2b23ba50
+MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
new file mode 100644
index 000000000000..dd75e3a5e96c
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
@@ -0,0 +1,33 @@
+From e3bdb7d17264b8d5bd9abab97c96d9c4a50e4f61 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 3 Apr 2017 23:44:56 +0300
+Subject: [PATCH] gpgscm: Use shorter socket path lengts to improve test
+ reliability
+
+--
+As socket lengths are normally restricted to 108 characters
+(UNIX_PATH_MAX variable in /usr/include/linux/un.h), using 42 characters
+by default easily results in errors.
+---
+ tests/gpgscm/tests.scm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
+index 592b36f..f54a387 100644
+--- a/tests/gpgscm/tests.scm
++++ b/tests/gpgscm/tests.scm
+@@ -273,9 +273,9 @@
+   (canonical-path (_mkdtemp (if (null? components)
+ 				(path-join
+ 				 (get-temp-path)
+-				 (string-append "gpgscm-" (get-isotime) "-"
++				 (string-append "gscm"
+ 						(basename-suffix *scriptname* ".scm")
+-						"-XXXXXX"))
++						"XXXXXX"))
+ 				(apply path-join components)))))
+ 
+ ;; Make a temporary directory and remove it at interpreter shutdown.
+-- 
+2.10.2
+
diff --git a/app-crypt/gnupg/gnupg-1.4.21.ebuild b/app-crypt/gnupg/gnupg-1.4.21.ebuild
new file mode 100644
index 000000000000..d8cb5bc50c6c
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.21.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+ECCVER="0.2.0"
+ECCVER_GNUPG="1.4.9"
+ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
+MY_P=${P/_/}
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib"
+
+COMMON_DEPEND="
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	curl? ( net-misc/curl )
+	mta? ( virtual/mta )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( =virtual/libusb-0* )
+	usb? ( =virtual/libusb-0* )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND} )
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# bug#469388
+	sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
+
+	# Fix PIC definitions
+	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
+		|| die "sed PIC failed"
+	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
+		die "sed PIC failed"
+}
+
+src_configure() {
+	# Certain sparc32 machines seem to have trouble building correctly with
+	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
+	# fix until the gcc problem can be tracked down.
+	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
+	fi
+
+	# 'USE=static' support was requested in #29299
+	use static && append-ldflags -static
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable ldap) \
+		$(use_enable mta mailto) \
+		--enable-hkp \
+		--enable-finger \
+		$(use_with !zlib included-zlib) \
+		$(use_with curl libcurl /usr) \
+		$(use_enable nls) \
+		$(use_enable bzip2) \
+		$(use_enable smartcard card-support) \
+		$(use_enable selinux selinux-support) \
+		--without-capabilities \
+		$(use_with readline) \
+		$(use_with usb libusb /usr) \
+		--enable-static-rnd=linux \
+		--libexecdir="${EPREFIX}/usr/libexec" \
+		--enable-noexecstack \
+		CC_FOR_BUILD=$(tc-getBUILD_CC) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	# keep the documentation in /usr/share/doc/...
+	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
+
+	exeinto /usr/libexec/gnupg
+	doexe tools/make-dns-cert
+}
+
+pkg_postinst() {
+	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
+	ewarn "you MUST make the gpg binary setuid."
+	echo
+#	if use !bindist && use ecc; then
+#		ewarn
+#		ewarn "The elliptical curves patch is experimental"
+#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
+#	fi
+	elog
+	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
+	elog
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
+}
diff --git a/app-crypt/gnupg/gnupg-2.2.8.ebuild b/app-crypt/gnupg/gnupg-2.2.8.ebuild
new file mode 100644
index 000000000000..a7cb03c7e859
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.8.ebuild
@@ -0,0 +1,130 @@
+# 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.28
+	>=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"
+)
+
+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/metadata.xml b/app-crypt/gnupg/metadata.xml
new file mode 100644
index 000000000000..d9ae4079527c
--- /dev/null
+++ b/app-crypt/gnupg/metadata.xml
@@ -0,0 +1,38 @@
+<?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>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<longdescription>
+	GnuPG is a complete and free implementation of the OpenPGP standard as
+	defined by RFC4880.
+	</longdescription>
+	<use>
+		<flag name="smartcard">
+		Build scdaemon software. Enables usage of OpenPGP cards. For
+		other type of smartcards, try <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.
+		Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable scdaemon.
+		</flag>
+		<flag name="usb">
+		Build direct CCID access for scdaemon; requires <pkg>dev-libs/libusb</pkg>.
+		</flag>
+		<flag name="mta">
+		Build mta support using <pkg>virtual/mta</pkg>.
+		</flag>
+		<flag name="tofu">
+		Enable support for Trust on First use trust model; requires <pkg>dev-db/sqlite</pkg>.
+		</flag>
+		<flag name="tools">
+		Install extra tools (including gpgsplit and gpg-zip).
+		</flag>
+		<flag name="wks-server">
+		Install the wks-server
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/gorilla-1.4-r1 b/app-crypt/gorilla-1.4-r1
deleted file mode 100644
index 98bbdda40391..000000000000
--- a/app-crypt/gorilla-1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/tcl-8.4.19:0 >=dev-lang/tk-8.4.19:0 dev-tcltk/iwidgets dev-tcltk/bwidget
-DESCRIPTION=Password Safe in secure way with GUI interface
-EAPI=5
-HOMEPAGE=https://github.com/zdia/gorilla/wiki
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/tcl-8.4.19:0 >=dev-lang/tk-8.4.19:0 dev-tcltk/iwidgets dev-tcltk/bwidget
-SLOT=0
-SRC_URI=https://github.com/zdia/gorilla/archive/v1.4.tar.gz -> gorilla-1.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=15979381ca8bfbf40b46e9e52a3ca60a
diff --git a/app-crypt/gorilla/Manifest b/app-crypt/gorilla/Manifest
new file mode 100644
index 000000000000..06fffbc4df7c
--- /dev/null
+++ b/app-crypt/gorilla/Manifest
@@ -0,0 +1,4 @@
+AUX gorilla-script-destdir.patch 503 BLAKE2B 175f471883dc893095defe14e96a1b802aeb7f7532f8cbc2a7e058a0b2bc1b5701b5636e676cbd1dfe004c0af81baba403b3e5425977a5567ce68eca40ceca9f SHA512 d39601d0fbd2e25eb540fce4b837fbc86782d643577389a518312a23249c8930a3a784d03ea6a65753135660bdeed425b4906812f420b9f625e613ca2fb237c6
+DIST gorilla-1.4.tar.gz 190766 BLAKE2B f537ef4b7d7324dd04124450a8c84bd56fc52cc1f40669bda26c9770fc279a81d034e161807ab8b98a7ae779fe85b067f9ab8b7e208a656e96ac6922a8fb9bc9 SHA512 56328068506309e99f9bc8b095048840eabacb794c742b36c4b855501d2973646e6e5ef7755f0aa29e636c5f5463fa1b24f0f627cb691511e4a48e1f062ce44b
+EBUILD gorilla-1.4-r1.ebuild 778 BLAKE2B bb02fd433a53297cf4ca252e6d313ccbd0b1fb82c7929333315effcfa89d2a9ade8f689f26aa5e1c1b97e16235b4a98f9517c210f1b0dd19f994001e0f3f2177 SHA512 b137ab3c328a65a4c7d892a3cb14de66f5ff9b67a299c8df71de8eb7c73c1e40d4e6a9474f36a41b035c0392aeeb71983f472a7f98ac25cc668cb276f5434595
+MISC metadata.xml 334 BLAKE2B 45e622a9f79f3401c1e38c260dc8714d74845202b24b6d0d30366254c9a3869342f21375d198ce14eb25a1e827e9c40147ab07ae15be5d9f4b938572ef6320fb SHA512 82e606fd71fd8dd152b2e3a0638a6d503789226dcf0fa89d25066af33ae8f648da132578bfa506c172596b0a265590428b6444bdeda54d98dc7f1e80b5939b54
diff --git a/app-crypt/gorilla/files/gorilla-script-destdir.patch b/app-crypt/gorilla/files/gorilla-script-destdir.patch
new file mode 100644
index 000000000000..e18fcd80e3ec
--- /dev/null
+++ b/app-crypt/gorilla/files/gorilla-script-destdir.patch
@@ -0,0 +1,17 @@
+--- gorilla-1.4/gorilla.in	2006-07-14 13:29:33.000000000 -0400
++++ gorilla-1.4/gorilla.in.new	2006-07-14 13:33:01.000000000 -0400
+@@ -1,10 +1,13 @@
+ #! /bin/sh
+ # the next line restarts using wish \
+ exec @wish@ "$0" ${1+"$@"}
++
+ set myName [info script]
++set myGorilla /opt/gorilla-1.4/gorilla.tcl
++
+ if {![catch {
+     set linkName [file readlink $myName]
+ }]} {
+     set myName $linkName
+ }
+-source [file join [file dirname $myName] gorilla.tcl]
++source [file join [file dirname $myName] $myGorilla]
diff --git a/app-crypt/gorilla/gorilla-1.4-r1.ebuild b/app-crypt/gorilla/gorilla-1.4-r1.ebuild
new file mode 100644
index 000000000000..2348ecc65614
--- /dev/null
+++ b/app-crypt/gorilla/gorilla-1.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Password Safe in secure way with GUI interface"
+HOMEPAGE="https://github.com/zdia/gorilla/wiki"
+SRC_URI="https://github.com/zdia/gorilla/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/tcl-8.4.19:0
+	>=dev-lang/tk-8.4.19:0
+	dev-tcltk/iwidgets
+	dev-tcltk/bwidget"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-script-destdir.patch
+}
+
+src_configure() {
+	./configure || die "econf failed"
+}
+src_compile() { :; }
+
+src_install() {
+	PREFIX="/opt/${P}"
+
+	insinto ${PREFIX}
+	doins -r gorilla.tcl isaac.tcl twofish sha1 blowfish pwsafe pics
+
+	dobin gorilla
+}
diff --git a/app-crypt/gorilla/metadata.xml b/app-crypt/gorilla/metadata.xml
new file mode 100644
index 000000000000..a01eddb96726
--- /dev/null
+++ b/app-crypt/gorilla/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">zdia/gorilla</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/gpa-0.9.10 b/app-crypt/gpa-0.9.10
deleted file mode 100644
index b42c70abe5f6..000000000000
--- a/app-crypt/gpa-0.9.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=app-crypt/gnupg-2:= >=app-crypt/gpgme-1.5.0:= >=dev-libs/libassuan-1.1.0 >=dev-libs/libgpg-error-1.4 >=x11-libs/gtk+-2.10.0:2 virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG
-EAPI=6
-HOMEPAGE=http://gpa.wald.intevation.org
-IUSE=nls
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=>=app-crypt/gnupg-2:= >=app-crypt/gpgme-1.5.0:= >=dev-libs/libassuan-1.1.0 >=dev-libs/libgpg-error-1.4 >=x11-libs/gtk+-2.10.0:2
-SLOT=0
-SRC_URI=mirror://gnupg/gpa/gpa-0.9.10.tar.bz2
-_md5_=732a5452b69b3b91858084d2472c3a41
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
new file mode 100644
index 000000000000..5fb60b76841d
--- /dev/null
+++ b/app-crypt/gpa/Manifest
@@ -0,0 +1,3 @@
+DIST gpa-0.9.10.tar.bz2 763239 BLAKE2B 60763d63c39ca73c5f36d569e27388650060989386df10a867b0235d1b37ce3a46f1526668a1975b9e8c9ebd1c98ffaedab0fe92e55c80787a24dd412939e6a4 SHA512 ff81a78e6b7c46307af6648a2e691a5e8185db229ccc5e259f2c3c05a3c86b337dde492069e7e9510c155fbc64d71cc4e2f109a00400bfb7560c558b753c42a9
+EBUILD gpa-0.9.10.ebuild 805 BLAKE2B 39702b9ef9dadef1a73156a28f75a1404799dc5706d557d371090a635fd9aae773af3bfb18f7b09db6169dd6ce0b845105859c44eb6a4d04eb7bc18d0d833fb8 SHA512 63db81c883b11ebe436826957c62739a6cbc8398fa0b8c6e93296b04e19069aedc0fb47d5206689c58bef79886ce1e5c5b821b371f92b6f9438d081e009cf901
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/gpa/gpa-0.9.10.ebuild b/app-crypt/gpa/gpa-0.9.10.ebuild
new file mode 100644
index 000000000000..9fe3efefc9b8
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND="
+	>=app-crypt/gnupg-2:=
+	>=app-crypt/gpgme-1.5.0:=
+	>=dev-libs/libassuan-1.1.0
+	>=dev-libs/libgpg-error-1.4
+	>=x11-libs/gtk+-2.10.0:2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	sed -i 's/Application;//' gpa.desktop
+}
+
+src_configure() {
+	econf \
+		--with-gpgme-prefix=/usr \
+		--with-libassuan-prefix=/usr \
+		$(use_enable nls) \
+		GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
+}
diff --git a/app-crypt/gpa/metadata.xml b/app-crypt/gpa/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/gpa/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gpg-ringmgr-1.12 b/app-crypt/gpg-ringmgr-1.12
deleted file mode 100644
index 03ac70739877..000000000000
--- a/app-crypt/gpg-ringmgr-1.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/perl >=app-crypt/gnupg-1.2.1
-DESCRIPTION=GPG Keyring Manager to handle large GPG keyrings more easily
-EAPI=0
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=x86 ppc sparc alpha hppa amd64
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=app-crypt/gnupg-1.2.1
-SLOT=0
-SRC_URI=mirror://gentoo/gpg-ringmgr
-_md5_=359be7e06dc8d5a0f3b39bca74e60bd5
diff --git a/app-crypt/gpg-ringmgr/Manifest b/app-crypt/gpg-ringmgr/Manifest
new file mode 100644
index 000000000000..9bfbfe799a73
--- /dev/null
+++ b/app-crypt/gpg-ringmgr/Manifest
@@ -0,0 +1,3 @@
+DIST gpg-ringmgr 9378 BLAKE2B 673b1f6719dda0019c599a8ebc1d38e748c7749f07c8145f48dfff81515574080eec0b208868f89aa9f32b225d6efa4205e60a6298bda8151eb4a7d6cfb86df0 SHA512 f6aedf0db58c15163f6f08b37a5fef43a80655f5602d8ee856764177a33e2f5eb4c0b8a09e9f3ee5b36544039051909d48397be5793243eba5002526652dd194
+EBUILD gpg-ringmgr-1.12.ebuild 639 BLAKE2B 51afda4346efd8af8cc2593bee0ebbc500c169f140e74ef7379a5a48ad21044a0d882feb38e530c2c645e7c620f086c487dbb4019c934082491ac9a32fa4e864 SHA512 61b8711899704f0a6ff794392eafc26b896f7dc87451af1a19ae1aa08ec6b14ebf4e8266c5d6fbdc9bbb7158ed931966892f6e2c7c87357859c75db8819a7342
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild
new file mode 100644
index 000000000000..124c3167bb57
--- /dev/null
+++ b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="GPG Keyring Manager to handle large GPG keyrings more easily"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	>=app-crypt/gnupg-1.2.1"
+
+src_unpack() {
+	mkdir ${P}
+	cp "${DISTDIR}"/${PN} "${S}" || die
+}
+
+src_compile() {
+	pod2man "${S}"/${PN} >"${S}/"${PN}.1
+	pod2html "${S}"/${PN} >"${S}"/${PN}.html
+}
+
+src_install() {
+	dobin ${PN} || die
+	doman ${PN}.1
+	dohtml ${PN}.html
+}
diff --git a/app-crypt/gpg-ringmgr/metadata.xml b/app-crypt/gpg-ringmgr/metadata.xml
new file mode 100644
index 000000000000..a4e0d354f696
--- /dev/null
+++ b/app-crypt/gpg-ringmgr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gpgme-1.10.0 b/app-crypt/gpgme-1.10.0
deleted file mode 100644
index cf6123097270..000000000000
--- a/app-crypt/gpgme-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error-1.17:= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtcore:5 ) python? ( dev-lang/swig ) qt5? ( dev-qt/qttest:5 ) >=app-portage/elt-patches-20170422
-DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
-EAPI=6
-HOMEPAGE=http://www.gnupg.org/related_software/gpgme
-IUSE=common-lisp static-libs cxx python qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error-1.17:= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtcore:5 ) cxx? ( !<kde-apps/gpgmepp-4.14.11_pre20160611:4 !kde-apps/gpgmepp:5 !<kde-apps/kdepimlibs-4.14.10_p20160611:4 !=kde-apps/kdepimlibs-4.14.11_pre20160211*:4 )
-REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=1/11
-SRC_URI=mirror://gnupg/gpgme/gpgme-1.10.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1332d1c65dfa49d91eecb491715b7ad5
diff --git a/app-crypt/gpgme-1.11.1 b/app-crypt/gpgme-1.11.1
deleted file mode 100644
index 2dc7402c40c8..000000000000
--- a/app-crypt/gpgme-1.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error-1.29:= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtcore:5 ) python? ( dev-lang/swig ) qt5? ( dev-qt/qttest:5 ) >=app-portage/elt-patches-20170422
-DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
-EAPI=6
-HOMEPAGE=http://www.gnupg.org/related_software/gpgme
-IUSE=common-lisp static-libs cxx python qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error-1.29:= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtcore:5 ) cxx? ( !<kde-apps/gpgmepp-4.14.11_pre20160611:4 !kde-apps/gpgmepp:5 !<kde-apps/kdepimlibs-4.14.10_p20160611:4 !=kde-apps/kdepimlibs-4.14.11_pre20160211*:4 )
-REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=1/11
-SRC_URI=mirror://gnupg/gpgme/gpgme-1.11.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5600549a91ee5728965ec73ae814bb9
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
new file mode 100644
index 000000000000..359cf50a2f55
--- /dev/null
+++ b/app-crypt/gpgme/Manifest
@@ -0,0 +1,5 @@
+DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
+DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
+EBUILD gpgme-1.10.0.ebuild 2856 BLAKE2B 91de73844ba2c16d354d10aa6e1172365dbbbeddec97efabbcaa66bba316c86d357d24b3f0db8f34bd423f4976f5be25fe0dffe08eb8f881e7aa4395fd4c101c SHA512 a77cd079ba24dc9967a90ccf5278bd4d5991b10df9823d4c6bc6e7eea6b40fbed1fb067d69576ac6fdd7b6d26b02f4f0311c07c4d5c736ad3a431166d3344ee9
+EBUILD gpgme-1.11.1.ebuild 2858 BLAKE2B ecb8b064deee7e3f387768d48a128311afe7763c7683a0d4e8775357b259a35cf7b9937514f93463e9470e3fddb76b1870edb1addb03fdbd0f9ad006aaa8819e SHA512 d99dfba8c1d3a2ee1f60f59b626679140cceaac75674a607690ffbeb15db3dc8e3df541538984d1a2f01578dc6182fcc17fc44617b39c855ad9b25b1c7b8e506
+MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild
new file mode 100644
index 000000000000..c79592443168
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic libtool ltprune qmake-utils toolchain-funcs
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.0.2:=
+	>=dev-libs/libgpg-error-1.17:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-lang/swig )
+	qt5? ( dev-qt/qttest:5 )"
+RDEPEND="${COMMON_DEPEND}
+	cxx? (
+		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
+		!kde-apps/gpgmepp:5
+		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
+		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
+	)"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+pkg_setup() {
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b"
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	prune_libtool_files
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/gpgme/gpgme-1.11.1.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild
new file mode 100644
index 000000000000..4291744d3054
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic libtool ltprune qmake-utils toolchain-funcs
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.0.2:=
+	>=dev-libs/libgpg-error-1.29:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-lang/swig )
+	qt5? ( dev-qt/qttest:5 )"
+RDEPEND="${COMMON_DEPEND}
+	cxx? (
+		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
+		!kde-apps/gpgmepp:5
+		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
+		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
+	)"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+pkg_setup() {
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b"
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	prune_libtool_files
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/gpgme/metadata.xml b/app-crypt/gpgme/metadata.xml
new file mode 100644
index 000000000000..89e984954f11
--- /dev/null
+++ b/app-crypt/gpgme/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<use>
+		<flag name="common-lisp">Install common-lisp files</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/gpgstats-0.5-r1 b/app-crypt/gpgstats-0.5-r1
deleted file mode 100644
index afdff38116a2..000000000000
--- a/app-crypt/gpgstats-0.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-crypt/gpgme
-DESCRIPTION=GPGstats calculates statistics on the keys in your key-ring
-EAPI=6
-HOMEPAGE=http://www.vanheusden.com/gpgstats/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gpgme
-SLOT=0
-SRC_URI=http://www.vanheusden.com/gpgstats/gpgstats-0.5.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c96fbbf253336145c961ac7670f7f0ec
diff --git a/app-crypt/gpgstats/Manifest b/app-crypt/gpgstats/Manifest
new file mode 100644
index 000000000000..ac4d6e33ad99
--- /dev/null
+++ b/app-crypt/gpgstats/Manifest
@@ -0,0 +1,4 @@
+AUX gpgstats-0.5-flags.patch 668 BLAKE2B 5436cbb050c6f52edf74182127f2fc5e50c22808f3f8b80600c362ba652fd3b0ce927d9ead7f4ca28425046021b3e477e56a719bc63ab4a45b6e0025b259a00a SHA512 8f54993f957d8d93da495530dea25734f9e5fedc1d5dc17aa4b517daabc88f8162ab2565159a51daa203ef2b039e80122e009bd23dab862be87ad5a75e072546
+DIST gpgstats-0.5.tgz 6691 BLAKE2B 681a4bb06b4ab7156c35d81510238420121d1854d3f8f678fce6017331e2f9c6db9ea413f45dcce1570f917fd636a586ee816f998dbd17347473e1da964bd617 SHA512 273f08af37089eb43cee65fa06ff8023e1951fa4649bf208e01d6bc453e4131c11128b511c6cbd8396a7bd93722904e8930168656994e3d4d055024c3d5fb649
+EBUILD gpgstats-0.5-r1.ebuild 583 BLAKE2B 71fe5ed183451e7eeef40103188380c24303299f52f4857eafa020ed4dde035314be5e7d89545629314fc3814234642fbfd5a5c817bbbf7cef157dddf93226e0 SHA512 810bee4395d77df0d3cc70fce767a4c04e42c57eeaf0cf9e47e404dd861798cb9e1b5f0e04bff281b9c516f96846f8c063416386a8aaa28613b19b9647ed17e0
+MISC metadata.xml 315 BLAKE2B 9189293d4d9321f31a518c12d4ea70700ddc60d5fc1d89e5215cb2080c6ca2b9f2005b635a11dcfd3d75919f9d49f02f662e67cdb75d5addbc002502c3e0ceb9 SHA512 2b356b01e98ef77d3f356dbc758f08c0ea5438a0df80b2b2dc16c90cec34c437ec51b6f3b7f81ea321d9e42ac4016e7c9e83417e476c0ecb1b3741f709a469be
diff --git a/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch b/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch
new file mode 100644
index 000000000000..9a058ec48dbc
--- /dev/null
+++ b/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch
@@ -0,0 +1,25 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,18 @@
+ VERSION=0.5
+ 
+ DEBUG=-g # -fprofile-arcs -ftest-coverage # -pg -g
+-CXXFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG) `gpgme-config --cflags`
+-CFLAGS+=${CXXFLAGS}
+-LDFLAGS=-lstdc++ `gpgme-config --libs` $(DEBUG)
++CPPFLAGS+=-DVERSION=\"${VERSION}\" -D_FILE_OFFSET_BITS=64
++FLAGS+=-Wall $(DEBUG) `gpgme-config --cflags`
++CFLAGS+=${FLAGS}
++CXXFLAGS+=${FLAGS}
++LIBS=`gpgme-config --libs`
+ 
+ OBJS=error.o utils.o array.o iarray.o s.o
+ 
+ all: gpgstats
+ 
+ gpgstats: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o gpgstats
++	$(CXX) $(LDFLAGS) -Wall -W $(OBJS) -o gpgstats $(LIBS)
+ 
+ install: gpgstats
+ 	cp gpgstats /usr/bin
diff --git a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
new file mode 100644
index 000000000000..3c528ef3e7a2
--- /dev/null
+++ b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="GPGstats calculates statistics on the keys in your key-ring"
+HOMEPAGE="http://www.vanheusden.com/gpgstats/"
+SRC_URI="http://www.vanheusden.com/gpgstats/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="app-crypt/gpgme"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" DEBUG=
+}
+
+src_install() {
+	einstalldocs
+	dobin gpgstats
+}
diff --git a/app-crypt/gpgstats/metadata.xml b/app-crypt/gpgstats/metadata.xml
new file mode 100644
index 000000000000..0106d597ab3c
--- /dev/null
+++ b/app-crypt/gpgstats/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>crypto@gentoo.org</email>
+  <name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/hashalot-0.3-r2 b/app-crypt/hashalot-0.3-r2
deleted file mode 100644
index b5a0d28d1d22..000000000000
--- a/app-crypt/hashalot-0.3-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install test
-DESCRIPTION=CryptoAPI utils
-EAPI=0
-HOMEPAGE=http://www.kerneli.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.paranoiacs.org/~sluskyb/hacks/hashalot/hashalot-0.3.tar.gz
-_md5_=9cb9c0c56c1ccba0f70d17a58600ef1e
diff --git a/app-crypt/hashalot/Manifest b/app-crypt/hashalot/Manifest
new file mode 100644
index 000000000000..d7144b9bf274
--- /dev/null
+++ b/app-crypt/hashalot/Manifest
@@ -0,0 +1,3 @@
+DIST hashalot-0.3.tar.gz 80284 BLAKE2B 1ec902f917a1e3e5babb24ea8763360fff8d41ab0baa6fac8053313c2115bc03187fb805f6ae6c013eb7a4f8eb4111bc781d5ac04c275fdba87658f0346aa8fd SHA512 c9ee39cefce5cc73b9a3a67b240616db9b66cde94fa351e6ebd4d13fd0f9195de9021c07d223809107e50b0a091d0d55e4caf2f71bba93f6d0da86af10632145
+EBUILD hashalot-0.3-r2.ebuild 515 BLAKE2B f3c1b70595297071efb3b029d86f15b047b333003f064dc217af19813f113c21db2130b9f4b36c0b199be2324737c7d02499bd67771749e9d51b433134574af1 SHA512 6613cebb6b688c67eb2e08ea1d37962d6fa2fb2eaf5d750d356bf2aed32bcc3bcc4b99ce2a2bba82b674734b5ac50af4080370b4f4d11d04a16f1842e4668f94
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-crypt/hashalot/hashalot-0.3-r2.ebuild b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
new file mode 100644
index 000000000000..eddabd64838d
--- /dev/null
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="CryptoAPI utils"
+HOMEPAGE="http://www.kerneli.org/"
+SRC_URI="http://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND=""
+
+src_test() {
+	make check-TESTS || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install error"
+	dodoc ChangeLog NEWS README
+}
diff --git a/app-crypt/hashalot/metadata.xml b/app-crypt/hashalot/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-crypt/hashalot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/hashcat-4.0.1 b/app-crypt/hashcat-4.0.1
deleted file mode 100644
index 33dd1a0dc007..000000000000
--- a/app-crypt/hashcat-4.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile prepare test
-DEPEND=virtual/opencl
-DESCRIPTION=World's fastest and most advanced password recovery utility
-EAPI=6
-HOMEPAGE=https://github.com/hashcat/hashcat
-IUSE=custom-cflags video_cards_nvidia
-KEYWORDS=~x86 ~amd64
-LICENSE=MIT
-RDEPEND=virtual/opencl
-SLOT=0
-SRC_URI=https://github.com/hashcat/hashcat/archive/v4.0.1.tar.gz -> hashcat-4.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d544fbaec2a2066926806415d090a72c
diff --git a/app-crypt/hashcat-4.1.0 b/app-crypt/hashcat-4.1.0
deleted file mode 100644
index 1bcff7703406..000000000000
--- a/app-crypt/hashcat-4.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile prepare test
-DEPEND=virtual/opencl
-DESCRIPTION=World's fastest and most advanced password recovery utility
-EAPI=6
-HOMEPAGE=https://github.com/hashcat/hashcat
-IUSE=custom-cflags video_cards_nvidia
-KEYWORDS=~x86 ~amd64
-LICENSE=MIT
-RDEPEND=virtual/opencl
-SLOT=0
-SRC_URI=https://github.com/hashcat/hashcat/archive/v4.1.0.tar.gz -> hashcat-4.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e38fbcf80e160174cd586444ae69236
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
new file mode 100644
index 000000000000..eb2411974397
--- /dev/null
+++ b/app-crypt/hashcat/Manifest
@@ -0,0 +1,5 @@
+DIST hashcat-4.0.1.tar.gz 3905127 BLAKE2B 534270c7409f5a3dc4995a81fab63e6bfcd6b2bd4bb549f96b44e9c6bf24ce67505eb82803ace29fba69526c7c0703c66de9cc68cefcca79ef58040165041756 SHA512 7300b16ebd601fdbdbfd66adeba072c6f4f4dd5898dd85824513b97cc7848f4c2ae0fe523cfe7803fdba7954966ea289275fa5d49ff792706f73394e2bd95e77
+DIST hashcat-4.1.0.tar.gz 3956136 BLAKE2B f9d6f9322e4c50ee1e156c283da1257a24f0e2cb22618cf93b8b11dd1964f6741f409429ee904412f70301e4b2381b388bcab0296a30ea3a94569efe7aaaeec6 SHA512 c9e01847c89dd8521da8734ea324c69f1e9bfef50c059e9dc29d4b947fe090405774a57ae688f907698c7d9a2d1f087b730e0a994dc5ed0d5d937a9ef950dd73
+EBUILD hashcat-4.0.1.ebuild 1286 BLAKE2B b0b59548ed67a9b36d1459088722bc7c7be89b0a77fb82d92fa9d3871630184fbdbaffa0143d42e9b764a456317c02b4d9da3189bfc5226967cf33e9a3114d6b SHA512 d8700a5c15502370e29555cbf39209db75e46936ff5cf522c6a67a7839399cfa9000f667d49b6b04b6a88e6b9ec68e31fe56a930e809602eaf475e0fb7013b13
+EBUILD hashcat-4.1.0.ebuild 1286 BLAKE2B 97238cdc5fd31bc6dbc6c1d1d350effcc2e6a309524215cea15650d69f7abbd11a91d0c30c4ae50db94970349a3528753147d511b1088df8733149c7f2636ee4 SHA512 da135ef8fdda9ca5f4785e0d4151c9e60f77a086db9510b90412d396f80d232b2f1d7b828c1fbb48e619ea3f1d927e422eca62bff2350f37fd447a4456131bfb
+MISC metadata.xml 327 BLAKE2B 2f5c4cb3a51fe231059a9cf3b11875b9acc86dc51ccbd98e6f62fa85a3b546db1f5b6460e3be1ed26b239d5806c4dc787afb0cdf07b31b4a9330ab19339d3186 SHA512 024401252f35e93caa0ec7a48a7df7b71c18e4c7e71eb495f3ee5598fec5f3332c44fd3cf5d6b86d3d885649e6da15a8e7b5bac4e9205f552f8c8ec3f0fcd496
diff --git a/app-crypt/hashcat/hashcat-4.0.1.ebuild b/app-crypt/hashcat/hashcat-4.0.1.ebuild
new file mode 100644
index 000000000000..d867ebec2e8e
--- /dev/null
+++ b/app-crypt/hashcat/hashcat-4.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils multilib
+
+DESCRIPTION="World's fastest and most advanced password recovery utility"
+HOMEPAGE="https://github.com/hashcat/hashcat"
+SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="custom-cflags video_cards_nvidia"
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#do not strip
+	sed -i "/LFLAGS                  += -s/d" src/Makefile
+	#do not add random CFLAGS
+	sed -i "s/-O2//" src/Makefile || die
+	export PREFIX=/usr
+	export LIBRARY_FOLDER="/usr/$(get_libdir)"
+	eapply_user
+}
+
+src_compile() {
+	default
+	pax-mark -mr hashcat
+}
+
+src_test() {
+	if use video_cards_nvidia; then
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia-uvm
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
+		fi
+	#elif use vidia_cards_fglrx; then
+	#	addwrite /dev/ati
+	fi
+	#this always exits with 255 despite success
+	#./hashcat -b -m 2500 || die "Test failed"
+	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
+}
diff --git a/app-crypt/hashcat/hashcat-4.1.0.ebuild b/app-crypt/hashcat/hashcat-4.1.0.ebuild
new file mode 100644
index 000000000000..cd473accdb50
--- /dev/null
+++ b/app-crypt/hashcat/hashcat-4.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils multilib
+
+DESCRIPTION="World's fastest and most advanced password recovery utility"
+HOMEPAGE="https://github.com/hashcat/hashcat"
+SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="custom-cflags video_cards_nvidia"
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#do not strip
+	sed -i "/LFLAGS                  += -s/d" src/Makefile
+	#do not add random CFLAGS
+	sed -i "s/-O2//" src/Makefile || die
+	export PREFIX=/usr
+	export LIBRARY_FOLDER="/usr/$(get_libdir)"
+	eapply_user
+}
+
+src_compile() {
+	default
+	pax-mark -mr hashcat
+}
+
+src_test() {
+	if use video_cards_nvidia; then
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia-uvm
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
+		fi
+	#elif use vidia_cards_fglrx; then
+	#	addwrite /dev/ati
+	fi
+	#this always exits with 255 despite success
+	#./hashcat -b -m 2500 || die "Test failed"
+	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
+}
diff --git a/app-crypt/hashcat/metadata.xml b/app-crypt/hashcat/metadata.xml
new file mode 100644
index 000000000000..2f9493fe8e46
--- /dev/null
+++ b/app-crypt/hashcat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hashcat/hashcat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/heimdal-7.5.0 b/app-crypt/heimdal-7.5.0
deleted file mode 100644
index 8b5acb930126..000000000000
--- a/app-crypt/heimdal-7.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Kerberos 5 implementation from KTH
-EAPI=6
-HOMEPAGE=http://www.h5l.org/
-IUSE=afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd
-LICENSE=BSD
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
-SLOT=0
-SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.5.0/heimdal-7.5.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=bf55d18d6520e9434179706bda84d85c
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
new file mode 100644
index 000000000000..54c1180ec15f
--- /dev/null
+++ b/app-crypt/heimdal/Manifest
@@ -0,0 +1,14 @@
+AUX heimdal-kadmind.confd 151 BLAKE2B 1e916d248e9d93029e1e2a541c505c87f017e2a825383650dd8cf0e9c55d1740410312bf050270a382caef11250dbcf333724e5e73ce4ed4d2dacb53dbdb6a34 SHA512 2e2852fa6bebeb58da4bd80fb584339ab8c95fdc1e37f957045f9fcc9b212ccf61145d16c6f7a2fae6245e977200e48150f25bc4ac1d734692555ccfd9911810
+AUX heimdal-kadmind.initd-r2 427 BLAKE2B 55f0d458b28c889bce8a98ce58112124983c284918c1db1b877c095bd9f573d60ec035afe3182d5ae3f6d484af6fdd09b9efe01b73821921afac8509b65abbf4 SHA512 fd8cf77b7786a6b78d775be3ee769a31ec27a085f4e0764722948a02122e9a4ce52143eb1d3ac2acd7c74a5bee4432220155eb9a49bfbafc0c23431b18da64b2
+AUX heimdal-kcm.confd 130 BLAKE2B 5c182031eab38014f2f83c70989df31c9ddb664d166f2c92d93aac9cf352ac0975486d4edb8079cd77b74e52d480917297d00f966d0568b24ee70212e119de18 SHA512 dd70d57c3be5f0d4cf872463af1df6bec82774314e6462cd2433ff9fc4d2ff585210581c75bc76b33085e58b16e3ca795bbd531eba6b5f7a3f7f505b7e9ed50b
+AUX heimdal-kcm.initd-r1 463 BLAKE2B 1720ebeb9e1cafe137d420d0e66976a972e369c45f39ec4d4d41b9f4327a072824b277dc70ccf3da81f1cffed6b0c3d34cbc9f24da89b0221db107fb3cb60428 SHA512 f80e2543637f273aa38d2265e6c33dda21e1fd677e7ada3f8234dbbb295baf96e63d7bc25f2420f200191a041dc2abbac056acc405970d2ba862bec216f1b274
+AUX heimdal-kdc.confd 130 BLAKE2B d0cd1667fd48f4fa4fe3ea995e810919225c0976e76818fc32e197a9459f7750f69158889de887b22ed2743bfbd1f0c45460abaa8e6d77b80a2c05d5d94ca253 SHA512 817a3565948e75c01aaa3e8fd3d5d77715be4aecb51c33f61f0f4342fd8c4cfb458c20b71fb78d309becf600276cd5ea695c83e2cd17a9f99dd67f35d2c58b12
+AUX heimdal-kdc.initd-r2 434 BLAKE2B 2790f2d0732c8ff6d3c0dd0917322f33a1215d523db386465af4eea64b973674abd85ab27e83858d38726711f81ed9f72414de34d4a578f47cf3e34b6afe74ac SHA512 1698a29ff23aef6bcc83153076036297639f38e5b42f12a3f59324ecce3fe7483f99f84e2bc88d27f010d07ebec4f2758d0249a9cb5bd62be40c3e6cc79353c1
+AUX heimdal-kpasswdd.confd 148 BLAKE2B 74c70bf236789e8c87bfd928d9108f181ad31c254b02e4cf9b45ba925a2169d8ccb7bd59999f5e98f265020f0a5cffd03ac88ad39aedf0c305346821d9688afb SHA512 198d8f219abdd349213d26119e7cc343956981a5cb7d031186c81cb1a0b3f017097f4a429481089787b1cde6f8f013a8ee3909f6807f44b51531ac19a7a3a17e
+AUX heimdal-kpasswdd.initd-r2 448 BLAKE2B e9280b18c06ad50579eceec52fe7bb83630b868e5b3ec16bc6ba0bf80c04f303fb8405cb6a728be79052729076de4df4b85e08277198e75d3c0d3093c464680e SHA512 e7de18a197ec6d56fac61c3d014c9f7d5cc10e4ee6c7ee432f9e4658ad5feee7be6c26d175755863321bf927e082e9da34a576647eaa428c98cf80f9eaa99176
+AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0948437f20228aec0508788de30fe657765dfe3be3955680a8e006d4afdc1396c7810d26775bae936d72f927e14e8dbd46f SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e
+AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
+AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
+DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
+EBUILD heimdal-7.5.0.ebuild 4262 BLAKE2B 98fb0da16976776a277c511901b600d0b3c10e466b90d584afca30b338fb76c32a68a410fb5cc0e2c2e020f5e5ed9c8f9c8bb32b815796df40f3647b1e36652d SHA512 8bd03ef90c1366541be069a0327562ae189425141d441e5f37a8803f66d70debd7f067e09b3fb30985daa9e5fe74de3b3c99ee21541925d49edf8918c128d77b
+MISC metadata.xml 638 BLAKE2B f886a9862a4143b2c9f2a2e5af79c6ce72d23e883a2285f16ad22e61c8acc301f8a838b2fea65f42168edfda9a8652a420c01dc34482123d0ec6ccc6ef0a5ce9 SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f
diff --git a/app-crypt/heimdal/files/heimdal-kadmind.confd b/app-crypt/heimdal/files/heimdal-kadmind.confd
new file mode 100644
index 000000000000..5d75504a1402
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kadmind.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kadmind
+
+# Options to pass to the kadmind daemon.  Please see man 8 kadmind for details.
+#
+# OPTIONS="--keytab=/etc/krb5.keytab"
diff --git a/app-crypt/heimdal/files/heimdal-kadmind.initd-r2 b/app-crypt/heimdal/files/heimdal-kadmind.initd-r2
new file mode 100644
index 000000000000..694e6d1d9ad2
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kadmind.initd-r2
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net heimdal-kdc
+	after logger
+}
+
+start() {
+	ebegin "Starting Heimdal kadmind"
+		/usr/sbin/kadmind "${OPTIONS}" &
+		echo $! > /var/run/heimdal-kadmind.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Heimdal kadmind"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kadmind
+	eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kcm.confd b/app-crypt/heimdal/files/heimdal-kcm.confd
new file mode 100644
index 000000000000..8c156aa9b677
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kcm.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kcm
+
+# Options to pass to the kcm daemon.  Please see man 8 kcm for details
+#
+# OPTIONS="-c /etc/krb5.conf"
diff --git a/app-crypt/heimdal/files/heimdal-kcm.initd-r1 b/app-crypt/heimdal/files/heimdal-kcm.initd-r1
new file mode 100644
index 000000000000..88824dd7e34f
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kcm.initd-r1
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after heimdal-kdc
+}
+
+OPTIONS="${OPTIONS} --detach"
+
+start() {
+	ebegin "Starting Heimdal KCM..."
+	start-stop-daemon --start --pidfile /var/run/kcm.pid --exec /usr/sbin/kcm -- ${OPTIONS# }
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Heimdal KCM..."
+	start-stop-daemon --stop --pidfile /var/run/kcm.pid --retry SIGKILL/5
+	eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kdc.confd b/app-crypt/heimdal/files/heimdal-kdc.confd
new file mode 100644
index 000000000000..d33f663feccd
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kdc.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kdc
+
+# Options to pass to the kdc daemon.  Please see man 8 kdc for details
+#
+# OPTIONS="-c /etc/krb5.conf"
diff --git a/app-crypt/heimdal/files/heimdal-kdc.initd-r2 b/app-crypt/heimdal/files/heimdal-kdc.initd-r2
new file mode 100644
index 000000000000..8d3f4f4b60c6
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kdc.initd-r2
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+	after logger
+}
+
+OPTIONS="${OPTIONS} --detach"
+
+start() {
+	ebegin "Starting Heimdal kdc"
+	start-stop-daemon --start --quiet --exec \
+		/usr/sbin/kdc -- ${OPTIONS# }
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Heimdal kdc"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kdc
+	eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd.confd b/app-crypt/heimdal/files/heimdal-kpasswdd.confd
new file mode 100644
index 000000000000..7a3e808a9715
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kpasswdd.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kpasswdd
+
+# Options to pass to the kpasswdd daemon.  Please see man 8 kpasswdd for details.
+#
+# OPTIONS="-k /etc/krb5.keytab"
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r2 b/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r2
new file mode 100644
index 000000000000..a614c2232d85
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r2
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net heimdal-kdc
+	after logger
+}
+
+start() {
+	ebegin "Starting Heimdal kpasswdd"
+	start-stop-daemon --background --start --quiet --exec \
+		/usr/sbin/kpasswdd -- "${OPTIONS}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Heimdal kpasswdd"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kpasswdd
+	eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal_disable-check-iprop.patch b/app-crypt/heimdal/files/heimdal_disable-check-iprop.patch
new file mode 100644
index 000000000000..703fc7c94d46
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_disable-check-iprop.patch
@@ -0,0 +1,16 @@
+diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
+index ba9aff1..0bea2ed 100644
+--- a/tests/kdc/check-iprop.in
++++ b/tests/kdc/check-iprop.in
+@@ -31,6 +31,11 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ # SUCH DAMAGE. 
+ 
++# check-iprop is known to fail and there is no easy way out
++# http://article.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/5408
++# http://article.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/5409
++exit 77
++
+ top_builddir="@top_builddir@"
+ env_setup="@env_setup@"
+ objdir="@objdir@"
diff --git a/app-crypt/heimdal/files/heimdal_tinfo.patch b/app-crypt/heimdal/files/heimdal_tinfo.patch
new file mode 100644
index 000000000000..010a9037c7e6
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_tinfo.patch
@@ -0,0 +1,22 @@
+--- heimdal-1.5/configure.ac.orig	2011-08-01 12:49:33.554689000 +0200
++++ heimdal-1.5/configure.ac	2011-08-01 13:54:12.707009421 +0200
+@@ -444,7 +444,7 @@
+ #endif
+ ],[0,0,0,0,0])
+ 
+-AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses,[
++AC_FIND_FUNC_NO_LIBS(tgetent, tinfo ncurses curses termcap,[
+ #ifdef HAVE_TERMCAP_H
+ #include <termcap.h>
+ #endif
+--- heimdal-1.5/lib/libedit/configure.ac~	2011-07-30 22:43:29.000000000 +0200
++++ heimdal-1.5/lib/libedit/configure.ac	2011-08-01 13:54:30.657009419 +0200
+@@ -33,7 +33,7 @@
+ EL_MANTYPE
+ 
+ 
+-AC_CHECK_LIB(curses, tgetent,,
++AC_CHECK_LIB(tinfo, tgetent,,
+    [AC_CHECK_LIB(ncurses, tgetent,,
+       [AC_MSG_ERROR([libcurses or libncurses are required!])] )] )
+ 
diff --git a/app-crypt/heimdal/files/krb5.conf b/app-crypt/heimdal/files/krb5.conf
new file mode 100644
index 000000000000..906eb4d087d0
--- /dev/null
+++ b/app-crypt/heimdal/files/krb5.conf
@@ -0,0 +1,27 @@
+[libdefaults]
+        default_realm = MY.REALM
+#	clockskew = 300
+#	v4_instance_resolve = false
+#	v4_name_convert = {
+#		host = {
+#			rcmd = host
+#			ftp = ftp
+#		}
+#		plain = {
+#			something = something-else
+#		}
+#	}
+	
+[realms]
+	MY.REALM = {
+		kdc = MY.COMPUTER
+	}
+#	OTHER.REALM = {
+#		v4_instance_convert = {
+#			kerberos = kerberos
+#			computer = computer.some.other.domain
+#		}
+#	}
+
+[domain_realm]
+	.my.domain = MY.REALM
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
new file mode 100644
index 000000000000..58e1b3287d88
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -0,0 +1,173 @@
+# 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} )
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd"
+IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
+	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	caps? ( sys-libs/libcap-ng )
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt
+	)
+	!!app-crypt/mit-krb5
+	!!app-crypt/mit-krb5-appl"
+
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/krb5-types.h
+	/usr/include/cms_asn1.h
+	/usr/include/digest_asn1.h
+	/usr/include/hdb_asn1.h
+	/usr/include/krb5_asn1.h
+	/usr/include/pkcs12_asn1.h
+	/usr/include/pkinit_asn1.h
+	/usr/include/rfc2459_asn1.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
+	eapply "${FILESDIR}/heimdal_tinfo.patch"
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if use berkdb; then
+		myconf+=(
+			--with-berkeley-db
+			--with-berkeley-db-include="$(db_includedir)"
+		)
+	else
+		myconf+=(
+			--without-berkeley-db
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-kcm \
+		--disable-osfc2 \
+		--enable-shared \
+		--with-libintl=/usr \
+		--with-readline=/usr \
+		--with-sqlite3=/usr \
+		--libexecdir=/usr/sbin \
+		--enable-pthread-support \
+		$(use_enable afs afs-support) \
+		$(use_enable otp) \
+		$(use_enable pkinit kx509) \
+		$(use_enable pkinit pk-init) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with caps capng) \
+		$(multilib_native_use_with hdb-ldap openldap /usr) \
+		$(use_with ipv6) \
+		$(use_with ssl openssl /usr) \
+		$(multilib_native_use_with X x) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake -j1
+	else
+		emake -C include -j1
+		emake -C lib -j1
+		emake -C kdc -j1
+		emake -C tools -j1
+		emake -C tests/plugin -j1
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
+	else
+		emake -C include DESTDIR="${D}" install
+		emake -C lib DESTDIR="${D}" install
+		emake -C kdc DESTDIR="${D}" install
+		emake -C tools DESTDIR="${D}" install
+		emake -C tests/plugin DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog* README NEWS TODO
+
+	# client rename
+	mv "${D}"/usr/share/man/man1/{,k}su.1
+	mv "${D}"/usr/bin/{,k}su
+
+	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
+	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
+	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
+	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+	insinto /etc
+	newins "${S}"/krb5.conf krb5.conf.example
+
+	if use hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/lib/hdb/hdb.schema"
+	fi
+
+	prune_libtool_files
+
+	# default database dir
+	keepdir /var/heimdal
+}
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
new file mode 100644
index 000000000000..0862feb8ed96
--- /dev/null
+++ b/app-crypt/heimdal/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kerberos@gentoo.org</email>
+		<name>Kerberos</name>
+	</maintainer>
+	<longdescription>Kerberos 5 implementation from KTH</longdescription>
+	<use>
+		<flag name="otp">
+		Adds support for one-time passwords
+	</flag>
+		<flag name="pkinit">
+		Adds support for PKINIT for the initial ticket
+	</flag>
+		<flag name="hdb-ldap">
+		Adds support for LDAP as a database backend
+	</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">heimdal/heimdal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/hmaccalc-0.9.14 b/app-crypt/hmaccalc-0.9.14
deleted file mode 100644
index c470a5729590..000000000000
--- a/app-crypt/hmaccalc-0.9.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/nss sys-devel/prelink
-DESCRIPTION=Tools for computing and checking HMAC values for files
-EAPI=6
-HOMEPAGE=https://pagure.io/hmaccalc
-IUSE=+fips abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/nss sys-devel/prelink
-SLOT=0
-SRC_URI=https://releases.pagure.org/hmaccalc/hmaccalc-0.9.14.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fcc1a6b0aba44f8c460a60330346c53b
diff --git a/app-crypt/hmaccalc/Manifest b/app-crypt/hmaccalc/Manifest
new file mode 100644
index 000000000000..ab5e901a0f59
--- /dev/null
+++ b/app-crypt/hmaccalc/Manifest
@@ -0,0 +1,3 @@
+DIST hmaccalc-0.9.14.tar.gz 111893 BLAKE2B 30aebd67e49db354c616110477e78fd6923df3ddfbe5e5023fd791bd90c783031da8c631fbfc9e5f2bdae06a08da1d56a08df921ddee359b630c5665e833ad4e SHA512 688a72b4e534ca4a1d45a116c0361ffd389de93dfdeec68e35cbffe0be13832789abaf33300003e12c7317ba473d3a0415f4b22cb3b7b36946c04bd40aa49184
+EBUILD hmaccalc-0.9.14.ebuild 570 BLAKE2B ba3b4eae888ea54a913ecf6032b28963b2ac52f26d61686a082f3bf224c5ec2e3802c799d06d1701027b3ae9d392f0b116a7d75e4e82659c1790566f1466854d SHA512 b0a6335a64fde93f59be97e62de212333dd8c446eb9b564117b9fcabf5d5d5a4ee629b6dcd83b58dd57411119b50c3ee2c068a4c782d3388f5b00078aa67698b
+MISC metadata.xml 671 BLAKE2B 276b40259996c8556788b1aecc645cd2e344908e8705d4b73771401a07eb1a75132d81589ef046ad7e1b72d4421251a9690e10668d43a67a0cb925be58835e77 SHA512 d4bb7d03ed78f667255e38138262ccdfe33c42707e967817c52d8f445552b9502d6ed1a10a96df7e20cc62f7fa06c2285057a2f81cff1004b28c6e0c20fb17b7
diff --git a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
new file mode 100644
index 000000000000..08448ab7923e
--- /dev/null
+++ b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal
+
+DESCRIPTION="Tools for computing and checking HMAC values for files"
+HOMEPAGE="https://pagure.io/hmaccalc"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fips"
+
+DEPEND="dev-libs/nss
+		sys-devel/prelink"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-sum-directory=/usr/$(get_libdir)/${PN}/ \
+		$(use_enable !fips non-fips)
+}
diff --git a/app-crypt/hmaccalc/metadata.xml b/app-crypt/hmaccalc/metadata.xml
new file mode 100644
index 000000000000..6557d925ad15
--- /dev/null
+++ b/app-crypt/hmaccalc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>crypto@gentoo.org</email>
+<name>Crypto</name>
+</maintainer>
+<use>
+<flag name="fips">Enable NSS FIPS mode and support only the FIPS-compliant functions</flag>
+</use>
+<longdescription>
+hmaccalc can be used to compute HMAC (hash-based message authentication code)
+values for files. An HMAC is similar in concept to a message digest, except in
+that its calculation also incorporates a key which must be known to both the
+party generating the HMAC and the party verifying the HMAC. 
+</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/ima-evm-utils-0.2 b/app-crypt/ima-evm-utils-0.2
deleted file mode 100644
index d177c42d3e98..000000000000
--- a/app-crypt/ima-evm-utils-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-apps/keyutils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Supporting tools for IMA and EVM
-EAPI=5
-HOMEPAGE=http://linux-ima.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/keyutils
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-ima/ima-evm-utils-0.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d9558fa81bf2d1a68e15f3bb10cb408a
diff --git a/app-crypt/ima-evm-utils-0.8 b/app-crypt/ima-evm-utils-0.8
deleted file mode 100644
index 020b421ecc53..000000000000
--- a/app-crypt/ima-evm-utils-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-apps/keyutils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Supporting tools for IMA and EVM
-EAPI=5
-HOMEPAGE=http://linux-ima.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/keyutils
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-ima/ima-evm-utils-0.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=96a31a1a3d838f2181d45d1279b86902
diff --git a/app-crypt/ima-evm-utils-1.0 b/app-crypt/ima-evm-utils-1.0
deleted file mode 100644
index fef3c0eb3f24..000000000000
--- a/app-crypt/ima-evm-utils-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-apps/keyutils app-text/docbook-xsl-stylesheets >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Supporting tools for IMA and EVM
-EAPI=6
-HOMEPAGE=http://linux-ima.sourceforge.net
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/keyutils
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-ima/ima-evm-utils-1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=75bc448ba75a290da1d7cc087afaa681
diff --git a/app-crypt/ima-evm-utils-9999 b/app-crypt/ima-evm-utils-9999
deleted file mode 100644
index 90de9ce90793..000000000000
--- a/app-crypt/ima-evm-utils-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/openssl:0= sys-apps/keyutils app-text/docbook-xsl-stylesheets >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Supporting tools for IMA and EVM
-EAPI=6
-HOMEPAGE=http://linux-ima.sourceforge.net
-IUSE=debug
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0= sys-apps/keyutils
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=85973b937e4494194ef17ffb008b2f7f
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
new file mode 100644
index 000000000000..2dde70f59750
--- /dev/null
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -0,0 +1,8 @@
+DIST ima-evm-utils-0.2.tar.gz 16329 BLAKE2B 6682d42d7e5801adf49a253fbcbbfbb9f66387e78e27fa8fa301a4cd6da904d0666b5f2011df7791dfc7c0e05cebe90fa20d7a103254141b6fbcd2c1a56aa334 SHA512 44d5ead01d0d1241d743a8545a619308a1988f2188384571d7d37dca567598f46d1d7d8b8a6ba3fdaf5b5e980f4c8a80f1c098ec4dadf082393a727f7a266229
+DIST ima-evm-utils-0.8.tar.gz 32025 BLAKE2B 4635c737257bba7b5aa7ca5b9b27e57a3cb16c7730bcd752602923c84e0f6e4c56e7de9099fcde6e6ae479fcfdb3b6c3251aeeb2872ecbc9430977f7f77fce7e SHA512 cfa90963426c9adfaa3b61e31c1b63d87407a1dfadd39d4c00f5c16b2b312d7535159c84c7f1854bb143147b5b097ef41dde22f8bba30555eecd8ed0255f3630
+DIST ima-evm-utils-1.0.tar.gz 35601 BLAKE2B 990e58e16923988d678cf1e1b588a2bc025b37cf94bda446e256640a9a1114f710b242dad9839767fb3570d593f8da7a31b39b92bf5acb6a5629e074513995e7 SHA512 f7edec4c2cd0f72291045c0096d198bff49bf892f5c5f7bf772f104613295e7522e96cccb89261c0ac035b0265c9574c14758359ab84c47180095630cf60802a
+EBUILD ima-evm-utils-0.2.ebuild 648 BLAKE2B 0adf4addc331065e8ee18e7e3f541d4377ebb8a49d5bec184211fac0a59f5ef1c69435ccc36c38b3bd40eba80d63aa68d016db8ee7c1b43cf1aec9321782dfa6 SHA512 c0b554baba358548e12cb82375c6b0bebfebfcfffce553e5d0efac779a2ec498d355e39377b3ff56cf9f2ac0896ad10db433dd9fe8e006741fe6d7d77a399eca
+EBUILD ima-evm-utils-0.8.ebuild 648 BLAKE2B 9a75d8548fbb18a0b7d830c1d8815024dd7c9791da50182ad926da8b8b57b69de883f3d8746566224f59f041d937e6f418619d856a81d9de58d472eb8ebc27f7 SHA512 041926b0b5f24446810ae458d8d3f63130fb2b1a87f35e00962191e4c4ae5d8b51608fd0f0980601f6b858ecdf5b97364b0846d9a722846e13115f50f0257539
+EBUILD ima-evm-utils-1.0.ebuild 701 BLAKE2B f54badac76413e9eb3c05f832d8907d88dbd933f866992362dd9a1501bf3385243638d90620014271ae0e3953d9f7d38e98931c3f2bd5fab1ae786961a8d738b SHA512 8770aad2f0d0a60058a91d28214264fc1256d2945c2dcec4894de2fa067d764b37bd7be2f6278a889681d9b2c4419e47074b5126888e2d30b32693365c191a31
+EBUILD ima-evm-utils-9999.ebuild 715 BLAKE2B c4801b96be72fc7852b5977c294ab8ac4583bfd20b36e49748d47d0ccfab47531b3a762b2a27c7ab3132ac8b863965a02bdd9a6ea4012d5090f57cb8809e5172 SHA512 312b5ad08de34c00f77d7db17d80eaa482c35a3079c09baa851a31423882734657556e908f3f9996770dcef4dd809eea5383370e91dc5419a6980001d7bcaea0
+MISC metadata.xml 519 BLAKE2B a421147d697524cfafe22995d14069d21eec1e0b134aee40ac014d9be716608800c6096c50d20ad9c77da00a10123b8900ae7eeb50997ab4cc9f136d4217d719 SHA512 d207f51e8723c1c36f4b6bdbf514977004da3af6e0ba1e1425b9cf3155562beaca233153549fb6e9007c6608bea180215a6918c484438ea31522a15aa00dd258
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild
new file mode 100644
index 000000000000..5f3ac2d1c0bb
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI="mirror://sourceforge/linux-ima/${P}.tar.gz"
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -i 's:pkglib_PROGRAMS:pkglibexec_PROGRAMS:g' tests/Makefile.am
+	sed -i 's:pkglib_SCRIPTS:pkglibexec_SCRIPTS:g' tests/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	econf || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild
new file mode 100644
index 000000000000..94811723d9db
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI="mirror://sourceforge/linux-ima/${P}.tar.gz"
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -i 's:pkglib_PROGRAMS:pkglibexec_PROGRAMS:g' tests/Makefile.am
+	sed -i 's:pkglib_SCRIPTS:pkglibexec_SCRIPTS:g' tests/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	econf || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.0.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.0.ebuild
new file mode 100644
index 000000000000..3a4552f1e3c9
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI="mirror://sourceforge/linux-ima/${P}.tar.gz"
+
+RDEPEND="sys-apps/keyutils"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+src_prepare() {
+	eapply_user
+
+	sed -i '/^MANPAGE_DOCBOOK_XSL/s:/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl:/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
new file mode 100644
index 000000000000..6252285e3f18
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools git-r3
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+EGIT_REPO_URI="git://git.code.sf.net/p/linux-ima/ima-evm-utils"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-apps/keyutils"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+src_prepare() {
+	default
+
+	sed -i '/^MANPAGE_DOCBOOK_XSL/s:/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl:/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
new file mode 100644
index 000000000000..b45a890a4174
--- /dev/null
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>swift@gentoo.org</email>
+		<name>Sven Vermeulen</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
+	<longdescription lang="en">
+Supporting tools for IMA and EVM
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">linux-ima</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/jacksum-1.7.0 b/app-crypt/jacksum-1.7.0
deleted file mode 100644
index cc0ef6fd0cd7..000000000000
--- a/app-crypt/jacksum-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.3.1 dev-java/ant-core app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java utility for computing and verifying checksums: CRC*, MD*, etc.
-EAPI=0
-HOMEPAGE=http://www.jonelo.de/java/jacksum/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.3.1 >=dev-java/java-config-2.2.0-r3 >=sys-apps/portage-2.1.2.7
-SLOT=0
-SRC_URI=mirror://sourceforge/jacksum/jacksum-1.7.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=14628fcf634fe31013bb470968dcf5ce
diff --git a/app-crypt/jacksum/Manifest b/app-crypt/jacksum/Manifest
new file mode 100644
index 000000000000..52eb53bdd44f
--- /dev/null
+++ b/app-crypt/jacksum/Manifest
@@ -0,0 +1,3 @@
+DIST jacksum-1.7.0.zip 446595 BLAKE2B 8460efbd43563b19030abbd991e2dd88e3388d39f7ef1bf8decf8a4094973df266ee62e47a42e0653c16c04f94b61445a258dde404aa7255841b1d2da88c7761 SHA512 dc3f96e39fed4f2ca3a7b41bd8a6685cf96673293ff12f3858707a2d61144d74fb89db0218ed1a04164173e2d7fa6d1b973b68ca4c138213ca7f03e03628f21b
+EBUILD jacksum-1.7.0.ebuild 736 BLAKE2B 9e92fcb0bc03fab6bbce1c66c7c61e14ef70cc4e0f9d026cf2f1d0a00aa4d26bdd8e0c7f0ab4787e54e5bef661810cdd762bd7001b9af549dcf85bcdcc4b4e9f SHA512 fc02d6de044377ebb1bf0e6e3fae87d45f253045789dd9d0050a19d8b58a47c9ee475d8fa1033c02e66345f9ae8b60413cb545de28d9ddbf21498defeab34177
+MISC metadata.xml 313 BLAKE2B d6ff5aa7f2435cd1c20c266ccec13ed6f1a3a20ec7a491053acdce6eb699bdf564a47cb8d2db7d1c41f7887cc5546de8a0603b69571087320481bb5844647509 SHA512 e2c52edb5560223fc1abe958eca1d02e7a42c143c324c898479d6354f03898a38549831d25968ddf48d480c4aedd7430560cc22555dc7582acf07d87481dd06e
diff --git a/app-crypt/jacksum/jacksum-1.7.0.ebuild b/app-crypt/jacksum/jacksum-1.7.0.ebuild
new file mode 100644
index 000000000000..1a8ef9ae2ccc
--- /dev/null
+++ b/app-crypt/jacksum/jacksum-1.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java utility for computing and verifying checksums: CRC*, MD*, etc."
+HOMEPAGE="http://www.jonelo.de/java/jacksum/"
+SRC_URI="mirror://sourceforge/jacksum/${P}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.3.1
+	dev-java/ant-core
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.3.1"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unzip -qq source/${PN}-src.zip || die "failed to unpack source"
+	rm *.jar
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dodoc history.txt readme.txt help/${PN}/*
+
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+}
diff --git a/app-crypt/jacksum/metadata.xml b/app-crypt/jacksum/metadata.xml
new file mode 100644
index 000000000000..897e2a4d8850
--- /dev/null
+++ b/app-crypt/jacksum/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jacksum</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/jetring-0.25 b/app-crypt/jetring-0.25
deleted file mode 100644
index 4e84ccfcce69..000000000000
--- a/app-crypt/jetring-0.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-crypt/gnupg
-DESCRIPTION=GPG keyring maintenance using changesets
-EAPI=5
-HOMEPAGE=http://joeyh.name/code/jetring/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/gnupg dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.25.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b44891adeda657cf64ec8895c97f9d2d
diff --git a/app-crypt/jetring/Manifest b/app-crypt/jetring/Manifest
new file mode 100644
index 000000000000..d28eb12420fa
--- /dev/null
+++ b/app-crypt/jetring/Manifest
@@ -0,0 +1,4 @@
+AUX jetring-0.21-parallel.patch 762 BLAKE2B 0cdb8e21c3afcf17fdf8dc2eb3c9d9728c1139f0599572168b00cc95581f4c84072b2b3c15f188a120c65d1d9ac678ff1b7721b6e3afc62796849697ce623c1f SHA512 67f866eb53bf6aab22ff955a8ecc4ae9907f2b6cc430e12c5183a18c23488b53ec1de8271dc853f1a429463228f80aa2f90b6161a5350bc6d85db50de95a5f0b
+DIST jetring_0.25.tar.xz 208944 BLAKE2B 417565c1590f677542f81b6f457482ff1c8219317b90d12666a8b497608f5ee16466c03f68d8c4424c4bb92a0713fefb243dc621eee9cd10f7cf3495590143bd SHA512 aa9de0c7c034093789bf74c75533e678b0822cf0d1261d1b906fd5ef2decb41654bf2facc5c06b469367bb1a0fea4c862c0836fd00635779a2e8dd4f3c08ff46
+EBUILD jetring-0.25.ebuild 595 BLAKE2B a451df5ba0382a63c325eb549e27b5429f0c0f396cbd12828abf372d4691768adbdd5ddbfb588959454361c67cf49151ccda3a6469c1ad72a4731fd4ab80700a SHA512 43f69b5b8ce3550ac8d178ae12f6284956c29440eebbeedf2ddac1daedba1984f2765f17336c18b8d436b5318e3a9a3e9970f2c1597947c41df205497eaebb90
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/jetring/files/jetring-0.21-parallel.patch b/app-crypt/jetring/files/jetring-0.21-parallel.patch
new file mode 100644
index 000000000000..af5605fe0c82
--- /dev/null
+++ b/app-crypt/jetring/files/jetring-0.21-parallel.patch
@@ -0,0 +1,31 @@
+From 4554254608c97aed3f9e654ca219c53e3c4e2ec1 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 21 Feb 2016 18:47:46 +0100
+Subject: [PATCH] Address make warning "jobserver unavailable"
+
+To be precise:
+make[1]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6e62bda..43a14b7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,10 +3,10 @@ PROGS=jetring-accept jetring-apply jetring-build jetring-diff \
+ 	jetring-checksum
+ 
+ build:
+-	make -C example build
++	$(MAKE) -C example build
+ 
+ clean:
+-	make -C example clean
++	$(MAKE) -C example clean
+ 
+ install:
+ 	install -d $(DESTDIR)/usr/bin/
+-- 
+2.7.1
+
diff --git a/app-crypt/jetring/jetring-0.25.ebuild b/app-crypt/jetring/jetring-0.25.ebuild
new file mode 100644
index 000000000000..04664bb5eb51
--- /dev/null
+++ b/app-crypt/jetring/jetring-0.25.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="GPG keyring maintenance using changesets"
+HOMEPAGE="http://joeyh.name/code/jetring/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.21-parallel.patch
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}/
+	doins -r example
+
+	doman ${PN}*.[0-9]
+}
diff --git a/app-crypt/jetring/metadata.xml b/app-crypt/jetring/metadata.xml
new file mode 100644
index 000000000000..6d2298876faa
--- /dev/null
+++ b/app-crypt/jetring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/jitterentropy-2.1.1 b/app-crypt/jitterentropy-2.1.1
deleted file mode 100644
index 7d2cc011aa48..000000000000
--- a/app-crypt/jitterentropy-2.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Hardware RNG based on CPU timing jitter
-EAPI=7
-HOMEPAGE=https://github.com/smuellerDD/jitterentropy-library
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/gktrk/jitterentropy-library/archive/v2.1.1.tar.gz -> jitterentropy-2.1.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c7731779a74436f6d6e515e20036d761
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
new file mode 100644
index 000000000000..5e9f6c5f9b6e
--- /dev/null
+++ b/app-crypt/jitterentropy/Manifest
@@ -0,0 +1,4 @@
+AUX jitterentropy-2.1.1-destdir-fix.patch 1542 BLAKE2B c9ad6221194de1076d14a7c4885d18520383cbb155ff13c3e19e453c7a87b30145950cbc07475d4cdc2a3c7be8710009719820c7634e25b5a53a9dab49616d8d SHA512 25113f85ecc3f2e010906b23a6e70ff616053256ff1a1ce91b9e7210d88bc0938d34696dfce884e381eb7a8993b4787bad6048361b851150c65198bfb8772d80
+DIST jitterentropy-2.1.1.tar.gz 23804 BLAKE2B e208c87b414939485c16c6e94460020164e77089d5ac69f8627f8f1dfb38f211ff985c7fa5d32f647f1b06f065f86dc9070aea9b481e8251ecdecbfb4724ce08 SHA512 fb1b76278e03f425be06c8b66532e3997a07f91645393317f42681b1113bd31dfdf348bd18c92d0dfc153c85b75f8f968fe070e988f1a02e4ef4e09435b6cef8
+EBUILD jitterentropy-2.1.1.ebuild 949 BLAKE2B 99ca327ca1bcfadbae60c43c7c97fbc4ae15586dfe60ceb019760ccf57109c82ac1947e705dd43c8158039b9f4c62fdef72685a496cf2f1939486c3a5aec1484 SHA512 fd5729d9bb41c5b78651a1922791e21de461500f98632df4b55e638c665756ff7c47720751be352641578c1331cdd499fb261f8afaccbc9fc2b8a278b2d67e12
+MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch b/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch
new file mode 100644
index 000000000000..cdcc2a57756f
--- /dev/null
+++ b/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch
@@ -0,0 +1,37 @@
+From 4b5dc596547e0833e2cccf65efa46ecbe7d0b99c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Fri, 6 Jul 2018 14:41:52 -0400
+Subject: [PATCH] Makefile: add support for $(DESTDIR) in install target
+
+Allow install target to install into an arbitrary root instead of '/'
+by prefixing $(PREFIX) with $(DESTDIR).
+---
+ Makefile | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c38b800..2c778f2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -44,11 +44,13 @@ scan:	$(OBJS)
+ 	scan-build --use-analyzer=/usr/bin/clang $(CC) -shared -Wl,-soname,lib$(NAME).so.$(LIBMAJOR) -o lib$(NAME).so.$(LIBVERSION) $(OBJS) $(LDFLAGS)
+ 
+ install:
+-	install -m 644 doc/$(NAME).3 $(PREFIX)/share/man/man3/
+-	gzip -9 $(PREFIX)/share/man/man3/$(NAME).3
+-	install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(PREFIX)/$(LIBDIR)/
+-	$(RM) $(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+-	ln -s lib$(NAME).so.$(LIBVERSION) $(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
++	install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
++	install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
++	gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
++	install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
++	$(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
++	ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+ 
+ clean:
+ 	@- $(RM) $(NAME)
+-- 
+2.17.0
+
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
new file mode 100644
index 000000000000..70e643f40806
--- /dev/null
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hardware RNG based on CPU timing jitter"
+HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
+SRC_URI="https://github.com/gktrk/jitterentropy-library/archive/v2.1.1.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1-destdir-fix.patch
+)
+
+S="${WORKDIR}/${PN}-library-${PV}"
+
+src_prepare() {
+	default
+
+	# Disable man page compression on install
+	sed -e '/\tgzip.*man/ d' -i Makefile || die
+	# Let the package manager handle stripping
+	sed -e '/\tinstall.*-s / s/-s //g' -i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="$(get_libdir)" \
+		  DESTDIR="${D}" install
+	dosym lib${PN}.so.${PV} "/usr/$(get_libdir)"/lib${PN}.so
+	doheader ${PN}.h ${PN}-base-user.h
+}
diff --git a/app-crypt/jitterentropy/metadata.xml b/app-crypt/jitterentropy/metadata.xml
new file mode 100644
index 000000000000..4cf1945b408e
--- /dev/null
+++ b/app-crypt/jitterentropy/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>gokturk@gentoo.org</email>
+	<name>Göktürk Yüksek</name>
+</maintainer>
+<longdescription>
+	The Jitter RNG provides a noise source using the CPU execution
+	timing jitter. It does not depend on any system resource other
+	than a high-resolution time stamp. It is a small-scale, yet
+	fast entropy source that is viable in almost all environments
+	and on a lot of CPU architectures.
+</longdescription>
+<upstream>
+	<remote-id type="github">smuellerDD/jitterentropy-library</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-crypt/johntheripper-1.7.9-r10 b/app-crypt/johntheripper-1.7.9-r10
deleted file mode 100644
index a629140532f0..000000000000
--- a/app-crypt/johntheripper-1.7.9-r10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
-DESCRIPTION=fast password cracker
-EAPI=5
-HOMEPAGE=http://www.openwall.com/john/
-IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
-REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )
-SLOT=0
-SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
-_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f0cce98648753b0d3eb4ca9c1ed83c06
diff --git a/app-crypt/johntheripper-1.7.9-r11 b/app-crypt/johntheripper-1.7.9-r11
deleted file mode 100644
index 3171ebc5131a..000000000000
--- a/app-crypt/johntheripper-1.7.9-r11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
-DESCRIPTION=fast password cracker
-EAPI=6
-HOMEPAGE=http://www.openwall.com/john/
-IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
-REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )
-SLOT=0
-SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
-_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4f7f4dc46dd529e13cbd0bd0601002d0
diff --git a/app-crypt/johntheripper-1.7.9-r6 b/app-crypt/johntheripper-1.7.9-r6
deleted file mode 100644
index f7fcdffc8797..000000000000
--- a/app-crypt/johntheripper-1.7.9-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-libs/zlib !minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl )
-DESCRIPTION=fast password cracker
-EAPI=4
-HOMEPAGE=http://www.openwall.com/john/
-IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl )
-REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal )
-SLOT=0
-SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c6caf12db82e5edcd44689ffa315eede
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
new file mode 100644
index 000000000000..3d3102bc33b3
--- /dev/null
+++ b/app-crypt/johntheripper/Manifest
@@ -0,0 +1,10 @@
+AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 BLAKE2B b682dff0bb3675c5d59a93e927cd47ee0d1ed3d2a31cffd855f2db6924dda70b243bbd6d575d22e8e9aa9588f4b377547feecbaf0db8d6ed25006e269dde8bd9 SHA512 7aac967890dd57a67b6248722cefe9764e6ddfb280cb06f511e3f71e16527689098d39a80c32316f343030e3e5161e0e0003b83f95707b6a89dbf590fa5256a4
+AUX johntheripper-1.7.6-cflags.patch 2927 BLAKE2B e013afb4e669b5185b8020e6d65014809b2df8c9e2cbcb6c8508dddc7012468dc13e050720afe4925453ca0fed068d664184fbf70c94ab750f59895bfb0aab2f SHA512 47d9f074c9a639caf2366c425220f03c4daf882cbac3d86fa2649a5b12de3784713800be0f719a37b0b92c0c4b0a36ded247c351f894514cfa8fe67a0e23c732
+AUX johntheripper-1.7.9-clang.patch 454 BLAKE2B 96a7ffadcb23ba7979e05a796fafb8f22c1189a3f99de4145f0dc5ce95d492cc69b4cefa881ee8fc66573b069b69a408937faa6ecb2b5462390080302157252c SHA512 8fe7579f9ff27e43d1d42287823a8c885b8095600a076cb5807c4fb9f94798e730b817a56f8e3120a762959d06a09e9a4e312656bea4cee858198ae4cff0b5e7
+AUX johntheripper-1.7.9-ppc-compile-fix.patch 444 BLAKE2B 0bbbe937851272ba3a06c7c521c4cf24d092d66816f65eabd9800bb0c968e0a191fa7ccd2ccb2a87c0b540e8910a5f4c8978d7692cfba775b1f64471078ec013 SHA512 4af86bb0c5bfc4d88914f195744a596a71236fa49340b47748974a242fde82266fb6bfb41cb266980a3367b1c1a3797960f057a42c5ece3cdc09229c5a4a1513
+DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a
+DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b
+EBUILD johntheripper-1.7.9-r10.ebuild 6458 BLAKE2B d340065c06216ab2cbe9b1ceb04f015f0f31e507751c03862031a6d7a5fb10aa0a2fc9c0467136a81419c0068317e73f5840fb377d04b3236d617166863813ff SHA512 8f501299c07785dd117729a0b7140c06f95c821079ea3aaa8012d0915ba74e248de7a9da33e462ace27ad93298f0f08261689c5bccbf7df07e86fd13c4faa641
+EBUILD johntheripper-1.7.9-r11.ebuild 6502 BLAKE2B d35cbc0d684d91a4f6221a61d479f7353b9aae8b4a5d03ed06fbddcb862e870ed1e4a0ebacd57207fcb3e8ebc5ddc1b04dc46a9749c70c740fb584cc2f888ebf SHA512 3c622e14aa90edef71ee68efeb514d7a99c94b8759b621f6b6a4f06fc60867b612c9ba9c4c5ebc92966efd28c25177eb1464923ba77006569ca5de51a86e0f96
+EBUILD johntheripper-1.7.9-r6.ebuild 6006 BLAKE2B d946da54f070891fa7073a7b726e572a069f36af06ff728547aed74184b3da2467a00b1fc570dcedce51ba83b1baf0343e3eeb95b126a92a43c9469ee2b4d622 SHA512 c9d890a764acc3e6231203c486da1870d31c70596e8543cfae61bf276c6cc08bac5b211946b1ec78644a1b6307ac854d3dc046fce3e89e294ee6210c9d7b1a90
+MISC metadata.xml 698 BLAKE2B 7e709eafa3152cd9d689e662a4d1cdeb2049ea3bae4092da5c4a8e777ee0d15f10d26e9b546fa82a8cc0ea567983842b4caa65746b29fa365637b085eecbdd6d SHA512 148a01668f397d5e9cceacd4eb7ec903da251db713ce31a5a82d1e57af2aecbf9483f07226776039c3886ce96bc064199277e1d8af26679ae27630bb65d35feb
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
new file mode 100644
index 000000000000..5600f3cc17ec
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
@@ -0,0 +1,12 @@
+diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c
+--- john-1.7.3.1.org/src/path.c	2003-10-01 04:26:25.000000000 +0300
++++ john-1.7.3.1/src/path.c	2007-11-10 15:53:23.000000000 +0200
+@@ -55,7 +55,7 @@ void path_init(char **argv)
+ #ifdef JOHN_PRIVATE_HOME
+ 	private = path_expand(JOHN_PRIVATE_HOME);
+ 	if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
+-		if (errno != EEXIST) pexit("mkdir: %s", private);
++		if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private);
+ 	} else
+ 		fprintf(stderr, "Created directory: %s\n", private);
+ #endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
new file mode 100644
index 000000000000..4b6637a29d8f
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
@@ -0,0 +1,83 @@
+--- Makefile	2010-07-18 15:27:51.000000000 -0400
++++ Makefile.mine	2010-07-18 15:30:09.000000000 -0400
+@@ -629,7 +629,7 @@
+ macosx-ppc32-altivec:
+ 	$(LN) ppc32alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+-		CFLAGS="-c -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \
+ 		OPT_NORMAL="-fast -mcpu=7450" \
+ 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
+ 
+@@ -638,7 +638,7 @@
+ 	$(LN) ppc32alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc" \
+ 		OPT_NORMAL="-fast -mcpu=7450" \
+ 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
+@@ -650,7 +650,7 @@
+ 	$(LN) ppc32.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		CC=cc \
+-		CFLAGS="-c -traditional-cpp" \
++		CFLAGS="$(CFLAGS) -c -traditional-cpp" \
+ 		OPT_NORMAL="-O2" \
+ 		OPT_INLINE="-O3"
+ 
+@@ -658,7 +658,7 @@
+ 	$(LN) ppc32.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc" \
+ 		OPT_NORMAL="-O2" \
+ 		OPT_INLINE="-O3 -finline-limit=4000"
+@@ -667,7 +667,7 @@
+ macosx-ppc64-altivec:
+ 	$(LN) ppc64alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+-		CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -m64" \
+ 		OPT_NORMAL="-fast" \
+ 		OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
+@@ -676,7 +676,7 @@
+ 	$(LN) ppc64alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
+ 		OPT_NORMAL="-fast" \
+ 		OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
+@@ -684,7 +684,7 @@
+ macosx-ppc64:
+ 	$(LN) ppc64.h arch.h
+ 	$(MAKE) $(PROJ) \
+-		CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -m64" \
+ 		OPT_NORMAL="-fast" \
+ 		OPT_INLINE="-fast -finline-limit=4000"
+@@ -693,7 +693,7 @@
+ 	$(LN) ppc64.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
++		CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
+ 		OPT_NORMAL="-fast" \
+ 		OPT_INLINE="-fast -finline-limit=4000"
+@@ -723,7 +723,7 @@
+ 	$(LN) ppc32alt.h arch.h
+ 	$(MAKE) $(PROJ) \
+ 		ASFLAGS="$(ASFLAGS) -arch ppc" \
+-		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
++		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
+ 		LDFLAGS="$(LDFLAGS) -arch ppc" \
+ 		OPT_NORMAL="-fast -mcpu=7450" \
+ 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch
new file mode 100644
index 000000000000..1b85914ed4ff
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch
@@ -0,0 +1,15 @@
+Fix for building johntheripper with clang.
+
+https://bugs.gentoo.org/show_bug.cgi?id=554392 
+
+--- john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c
++++ john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c
+@@ -530,7 +530,7 @@
+ 
+ #if defined(__SSE4_1__)
+ 
+-# if !defined(__INTEL_COMPILER)
++# if !defined(__INTEL_COMPILER) && !defined(__clang__)
+ // This intrinsic is not always available in GCC, so define it here.
+ static inline int _mm_testz_si128 (__m128i __M, __m128i __V)
+ {
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch
new file mode 100644
index 000000000000..c28ec21a0ae8
--- /dev/null
+++ b/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch
@@ -0,0 +1,17 @@
+diff -ru john-1.7.9.orig/src/gost_plug.c john-1.7.9/src/gost_plug.c
+--- john-1.7.9.orig/src/gost_plug.c     2013-01-20 16:15:45.464000001 +0000
++++ john-1.7.9/src/gost_plug.c  2013-01-20 16:16:06.104000001 +0000
+@@ -531,7 +531,6 @@
+ }
+ #endif
+ 
+-#ifndef __GLIBC__
+ void rhash_u32_swap_copy(void* to, int index, const void* from, size_t length) {
+	size_t i;
+	unsigned int *pO, *pI;
+@@ -542,4 +541,3 @@
+		*pO++ = bswap_32(*pI++);
+ 	}
+ }
+-#endif
+
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
new file mode 100644
index 000000000000..fc6fab5d5284
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-7"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
+	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2"
+REQUIRED_USE="openmp? ( !minimal )
+	mpi? ( !minimal )
+	cuda? ( !minimal )
+	opencl? ( !minimal )
+	mozilla? ( !minimal )"
+
+DEPEND="sys-libs/zlib
+	!minimal? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	mpi? ( virtual/mpi )
+	cuda? ( x11-drivers/nvidia-drivers
+		dev-util/nvidia-cuda-toolkit:= )
+	opencl? ( virtual/opencl )
+	mozilla? ( dev-libs/nss dev-libs/nspr )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+has_xop() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if has_xop; then
+			echo "linux-x86-64-xop"
+		elif has_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc32"
+		#fi
+	elif use ppc64; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc64"
+		#fi
+		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
+		# as per the Makefile comments
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if has_xop; then
+			echo "linux-x86-xop"
+		elif has_avx; then
+			echo "linux-x86-avx"
+		elif use cpu_flags_x86_sse2; then
+			echo "linux-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "linux-x86-mmx"
+		else
+			echo "linux-x86-any"
+		fi
+	elif use ppc-macos; then
+	# force AltiVec, the non-altivec profile contains ancient compiler cruft
+	#	if use altivec; then
+			echo "macosx-ppc32-altivec"
+	#	else
+	#		echo "macosx-ppc32"
+	#	fi
+		# for Tiger this can be macosx-ppc64
+	elif use x86-macos; then
+		if use cpu_flags_x86_sse2; then
+			echo "macosx-x86-sse2"
+		else
+			echo "macosx-x86"
+		fi
+	elif use x86-solaris; then
+		echo "solaris-x86-any"
+	elif use x86-fbsd; then
+		if use cpu_flags_x86_sse2; then
+			echo "freebsd-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "freebsd-x86-mmx"
+		else
+			echo "freebsd-x86-any"
+		fi
+	elif use amd64-fbsd; then
+		echo "freebsd-x86-64"
+	else
+		echo "generic"
+	fi
+}
+
+get_john_objs() {
+	echo -n '${JOHN_COMMON_OBJS} '
+	if use opencl; then
+		echo -n '${OCL_OBJS} '
+	fi
+	if use cuda; then
+		echo -n '${CUDA_OBJS}'
+	fi
+}
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	if ! use minimal; then
+		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+
+		if use mpi ; then
+			sed -e "s/^#CC = mpicc/CC = mpicc/" \
+				-e "s/^#MPIOBJ =/MPIOBJ =/" \
+				-i src/Makefile || die
+		fi
+
+		# fix typo in jumbo patch
+		sed -i 's:All15:All5:' run/john.conf || die
+		# fix compile on ppc (only needed for jumbo-7)
+		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
+	fi
+
+	cd src
+	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
+	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
+
+	if ! use minimal; then
+		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
+			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
+			-i Makefile || die "sed Makefile failed"
+		sed -i 's#/usr/local#/opt#g' Makefile || die
+	fi
+	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
+
+	if use cuda; then
+		cuda_src_prepare
+		sed \
+			-e "/^NVCC_FLAGS/s:-arch sm_10:${NVCCFLAGS}:g" \
+			-i Makefile || die
+	fi
+
+	if use mozilla; then
+		sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die
+	fi
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
+	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
+	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
+	append-flags -fPIC -fPIE
+	gcc-specs-pie && append-ldflags -nopie
+	use openmp && OMP="-fopenmp"
+
+	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+	if use mpi; then
+		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+	fi
+
+	#this stuff was all stolen from the Makefile, if build breaks, check this first
+	if use opencl; then
+		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
+		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
+	fi
+	if use cuda; then
+		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
+		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
+	fi
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
+		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		JOHN_OBJS="$(get_john_objs)" \
+		$(get_target)
+}
+
+src_test() {
+	if use opencl; then
+		cp src/opencl/*.cl run/
+		cp src/opencl_*.h run/
+	fi
+	pax-mark -mr run/john
+	if use opencl || use cuda; then
+		ewarn "GPU tests fail, skipping all tests..."
+	else
+		make -C src/ check
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}usr/sbin/john" || die
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# jumbo-patch additions
+	if ! use minimal; then
+		for s in \
+			keychain2john keepass2john pwsafe2john hccap2john \
+			racf2john zip2john rar2john pdf2john ssh2john undrop \
+			; do
+			dosym john /usr/sbin/$s
+		done
+		use mozilla && dosym john /usr/sbin/mozilla2john
+		dosbin run/calc_stat
+		dosbin run/genmkvpwd
+		dosbin run/mkvcalcproba
+		dosbin run/raw2dyna
+		dosbin run/tgtsnarf
+		insinto /etc/john
+		doins run/genincstats.rb run/stats
+		doins run/netscreen.py run/sap2john.pl
+		if use opencl; then
+			doins src/opencl/*.cl
+			doins src/opencl_*.h
+		fi
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
new file mode 100644
index 000000000000..b4d60a13decb
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-7"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
+	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2"
+REQUIRED_USE="openmp? ( !minimal )
+	mpi? ( !minimal )
+	cuda? ( !minimal )
+	opencl? ( !minimal )
+	mozilla? ( !minimal )"
+
+DEPEND="sys-libs/zlib
+	!minimal? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	mpi? ( virtual/mpi )
+	cuda? ( x11-drivers/nvidia-drivers
+		dev-util/nvidia-cuda-toolkit:= )
+	opencl? ( virtual/opencl )
+	mozilla? ( dev-libs/nss dev-libs/nspr )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+has_xop() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if has_xop; then
+			echo "linux-x86-64-xop"
+		elif has_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc32"
+		#fi
+	elif use ppc64; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc64"
+		#fi
+		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
+		# as per the Makefile comments
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if has_xop; then
+			echo "linux-x86-xop"
+		elif has_avx; then
+			echo "linux-x86-avx"
+		elif use cpu_flags_x86_sse2; then
+			echo "linux-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "linux-x86-mmx"
+		else
+			echo "linux-x86-any"
+		fi
+	elif use ppc-macos; then
+	# force AltiVec, the non-altivec profile contains ancient compiler cruft
+	#	if use altivec; then
+			echo "macosx-ppc32-altivec"
+	#	else
+	#		echo "macosx-ppc32"
+	#	fi
+		# for Tiger this can be macosx-ppc64
+	elif use x86-macos; then
+		if use cpu_flags_x86_sse2; then
+			echo "macosx-x86-sse2"
+		else
+			echo "macosx-x86"
+		fi
+	elif use x86-solaris; then
+		echo "solaris-x86-any"
+	elif use x86-fbsd; then
+		if use cpu_flags_x86_sse2; then
+			echo "freebsd-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "freebsd-x86-mmx"
+		else
+			echo "freebsd-x86-any"
+		fi
+	elif use amd64-fbsd; then
+		echo "freebsd-x86-64"
+	else
+		echo "generic"
+	fi
+}
+
+get_john_objs() {
+	echo -n '${JOHN_COMMON_OBJS} '
+	if use opencl; then
+		echo -n '${OCL_OBJS} '
+	fi
+	if use cuda; then
+		echo -n '${CUDA_OBJS}'
+	fi
+}
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	if ! use minimal; then
+		eapply "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+
+		if use mpi ; then
+			sed -e "s/^#CC = mpicc/CC = mpicc/" \
+				-e "s/^#MPIOBJ =/MPIOBJ =/" \
+				-i src/Makefile || die
+		fi
+
+		# fix typo in jumbo patch
+		sed -i 's:All15:All5:' run/john.conf || die
+		# fix compile on ppc (only needed for jumbo-7)
+		eapply "${FILESDIR}/${P}-ppc-compile-fix.patch"
+	fi
+
+	cd src || die
+	eapply -p0 "${FILESDIR}/${PN}-1.7.6-cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
+	eapply -p2 "${FILESDIR}/${PN}-1.7.9-clang.patch"
+	eapply_user
+
+	if ! use minimal; then
+		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
+			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
+			-i Makefile || die "sed Makefile failed"
+		sed -i 's#/usr/local#/opt#g' Makefile || die
+	fi
+	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
+
+	if use cuda; then
+		cuda_src_prepare
+		sed \
+			-e "/^NVCC_FLAGS/s:-arch sm_10:${NVCCFLAGS}:g" \
+			-i Makefile || die
+	fi
+
+	if use mozilla; then
+		sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die
+	fi
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	cat <<- EOF >> config.gentoo || die
+	#define JOHN_SYSTEMWIDE 1
+	#define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john"
+	#define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john"
+EOF
+
+	append-flags -fPIC -fPIE
+	gcc-specs-pie && append-ldflags -nopie
+	use openmp && OMP="-fopenmp"
+
+	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+	if use mpi; then
+		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+	fi
+
+	#this stuff was all stolen from the Makefile, if build breaks, check this first
+	if use opencl; then
+		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
+		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
+	fi
+	if use cuda; then
+		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
+		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
+	fi
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
+		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		JOHN_OBJS="$(get_john_objs)" \
+		$(get_target)
+}
+
+src_test() {
+	if use opencl; then
+		cp src/opencl/*.cl run/
+		cp src/opencl_*.h run/
+	fi
+	pax-mark -mr run/john
+	if use opencl || use cuda; then
+		ewarn "GPU tests fail, skipping all tests..."
+	else
+		make -C src/ check
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}usr/sbin/john" || die
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# jumbo-patch additions
+	if ! use minimal; then
+		for s in \
+			keychain2john keepass2john pwsafe2john hccap2john \
+			racf2john zip2john rar2john pdf2john ssh2john undrop \
+			; do
+			dosym john /usr/sbin/$s
+		done
+		use mozilla && dosym john /usr/sbin/mozilla2john
+		dosbin run/calc_stat
+		dosbin run/genmkvpwd
+		dosbin run/mkvcalcproba
+		dosbin run/raw2dyna
+		dosbin run/tgtsnarf
+		insinto /etc/john
+		doins run/genincstats.rb run/stats
+		doins run/netscreen.py run/sap2john.pl
+		if use opencl; then
+			doins src/opencl/*.cl
+			doins src/opencl_*.h
+		fi
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
new file mode 100644
index 000000000000..81c08300e9a7
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+JUMBO="jumbo-7"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.bz2
+	!minimal? ( http://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+#Remove AltiVec USE flag. Appears to be an upstream issue.
+IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
+REQUIRED_USE="openmp? ( !minimal )
+	mpi? ( !minimal )
+	cuda? ( !minimal )
+	opencl? ( !minimal )"
+
+RDEPEND="sys-libs/zlib
+	!minimal? ( >=dev-libs/openssl-0.9.7:0 )
+	mpi? ( virtual/mpi )
+	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
+	opencl? ( virtual/opencl )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+has_xop() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
+}
+
+has_avx() {
+	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
+}
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if has_xop; then
+			echo "linux-x86-64-xop"
+		elif has_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc32"
+		#fi
+	elif use ppc64; then
+		#if use altivec; then
+		#	echo "linux-ppc32-altivec"
+		#else
+			echo "linux-ppc64"
+		#fi
+		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
+		# as per the Makefile comments
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if has_xop; then
+			echo "linux-x86-xop"
+		elif has_avx; then
+			echo "linux-x86-avx"
+		elif use cpu_flags_x86_sse2; then
+			echo "linux-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "linux-x86-mmx"
+		else
+			echo "linux-x86-any"
+		fi
+	elif use ppc-macos; then
+	# force AltiVec, the non-altivec profile contains ancient compiler cruft
+	#	if use altivec; then
+			echo "macosx-ppc32-altivec"
+	#	else
+	#		echo "macosx-ppc32"
+	#	fi
+		# for Tiger this can be macosx-ppc64
+	elif use x86-macos; then
+		if use cpu_flags_x86_sse2; then
+			echo "macosx-x86-sse2"
+		else
+			echo "macosx-x86"
+		fi
+	elif use x86-solaris; then
+		echo "solaris-x86-any"
+	elif use x86-fbsd; then
+		if use cpu_flags_x86_sse2; then
+			echo "freebsd-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "freebsd-x86-mmx"
+		else
+			echo "freebsd-x86-any"
+		fi
+	elif use amd64-fbsd; then
+		echo "freebsd-x86-64"
+	else
+		echo "generic"
+	fi
+}
+
+get_john_objs() {
+	echo -n '${JOHN_COMMON_OBJS} '
+	if use opencl; then
+		echo -n '${OCL_OBJS} '
+	fi
+	if use cuda; then
+		echo -n '${CUDA_OBJS}'
+	fi
+}
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	if ! use minimal; then
+		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
+
+		if use mpi ; then
+			sed -e "s/^#CC = mpicc/CC = mpicc/" \
+				-e "s/^#MPIOBJ =/MPIOBJ =/" \
+				-i src/Makefile || die
+		fi
+
+		# fix typo in jumbo patch
+		sed -i 's:All15:All5:' run/john.conf || die
+		# fix compile on ppc (only needed for jumbo-7)
+		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
+	fi
+
+	cd src
+	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
+	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
+
+	if ! use minimal; then
+		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
+			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
+			-i Makefile || die "sed Makefile failed"
+		sed -i 's#/usr/local#/opt#g' Makefile || die
+	fi
+	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
+	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
+	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
+	append-flags -fPIC -fPIE
+	gcc-specs-pie && append-ldflags -nopie
+	use openmp && OMP="-fopenmp"
+
+	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+	if use mpi; then
+		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
+	fi
+
+	#this stuff was all stolen from the Makefile, if build breaks, check this first
+	if use opencl; then
+		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
+		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
+	fi
+	if use cuda; then
+		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
+		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
+	fi
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
+		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		JOHN_OBJS="$(get_john_objs)" \
+		$(get_target)
+}
+
+src_test() {
+	if use opencl; then
+		cp src/opencl/*.cl run/
+		cp src/opencl_*.h run/
+	fi
+	pax-mark -mr run/john
+	if use opencl || use cuda; then
+		ewarn "GPU tests fail, skipping all tests..."
+	else
+		make -C src/ check
+	fi
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}usr/sbin/john" || die
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# jumbo-patch additions
+	if ! use minimal; then
+		for s in \
+			keychain2john keepass2john pwsafe2john hccap2john \
+			racf2john zip2john rar2john pdf2john ssh2john undrop \
+			; do
+			dosym john /usr/sbin/$s
+		done
+		dosbin run/calc_stat
+		dosbin run/genmkvpwd
+		dosbin run/mkvcalcproba
+		dosbin run/raw2dyna
+		dosbin run/tgtsnarf
+		insinto /etc/john
+		doins run/genincstats.rb run/stats
+		doins run/netscreen.py run/sap2john.pl
+		if use opencl; then
+			doins src/opencl/*.cl
+			doins src/opencl_*.h
+		fi
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
new file mode 100644
index 000000000000..ea96d4b19271
--- /dev/null
+++ b/app-crypt/johntheripper/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+    <description>Any and all help appreciated</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <use>
+    <flag name="cuda">Use nvidia cuda toolkit for speeding up cracking on capable devices</flag>
+    <flag name="mozilla"> Support mozilla password cracking</flag>
+    <flag name="opencl">Enable opencl support for speeding up cracking on capable devices</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-crypt/kali-archive-keyring-2015.2 b/app-crypt/kali-archive-keyring-2015.2
deleted file mode 100644
index 7f409c5bec7d..000000000000
--- a/app-crypt/kali-archive-keyring-2015.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-crypt/jetring
-DESCRIPTION=GnuPG archive keys of the Kali archive
-EAPI=5
-HOMEPAGE=https://www.kali.org
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://http.kali.org/pool/main/k/kali-archive-keyring/kali-archive-keyring_2015.2.tar.xz
-_md5_=7d3b718554ac1c7f043623d362cc8935
diff --git a/app-crypt/kali-archive-keyring/Manifest b/app-crypt/kali-archive-keyring/Manifest
new file mode 100644
index 000000000000..d67378b8d035
--- /dev/null
+++ b/app-crypt/kali-archive-keyring/Manifest
@@ -0,0 +1,3 @@
+DIST kali-archive-keyring_2015.2.tar.xz 6448 BLAKE2B 5fe0c7d9e6ac145d046e1d7bcd1002c1799aba7224462691a0f940c5ee362c134c47cce9a60b71476f6b66f2cf6937262fb665dd29faed7e40dbd5a8a11f340f SHA512 3f680fb31f0723f0c4b8aa7053488637c23ef2804a688ad307365c6eaa71b9559dba31c8aee6e9804b9f03e24397c077f4f057e58da8f7e06ffc5d36003d23ad
+EBUILD kali-archive-keyring-2015.2.ebuild 388 BLAKE2B d8ba78ce8e7a75bc14501b47f8a049f117aa7a8ff30a69b768b830763ed146bcaca4a9abba08ec5ee4dd77a324e9f89605538386b897729907dbcfb446cc3b0d SHA512 1d4a7d02030e66a0ff1ed69c628477383fe99e6b627d9c866ef80c810a0478f1a157701561799b509ce8a8d6352862260c40bebab20f3b28e7761766a184ece7
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild b/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild
new file mode 100644
index 000000000000..ce982c36e0fc
--- /dev/null
+++ b/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Kali archive"
+HOMEPAGE="https://www.kali.org"
+SRC_URI="http://http.kali.org/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/jetring"
+
+MAKEOPTS+=' -j1'
diff --git a/app-crypt/kali-archive-keyring/metadata.xml b/app-crypt/kali-archive-keyring/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/app-crypt/kali-archive-keyring/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/app-crypt/kbfs-1.0.36 b/app-crypt/kbfs-1.0.36
deleted file mode 100644
index 69d130fdcbef..000000000000
--- a/app-crypt/kbfs-1.0.36
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.6:0 >=app-crypt/keybase-1.0.36
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-IUSE=git
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-SRC_URI=https://github.com/keybase/kbfs/archive/v1.0.36.tar.gz -> kbfs-1.0.36.tar.gz
-_md5_=08119cef7db60244a52c9ec57a122333
diff --git a/app-crypt/kbfs-1.0.40 b/app-crypt/kbfs-1.0.40
deleted file mode 100644
index 8047236fae11..000000000000
--- a/app-crypt/kbfs-1.0.40
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.6:0
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-IUSE=git
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-SRC_URI=https://github.com/keybase/kbfs/archive/v1.0.40.tar.gz -> kbfs-1.0.40.tar.gz
-_md5_=06ac231752f683add98c5ae5e5177bfc
diff --git a/app-crypt/kbfs-1.0.44 b/app-crypt/kbfs-1.0.44
deleted file mode 100644
index b080b1181d65..000000000000
--- a/app-crypt/kbfs-1.0.44
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.6:0
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-IUSE=git
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-SRC_URI=https://github.com/keybase/kbfs/archive/v1.0.44.tar.gz -> kbfs-1.0.44.tar.gz
-_md5_=06ac231752f683add98c5ae5e5177bfc
diff --git a/app-crypt/kbfs-1.0.44-r1 b/app-crypt/kbfs-1.0.44-r1
deleted file mode 100644
index 67834d5750c8..000000000000
--- a/app-crypt/kbfs-1.0.44-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.6:0 virtual/pkgconfig
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-IUSE=git
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-SRC_URI=https://github.com/keybase/kbfs/archive/v1.0.44.tar.gz -> kbfs-1.0.44.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a99b2a0ddccd22d2f25a6167e90b1bc1
diff --git a/app-crypt/kbfs-1.0.48 b/app-crypt/kbfs-1.0.48
deleted file mode 100644
index bee4088c5a3e..000000000000
--- a/app-crypt/kbfs-1.0.48
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-SRC_URI=https://github.com/keybase/kbfs/archive/v1.0.48.tar.gz -> kbfs-1.0.48.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6f9bd0e2820ba4c031d4486b6e6d409b
diff --git a/app-crypt/kbfs-2.0.0 b/app-crypt/kbfs-2.0.0
deleted file mode 100644
index 2c7450fb4cf6..000000000000
--- a/app-crypt/kbfs-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-SRC_URI=https://github.com/keybase/kbfs/archive/v2.0.0.tar.gz -> kbfs-2.0.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6f9bd0e2820ba4c031d4486b6e6d409b
diff --git a/app-crypt/kbfs-2.0.0-r1 b/app-crypt/kbfs-2.0.0-r1
deleted file mode 100644
index 0cc46e37fc49..000000000000
--- a/app-crypt/kbfs-2.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-SRC_URI=https://github.com/keybase/kbfs/archive/v2.0.0.tar.gz -> kbfs-2.0.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5e538935350926e5bb89502a451f59c1
diff --git a/app-crypt/kbfs-2.1.0 b/app-crypt/kbfs-2.1.0
deleted file mode 100644
index 01dccbb3b9cc..000000000000
--- a/app-crypt/kbfs-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-SRC_URI=https://github.com/keybase/kbfs/archive/v2.1.0.tar.gz -> kbfs-2.1.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5e538935350926e5bb89502a451f59c1
diff --git a/app-crypt/kbfs-9999 b/app-crypt/kbfs-9999
deleted file mode 100644
index 4ab7277cb6df..000000000000
--- a/app-crypt/kbfs-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Keybase Filesystem (KBFS)
-EAPI=6
-HOMEPAGE=https://keybase.io/docs/kbfs
-IUSE=git
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg sys-fs/fuse
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a48cab71135d8b1a2a79247256b95b7a
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
new file mode 100644
index 000000000000..4705a3580656
--- /dev/null
+++ b/app-crypt/kbfs/Manifest
@@ -0,0 +1,16 @@
+DIST kbfs-1.0.36.tar.gz 5135197 BLAKE2B a0d40048d11347a72ac9fedb358be7bd8d425e9eafc32fce44e75583aa75fde00bee62d81e7d4bc1553aec3f72ca3af1dffd1ef710d897ce28cb26d152eab4aa SHA512 eb50c4fdd07e0d0e0bd62c48a60520fe48a6b64d97e6ac561d0c567e50c4863f9969697f78553360e6b42776af4974b086bd0be75db6de4c28a5c4a840725919
+DIST kbfs-1.0.40.tar.gz 5432507 BLAKE2B 4d3c55d3c081cb7fea44d302a1a5598df515f98f4f75bf3e0eee84c3151114247eb1a80ea2ff9bb6d10cc3612af25e283b114b26b24043fbfdd16f05d2fb0210 SHA512 c5391e710fc55130437ff5f42e00229ea06fd1bd5e535c814158a501f2b23ef43d65d27ebf57ec3c3b5d3c7cbbed43cd2baf8888af001a3b23a40cbc94d22883
+DIST kbfs-1.0.44.tar.gz 5440024 BLAKE2B b8ab744b1bb9fa2e33bd382df92f1e50ed294446106d5723306465cbbadc0e960ad0da834671fa7f01e7ea8ff3486477972f44e927feefd1123d8a8ad4e376f5 SHA512 03e92303f140dbff059f8c954142d6180f388c1e50c2f8af02a30a740d440d5f79be47ad851d021a2b90525bf7b775e471780438b94d1d6403eddbdc0bd41e8e
+DIST kbfs-1.0.48.tar.gz 5639704 BLAKE2B 4d8152c8bf1a72b0493840c6ffa0da35ba6abcb677a9a15ee88745b7b870c9f2923061751e66b6d54ff12c92bcd74d7c6ce8320cb7c7cd6f75e1cd62ccf13803 SHA512 89b391223e2c7014e64c09e5303c7b89bea2508331b5d53facf8802de2442c4e53a4d79f65c085a2b3234762b334d3d36e903867ef841140d44207926d82991c
+DIST kbfs-2.0.0.tar.gz 5674786 BLAKE2B 65924644babbaf95867792da6a9c1f5c9c517bbe36292c3b5e40afaeb2879b1145d0b6017f3b66e6bc2ec4b858a312ab1d86ff1d8515f99c9004eeb1acaf8caa SHA512 6e51490b52cc5484d940ee057dc9b453a88d44622b1c533dd29e75eed5fa075f33d9cb6ac438401d80aa148d7561c1bc63deece5e75cdc30bb54102f2d00215b
+DIST kbfs-2.1.0.tar.gz 5703221 BLAKE2B 55daa1d8f1efe4a0264477b54c1ea8db74e972b1ecdd536f4ab8042e66117c6854889aeb203fa6fea6f757e928af514520be3732ee07ccc1289ccc9f5d3f27a8 SHA512 04dd058e97c85d5188cc61a56cc4a4468ec1d4d6b2f65cbe0edb88cec2864cef3525e6f48729761a2cc6fa79559794e5a3fd9663cb31dcaaaeff90a32f2a211a
+EBUILD kbfs-1.0.36.ebuild 984 BLAKE2B 84ea9e3a3db5917cf000e56f7c4826c9d5210bbb22e157310028421383e308e0e164be7d57e0838694730e1dff645ba89ad991d9beef17eb1bf0c0823ef55e13 SHA512 79cfb2c88f09d7cf0050f25e5c4e8fe9ffdbdafa5e62b6943b8d690eb766cb51d2b657774f0eab9ba561478fd3e22d416b409485f9ba38512247e66b6acf0d00
+EBUILD kbfs-1.0.40.ebuild 952 BLAKE2B 0ad195fc7cfba58e764692d2eff0de4e365ef86e11606552961484e54ffc93f54d522c8a3b0e5900ae5a25ec72cd3ea24d346f7578055d7ac9b82326a2cfc41a SHA512 36c347cfbe3ee81a11916193c7757f5ed71e8253449595c07a73db6b34d576f989a9a1f8605f695b30c27ef9fe89e47e81cd45f2405e65b92eae736a74d44f7b
+EBUILD kbfs-1.0.44-r1.ebuild 1033 BLAKE2B 46055ea689aad784f6f93704f0cb99abde81c367fb4c10a9825da8e83b86422f8cd78f099a1c8ad3da6f44ca4c91090502de7d90e0a6c5cdbe42e99c1a710597 SHA512 6813ae23ea413bd3a1ef5d84b3f0fa642510e98bf08f64ee95d7f7dcc8cf2008f470d7b7af1b1a3d51327949a01824f5e0e44c6e16fb7a91dc526379a8ebe391
+EBUILD kbfs-1.0.44.ebuild 952 BLAKE2B 0ad195fc7cfba58e764692d2eff0de4e365ef86e11606552961484e54ffc93f54d522c8a3b0e5900ae5a25ec72cd3ea24d346f7578055d7ac9b82326a2cfc41a SHA512 36c347cfbe3ee81a11916193c7757f5ed71e8253449595c07a73db6b34d576f989a9a1f8605f695b30c27ef9fe89e47e81cd45f2405e65b92eae736a74d44f7b
+EBUILD kbfs-1.0.48.ebuild 1001 BLAKE2B 83bb03c8b7d135e60d353c259effcd1ad6e2d5c8efd305b740961ad7b1921c8e30b37db8306644003df0a8a9d2b2f8f0cb4bbf63f3772f98d8c323681ef8043f SHA512 648be76efdd357dbfe3ed611c58cadd3b9fa30469392f6d3b3352bac961a421960a7d4919c5ea373c0418dd48a71fbe4e92044fb608f9b463b92fbc87a3e17a2
+EBUILD kbfs-2.0.0-r1.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
+EBUILD kbfs-2.0.0.ebuild 1001 BLAKE2B 83bb03c8b7d135e60d353c259effcd1ad6e2d5c8efd305b740961ad7b1921c8e30b37db8306644003df0a8a9d2b2f8f0cb4bbf63f3772f98d8c323681ef8043f SHA512 648be76efdd357dbfe3ed611c58cadd3b9fa30469392f6d3b3352bac961a421960a7d4919c5ea373c0418dd48a71fbe4e92044fb608f9b463b92fbc87a3e17a2
+EBUILD kbfs-2.1.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
+EBUILD kbfs-9999.ebuild 1143 BLAKE2B 6a1f0b69fc416d0403194c0e77b8652d4d2e1d1104c9eff2bd516aa088aca067e5aaa11ef09eeaca3f721f236fb80b8a436a8fae5c4340f0f0f4b0ca655e9a40 SHA512 17ce0915dff90a653800d8bac496c3afaf38e458ed37a2bfdd7a61173ac698c735eb188810e06a899d3c71950a7dde8b46c8c0b1a966e9877e9d9812539a38f3
+MISC metadata.xml 482 BLAKE2B ea0f5fe2ae3d3c5cd10020f178e0233fe55a38174c10ccd54c50fcd2104c4a0dbe737b371cc49624fefbc2107b5697ee4c826466a5f14d7c952542edd1134414 SHA512 74eb8d2fb7b19f269dcf5dbc67a5f63cac1589343a069011dfe8492a0bc1d82b526a175b2fad91a00f7fd60e4a77bbf2b7f7dea4537d6ae9221a9e93ca2bdd60
diff --git a/app-crypt/kbfs/kbfs-1.0.36.ebuild b/app-crypt/kbfs/kbfs-1.0.36.ebuild
new file mode 100644
index 000000000000..96432ebc4277
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-1.0.36.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="git"
+
+DEPEND="
+	>=dev-lang/go-1.6:0
+	>=app-crypt/keybase-1.0.36
+	"
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+S="${WORKDIR}/src/github.com/keybase/kbfs"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "kbfs-${PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/kbfsfuse" \
+		github.com/keybase/kbfs/kbfsfuse
+	use git && \
+		GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/git-remote-keybase" \
+		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	use git && \
+		dobin "${T}/git-remote-keybase"
+}
diff --git a/app-crypt/kbfs/kbfs-1.0.40.ebuild b/app-crypt/kbfs/kbfs-1.0.40.ebuild
new file mode 100644
index 000000000000..df627e677239
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-1.0.40.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="git"
+
+DEPEND=">=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+S="${WORKDIR}/src/github.com/keybase/kbfs"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "kbfs-${PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/kbfsfuse" \
+		github.com/keybase/kbfs/kbfsfuse
+	use git && \
+		GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/git-remote-keybase" \
+		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	use git && \
+		dobin "${T}/git-remote-keybase"
+}
diff --git a/app-crypt/kbfs/kbfs-1.0.44-r1.ebuild b/app-crypt/kbfs/kbfs-1.0.44-r1.ebuild
new file mode 100644
index 000000000000..7d419c6fd750
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-1.0.44-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="git"
+
+DEPEND=">=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+S="${WORKDIR}/src/github.com/keybase/kbfs"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "kbfs-${PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/kbfsfuse" \
+		github.com/keybase/kbfs/kbfsfuse
+	use git && \
+		GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/git-remote-keybase" \
+		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	use git && \
+		dobin "${T}/git-remote-keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/kbfs-1.0.44.ebuild b/app-crypt/kbfs/kbfs-1.0.44.ebuild
new file mode 100644
index 000000000000..df627e677239
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-1.0.44.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="git"
+
+DEPEND=">=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+S="${WORKDIR}/src/github.com/keybase/kbfs"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "kbfs-${PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/kbfsfuse" \
+		github.com/keybase/kbfs/kbfsfuse
+	use git && \
+		GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/git-remote-keybase" \
+		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	use git && \
+		dobin "${T}/git-remote-keybase"
+}
diff --git a/app-crypt/kbfs/kbfs-1.0.48.ebuild b/app-crypt/kbfs/kbfs-1.0.48.ebuild
new file mode 100644
index 000000000000..e92f7b9c3cf4
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-1.0.48.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+		golang-build_src_compile
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild b/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..41a15fe68057
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/redirector" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	dobin "${T}/keybase-redirector"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/kbfs-2.0.0.ebuild b/app-crypt/kbfs/kbfs-2.0.0.ebuild
new file mode 100644
index 000000000000..e92f7b9c3cf4
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-2.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+		golang-build_src_compile
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/kbfs-2.1.0.ebuild b/app-crypt/kbfs/kbfs-2.1.0.ebuild
new file mode 100644
index 000000000000..41a15fe68057
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-2.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/redirector" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	dobin "${T}/keybase-redirector"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild
new file mode 100644
index 000000000000..6c648020c5ec
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3 golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+EGIT_REPO_URI="https://github.com/keybase/kbfs.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="git"
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	git-r3_src_unpack
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/redirector" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \
+		golang-build_src_compile
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	dobin "${T}/keybase-redirector"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/metadata.xml b/app-crypt/kbfs/metadata.xml
new file mode 100644
index 000000000000..00881f3d617a
--- /dev/null
+++ b/app-crypt/kbfs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		The official Keybase implementation of the client-side code for the
+		Keybase filesystem (KBFS).
+	</longdescription>
+	<use>
+		<flag name="git">
+			Build the Git remote helper for storing repositories in Keybase
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/kencfs-plasma-2.0.1_alpha b/app-crypt/kencfs-plasma-2.0.1_alpha
deleted file mode 100644
index 201b4356a80d..000000000000
--- a/app-crypt/kencfs-plasma-2.0.1_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/knotifications:5 kde-frameworks/kwallet:5
-DESCRIPTION=GUI frontend for encfs
-EAPI=6
-HOMEPAGE=https://www.linux-apps.com/p/1170068/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/knotifications:5 kde-frameworks/kwallet:5 sys-fs/encfs
-SLOT=0
-SRC_URI=https://dl.opendesktop.org/api/files/download/id/1486310914/kencfs-plasma-2.0.1a.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=887287e91d9feb642057890ccdc64f11
diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
new file mode 100644
index 000000000000..687bd6e7f0c2
--- /dev/null
+++ b/app-crypt/kencfs-plasma/Manifest
@@ -0,0 +1,4 @@
+AUX kencfs-plasma-2.0.1_alpha-include.patch 267 BLAKE2B 75755d4ce83b8146efd2a956b44a5f42d936d94189df2157d8be27abf35c252540fd27a7884290a1397b4b9b477a94cab146f3fe21d9e20740ebdc86d8142842 SHA512 74646bab28c76db89d441e7528ad288f44522dc20f53b5b12b8140d1a61c86d9ae0fb9f559d37fe1de912f176a366000d77b67a3fe3657a3428304a2ce2a29a1
+DIST kencfs-plasma-2.0.1a.tar.gz 216580 BLAKE2B 7c8e77e3019d48d37437f2031c5c522b30c89a927ca3a51571e42decaa004a5cfb3c5b84d50ee1c775599943a23cc58a7b994e94e0e316a7539d793004d05035 SHA512 a9093680bb141c18e2d4ed8a966f7176c40c10fa0ee6e5cee25ae26ef3f94e6ffc7e3f0a7b55321640e4ba6e484d75755f901b53688dbfc5c22a1c0b1e01cfac
+EBUILD kencfs-plasma-2.0.1_alpha.ebuild 942 BLAKE2B 4ca9785f0e0def0703c03ce90e9154173b8c858c577c16df38de034f3ee416563d3f61048520d90411f680d8c40579b4a3c2e79c648b0234192baa159b02d66b SHA512 bdc8261ada220cf77dac4f95ccbb38354e2b4d67e8219367ae3a949b1724a53d2c32e8c9381010d1449d73f85087d2feea00ec87c88d13671825f7d6d420d17e
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
new file mode 100644
index 000000000000..2bdd692c122f
--- /dev/null
+++ b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
@@ -0,0 +1,13 @@
+Fix build when kdelibs is not installed.
+
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -52,7 +52,7 @@
+ 
+ QStandardItemModel *model;
+ 
+-#include <KDE/KWallet/Wallet>
++#include <KWallet>
+ using KWallet::Wallet;
+ Wallet *m_wallet;
+ QString WalletFolder="Kencfs-Plasma";
diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
new file mode 100644
index 000000000000..5b6df0f1ffd6
--- /dev/null
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_alpha/a}"
+inherit qmake-utils
+
+DESCRIPTION="GUI frontend for encfs"
+HOMEPAGE="https://www.linux-apps.com/p/1170068/"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486310914/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/knotifications:5
+	kde-frameworks/kwallet:5
+"
+RDEPEND="${DEPEND}
+	sys-fs/encfs
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
+src_prepare() {
+	default
+
+	sed -i ${PN}.pro -e "/^doc.path =/s/$/${PF}/" || die
+
+	# fix desktop validation
+	sed -i ${PN}.desktop -e "s|kencfs-plasma/kencfs-icon|/usr/share/icons/&.png|" || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/app-crypt/kencfs-plasma/metadata.xml b/app-crypt/kencfs-plasma/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/app-crypt/kencfs-plasma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/keybase-1.0.41 b/app-crypt/keybase-1.0.41
deleted file mode 100644
index f5be511c743f..000000000000
--- a/app-crypt/keybase-1.0.41
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=dev-lang/go-1.6:0
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v1.0.41.tar.gz -> keybase-1.0.41.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=641d8d36542b6d9e5a98ffe409c82e3c
diff --git a/app-crypt/keybase-1.0.41-r1 b/app-crypt/keybase-1.0.41-r1
deleted file mode 100644
index 7b51e034412f..000000000000
--- a/app-crypt/keybase-1.0.41-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-lang/go-1.6:0 app-crypt/kbfs virtual/pkgconfig
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v1.0.41.tar.gz -> keybase-1.0.41.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4f0633e3d9d9ee6179aff2fdca5293f5
diff --git a/app-crypt/keybase-1.0.41-r2 b/app-crypt/keybase-1.0.41-r2
deleted file mode 100644
index bee38f320c83..000000000000
--- a/app-crypt/keybase-1.0.41-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-lang/go-1.6:0 app-crypt/kbfs virtual/pkgconfig
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v1.0.41.tar.gz -> keybase-1.0.41.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c94e9e6a9bca448b06a51a0d9af5532d
diff --git a/app-crypt/keybase-1.0.44 b/app-crypt/keybase-1.0.44
deleted file mode 100644
index 9ed1501fb8c0..000000000000
--- a/app-crypt/keybase-1.0.44
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-lang/go-1.6:0 app-crypt/kbfs virtual/pkgconfig
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-IUSE=+suid
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v1.0.44.tar.gz -> keybase-1.0.44.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ddbeb869a067b3fd9645c0a716a82189
diff --git a/app-crypt/keybase-1.0.44-r1 b/app-crypt/keybase-1.0.44-r1
deleted file mode 100644
index b72669bfb790..000000000000
--- a/app-crypt/keybase-1.0.44-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-lang/go-1.6:0 ~app-crypt/kbfs-1.0.44 virtual/pkgconfig
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-IUSE=+suid
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v1.0.44.tar.gz -> keybase-1.0.44.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d32467e570010d416e3dfdbf5d01a36f
diff --git a/app-crypt/keybase-1.0.48 b/app-crypt/keybase-1.0.48
deleted file mode 100644
index c66140e6f987..000000000000
--- a/app-crypt/keybase-1.0.48
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst test unpack
-DEPEND=~app-crypt/kbfs-1.0.48 >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v1.0.48.tar.gz -> keybase-1.0.48.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d5a2e45ce025305721218573f76e1cea
diff --git a/app-crypt/keybase-2.0.0 b/app-crypt/keybase-2.0.0
deleted file mode 100644
index f2cc861252ff..000000000000
--- a/app-crypt/keybase-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst test unpack
-DEPEND=~app-crypt/kbfs-2.0.0 >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v2.0.0.tar.gz -> keybase-2.0.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d5a2e45ce025305721218573f76e1cea
diff --git a/app-crypt/keybase-2.1.0 b/app-crypt/keybase-2.1.0
deleted file mode 100644
index 94187db87932..000000000000
--- a/app-crypt/keybase-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst test unpack
-DEPEND=~app-crypt/kbfs-2.1.0 >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v2.1.0.tar.gz -> keybase-2.1.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d5a2e45ce025305721218573f76e1cea
diff --git a/app-crypt/keybase-9999 b/app-crypt/keybase-9999
deleted file mode 100644
index abc0e5a34c68..000000000000
--- a/app-crypt/keybase-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst test unpack
-DEPEND=~app-crypt/kbfs-9999 >=dev-lang/go-1.9 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0b43e832508d6f814edf079838376b2d
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
new file mode 100644
index 000000000000..af571f7ae0bc
--- /dev/null
+++ b/app-crypt/keybase/Manifest
@@ -0,0 +1,15 @@
+DIST keybase-1.0.41.tar.gz 31643095 BLAKE2B 72fe94c8996b0dfad3d75f487545d5cb96ffa09c46276104171f103f2fcbb29199013ad8075fdddf3655f63f55cbd2f0d0768b5f0e697b7339262736d9c29ca5 SHA512 1382f008089d8704167842960aec9e4007ac32db589bad45944428ad92ac90b1802338ff6ccc0c570d40b9c9115170a2e15c590f875cdc8261d203c01402385c
+DIST keybase-1.0.44.tar.gz 31729876 BLAKE2B 945700824e630591f7b79dd5e8253156ee8e3ab1349f9ad584311d781cd9c98a5176884aa2fa34ac164af2194941822e56e96d7783843f649a97058edf015670 SHA512 a50c33548745e3c946099105c6926e4b4cd37a96c57d86ca7259b7b864f92a9e2b8823b992d7e367ee93a5832481360d66e170ba59a5cf99296dde20c1538c41
+DIST keybase-1.0.48.tar.gz 34026876 BLAKE2B c620a664b47f66932d1b49c22509aac73a6c82d77399019284f2887cdbf5166477ca824fcb2c2099d175fe4a38436c84c15b96a1c4faa4cdda62a9044b95e1c4 SHA512 fac72b7827dff350589e28e0d602b024130bc6bee8dd282dc141db773e493fcd4043aef6ce5382f92e1841619245c5819adf23d6dcf32b409939c275f40a03f1
+DIST keybase-2.0.0.tar.gz 34340958 BLAKE2B fa9bcf2285a987131e00a5bc8b06ad09fa86f3bf3de87cc4e48669131fcf93e2c515435fc1e9d6663455d16744889131d09b5957fa5f78f9d3ecc91d10667bc1 SHA512 d7b91c9a0ef69442501956ba3a09f40490adf76ef38bf945617793a8238daee68f3fc2be7a5d2118531c2364f5604016ec241226a22bd217dbab3dafbf77fd25
+DIST keybase-2.1.0.tar.gz 34444571 BLAKE2B 834f1001b136461c5665f12530d660e619d93c8b4e4b5f0c96da94af23f0667c778d7ddabc65d0585ac472cd91f89240bc4260b2034bf20c26b4047839570299 SHA512 0d71a22b5f56442fdc03848f831487da097dc817bfcacfb5a8eea1a9a13e87d231619216b6bab61862de71289373977c4c8d345518152137c8804005bf20e3e4
+EBUILD keybase-1.0.41-r1.ebuild 1406 BLAKE2B 98696edcda23f847bbae3bafba3746cab2ca20b63b097b9609fbe89f563d23273039cc0851314d28df3367f002392cfd27dbb0a47a6fb2770e6f3618f1761924 SHA512 8b2c29ff8ebc3c942c1d9bcf0a14b45381853ad72593a18f0c92123e2d915c62ab4b92ed61f121c9c23f0397d966423eb2b2fa2636f591f6cf73a5b490b2c1ce
+EBUILD keybase-1.0.41-r2.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
+EBUILD keybase-1.0.41.ebuild 959 BLAKE2B f94747768552a47f9ca7f9d786d6933caa3fb8df52e183cea08f953cc5e611e94e16bcf107d086a0c625ae888e907d583cd43af1147da5ab0d46eaafd148fb75 SHA512 6c8f0f09c879583bda20b6a693fee84d7ac8434d01c2e60131bf85ceec27eea91874870543b5c1b26e133ef7afd0e7f185ed582b4d49ff669cfa2cc1e0f76db7
+EBUILD keybase-1.0.44-r1.ebuild 1601 BLAKE2B 37f326eb08651557328e0bc111255228abfa1d53d8fe326372e145f56248c6afc5470524eefba84892d4b72ec94ddd05f12e3ad25c6635ed7ad9a53475b3237d SHA512 be291b6b942d0b0468a93df396ca51d46ca9406b6c84e3f23bf0368f5f66a4e7459b86718c55eb8ada1e1fafdd47aa9d0e8329d77a853c5869573d6469462ffd
+EBUILD keybase-1.0.44.ebuild 1594 BLAKE2B 45c65cd0f7b749d8d07a06426b6ab9d7fe16acadeb7b0616b87edc4ebc490f66c6cfe0155ac4d409dc782273a063d144de19fdece9498f9723e03873cc2b95f3 SHA512 b6d0c8ea90998229f934b02b3822565f2368b72f828b6428528fb41649bbd62256e5396171568eadbf2ff9e2887e9322424afa6767889bde316850144b0eaaa3
+EBUILD keybase-1.0.48.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
+EBUILD keybase-2.0.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
+EBUILD keybase-2.1.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
+EBUILD keybase-9999.ebuild 1268 BLAKE2B 7c57de5a44a42066ff20ace9720cbf1dbeb2b900794a94b82be66c4becbbfcc0148cd5038de6bb2f412b1dc86c4b23af336b81748e81fcf5069548c9cd9e26d3 SHA512 7b56be4322b630105f093853cb33afd2377b1df1b9ddb75e44579c64b76918940a0576aee4a39df55b49f0307b08144a3418a8835bb2cdcd0d3b868886ca0e3e
+MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-1.0.41-r1.ebuild b/app-crypt/keybase/keybase-1.0.41-r1.ebuild
new file mode 100644
index 000000000000..bd5957be4c0c
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.41-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils systemd user versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0
+	app-crypt/kbfs"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+pkg_setup() {
+	enewuser keybasehelper
+}
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase-mount-helper" \
+		github.com/keybase/client/go/mounter/keybase-mount-helper || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${T}/keybase-mount-helper"
+	fowners keybasehelper:keybasehelper "${EROOT}/usr/bin/keybase-mount-helper"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_dounit "${S}/packaging/linux/systemd/keybase.service"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+	elog "Restart keybase: run_keybase"
+}
diff --git a/app-crypt/keybase/keybase-1.0.41-r2.ebuild b/app-crypt/keybase/keybase-1.0.41-r2.ebuild
new file mode 100644
index 000000000000..afb357189ce5
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.41-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils systemd user versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0
+	app-crypt/kbfs"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+pkg_setup() {
+	enewuser keybasehelper
+}
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase-mount-helper" \
+		github.com/keybase/client/go/mounter/keybase-mount-helper || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${T}/keybase-mount-helper"
+	fowners keybasehelper:keybasehelper "${EROOT}/usr/bin/keybase-mount-helper"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+	elog "Restart keybase: run_keybase"
+}
diff --git a/app-crypt/keybase/keybase-1.0.41.ebuild b/app-crypt/keybase/keybase-1.0.41.ebuild
new file mode 100644
index 000000000000..581d0d13e243
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.41.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/keybase/keybase-1.0.44-r1.ebuild b/app-crypt/keybase/keybase-1.0.44-r1.ebuild
new file mode 100644
index 000000000000..232903d0c5f9
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.44-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils systemd user versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+suid"
+
+DEPEND="
+	>=dev-lang/go-1.6:0
+	~app-crypt/kbfs-${PV}"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+pkg_setup() {
+	enewuser keybasehelper
+}
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase-mount-helper" \
+		github.com/keybase/client/go/mounter/keybase-mount-helper || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dodir "/var/lib/keybase"
+	fowners keybasehelper:keybasehelper "/var/lib/keybase"
+	dosym "/tmp/keybase" "/var/lib/keybase/mount1"
+	dobin "${T}/keybase-mount-helper"
+	fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper"
+	use suid && fperms 4755 "/usr/bin/keybase-mount-helper"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+	elog "Restart keybase: run_keybase"
+}
diff --git a/app-crypt/keybase/keybase-1.0.44.ebuild b/app-crypt/keybase/keybase-1.0.44.ebuild
new file mode 100644
index 000000000000..505b2ca3eb20
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.44.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils systemd user versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+suid"
+
+DEPEND="
+	>=dev-lang/go-1.6:0
+	app-crypt/kbfs"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+pkg_setup() {
+	enewuser keybasehelper
+}
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase-mount-helper" \
+		github.com/keybase/client/go/mounter/keybase-mount-helper || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dodir "/var/lib/keybase"
+	fowners keybasehelper:keybasehelper "/var/lib/keybase"
+	dosym "/tmp/keybase" "/var/lib/keybase/mount1"
+	dobin "${T}/keybase-mount-helper"
+	fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper"
+	use suid && fperms 4755 "/usr/bin/keybase-mount-helper"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+	elog "Restart keybase: run_keybase"
+}
diff --git a/app-crypt/keybase/keybase-1.0.48.ebuild b/app-crypt/keybase/keybase-1.0.48.ebuild
new file mode 100644
index 000000000000..af077ef41e52
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.48.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	~app-crypt/kbfs-${PV}"
+RDEPEND="
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -vs "client-${PV}" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-crypt/keybase/keybase-2.0.0.ebuild b/app-crypt/keybase/keybase-2.0.0.ebuild
new file mode 100644
index 000000000000..af077ef41e52
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	~app-crypt/kbfs-${PV}"
+RDEPEND="
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -vs "client-${PV}" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-crypt/keybase/keybase-2.1.0.ebuild b/app-crypt/keybase/keybase-2.1.0.ebuild
new file mode 100644
index 000000000000..af077ef41e52
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	~app-crypt/kbfs-${PV}"
+RDEPEND="
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -vs "client-${PV}" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-crypt/keybase/keybase-9999.ebuild b/app-crypt/keybase/keybase-9999.ebuild
new file mode 100644
index 000000000000..e1c48d66de9c
--- /dev/null
+++ b/app-crypt/keybase/keybase-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd git-r3
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+EGIT_REPO_URI="https://github.com/keybase/client.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	~app-crypt/kbfs-${PV}"
+RDEPEND="
+	app-crypt/gnupg"
+
+src_unpack() {
+	git-r3_src_unpack
+	ln -vs "client" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-crypt/keybase/metadata.xml b/app-crypt/keybase/metadata.xml
new file mode 100644
index 000000000000..5a46be00f249
--- /dev/null
+++ b/app-crypt/keybase/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
+	</maintainer>
+	<longdescription lang="en">
+		Get a public key, safely, starting just with someone's social media username(s)
+	</longdescription>
+	<upstream>
+		<remote-id type="github">keybase/node-client</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/keylookup-2.2 b/app-crypt/keylookup-2.2
deleted file mode 100644
index ec7886b753eb..000000000000
--- a/app-crypt/keylookup-2.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A tool to fetch PGP keys from keyservers
-EAPI=6
-HOMEPAGE=http://www.palfrader.org/keylookup/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-crypt/gnupg
-SLOT=0
-SRC_URI=http://www.palfrader.org/keylookup/files/keylookup-2.2.tar.gz
-_md5_=a2a0506cda94e5cca3f59041a29275a1
diff --git a/app-crypt/keylookup-2.2-r9999 b/app-crypt/keylookup-2.2-r9999
deleted file mode 100644
index 73d0d5c2603a..000000000000
--- a/app-crypt/keylookup-2.2-r9999
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A tool to fetch PGP keys from keyservers
-EAPI=0
-HOMEPAGE=http://www.palfrader.org/keylookup/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/signing-party-1.1.3-r2
-SLOT=0
-_md5_=179fbea53511988ccd9c9227c7158e74
diff --git a/app-crypt/keylookup/Manifest b/app-crypt/keylookup/Manifest
new file mode 100644
index 000000000000..48f637596a77
--- /dev/null
+++ b/app-crypt/keylookup/Manifest
@@ -0,0 +1,4 @@
+DIST keylookup-2.2.tar.gz 13188 BLAKE2B 63d1c218fe5fc6a69baa73d58f1cd491125e5718745fc932d802e378c9b0038da12d5f9edac73598e3ecd94b0ed057273c813c3723446d045e4719621d735c3e SHA512 e9aa931bdf33a720b1262449d63e7e9592b375526eb33832ff966968a20dac1a0362e0db0e4444dba868ee4ad8c3e553e9cc3f3c60376d95b8a303e05d722abb
+EBUILD keylookup-2.2-r9999.ebuild 372 BLAKE2B 8d6a21ea93d9883f6747c07eb86d2b3270fc62771773d5daff03f9a73743bdbb0c5c023da682140f4a5f869578a9d3d9a4a344fd13f0e87aaa099cf8f55c8cef SHA512 885d14d1a10e7ddf7d326d2e507fd4d4557fb75e0f854c7348f84a9b97d86c777c7897f15395b609097df0506b4310c2b6a1d4af5e0696a5f83bd978f2e240b2
+EBUILD keylookup-2.2.ebuild 486 BLAKE2B 69dc89735a4986f4aa483f9dcc5aab7a894da84af3535b3bee3a0dc07bac436d42c8863ca84b3375dcbe906ca591602c60151cd49a579e3979f7d29c03f12dcc SHA512 7a58431179b681bc02e54965f60004d95ce412363c872d303c717c99d78b973d72e32e986def388184c03ec1e2a693577552454b44f156d932cc81a456bf703a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/keylookup/keylookup-2.2-r9999.ebuild b/app-crypt/keylookup/keylookup-2.2-r9999.ebuild
new file mode 100644
index 000000000000..104a5b70e985
--- /dev/null
+++ b/app-crypt/keylookup/keylookup-2.2-r9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="A tool to fetch PGP keys from keyservers"
+HOMEPAGE="http://www.palfrader.org/keylookup/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=app-crypt/signing-party-1.1.3-r2"
diff --git a/app-crypt/keylookup/keylookup-2.2.ebuild b/app-crypt/keylookup/keylookup-2.2.ebuild
new file mode 100644
index 000000000000..4f441c7cff56
--- /dev/null
+++ b/app-crypt/keylookup/keylookup-2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool to fetch PGP keys from keyservers"
+HOMEPAGE="http://www.palfrader.org/keylookup/"
+SRC_URI="http://www.palfrader.org/keylookup/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	app-crypt/gnupg"
+
+src_install() {
+	dobin keylookup
+	doman keylookup.1
+	einstalldocs
+}
diff --git a/app-crypt/keylookup/metadata.xml b/app-crypt/keylookup/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-crypt/keylookup/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/keynote-2.3-r3 b/app-crypt/keynote-2.3-r3
deleted file mode 100644
index 1ac2a41d3156..000000000000
--- a/app-crypt/keynote-2.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/yacc
-DESCRIPTION=The KeyNote Trust-Management System
-EAPI=5
-HOMEPAGE=http://www1.cs.columbia.edu/~angelos/keynote.html
-IUSE=libressl ssl
-KEYWORDS=amd64 x86
-LICENSE=keynote
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://www1.cs.columbia.edu/~angelos/Code/keynote-2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6fd7e5e7aa0c5440bdbc455e31acd9f0
diff --git a/app-crypt/keynote/Manifest b/app-crypt/keynote/Manifest
new file mode 100644
index 000000000000..5f8be27d60e9
--- /dev/null
+++ b/app-crypt/keynote/Manifest
@@ -0,0 +1,5 @@
+AUX keynote-2.3-parallel-build.patch 477 BLAKE2B 16474affd6754a65baf18b7e4bd866c3cd41ed15d8e2f16385f6f60162471364045894e4cde04dbc4fb4fccf3bce2b956ceccc30bdb30d8a078974157ce7cc12 SHA512 1c1934150dd9137d410755e2c6a85f17f3b84e60f24abac070ae240c6b6581b3123f35b927edc2bf17296a0d797409cd1865d7d72b58f15488b66ad26c6bf996
+AUX keynote-2.3-qa.patch 1112 BLAKE2B 70392cfc6c9686ac93d5c81de187ee3f483b23d5446a1f6497cbd7cc6396eadedd75fd321ac126171d66ed7b77fef2c9534e3046bb64d6c3f5cccf1ee20b7f35 SHA512 ec681de7b3f4372a07c0b8a693e4d83d12cdd28fcd605044a2afd8dc9645eb09815efa1d1c74232deb96bb88c394a05ba803e61be912c3a4369f07d62e0eb4a2
+DIST keynote-2.3.tar.gz 141930 BLAKE2B 9cbf18214ca8d39a09be149370b104989470d8040ea307b263451d0d0c74f4658f4620ac16d8f2a5310edca78555e6b8077d67c96941722cd0bc8afa923a2452 SHA512 c4f2f70718cf6092a9af82d6f6e1d8e24d03be9a938e2bde830b24794cd20610b8f647c552d46e37e840f1a1a432dc797b65548c4d39cdbaa65ec2d11f6cfefe
+EBUILD keynote-2.3-r3.ebuild 959 BLAKE2B cc898503df600633b5f69cba59f75ff86e584c99ac26876d7550932ebc8165ef787b60701d4a93cec328ec5715fb71e632fe8b49ccb0cf6147a76ef309b55331 SHA512 b581c7d90e4e8b5db0028f435ecc1810f3fd180260ee2892fee537598dcc4458ef8e745a1570224859605e27e7d850098251702e0b68804733ffa431ebdbcce4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
new file mode 100644
index 000000000000..cf4b4926f79d
--- /dev/null
+++ b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
@@ -0,0 +1,14 @@
+--- keynote-2.3.orig/Makefile.in	2010-02-04 09:51:35.757096194 +0100
++++ keynote-2.3/Makefile.in	2010-02-04 09:52:17.441137132 +0100
+@@ -86,9 +86,11 @@
+ 
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ 	$(YACC) $(YACCFLAGS) keynote.y
++k.tab.h: k.tab.c
+ 
+ z.tab.c: keynote-ver.y keynote.h header.h config.h
+ 	$(YACC) $(YACCFLAGS2) keynote-ver.y
++z.tab.h: z.tab.c
+ 
+ lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h
+ 	$(LEX) $(LEXFLAGS) keynote.l
diff --git a/app-crypt/keynote/files/keynote-2.3-qa.patch b/app-crypt/keynote/files/keynote-2.3-qa.patch
new file mode 100644
index 000000000000..f6b1ff28cdb8
--- /dev/null
+++ b/app-crypt/keynote/files/keynote-2.3-qa.patch
@@ -0,0 +1,44 @@
+Respect CFLAGS, LDFLAGS, and AR.
+
+The better way to fix AR would be to patch configure.in,
+but it is sufficiently old to fail with current autotools.
+--- Makefile.in
++++ Makefile.in
+@@ -27,7 +27,6 @@
+ YACC = @YACC@
+ SSLEAY = @SSLEAY@
+ RM = @RM@
+-AR = @AR@
+ NROFF = @NROFF@
+ TAR = @TAR@
+ TRUE = @TRUE@
+@@ -41,10 +40,10 @@
+ YACCFLAGS = -d -p kn -b k
+ LEXFLAGS2 = -Pkv -s -i
+ LEXFLAGS = -Cr -Pkn -s -i
+-CFLAGS = -O2 -Wall # -g
+ RMFLAGS2 = -rf
+ RMFLAGS = -f
+ NROFFFLAGS = -mandoc
++LDFLAGS = @LDFLAGS@
+ 
+ SSLCONF = testsuite/openssl.cnf
+ SSLCERT = testsuite/test.cert.pem
+@@ -83,7 +82,7 @@
+ 	$(RANLIB) $(TARGET)
+ 
+ $(TARGET2): $(TARGET) $(OBJS2)
+-	$(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
+ 
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ 	$(YACC) $(YACCFLAGS) keynote.y
+@@ -131,7 +130,7 @@
+ 	-keyout $(SSLKEY)
+ 
+ test-sample: all $(OBJS3)
+-	$(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
+ 
+ test-sig: all $(SSLCERT) $(SSLKEY)
+ 	$(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1
diff --git a/app-crypt/keynote/keynote-2.3-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild
new file mode 100644
index 000000000000..b4351b69e09b
--- /dev/null
+++ b/app-crypt/keynote/keynote-2.3-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The KeyNote Trust-Management System"
+HOMEPAGE="http://www1.cs.columbia.edu/~angelos/keynote.html"
+SRC_URI="http://www1.cs.columbia.edu/~angelos/Code/${P}.tar.gz"
+
+LICENSE="keynote"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libressl ssl"
+
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+pkg_setup() {
+	tc-export AR CC RANLIB
+	# bug #448904
+	export ac_cv_path_AR="$(type -p $(tc-getAR))"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qa.patch
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+}
+
+src_compile() {
+	if use ssl; then
+		emake
+	else
+		emake nocrypto
+	fi
+}
+
+src_install() {
+	dobin keynote
+
+	dolib.a libkeynote.a
+
+	insinto /usr/include
+	doins keynote.h
+
+	doman man/keynote.[1345]
+	dodoc README HOWTO.add.crypto TODO
+}
diff --git a/app-crypt/keynote/metadata.xml b/app-crypt/keynote/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-crypt/keynote/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/kstart-4.1 b/app-crypt/kstart-4.1
deleted file mode 100644
index 3ee8cfb45283..000000000000
--- a/app-crypt/kstart-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/krb5 afs? ( net-fs/openafs )
-DESCRIPTION=Modified versions of kinit for refreshing kerberos tickets automatically
-EAPI=4
-HOMEPAGE=https://www.eyrie.org/~eagle/software/kstart/
-IUSE=afs
-KEYWORDS=amd64 x86
-LICENSE=|| ( MIT Stanford ISC )
-RDEPEND=virtual/krb5 afs? ( net-fs/openafs )
-SLOT=0
-SRC_URI=https://archives.eyrie.org/software/kerberos/kstart-4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d38717684e5e38f60af986815caa5c00
diff --git a/app-crypt/kstart-4.2 b/app-crypt/kstart-4.2
deleted file mode 100644
index dcd13981a8e5..000000000000
--- a/app-crypt/kstart-4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/krb5 afs? ( net-fs/openafs )
-DESCRIPTION=Modified versions of kinit for refreshing kerberos tickets automatically
-EAPI=6
-HOMEPAGE=https://www.eyrie.org/~eagle/software/kstart/
-IUSE=afs
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Stanford ISC )
-RDEPEND=virtual/krb5 afs? ( net-fs/openafs )
-SLOT=0
-SRC_URI=https://archives.eyrie.org/software/kerberos/kstart-4.2.tar.gz
-_md5_=ec0517148b579db67bb99da4d923eb65
diff --git a/app-crypt/kstart/Manifest b/app-crypt/kstart/Manifest
new file mode 100644
index 000000000000..71a99e1369e2
--- /dev/null
+++ b/app-crypt/kstart/Manifest
@@ -0,0 +1,5 @@
+DIST kstart-4.1.tar.gz 269215 BLAKE2B 0d979953206e1598c121e21b2c52a123a4b5d93872ce8292638e21c5d9a4c1be0345990f1a74fa60e9a5ce58d6f166cca5ae525f97c67f7a908d73e7657d6fe8 SHA512 74a8a3f2c8d2c95f166f5861fb05a2d659a31db3165e27e81e5cf216bde44809d937ebc00995f89fa3b9df68609e3081303eb30742f5c4d90151b1410f0bd3cc
+DIST kstart-4.2.tar.gz 296651 BLAKE2B 127bf28ef538681d188ae79ed67cedaa7d9022c1fe6741b3486ce7d5901c4a77d0aec7d00164240a79ffc70b56dd7fdeaf42e76dd2b02effe79bcad41ad8e271 SHA512 7ce9c1f964c0d469b4b8a5de88ae83186e99116959941c4e7f69c59165d0c22aac432ac26dd5fe54f7c2f725048bb55b787107aea8408e2fd6c9ad02dcb31552
+EBUILD kstart-4.1.ebuild 706 BLAKE2B 3f43a948aa353100c667e7629132bdbcf22d076d207442a7e0c97b690009dc4d3054811c1ea98af7046182227fb4d5024d1bb24b64e9848b7b983b4d8d6b7865 SHA512 2b8865c5460966d049363d1ddef18db1abbadb1c7e527b9a22dfcd4eac9eca6938485772756ad906183e076dee9d29ef459c2b877335196f81033bf1c5f01c98
+EBUILD kstart-4.2.ebuild 666 BLAKE2B ce11818d2327c2ca3d8ff561a5f22248523b1c13162dbec270eadc05667dfbedd262c5b3d7adba98486e93f2bbfe9a6f5de275516fac6d027a1b81db5d6f9605 SHA512 d267f318c97bb1843f9ce3da3f7af0fb5d2cb570037d4c2e3ea8edcfc446c69a027caa05c9d9523d2094949925afbf71b75efc913ac42d1fd5de953920414bad
+MISC metadata.xml 807 BLAKE2B 9c7c0283dce5943b74d5d57b21fdfb11cd2f9b994ca1930e62997576e20e3a74cb468565824c44051b67fd87b44f70f08defcd834d2dc03e98b5de62289cf08c SHA512 d854205e8829d141c3cd94cc00db039fce23376cb4f75c2498ae46d714765103890329526d2fe85f2eeff238fe2620f616686e78c62c9a115051d5fc161d19b5
diff --git a/app-crypt/kstart/kstart-4.1.ebuild b/app-crypt/kstart/kstart-4.1.ebuild
new file mode 100644
index 000000000000..c80974b18abb
--- /dev/null
+++ b/app-crypt/kstart/kstart-4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
+automatically"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
+SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
+
+LICENSE="|| ( MIT Stanford ISC )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="afs"
+
+DEPEND="virtual/krb5
+		afs? ( net-fs/openafs )"
+RDEPEND="$DEPEND"
+
+src_configure() {
+	econf \
+		--enable-reduced-depends \
+		"$(use_with afs)" \
+		"$(use_enable afs setpag)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doman k5start.1 krenew.1
+	dodoc README NEWS TODO examples/*
+}
diff --git a/app-crypt/kstart/kstart-4.2.ebuild b/app-crypt/kstart/kstart-4.2.ebuild
new file mode 100644
index 000000000000..0f9b5ae1131c
--- /dev/null
+++ b/app-crypt/kstart/kstart-4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
+automatically"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
+SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
+
+LICENSE="|| ( MIT Stanford ISC )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="afs"
+
+DEPEND="virtual/krb5
+		afs? ( net-fs/openafs )"
+RDEPEND="$DEPEND"
+
+src_configure() {
+	econf \
+		--enable-reduced-depends \
+		"$(use_with afs)" \
+		"$(use_enable afs setpag)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README NEWS TODO examples/*
+}
diff --git a/app-crypt/kstart/metadata.xml b/app-crypt/kstart/metadata.xml
new file mode 100644
index 000000000000..0a3c1226d1c1
--- /dev/null
+++ b/app-crypt/kstart/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>kerberos@gentoo.org</email>
+    <name>Kerberos</name>
+  </maintainer>
+  <longdescription>Modified versions of kinit that can use srvtabs or
+  keytabs to authenticate, can run as daemons and wake up periodically
+  to refresh a ticket, and can run single commands with their own
+  authentication credentials and refresh those credentials until the
+  command exits.</longdescription>
+  <use>
+    <flag name="afs">
+      Enables afs support which means you can acquire an afs token and
+      set PAGs. It's recommended to set this USE if you need
+      authenticated access to an AFS cell for your daemon/app.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/app-crypt/libb2-0.98 b/app-crypt/libb2-0.98
deleted file mode 100644
index d9e99d39d25b..000000000000
--- a/app-crypt/libb2-0.98
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
-EAPI=6
-HOMEPAGE=https://github.com/BLAKE2/libb2
-IUSE=static native-cflags
-KEYWORDS=~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris
-LICENSE=CC0-1.0
-SLOT=0
-SRC_URI=https://github.com/BLAKE2/libb2/archive/0d7015f6a640a63bc6c68562328e112445ea9d5c.tar.gz -> libb2-0.98.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b246fbb10318e8b27bf5c8c09359b66c
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
new file mode 100644
index 000000000000..a642089516dc
--- /dev/null
+++ b/app-crypt/libb2/Manifest
@@ -0,0 +1,3 @@
+DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
+EBUILD libb2-0.98.ebuild 983 BLAKE2B ef56ce606348776f1bf24a3e275c95ae40e0569e46dad425c5e47b30b6df4ea512477f41bf117b4e4b0562d4ffbbc2de9ef2d9e4e6b897bc25859ee5f6c63816 SHA512 8e69f8cee42a75680d4aa616127482c36f986cf32f5c2612e0c1af7418b8b62cbd0cb73163ba93190b9359389a13eb31fd75528110391318dc3d14d0d78447a4
+MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.ebuild b/app-crypt/libb2/libb2-0.98.ebuild
new file mode 100644
index 000000000000..3ca37501441b
--- /dev/null
+++ b/app-crypt/libb2/libb2-0.98.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
+HOMEPAGE="https://github.com/BLAKE2/libb2"
+GITHASH="0d7015f6a640a63bc6c68562328e112445ea9d5c"
+SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="static native-cflags"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${GITHASH}
+
+src_prepare() {
+	default
+	# fix bashism
+	sed -i -e 's/ == / = /' configure.ac || die
+	eautoreconf  # upstream doesn't make releases
+}
+
+src_configure() {
+	econf \
+		$(use_enable static) \
+		$(use_enable native-cflags native)
+}
+
+src_compile() {
+	# respect our CFLAGS when native-cflags is not in effect
+	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/libb2/metadata.xml b/app-crypt/libb2/metadata.xml
new file mode 100644
index 000000000000..76fd7590acbb
--- /dev/null
+++ b/app-crypt/libb2/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<longdescription lang="en">
+		C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
+
+		Official implementations from BLAKE2 project.
+	</longdescription>
+	<use>
+		<flag name="native-cflags">
+		Use CFLAGS as determined by configure script.  These flags will
+		enable all CPU specific features it find available, to further
+		optimise the implementation.  This discards any existing CFLAGS
+		set in make.conf or similar.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/libmd-0.0.0 b/app-crypt/libmd-0.0.0
deleted file mode 100644
index 8dcefc38acaa..000000000000
--- a/app-crypt/libmd-0.0.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Message Digest functions from BSD systems
-EAPI=6
-HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
-SLOT=0
-SRC_URI=https://archive.hadrons.org/software/libmd/libmd-0.0.0.tar.xz
-_md5_=1b4fdc373d34feec30240ba34f68f0f4
diff --git a/app-crypt/libmd-1.0.0 b/app-crypt/libmd-1.0.0
deleted file mode 100644
index 82c212338fc7..000000000000
--- a/app-crypt/libmd-1.0.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Message Digest functions from BSD systems
-EAPI=6
-HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
-SLOT=0
-SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.0.tar.xz
-_md5_=ae239665f4e53ba2002161352bdc238f
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
new file mode 100644
index 000000000000..87d1a2318281
--- /dev/null
+++ b/app-crypt/libmd/Manifest
@@ -0,0 +1,5 @@
+DIST libmd-0.0.0.tar.xz 252384 BLAKE2B 00db5db91c35fc27a681977155eb18fee44f553911938abd4b57656a4b71c0de7014df0d8303d48b40b5fe688fb150e06a03ea44d089e4ea1f52ac4060ea7c84 SHA512 6677959b7725114d7ebb747e0746d2712fc9b65f688eb28fa931c9042cee10cda3de33a1496b0220141800e98cf923d95dd5a5f3c2b8a68c3e169ef9fdaa39ef
+DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af8055885b08084fafd7299e9aaea95efb8437ffa756e43c5bb75fac99af067c6a560f3bb2b8b93ee889d5e664b SHA512 54c3cae1308f7686a1f642d25ae5d8cfb0fce2b98b33cf5e2891682893715c7de7e9700c70a6bd7e4ab4cf7f54c87643b259319e09e03f529b70d273477fc8be
+EBUILD libmd-0.0.0.ebuild 386 BLAKE2B c70801d1e4958802b33f8a6aa64b4ef8bb477f96bd19155f964d1c3c17cd52dfc18d47d864bf006550833d1aa9f7134c919428b78a9e09dbc956e8f95f73753d SHA512 b60e55904bc356ec87b60ace12914bc5d301a07939092615c3fe38f2eef4258b30d04e2b2cd3f5a39b28326a08f28bd0949363c172d29f9c6c021aceaba0193f
+EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/libmd/libmd-0.0.0.ebuild b/app-crypt/libmd/libmd-0.0.0.ebuild
new file mode 100644
index 000000000000..28cdc290c7ed
--- /dev/null
+++ b/app-crypt/libmd/libmd-0.0.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Message Digest functions from BSD systems"
+HOMEPAGE="https://www.hadrons.org/software/libmd/"
+SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
+
+LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
diff --git a/app-crypt/libmd/libmd-1.0.0.ebuild b/app-crypt/libmd/libmd-1.0.0.ebuild
new file mode 100644
index 000000000000..aed0b60e74e8
--- /dev/null
+++ b/app-crypt/libmd/libmd-1.0.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Message Digest functions from BSD systems"
+HOMEPAGE="https://www.hadrons.org/software/libmd/"
+SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
+
+LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
diff --git a/app-crypt/libmd/metadata.xml b/app-crypt/libmd/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-crypt/libmd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/libnitrokey-3.3 b/app-crypt/libnitrokey-3.3
deleted file mode 100644
index 81677e357694..000000000000
--- a/app-crypt/libnitrokey-3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/hidapi:= virtual/udev virtual/pkgconfig test? ( >=dev-cpp/catch-2.2.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Support library for the Nitrokey
-EAPI=6
-HOMEPAGE=https://github.com/Nitrokey/libnitrokey
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-libs/hidapi:= virtual/udev
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Nitrokey/libnitrokey/archive/v3.3.tar.gz -> libnitrokey-3.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=167b4440d5c1743588c6d2c4def9994b
diff --git a/app-crypt/libnitrokey-9999 b/app-crypt/libnitrokey-9999
deleted file mode 100644
index bd2fbca31171..000000000000
--- a/app-crypt/libnitrokey-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/hidapi:= virtual/udev virtual/pkgconfig test? ( >=dev-cpp/catch-2.2.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Support library for the Nitrokey
-EAPI=6
-HOMEPAGE=https://github.com/Nitrokey/libnitrokey
-IUSE=test
-LICENSE=GPL-3
-RDEPEND=dev-libs/hidapi:= virtual/udev
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=167b4440d5c1743588c6d2c4def9994b
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
new file mode 100644
index 000000000000..e7d606f5fdaa
--- /dev/null
+++ b/app-crypt/libnitrokey/Manifest
@@ -0,0 +1,4 @@
+DIST libnitrokey-3.3.tar.gz 76581 BLAKE2B 1a662fb94184355dc5cae2f8e3109fc82a96aed06c726e04c4fcfef3aef0423150ac1f4647e4bf3585de7805e70cd67534d72f1255c9f80b57afa2aec36fc9d3 SHA512 fe3b6c7bdeb78f736fe7aa7475880a293c516119ac049ff47ddbaba626f2d70addee4d0cd3a38ea706b94717f51c4fb56f687d5a9bb9f10895836c5adc98b11b
+EBUILD libnitrokey-3.3.ebuild 1145 BLAKE2B 01a32d7b4498ede0e645ed6747e5d2901bacfe8602d598be4b92ff7952597f430b4b68123d60d8dc4277af4bba88b3598e0dd52fe645862d0b470ef0c9c4fc74 SHA512 bd3ddfb326baf091cdd4062819e2cc5635c4aaeb1f4b9436465f89e1cbb58289ca9ca061a6c938ef711604879dbcdb32e475d22184f5480b0c42b67bc1499fb1
+EBUILD libnitrokey-9999.ebuild 1145 BLAKE2B 01a32d7b4498ede0e645ed6747e5d2901bacfe8602d598be4b92ff7952597f430b4b68123d60d8dc4277af4bba88b3598e0dd52fe645862d0b470ef0c9c4fc74 SHA512 bd3ddfb326baf091cdd4062819e2cc5635c4aaeb1f4b9436465f89e1cbb58289ca9ca061a6c938ef711604879dbcdb32e475d22184f5480b0c42b67bc1499fb1
+MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e
diff --git a/app-crypt/libnitrokey/libnitrokey-3.3.ebuild b/app-crypt/libnitrokey/libnitrokey-3.3.ebuild
new file mode 100644
index 000000000000..32cf1940ee3a
--- /dev/null
+++ b/app-crypt/libnitrokey/libnitrokey-3.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils udev
+
+DESCRIPTION="Support library for the Nitrokey"
+HOMEPAGE="https://github.com/Nitrokey/libnitrokey"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nitrokey/libnitrokey.git"
+
+	# Disable pulling in bundled dependencies
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/hidapi:=
+	virtual/udev"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-cpp/catch-2.2.0 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DBUILD_SHARED_LIBS=ON
+
+		# actual hardware tests
+		#   1. require a connected Nitrokey
+		#   2. may kill data on your Nitrokey
+		# hence the main testsuite is disabled
+		-DCOMPILE_TESTS=OFF
+		-DCOMPILE_OFFLINE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-crypt/libnitrokey/libnitrokey-9999.ebuild b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
new file mode 100644
index 000000000000..32cf1940ee3a
--- /dev/null
+++ b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils udev
+
+DESCRIPTION="Support library for the Nitrokey"
+HOMEPAGE="https://github.com/Nitrokey/libnitrokey"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nitrokey/libnitrokey.git"
+
+	# Disable pulling in bundled dependencies
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/hidapi:=
+	virtual/udev"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-cpp/catch-2.2.0 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DBUILD_SHARED_LIBS=ON
+
+		# actual hardware tests
+		#   1. require a connected Nitrokey
+		#   2. may kill data on your Nitrokey
+		# hence the main testsuite is disabled
+		-DCOMPILE_TESTS=OFF
+		-DCOMPILE_OFFLINE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-crypt/libnitrokey/metadata.xml b/app-crypt/libnitrokey/metadata.xml
new file mode 100644
index 000000000000..bea0c015c764
--- /dev/null
+++ b/app-crypt/libnitrokey/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Nitrokey/libnitrokey</remote-id>
+		<bugs-to>https://github.com/Nitrokey/libnitrokey/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/libscrypt-1.21 b/app-crypt/libscrypt-1.21
deleted file mode 100644
index a6d8b136bf41..000000000000
--- a/app-crypt/libscrypt-1.21
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile setup
-DESCRIPTION=Shared library to impliment the scrypt algorithm
-EAPI=6
-HOMEPAGE=https://github.com/technion/libscrypt
-KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/technion/libscrypt/archive/v1.21.tar.gz -> libscrypt-1.21.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=67eff479f43c455480417ea9b93f5636
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
new file mode 100644
index 000000000000..8e17ba85fc70
--- /dev/null
+++ b/app-crypt/libscrypt/Manifest
@@ -0,0 +1,4 @@
+AUX libscrypt-1.21-build.patch 2460 BLAKE2B 139168dc59ea0001b5106a62731379c8a54e713d0bb5a30ab736eab36b2e8918d2ce47c8b3dc264b50172868c9c5108d0cd093c68e4fe4d3668301d84b15269c SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d
+DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34
+EBUILD libscrypt-1.21.ebuild 709 BLAKE2B 1c2bfa6f478996809d468000838d310208a1e79fbc5db4a4b0a2cf5b631c48b5b2fe8bf5c7bd2708a6ffba0b6e63d858aadcfcbf3f382308cfdf520b25d5d1c5 SHA512 6999f0a1a937c7b7fae9e3af4c60a4385e7c3662e9625760d2c3392eaad2cd11e5a0e1b2f863f35368fc66c16f765539275eeafdc20afaa5d44826e59018f30e
+MISC metadata.xml 345 BLAKE2B affc5819c29d3b72ccc6a15e4d0b01bbff5bd3fdbe617c1b90dbd3af812127731d9981bab6a5ddd4a66cb1dcbb6bfa91b692cae1e5daf8247b84f25aa9bc01c1 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383
diff --git a/app-crypt/libscrypt/files/libscrypt-1.21-build.patch b/app-crypt/libscrypt/files/libscrypt-1.21-build.patch
new file mode 100644
index 000000000000..236e80730d57
--- /dev/null
+++ b/app-crypt/libscrypt/files/libscrypt-1.21-build.patch
@@ -0,0 +1,76 @@
+From bdfec26744122e8f52a58bc086c89b27faaf5888 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 1 Jul 2017 23:06:41 +0300
+Subject: [PATCH 1/2] build: move non-essential flags to *_EXTRA
+
+This enables downstream to selectively add/replace the optimization and
+other non-essential flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7022a4a..c9313cb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,21 +5,22 @@ MAKE_DIR     ?= install -d
+ INSTALL_DATA ?= install
+ 
+ CC?=gcc
+-CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC
+-LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version
+-CFLAGS_EXTRA?=-Wl,-rpath=.
++CFLAGS?=$(CFLAGS_EXTRA) -D_FORTIFY_SOURCE=2 -fPIC
++LDFLAGS?=$(LDFLAGS_EXTRA) -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version
++CFLAGS_EXTRA?=-Wl,-rpath=. -O2 -Wall -g -fstack-protector
++LDFLAGS_EXTRA?=-Wl,-z,relro
+ 
+ all: reference
+ 
+ OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o
+ 
+ libscrypt.so.0: $(OBJS) 
+-	$(CC)  $(LDFLAGS) -shared -o libscrypt.so.0  $(OBJS) -lm -lc
++	$(CC) $(LDFLAGS) -shared -o libscrypt.so.0  $(OBJS) -lm -lc
+ 	ar rcs libscrypt.a  $(OBJS)
+ 
+ reference: libscrypt.so.0 main.o crypto_scrypt-hexconvert.o
+ 	ln -s -f libscrypt.so.0 libscrypt.so
+-	$(CC) -Wall -o reference main.o b64.o crypto_scrypt-hexconvert.o $(CFLAGS_EXTRA) -L.  -lscrypt
++	$(CC) -o reference main.o b64.o crypto_scrypt-hexconvert.o $(CFLAGS) $(LDFLAGS_EXTRA) -L.  -lscrypt
+ 
+ clean:
+ 	rm -f *.o reference libscrypt.so* libscrypt.a endian.h
+-- 
+2.13.0
+
+From 7899df0447e0fcad32a6cce7439eef1f1295aaeb Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 1 Jul 2017 23:14:29 +0300
+Subject: [PATCH 2/2] build: run tests with local library
+
+Ensure tests can run and when run are run with current library.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c9313cb..783c537 100644
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,7 @@ clean:
+ 	rm -f *.o reference libscrypt.so* libscrypt.a endian.h
+ 
+ check: all
+-	./reference
++	LD_LIBRARY_PATH=. ./reference
+ 
+ devtest:
+ 	splint crypto_scrypt-hexconvert.c 
+-- 
+2.13.0
+
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
new file mode 100644
index 000000000000..62491faa8ab2
--- /dev/null
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Shared library to impliment the scrypt algorithm"
+HOMEPAGE="https://github.com/technion/libscrypt"
+SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	export LIBDIR=${PREFIX}/$(get_libdir)
+	export CFLAGS_EXTRA="${CFLAGS}"
+	export LDFLAGS_EXTRA="${LDFLAGS}"
+	export PREFIX=/usr
+	unset CFLAGS
+	unset LDFLAGS
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC)
+}
diff --git a/app-crypt/libscrypt/metadata.xml b/app-crypt/libscrypt/metadata.xml
new file mode 100644
index 000000000000..576146f2c144
--- /dev/null
+++ b/app-crypt/libscrypt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">technion/libscrypt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/libsecret-0.18.5 b/app-crypt/libsecret-0.18.5
deleted file mode 100644
index eb4af8e7d4e4..000000000000
--- a/app-crypt/libsecret-0.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29:= ) dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( dev-python/mock introspection? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-libs/gjs-1.32 dev-python/pygobject:3 ) ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
-IUSE=+crypt +introspection test vala debug test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=LGPL-2.1+ Apache-2.0
-PDEPEND=>=gnome-base/gnome-keyring-3
-RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.5.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e52e91fafcb5532a3c0709466d3519f
diff --git a/app-crypt/libsecret-0.18.6 b/app-crypt/libsecret-0.18.6
deleted file mode 100644
index be2fea3134ea..000000000000
--- a/app-crypt/libsecret-0.18.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29:= ) dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( || ( ( dev-lang/python:3.6 dev-python/mock[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] introspection? ( dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ( dev-lang/python:3.5 dev-python/mock[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] introspection? ( dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) ( dev-lang/python:3.4 dev-python/mock[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] introspection? ( dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) introspection? ( >=dev-libs/gjs-1.32 ) ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
-IUSE=+crypt +introspection test vala debug test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=LGPL-2.1+ Apache-2.0
-PDEPEND=>=gnome-base/gnome-keyring-3
-RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-REQUIRED_USE=test? ( introspection ) vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e65e782ed645223e46a3ccd9df11adc
diff --git a/app-crypt/libsecret-0.18.6-r1 b/app-crypt/libsecret-0.18.6-r1
deleted file mode 100644
index 87d1ae31e574..000000000000
--- a/app-crypt/libsecret-0.18.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= ) dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( || ( ( dev-lang/python:3.6 dev-python/mock[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] introspection? ( dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ( dev-lang/python:3.5 dev-python/mock[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] introspection? ( dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) ( dev-lang/python:3.4 dev-python/mock[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] introspection? ( dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) introspection? ( >=dev-libs/gjs-1.32 ) ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
-IUSE=+crypt +introspection test vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd
-LICENSE=LGPL-2.1+ Apache-2.0
-PDEPEND=>=gnome-base/gnome-keyring-3
-RDEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-REQUIRED_USE=test? ( introspection ) vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b98cffc86247cdba1eab306de3ebd8e
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
new file mode 100644
index 000000000000..05ec65f2b70d
--- /dev/null
+++ b/app-crypt/libsecret/Manifest
@@ -0,0 +1,6 @@
+DIST libsecret-0.18.5.tar.xz 508556 BLAKE2B e3410dd113dfa1f4ebb78a47f90e23455eb8f82466d4607aa469c04adc84aa3181bfdb7dcb4ff459fd2aa49c315ffd52fd2d3a4929694909fe65af637b65482b SHA512 4ee297b556d3b555b6ca9f5eb5cc87425b782491d0550a75873aac0f7019b123f437f0731c85bb058fc65b50a589d54d0697657a50bef4ac2952e9e40a916b5c
+DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
+EBUILD libsecret-0.18.5.ebuild 1587 BLAKE2B 5bc76ca976d6fb5747df1fc877a66789b2260322b40e4a0c01e125d35423f813d84964f0cd7e8ce24eca3a009d3071660037a5c40de1364f343bcb06272761fb SHA512 2b8a057d68fae082f3485e20f1e2c868842d23d2ea49b4e42f3e67d2a684581e517b6d9b4d9daa0a25799f560ce276feff6cdec064082ce38f3d364f7c32ec74
+EBUILD libsecret-0.18.6-r1.ebuild 2667 BLAKE2B ce87c3edccd6b4dc544581e35a8d4585f7307b874a3877d6b0eb0ab4d24219ebfb542138b2bb9af5a2344199a9cfd00aafba0c8b911be1b79af6334b7b7ca9e2 SHA512 0a2387d37fe23e652ed514fa01e7821fbe2be3d70fef1c4437b19965cfcb777fc0fd4d883198aec6bfb02ee1b2a25b0744932e2b389cc097274c37d6d2e0e32a
+EBUILD libsecret-0.18.6.ebuild 2117 BLAKE2B a84646e1f775dd6a3e4d2bc3bbb06a9e4a63cd363b71ddfc43feb46967486fe37dd322acd5f767d86f5e68bf2cce97a21d5bdbfb1f13b383ce59e3672fa4ff5a SHA512 9e6e9f150f3e2d8077f50c2bebf807f6785d3ca8ac230c71582521b817469cfb3b86ef71bdad14bea17896d6ef372dbe68672e63deca8be9c40ba980b3b8742a
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.5.ebuild b/app-crypt/libsecret/libsecret-0.18.5.ebuild
new file mode 100644
index 000000000000..aed7f8ac1079
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+PDEPEND=">=gnome-base/gnome-keyring-3
+"
+# PDEPEND to avoid circular dep (bug #547456)
+# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-python/mock
+		introspection? (
+			${PYTHON_DEPS}
+			>=dev-libs/gjs-1.32
+			dev-python/pygobject:3 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-manpages \
+		--disable-strict \
+		--disable-coverage \
+		--disable-static \
+		$(use_enable crypt gcrypt) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
new file mode 100644
index 000000000000..a28beccceb86
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 multilib-minimal python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt +introspection test vala"
+# Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
+REQUIRED_USE="test? ( introspection )
+	vala? ( introspection )"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+PDEPEND=">=gnome-base/gnome-keyring-3
+"
+# PDEPEND to avoid circular dep (bug #547456)
+# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		introspection? ( >=dev-libs/gjs-1.32 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	# Drop unwanted CFLAGS modifications
+	sed -e 's/CFLAGS="$CFLAGS -\(g\|O0\|O2\)"//' -i configure || die
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE=${S}
+	gnome2_src_configure \
+		--enable-manpages \
+		--disable-strict \
+		--disable-coverage \
+		--disable-static \
+		$(use_enable crypt gcrypt) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable vala) \
+		LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/libsecret/html docs/reference/libsecret/html || die
+	fi
+}
+
+multilib_src_test() {
+	# tests fail without gobject-introspection
+	multilib_is_native_abi && virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/app-crypt/libsecret/libsecret-0.18.6.ebuild b/app-crypt/libsecret/libsecret-0.18.6.ebuild
new file mode 100644
index 000000000000..5337020694d9
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt +introspection test vala"
+# Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
+REQUIRED_USE="test? ( introspection )
+	vala? ( introspection )"
+
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+PDEPEND=">=gnome-base/gnome-keyring-3
+"
+# PDEPEND to avoid circular dep (bug #547456)
+# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		introspection? ( >=dev-libs/gjs-1.32 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-manpages \
+		--disable-strict \
+		--disable-coverage \
+		--disable-static \
+		$(use_enable crypt gcrypt) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/app-crypt/libsecret/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/libu2f-host-1.1.1 b/app-crypt/libu2f-host-1.1.1
deleted file mode 100644
index f1655d9d031e..000000000000
--- a/app-crypt/libu2f-host-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/hidapi dev-libs/json-c:= virtual/pkgconfig >=app-portage/elt-patches-20170422 virtual/pkgconfig
-DESCRIPTION=Yubico Universal 2nd Factor (U2F) Host C Library
-EAPI=5
-HOMEPAGE=https://developers.yubico.com/libu2f-host/
-IUSE=kernel_linux static-libs systemd kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/hidapi dev-libs/json-c:= systemd? ( sys-apps/systemd[acl] )
-SLOT=0
-SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3262a9d96900598c6820399ebc328b5d
diff --git a/app-crypt/libu2f-host-1.1.3 b/app-crypt/libu2f-host-1.1.3
deleted file mode 100644
index a115895f7a68..000000000000
--- a/app-crypt/libu2f-host-1.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=dev-libs/hidapi dev-libs/json-c:= virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Yubico Universal 2nd Factor (U2F) Host C Library
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/libu2f-host/
-IUSE=kernel_linux static-libs systemd kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/hidapi dev-libs/json-c:= systemd? ( sys-apps/systemd[acl] )
-SLOT=0
-SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.3.tar.xz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=27957a18a9af7f21c08c8bd67de6b033
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
new file mode 100644
index 000000000000..f3724d79b5c5
--- /dev/null
+++ b/app-crypt/libu2f-host/Manifest
@@ -0,0 +1,5 @@
+DIST libu2f-host-1.1.1.tar.xz 455652 BLAKE2B f5cc4dd7752d66790b4139e5b8e9262f6622b9608bc8b220640db773ce1e794b58eb3fdf855df4e73417aabf5f8e979218dfd1b068111c66c6d830ef4b7ebb97 SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693
+DIST libu2f-host-1.1.3.tar.xz 469480 BLAKE2B b2a002fa694972e71aef73191608d079f1c13d98a2f40e06d25a6e50a3175100099adbc5b5067e5f1fe027042f99e198a07282df735ab4ff2eec63a4f5daf59a SHA512 6729dd35beaae1c96283f81794ac6c058ed6446f935a5cee7dc1a3db594201c9f049de6a58ac2e544e1c6ac0c1e9815cce5e2e46a6e45372e419078307a57f55
+EBUILD libu2f-host-1.1.1.ebuild 1298 BLAKE2B 3eb0abee39181c3aea3cf63bbc59655732a0b8ec28bbc7260694e25f545749fcf0d7bd20aff6f7a3575d56d52c7ae8094dc7954ac76c5f9921ebd21a5a376248 SHA512 c5422305f55e948d20c2b954710b97a61a6b3e8ce48dca1950967c2a6c02e6d63b0530ab427fa5c48a90802544b4b13dcee8ccb88c9e1df814549219db1bed1f
+EBUILD libu2f-host-1.1.3.ebuild 1186 BLAKE2B 20a64efdf2fdb0e43778a726abaa6c57cb5dbe48063457f7a94592e75f033e60ff0f3b157b5f1057fbc372329b43939ee663d95509ccedf22ffa04ab2d06cc54 SHA512 5a32629523690898a179f86b92c472e8b84d45db95cc2541e988cfc7901c3d85ec82261c0eaf3f4756a47b0c3a1830c39af445a8a1beb616c183dd900e712bed
+MISC metadata.xml 550 BLAKE2B 992fdc0643bed1c1122b544947535745a7209552387c3e6917942eee04cd33bd613f78f5e447099493b56e133d88095d958a8816f1b1ba65d34944ddb3210eea SHA512 9970724fffe49705d8dedc85522cbe3040c4e542fa5a56c2cbc428df2540975e76a84fe8c4819bfaacc085cccdf6e5a996a058c14f561b9ef10c7d705f98bfa0
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
new file mode 100644
index 000000000000..6d1773945177
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils linux-info udev user
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kernel_linux static-libs systemd"
+
+RDEPEND="
+	dev-libs/hidapi
+	dev-libs/json-c:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	systemd? ( sys-apps/systemd[acl] )"
+
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+	# The U2F device node will be owned by group 'plugdev'
+	# in non-systemd configurations
+	if ! use systemd; then
+		enewgroup plugdev
+	fi
+}
+
+src_prepare() {
+	autotools-utils_src_prepare
+
+	sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+		70-u2f.rules > 70-u2f-udev.rules || die
+}
+
+src_configure() {
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use kernel_linux; then
+		if use systemd; then
+			udev_dorules 70-u2f.rules
+		else
+			udev_newrules 70-u2f-udev.rules 70-u2f.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd; then
+		elog "Users must be a member of the 'plugdev' group"
+		elog "to be able to access U2F devices"
+	fi
+}
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild
new file mode 100644
index 000000000000..129a3f8c98c1
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info udev user
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="kernel_linux static-libs systemd"
+
+RDEPEND="
+	dev-libs/hidapi
+	dev-libs/json-c:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	systemd? ( sys-apps/systemd[acl] )"
+
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+	# The U2F device node will be owned by group 'plugdev'
+	# in non-systemd configurations
+	if ! use systemd; then
+		enewgroup plugdev
+	fi
+}
+
+src_prepare() {
+	default
+	sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+		70-u2f.rules > 70-u2f-udev.rules || die
+}
+
+src_install() {
+	default
+	if use kernel_linux; then
+		if use systemd; then
+			udev_dorules 70-u2f.rules
+		else
+			udev_newrules 70-u2f-udev.rules 70-u2f.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd; then
+		elog "Users must be a member of the 'plugdev' group"
+		elog "to be able to access U2F devices"
+	fi
+}
diff --git a/app-crypt/libu2f-host/metadata.xml b/app-crypt/libu2f-host/metadata.xml
new file mode 100644
index 000000000000..e15cf03356a6
--- /dev/null
+++ b/app-crypt/libu2f-host/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <use>
+    <flag name="systemd">
+      Use user ACLs rather than plugdev group to give user access to the HIDRAW
+      device.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">Yubico/libu2f-host</remote-id>
+    <bugs-to>https://github.com/Yubico/libu2f-host/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/libu2f-server-1.0.1 b/app-crypt/libu2f-server-1.0.1
deleted file mode 100644
index ad43d2aa153f..000000000000
--- a/app-crypt/libu2f-server-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/hidapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yubico Universal 2nd Factor (U2F) server C Library
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/libu2f-server/
-IUSE=libressl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=!libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/hidapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://developers.yubico.com/libu2f-server/Releases/libu2f-server-1.0.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d20a7a33a12abd05c8eb9244923fe57
diff --git a/app-crypt/libu2f-server-1.1.0 b/app-crypt/libu2f-server-1.1.0
deleted file mode 100644
index 1a3d118f3b81..000000000000
--- a/app-crypt/libu2f-server-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/hidapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yubico Universal 2nd Factor (U2F) server C Library
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/libu2f-server/
-IUSE=libressl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=!libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/hidapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/0.1
-SRC_URI=https://developers.yubico.com/libu2f-server/Releases/libu2f-server-1.1.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fa709e5032ac315264d9a345605ddd7a
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
new file mode 100644
index 000000000000..776ac4524d59
--- /dev/null
+++ b/app-crypt/libu2f-server/Manifest
@@ -0,0 +1,7 @@
+AUX libu2f-server-1.0.1-tests-fix.patch 1486 BLAKE2B 19b37973a2efcbdbca285e59baf7f1d4c03abd4592f9ed988cd02c6bfea892c2ee3db1cf36621f685da1ab5075219e05ff2dc6752dcec30576aac271ec57b0b6 SHA512 3283f95308f72a13ce8575969992c633705eacacf3c01546d1fd8c35c3a5499a1229d8dd34f493075b4f145f2e722fed6568d75c8f37729f6b18d5b9bb553e45
+AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
+DIST libu2f-server-1.0.1.tar.xz 268648 BLAKE2B 9c6c2e5bafb2a95fcc5c2773de49b4db197ee6283e90cf0e4e62ff3982bdde8a51635cd9771e4dd35d27c71634367197d3b01b9c26d8a3847fccf1daf676f04b SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47
+DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
+EBUILD libu2f-server-1.0.1.ebuild 1141 BLAKE2B 940d5c772e94a0e77a72b56330a1c013da2588d573edb999a2d0af4cda5c8b62f07ea92eba0b45fb763200f6c7edf7f47bd115cf8bd4972e1681a6b0d9145bcc SHA512 6050266c78936ca416549483ded7beeb8866a23ca7cdebf0b5a973191bf27af0ece5cecf27c784c4abe8d1edbcd073baa7150236531d45dba18036dd20315459
+EBUILD libu2f-server-1.1.0.ebuild 1187 BLAKE2B 27ec974968e6717e3c17d2b89bc616ccf393509e9e247613ab638393d7c1efce5ca3643981c164788b10979b17180c9a87b6c338c0a44ffd58172502e4708fcd SHA512 85d9d2c8170c9566f614247aad94e177ffcea29b7c4e22df52085b5cbf3a65c2f733db20bd6168dc28ec2a0aacc4bb328c296df3d543163a0ce026538f9e08db
+MISC metadata.xml 351 BLAKE2B 9b08643cd9cfab47436281dd57bca31e713980d3cb0b5d20fcd9a915bc5adbcf589ac4df9f03929a8f57e7a11393602afe05d025d10bb04d425bacc1f4765324 SHA512 6a1aeb9117473d5c2ea5de3a3043de7926bb70e2cc00ac8c13b4d3a27b7fd3c7ca6611bc4f4ed9faeb611f228f5a8ffc657e924fdf800133d62a70b48e408f22
diff --git a/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch b/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch
new file mode 100644
index 000000000000..3cbb9c93868c
--- /dev/null
+++ b/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch
@@ -0,0 +1,54 @@
+From: Gokturk Yuksek <gokturk@gentoo.org>
+Subject: [PATCH] Make tests with CHECK optional at configure time
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,15 @@
+ 
+ PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto], [], [])
+ 
+-PKG_CHECK_MODULES([CHECK], [check], [], [])
++AC_ARG_ENABLE([tests],
++              [AS_HELP_STRING([--enable-tests],
++                              [use check to run the unit tests])],
++                              [enable_tests=$enableval],
++                              [enable_tests=no])
++AM_CONDITIONAL([ENABLE_TESTS],[test '!' "$enable_tests" = no])
++if test '!' "$enable_tests" = no; then
++  PKG_CHECK_MODULES([CHECK], [check], [], [AC_MSG_NOTICE(Check package not found `make check` won't work)])
++fi
+ 
+ AC_ARG_ENABLE([coverage],
+               [AS_HELP_STRING([--enable-coverage],
+@@ -123,11 +131,15 @@
+   Makefile
+   gtk-doc/Makefile
+   src/Makefile
+-  tests/Makefile
+   u2f-server/Makefile
+   u2f-server/u2f-server-version.h
+   u2f-server/u2f-server.pc
+ ])
++if test '!' "$enable_tests" = no; then
++  AC_CONFIG_FILES([
++    tests/Makefile
++  ])
++fi
+ AC_OUTPUT
+ 
+ AC_MSG_NOTICE([summary of build options:
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,7 +25,11 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-SUBDIRS = u2f-server src tests gtk-doc
++SUBDIRS = u2f-server src gtk-doc
++
++if ENABLE_TESTS
++SUBDIRS+=tests
++endif
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
diff --git a/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch b/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch
new file mode 100644
index 000000000000..2dbe28b5aa68
--- /dev/null
+++ b/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch
@@ -0,0 +1,37 @@
+Reverted, removed the second hunk about dev-libs/check, and further
+adjusted. The tarball already contains the man page and gengetopt
+generated command line parsing, so these checks are useless to us.
+
+From fbd340d1c777e23b66ef27ce1c03c4eb3bafc511 Mon Sep 17 00:00:00 2001
+From: Thordur Bjornsson <thorduri@yubico.com>
+Date: Thu, 12 Jan 2017 14:28:31 +0100
+Subject: [PATCH] auto: Check for help2man/gengetopt, and bail out if not
+ found.
+
+Both are required to build.
+
+While here, if `--enable-tests` passed, check for `check` and
+if not found, bail out as well.
+---
+ configure.ac | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ad409a2..6decb78 100644
+--- b/configure.ac
++++ a/configure.ac
+@@ -43,14 +43,7 @@
+ LT_INIT([win32-dll])
+ 
+ AM_MISSING_PROG(HELP2ADOC, help2adoc, $missing_dir)
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+-if ! which help2man >/dev/null ; then
+-   AC_MSG_ERROR([help2man missing])
+-fi
+-if ! which gengetopt >/dev/null ; then
+-   AC_MSG_ERROR([gengetopt missing])
+-fi
+-
+ gl_LD_VERSION_SCRIPT
+ 
+ PKG_CHECK_MODULES([LIBJSON], [json-c], [], [
diff --git a/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
new file mode 100644
index 000000000000..823be1308e3d
--- /dev/null
+++ b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-server/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl static-libs test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	dev-libs/hidapi[${MULTILIB_USEDEP}]
+	dev-libs/json-c:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tests-fix.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	touch man/u2f-server.1 || die # do not rebuild the man page
+}
+
+multilib_src_configure() {
+	myeconfargs=(
+		--disable-h2a # tarball already contains the manpage
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
new file mode 100644
index 000000000000..d6f5837efa5a
--- /dev/null
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-server/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0/0.1"
+KEYWORDS="amd64 x86"
+IUSE="libressl static-libs test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	dev-libs/hidapi[${MULTILIB_USEDEP}]
+	dev-libs/json-c:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-disable-help2man-gengetopt-checks.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	touch man/u2f-server.1 || die # do not rebuild the man page
+}
+
+multilib_src_configure() {
+	myeconfargs=(
+		--disable-h2a # tarball already contains the manpage
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/libu2f-server/metadata.xml b/app-crypt/libu2f-server/metadata.xml
new file mode 100644
index 000000000000..6c2feb84a0e0
--- /dev/null
+++ b/app-crypt/libu2f-server/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+  <slots>
+    <subslots>Reflects ABI compatibility for libu2f-server.so</subslots>
+  </slots>
+</pkgmetadata>
diff --git a/app-crypt/libykneomgr-0.1.8 b/app-crypt/libykneomgr-0.1.8
deleted file mode 100644
index 638554f80a53..000000000000
--- a/app-crypt/libykneomgr-0.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=sys-apps/pcsc-lite dev-libs/libzip virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=YubiKey NEO CCID Manager C Library
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/libykneomgr/
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=sys-apps/pcsc-lite dev-libs/libzip >=app-crypt/ccid-1.4.18[usb]
-SLOT=0
-SRC_URI=https://developers.yubico.com/libykneomgr/Releases/libykneomgr-0.1.8.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
-_md5_=ef81bad2fca3a99648ec280feec0d385
diff --git a/app-crypt/libykneomgr/Manifest b/app-crypt/libykneomgr/Manifest
new file mode 100644
index 000000000000..ec75301f718e
--- /dev/null
+++ b/app-crypt/libykneomgr/Manifest
@@ -0,0 +1,3 @@
+DIST libykneomgr-0.1.8.tar.gz 626257 BLAKE2B 4819420f36261251261264dfe688297107fa857cc78081dbbdaa90e5c821ceaafa7d770e431fdfec4c199273c67ec684da1f4570883c300f9283e73aeea42d17 SHA512 536db3a81b74d24e727cc09c5bb898723b602e6c55e249745ced59d5f9416673fdbecd80bb7ebc7031be349092c8fb4f5623c8f6972ab870ec1f50ac1bc2f795
+EBUILD libykneomgr-0.1.8.ebuild 575 BLAKE2B 217a3e1f5cf7b895cf573a8cfae67d87da17e4d294a42df4b8b9135aac9e9e40374de19bf4589872aa3e74a57d1fbab43bccb78a3b015bce5e01cda291f2ed18 SHA512 07378321b01b7ad884471eb0d2e69df7d995a9f4ed0f8282547d0653702c955b65b4b03db37e95d965f7ab05c520cd3334e77bcc2e186caaa452a7fed00df5a3
+MISC metadata.xml 401 BLAKE2B 278a4aca731d3b5b8f20f1eba0f6474695f5de4e8a4bd67ebe93b3ad366874c034ac9b5809d44e2065b0e640b5e29cf23000463c98a9654cd09ca260964f9ee7 SHA512 90b43e61063738f2821f8f4134f5e5457b40840ae72097dbd01bf27cfb2dbd405941902bf414be2b67b10901708ca6c80d6573f0f9ed42828e1a83e635761455
diff --git a/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild
new file mode 100644
index 000000000000..89281dfd83a1
--- /dev/null
+++ b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit udev
+
+DESCRIPTION="YubiKey NEO CCID Manager C Library"
+HOMEPAGE="https://developers.yubico.com/libykneomgr/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux"
+
+RDEPEND="sys-apps/pcsc-lite
+	dev-libs/libzip"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	>=app-crypt/ccid-1.4.18[usb]"
+
+src_configure() {
+	econf \
+		--with-backend=pcsc \
+		--disable-static
+}
diff --git a/app-crypt/libykneomgr/metadata.xml b/app-crypt/libykneomgr/metadata.xml
new file mode 100644
index 000000000000..5b8a7d06fa11
--- /dev/null
+++ b/app-crypt/libykneomgr/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Yubico/libykneomgr</remote-id>
+    <bugs-to>https://github.com/Yubico/libykneomgr/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/loop-aes-losetup-2.28.2 b/app-crypt/loop-aes-losetup-2.28.2
deleted file mode 100644
index d16909a33eb3..000000000000
--- a/app-crypt/loop-aes-losetup-2.28.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=selinux? ( sys-libs/libselinux ) nls? ( sys-devel/gettext ) virtual/os-headers >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Loop-AES losetup utility
-EAPI=6
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=nls selinux static
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.28/util-linux-2.28.2.tar.xz http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7j.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2eadcab2d174e96da0eb0550b983d892
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
new file mode 100644
index 000000000000..5836d2a48d2d
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -0,0 +1,4 @@
+DIST loop-AES-v3.7j.tar.bz2 326818 BLAKE2B ca2db3162298e2e28dcc6feb5e6ba885a08097acafb9937a69898e6944c62cbb1c0ef601e13c0547550721430bf770f187ee71bc5e642d6107c982fae9d03462 SHA512 e1b59680680e2b40bb42cad9f1e89a344c7bfd0ee01fdc26151e9edea64b5111744588bc05c672de16c76ae0a3e4d6a8d4c4c9c09709a9f93bfc62a2f64ba7c7
+DIST util-linux-2.28.2.tar.xz 4149700 BLAKE2B da38a047b4a7dc867ba72aea149d515665375089d880d43c40f6d19a09ee33023d64b95c15073d6a83a36ee58ff6d47ef08671ab841b533bb747a337c5da6c02 SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940
+EBUILD loop-aes-losetup-2.28.2.ebuild 2390 BLAKE2B 51c6abdeff7924eca6e5f5e0d288adfe782a5440aa0a5db47a59afdd801b5b21fb9e3f9cef505b50cb15727d3e23b4c1238edd1c5d3e88d02bccf2b6df1fb1c2 SHA512 c71049614a40863c8634b142d16beb671f0cf77607b541018cfc44ab4bcfccf8b85e6f568e55963a30be8650d86c8fe6b0138914c7b0449592fe27062a6bcab3
+MISC metadata.xml 318 BLAKE2B 645d30bddca8c141085ee99caba70b409c1318c175f6f25c0a16b81d2286f1c1b74ab694d2100fd20b1bf16bf5f4134c4642370b99bdedd8d2cc015a822ec768 SHA512 93c67a250f19a2a17bde884a0f493b5b675ae2e0b4dd89164dc8a052e7adb9b2b5ebd07a43fb5432a8198216134ed3a0eca4b14bc98b9be71e9d947f51b77439
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
new file mode 100644
index 000000000000..abeaf0b775d7
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools toolchain-funcs libtool flag-o-matic
+
+MY_PV="${PV/_/-}"
+MY_P="util-linux-${MY_PV}"
+LOOPAES_P="loop-AES-v3.7j"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Loop-AES losetup utility"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
+SRC_URI="mirror://kernel/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 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	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
+		#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 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+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
+	# We manually set --libdir to the default since on prefix, econf will set it to
+	# a value which the configure script does not recognize.  This makes it set the
+	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
+	ECONF_SOURCE=${S} \
+	econf \
+		--libdir='${prefix}/'"$(get_libdir)" \
+		--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
new file mode 100644
index 000000000000..12925882c9ff
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">loop-aes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/manuale-1.1.0 b/app-crypt/manuale-1.1.0
deleted file mode 100644
index 96470d4633e9..000000000000
--- a/app-crypt/manuale-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A fully manual Let's Encrypt client
-EAPI=6
-HOMEPAGE=https://github.com/veeti/manuale
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/veeti/manuale/archive/1.1.0.tar.gz -> manuale-1.1.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f283838ee1396614370387a491dc7d8f
diff --git a/app-crypt/manuale/Manifest b/app-crypt/manuale/Manifest
new file mode 100644
index 000000000000..2e6b0153a82b
--- /dev/null
+++ b/app-crypt/manuale/Manifest
@@ -0,0 +1,3 @@
+DIST manuale-1.1.0.tar.gz 14015 BLAKE2B 1c3eb18e591032c1633e73da46bd91653627c127ccd9d0006d776ccc12d95faaf53b8942a47fcedcb37ef998ad6975efee7a20658f6e366fa51f0b6ddd635f31 SHA512 b78d6468fba14738f0b33cb11817a61692bab2b18a3331b2696c6e1c070a202903be6d6f642da7dd35560b15ee5fe24afecebe51395bdacae59f04cc582b6b44
+EBUILD manuale-1.1.0.ebuild 584 BLAKE2B 9dd597b5fc97f96a6c65536d7deb20bdc72f85e9c542d7d9c0845d7f04d8b597eb2ef9345d5dab2dda2c28d1f1b3fac04c2c6181ef8c2dec0d1dbde787b576df SHA512 5f0fa3fe24306081cf81c4a49ca947f37ef391a5abe88bf494726e8390b38b9cf1c96fe58f4140ccab0ccb4449e9650f308163f162a7ae69878b6bfe781ba842
+MISC metadata.xml 245 BLAKE2B 971a9685a9931969cce9ae3f586e5a1b1be60f3d494139c8f09b19e68552286c04f70e4321473e9d62e20136e322f0ce5c8265a986f27ab4c3b02dc2584a8e05 SHA512 959004edbb7652a51b20d5c16dcdc270389d9ea656a795928323ca071ba51cb34d25b4bedfdc0cabe9e95301986aec7b8f3972bf1a50df4253b6364da932b232
diff --git a/app-crypt/manuale/manuale-1.1.0.ebuild b/app-crypt/manuale/manuale-1.1.0.ebuild
new file mode 100644
index 000000000000..974307de8f43
--- /dev/null
+++ b/app-crypt/manuale/manuale-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A fully manual Let's Encrypt client"
+HOMEPAGE="https://github.com/veeti/manuale"
+SRC_URI="https://github.com/veeti/manuale/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+DOCS=( README.md CHANGELOG.md)
diff --git a/app-crypt/manuale/metadata.xml b/app-crypt/manuale/metadata.xml
new file mode 100644
index 000000000000..0610b7e1cd7e
--- /dev/null
+++ b/app-crypt/manuale/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">veeti/manuale</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/mcrypt-2.6.8-r3 b/app-crypt/mcrypt-2.6.8-r3
deleted file mode 100644
index 491bab72cbf0..000000000000
--- a/app-crypt/mcrypt-2.6.8-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/libmcrypt-2.5.8 >=app-crypt/mhash-0.9.9 sys-libs/zlib
-DESCRIPTION=replacement of the old unix crypt(1)
-EAPI=6
-HOMEPAGE=http://mcrypt.sourceforge.net/
-IUSE=nls
-KEYWORDS=amd64 ppc sparc x86 ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libmcrypt-2.5.8 >=app-crypt/mhash-0.9.9 sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/mcrypt/mcrypt-2.6.8.tar.gz
-_md5_=67d86438eae4589d1ca702308fc899b2
diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest
new file mode 100644
index 000000000000..07abce541550
--- /dev/null
+++ b/app-crypt/mcrypt/Manifest
@@ -0,0 +1,9 @@
+AUX mcrypt-2.6.7-qa.patch 736 BLAKE2B 3ccce0aa5e0cd2301123e91d7119059012b977107f7e555a07c33bdd9a303a7767e069d7f008682a0938be39b1eb7cd7ec461d8ace0c7d38c8e041e187580331 SHA512 f50e2db738583b5dbca80e7458cc341787b94bd475b699de1333e4839b1bc448c0a6d7c759a71849c60fc97d45dbb0f075ad6c5d67d312865eea26118bba4dee
+AUX mcrypt-2.6.8-format-string.patch 518 BLAKE2B b5fd6a3780819acaa4c5e30dd78727b5eea94883e5467d2316929ace6fdb0ea7c0c54dc6db477b9aa9c9caa316269ab26d4dad08b4eff7137be216d0ea4e2661 SHA512 3056177ad2bf9cbf7cc9a5b3ae272407c0e38ed495ca665a26a9b36d5a0b5c874aff90a28903a6673e35b2691b036aed71721515cadd80c56a96d7604c4cee4a
+AUX mcrypt-2.6.8-overflow.patch 810 BLAKE2B bc8c7e23335263396de52adb917527a8fd3da5b07618225b7012875c4afd4413e7dd173f74c044ae621d9a781057ec1c0e7df5442880128320f2bbbd46b89a2d SHA512 c884f67011f07245b7dc3c0a689c9bd33664a402ad5585823319084b74c758046938364372ce0ebf2cc898cb704375ff1f1cbee40d6e3d622641a16193857426
+AUX mcrypt-2.6.8-segv.patch 1330 BLAKE2B 731b3aba84731d81d993771270c0a8d42222ad636de388285e115da116298dea63fcaeef37c28e60600ddc6df5b662e9e35050ab5c26b390aae41b329cfe3e71 SHA512 7bea9f7731f39d2fed3920cbf6efaf006681e59eaa5dc3a0e50ac0cd3166c959e1ebd06c449329865501bd525a22c49380c4f72b27693f8bc0b0c0c4141a5af2
+AUX mcrypt-2.6.8-sprintf.patch 3617 BLAKE2B 9dc7fd48a12fbd34624ce4e02dd3e729444a8c8fd05b9a77f15cb0c7547aa21972bb4295e5ff9846530758e7994eee7dd9351ff32c03825e8d3611251ef858a5 SHA512 36163d3c782a29ab70527d0389e9ee4fc0fdb6d92300a5a576f3702c4b6a63f598e3832fd704570cd3c8da79182e2c57473b84932c26b08d3c8bd509f475a7d8
+AUX mcrypt-2.6.8-stdlib.h.patch 262 BLAKE2B 30735481ecc743554dc5a1fdf6d91d259ee2670ee39d939b90970aaaa0548c5edbe88fd5820f1cce4f7d4442d293258c5528f8c01d485a14fdda4cf060b27019 SHA512 6f20fe8982cca9fb448ace79c8b8b04260dc63f6a372da4cbf8a7a5d7458f32527e0f31d32387c9f326906fe6fe98013dc49a388b1c987ccca096c9796b409fd
+DIST mcrypt-2.6.8.tar.gz 471915 BLAKE2B 63bb51d2e0fac138ad1cadd6c0842b5c13e604a0a6dd134b85c1e4f4a3af2758955c09a032641f34861a52dee5b0ce138b22e849a26a6e3c27bc0838999718fc SHA512 eae5f831e950df69eb93efc8314100b4b5dc8a535b1d00f500e6b25382efcec321346776a92dadf101b878ef46a47de2e9e81f5ddf5c73563ece4741f169c8d1
+EBUILD mcrypt-2.6.8-r3.ebuild 707 BLAKE2B add315ca7d9564ff68f1c955eae1958de657113e49f0cfd1ef33c410dcf96060c7139834533001dd78e32ac2f2ed1dfb670d677aa78ba66e4ca8a79fc8ad0fb4 SHA512 9378c7d796775b8e1edca96194a8d52663f91455cc6df20b76d79b417b7cb43d7309e9682c70c0fbdcb060b92e7d72c5771b1febdb127956e8282cbf95450893
+MISC metadata.xml 326 BLAKE2B 7815b2e4462f847a84c902df0c20b993c2a1cdd77006da029616096587e07003b2bba50499144d211c8ad0880eef53f0a3a9ce23af69f6320c427d6352958384 SHA512 a5d7a15b6084aebe038f38dc8003040c42434d415ebdb33b225e2772047950d35b2328dba5a7194533608b74ec47ca6a1bfccb56540f3a67308b499b04774207
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch b/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch
new file mode 100644
index 000000000000..368884f7fecb
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.7-qa.patch
@@ -0,0 +1,22 @@
+diff -urNp mcrypt-2.6.7.org/src/gaaout.c mcrypt-2.6.7/src/gaaout.c
+--- mcrypt-2.6.7.org/src/gaaout.c	2007-06-09 11:39:14.000000000 +0300
++++ mcrypt-2.6.7/src/gaaout.c	2007-11-10 14:30:22.000000000 +0200
+@@ -5,6 +5,7 @@
+ 
+ 
+ #include <defines.h>
++#include "mcrypt_int.h"
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff -urNp mcrypt-2.6.7.org/src/mcrypt_int.h mcrypt-2.6.7/src/mcrypt_int.h
+--- mcrypt-2.6.7.org/src/mcrypt_int.h	2003-09-08 20:25:50.000000000 +0300
++++ mcrypt-2.6.7/src/mcrypt_int.h	2007-11-10 14:27:42.000000000 +0200
+@@ -15,3 +15,7 @@ void rol_buf(void * buffer, int buffersi
+ void mcrypt_version();
+ void mcrypt_license();
+ void usage(void);
++
++int print_list(void);
++int print_hashlist(void);
++int print_keylist(void);
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch
new file mode 100644
index 000000000000..ceeb28f38e0d
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-format-string.patch
@@ -0,0 +1,31 @@
+--- a/src/errors.c
++++ b/src/errors.c
+@@ -25,24 +25,24 @@
+ 
+ void err_quit(char *errmsg)
+ {
+-	fprintf(stderr, errmsg);
++	fprintf(stderr, "%s", errmsg);
+ 	exit(-1);
+ }
+ 
+ void err_warn(char *errmsg)
+ {
+ 	if (quiet <= 1)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+ 
+ void err_info(char *errmsg)
+ {
+ 	if (quiet == 0)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+ 
+ void err_crit(char *errmsg)
+ {
+ 	if (quiet <= 2)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch
new file mode 100644
index 000000000000..97c658bb2d3b
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-overflow.patch
@@ -0,0 +1,25 @@
+From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:37:06 +0200
+Subject: [PATCH] cleanup: buffer overflow
+
+---
+ src/extra.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/extra.c b/src/extra.c
+index 3082f82..c7a1ac0 100644
+--- a/src/extra.c
++++ b/src/extra.c
+@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode,
+ 		if (m_getbit(6, flags) == 1) { /* if the salt bit is set */
+ 			if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
+ 				*salt_size = m_setbit(0, sflag, 0);
++				if (*salt_size > sizeof(tmp_buf))
++					err_quit(_("Salt is too long\n"));
+ 				if (*salt_size > 0) {
+ 					fread(tmp_buf, 1, *salt_size,
+ 					      fstream);
+-- 
+1.7.8.6
+
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch
new file mode 100644
index 000000000000..478b3cbc0f6e
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-segv.patch
@@ -0,0 +1,40 @@
+From 5bee29fae8f0e936ad4c957aef6035d09532a57a Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:04:27 +0200
+Subject: [PATCH] cleanup: fixup segv on buffer access
+
+use exact buffer size instead of guess.
+
+do not copy out of source buffer.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/rfc2440.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/rfc2440.c b/src/rfc2440.c
+index 5a1f296..929b9ab 100644
+--- a/src/rfc2440.c
++++ b/src/rfc2440.c
+@@ -497,7 +497,7 @@ plaintext_encode(const USTRING dat)
+     time_t t;
+ 
+     assert(dat->len > 0);
+-    result = make_ustring( NULL,  2 * dat->len); /* xxx */
++    result = make_ustring( NULL,  dat->len + 12); /* xxx */
+     newdat = (USTRING)dat;
+     result->d[pos++] = (0x80 | 0x40 | PKT_PLAINTEXT);
+ 
+@@ -810,7 +810,8 @@ encrypted_encode(const USTRING pt, const DEK *dek)
+     _mcrypt_encrypt(dek->hd, rndpref, dek->blocklen + 2, NULL, 0);
+     _mcrypt_sync(dek->hd, rndpref, dek->blocklen);
+ 
+-    ct = make_ustring( rndpref,   2 * pt->len); /* xxx */
++    ct = make_ustring( NULL, dek->blocklen + 2 + pt->len + 12); /* xxx */
++    memcpy(ct->d, rndpref, dek->blocklen + 2);
+     pos = dek->blocklen + 2;
+     
+     _mcrypt_encrypt(dek->hd, ct->d + pos, pt->len, pt->d, pt->len);
+-- 
+1.7.8.6
+
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch
new file mode 100644
index 000000000000..a287680958bb
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch
@@ -0,0 +1,108 @@
+Description: [CVE-2012-4527] Stack-based buffer overflow with long file names
+ .
+ A buffer overflow in mcrypt version 2.6.8 and earlier due to long filenames.
+ If a user were tricked into attempting to encrypt/decrypt specially crafted
+ long filename(s), this flaw would cause a stack-based buffer overflow that
+ could potentially lead to arbitrary code execution.
+ .
+ Note that this is caught by FORTIFY_SOURCE, which makes this a crash-only
+ bug on wheezy.
+Author: Attila Bogar, Jean-Michel Vourgère <jmv_deb@nirgal.com>
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4527
+Bug: CVE-2012-4527
+Bug-Debian: http://bugs.debian.org/690924
+Forwarded: no
+Last-Update: 2012-11-01
+Index: mcrypt-2.6.8/src/mcrypt.c
+===================================================================
+--- mcrypt-2.6.8.orig/src/mcrypt.c
++++ mcrypt-2.6.8/src/mcrypt.c
+@@ -41,4 +41,6 @@
+ 
++/* Temporary error message can contain one file name and 1k of text */
++#define ERRWIDTH ((PATH_MAX)+1024)
+-char tmperr[128];
++char tmperr[ERRWIDTH];
+ unsigned int stream_flag = FALSE;
+ char *keymode = NULL;
+ char *mode = NULL;
+@@ -482,7 +485,7 @@
+ #ifdef HAVE_STAT
+       if (stream_flag == FALSE) {
+ 	 if (is_normal_file(file[i]) == FALSE) {
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: %s is not a regular file. Skipping...\n"),
+ 		    program_name, file[i]);
+@@ -501,7 +504,7 @@
+ 	    dinfile = file[i];
+ 	 if ((isatty(fileno((FILE *) (stdin))) == 1)
+ 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: Encrypted data will not be read from a terminal.\n"),
+ 		    program_name);
+@@ -520,7 +523,7 @@
+ 	    einfile = file[i];
+ 	 if ((isatty(fileno((FILE *) (stdout))) == 1)
+ 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: Encrypted data will not be written to a terminal.\n"),
+ 		    program_name);
+@@ -544,7 +547,7 @@
+ 	    strcpy(outfile, einfile);
+ 	    /* if file has already the .nc ignore it */
+ 	    if (strstr(outfile, ".nc") != NULL) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("%s: file %s has the .nc suffix... skipping...\n"),
+ 		       program_name, outfile);
+@@ -590,10 +593,10 @@
+ 
+ 	 if (x == 0) {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr, _("File %s was decrypted.\n"), dinfile);
++	       snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile);
+ 	       err_warn(tmperr);
+ 	    } else {
+-	       sprintf(tmperr, _("Stdin was decrypted.\n"));
++	       snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n"));
+ 	       err_warn(tmperr);
+ 	    }
+ #ifdef HAVE_STAT
+@@ -610,7 +613,7 @@
+ 
+ 	 } else {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("File %s was NOT decrypted successfully.\n"),
+ 		       dinfile);
+@@ -636,10 +639,10 @@
+ 
+ 	 if (x == 0) {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr, _("File %s was encrypted.\n"), einfile);
++	       snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile);
+ 	       err_warn(tmperr);
+ 	    } else {
+-	       sprintf(tmperr, _("Stdin was encrypted.\n"));
++	       snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n"));
+ 	       err_warn(tmperr);
+ 	    }
+ #ifdef HAVE_STAT
+@@ -655,7 +658,7 @@
+ 
+ 	 } else {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("File %s was NOT encrypted successfully.\n"),
+ 		       einfile);
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
new file mode 100644
index 000000000000..c4bdb18a6dbc
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
@@ -0,0 +1,11 @@
+--- a/src/rfc2440.c	2008-11-17 06:50:01.000000000 +1100
++++ b/src/rfc2440.c	2010-08-10 13:48:28.000000000 +1000
+@@ -23,7 +23,7 @@
+ #include <zlib.h>
+ #endif
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ #include "xmalloc.h"
+ #include "keys.h"
diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
new file mode 100644
index 000000000000..03b77bb3afb3
--- /dev/null
+++ b/app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="replacement of the old unix crypt(1)"
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-macos"
+IUSE="nls"
+
+DEPEND=">=dev-libs/libmcrypt-2.5.8
+	>=app-crypt/mhash-0.9.9
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.7-qa.patch"
+	"${FILESDIR}/${P}-stdlib.h.patch"
+	"${FILESDIR}/${P}-segv.patch"
+	"${FILESDIR}/${P}-sprintf.patch"
+	"${FILESDIR}/${P}-format-string.patch"
+	"${FILESDIR}/${P}-overflow.patch"
+)
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-crypt/mcrypt/metadata.xml b/app-crypt/mcrypt/metadata.xml
new file mode 100644
index 000000000000..a07f7533cf4a
--- /dev/null
+++ b/app-crypt/mcrypt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mcrypt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/md4sum-0.02.03-r1 b/app-crypt/md4sum-0.02.03-r1
deleted file mode 100644
index 4549a0a723e4..000000000000
--- a/app-crypt/md4sum-0.02.03-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=md4 and edonkey hash algorithm tool
-EAPI=5
-HOMEPAGE=http://linux.xulin.de/c/
-KEYWORDS=~amd64 ~x86 ~ppc
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linux.xulin.de/c/md4sum-0.02.03.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2679b4aa347768c9d5ad5d97d94d45b
diff --git a/app-crypt/md4sum/Manifest b/app-crypt/md4sum/Manifest
new file mode 100644
index 000000000000..d5a6e273daaa
--- /dev/null
+++ b/app-crypt/md4sum/Manifest
@@ -0,0 +1,4 @@
+AUX md4sum-fix-out-of-bounds-write.diff 271 BLAKE2B 44573278991d38979ca6f7d18b51be2d9f4150b1491c0650b0ae99d203be475a9c15bfcbdba1dab557a5467aff3c78a16b098d417905b24270164a9969d81ff3 SHA512 bcf06b6da80b67965547d359774c4462516dd69d36ed84723d9baaa93472405ed4d790ce687affa148be39157137ef46399e355540c18271f9164318f7731d65
+DIST md4sum-0.02.03.tar.gz 26819 BLAKE2B 6e7fb76a21d13276a7444e1c1d1d0a05e90399dc7a99b3e2e6d24d1dc46f45b086b99d00e4c9e1821c4a82a9fe985e4823a235e254abba475bd639f98536aea6 SHA512 5a05760aa6a770d9f55a41e42bdf6801dcd67bc804ead5bd84aecc48e5ee5a7c8b01d4a1e1767a4cc1f8695d66ed16c6a1f09b58d236c27db317f227e02e3762
+EBUILD md4sum-0.02.03-r1.ebuild 687 BLAKE2B 8a4c60e60c65bc96603c76dad203ba7323a98ba75b8d7a9fb8a6bbfb854334880f4f71a2312a2fd2c8cb3bdc9b03b08ab12938359e537cc25777050df5cef1a6 SHA512 d6eb35b2f85b0948094f84d0f9b47c5166b3dd4b02ec10bdea8bb5188e25aedf370b2e2425f2f6b9f35d97e2a396e99e2c4843fd3988f3e9168d0081c42783ff
+MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-crypt/md4sum/files/md4sum-fix-out-of-bounds-write.diff b/app-crypt/md4sum/files/md4sum-fix-out-of-bounds-write.diff
new file mode 100644
index 000000000000..1275996080ee
--- /dev/null
+++ b/app-crypt/md4sum/files/md4sum-fix-out-of-bounds-write.diff
@@ -0,0 +1,11 @@
+--- a/md4sum.c	2007-04-11 23:22:38.000000000 +0200
++++ b/md4sum.c	2015-02-15 21:57:59.699682995 +0100
+@@ -126,7 +126,7 @@
+   int i;
+   static char s[33];
+   for( i=0; i<16; i++ ) sprintf( &s[2*i], "%02x", digest[i] );
+-  s[33]= '\0';
++  s[32]= '\0';
+   return( s );
+ }
+ 
diff --git a/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild b/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild
new file mode 100644
index 000000000000..fac751884b0e
--- /dev/null
+++ b/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="md4 and edonkey hash algorithm tool"
+HOMEPAGE="http://linux.xulin.de/c/"
+SRC_URI="http://linux.xulin.de/c/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}/md4sum-fix-out-of-bounds-write.diff"
+}
+
+src_compile() {
+	sed -i -e "s:CFLAGS=:CFLAGS=${CFLAGS} :g" \
+		-e "s:install -s:install:g" Makefile
+	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	mkdir -p "${D}/usr/bin"
+	mkdir -p "${D}/usr/share/man/man1"
+	einstall || die "einstall failed"
+}
diff --git a/app-crypt/md4sum/metadata.xml b/app-crypt/md4sum/metadata.xml
new file mode 100644
index 000000000000..28ef3c7b080f
--- /dev/null
+++ b/app-crypt/md4sum/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-crypt/md5deep-4.3 b/app-crypt/md5deep-4.3
deleted file mode 100644
index 7f604b191ac0..000000000000
--- a/app-crypt/md5deep-4.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Expanded md5sum program with recursive and comparison options
-EAPI=4
-HOMEPAGE=http://md5deep.sourceforge.net/
-KEYWORDS=amd64 ~arm ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=public-domain GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/md5deep/md5deep-4.3.tar.gz
-_md5_=bcbb3600f55c74b67dcfc0784ecf7cbc
diff --git a/app-crypt/md5deep-4.4 b/app-crypt/md5deep-4.4
deleted file mode 100644
index e620439395a7..000000000000
--- a/app-crypt/md5deep-4.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Expanded md5sum program with recursive and comparison options
-EAPI=5
-HOMEPAGE=http://md5deep.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=public-domain GPL-2
-SLOT=0
-SRC_URI=https://github.com/jessek/hashdeep/archive/release-4.4.tar.gz -> md5deep-4.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a01a4ce4841f3d408204e9918954965
diff --git a/app-crypt/md5deep/Manifest b/app-crypt/md5deep/Manifest
new file mode 100644
index 000000000000..0e54c2e32093
--- /dev/null
+++ b/app-crypt/md5deep/Manifest
@@ -0,0 +1,5 @@
+DIST md5deep-4.3.tar.gz 1416180 BLAKE2B 0b0d4814b8a9734555a8b68b363f8a3423c5a97cc21409c166c9f611168e97d41005f981c9493a8bf573661869bef0300028616a414cd130d0ccc5a5dc8ea923 SHA512 fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14
+DIST md5deep-4.4.tar.gz 4534687 BLAKE2B a2fc72e6e032945b6e3820d23a9d19b40438c00b7af870d00bed08f753decc5ac4e18c00dea447aa227f8706949f75712aa05d14f87ee76f62223b1fad0f7f1a SHA512 c37ec85ed04d4452f9038f43434c02e064cf9e17c4eaa233867dba0236443922a14ccb8ec76c68820087751c2ca3db014d3f17dd8fcd2c2bde84d620aae50de1
+EBUILD md5deep-4.3.ebuild 480 BLAKE2B 39183d9b63c81e0bd5d8084272579da2a9710c1457c978a0dfba06a05fc5c29b4dae4bc064436b53d92c58ac887278d195b322c6418bed30762f106e8a1e9b22 SHA512 0200309a8e3acf89df5ae5ff5cccea3cf379d17341a4ff46b4df95d0111ef4e6a4e025d6162c31283a3a9ed1e3ad09ef9e7b5c3e0093bbff136f213972d9f238
+EBUILD md5deep-4.4.ebuild 598 BLAKE2B 48b41879a455b297bf34ad352621fcc4dfda07d7f48c885aec0ee8656991c77692887cb7a27190409b468eec16502fa0c83e76319c63dcce18bf2b0d38f47825 SHA512 63a6002ca2a95b67a2b8f4bddb66130d1a02e4cfef7e5a66145402102cda56e64f0ff87708b8560c66703279866d65e47b7f834e3e3c4ab993152d3002737a66
+MISC metadata.xml 396 BLAKE2B a1a6c4916e6e59e84cb6b095d8c0eda9584ad727014e934ad792bab88a3f6323fd1c31b6dbf84a10440daa9ec8afc494e31045bb20ec6a92d5705cf739fc61fa SHA512 2d4907761039f21088a1644f5da3b764ab55d37513195f0b04c8110a80f638f62f1322ecaf58bb3c506f69449b56e8f430130dcb3906738f0893a5cf83ae4e30
diff --git a/app-crypt/md5deep/md5deep-4.3.ebuild b/app-crypt/md5deep/md5deep-4.3.ebuild
new file mode 100644
index 000000000000..cb91e22b8213
--- /dev/null
+++ b/app-crypt/md5deep/md5deep-4.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Expanded md5sum program with recursive and comparison options"
+HOMEPAGE="http://md5deep.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog FILEFORMAT NEWS README TODO"
diff --git a/app-crypt/md5deep/md5deep-4.4.ebuild b/app-crypt/md5deep/md5deep-4.4.ebuild
new file mode 100644
index 000000000000..b2488ffb059b
--- /dev/null
+++ b/app-crypt/md5deep/md5deep-4.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="Expanded md5sum program with recursive and comparison options"
+HOMEPAGE="http://md5deep.sourceforge.net/"
+SRC_URI="https://github.com/jessek/hashdeep/archive/release-${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="public-domain GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}/hashdeep-release-${PV}
+
+DOCS=( AUTHORS ChangeLog FILEFORMAT NEWS README.md TODO )
diff --git a/app-crypt/md5deep/metadata.xml b/app-crypt/md5deep/metadata.xml
new file mode 100644
index 000000000000..d162c6244ad1
--- /dev/null
+++ b/app-crypt/md5deep/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jessek/hashdeep</remote-id>
+    <remote-id type="sourceforge">md5deep</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/md6sum-1.0-r2 b/app-crypt/md6sum-1.0-r2
deleted file mode 100644
index 6558500cc5ab..000000000000
--- a/app-crypt/md6sum-1.0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A C implementation of MD6
-EAPI=6
-HOMEPAGE=https://groups.csail.mit.edu/cis/md6
-KEYWORDS=amd64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=mirror://sourceforge/md6sum/md6sum-1.0.tar.gz
-_md5_=80f9b5a98eff68999d1e7b84475ab69a
diff --git a/app-crypt/md6sum/Manifest b/app-crypt/md6sum/Manifest
new file mode 100644
index 000000000000..3bfe24a7cd9e
--- /dev/null
+++ b/app-crypt/md6sum/Manifest
@@ -0,0 +1,6 @@
+AUX md6sum-1.0-cflags.patch 791 BLAKE2B 9db97a022d784d0e1dce6090f3d9e9831b57609f30b157937dce2499bfbff7302e154b8bc81fcba58949fa90a161246da1456b6fb4d240ab7eccaf767bb7e3c3 SHA512 dbd6cadb05b4bcf6dae2efc970de71678eb4f78ef7ee743c08b17782ed052ada29c083da94185a7a37c461823e4c6c10a978bee79791e2e8dd22e604817813b2
+AUX md6sum-1.0-format-security.patch 620 BLAKE2B 5864e943d0ba267c5e9995d2572d0e8663b94c3d17acfbc6f85cd1cb9474df26091bb2727968cac73a06a558b27b569040cea11fddbc2fb5324a78d0eedfbdf1 SHA512 b1ec3b1479ce58e9e2aa4a43982b61932d7ed099d1246dd00e7d6f183b1087dda7c446a63ceea06006ee905a167bd3cb7485d208d95a7860768b680670f0fd88
+AUX md6sum-1.0-ldflags.patch 427 BLAKE2B e7ecbab2d65cdad2bd45f2fd024081dd807a994a312090276db77b7cb7bd2c4636871ef3c2466e5ce137627949e16585cb8699e6ca25f5fb826bcca2a6e37153 SHA512 2ed3dc38eef78f365bd8e03e22264488c6a0d089c30f827e90ca5dd5ada9ad061e0c1a736c3ccc81c05fd172ffc8140034d703993233e5e3f8877cfb298fa1a1
+DIST md6sum-1.0.tar.gz 125626 BLAKE2B 19217592cfa65d16fad684448813adc6cda96c6ee8bfd01617c0a5f04b9ed5efb78aade64358deb535a2c9221c6a033b9d5486aee6438b5b6398f0e0096abf2c SHA512 8253a68dd036dd98b22c39a35a75f9bbdc4018ea63dc8f7823c831090d19f2f92a727458b4dc35388e494dbf496b9f5de693a1cfb3e5a8ca8441f31f0e817d46
+EBUILD md6sum-1.0-r2.ebuild 430 BLAKE2B a98c24322ae462ce08c64a088c7472b8fb85ff25a820d6953a5fb396400746f94238273363c4df4636d0376993e62b6361146792f7f7553ebdec8cb8c2dbba75 SHA512 4a4fb6256b142e5ec92ad2527fe2127f1d92bea7f56c6b4c60f9f2b04c7c15a4c4ba943f5c5cb4dfd277f7d0e0a501bcf8b862915a50b1f3cb9a2e8f9dbebf6e
+MISC metadata.xml 316 BLAKE2B db383f2d08311259f00b79ee57ae9497c9a6f3693da97f18e4891760e42360b9e6f31116422e814f0680387bca1981dad3d89ed8a3d92e9df4e98c434ebe2811 SHA512 c6ae22608f860eaf81fcabca3750fe7a1b24249c5d6eb8aa33867c4a8fba5f1ac6203f298667db39dba9fa9164109bc59267f31e6d9435cd40a242c0055fa3a2
diff --git a/app-crypt/md6sum/files/md6sum-1.0-cflags.patch b/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
new file mode 100644
index 000000000000..b0bf8f01a327
--- /dev/null
+++ b/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.in	2012-11-07 22:04:51.207982344 -0500
++++ b/Makefile.in	2012-11-07 22:06:00.905977580 -0500
+@@ -18,19 +18,19 @@
+ all: md6sum
+ 
+ md6sum: $(OBJS)
+-	$(CC) $(OBJS) $(CXXFLAGS) $(LDFLAGS) -o $@
++	$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) -o $@
+ 
+ md6_compress.o: md6_compress.c inttypes.h  md6.h  md6_nist.h  stdint.h
+-	$(CC) $(CXXFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ md6_mode.o: md6_mode.c inttypes.h  md6.h  md6_nist.h  stdint.h 
+-	$(CC) $(CXXFLAGS) -c $< -o $@ 
++	$(CC) $(CFLAGS) -c $< -o $@ 
+ 
+ md6_nist.o: md6_nist.c inttypes.h  md6.h  md6_nist.h  stdint.h 
+-	$(CC) $(CXXFLAGS) -c $< -o $@ 
++	$(CC) $(CFLAGS) -c $< -o $@ 
+ 
+ md6sum.o: md6sum.c inttypes.h  md6.h  md6_nist.h  stdint.h 
+-	$(CC) $(CXXFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ clean:
+ 	rm *.o 
diff --git a/app-crypt/md6sum/files/md6sum-1.0-format-security.patch b/app-crypt/md6sum/files/md6sum-1.0-format-security.patch
new file mode 100644
index 000000000000..061ec7b5f1b4
--- /dev/null
+++ b/app-crypt/md6sum/files/md6sum-1.0-format-security.patch
@@ -0,0 +1,26 @@
+From 95833e409336bd0a4a656b7e2d0a9598dfe3f546 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 30 Aug 2014 21:25:23 +0300
+Subject: [PATCH] build: fix warning of format-security
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ md6sum.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/md6sum.c b/md6sum.c
+index 2401a5a..0338d30 100644
+--- a/md6sum.c
++++ b/md6sum.c
+@@ -428,7 +428,7 @@ void optd(char *optstr)
+ 
+ void opth()
+ { /* print md6sum help string */
+-  printf(help_string);
++  printf("%s", help_string);
+ }
+ 
+ void optK(char *optstr)
+-- 
+1.8.5.5
+
diff --git a/app-crypt/md6sum/files/md6sum-1.0-ldflags.patch b/app-crypt/md6sum/files/md6sum-1.0-ldflags.patch
new file mode 100644
index 000000000000..23d37e192ea3
--- /dev/null
+++ b/app-crypt/md6sum/files/md6sum-1.0-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Nru md6sum-1.0.orig/Makefile.in md6sum-1.0/Makefile.in
+--- md6sum-1.0.orig/Makefile.in	2011-01-09 02:12:09.000000000 +0000
++++ md6sum-1.0/Makefile.in	2011-02-01 04:41:35.000000000 +0000
+@@ -18,7 +18,7 @@
+ all: md6sum
+ 
+ md6sum: $(OBJS)
+-	$(CC) $(OBJS) $(CXXFLAGS) -o $@
++	$(CC) $(OBJS) $(CXXFLAGS) $(LDFLAGS) -o $@
+ 
+ md6_compress.o: md6_compress.c inttypes.h  md6.h  md6_nist.h  stdint.h
+ 	$(CC) $(CXXFLAGS) -c $< -o $@
diff --git a/app-crypt/md6sum/md6sum-1.0-r2.ebuild b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
new file mode 100644
index 000000000000..93020816bfd6
--- /dev/null
+++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="A C implementation of MD6"
+HOMEPAGE="https://groups.csail.mit.edu/cis/md6"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-format-security.patch"
+)
diff --git a/app-crypt/md6sum/metadata.xml b/app-crypt/md6sum/metadata.xml
new file mode 100644
index 000000000000..5554188586db
--- /dev/null
+++ b/app-crypt/md6sum/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">md6sum</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/metadata.xml b/app-crypt/metadata.xml
new file mode 100644
index 000000000000..d508e6060e4c
--- /dev/null
+++ b/app-crypt/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-crypt category contains cryptographic (encryption, decryption,
+		steganography and signing) software.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-crypt enhält kryptographische (Ver- und Entschlüsselung,
+		Steganographie, Signierung) Software.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-crypt contiene programas para criptografía
+		(cifrado, des-cifrado, estenografía y firmas). 
+	</longdescription>
+	<longdescription lang="ja">
+		app-cryptカテゴリには暗号手法ソフトウェア
+		(暗証化と復号化と電子透かしと電子署名)が含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-crypt categorie bevat cryptografische applicaties (encryptie,
+		decryptie, steganografie,...).
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-crypto chứa các ứng dụng về mật mã (mã hóa,
+		giải mã, kỷ tên và steganography).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-crypt contiene programmi di crittografia (cifratura, decifratura, steganografia e firma).
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-crypt contém programas criptográficos (cifradores,
+		descifradores, esteganografia e assinaturas).
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-crypt zawiera programy kryptograficzne związane z
+		szyfrowaniem, deszyfrowaniem, stenografią oraz podpisywaniem danych.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-crypt/mhash-0.9.9.9-r2 b/app-crypt/mhash-0.9.9.9-r2
deleted file mode 100644
index 3e325aad13a7..000000000000
--- a/app-crypt/mhash-0.9.9.9-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=library providing a uniform interface to a large number of hash algorithms
-EAPI=6
-HOMEPAGE=http://mhash.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/mhash/mhash-0.9.9.9.tar.gz
-_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bc2faf49663afa3cc1aeb3ade0908d9c
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
new file mode 100644
index 000000000000..2db0e2693d97
--- /dev/null
+++ b/app-crypt/mhash/Manifest
@@ -0,0 +1,11 @@
+AUX mhash-0.9.9-autotools-namespace-stomping.patch 3087 BLAKE2B fc603a771f074f35ea6a95f5c8bbf8964c9310cee1c04a77189b3416414ccb0b6924988602bdfd3bbaefeca16a93d289a8379325c8288cabc70acabf05f79f88 SHA512 f32bcbf244aa38755b99c0bb1b328974a9dc6b927bf56073061821827f7b2017c98eb042d11f52d0befb654c58db6540fe1bec0ce7d5f980bfd26914ac49b596
+AUX mhash-0.9.9-fix-mem-leak.patch 1016 BLAKE2B 33037f2d2ed56b22b70ff9f6fd97d885476afa3a7c140533fab983c7bcbf11b9b34e78437685ac9d4bf0fe5d0872053543f266634417bc4f098b388316a1097a SHA512 2255a24f1053ef657750196fbf3e07cb68fc630db5d07356e048a4470a99b2eeeb932a7ecc344211b08bb705a176083f7f36bf0cf245ae684d8cc76b37dcbac0
+AUX mhash-0.9.9-fix-snefru-segfault.patch 1005 BLAKE2B f505dc18602d20772fdc8ea3756a2650848adb53c469da94ad5d373ae2de629dd133591f0771dd14b86b4f02e87937e3097a3afbe7f0c2d1ce9533e85ebeab19 SHA512 20f23f4d3ba20b61942e09915fa3e355f679f3e9747fec888d1c576c0e7144611b432cf005184938b86d080d8e626bc31af6ea2877762ec3e3205563b5cbfb09
+AUX mhash-0.9.9-fix-whirlpool-segfault.patch 1011 BLAKE2B c7c7a846fb50df6b1bfc6df33466dd3ba5468d5e833580542de4b30a1cc682805485a64f68d5c5dd42f1b133c88c64322f63294805cae910e31ec57cb0d63244 SHA512 4132174e3b1bf08a296fb36a1bc516eedc79d59c5bd5f17e32ddcf70ad243e24bc733fecafe9bbc3a776c573022496ab2593a0201d3576ebf94402588a4f4889
+AUX mhash-0.9.9.9-align.patch 3037 BLAKE2B d93a4bc58de7df96ed07fdefa066d368e342fff186c3282e25c4c2bd359187fe76aceb3e68e9748768c5cf594a25fb091870532ddae4eb3f9b6eb54ec3f7f73b SHA512 ce52d1caf3f9dc5bcc388aefacebb93fd422f905ab82f4d7aa6b66ac4ecfcbd32d576778cf3c0ad34f48461a016a08f2cc9ea7063fcb1f29b5188dea04f1ae03
+AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e333c4b64ace3b4f7f220e4035423c8873b6ea66ade3d8ddd68fa49540ff02c53a262fb87c401fdecfba3921df25958ac SHA512 6272d5e346067861235b8c5cbb5f4ec1bbb1cd80910ea913860e09ed34661df02ed3d4ed9fa55e870d7e22827fad84cc56bb701195908acca435643018fe81d3
+AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
+AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
+DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
+EBUILD mhash-0.9.9.9-r2.ebuild 1438 BLAKE2B 0722da99796190fc4b0240f88486e5a35d080cec1ef56a425d754e2d55cc800de9065a11892e4b33ab599b76883a0678b5c78298748727ec66c556687112f08d SHA512 9dbd5075d99c23f9274cbbaf5bdcd13833f0c4c353796e888b64fbcf7e83c39f67df1d270da65e139b42a75416fece6a5e16b4c643602debae6dcae897e5c92a
+MISC metadata.xml 325 BLAKE2B 07d8e2f3ec1adec0b16be91a853079e875a3d318fb47ec60e43a6ea87fbbdbbf5f22ec364af47ae311070081235752cebac0fbca30785731cc4b924a9a14edba SHA512 32c365b53e7c9d2a3c6dcef43cc33163a690a0e2f3401e275d3511faa388149ade4b9f5c583307f5b94e6df005796b4ec935ecf35c6cda8d236e46ed0ab7336c
diff --git a/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch b/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch
new file mode 100644
index 000000000000..19981b6b9072
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch
@@ -0,0 +1,96 @@
+Per debian 473204: http://bugs.debian.org/473204, mhash exports #defines that
+are customarily autotools-private. This results in warnings when other packages
+attempt to use mhash's headers.
+
+Gentoo-Bug: 221093
+Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=221093
+Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=152625&action=view
+Signed-off-by: Peter Alfredson <loki_val@gentoo.org>
+
+diff -NrU5 mhash-0.9.9.orig/configure.in mhash-0.9.9/configure.in
+--- mhash-0.9.9.orig/configure.in	2008-05-09 16:17:52.000000000 +0200
++++ mhash-0.9.9/configure.in	2008-05-09 16:18:20.000000000 +0200
+@@ -4,10 +4,11 @@
+ AC_CANONICAL_TARGET
+ AC_CONFIG_SRCDIR([lib/mhash.c])
+ AM_INIT_AUTOMAKE
+ 
+ AC_DEFINE([MHASH_VERSION], PROGRAM_VERSION, "MHash Version")
++AC_CONFIG_HEADER([include/mutils/config.h])
+ AC_CONFIG_HEADER([include/mutils/mhash_config.h])
+ 
+ 
+ dnl Check system.
+ 
+diff -NrU5 mhash-0.9.9.orig/include/mutils/config.h.in mhash-0.9.9/include/mutils/config.h.in
+--- mhash-0.9.9.orig/include/mutils/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ mhash-0.9.9/include/mutils/config.h.in	2008-05-09 16:18:20.000000000 +0200
+@@ -0,0 +1,22 @@
++/* Name of package */
++#undef PACKAGE
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Version number of package */
++#undef VERSION
++
++
+diff -NrU5 mhash-0.9.9.orig/include/mutils/mhash_config.h.in mhash-0.9.9/include/mutils/mhash_config.h.in
+--- mhash-0.9.9.orig/include/mutils/mhash_config.h.in	2008-05-09 16:17:52.000000000 +0200
++++ mhash-0.9.9/include/mutils/mhash_config.h.in	2008-05-09 16:19:17.000000000 +0200
+@@ -179,28 +179,10 @@
+ #undef MHASH_VERSION
+ 
+ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+ #undef NO_MINUS_C_MINUS_O
+ 
+-/* Name of package */
+-#undef PACKAGE
+-
+-/* Define to the address where bug reports for this package should be sent. */
+-#undef PACKAGE_BUGREPORT
+-
+-/* Define to the full name of this package. */
+-#undef PACKAGE_NAME
+-
+-/* Define to the full name and version of this package. */
+-#undef PACKAGE_STRING
+-
+-/* Define to the one symbol short name of this package. */
+-#undef PACKAGE_TARNAME
+-
+-/* Define to the version of this package. */
+-#undef PACKAGE_VERSION
+-
+ /* Define to 1 if the C compiler supports function prototypes. */
+ #undef PROTOTYPES
+ 
+ /* The size of `unsigned char', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_CHAR
+@@ -221,13 +203,10 @@
+ #undef STDC_HEADERS
+ 
+ /* dmalloc */
+ #undef USE_DMALLOC
+ 
+-/* Version number of package */
+-#undef VERSION
+-
+ /* Define if using the dmalloc debugging malloc package */
+ #undef WITH_DMALLOC
+ 
+ /* Define to 1 if your processor stores words with the most significant byte
+    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch
new file mode 100644
index 000000000000..74552499501f
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch
@@ -0,0 +1,27 @@
+The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are
+affected by a bug which causes memory to be leaked during
+mhash_restore_state_mem.
+
+In this function/patch, ret->state is allocated towards the beginning and later
+on replaced with a new allocated area without freeing the old.  The patch fixes
+it.
+
+Patch already submitted upstream, but depending on speed, this may be faster to
+patch in a new patchset.
+
+Gentoo-Bug: 255006
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255006
+Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178560
+Signed-off-by: Thomas Harning <harningt@gmail.com>
+
+--- mhash-0.9.9/lib/mhash.c	2007-02-21 01:18:46.000000000 -0500
++++ mhash-0.9.9-new/lib/mhash.c	2009-01-15 01:57:53.000000000 -0500
+@@ -719,6 +719,8 @@
+ 	mutils_memcpy( &ret->state_size, &mem[pos], sizeof(ret->state_size));
+ 	pos += sizeof( ret->state_size);
+
++	if (ret->state)
++		mutils_free(ret->state);
+ 	ret->state = mutils_malloc(ret->state_size);
+ 	if (ret->state==NULL)
+ 		goto freeall;
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch
new file mode 100644
index 000000000000..c308269c1b24
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch
@@ -0,0 +1,27 @@
+The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are
+affected by a bug which causes a NULL ptr dereference in whirlpool/snefru
+digest-completion functionality.
+
+In this patch, whirlpool and snefru's code is updated to bail if 'digest' is
+NULL.  The code portion aborted is only responsible for writing data to the
+digest, so this appears to be correct behavior.
+
+Patch already submitted upstream, but depending on speed, this may be faster to
+patch in a new patchset.
+
+Gentoo-Bug: 255131
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255131
+Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178666&action=view
+Signed-off-by: Thomas Harning <harningt@gmail.com>
+
+--- mhash-0.9.9/lib/snefru.c	2009-01-16 00:16:04.000000000 -0500
++++ mhash-0.9.9-new/lib/snefru.c	2009-01-16 00:16:21.000000000 -0500
+@@ -859,6 +859,8 @@
+ {
+ 	mutils_word32 i;
+ 
++	if(!digest) return;
++
+ 	for (i = 0; i < len; i++, digest += 4)
+ 	{
+ 		*(mutils_word32 *)digest = mutils_bend2sys32(ctx->hash[i]);
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch
new file mode 100644
index 000000000000..6c79139d5793
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch
@@ -0,0 +1,27 @@
+The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are
+affected by a bug which causes a NULL ptr dereference in whirlpool/snefru
+digest-completion functionality.
+
+In this patch, whirlpool and snefru's code is updated to bail if 'digest' is
+NULL.  The code portion aborted is only responsible for writing data to the
+digest, so this appears to be correct behavior.
+
+Patch already submitted upstream, but depending on speed, this may be faster to
+patch in a new patchset.
+
+Gentoo-Bug: 255131
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255131
+Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178667&action=view
+Signed-off-by: Thomas Harning <harningt@gmail.com>
+
+--- mhash-0.9.9/lib/whirlpool.c	2006-01-08 03:14:47.000000000 -0500
++++ mhash-0.9.9-new/lib/whirlpool.c	2009-01-16 00:17:34.000000000 -0500
+@@ -970,6 +970,8 @@
+                     mutils_word8 * digest)
+ {
+    mutils_word32 i;
++
++   if(!digest) return;
+     /*
+      * return the completed message digest:
+      */
diff --git a/app-crypt/mhash/files/mhash-0.9.9.9-align.patch b/app-crypt/mhash/files/mhash-0.9.9.9-align.patch
new file mode 100644
index 000000000000..04bb310aa772
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9.9-align.patch
@@ -0,0 +1,119 @@
+diff -up mhash-0.9.9.9/lib/stdfns.c.BAD mhash-0.9.9.9/lib/stdfns.c
+--- mhash-0.9.9.9/lib/stdfns.c.BAD	2009-07-02 16:38:43.217029623 -0400
++++ mhash-0.9.9.9/lib/stdfns.c	2009-07-02 16:41:58.647120391 -0400
+@@ -152,6 +152,18 @@ mutils_bzero(void *s, __const mutils_wor
+ 	}
+ }
+ 
++static void
++mutils_memset8(void *s, __const mutils_word8 c, __const mutils_word32 n)
++{
++	mutils_word8 *stmp = s;
++	mutils_word32 i;
++
++	for (i = 0; i < n; i++, stmp++)
++	{
++               *stmp = c;
++	}
++}
++
+ WIN32DLL_DEFINE
+ void
+ mutils_memset(void *s, __const mutils_word8 c, __const mutils_word32 n)
+@@ -160,8 +172,7 @@ mutils_memset(void *s, __const mutils_wo
+ 	/* Sparc needs 8-bit alignment - just use standard memset */
+ 	memset(s, (int) c, (size_t) n);
+ #else
+-	mutils_word8 *stmp;
+-	mutils_word32 *ltmp = (mutils_word32 *) s;
++	mutils_word32 *ltmp;
+ 	mutils_word32 lump;
+ 	mutils_word32 i;
+ 	mutils_word32 words;
+@@ -172,22 +183,30 @@ mutils_memset(void *s, __const mutils_wo
+ 		return;
+ 	}
+ 
++	if (n < 16)
++	{
++		return mutils_memset8(s, c, n);
++	}
++
++	/* unaligned portion at beginning */
++	remainder = (-(mutils_word32)s) & 0x3;
++	mutils_memset8(s, c, remainder);
++
++	/* aligned words in the middle */
++	ltmp = (mutils_word32 *) (s + remainder);
++
+ 	lump = (c << 24) + (c << 16) + (c << 8) + c;
+ 
+-	words = n >> 2;
+-	remainder = n - (words << 2);
++	words = (n - remainder) >> 2;
++	remainder = n - remainder - (words << 2);
+ 
+ 	for (i = 0; i < words; i++, ltmp++)
+ 	{
+ 		*ltmp = lump;
+ 	}
+ 
+-	stmp = (mutils_word8 *) ltmp;
+-
+-	for (i = 0; i < remainder; i++, stmp++)
+-	{
+-		*stmp = c;
+-	}
++	/* unaligned portion at end */
++	return mutils_memset8(ltmp, c, remainder);
+ #endif
+ }
+ 
+@@ -281,6 +300,9 @@ mutils_word32nswap(mutils_word32 *x, mut
+ 	mutils_word32 *buffer;
+ 	mutils_word32 *ptrIn;
+ 	mutils_word32 *ptrOut;
++	mutils_word8 *ptr8In;
++	mutils_word8 *ptr8Out;
++	mutils_word8 tmp8;
+ 	mutils_word32 count = n * 4;
+ 
+ 	if (destructive == MUTILS_FALSE)
+@@ -301,9 +323,35 @@ mutils_word32nswap(mutils_word32 *x, mut
+  * data on a little-endian machine.
+  */
+ 
+-	for (loop = 0, ptrIn = x, ptrOut = buffer; loop < n; loop++, ptrOut++, ptrIn++)
++	if ((mutils_word32)x & 0x3)
++	{
++         ptr8In = (mutils_word8 *) x;
++         ptr8Out = (mutils_word8 *) buffer;
++         for (loop = 0; loop < n; loop++)
++           {
++#ifdef WORDS_BIGENDIAN
++             tmp8 = ptr8In[0];
++             ptr8Out[0] = ptr8In[3];
++             ptr8Out[3] = tmp8;
++             tmp8 = ptr8In[1];
++             ptr8Out[1] = ptr8In[2];
++             ptr8Out[2] = tmp8;
++#else
++             ptr8Out[0] = ptr8In[0];
++             ptr8Out[1] = ptr8In[1];
++             ptr8Out[2] = ptr8In[2];
++             ptr8Out[3] = ptr8In[3];
++#endif
++             ptr8Out += 4;
++             ptr8In += 4;
++           }
++	}
++	else
+ 	{
+-		*ptrOut = mutils_lend32(*ptrIn);
++               for (loop = 0, ptrIn = x, ptrOut = buffer; loop < n; loop++, ptrOut++, ptrIn++)
++               {
++                       *ptrOut = mutils_lend32(*ptrIn);
++               }
+ 	}
+ 
+ 	return(buffer);
diff --git a/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch b/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch
new file mode 100644
index 000000000000..04df22167a3f
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch
@@ -0,0 +1,16 @@
+diff -up mhash-0.9.9.9/lib/stdfns.c.BAD mhash-0.9.9.9/lib/stdfns.c
+--- mhash-0.9.9.9/lib/stdfns.c.BAD	2009-07-21 12:05:40.139461097 -0400
++++ mhash-0.9.9.9/lib/stdfns.c	2009-07-21 12:06:52.151190927 -0400
+@@ -378,6 +378,12 @@ mutils_memmove(void *dest, __const void 
+ 	bigptr1 = (mutils_word32 *) dest;
+ 	bigptr2 = (mutils_word32 *) src;
+ 
++	/* copy byte-by-byte for small and/or unaligned copies */
++	if ((n < 16) || ((mutils_word32)dest & 0x3) || ((mutils_word32)src & 0x3))
++	{
++		return mutils_memcpy8(dest, src, n);
++	}
++
+ 	words = n >> 2;
+ 	remainder = n - (words << 2);
+ 
diff --git a/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch b/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch
new file mode 100644
index 000000000000..2248bcc6a308
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch
@@ -0,0 +1,14 @@
+diff -up mhash-0.9.9.9/lib/tiger.c.BAD mhash-0.9.9.9/lib/tiger.c
+--- mhash-0.9.9.9/lib/tiger.c.BAD	2009-07-02 16:42:47.683029940 -0400
++++ mhash-0.9.9.9/lib/tiger.c	2009-07-02 16:43:46.085049317 -0400
+@@ -252,7 +252,9 @@ void tiger_update(struct tiger_ctx *ctx,
+ void tiger_final(struct tiger_ctx *ctx)
+ {
+ 	register mutils_word64 i, j;
+-	mutils_word8 temp[TIGER_DATASIZE];
++	/* Force 64-bit alignment */
++	mutils_word64 temp_64bit[TIGER_DATASIZE/8];
++	mutils_word8 *temp = temp_64bit;
+ 	i = ctx->index;
+ 	
+ #if defined(WORDS_BIGENDIAN)
diff --git a/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch b/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch
new file mode 100644
index 000000000000..5ed4ecbe6292
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch
@@ -0,0 +1,12 @@
+diff -ru mhash-0.9.9.9.orig/src/keygen_test.c mhash-0.9.9.9/src/keygen_test.c
+--- mhash-0.9.9.9.orig/src/keygen_test.c	2007-02-21 07:39:08.000000000 +0100
++++ mhash-0.9.9.9/src/keygen_test.c	2009-12-04 01:29:16.000000000 +0100
+@@ -121,8 +121,6 @@
+ 	
+ 	mhash_keygen_ext(KEYGEN_S2K_SALTED, data, key, keysize, password, passlen);
+ 
+-	mutils_memset(tmp, 0, keysize * 2);
+-
+ 	tmp = mutils_asciify(key, keysize);
+ 
+ 	result = mutils_strcmp((mutils_word8 *) KEY2, tmp);
diff --git a/app-crypt/mhash/metadata.xml b/app-crypt/mhash/metadata.xml
new file mode 100644
index 000000000000..4d45a5368800
--- /dev/null
+++ b/app-crypt/mhash/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mhash</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
new file mode 100644
index 000000000000..300d6c81abea
--- /dev/null
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune
+
+DESCRIPTION="library providing a uniform interface to a large number of hash algorithms"
+HOMEPAGE="http://mhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="dev-lang/perl" # pod2html
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.9-fix-mem-leak.patch"
+	"${FILESDIR}/${PN}-0.9.9-fix-snefru-segfault.patch"
+	"${FILESDIR}/${PN}-0.9.9-fix-whirlpool-segfault.patch"
+	"${FILESDIR}/${PN}-0.9.9-autotools-namespace-stomping.patch"
+	"${FILESDIR}/${P}-remove_premature_free.patch"
+	"${FILESDIR}/${P}-force64bit-tiger.patch"
+	"${FILESDIR}/${P}-align.patch"
+	"${FILESDIR}/${P}-alignment.patch"
+)
+
+DOCS=(
+	doc/example.c
+	doc/skid2-authentication
+)
+HTML_DOCS=(
+	doc/mhash.html
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's/--netscape//' \
+		"${S}"/doc/Makefile.in
+}
+
+src_configure() {
+	# https://sourceforge.net/p/mhash/patches/11/
+	export ac_cv_func_malloc_0_nonnull=yes
+
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	emake -C doc mhash.html
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/mit-krb5-1.16-r2 b/app-crypt/mit-krb5-1.16-r2
deleted file mode 100644
index 365d01290785..000000000000
--- a/app-crypt/mit-krb5-1.16-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl:0 dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=MIT Kerberos V
-EAPI=6
-HOMEPAGE=https://web.mit.edu/kerberos/www/
-IUSE=doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-1.16.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=42e19c2b1bc999a6aba80e889fe386b8
diff --git a/app-crypt/mit-krb5-1.16.1 b/app-crypt/mit-krb5-1.16.1
deleted file mode 100644
index 121ef4bf81af..000000000000
--- a/app-crypt/mit-krb5-1.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl:0 dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=MIT Kerberos V
-EAPI=6
-HOMEPAGE=https://web.mit.edu/kerberos/www/
-IUSE=doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-1.16.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f3fee7458fb4df466362f12de71db4e1
diff --git a/app-crypt/mit-krb5-appl-1.0.3 b/app-crypt/mit-krb5-appl-1.0.3
deleted file mode 100644
index 13a21a4ed700..000000000000
--- a/app-crypt/mit-krb5-appl-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Kerberized applications split from the main MIT Kerberos V distribution
-EAPI=4
-HOMEPAGE=http://web.mit.edu/kerberos/www/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=openafs-krb5-a BSD
-RDEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses
-SLOT=0
-SRC_URI=http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.3-signed.tar
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c200f0ff5bd6449641c5c97fe8fdb498
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
new file mode 100644
index 000000000000..415822a3df37
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -0,0 +1,5 @@
+AUX mit-krb5-appl-sig_t.patch 1411 BLAKE2B c2a34ada3f811459d006c1be6e79cb0811b0ab6ef7a1eb2fa6372db5b52b7db06e1cb94d7cbcd9b883fa14d9e0cf704ebfde7a441e7348728be9511ff2b6dae5 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3
+AUX mit-krb5-appl-tinfo.patch 575 BLAKE2B e79cbae98ea7848bbe11f0aeda1f192d51bb1b9440952d0b8606d91b0fb8dd6d1057c4eece722112a3a3bcd26596868cf534d49f4bf5dbfeee227b16f8adde19 SHA512 076f34d70f43ae34fa6bc5e23171b2b31f579812527b7f78ba40ac3fca0cd92000b8caa40b8773bd2f9cc3ce0f6bcc6815f83422d5f8d320d34c4feb580231ab
+DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
+EBUILD mit-krb5-appl-1.0.3.ebuild 1642 BLAKE2B 5636ff5fadd84d073ddb93e0e43461f864eed505ba49fa8d59a229aa97038e57d9d77888dde1390f69d9f826afc1307cbd8bce9f0a4d3787fc0522fafde92d3e SHA512 c246be6deaf8fe6651ab8b6c61cdc47f5e1afb73c7913beef5b66d571622e318751fc5e7514ef662c2ea0c4196a4dcdf64b4f685e2cef6435bc2cb6796f80bc9
+MISC metadata.xml 240 BLAKE2B 3a20174df7c37c40098c716b97f64079f86d511e3740e43865ba8e1b1fe52de971091ee51a510543cb2a49373cff87e790f71fe397975f61eee2b308b0729e66 SHA512 57354970f719cd4e3a27f6024addadbb81919a5eaaefef094d3d2b362c44b5ab5cec740090ffce89730cc52f469bc93957c129865a71a4583e0309a93e6f970d
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch
new file mode 100644
index 000000000000..ebdaf6b5b3d2
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch
@@ -0,0 +1,55 @@
+Bug #513762
+
+From 4b45a32ba7c4f7b447919de6ce28a14150584290 Mon Sep 17 00:00:00 2001
+From: Russ Allbery <rra@stanford.edu>
+Date: Wed, 21 Mar 2012 04:16:36 +0000
+Subject: [PATCH] Move redeclaration of sig_t after all system includes
+
+Move some internal messing about with sig_t done by gssftp/ftp/ftp_var.h
+after the last system include to keep from stomping on system headers.
+Required for kFreeBSD and Hurd.
+
+git-svn-id: svn://anonsvn.mit.edu/krb5-appl/trunk@3331 dc483132-0cff-0310-8789-dd5450dbe970
+---
+ gssftp/ftp/ftp_var.h | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/gssftp/ftp/ftp_var.h b/gssftp/ftp/ftp_var.h
+index 3efbdb1..e478961 100644
+--- a/gssftp/ftp/ftp_var.h
++++ b/gssftp/ftp/ftp_var.h
+@@ -53,15 +53,6 @@ FILE* fdopen_socket(SOCKET s, char* mode);
+ #define PERROR_SOCKET(str) perror(str)
+ #endif
+ 
+-#ifdef _WIN32
+-typedef void (*sig_t)(int);
+-typedef void sigtype;
+-#else
+-#define sig_t my_sig_t
+-#define sigtype krb5_sigtype
+-typedef sigtype (*sig_t)();
+-#endif
+-
+ /*
+  * FTP global variables.
+  */
+@@ -168,6 +159,15 @@ extern int macnum;		/* number of defined macros */
+ extern struct macel macros[16];
+ extern char macbuf[4096];
+ 
++#ifdef _WIN32
++typedef void (*sig_t)(int);
++typedef void sigtype;
++#else
++#define sig_t my_sig_t
++#define sigtype krb5_sigtype
++typedef sigtype (*sig_t)();
++#endif
++
+ #ifdef DEFINITIONS
+ #undef extern
+ #endif
+-- 
+1.9.3
+
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
new file mode 100644
index 000000000000..54c18665d336
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
@@ -0,0 +1,12 @@
+--- configure.ac	2011-07-11 22:34:17.000000000 +0300
++++ configure.ac	2013-02-28 15:12:24.693841664 +0200
+@@ -152,7 +152,8 @@
+              [AC_DEFINE(TERMCAP,1,[Define if termcap library is available])
+               LIBS="$LIBS -ltermcap"])
+ AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses",
+-             [AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses")])
++             [AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses",
++	     	[AC_CHECK_LIB(tinfo,setupterm,LIBS="$LIBS -lncurses")])])
+ AC_CHECK_FUNCS(setupterm)
+ TELNET_LIBS="$LIBS"
+ TELNETD_LIBS="$LIBS"
diff --git a/app-crypt/mit-krb5-appl/metadata.xml b/app-crypt/mit-krb5-appl/metadata.xml
new file mode 100644
index 000000000000..b02e0cad4528
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>kerberos@gentoo.org</email>
+	<name>Kerberos</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
new file mode 100644
index 000000000000..5edde7606927
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic toolchain-funcs versionator
+
+MY_P=${P/mit-}
+MAJOR_MINOR="$( get_version_component_range 1-2 )"
+DESCRIPTION="Kerberized applications split from the main MIT Kerberos V distribution"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signed.tar"
+
+LICENSE="openafs-krb5-a BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND=">=app-crypt/mit-krb5-1.8.0
+	sys-libs/e2fsprogs-libs
+	sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-tinfo.patch"
+	epatch "${FILESDIR}/${PN}-sig_t.patch"
+	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-I/usr/include/et"
+	append-cppflags -fno-strict-aliasing
+	append-cppflags -fno-strict-overflow
+	econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	for i in {telnetd,ftpd} ; do
+		mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 \
+		|| die "mv failed (man)"
+		mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} || die "mv failed"
+	done
+
+	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
+		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 \
+		|| die "mv failed (man)"
+		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} || die "mv failed"
+	done
+
+	rm "${D}"/usr/share/man/man1/tmac.doc
+	dodoc README
+}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
new file mode 100644
index 000000000000..5a84e9135df4
--- /dev/null
+++ b/app-crypt/mit-krb5/Manifest
@@ -0,0 +1,21 @@
+AUX CVE-2018-5729-5730.patch 11896 BLAKE2B 324bbd80acf4a2520909fc26f90f67cec06148ee0effecc43fbadd6c6445b57ee17eae57864c92a5ce0cdc3dbfb0540758910133195fd2078d334bc6e209a452 SHA512 b59ba6cb5d40cca6c8f539c028ba24c2fa6bd1750133545e912f519b91043d426cecf782209c373598fd895c6294e44fc2bc27af34c033ff367bdfb2cb4f91c4
+AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d4282bc88d7b33b317a202d57df0bb4a2b47113f0d38cb508614e122e4a3bb7dfd2397e2daa3178396 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f
+AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
+AUX mit-krb5-config_LDFLAGS.patch 466 BLAKE2B 2dd4f1cfc20bea229d08201d66e3de71472dccfa45dee9b260c51578187e706b864c0b4ff81c0c5a09fd29401c2abdbe334441ca075208299b02d5e1d49aff94 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7
+AUX mit-krb5-libressl-version-check.patch 1123 BLAKE2B ca8bad504949c8dcbffe5f9906a38287a2483ffef8b0326cf361f7a07c44787aa0972a24a832aa4da9a1450fa41035bf216c55e1aafb8a890cc8d88f1e210e88 SHA512 cec03ab3577fd8f96f34e51e9380622b09ac5964687b2e8e45e066d16846a9add71c3fd44f6de305ee5c5be5a27a07e4758b6752afdd8a70149b3f191be609f8
+AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
+AUX mit-krb5kadmind.initd-r2 612 BLAKE2B ba2a70a7c123d63b9c58f4ec31c3c2366949e6971ff4f203cb38e1efb5a69991533291e118066e680d880c5221168c8eb5b047ec70dac857888330978d1e5a9b SHA512 3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98
+AUX mit-krb5kadmind.service 137 BLAKE2B fcbb450a9bd39407801c93d7ffe050eadb27adbfe3165f27fe9a6ad1b18464153109bdab61a85a6a908dbb8e57b14d577165d9144a6f311d90167d01a92de748 SHA512 65a507b84e8280a9e417e32f8667941f52802f1afe9de513718db5a414ba84569b95a5c4d84eb9d39c232901c4ae1f674e6c95ea2c6895dc0c495b78ec04a026
+AUX mit-krb5kdc.confd 54 BLAKE2B d8cbcf8dfb6e9d249b1990587f7e5880f32f3e69df2b44d7e973adcf3809185de76f0c2a12d3c4c4ff590c26b2e3fcd69aedd3881ef23b0216e5bff57993c62b SHA512 bd51139b644350f464fe4d254cc5036e96a7f5b0156033e1fdeed1acee6867052bddfe3495893295e83f56dfdff1c30a606bd64faeba58cc9a5bcd6cde5c6b9c
+AUX mit-krb5kdc.initd-r2 572 BLAKE2B f9115cc452891e1267268df6d4beb7eeb69ec27edc924744a6cee957ec8e3d9e1b062fc6a86f83692d95163419f80e1a7c781afd373cd3c135227ede2ebf7f1a SHA512 42cbc315a4e28a78cd29ee6f9aa9401ac6185cc78d39528f0c498d6b04a8edba7b7efadaaeae52ac2c4f89faa846787da9aee645f9ef0bdb79cd6289454586a3
+AUX mit-krb5kdc.service 129 BLAKE2B f1cfb303cfef67c138e04bb2a7e2b61755370819a5dd4cb921ac7590df9c6c9934d49ac719784743c691c93f78b96d8b63609e3dc4c9eb3142451ee6f30f7c87 SHA512 0b4d41f658769b0134764dafeab9008fa0a5916adc9bd9362dfda6f92681d8a8cc4c6b78058b2c2ec6e6e3d991e2de3d883dac1813530ce791cd8df2b73c9658
+AUX mit-krb5kpropd.confd 84 BLAKE2B e3f47a3c520af14794c2fe11368651ba56e8aa059babb91b3112af9682403a6409b3fb39ed6313f9cd87169c3754e4c4fc17bc24b0b773cfdf01e7df3eb03490 SHA512 afd1cf21a6afd3bc73b1ef3cb0a26ec3420b26ed31196f8c092ae880b235043273c95e2ecb3b88e65ea008cd8ea6a10553d1966f45646cf5993d5752dfc945ac
+AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aecdab99d3dcfd8c16bae65ed05fc732f2007c65f0abfab10cf766035c03c557d217f750ab06f804b639722b27e SHA512 28b9d9bc9d132d8bd87d5fd9e74103d4772f26cba48d28ad53f40ade037a5ac91e07c01aa3180d50c3624673bf4e534f76689b03feb4888cdd9198755576b6a7
+AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655dd5170a4f9f16c6a889a4303a4dc276aca09b3a213a1de3e6ab759c66790141708ec95c4393bbbe79e8fb16f SHA512 b7419d1c728eda86fbab2fbf83794ae754e3cdaec7dcdc12c2105e3a75f9903c25fe8fee48f57acf6f0a8c62d27f7934fae81c0cbd67b997541aef7060a4de46
+AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
+AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
+DIST krb5-1.16.1.tar.gz 9477480 BLAKE2B 16bdd7d6d03ddbd4b070663c3a7a3d2331d54e8590b24f1dc162be2531bfbbbd65878d426a160c65ffc1ba4751f16bbbd177a8a91c01002fde0e886cc1bd91b9 SHA512 fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84
+DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
+EBUILD mit-krb5-1.16-r2.ebuild 4213 BLAKE2B 9e517ec5e62264bd9ddd59fbc20473ae0f5e053fefd793006edd8ed47d6c780f02a4f73dc7f3a7b73a253014d30cb457020dd426b50164354229d847ffacbab4 SHA512 8f64302076f3348f0f89d3630f1724999310567224ae0fc4f3b2cdb267db81bd3cadd77380f79e3e9a1ddf1e8a04ed168a9b0407950790b0f9ebe1d2b6785a4d
+EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
+MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/files/CVE-2018-5729-5730.patch b/app-crypt/mit-krb5/files/CVE-2018-5729-5730.patch
new file mode 100644
index 000000000000..114cfe688e73
--- /dev/null
+++ b/app-crypt/mit-krb5/files/CVE-2018-5729-5730.patch
@@ -0,0 +1,297 @@
+diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
+index 2420f2c2be..a59a65e8f6 100644
+--- a/src/lib/kadm5/srv/svr_principal.c
++++ b/src/lib/kadm5/srv/svr_principal.c
+@@ -330,6 +330,13 @@ kadm5_create_principal_3(void *server_handle,
+         return KADM5_BAD_MASK;
+     if((mask & ~ALL_PRINC_MASK))
+         return KADM5_BAD_MASK;
++    if (mask & KADM5_TL_DATA) {
++        for (tl_data_tail = entry->tl_data; tl_data_tail != NULL;
++             tl_data_tail = tl_data_tail->tl_data_next) {
++            if (tl_data_tail->tl_data_type < 256)
++                return KADM5_BAD_TL_TYPE;
++        }
++    }
+ 
+     /*
+      * Check to see if the principal exists
+diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+index 535a1f309e..8b8420faa9 100644
+--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
++++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+@@ -141,7 +141,7 @@ extern int set_ldap_error (krb5_context ctx, int st, int op);
+ #define UNSTORE16_INT(ptr, val) (val = load_16_be(ptr))
+ #define UNSTORE32_INT(ptr, val) (val = load_32_be(ptr))
+ 
+-#define  KDB_TL_USER_INFO      0x7ffe
++#define  KDB_TL_USER_INFO      0xff
+ 
+ #define KDB_TL_PRINCTYPE          0x01
+ #define KDB_TL_PRINCCOUNT         0x02
+diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
+index 88a1704950..b7c9212cb2 100644
+--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
++++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
+@@ -651,6 +651,107 @@ update_ldap_mod_auth_ind(krb5_context context, krb5_db_entry *entry,
+     return ret;
+ }
+ 
++static krb5_error_code
++check_dn_in_container(krb5_context context, const char *dn,
++                      char *const *subtrees, unsigned int ntrees)
++{
++    unsigned int i;
++    size_t dnlen = strlen(dn), stlen;
++
++    for (i = 0; i < ntrees; i++) {
++        if (subtrees[i] == NULL || *subtrees[i] == '\0')
++            return 0;
++        stlen = strlen(subtrees[i]);
++        if (dnlen >= stlen &&
++            strcasecmp(dn + dnlen - stlen, subtrees[i]) == 0 &&
++            (dnlen == stlen || dn[dnlen - stlen - 1] == ','))
++            return 0;
++    }
++
++    k5_setmsg(context, EINVAL, _("DN is out of the realm subtree"));
++    return EINVAL;
++}
++
++static krb5_error_code
++check_dn_exists(krb5_context context,
++                krb5_ldap_server_handle *ldap_server_handle,
++                const char *dn, krb5_boolean nonkrb_only)
++{
++    krb5_error_code st = 0, tempst;
++    krb5_ldap_context *ldap_context = context->dal_handle->db_context;
++    LDAP *ld = ldap_server_handle->ldap_handle;
++    LDAPMessage *result = NULL, *ent;
++    char *attrs[] = { "krbticketpolicyreference", "krbprincipalname", NULL };
++    char **values;
++
++    LDAP_SEARCH_1(dn, LDAP_SCOPE_BASE, 0, attrs, IGNORE_STATUS);
++    if (st != LDAP_SUCCESS)
++        return set_ldap_error(context, st, OP_SEARCH);
++
++    ent = ldap_first_entry(ld, result);
++    CHECK_NULL(ent);
++
++    values = ldap_get_values(ld, ent, "krbticketpolicyreference");
++    if (values != NULL)
++        ldap_value_free(values);
++
++    values = ldap_get_values(ld, ent, "krbprincipalname");
++    if (values != NULL) {
++        ldap_value_free(values);
++        if (nonkrb_only) {
++            st = EINVAL;
++            k5_setmsg(context, st, _("ldap object is already kerberized"));
++            goto cleanup;
++        }
++    }
++
++cleanup:
++    ldap_msgfree(result);
++    return st;
++}
++
++static krb5_error_code
++validate_xargs(krb5_context context,
++               krb5_ldap_server_handle *ldap_server_handle,
++               const xargs_t *xargs, const char *standalone_dn,
++               char *const *subtrees, unsigned int ntrees)
++{
++    krb5_error_code st;
++
++    if (xargs->dn != NULL) {
++        /* The supplied dn must be within a realm container. */
++        st = check_dn_in_container(context, xargs->dn, subtrees, ntrees);
++        if (st)
++            return st;
++        /* The supplied dn must exist without Kerberos attributes. */
++        st = check_dn_exists(context, ldap_server_handle, xargs->dn, TRUE);
++        if (st)
++            return st;
++    }
++
++    if (xargs->linkdn != NULL) {
++        /* The supplied linkdn must be within a realm container. */
++        st = check_dn_in_container(context, xargs->linkdn, subtrees, ntrees);
++        if (st)
++            return st;
++        /* The supplied linkdn must exist. */
++        st = check_dn_exists(context, ldap_server_handle, xargs->linkdn,
++                             FALSE);
++        if (st)
++            return st;
++    }
++
++    if (xargs->containerdn != NULL && standalone_dn != NULL) {
++        /* standalone_dn (likely composed using containerdn) must be within a
++         * container. */
++        st = check_dn_in_container(context, standalone_dn, subtrees, ntrees);
++        if (st)
++            return st;
++    }
++
++    return 0;
++}
++
+ krb5_error_code
+ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
+                         char **db_args)
+@@ -662,12 +763,12 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
+     LDAPMessage                 *result=NULL, *ent=NULL;
+     char                        **subtreelist = NULL;
+     char                        *user=NULL, *subtree=NULL, *principal_dn=NULL;
+-    char                        **values=NULL, *strval[10]={NULL}, errbuf[1024];
++    char                        *strval[10]={NULL}, errbuf[1024];
+     char                        *filtuser=NULL;
+     struct berval               **bersecretkey=NULL;
+     LDAPMod                     **mods=NULL;
+     krb5_boolean                create_standalone=FALSE;
+-    krb5_boolean                krb_identity_exists=FALSE, establish_links=FALSE;
++    krb5_boolean                establish_links=FALSE;
+     char                        *standalone_principal_dn=NULL;
+     krb5_tl_data                *tl_data=NULL;
+     krb5_key_data               **keys=NULL;
+@@ -860,24 +961,6 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
+      * any of the subtrees
+      */
+     if (xargs.dn_from_kbd == TRUE) {
+-        /* make sure the DN falls in the subtree */
+-        int              dnlen=0, subtreelen=0;
+-        char             *dn=NULL;
+-        krb5_boolean     outofsubtree=TRUE;
+-
+-        if (xargs.dn != NULL) {
+-            dn = xargs.dn;
+-        } else if (xargs.linkdn != NULL) {
+-            dn = xargs.linkdn;
+-        } else if (standalone_principal_dn != NULL) {
+-            /*
+-             * Even though the standalone_principal_dn is constructed
+-             * within this function, there is the containerdn input
+-             * from the user that can become part of the it.
+-             */
+-            dn = standalone_principal_dn;
+-        }
+-
+         /* Get the current subtree list if we haven't already done so. */
+         if (subtreelist == NULL) {
+             st = krb5_get_subtree_info(ldap_context, &subtreelist, &ntrees);
+@@ -885,81 +968,10 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
+                 goto cleanup;
+         }
+ 
+-        for (tre=0; tre<ntrees; ++tre) {
+-            if (subtreelist[tre] == NULL || strlen(subtreelist[tre]) == 0) {
+-                outofsubtree = FALSE;
+-                break;
+-            } else {
+-                dnlen = strlen (dn);
+-                subtreelen = strlen(subtreelist[tre]);
+-                if ((dnlen >= subtreelen) && (strcasecmp((dn + dnlen - subtreelen), subtreelist[tre]) == 0)) {
+-                    outofsubtree = FALSE;
+-                    break;
+-                }
+-            }
+-        }
+-
+-        if (outofsubtree == TRUE) {
+-            st = EINVAL;
+-            k5_setmsg(context, st, _("DN is out of the realm subtree"));
++        st = validate_xargs(context, ldap_server_handle, &xargs,
++                            standalone_principal_dn, subtreelist, ntrees);
++        if (st)
+             goto cleanup;
+-        }
+-
+-        /*
+-         * dn value will be set either by dn, linkdn or the standalone_principal_dn
+-         * In the first 2 cases, the dn should be existing and in the last case we
+-         * are supposed to create the ldap object. so the below should not be
+-         * executed for the last case.
+-         */
+-
+-        if (standalone_principal_dn == NULL) {
+-            /*
+-             * If the ldap object is missing, this results in an error.
+-             */
+-
+-            /*
+-             * Search for krbprincipalname attribute here.
+-             * This is to find if a kerberos identity is already present
+-             * on the ldap object, in which case adding a kerberos identity
+-             * on the ldap object should result in an error.
+-             */
+-            char  *attributes[]={"krbticketpolicyreference", "krbprincipalname", NULL};
+-
+-            ldap_msgfree(result);
+-            result = NULL;
+-            LDAP_SEARCH_1(dn, LDAP_SCOPE_BASE, 0, attributes, IGNORE_STATUS);
+-            if (st == LDAP_SUCCESS) {
+-                ent = ldap_first_entry(ld, result);
+-                if (ent != NULL) {
+-                    if ((values=ldap_get_values(ld, ent, "krbticketpolicyreference")) != NULL) {
+-                        ldap_value_free(values);
+-                    }
+-
+-                    if ((values=ldap_get_values(ld, ent, "krbprincipalname")) != NULL) {
+-                        krb_identity_exists = TRUE;
+-                        ldap_value_free(values);
+-                    }
+-                }
+-            } else {
+-                st = set_ldap_error(context, st, OP_SEARCH);
+-                goto cleanup;
+-            }
+-        }
+-    }
+-
+-    /*
+-     * If xargs.dn is set then the request is to add a
+-     * kerberos principal on a ldap object, but if
+-     * there is one already on the ldap object this
+-     * should result in an error.
+-     */
+-
+-    if (xargs.dn != NULL && krb_identity_exists == TRUE) {
+-        st = EINVAL;
+-        snprintf(errbuf, sizeof(errbuf),
+-                 _("ldap object is already kerberized"));
+-        k5_setmsg(context, st, "%s", errbuf);
+-        goto cleanup;
+     }
+ 
+     if (xargs.linkdn != NULL) {
+diff --git a/src/tests/t_kdb.py b/src/tests/t_kdb.py
+index 217f2cdc3b..6e563b1032 100755
+--- a/src/tests/t_kdb.py
++++ b/src/tests/t_kdb.py
+@@ -203,6 +203,12 @@ def ldap_add(dn, objectclass, attrs=[]):
+ # in the test LDAP server.
+ realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=krb5', 'princ1'],
+           expected_code=1, expected_msg='DN is out of the realm subtree')
++# Check that the DN container check is a hierarchy test, not a simple
++# suffix match (CVE-2018-5730).  We expect this operation to fail
++# either way (because "xcn" isn't a valid DN tag) but the container
++# check should happen before the DN is parsed.
++realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=xcn=t1,cn=krb5', 'princ1'],
++          expected_code=1, expected_msg='DN is out of the realm subtree')
+ realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=t2,cn=krb5', 'princ1'])
+ realm.run([kadminl, 'getprinc', 'princ1'], expected_msg='Principal: princ1')
+ realm.run([kadminl, 'ank', '-randkey', '-x', 'dn=cn=t2,cn=krb5', 'again'],
+@@ -226,6 +232,11 @@ def ldap_add(dn, objectclass, attrs=[]):
+            'princ3'])
+ realm.run([kadminl, 'modprinc', '-x', 'containerdn=cn=t2,cn=krb5', 'princ3'],
+           expected_code=1, expected_msg='containerdn option not supported')
++# Verify that containerdn is checked when linkdn is also supplied
++# (CVE-2018-5730).
++realm.run([kadminl, 'ank', '-randkey', '-x', 'containerdn=cn=krb5',
++           '-x', 'linkdn=cn=t2,cn=krb5', 'princ4'], expected_code=1,
++          expected_msg='DN is out of the realm subtree')
+ 
+ # Create and modify a ticket policy.
+ kldaputil(['create_policy', '-maxtktlife', '3hour', '-maxrenewlife', '6hour',
diff --git a/app-crypt/mit-krb5/files/kpropd.xinetd b/app-crypt/mit-krb5/files/kpropd.xinetd
new file mode 100644
index 000000000000..af542fcf8a54
--- /dev/null
+++ b/app-crypt/mit-krb5/files/kpropd.xinetd
@@ -0,0 +1,11 @@
+service tell
+{
+	disable		= yes
+	socket_type	= stream
+	user		= root
+	wait		= no
+	server		= /usr/sbin/kpropd
+	only_from	= 0.0.0.0
+	log_on_success	= PID HOST EXIT DURATION
+	log_on_failure	= HOST
+}
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.12_warn_cflags.patch b/app-crypt/mit-krb5/files/mit-krb5-1.12_warn_cflags.patch
new file mode 100644
index 000000000000..53037d970214
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.12_warn_cflags.patch
@@ -0,0 +1,11 @@
+gentoo bug #498794
+--- src/aclocal.m4	2014-01-16 00:44:15.000000000 +0000
++++ src/aclocal.m4	2014-03-26 10:20:54.000000000 +0000
+@@ -501,6 +501,7 @@
+   fi
+   if test "x$krb5_ac_warn_cflags_set" = xset ; then
+     AC_MSG_NOTICE(not adding extra gcc warning flags because WARN_CFLAGS was set)
++    WARN_CFLAGS=""
+   else
+     AC_MSG_NOTICE(adding extra warning flags for gcc)
+     WARN_CFLAGS="$WARN_CFLAGS $extra_gcc_warn_opts -Wmissing-prototypes"
diff --git a/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch b/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch
new file mode 100644
index 000000000000..8490e629a377
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch
@@ -0,0 +1,12 @@
+Bug #448778
+--- a/src/build-tools/krb5-config.in	2012-12-18 02:47:04.000000000 +0000
++++ b/src/build-tools/krb5-config.in	2012-12-28 07:13:16.582693363 +0000
+@@ -217,7 +217,7 @@
+ 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
+ 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+-	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
++	    -e 's#\$(LDFLAGS)##' \
+ 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ 	    -e 's#\$(CFLAGS)##'`
+ 
diff --git a/app-crypt/mit-krb5/files/mit-krb5-libressl-version-check.patch b/app-crypt/mit-krb5/files/mit-krb5-libressl-version-check.patch
new file mode 100644
index 000000000000..5c979cfd1ef7
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-libressl-version-check.patch
@@ -0,0 +1,31 @@
+--- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -191,7 +191,7 @@ pkinit_pkcs11_code_to_text(int err);
+     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ /* 1.1 standardizes constructor and destructor names, renaming
+  * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
+@@ -3059,7 +3059,7 @@ cleanup:
+     return retval;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ /*
+  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
+--- src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
++++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+@@ -46,7 +46,7 @@
+ #include <openssl/asn1.h>
+ #include <openssl/pem.h>
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #include <openssl/asn1t.h>
+ #else
+ #include <openssl/asn1_mac.h>
diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.confd b/app-crypt/mit-krb5/files/mit-krb5kadmind.confd
new file mode 100644
index 000000000000..f6029b60979c
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.confd
@@ -0,0 +1,2 @@
+# Define startup options for Kerberos administration server
+KADMIND_OPTS=""
diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2
new file mode 100644
index 000000000000..03e64f83e238
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 Admin daemon
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 Admin daemon"
+exec="/usr/sbin/kadmind"
+
+depend() {
+	need mit-krb5kdc
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- ${KADMIND_OPTS} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.service b/app-crypt/mit-krb5/files/mit-krb5kadmind.service
new file mode 100644
index 000000000000..f3836c89862d
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 administration server
+
+[Service]
+ExecStart=/usr/sbin/kadmind -nofork
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.confd b/app-crypt/mit-krb5/files/mit-krb5kdc.confd
new file mode 100644
index 000000000000..887d3d8c7bd4
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kdc.confd
@@ -0,0 +1,2 @@
+# Define startup options for Kerberos KDC
+KDC_OPTS=""
diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2
new file mode 100644
index 000000000000..ecd47e45689b
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 KDC
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 KDC"
+exec="/usr/sbin/krb5kdc"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- ${KDC_OPTS} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.service b/app-crypt/mit-krb5/files/mit-krb5kdc.service
new file mode 100644
index 000000000000..6ec93bb7232b
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kdc.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kerberos 5 KDC
+
+[Service]
+ExecStart=/usr/sbin/krb5kdc -n
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.confd b/app-crypt/mit-krb5/files/mit-krb5kpropd.confd
new file mode 100644
index 000000000000..d75d41ab813a
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.confd
@@ -0,0 +1,2 @@
+# Define startup options for Kerberos incremental propagation server
+KPROPD_OPTS=""
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2 b/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2
new file mode 100644
index 000000000000..f6ab7872c9ce
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 kpropd
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 kpropd"
+exec="/usr/sbin/kpropd"
+
+depend() {
+	use net mit-krb5kdc mit-krb5kadmind
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- ${KPROPD_OPTS} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.service b/app-crypt/mit-krb5/files/mit-krb5kpropd.service
new file mode 100644
index 000000000000..a7c5b579d2b9
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 propagation server
+
+[Service]
+ExecStart=/usr/sbin/kpropd -S
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd.socket b/app-crypt/mit-krb5/files/mit-krb5kpropd.socket
new file mode 100644
index 000000000000..4389290c0b16
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kerberos 5 propagation server
+
+[Socket]
+ListenStream=754
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service b/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service
new file mode 100644
index 000000000000..f826eb33cb33
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 propagation server
+Conflicts=mit-krb5kpropd.service
+
+[Service]
+ExecStart=/usr/sbin/kpropd
+StandardInput=socket
+StandardError=syslog
diff --git a/app-crypt/mit-krb5/metadata.xml b/app-crypt/mit-krb5/metadata.xml
new file mode 100644
index 000000000000..253338743989
--- /dev/null
+++ b/app-crypt/mit-krb5/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>kerberos@gentoo.org</email>
+  <name>Kerberos</name>
+</maintainer>
+<longdescription>Kerberos 5 reference implementation from MIT</longdescription>
+<use>
+  <flag name="doc">
+    Creates and installs the API and implementation
+    documentation. This is only useful if you want to develop software
+    which depends on kerberos.
+  </flag>
+  <flag name="keyutils">Enable for the keyring ccache using keyutils.</flag>
+  <flag name="pkinit">Enable pkinit support for the initial ticket.</flag>
+  <flag name="openldap">Enable support for ldap as a database backend.</flag>
+</use>
+<upstream>
+  <remote-id type="cpe">cpe:/a:mit:kerberos</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
new file mode 100644
index 000000000000..4ebb3adf4df4
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 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 ~sh sparc x86"
+IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite require network access
+RESTRICT="test"
+
+CDEPEND="
+	!!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}] )
+	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[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}/CVE-2018-5729-5730.patch"
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	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) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+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/mit-krb5/mit-krb5-1.16.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.1.ebuild
new file mode 100644
index 000000000000..6e6edde5000f
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 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 ~sh ~sparc ~x86"
+IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite require network access
+RESTRICT="test"
+
+CDEPEND="
+	!!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}] )
+	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[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	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) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+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/monkeysphere-0.36-r1 b/app-crypt/monkeysphere-0.36-r1
deleted file mode 100644
index b1deab04ce1e..000000000000
--- a/app-crypt/monkeysphere-0.36-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg app-misc/lockfile-progs dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 || ( net-analyzer/netcat net-misc/socat ) test? ( net-misc/socat )
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg app-misc/lockfile-progs dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 || ( net-analyzer/netcat net-misc/socat )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92d280bdf1d9e23a226db402cde1722b
diff --git a/app-crypt/monkeysphere-0.36-r2 b/app-crypt/monkeysphere-0.36-r2
deleted file mode 100644
index 766ce2ac992b..000000000000
--- a/app-crypt/monkeysphere-0.36-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg net-misc/socat dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 app-misc/lockfile-progs
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg net-misc/socat dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 app-misc/lockfile-progs
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30bd9348cde168901cc5599226992248
diff --git a/app-crypt/monkeysphere-0.37 b/app-crypt/monkeysphere-0.37
deleted file mode 100644
index 10d24bd820e0..000000000000
--- a/app-crypt/monkeysphere-0.37
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e86d1e4b88c1ef01657632f967844ace
diff --git a/app-crypt/monkeysphere-0.38 b/app-crypt/monkeysphere-0.38
deleted file mode 100644
index 223d4938c60c..000000000000
--- a/app-crypt/monkeysphere-0.38
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13f091151dc8c981853f682e942f7767
diff --git a/app-crypt/monkeysphere-0.39 b/app-crypt/monkeysphere-0.39
deleted file mode 100644
index e0c9f49e0ee6..000000000000
--- a/app-crypt/monkeysphere-0.39
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df5cc7c52af46ded0cf6755b25595e8e
diff --git a/app-crypt/monkeysphere-0.41 b/app-crypt/monkeysphere-0.41
deleted file mode 100644
index 4a5a597038f5..000000000000
--- a/app-crypt/monkeysphere-0.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f89b34157cd55d6e07eeea2ee2ab409
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
new file mode 100644
index 000000000000..fca383926336
--- /dev/null
+++ b/app-crypt/monkeysphere/Manifest
@@ -0,0 +1,24 @@
+AUX monkeysphere-0.36_default_shell.patch 466 BLAKE2B be3f2818c3d31400235fe413fb55ea79cdad0cf441a3a841465d11c9467f948f790337dfc1c07bd1bead1f3c58a3b157800b64eb9bc98ada7f263fd7b1c221f4 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8
+AUX monkeysphere-0.36_hd_od.patch 528 BLAKE2B 9ba0ae67297716b2379fc7141f6e60f0af68f9290654641946ad94fb6e04d16ede747bd334639c96c6f241e98331cba1373bf5a1c012a15460b58cffe0227ce3 SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55
+AUX monkeysphere-0.36_non_default_port.patch 418 BLAKE2B 8abc99d21b539e1b11eab3c689783646c15337e3276c55baf8ef43577fc08c1cd68c85f6555a8685ba1741988e0f2ae31b757795a40ecd30411b00e05958799b SHA512 2a173500e0b659a79a7274e042e49a282f708cda0f6a78ce8fa126013e35c4f6f117e606b90ce31da5158e58ab52a236038a913cc98c5ae1fc8e04a5dcbf816e
+AUX monkeysphere-0.36_openpgp2ssh_sanity_check.patch 1194 BLAKE2B af75804e5ea457c63e6e904e2f1ffde393e3ab06a8222527b825212f44b253ad7d418a1d10a6abd2204332065a2ba5bbbdff09a14181f0fc8bcac6808cdc64fd SHA512 b14c421e5880407b3acb845b235c89c5338a1fc1285b514679de09371db38e42aa3371ef2916c57d5ab10f08bc19f5c864762ff7eaf0a054d2817bc6bcaab488
+AUX monkeysphere-0.36_tests_gnupg2.patch 2272 BLAKE2B fd690dfe4fd357f7a6c551698c8cc897d2c5f34ae44fffd77f4a63de9a25173b3f84dfe7aa3877cd0c724650de250c72ee55f63e1aa658421188658691f02270 SHA512 e75f82793419dd2e99aa95765e9d954437d0e78294ed4188a9e7fa246b85ddbcd755eb566a1e9a9c20f2f2634150d65caa0715993863f59f9146f5cc95457975
+AUX monkeysphere-0.36_userid_empty_line.patch 292 BLAKE2B 5ce813bca6235a365d69f3c8d19b6f39dbb981af57e8171efeeb921f2e0b9c4e73c531838a87e3275809e427a3d7b7e75ad88341ab3dc05a5258f6a7fab6af6d SHA512 15b8e8ff71537e79d069d0f298326cc6705931c58ff1cf2f16c5486e587fe69f610dc1e0ebd0006e0bdef12f936685a0594dc3f9dbdadb928fba25a8e2982eb7
+AUX monkeysphere-0.37_default_shell.patch 466 BLAKE2B be3f2818c3d31400235fe413fb55ea79cdad0cf441a3a841465d11c9467f948f790337dfc1c07bd1bead1f3c58a3b157800b64eb9bc98ada7f263fd7b1c221f4 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8
+AUX monkeysphere-0.37_hd_od.patch 528 BLAKE2B 9ba0ae67297716b2379fc7141f6e60f0af68f9290654641946ad94fb6e04d16ede747bd334639c96c6f241e98331cba1373bf5a1c012a15460b58cffe0227ce3 SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55
+AUX monkeysphere-0.38-asprintf.patch 1569 BLAKE2B 2acab74551104685ff7735ba732362be00fcaa4e83326b52a36fda5ad514a5f367f03889e05181013531b1f1a15a36dbd80085cac6271f4484e399fd6839b150 SHA512 d750a948a9149c6110ca513743403588b4d861fbbe5c661401f4e0406d4ecbf03d9ca02e4eaf4f469aaa23925f2bc8dde4c155d72fadf26c02291e76571a6c70
+AUX monkeysphere-0.38-revert-executable-patch.patch 4379 BLAKE2B e599a5e13454aa9748c57d02df67f902b9337b345347622fdbdda428b0340a8672baef2ee254a17526077cc56eb2563b248a4bf42db8f24f374f139ffddfed4f SHA512 21c38c63200de7250ce90724f3dd51ee39fc2110f52b0815a592d4c49e7c32e08b3aa56b17b5a680e77727793768bed04938e7d3e85a15308ef894fbe2593f8b
+AUX monkeysphere-0.38-syssharedir-whitespace.patch 2408 BLAKE2B 89fa5bafb1c450216bdbabb7c202f2ad472c4a06720c976798852c2f8c996328e0da2dfc4c7bfaff212cd689609658976d5afa5795ed8c9c99eedc82d8ff7ca6 SHA512 7287ddcead490b188265c7bd001072125e5abe25431303853ba7bd512330d8bef9197b563745211dbde358a4107880915bd8489164be1dce72e46d9d790d2620
+AUX monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch 1700 BLAKE2B 81e72232976d71d7b3570c0fbb4852862997fe7e38e5858826fb1772fb8dbb51b1790e9c99bb6fcd082a54f0d9556ca0e05aa1ea34a2e5410da4ea6f4e938399 SHA512 1a23a1f02e98c86f45701105819ea1ff78f87132d7195ac2aebb0fda8c867b360e12ab8701c9579625af6d54851db30a93647c351ecbb3d99c5963b039628cbb
+DIST monkeysphere_0.36.orig.tar.gz 98876 BLAKE2B 5f8dcd5349cd038208fcc00dff19c7d001ca8b763f223e832c820bc4f09391ff78667f80af691c0234aed810f4d5aa77d26a378a88b41a4b115ab528e0cdd9ed SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
+DIST monkeysphere_0.37.orig.tar.gz 99557 BLAKE2B d32d127927bcf3494933282fcc343ffd32841a8afe84c78b9b29ae30fa374328295d3610475aacd8e2cf0962130c2a73b338c702dff4f904b6fd23b33ad0331b SHA512 ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512
+DIST monkeysphere_0.38.orig.tar.gz 107546 BLAKE2B 627b0fbed52e651d57fd359e79b91689eeca47ea58335125061cba72f863a582d39536504124e18805c39b3c43e5096edb6db0e32c5c80570689bd55e2936a3b SHA512 fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f4155557a8354cf38d89159422dca390f
+DIST monkeysphere_0.39.orig.tar.gz 107735 BLAKE2B 5e4df72c8c78f6325f79c93b7de1407af2ceb1d2b6be43476d3e0dc5b2505ae97c589deec2bcb64a7dbb3a661221891b89e126086d08df09aef07b07452344f7 SHA512 069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2
+DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
+EBUILD monkeysphere-0.36-r1.ebuild 1187 BLAKE2B 6b0f8b0e240a372e13b1aaf0dd4f7fdbfd08093d2e8f9e0a3dc71e7590643eb814978573a9098a134f402470162459832040252bcb19657a958e7ede5caada87 SHA512 380cd2eb925360506c6a3237d642131c9a6e257e219d19d5b6902034b056f6984296f9f1621d81c012f75456658eb57487fa609a0748df7aa11397fc0d5b89bc
+EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac613c34efa3a2bff2f7a01aa05bf838455c8fd0dda653594619e0255b42ddf7ebcd8f5d3dc3ee65e949948d7249424395 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8
+EBUILD monkeysphere-0.37.ebuild 1459 BLAKE2B e9196602c64910a1cc816993c36fce60926354958403c78753cd9eaf5b737ecc6194639614387fa8bd65c4cfb398d0eb548583a95f2b20649f8d7ec575e7355a SHA512 5181dc7b06a7a5910bafe37438c152f54d4c0f6949cc6fc8a8e203324d16c345e18475c7a854709c722ff3d4d72c66b121a653c6f86d3a33a24ad16b0097f0c3
+EBUILD monkeysphere-0.38.ebuild 1635 BLAKE2B 7382941a153716cdafcb925258a75e52cc334cd2ec467f4a1908a03388c92dcc13b05a144d259f727acc93bb5b02133e15e7b91af8d7f1606c2c98de08bea371 SHA512 6dd69c21f73158cc68e4df4c4ba9a3e15387d20effadf8bb3566955acd8b62d9c5e59c8b47d98d3470dc5cfaa9e28e343ac8cec43aed5642b1568352150c3041
+EBUILD monkeysphere-0.39.ebuild 1441 BLAKE2B 588283fd2a272a963781f0ee4a6a1e24b157642a987bd4a54d40e82a3d5cca3d3cb8d408250a369916041abe16ae722824ad863ba4cb374144a0388cd4b841a6 SHA512 1eac7528acd605c46e1b0c869afc43e6e603b4f191650568b5ca9c478f22efdd0b41c31d09daf341309d8a31cdac8f2bc1ac29408f48315709a9923589f46b1a
+EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f
+MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
new file mode 100644
index 000000000000..f979114181d1
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
@@ -0,0 +1,12 @@
+diff -r d0c02fe6a949 src/share/common
+--- a/src/share/common	Sun Oct 06 19:21:18 2013 +0200
++++ b/src/share/common	Sun Oct 06 19:21:49 2013 +0200
+@@ -108,7 +108,7 @@
+          # if root, su command as monkeysphere user
+ 	'root')
+             # requote arguments using bash builtin feature (see "help printf"):
+-	    su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
++	    su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
+ 	    ;;
+ 
+ 	# otherwise, fail
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
new file mode 100644
index 000000000000..7cdaa74b5735
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
@@ -0,0 +1,14 @@
+diff -r 6150774ec7f4 tests/keytrans
+--- a/tests/keytrans	Sun Feb 16 20:11:02 2014 +0100
++++ b/tests/keytrans	Sun Feb 16 20:11:40 2014 +0100
+@@ -104,8 +104,8 @@
+     <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
+ 
+ diff -u \
+-    <(hd "$TEMPDIR"/secret.key) \
+-    <(hd "$TEMPDIR"/converted.secret.key)
++    <(od -xc "$TEMPDIR"/secret.key) \
++    <(od -xc "$TEMPDIR"/converted.secret.key)
+ 
+ KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
+ KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
new file mode 100644
index 000000000000..f14550280fcf
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
@@ -0,0 +1,14 @@
+diff -r 5f7ee764ec1f src/share/common
+--- a/src/share/common	Mon Oct 07 19:22:36 2013 +0200
++++ b/src/share/common	Mon Oct 07 19:22:58 2013 +0200
+@@ -863,6 +863,10 @@
+ 		    ;;
+ 		('known_hosts')
+ 		    host=${userID#ssh://}
++	    	    if [[ "${host}" == *:* ]]; then
++			IFS=':' read -a ARR <<< "${host}"
++			host="[${ARR[0]}]:${ARR[1]}"
++		    fi
+ 		    remove_line "$keyFile" "$host" "$sshKey"
+ 		    ;;
+ 	    esac
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
new file mode 100644
index 000000000000..aec90eb07661
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
@@ -0,0 +1,34 @@
+diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
+index edc7995..2711ff2 100755
+--- a/src/monkeysphere-authentication
++++ b/src/monkeysphere-authentication
+@@ -84,6 +84,13 @@ gpg_sphere() {
+     su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
+ }
+ 
++check_openpgp2ssh_sanity() {
++    if [[ `su_monkeysphere_user openpgp2ssh ABC &>/dev/null || echo $?` != "255" ]]; then
++    echo "openpgp2ssh command gives unexpected return code. This can lead to a scenario where no authorized keys are populated, even though they are otherwise valid. Aborting!"
++    exit 1
++    fi; 
++}
++
+ # output to stdout the core fingerprint from the gpg core secret
+ # keyring
+ core_fingerprint() {
+@@ -163,6 +170,7 @@ case $COMMAND in
+     'update-users'|'update-user'|'update'|'u')
+ 	source "${MASHAREDIR}/setup"
+ 	setup
++	check_openpgp2ssh_sanity
+ 	source "${MASHAREDIR}/update_users"
+ 	OUTPUT_STDOUT= update_users "$@"
+ 	;;
+@@ -171,6 +179,7 @@ case $COMMAND in
+ 	(( $# > 0 )) || failure "Must specify user."
+ 	source "${MASHAREDIR}/setup"
+ 	setup
++	check_openpgp2ssh_sanity
+ 	source "${MASHAREDIR}/update_users"
+ 	OUTPUT_STDOUT=true update_users "$1"
+ 	;;
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
new file mode 100644
index 000000000000..712734459054
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
@@ -0,0 +1,50 @@
+diff -r c13f4b11061e tests/keytrans
+--- a/tests/keytrans	Sun Feb 16 19:24:08 2014 +0100
++++ b/tests/keytrans	Sun Feb 16 19:27:42 2014 +0100
+@@ -131,9 +131,9 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ EOF
+ 
+ diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru)
+@@ -159,10 +159,10 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
+-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
++rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
+ EOF
+ 
+ 
+@@ -190,15 +190,15 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
+-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
++rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
+ uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA:
+ uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar:
+-sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:
++sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8:
+ EOF
+ 
+ echo "test: diff expected gpg list output"
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch
new file mode 100644
index 000000000000..70c7cffe7dc4
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch
@@ -0,0 +1,12 @@
+diff -r 2315bb7781c6 src/share/common
+--- a/src/share/common	Thu Oct 10 19:25:10 2013 +0200
++++ b/src/share/common	Thu Oct 10 19:25:50 2013 +0200
+@@ -917,7 +917,7 @@
+     IFS=$'\n'
+     while read line ; do
+ 	case "$line" in
+-	    ("#"*)
++	    ("#"*|"")
+ 		continue
+ 		;;
+ 	    (" "*|$'\t'*)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch
new file mode 100644
index 000000000000..f979114181d1
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch
@@ -0,0 +1,12 @@
+diff -r d0c02fe6a949 src/share/common
+--- a/src/share/common	Sun Oct 06 19:21:18 2013 +0200
++++ b/src/share/common	Sun Oct 06 19:21:49 2013 +0200
+@@ -108,7 +108,7 @@
+          # if root, su command as monkeysphere user
+ 	'root')
+             # requote arguments using bash builtin feature (see "help printf"):
+-	    su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
++	    su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
+ 	    ;;
+ 
+ 	# otherwise, fail
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch
new file mode 100644
index 000000000000..7cdaa74b5735
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch
@@ -0,0 +1,14 @@
+diff -r 6150774ec7f4 tests/keytrans
+--- a/tests/keytrans	Sun Feb 16 20:11:02 2014 +0100
++++ b/tests/keytrans	Sun Feb 16 20:11:40 2014 +0100
+@@ -104,8 +104,8 @@
+     <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
+ 
+ diff -u \
+-    <(hd "$TEMPDIR"/secret.key) \
+-    <(hd "$TEMPDIR"/converted.secret.key)
++    <(od -xc "$TEMPDIR"/secret.key) \
++    <(od -xc "$TEMPDIR"/converted.secret.key)
+ 
+ KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
+ KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
new file mode 100644
index 000000000000..dbf9d5f590ca
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
@@ -0,0 +1,45 @@
+From b756fd2e58ab013b5c9bfc2658ed9ad48868067c Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Sun, 7 Aug 2016 18:24:47 -0400
+Subject: [PATCH] avoid warning about unused asprintf return value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+some versions of gcc produce this warning, which is treated as an
+error due to our conservative defaults in Makefile:
+
+src/agent-transfer/main.c: In function ‘main’:
+src/agent-transfer/main.c:676:5: error: ignoring return value of ‘asprintf’, declared with attribute warn_unused_result [-Werror=unused-result]
+     asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
+     ^
+cc1: all warnings being treated as errors
+
+this patch avoids the warning.
+---
+ src/agent-transfer/main.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/agent-transfer/main.c b/src/agent-transfer/main.c
+index 406aaa3..3038f5c 100644
+--- a/src/agent-transfer/main.c
++++ b/src/agent-transfer/main.c
+@@ -672,8 +672,13 @@ int main (int argc, const char* argv[]) {
+     return 1;
+   }
+ 
+-  if (!args.comment)
+-    asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
++  if (!args.comment) {
++    err = asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
++    if (err < 0) {
++      fprintf (stderr, "failed to generate key comment\n");
++      return 1;
++    }
++  }
+   
+   err = send_to_ssh_agent (&e, ssh_sock_fd, args.seconds, args.confirm,
+                            args.comment ? args.comment : alt_comment);
+-- 
+2.7.3
+
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
new file mode 100644
index 000000000000..4d98c0a7cf5b
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
@@ -0,0 +1,98 @@
+From c75c7553a88e387013e2b4310f4c4956adfd8a98 Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 8 Aug 2016 20:45:07 -0400
+Subject: [PATCH 1/2] avoid treating src/share/common as an executable
+
+having src/share/common treated as an executable (commit
+ed10318d3760b56e57d5e1bef04ab57761ab8bd1) was actually a terrible
+idea.
+
+In addition to causing "monkeysphere version" to print the version
+number twice, it meant that any invocation of a monkeysphere command
+that sourced src/share/common and had a first argument that happened
+to be a function name would accidentally invoke that function.
+
+This commit reverts that idea.
+---
+ Makefile                   | 2 +-
+ src/share/common           | 5 -----
+ src/share/ma/add_certifier | 2 +-
+ src/share/ma/update_users  | 2 +-
+ src/share/mh/add_revoker   | 2 +-
+ 5 files changed, 4 insertions(+), 9 deletions(-)
+ mode change 100755 => 100644 src/share/common
+
+diff --git a/Makefile b/Makefile
+index 608a317..768564a 100755
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ install: all installman
+ 	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+ 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
+ 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
+-	install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
++	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
+ 	sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
+diff --git a/src/share/common b/src/share/common
+old mode 100755
+new mode 100644
+index 66181a3..b10a040
+--- a/src/share/common
++++ b/src/share/common
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # -*-shell-script-*-
+ # This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
+ 
+@@ -1022,7 +1021,3 @@ report_cruft() {
+ 	printf "The directories above are backups left over from a monkeysphere transition.\nThey may contain copies of sensitive data (host keys, certifier lists), but\nthey are no longer needed by monkeysphere.\nYou may remove them at any time.\n\n" | log info
+     fi
+ }
+-
+-if [ -n "$1" ] && [ "$(type -t "$1" || true)" = "function" ]; then
+-    "$@"
+-fi
+diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
+index 1d450e7..5416aa9 100644
+--- a/src/share/ma/add_certifier
++++ b/src/share/ma/add_certifier
+@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
+     # check the key is ok as monkeysphere user before loading
+     log debug "checking keys in file..."
+     fingerprint=$(su_monkeysphere_user \
+-	"${SYSSHAREDIR}/common" list_primary_fingerprints < "$keyID")
++	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$keyID")
+ 
+     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
+ 	failure "There was not exactly one gpg key in the file."
+diff --git a/src/share/ma/update_users b/src/share/ma/update_users
+index d23c125..4f83e0c 100644
+--- a/src/share/ma/update_users
++++ b/src/share/ma/update_users
+@@ -79,7 +79,7 @@ for uname in $unames ; do
+ 
+ 	    # process authorized_user_ids file, as monkeysphere user
+ 	    su_monkeysphere_user \
+-		/usr/bin/env "STRICT_MODES=$STRICT_MODES" "${SYSSHAREDIR}/common" process_authorized_user_ids - \
++		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c ". ${SYSSHAREDIR}/common && process_authorized_user_ids -" \
+ 		< "$authorizedUserIDs" \
+ 		> "$tmpAuthorizedKeys"
+ 
+diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
+index 28b11ac..e00ac4e 100644
+--- a/src/share/mh/add_revoker
++++ b/src/share/mh/add_revoker
+@@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then
+     # check the key is ok as monkeysphere user before loading
+     log debug "checking keys in file..."
+     fingerprint=$(su_monkeysphere_user \
+-	"${SYSSHAREDIR}/common" list_primary_fingerprints < "$revokerKeyID")
++	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$revokerKeyID")
+ 
+     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
+ 	failure "There was not exactly one gpg key in the file."
+-- 
+2.7.3
+
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch
new file mode 100644
index 000000000000..65d3ba6a95aa
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch
@@ -0,0 +1,53 @@
+From 0e339de4772b6de1849dc55790821c3dd5943be3 Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 9 Aug 2016 09:39:45 -0400
+Subject: [PATCH 2/2] ensure that this works even if SYSSHAREDIR has whitespace
+
+---
+ src/share/ma/add_certifier | 2 +-
+ src/share/ma/update_users  | 2 +-
+ src/share/mh/add_revoker   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
+index 5416aa9..9488806 100644
+--- a/src/share/ma/add_certifier
++++ b/src/share/ma/add_certifier
+@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
+     # check the key is ok as monkeysphere user before loading
+     log debug "checking keys in file..."
+     fingerprint=$(su_monkeysphere_user \
+-	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$keyID")
++	bash -c "$(printf ". %q && list_primary_fingerprints" "${SYSSHAREDIR}/common")" < "$keyID")
+ 
+     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
+ 	failure "There was not exactly one gpg key in the file."
+diff --git a/src/share/ma/update_users b/src/share/ma/update_users
+index 4f83e0c..a0ec21b 100644
+--- a/src/share/ma/update_users
++++ b/src/share/ma/update_users
+@@ -79,7 +79,7 @@ for uname in $unames ; do
+ 
+ 	    # process authorized_user_ids file, as monkeysphere user
+ 	    su_monkeysphere_user \
+-		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c ". ${SYSSHAREDIR}/common && process_authorized_user_ids -" \
++		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c "$(printf ". %q && process_authorized_user_ids -" "${SYSSHAREDIR}/common")"\
+ 		< "$authorizedUserIDs" \
+ 		> "$tmpAuthorizedKeys"
+ 
+diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
+index e00ac4e..de08961 100644
+--- a/src/share/mh/add_revoker
++++ b/src/share/mh/add_revoker
+@@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then
+     # check the key is ok as monkeysphere user before loading
+     log debug "checking keys in file..."
+     fingerprint=$(su_monkeysphere_user \
+-	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$revokerKeyID")
++	bash -c "$(printf ". %q && list_primary_fingerprints" "${SYSSHAREDIR}/common")" < "$revokerKeyID")
+ 
+     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
+ 	failure "There was not exactly one gpg key in the file."
+-- 
+2.7.3
+
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
new file mode 100644
index 000000000000..776e633b3d73
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
@@ -0,0 +1,45 @@
+From b1dd8fb1b84c6eea25523c3ea746852b3dce6034 Mon Sep 17 00:00:00 2001
+From: Valo <valo@autoproduzioni.net>
+Date: Wed, 31 Aug 2016 14:00:05 -0400
+Subject: [PATCH] Make tests pass with GnuPG 2.1.15
+
+2.1.15 appears to always emit the fingerprint lines in these cases,
+while 2.1.14 did not.
+---
+ tests/keytrans | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/keytrans b/tests/keytrans
+index 3076e3f..5c7d2c8 100755
+--- a/tests/keytrans
++++ b/tests/keytrans
+@@ -140,7 +140,7 @@ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest
+ sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
+ EOF
+ 
+-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
++diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
+ 
+ echo "##################################################"
+ echo "### sleeping to avoid test suite breakage on fast"
+@@ -170,7 +170,7 @@ rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8
+ EOF
+ 
+ 
+-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
++diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
+ 
+ 
+ echo "##################################################"
+@@ -206,7 +206,7 @@ sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8
+ EOF
+ 
+ echo "test: diff expected gpg list output"
+-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
++diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
+ 
+ sort >"$TEMPDIR"/expectedout <<EOF
+ $KEYFPR
+-- 
+2.7.3
+
diff --git a/app-crypt/monkeysphere/metadata.xml b/app-crypt/monkeysphere/metadata.xml
new file mode 100644
index 000000000000..91439c59951d
--- /dev/null
+++ b/app-crypt/monkeysphere/metadata.xml
@@ -0,0 +1,8 @@
+<?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/monkeysphere/monkeysphere-0.36-r1.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
new file mode 100644
index 000000000000..953836fdace6
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+SRC_URI="http://archive.${PN}.info/debian/pool/${PN}/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+# Tests do weird things with network and fail OOTB.
+RESTRICT="test"
+
+RDEPEND="
+	app-crypt/gnupg
+	app-misc/lockfile-progs
+	dev-perl/Crypt-OpenSSL-RSA
+	dev-perl/Digest-SHA1
+	|| ( net-analyzer/netcat net-misc/socat )"
+DEPEND="${RDEPEND}
+	test? ( net-misc/socat )"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${P}_default_shell.patch" \
+		"${FILESDIR}/${P}_non_default_port.patch" \
+		"${FILESDIR}/${P}_userid_empty_line.patch"
+
+	sed -i "s#share/doc/${PN}#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+	default
+
+	dodir /var/lib/${PN}
+	fowners root:${PN} /var/lib/${PN}
+	fperms 751 /var/lib/${PN}
+}
+
+pkg_postinst()
+{
+	${PN}-authentication setup || die
+}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
new file mode 100644
index 000000000000..63a671e3e588
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DOCS=( README Changelog )
+
+# Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="app-crypt/gnupg
+	net-misc/socat
+	dev-perl/Crypt-OpenSSL-RSA
+	dev-perl/Digest-SHA1
+	app-misc/lockfile-progs"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup monkeysphere
+	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+	# Using fperms and fowner in src_install leave unusable config with error
+	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
+	chown root:monkeysphere /var/lib/monkeysphere
+	chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${P}_default_shell.patch"\
+	       "${FILESDIR}/${P}_non_default_port.patch"\
+	       "${FILESDIR}/${P}_userid_empty_line.patch"\
+	       "${FILESDIR}/${P}_openpgp2ssh_sanity_check.patch"\
+	       "${FILESDIR}/${P}_hd_od.patch"
+
+	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+
+	# Output format of gpg --check-sigs differ between 1.4 and 2.0 so test
+	# needs to be updated if 2.0 is used
+	if has_version '>=app-crypt/gnupg-2.0.0:0'; then
+		epatch "${FILESDIR}/${P}_tests_gnupg2.patch"
+	fi;
+}
+
+src_install()
+{
+	default
+	dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+	#This function is idempotent, make sure it is run at least once.
+	monkeysphere-authentication setup || die
+}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
new file mode 100644
index 000000000000..7276dff3dadb
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+IUSE=""
+SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="amd64 ~arm x86"
+
+DOCS=( README Changelog )
+
+# Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="app-crypt/gnupg:0=
+	net-misc/socat:0=
+	dev-perl/Crypt-OpenSSL-RSA:0=
+	dev-perl/Digest-SHA1:0=
+	app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup monkeysphere
+	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+	# Using fperms and fowner in src_install leave unusable config with error
+	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
+	chown root:monkeysphere /var/lib/monkeysphere
+	chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${P}_default_shell.patch"\
+	       "${FILESDIR}/${P}_hd_od.patch"
+
+	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+	default
+	dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+	monkeysphere-authentication setup || die
+}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
new file mode 100644
index 000000000000..2d718ae60cdc
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+IUSE=""
+SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DOCS=( README Changelog )
+
+# Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="app-crypt/gnupg:0=
+	net-misc/socat:0=
+	dev-perl/Crypt-OpenSSL-RSA:0=
+	dev-perl/Digest-SHA1:0=
+	app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup monkeysphere
+	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+	# Using fperms and fowner in src_install leave unusable config with error
+	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
+	chown root:monkeysphere /var/lib/monkeysphere
+	chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${P}-asprintf.patch" \
+           "${FILESDIR}/${P}-revert-executable-patch.patch"\
+           "${FILESDIR}/${P}-syssharedir-whitespace.patch"\
+		   "${FILESDIR}/${PN}-0.37_default_shell.patch"\
+	       "${FILESDIR}/${PN}-0.37_hd_od.patch"
+
+	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+	default
+	dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+	monkeysphere-authentication setup || die
+}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.39.ebuild b/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
new file mode 100644
index 000000000000..a7f0efd409b1
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+IUSE=""
+SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DOCS=( README Changelog )
+
+# Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="app-crypt/gnupg:0=
+	net-misc/socat:0=
+	dev-perl/Crypt-OpenSSL-RSA:0=
+	dev-perl/Digest-SHA1:0=
+	app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup monkeysphere
+	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+	# Using fperms and fowner in src_install leave unusable config with error
+	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
+	chown root:monkeysphere /var/lib/monkeysphere
+	chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${P}-make-tests-work-with-gnupg-2.1.15.patch"
+
+	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+	default
+	dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+	monkeysphere-authentication setup || die
+}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
new file mode 100644
index 000000000000..fc2a5255bbe5
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+IUSE=""
+SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="amd64 ~arm x86"
+
+DOCS=( README Changelog )
+
+## Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="app-crypt/gnupg:0=
+	net-misc/socat:0=
+	dev-perl/Crypt-OpenSSL-RSA:0=
+	dev-perl/Digest-SHA1:0=
+	app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup monkeysphere
+	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+	# Using fperms and fowner in src_install leave unusable config with error
+	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
+	chown root:monkeysphere /var/lib/monkeysphere
+	chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+	default
+	dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+	monkeysphere-authentication setup || die
+}
diff --git a/app-crypt/moolticute-0.18.1 b/app-crypt/moolticute-0.18.1
deleted file mode 100644
index 2d2fdf1f1a1a..000000000000
--- a/app-crypt/moolticute-0.18.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Mooltipass crossplatform daemon/tools
-EAPI=6
-HOMEPAGE=https://github.com/mooltipass/moolticute
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.18.1.tar.gz -> moolticute-0.18.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e18b831bbaccfbc5746f7c210949d7db
diff --git a/app-crypt/moolticute-9999 b/app-crypt/moolticute-9999
deleted file mode 100644
index d7f5fb3a9d83..000000000000
--- a/app-crypt/moolticute-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=dev-vcs/git-1.8.2.1[curl] >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Mooltipass crossplatform daemon/tools
-EAPI=6
-HOMEPAGE=https://github.com/mooltipass/moolticute
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e18b831bbaccfbc5746f7c210949d7db
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
new file mode 100644
index 000000000000..88add904ce53
--- /dev/null
+++ b/app-crypt/moolticute/Manifest
@@ -0,0 +1,6 @@
+AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
+AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
+DIST moolticute-0.18.1.tar.gz 5549370 BLAKE2B 11a1a40e799e54f18e44eacb6ded1892681932676328bfcf0dfc23d197fc418bbe5b726adee280125e974bdf0497e9148f60735e0f80785380ae1b2894d1b187 SHA512 166c2091e84bbe19fced593c97f195d958feb37556670a1e457a0532bf4df399dce214e89782cb8006db5eedad5b9d2c21e5dc9902137f5b2b17b96aa6780366
+EBUILD moolticute-0.18.1.ebuild 1241 BLAKE2B d12fb1de10aead21f1c5a6fc7faf3719b05d3bac598d681bf8529c2bea92a904c10cca4b46314ddc01f3cbc531cd2dd288d242425106c84229e12daef03fa084 SHA512 02e813bc70f79954b3b54aa6aae08d6a4158db83ae03aa6c9926248da80ed4aae9b497d26bbb70d9061e886f4d3b7d64cefe49524a8cd1612af7313b7aa6b4bd
+EBUILD moolticute-9999.ebuild 1241 BLAKE2B d12fb1de10aead21f1c5a6fc7faf3719b05d3bac598d681bf8529c2bea92a904c10cca4b46314ddc01f3cbc531cd2dd288d242425106c84229e12daef03fa084 SHA512 02e813bc70f79954b3b54aa6aae08d6a4158db83ae03aa6c9926248da80ed4aae9b497d26bbb70d9061e886f4d3b7d64cefe49524a8cd1612af7313b7aa6b4bd
+MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
diff --git a/app-crypt/moolticute/files/50-mooltipass.rule b/app-crypt/moolticute/files/50-mooltipass.rule
new file mode 100644
index 000000000000..4bfd907d7257
--- /dev/null
+++ b/app-crypt/moolticute/files/50-mooltipass.rule
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="09a0", TAG+="uaccess"
diff --git a/app-crypt/moolticute/files/moolticuted.init b/app-crypt/moolticute/files/moolticuted.init
new file mode 100644
index 000000000000..4a331db1c3a4
--- /dev/null
+++ b/app-crypt/moolticute/files/moolticuted.init
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/moolticuted
+command_args=""
+pidfile=/var/run/moolticuted.pid
+start_stop_daemon_args="--make-pidfile --background --user nobody --group usb"
+
+depend() {
+	need udev
+}
diff --git a/app-crypt/moolticute/metadata.xml b/app-crypt/moolticute/metadata.xml
new file mode 100644
index 000000000000..874684f5407a
--- /dev/null
+++ b/app-crypt/moolticute/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nemunaire@nemunai.re</email>
+		<name>Pierre-Olivier Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mooltipass/moolticute</remote-id>
+		<bugs-to>https://github.com/mooltipass/moolticute/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/moolticute/moolticute-0.18.1.ebuild b/app-crypt/moolticute/moolticute-0.18.1.ebuild
new file mode 100644
index 000000000000..da3da6c6597f
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-0.18.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+inherit gnome2-utils qmake-utils udev
+
+DESCRIPTION="Mooltipass crossplatform daemon/tools"
+HOMEPAGE="https://github.com/mooltipass/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libusb-1.0.20
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	default
+
+	# Fill version.h with package version
+	if [[ ${PV} != 9999* ]]; then
+		sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
+	fi
+}
+
+src_configure() {
+	eqmake5 PREFIX="/usr" Moolticute.pro
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	udev_dorules "${FILESDIR}/50-mooltipass.rule"
+	newinitd "${FILESDIR}/moolticuted.init" moolticuted
+}
+
+pkg_postinst() {
+	udev_reload
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
new file mode 100644
index 000000000000..da3da6c6597f
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+inherit gnome2-utils qmake-utils udev
+
+DESCRIPTION="Mooltipass crossplatform daemon/tools"
+HOMEPAGE="https://github.com/mooltipass/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libusb-1.0.20
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	default
+
+	# Fill version.h with package version
+	if [[ ${PV} != 9999* ]]; then
+		sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
+	fi
+}
+
+src_configure() {
+	eqmake5 PREFIX="/usr" Moolticute.pro
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	udev_dorules "${FILESDIR}/50-mooltipass.rule"
+	newinitd "${FILESDIR}/moolticuted.init" moolticuted
+}
+
+pkg_postinst() {
+	udev_reload
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-crypt/nasty-0.6-r1 b/app-crypt/nasty-0.6-r1
deleted file mode 100644
index a17157a656b9..000000000000
--- a/app-crypt/nasty-0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-crypt/gpgme
-DESCRIPTION=Proof-of-concept GPG passphrase recovery tool
-EAPI=6
-HOMEPAGE=http://www.vanheusden.com/nasty/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gpgme
-SLOT=0
-SRC_URI=http://www.vanheusden.com/nasty/nasty-0.6.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6e6437202d2beb3a44d57f93feb507c0
diff --git a/app-crypt/nasty/Manifest b/app-crypt/nasty/Manifest
new file mode 100644
index 000000000000..a5d21a3f985e
--- /dev/null
+++ b/app-crypt/nasty/Manifest
@@ -0,0 +1,4 @@
+AUX nasty-0.6-flags.patch 468 BLAKE2B acc1ac4bbe024136a176f04a3f6ba85190ffa34b4655d4e284ed980774169ab790f5582d8ce8d86cb59ceecaeefb579f975dacc5144b6bf8fc5da741819a8f27 SHA512 56d808209a9ba1fd1fa3b77ed90398cded9adb08c271ed74c80c5dff793413f1e7270ab057bd253c8c1e951dec7e7b8ad6c92976abb7c267109f517ccb81d4a1
+DIST nasty-0.6.tgz 3811 BLAKE2B d6e5973c4f1335fe936b9a7c976d5a0f994cf618ed83c8ae7629256c2dbab17b631a095a14da366d7011add5df5263d63de66db4b3e69712aae0be092fa50064 SHA512 6803c1ccb843934ab6d2bd173c4cf154124926ee493a79072b351167f7fbbc08f90226ba63d2c591f2ae122d33d7cf1dc6b60e8684dc7ec650c8bcf3f04b3e07
+EBUILD nasty-0.6-r1.ebuild 563 BLAKE2B aa8f6e49e82ebf032735171d2c90d1364bea6634b47603d2c15676720ecf70e26538c238a9a5b14f50f68f0e375a3c7dc37163845d0834fa0632f957ea78693b SHA512 a71d286a93f11ae9fda832d5f475cfa7b6dcd74575517dcc7783106a4b1e62e635be70106e1a4e64e2df59880cdda36db79ea21a770768f1dfef16ba527978ea
+MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/app-crypt/nasty/files/nasty-0.6-flags.patch b/app-crypt/nasty/files/nasty-0.6-flags.patch
new file mode 100644
index 000000000000..522e570a94a8
--- /dev/null
+++ b/app-crypt/nasty/files/nasty-0.6-flags.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,15 +1,16 @@
+ VERSION=0.6
+ 
+ DEBUG=-g # -pg
+-CFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
+-LDFLAGS=-lgpgme $(DEBUG)
++CPPFLAGS+=-DVERSION=\"${VERSION}\" -D_FILE_OFFSET_BITS=64
++CFLAGS+=-Wall $(DEBUG) `gpgme-config --cflags`
++LIBS=`gpgme-config --libs`
+ 
+ OBJS=nasty.o
+ 
+ all: nasty
+ 
+ nasty: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o nasty
++	$(CC) $(LDFLAGS) $(OBJS) -o nasty $(LIBS)
+ 
+ install: nasty
+ 	cp nasty /usr/bin
diff --git a/app-crypt/nasty/metadata.xml b/app-crypt/nasty/metadata.xml
new file mode 100644
index 000000000000..4f6e28828f65
--- /dev/null
+++ b/app-crypt/nasty/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/nasty/nasty-0.6-r1.ebuild b/app-crypt/nasty/nasty-0.6-r1.ebuild
new file mode 100644
index 000000000000..8cfa34f4d007
--- /dev/null
+++ b/app-crypt/nasty/nasty-0.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Proof-of-concept GPG passphrase recovery tool"
+HOMEPAGE="http://www.vanheusden.com/nasty/"
+SRC_URI="http://www.vanheusden.com/nasty/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="app-crypt/gpgme"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	readme.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" DEBUG=
+}
+
+src_install() {
+	einstalldocs
+	dobin nasty
+}
diff --git a/app-crypt/nitrokey-app-1.3 b/app-crypt/nitrokey-app-1.3
deleted file mode 100644
index 65d949dc24bf..000000000000
--- a/app-crypt/nitrokey-app-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/libnitrokey:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-libs/cppcodec dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Cross platform personalization tool for the Nitrokey
-EAPI=6
-HOMEPAGE=https://github.com/Nitrokey/nitrokey-app
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=app-crypt/libnitrokey:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/Nitrokey/nitrokey-app/archive/v1.3.tar.gz -> nitrokey-app-1.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c722e1253570c5afc0f7f41d8db1c22
diff --git a/app-crypt/nitrokey-app-9999 b/app-crypt/nitrokey-app-9999
deleted file mode 100644
index b38434736d42..000000000000
--- a/app-crypt/nitrokey-app-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=app-crypt/libnitrokey:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-libs/cppcodec dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Cross platform personalization tool for the Nitrokey
-EAPI=6
-HOMEPAGE=https://github.com/Nitrokey/nitrokey-app
-LICENSE=GPL-3
-RDEPEND=app-crypt/libnitrokey:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=77942073d099ae2fcb8b4a07c4bba4aa
diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
new file mode 100644
index 000000000000..ba0889df3d4f
--- /dev/null
+++ b/app-crypt/nitrokey-app/Manifest
@@ -0,0 +1,4 @@
+DIST nitrokey-app-1.3.tar.gz 1132479 BLAKE2B 96a20ed4156137e13c0b0eb3f69edd537cf2a236781ba55d295b797a2a273ef3a412f27c2302c035569756146acb006752dd91d9176377f142e2a8c8108ef4a1 SHA512 b78830dee0957601b2e2de97ef267154e9b3444e9ef49e307f7aad5810e4184f1b5d5a278711431cac098e51217eda30d27425cd6a83040fb16bc27d6b1aec5b
+EBUILD nitrokey-app-1.3.ebuild 1012 BLAKE2B c7c13573c023e7b98f4f79b9e0333855171ef2bc5c38d734c2722cae2c41fcf87399c07bcd48436676bc63d7a84ef0b7059094ce6b7465f35e4b3cd584f75069 SHA512 66f7f0610ada624a2c5f687a145033d321b31c20a579eac74cc192969f212ece0ee8f2e491de099e93d22f3d551881a9f5f9383577a27fce6b8dab728a36c464
+EBUILD nitrokey-app-9999.ebuild 914 BLAKE2B 88dee3884a2974d8985e344bc3d23f9198108acd50cae3c8a91c72054e4012cb7260d2184351e007bfd424ce13a5091b8d82871306673d5ecf5eb5cb27695a6a SHA512 5930fc79a9c1962bb2277c8a8305ae3ad219db553214801b45773d3c62ae6621910292b474bd00183d4c43eabdc70d1dff9a96bb7b75475f06f01989fb105a48
+MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab
diff --git a/app-crypt/nitrokey-app/metadata.xml b/app-crypt/nitrokey-app/metadata.xml
new file mode 100644
index 000000000000..89dfb8e83e30
--- /dev/null
+++ b/app-crypt/nitrokey-app/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Nitrokey/nitrokey-app</remote-id>
+		<bugs-to>https://github.com/Nitrokey/nitrokey-app/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
new file mode 100644
index 000000000000..1bd4aaad0693
--- /dev/null
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Cross platform personalization tool for the Nitrokey"
+HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nitrokey/nitrokey-app"
+
+	# Disable pulling in bundled dependencies
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	app-crypt/libnitrokey:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5"
+DEPEND="
+	${RDEPEND}
+	dev-libs/cppcodec
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i '/^qt5_add_resources/d' CMakeLists.txt || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
new file mode 100644
index 000000000000..f1ed0d3dfac3
--- /dev/null
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Cross platform personalization tool for the Nitrokey"
+HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nitrokey/nitrokey-app"
+
+	# Disable pulling in bundled dependencies
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	app-crypt/libnitrokey:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5"
+DEPEND="
+	${RDEPEND}
+	dev-libs/cppcodec
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-crypt/nwipe-0.21 b/app-crypt/nwipe-0.21
deleted file mode 100644
index b1010fdea27c..000000000000
--- a/app-crypt/nwipe-0.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Securely erase disks using a variety of recognized methods
-EAPI=6
-HOMEPAGE=https://github.com/martijnvanbrummelen/nwipe/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7:=
-SLOT=0
-SRC_URI=https://github.com/martijnvanbrummelen/nwipe/archive/v0.21.tar.gz -> nwipe-0.21.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=18e3d5f92f725d054532306caa49ae60
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
new file mode 100644
index 000000000000..16ba2b19d6d3
--- /dev/null
+++ b/app-crypt/nwipe/Manifest
@@ -0,0 +1,3 @@
+DIST nwipe-0.21.tar.gz 49298 BLAKE2B cec43ed196a215b4181446206d96cac4e72cb92a58e22588648bc28370de5d294944fbbcb94b96f42ebcef77b0fbc13356b94fb20e76963ac04903bc234c9b0a SHA512 0d083ac903889602ea5bd889b97f3dd3f1ac8c3737612394a68e9cc1fe44d387819be2aca563005b13e61d3406f080bfb279adbeffb106d3b489ac4748189aa2
+EBUILD nwipe-0.21.ebuild 557 BLAKE2B 96a6bbc74a28d54ad912ce87d15cd89353de15e7786e921a13cb2e48788f0037f177892d4a36fdfbe0113fd974d4a25bcc9f2ec9887a8060809e4298acaa01d0 SHA512 ea721ac83d28fdfdbc1970e7da63f5f29a908e44047322420c6f7a5eb789863a2caa6b02b60d3baeff6686fc614c1b4dfedb94e1cf47dbb6cea815dd64e2dcfa
+MISC metadata.xml 325 BLAKE2B 7f200272a1bbd3a794cedae13459c0d339946dfcb07004474258144e65a82ff623fb8b132343f8e1a8ce9d4a30cf81e86724745aa9bd2a452d37201b658ac87f SHA512 7e34fed2902e5b4c88a73b8976a9d7e903e5149233d1bd8625485dd54a21f012fabf7585c5713bcba837ba15ae03656ad3fb1b51a110bc5c42e4a9ccb0728822
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
new file mode 100644
index 000000000000..4ae809e68a16
--- /dev/null
+++ b/app-crypt/nwipe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">nwipe</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/nwipe/nwipe-0.21.ebuild b/app-crypt/nwipe/nwipe-0.21.ebuild
new file mode 100644
index 000000000000..91818423c6c6
--- /dev/null
+++ b/app-crypt/nwipe/nwipe-0.21.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Securely erase disks using a variety of recognized methods"
+HOMEPAGE="https://github.com/martijnvanbrummelen/nwipe/"
+SRC_URI="https://github.com/martijnvanbrummelen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-block/parted-2.3
+	>=sys-libs/ncurses-5.7-r7:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-crypt/onak-0.5.0 b/app-crypt/onak-0.5.0
deleted file mode 100644
index 90d84f7433b2..000000000000
--- a/app-crypt/onak-0.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql[server] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=onak is an OpenPGP keyserver
-EAPI=6
-HOMEPAGE=http://www.earth.li/projectpurple/progs/onak.html
-IUSE=berkdb postgres
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.earth.li/projectpurple/files/onak-0.5.0.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=59ee6cb706fd5d3ea1e5a87335c03e03
diff --git a/app-crypt/onak/Manifest b/app-crypt/onak/Manifest
new file mode 100644
index 000000000000..d7f223a61bf8
--- /dev/null
+++ b/app-crypt/onak/Manifest
@@ -0,0 +1,3 @@
+DIST onak-0.5.0.tar.xz 240764 BLAKE2B a42d9a97137ae7fb403d8a20f2a9a5b5060d216fca97447630c8e8659440d5baa0c6e0fbe983feec8b4061263decc1183868055fe53c0797d49dd1f2e4c141f8 SHA512 db38793acc82089089ac0b9fb6db9989b6bb8e94c35c14112d028d12f7bb7553b7409121378346625528c4916506d007bf40963f4a346483f51a23b670680a7d
+EBUILD onak-0.5.0.ebuild 1012 BLAKE2B 4c065522f30cdb4c8d00593c0078b9ca13dd5fcfbc7b09096b42ca5ecd4ac33245129f6374291bff55b9f2f6ad77e8cd68d8a06c2800b3e7bae0237a14a5c336 SHA512 8eb3c1c777fb6d06c13ed3631095b7feebd40be33e176e822464a8b5ab61ee9186a3100d3946a0064c2eb967e70eb7b9a9c5476265a3f977e1cacc10247c1586
+MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/app-crypt/onak/metadata.xml b/app-crypt/onak/metadata.xml
new file mode 100644
index 000000000000..4f6e28828f65
--- /dev/null
+++ b/app-crypt/onak/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/onak/onak-0.5.0.ebuild b/app-crypt/onak/onak-0.5.0.ebuild
new file mode 100644
index 000000000000..f17d1f50f816
--- /dev/null
+++ b/app-crypt/onak/onak-0.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="onak is an OpenPGP keyserver"
+HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
+SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb postgres"
+
+DEPEND="berkdb? ( >=sys-libs/db-4 )
+	postgres? ( dev-db/postgresql[server] )"
+
+DOCS=(
+	apache2 README LICENSE onak.sql
+)
+
+# it tries to use all backends?
+RESTRICT="test"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local backend="fs"
+	use berkdb && backend="db4"
+	use postgres && backend="pg"
+	if use berkdb && use postgres; then
+		ewarn "berkdb and postgres requested, postgres was preferred"
+	fi
+	econf --localstatedir=/var --enable-backend="${backend}"
+}
+
+src_install() {
+	default
+	insinto /etc
+	doins onak.ini
+	keepdir /var/lib/onak
+	dodir /usr/lib/cgi-bin/pks
+	insinto /usr/lib/cgi-bin/pks
+	doins add gpgwww lookup
+}
diff --git a/app-crypt/openpgp-keys-gentoo-mirror-20180203 b/app-crypt/openpgp-keys-gentoo-mirror-20180203
deleted file mode 100644
index a04bbdacde74..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror-20180203
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP key used to sign gentoo-mirror commits
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.20180203.gz
-_md5_=03a78e9a9f5a678a40dd55d05e2ae30a
diff --git a/app-crypt/openpgp-keys-gentoo-mirror-20180528 b/app-crypt/openpgp-keys-gentoo-mirror-20180528
deleted file mode 100644
index 8ecbc11116c1..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror-20180528
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP key used to sign gentoo-mirror commits
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.20180528.gz
-_md5_=03a78e9a9f5a678a40dd55d05e2ae30a
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/Manifest b/app-crypt/openpgp-keys-gentoo-mirror/Manifest
new file mode 100644
index 000000000000..7ab690d1ef9e
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-mirror/Manifest
@@ -0,0 +1,5 @@
+DIST gentoo-mirror.asc.20180203.gz 3054 BLAKE2B 4904aee11e80aaab7113356eba5aa8fcaced960b253bf5ba40addc6e4026fa7342319517af3549e902c547d42775fffd8713f1873ac9685d5dfe0207655bbfa5 SHA512 429e1226c535b1c3e0a87b471bf03a6c216086a5d801f77b5061b8f00b44a597e5569b5be58ca3a01aaa2d18c1e323532587e7403ab5ef51d718690d0bad2059
+DIST gentoo-mirror.asc.20180528.gz 5954 BLAKE2B 4942ac019249a6fe0c03a4cd33b472b2df82faabb8df1bba9af61dd12d52a5059a5c3ffc20f8c3cd8c5b20d24fd110f4dc0d9f11aaaa439cf07985842c993f40 SHA512 b0856f7ee62798e7b259bba17d7ee63a3bc5c78bbe901d0a45d951f47c1cc435a6b21812bf4287cb45520061713ec1885bfc07e5c2baf76c17a2d3f2584f1685
+EBUILD openpgp-keys-gentoo-mirror-20180203.ebuild 600 BLAKE2B 298ad89c2541312023283c0ef39342244c6611c0d9fea252417be1dfda81418fe70a2be86ef3410edc196cad37094e97cc5cf7c92f5ad642a3f737a3b9c8b4b0 SHA512 3e6d5c63648664253dc6b07e25b1dcedf6af316f19587d6e024be6c3c397769ea15737fd836f6873313ca12bf5d8a1ea780959ddb8d4a143dd163129bc1e36e4
+EBUILD openpgp-keys-gentoo-mirror-20180528.ebuild 600 BLAKE2B 298ad89c2541312023283c0ef39342244c6611c0d9fea252417be1dfda81418fe70a2be86ef3410edc196cad37094e97cc5cf7c92f5ad642a3f737a3b9c8b4b0 SHA512 3e6d5c63648664253dc6b07e25b1dcedf6af316f19587d6e024be6c3c397769ea15737fd836f6873313ca12bf5d8a1ea780959ddb8d4a143dd163129bc1e36e4
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml b/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
new file mode 100644
index 000000000000..fc597b55ac39
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
+}
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild
new file mode 100644
index 000000000000..fc597b55ac39
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release-20180323 b/app-crypt/openpgp-keys-gentoo-release-20180323
deleted file mode 100644
index f6eb9693cb7e..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release-20180323
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP keys used for Gentoo releases (snapshots, stages)
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/downloads/signatures/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.20180323.gz
-_md5_=3d7935fd5c873717a08aa0220ee621c9
diff --git a/app-crypt/openpgp-keys-gentoo-release-20180530 b/app-crypt/openpgp-keys-gentoo-release-20180530
deleted file mode 100644
index cd509a0a39d3..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release-20180530
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP keys used for Gentoo releases (snapshots, stages)
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/downloads/signatures/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.20180530.gz
-_md5_=3d7935fd5c873717a08aa0220ee621c9
diff --git a/app-crypt/openpgp-keys-gentoo-release-20180703 b/app-crypt/openpgp-keys-gentoo-release-20180703
deleted file mode 100644
index 75c9e832196b..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release-20180703
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OpenPGP keys used for Gentoo releases (snapshots, stages)
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/downloads/signatures/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.20180703.gz
-_md5_=3d7935fd5c873717a08aa0220ee621c9
diff --git a/app-crypt/openpgp-keys-gentoo-release-20180706 b/app-crypt/openpgp-keys-gentoo-release-20180706
deleted file mode 100644
index cd7f67f83358..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release-20180706
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( app-crypt/gnupg )
-DESCRIPTION=OpenPGP keys used for Gentoo releases (snapshots, stages)
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/downloads/signatures/
-IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.20180706.gz test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )
-_md5_=d70a5f092b5b32658403249a9b00349e
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
new file mode 100644
index 000000000000..73fd393b5fd9
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -0,0 +1,10 @@
+DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
+DIST gentoo-release.asc.20180323.gz 40546 BLAKE2B 7fed70d734a73368e4772cbca7810e8d61ad3b483e0e0c115072de9f96332b0c8c3c9f091b0ee1cdd056c775db1121deee77d6a629e0b99a4c67d485ccacdfe6 SHA512 31ffdf1e23ea6a36c5f4ab6bd49b9c0323b6b03627a9001589030b2b10e95459b959ee931762bcd43fb94b28eaba5d5ede290b1a41ce3ec0ad1b7b8b0f98d48a
+DIST gentoo-release.asc.20180530.gz 47465 BLAKE2B de37e8e84570debd8b39003bc65ada276f730e8a792b8990c87f4ffd7bbefd2cf49e44b53d3554fc6ecc302da65c8fc480821fd6e9f11324d5ed08a5fac861ef SHA512 63fcb06ae84657cde66fa74bd2b499936906d7aef36c46d19439c72a8c0f199cdc273d7e25004c60b23c50684365192b2a304f26c2b173564a216316eb22f66a
+DIST gentoo-release.asc.20180703.gz 46676 BLAKE2B 934db8c5896aa9fc268820c3349a60854e0a99586c84dbb16e92528b2fac7c043033f68f790bf737fa6835138bdf4dc7ae0df4d67ed96bd8664b16cd42db50a1 SHA512 85ceed12ca105a8dc9767c61b6ff391ed9d3ec2a116ed39b130aa75fa60998d0c2569677b783937bf4cae1cf91f472c9f16fb87abee051fa26f3c7b96bef0b27
+DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
+EBUILD openpgp-keys-gentoo-release-20180323.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
+EBUILD openpgp-keys-gentoo-release-20180530.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
+EBUILD openpgp-keys-gentoo-release-20180703.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
+EBUILD openpgp-keys-gentoo-release-20180706.ebuild 1145 BLAKE2B 937f2632087e94da638b49d8eda2af8344d1bfc9599b53450159bf6310e5a3ccb779d54ee7b692168a4e23568f148af275eb4fde4d907f0f69c8b80220cb4672 SHA512 d288fbfa00b490fa833ac744fd58ff3ed2219b5d5c69c9d23efe548cf0629ab4afb3925f907080083fb6d8205424c15477e029ec99df81aa279530a560cfa028
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/metadata.xml b/app-crypt/openpgp-keys-gentoo-release/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180323.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180323.ebuild
new file mode 100644
index 000000000000..8d339d4fb133
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180323.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild
new file mode 100644
index 000000000000..8d339d4fb133
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180703.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180703.ebuild
new file mode 100644
index 000000000000..8d339d4fb133
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180703.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
new file mode 100644
index 000000000000..a36da1acafbd
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
+	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-${PV}.tar.gz )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( app-crypt/gnupg )"
+
+S=${WORKDIR}
+
+src_test() {
+	local old_umask=$(umask)
+	umask 077
+
+	local -x GNUPGHOME=${T}/.gnupg
+	mkdir "${GNUPGHOME}" || die
+	einfo "Importing keys ..."
+	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
+
+	local f
+	for f in gentoo-release-test-sigs*/*.asc; do
+		einfo "Testing ${f##*/} ..."
+		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
+	done
+
+	umask "${old_umask}"
+}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}
diff --git a/app-crypt/openssl-blacklist-0.5.3 b/app-crypt/openssl-blacklist-0.5.3
deleted file mode 100644
index 54a9a413372c..000000000000
--- a/app-crypt/openssl-blacklist-0.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Detection of weak ssl keys produced by certain debian versions in 2006-2008
-EAPI=5
-HOMEPAGE=https://launchpad.net/ubuntu/+source/openssl-blacklist/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 hppa x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://debian/pool/main/o/openssl-blacklist/openssl-blacklist_0.5.orig.tar.gz mirror://debian/pool/main/o/openssl-blacklist/openssl-blacklist_0.5-3.diff.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8949b079a901017c1ebfb8f9a983391c
diff --git a/app-crypt/openssl-blacklist/Manifest b/app-crypt/openssl-blacklist/Manifest
new file mode 100644
index 000000000000..f45a53adac4f
--- /dev/null
+++ b/app-crypt/openssl-blacklist/Manifest
@@ -0,0 +1,4 @@
+DIST openssl-blacklist_0.5-3.diff.gz 20228 BLAKE2B d09a6288ceb15e186855f52aef9c76fdeb94907555b8d6c8fa07963d629f0adade2f433bbf6a390a065e5ec0b336c2d2d57ecfd347fbf96d3497404eab16d1b5 SHA512 5e5b7fdc97248ccc44f3ffa306a23f9d3ed9585cee15f1ad55dffcf4e70a50463c05382b393bc07e4bd18ea530eea7d36a508f40c1e03b0932eb3cde43f886bd
+DIST openssl-blacklist_0.5.orig.tar.gz 32908393 BLAKE2B 75cbc1bb5780ded04ba84cd8cb7ea93fe271d0075a854e94dea81ff49b54e48a8207290f5e06426a090c0e913bad95b0f0d6992a1cdacfa1ea044521786ac8f1 SHA512 b0ecab15f4357b56508b048a0648263f118aa8eeda8ad6a15caab8c38b2270a5daf897026daf376a561b292c64c2651269182732e0ae3e4bbac455cc1d3985ab
+EBUILD openssl-blacklist-0.5.3.ebuild 1342 BLAKE2B 641b9f34737391fa4280b964a38ba9272792b4be5cc07b03c1c8157d1bc78e32d3ad8895428846e8d58099ea633515a6dbe854f0d9f596f406e8745cde6a88ab SHA512 e869dda8a3c77397990e1ca72e17cb27586c990e14a26098419986eb36bbcf0365767104794ddedc7fdba4c3449d2f4ee6b9d94a556b7719d336d0560645baad
+MISC metadata.xml 316 BLAKE2B 02c6930f6b5ce5c6683712cc74bfce02d87d0a9d67af18c37b4d3751df364508901e2c5b537b7d84e3778c7044f206fac9994eaf0e5cab64bf24b2ee33758b9b SHA512 7879fcc74e3f52d1d04e273a89707e2f59d38675ddfceb30aaa59226372624f6ed11c08bd68271781a6a70ebca69c848042b95070d3a19dd55738b18af48be99
diff --git a/app-crypt/openssl-blacklist/metadata.xml b/app-crypt/openssl-blacklist/metadata.xml
new file mode 100644
index 000000000000..2a593dc51c9b
--- /dev/null
+++ b/app-crypt/openssl-blacklist/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">ubuntu/+source/openssl-blacklist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild b/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild
new file mode 100644
index 000000000000..29b6d9c9fcf6
--- /dev/null
+++ b/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils versionator python-single-r1
+
+MY_PV=$(get_version_component_range 1-2)
+MY_P="${PN}-${MY_PV}"
+DEB_P="${PN}_${MY_PV}"
+DEB_PVER=$(get_version_component_range 3)
+DEB_PATCH="${DEB_P}-${DEB_PVER}.diff"
+
+DESCRIPTION="Detection of weak ssl keys produced by certain debian versions in 2006-2008"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/openssl-blacklist/"
+SRC_URI="mirror://debian/pool/main/o/${PN}/${DEB_P}.orig.tar.gz
+	mirror://debian/pool/main/o/${PN}/${DEB_PATCH}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${DEB_PATCH}
+}
+
+src_install() {
+	dobin openssl-vulnkey
+	doman openssl-vulnkey.1
+	insinto /usr/share/openssl-blacklist
+
+	# ripped from debian/rules "install" target
+	local keysize
+	for keysize in 512 1024 2048 4096 ; do
+		(
+		cat debian/blacklist.prefix
+		cat blacklists/{be32,le32,le64}/blacklist-${keysize}.db \
+			| cut -d ' ' -f 5 | cut -b21- | sort
+		) > blacklist.RSA-${keysize}
+		doins blacklist.RSA-${keysize}
+	done
+
+	python_fix_shebang "${ED}/usr/bin/openssl-vulnkey"
+}
diff --git a/app-crypt/openssl-tpm-engine-0.4.2 b/app-crypt/openssl-tpm-engine-0.4.2
deleted file mode 100644
index 29f4c056cd70..000000000000
--- a/app-crypt/openssl-tpm-engine-0.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-crypt/trousers-0.2.8 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=This provides a OpenSSL engine that uses private keys stored in TPM hardware
-EAPI=6
-HOMEPAGE=http://trousers.sourceforge.net
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-crypt/trousers-0.2.8
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/openssl_tpm_engine-0.4.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5931766e3ecdf48819b091d5fea5a657
diff --git a/app-crypt/openssl-tpm-engine/Manifest b/app-crypt/openssl-tpm-engine/Manifest
new file mode 100644
index 000000000000..2477fc20a099
--- /dev/null
+++ b/app-crypt/openssl-tpm-engine/Manifest
@@ -0,0 +1,4 @@
+AUX openssl-tpm-engine-0.4.2-build.patch 317 BLAKE2B e9467e78d4db86a19df11acf51ea479ea0bc41be9b11aa5d0f120fbda203c27efb15227ce5b2624f04a8933b4618b6f53068b61bb380039a67b8d89718fa6188 SHA512 ef62d70d83cd3251731686e6132cb287b02c1416f59bd1c4ca678f6702d61f505a8b10af387041ce569ea07e270e97983cbb7e00124b8ad4d7eaa1cf01d800a8
+DIST openssl_tpm_engine-0.4.2.tar.gz 528196 BLAKE2B a034c25df32db53775144ffcad74f421176e5abfee346dad3159e8d7a1fdc465421a549a71a5c2a5dc7b414e578fb8eb6b3522e4956a274f5c31635f5a52dcf5 SHA512 376f2aa87ab10d4a77bcc363865238a19e6dfcd548eb1f0780ee223d57d90ebfe7046308757836b76e7f33f4c30f98c0d82126b5e0e0534ec57087384e584f95
+EBUILD openssl-tpm-engine-0.4.2.ebuild 788 BLAKE2B 169da1417a132645e288e16dbc1cf59bb081aed94ea68475856094ee8b17ba6901b950be85763626db18e97474150bca6047f0b90d8bdb9a27441c36040bcfd2 SHA512 3e52257d57bead79a8b19037780c261e48551d8c079c83898d4f319f7a2be1a5332e8c0ba17320d5c8eaf2d22366bacfdf224dba0a0d86514060d10137130cb6
+MISC metadata.xml 318 BLAKE2B ed3850eec8c06dbecc55990dcf55c17afb0a4e0e4c3292008e96685c507efbc42797715b988d459fb9b42dfd69c7cb9092e62256b49c537ac74154bf09e4f5a6 SHA512 628ef47a6ad964f7b3ebd288e3ad423192970a060bfae6e95625056d6b1a49c1d36d3f8001ba066a356a9d63203fd4b40d0ee5c213f8735e0e8d736297e6a721
diff --git a/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch b/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch
new file mode 100644
index 000000000000..ed32ced1b3e5
--- /dev/null
+++ b/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch
@@ -0,0 +1,10 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6695656..4932fae 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,4 +10,4 @@ libtpm_la_LIBADD=-lcrypto -lc -ltspi
+ libtpm_la_SOURCES=e_tpm.c e_tpm.h e_tpm_err.c
+ 
+ create_tpm_key_SOURCES=create_tpm_key.c
+-create_tpm_key_LDADD=-ltspi
++create_tpm_key_LDADD=-lcrypto -ltspi
diff --git a/app-crypt/openssl-tpm-engine/metadata.xml b/app-crypt/openssl-tpm-engine/metadata.xml
new file mode 100644
index 000000000000..7b14326dd1a6
--- /dev/null
+++ b/app-crypt/openssl-tpm-engine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">trousers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild
new file mode 100644
index 000000000000..964c21f365bf
--- /dev/null
+++ b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+MY_P="${P/-tpm-/_tpm_}"
+
+DESCRIPTION="This provides a OpenSSL engine that uses private keys stored in TPM hardware"
+HOMEPAGE="http://trousers.sourceforge.net"
+SRC_URI="mirror://sourceforge/trousers/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=app-crypt/trousers-0.2.8"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	openssl.cnf.sample
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/openvpn-blacklist-0.4-r1 b/app-crypt/openvpn-blacklist-0.4-r1
deleted file mode 100644
index eb09f7fdd2f9..000000000000
--- a/app-crypt/openvpn-blacklist-0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Detection of weak openvpn keys produced by certain debian versions in 2006-2008
-EAPI=5
-HOMEPAGE=http://packages.debian.org/sid/openvpn-blacklist
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://debian/pool/main/o/openvpn-blacklist/openvpn-blacklist_0.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4c79664dd9831bf787e744245788c624
diff --git a/app-crypt/openvpn-blacklist-0.5 b/app-crypt/openvpn-blacklist-0.5
deleted file mode 100644
index 8dc893ac22e7..000000000000
--- a/app-crypt/openvpn-blacklist-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Detection of weak openvpn keys produced by certain debian versions in 2006-2008
-EAPI=5
-HOMEPAGE=http://packages.debian.org/sid/openvpn-blacklist
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://debian/pool/main/o/openvpn-blacklist/openvpn-blacklist_0.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c97b2e8722a0f27a331365751edd4eed
diff --git a/app-crypt/openvpn-blacklist/Manifest b/app-crypt/openvpn-blacklist/Manifest
new file mode 100644
index 000000000000..2d66f7b89525
--- /dev/null
+++ b/app-crypt/openvpn-blacklist/Manifest
@@ -0,0 +1,5 @@
+DIST openvpn-blacklist_0.4.tar.gz 1808103 BLAKE2B b7890a9d591128b7f770b2cdbac1ad881c430f737707c2f7c5df41d4da0c1ae52d8ee87f3ffd378718a6788721cc0c988f49c8be9b31d868c4470c204a03bd95 SHA512 3301f7425520eb086306acb30bd718465208b5aa5606e879b65f936161d1955b93254d9c1dd6f5d66ec6480850652afadabb05db2a0df9fd5acb73a5ed5c19e3
+DIST openvpn-blacklist_0.5.tar.gz 1828347 BLAKE2B d55fe46b2efea312782283ac64c7678f8ad67fe8d09be3fb4f5ada25e17cef06dcaebd4d84d6b72a3aa1093088cf2e0319c6908ce77f9f4e9adecd468c69adf1 SHA512 589216cb2f10b6ea0cf2179f8b47ce2d2ed03916ad5d8a62e22dce71f432101a735d16093855ff43a1d6618fe94e75b9127bbd63408556197e91de6735e713aa
+EBUILD openvpn-blacklist-0.4-r1.ebuild 877 BLAKE2B e26fc60c8cc405224a2b38135c15d9c7316c201a652444cb6e483d932a916fbc580aefc44ca6d5dc41917a83d0b0d391c6b9c574c265e41a12e106f3172b4c7b SHA512 fb8d9d8dcdae7ae94dc8ba354901a824807fb0da1056a524af5860593bc9e2100021bd2737b4fe60d06384502779dfc4a4e06590f09886bfc6276e63e5466596
+EBUILD openvpn-blacklist-0.5.ebuild 880 BLAKE2B c362077d02fea6af5108e14d7e4aeae0d807a2f071a0c206c7547b52342b66d3f75b4c331cd4d259587b5fb94c98c500c7400a482cf135f02f2953fc8bc2fede SHA512 58a3b8396caf9c31e30d66ec2bf42fecd190de2a80763b83b17b4bb0889a1f4f40b38812d798dbf941e908e7d4771f3672399b82c3876e383f72b3f1d84bcb15
+MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-crypt/openvpn-blacklist/metadata.xml b/app-crypt/openvpn-blacklist/metadata.xml
new file mode 100644
index 000000000000..28ef3c7b080f
--- /dev/null
+++ b/app-crypt/openvpn-blacklist/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild
new file mode 100644
index 000000000000..661bca59a64d
--- /dev/null
+++ b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Detection of weak openvpn keys produced by certain debian versions in 2006-2008"
+HOMEPAGE="http://packages.debian.org/sid/openvpn-blacklist"
+SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	python_fix_shebang openvpn-vulnkey
+}
+
+src_install() {
+	dobin openvpn-vulnkey
+	doman openvpn-vulnkey.1
+	dodir /usr/share/openvpn-blacklist
+	cat "${S}/debian/blacklist.prefix" > "${D}/usr/share/openssl-blacklist/blacklist.RSA-2048"
+	cut "${S}/blacklist.RSA-2048" -d ' ' -f 2 | cut -b13- | sort \
+		>> "${D}/usr/share/openvpn-blacklist/blacklist.RSA-2048"
+}
diff --git a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild
new file mode 100644
index 000000000000..c6b4f267170e
--- /dev/null
+++ b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Detection of weak openvpn keys produced by certain debian versions in 2006-2008"
+HOMEPAGE="http://packages.debian.org/sid/openvpn-blacklist"
+SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	python_fix_shebang openvpn-vulnkey
+}
+
+src_install() {
+	dobin openvpn-vulnkey
+	doman openvpn-vulnkey.1
+	dodir /usr/share/openvpn-blacklist
+	insinto /usr/share/openvpn-blacklist
+	newins debian/blacklist.prefix blacklist.RSA-2048
+	cut "${S}/blacklist.RSA-2048" -d ' ' -f 2 | cut -b13- | sort \
+		>> "${D}/usr/share/openvpn-blacklist/blacklist.RSA-2048"|| die
+}
diff --git a/app-crypt/ophcrack-3.6.0 b/app-crypt/ophcrack-3.6.0
deleted file mode 100644
index e0911a78fb98..000000000000
--- a/app-crypt/ophcrack-3.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib
-DESCRIPTION=A time-memory-trade-off-cracker
-EAPI=6
-HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=debug libressl +tables
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=tables? ( app-crypt/ophcrack-tables ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib
-SLOT=0
-SRC_URI=mirror://sourceforge/ophcrack/ophcrack-3.6.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5cb0fdf5461723e7fdef34aaebaf2634
diff --git a/app-crypt/ophcrack-3.7.0 b/app-crypt/ophcrack-3.7.0
deleted file mode 100644
index 2cf0a2e9f791..000000000000
--- a/app-crypt/ophcrack-3.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib
-DESCRIPTION=A time-memory-trade-off-cracker
-EAPI=6
-HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=debug libressl +tables
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=tables? ( app-crypt/ophcrack-tables ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib
-SLOT=0
-SRC_URI=mirror://sourceforge/ophcrack/ophcrack-3.7.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1fbd48233725aee771ce19efb1ea0df
diff --git a/app-crypt/ophcrack-3.8.0 b/app-crypt/ophcrack-3.8.0
deleted file mode 100644
index c08a531c1919..000000000000
--- a/app-crypt/ophcrack-3.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib qt5? ( dev-qt/qtcharts:5 dev-qt/qtgui:5 )
-DESCRIPTION=A time-memory-trade-off-cracker
-EAPI=6
-HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=debug libressl qt5 +tables
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=tables? ( app-crypt/ophcrack-tables ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib qt5? ( dev-qt/qtcharts:5 dev-qt/qtgui:5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/ophcrack/ophcrack-3.8.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0bf9baa05835a2affff51b817f31e67c
diff --git a/app-crypt/ophcrack-tables-1.0-r2 b/app-crypt/ophcrack-tables-1.0-r2
deleted file mode 100644
index 9657bad5455e..000000000000
--- a/app-crypt/ophcrack-tables-1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Tables available for ophcrack
-EAPI=5
-HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=+xpfast xpsmall +vistafree
-KEYWORDS=~x86 ~amd64 ~ppc
-LICENSE=GPL-2
-REQUIRED_USE=|| ( xpfast xpsmall vistafree )
-SLOT=0
-SRC_URI=xpfast? ( mirror://sourceforge/ophcrack/tables_xp_free_fast.zip ) xpsmall? ( mirror://sourceforge/ophcrack/tables_xp_free_small.zip ) vistafree? ( mirror://sourceforge/ophcrack/tables_vista_free.zip )
-_md5_=056bb25cbbcf2cc18fd2c529189cabfe
diff --git a/app-crypt/ophcrack-tables/Manifest b/app-crypt/ophcrack-tables/Manifest
new file mode 100644
index 000000000000..0959db4a34bf
--- /dev/null
+++ b/app-crypt/ophcrack-tables/Manifest
@@ -0,0 +1,5 @@
+DIST tables_vista_free.zip 410609902 BLAKE2B 122f5f0dffdbfae7969f0930266fcbfd95fe68543b465c063f1a742c2d036334ee168331045914e822c2f01d7321925a09095d2a66343368bbbe672ed379bd0c SHA512 daadc06411a528d338862294ed5e9c5162c86bb7c784e2ae572af0d441afe4bf81844432bb543a9f711dd632271ed89e14ded515d1ef1befad8c44a1a7eb14db
+DIST tables_xp_free_fast.zip 701901509 BLAKE2B 7ff40f4a7a0eab6ef961b80e5aa7d86985191314697acc284d256f0a63794467947d236dde1cedf36597b138711bdabb9acaef5b04dd8e674e39ed94101bdcbb SHA512 d2849b2a48508bea830ecf1b39893f734e8bf1bcb6f71358ad344c0f584a3a9c9795e5c0d12851e44c332aeecf00e2da0c55b31fe0491d3bbd527058e45797a3
+DIST tables_xp_free_small.zip 370848194 BLAKE2B 1b1358bd3ddd4e3a574504f642aa5a7125641fc3c542d3e05084f228c11cb90d0dba41ae13227ca1fbc36a9241a53a6c44fe0f092da8e39485f7d2319b0f79c1 SHA512 50d0761a0d950d6492acb083b05c3e33dab905ab10f24a70fd8e25006ea583e871ae8d7908eabc2fed65b106f3ba994973ee881e40b147a6aa8ba297bf14ba61
+EBUILD ophcrack-tables-1.0-r2.ebuild 849 BLAKE2B b0988a5c6fa23997505da9fafb8642a85a60b4cc284f730449028fabd9af40f34b069a9723ef274169ee82938c9fba3258221e90d8654f78a95bca62c1e72bd3 SHA512 5906d12162d24230ae3e6b75b46cf347d2d1f2c2fd6f1b4c47fcaf37ede89c2f2f1986c84f50acdd545fdf2f670adb2a2f6ef22c1c47acf90f69c5324c3b4726
+MISC metadata.xml 546 BLAKE2B 232c2b9898effbd7f0332db19aac69eab6512cbdce55dd1cff820f5e1d0327c404ac3e87895be0ae9609fe5aab2e0f0145b7bfd6ff7ef4665510edbc5e28e10d SHA512 9df4dbe573e7c3a35f05c96c00549ae5777eecae46add6a766f71869787e7d1e3f4fc534e22d6babdc1eb2fceae7aeb9a95d38ac606b32ab57156d1824cbd6c6
diff --git a/app-crypt/ophcrack-tables/metadata.xml b/app-crypt/ophcrack-tables/metadata.xml
new file mode 100644
index 000000000000..3316e0db9ad7
--- /dev/null
+++ b/app-crypt/ophcrack-tables/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<use>
+		<flag name="vistafree">Installs the free Vista ophcrack tables</flag>
+		<flag name="xpfast">Installs the fast XP ophcrack tables</flag>
+		<flag name="xpsmall">Installs the small free XP ophcrack tables</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ophcrack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild b/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
new file mode 100644
index 000000000000..619eee011d2d
--- /dev/null
+++ b/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Tables available for ophcrack"
+HOMEPAGE="http://ophcrack.sourceforge.net/"
+SRC_URI="xpfast? ( mirror://sourceforge/ophcrack/tables_xp_free_fast.zip )
+		 xpsmall? ( mirror://sourceforge/ophcrack/tables_xp_free_small.zip )
+		 vistafree? ( mirror://sourceforge/ophcrack/tables_vista_free.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="+xpfast xpsmall +vistafree"
+
+REQUIRED_USE="|| ( xpfast xpsmall vistafree )"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	for i in ${A};
+	do
+		table=${i#tables_}
+		table=${table%.zip}
+		mkdir "${S}/${table}"
+		cd $_ || die
+		unpack "${i}"
+	done
+}
+
+src_install() {
+	dodir /usr/share/ophcrack/
+	cp -r "${S}"/* "${ED}"/usr/share/ophcrack/ || die
+}
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
new file mode 100644
index 000000000000..f0ae0c162cfb
--- /dev/null
+++ b/app-crypt/ophcrack/Manifest
@@ -0,0 +1,8 @@
+AUX ophcrack-openssl-des.patch 3253 BLAKE2B 91bdac930a784eb8f68c9cfbec7f0a41e05356cc5a87b2db37669e943fc576938b3cc494446d78407555d56af4357a77e4d92f391a4ec5971b5ae97ccd36a0db SHA512 60f4ec2792f1d697db62bbef16a1f365e368fa4cf99695b1fdda4cdfaa1fdef04bf39dbfea72fe5d97aead6435553051eda0b3b619ae93915f11b87de29cc4bc
+DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
+DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312 SHA512 27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6
+DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
+EBUILD ophcrack-3.6.0.ebuild 846 BLAKE2B 8d54066d02a3055fe3167a659058b5dd1137259242a566b24bc5154e09aaadea383a8c707657b06737cba767557e9e863c8669a32c5d99fda703839cfa1cc886 SHA512 8e61e377fb4e58bee406516987c4d5514ad525dd7979e6f93911ce60d80a40a26d48b5f9ca76be7eea18316fcfea52107db5657cfbc34c87166e72091463e6b5
+EBUILD ophcrack-3.7.0.ebuild 796 BLAKE2B eb167f52bb137c834a0ce928306858842fe21431f102a6c03ec36e450ca8719a5bdc7e20f9854abbcca6df612cba19ef427399c1ef50bfdb43303b4b172579db SHA512 86b8fbaac65982c84a32df52339d00ee08a0d2a072e14485475e25b7ab0a5d6237b9efe2a65c60e700dfd43ae8eb301e6974ff7e0c27eded1cfe94616422c386
+EBUILD ophcrack-3.8.0.ebuild 964 BLAKE2B 5098915d456088f26eaeafece924257f3657a0cea2edff2805d58f6c92bf29e0fb3994cee9b7af328b54fe559edb139571217228bf6d6d6c8fe35d6e6d49883a SHA512 bbbf006ea530c3b296a01675b84e71e1fd80d7020a0244945ac67e7690500c668c756a74fcb2efd5279cae822f92598ef0020be407d34ea56d681119f51f3b13
+MISC metadata.xml 474 BLAKE2B 06c67b21ed59a24074d06b4003873ef05bc4ef8632d4602e3ac5f0956698c40e8a7662b6aeddb7bea28055ed03e27900a3fe4f692d765cb25ba5d9c3ca62722e SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3
diff --git a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
new file mode 100644
index 000000000000..2515c178abb7
--- /dev/null
+++ b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
@@ -0,0 +1,92 @@
+--- a/src/lmtable.c	2013-06-04 07:42:47 UTC
++++ b/src/lmtable.c
+@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar
+ /*-------------------------------------------------------------------------*/
+ void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
+   uchar_t key[8];
+-  des_key_schedule ks;
+-  des_cblock *magic = (des_cblock*)lmmagic;
++  DES_key_schedule ks;
++  DES_cblock *magic = (DES_cblock*)lmmagic;
+   
+   key[0] = pwd[0];
+   key[1] = (pwd[0] << 7) | (pwd[1] >> 1);
+@@ -482,7 +482,7 @@ void lmtable_mkhash(uchar_t *pwd, uchar_
+   key[6] = (pwd[5] << 2) | (pwd[6] >> 6);
+   key[7] = (pwd[6] << 1) ;
+ 
+-  des_set_odd_parity(&key);
+-  des_set_key(&key, ks);
+-  des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT);
++  DES_set_odd_parity(&key);
++  DES_set_key(&key, &ks);
++  DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT);
+ }
+
+--- a/src/samdump2/samdump2.c	2015-03-30 02:26:33 UTC
++++ b/src/samdump2/samdump2.c
+@@ -71,7 +71,7 @@ void str_to_key(unsigned char *str,unsig
+ 	for (i=0;i<8;i++) {
+ 		key[i] = (key[i]<<1);
+ 	}
+-	des_set_odd_parity((des_cblock *)key);
++	DES_set_odd_parity((DES_cblock *)key);
+ }
+ 
+ /*
+@@ -209,8 +209,8 @@ unsigned char* utf16_to_utf8 (unsigned c
+   unsigned char hbootkey[0x20];
+   
+   /* Des */
+-  des_key_schedule ks1, ks2;
+-  des_cblock deskey1, deskey2;
++  DES_key_schedule ks1, ks2;
++  DES_cblock deskey1, deskey2;
+   
+   int i, j;
+   
+@@ -418,15 +418,15 @@ unsigned char* utf16_to_utf8 (unsigned c
+       
+       /* Get the two decrpt keys. */
+       sid_to_key1(rid,(unsigned char *)deskey1);
+-      des_set_key_checked((des_cblock *)deskey1,ks1);
++      DES_set_key_checked((DES_cblock *)deskey1, &ks1);
+       sid_to_key2(rid,(unsigned char *)deskey2);
+-      des_set_key_unchecked((des_cblock *)deskey2,ks2);
++      DES_set_key_unchecked((DES_cblock *)deskey2, &ks2);
+       
+       /* Decrypt the lanman password hash as two 8 byte blocks. */
+-      des_ecb_encrypt((des_cblock *)obfkey,
+-		      (des_cblock *)fb, ks1, DES_DECRYPT);
+-      des_ecb_encrypt((des_cblock *)(obfkey + 8),
+-		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
++      DES_ecb_encrypt((DES_cblock *)obfkey,
++		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
++      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
++		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
+       
+       
+       
+@@ -471,16 +471,16 @@ unsigned char* utf16_to_utf8 (unsigned c
+       if (lm_size != 0x14) {
+ 	/* Get the two decrpt keys. */
+ 	sid_to_key1(rid,(unsigned char *)deskey1);
+-	des_set_key((des_cblock *)deskey1,ks1);
++	DES_set_key((DES_cblock *)deskey1, &ks1);
+ 	sid_to_key2(rid,(unsigned char *)deskey2);
+-	des_set_key((des_cblock *)deskey2,ks2);
++	DES_set_key((DES_cblock *)deskey2, &ks2);
+       }
+ 
+       /* Decrypt the NT md4 password hash as two 8 byte blocks. */
+-      des_ecb_encrypt((des_cblock *)obfkey,
+-		      (des_cblock *)fb, ks1, DES_DECRYPT);
+-      des_ecb_encrypt((des_cblock *)(obfkey + 8),
+-		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
++      DES_ecb_encrypt((DES_cblock *)obfkey,
++		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
++      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
++		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
+       
+       /* sf27 wrap to sf25 */
+       //sf27( obfkey, (int*)&rid, fb );
diff --git a/app-crypt/ophcrack/metadata.xml b/app-crypt/ophcrack/metadata.xml
new file mode 100644
index 000000000000..cf1f547e6447
--- /dev/null
+++ b/app-crypt/ophcrack/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ikelos@gentoo.org</email>
+    <name>Mike Auty</name>
+  </maintainer>
+  <use>
+    <flag name="tables">Require the additional tables used to carry out cracking (<pkg>app-crypt/ophcrack-tables</pkg>)</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">ophcrack</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
new file mode 100644
index 000000000000..1e5b264f0c76
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils
+
+DESCRIPTION="A time-memory-trade-off-cracker"
+HOMEPAGE="http://ophcrack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug libressl +tables"
+
+CDEPEND="!libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+		 net-libs/netwib"
+DEPEND="app-arch/unzip
+		 virtual/pkgconfig
+		 ${CDEPEND}"
+RDEPEND="tables? ( app-crypt/ophcrack-tables )
+		 ${CDEPEND}"
+
+PATCHES="${FILESDIR}/ophcrack-openssl-des.patch"
+
+src_configure() {
+
+	local myconf
+
+	myconf="${myconf} $(use_enable debug) --disable-gui"
+
+	econf ${myconf} || die "Failed to compile"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "Installation failed."
+}
diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
new file mode 100644
index 000000000000..0e985ea1117c
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils
+
+DESCRIPTION="A time-memory-trade-off-cracker"
+HOMEPAGE="http://ophcrack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug libressl +tables"
+
+CDEPEND="!libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+		 net-libs/netwib"
+DEPEND="app-arch/unzip
+		 virtual/pkgconfig
+		 ${CDEPEND}"
+RDEPEND="tables? ( app-crypt/ophcrack-tables )
+		 ${CDEPEND}"
+
+src_configure() {
+
+	local myconf
+
+	myconf="${myconf} $(use_enable debug) --disable-gui"
+
+	econf ${myconf} || die "Failed to compile"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "Installation failed."
+}
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
new file mode 100644
index 000000000000..47dd63963818
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils
+
+DESCRIPTION="A time-memory-trade-off-cracker"
+HOMEPAGE="http://ophcrack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libressl qt5 +tables"
+
+CDEPEND="!libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+		 net-libs/netwib
+		 qt5? ( dev-qt/qtcharts:5
+		 dev-qt/qtgui:5 )"
+DEPEND="app-arch/unzip
+		 virtual/pkgconfig
+		 ${CDEPEND}"
+RDEPEND="tables? ( app-crypt/ophcrack-tables )
+		 ${CDEPEND}"
+
+src_configure() {
+
+	local myconf
+
+	myconf="$(use_enable debug)"
+	myconf="${myconf} $(use_enable qt5 gui)"
+
+	econf ${myconf} || die "Failed to compile"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "Installation failed."
+
+	cd "${S}"
+	newicon src/gui/pixmaps/os.xpm ophcrack.xpm
+	make_desktop_entry "${PN}" OphCrack ophcrack
+}
diff --git a/app-crypt/osslsigncode-1.4 b/app-crypt/osslsigncode-1.4
deleted file mode 100644
index b878e838d688..000000000000
--- a/app-crypt/osslsigncode-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl ) virtual/pkgconfig
-DESCRIPTION=Platform-independent tool for Authenticode signing of EXE/CAB files
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/osslsigncode
-IUSE=curl libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl )
-SLOT=0
-SRC_URI=mirror://sourceforge/osslsigncode/osslsigncode-1.4.tar.gz
-_md5_=738a1559165c6bf91425c75f1bdd4911
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
new file mode 100644
index 000000000000..b91d5b40667f
--- /dev/null
+++ b/app-crypt/osslsigncode/Manifest
@@ -0,0 +1,3 @@
+DIST osslsigncode-1.4.tar.gz 96512 BLAKE2B 8325153d16b7ad5d0701daf3d5d446bef498aaf45b88a78d5472d86c0899a73bff2350c224f9f3e35475d5dd72792fe24328f4710d25984ae23c5f83c6fef967 SHA512 89f82b5cbab5952b7bb0b1a3ea230db0c38d171924e5150e9cd157158e52d312cc10093ac719265d03a097f995bd3a438fe874c50263659859c625482ef0239f
+EBUILD osslsigncode-1.4.ebuild 569 BLAKE2B a65ef8297b8e864a0e6e9d429370dad60af3bace297e23ee651e26156fba8eef12d0f532f1720c0c5160d050f0f5e34915973372181e1723a32f7e7705ddbc18 SHA512 633f36d45f39c15a4534a36d7a3ddb946feaa72b5108fa7337473e96f3d8ea3580cb5d93d91fe3fb4c45f4e3db9bb8873c2f5bce152aa0e8ed0df8287f158d58
+MISC metadata.xml 249 BLAKE2B e2269cf35520934d37b0cace5aaa64dc71ba9917bb90ef01e3ddb5e0208ffd0e2c650008fe88df51ebf6c5c304dbf7670608712f4229cacf62f9c7a747fb8f00 SHA512 9d2ea5145e05b199a7c1cff11164a7eaa9179fec4149b5a0c6f17c5c689d041d68243f4e1cc550617f9649f72ca77d7cadf3d488d1c6cab31bdbdb3fdc26aa9a
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
new file mode 100644
index 000000000000..75c8297907db
--- /dev/null
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">osslsigncode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/osslsigncode/osslsigncode-1.4.ebuild b/app-crypt/osslsigncode/osslsigncode-1.4.ebuild
new file mode 100644
index 000000000000..43d60cc9620a
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
+HOMEPAGE="https://sourceforge.net/projects/osslsigncode"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	curl? ( net-misc/curl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_with curl)
+}
diff --git a/app-crypt/p11-kit-0.23.12 b/app-crypt/p11-kit-0.23.12
deleted file mode 100644
index 592492ccf7f9..000000000000
--- a/app-crypt/p11-kit-0.23.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates ) virtual/pkgconfig
-DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
-EAPI=6
-HOMEPAGE=https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit
-IUSE=+asn1 debug +libffi +trust abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates )
-REQUIRED_USE=trust? ( asn1 )
-SLOT=0
-SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.23.12/p11-kit-0.23.12.tar.gz
-_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c63b50b727cb5fd9d547922f5d2fc3fe
diff --git a/app-crypt/p11-kit-0.23.2 b/app-crypt/p11-kit-0.23.2
deleted file mode 100644
index 1806451aad86..000000000000
--- a/app-crypt/p11-kit-0.23.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates ) virtual/pkgconfig
-DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
-EAPI=5
-HOMEPAGE=https://p11-glue.freedesktop.org/p11-kit.html
-IUSE=+asn1 debug +libffi +trust abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates )
-REQUIRED_USE=trust? ( asn1 )
-SLOT=0
-SRC_URI=https://p11-glue.freedesktop.org/releases/p11-kit-0.23.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5274094da98df0a554fa956ddd765738
diff --git a/app-crypt/p11-kit-0.23.9 b/app-crypt/p11-kit-0.23.9
deleted file mode 100644
index 9daa22d13c72..000000000000
--- a/app-crypt/p11-kit-0.23.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates ) virtual/pkgconfig
-DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
-EAPI=6
-HOMEPAGE=https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit
-IUSE=+asn1 debug +libffi +trust abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates )
-REQUIRED_USE=trust? ( asn1 )
-SLOT=0
-SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.23.9/p11-kit-0.23.9.tar.gz
-_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2261570b5be941414e1e19ca794c7120
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
new file mode 100644
index 000000000000..80b400b4b611
--- /dev/null
+++ b/app-crypt/p11-kit/Manifest
@@ -0,0 +1,7 @@
+DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
+DIST p11-kit-0.23.2.tar.gz 1022733 BLAKE2B 09d1e1c9c9cc9bd330923f6aa37026b6f3b67fd728e4fdf2c692f0eaa1a27b1a045c263ba66d57063b8a03f8dc1ccd4d20bf5f255fc6e21d8ea600696f45d9ea SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f
+DIST p11-kit-0.23.9.tar.gz 1091561 BLAKE2B 9ad061e703f8a7bcf677d974316adc3c96c34765bcee9834e65850b16fd7afa6ab2ffade18a65b99b85ec1af877d74938cf9369797f914d622c15e218801351a SHA512 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed
+EBUILD p11-kit-0.23.12.ebuild 1990 BLAKE2B 6b92e6fc4f04fe9459c89b9451da33f2d4cce5f1b8e679c0004d4c92ebc97a3e4caaa015a795cd04a62eee4716be3e1774d9b0e22e81f15c478d24f1f56998f5 SHA512 8a06d412f57e3b7121e20fccfb6c324c334856813cba60ba2edd27fa942d2e995874e5abb31bb259b313535f7a1b9b71fd7f7e489135954e8f99e67d64d7cb63
+EBUILD p11-kit-0.23.2.ebuild 1311 BLAKE2B 6f255091c7997b46f069719d8b9c20258ea36cd44bd06907d2620686714c6b8a5e4f68d9bfd5487ea5f6b0a5166af1bcdd3c9b4d3cbbb23641954cc882208491 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c
+EBUILD p11-kit-0.23.9.ebuild 1982 BLAKE2B 12d3e64b9c5211271bfc6a8f2def055e7cdcff658ca21f878cba37d4bf927bf766027c44946eecd7cd7e3a0961c63140b70b68d9b9bbf04fb8ec4b5170f01dfb SHA512 c2bc6ecec23aa018102013931ae5ea116d60b5682e8739716c07b794545c9ed2e813ec8b544b60c08553e7eecfde1d72d71fc2096dc80658a4575ca9f142be9f
+MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
new file mode 100644
index 000000000000..911ed2493e78
--- /dev/null
+++ b/app-crypt/p11-kit/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<use>
+		<flag name="asn1">Enable ASN.1 certificate support</flag>
+		<flag name="trust">Build the trust policy module</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">p11-glue/p11-kit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
new file mode 100644
index 000000000000..cb5f5dc036bc
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit"
+SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
+		# drop to XPG6 to make feature_tests.h happy
+		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
+		# paths.h isn't available, oddly enough also not used albeit included
+		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
+		# we don't have SUN_LEN here
+		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+			p11-kit/server.c || die
+	fi
+	default
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable trust trust-module) \
+		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_enable debug) \
+		$(use_with libffi) \
+		$(use_with asn1 libtasn1)
+
+	if multilib_is_native_abi; then
+		# re-use provided documentation
+		ln -s "${S}"/doc/manual/html doc/manual/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.2.ebuild b/app-crypt/p11-kit/p11-kit-0.23.2.ebuild
new file mode 100644
index 000000000000..b39df734b446
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit ltprune multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html"
+SRC_URI="https://p11-glue.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable trust trust-module) \
+		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_enable debug) \
+		$(use_with libffi) \
+		$(use_with asn1 libtasn1)
+
+	if multilib_is_native_abi; then
+		# re-use provided documentation
+		ln -s "${S}"/doc/manual/html doc/manual/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
new file mode 100644
index 000000000000..62bc6419cd69
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit"
+SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
+		# drop to XPG6 to make feature_tests.h happy
+		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
+		# paths.h isn't available, oddly enough also not used albeit included
+		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
+		# we don't have SUN_LEN here
+		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+			p11-kit/server.c || die
+	fi
+	default
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable trust trust-module) \
+		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_enable debug) \
+		$(use_with libffi) \
+		$(use_with asn1 libtasn1)
+
+	if multilib_is_native_abi; then
+		# re-use provided documentation
+		ln -s "${S}"/doc/manual/html doc/manual/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/paperkey-1.4 b/app-crypt/paperkey-1.4
deleted file mode 100644
index 60877ddf4464..000000000000
--- a/app-crypt/paperkey-1.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=OpenPGP key archiver
-EAPI=6
-HOMEPAGE=http://www.jabberwocky.com/software/paperkey/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.jabberwocky.com/software/paperkey/paperkey-1.4.tar.gz
-_md5_=7b7bd530906fdac35e2b0b274c10391d
diff --git a/app-crypt/paperkey-1.5 b/app-crypt/paperkey-1.5
deleted file mode 100644
index 977bfebc8893..000000000000
--- a/app-crypt/paperkey-1.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=OpenPGP key archiver
-EAPI=6
-HOMEPAGE=http://www.jabberwocky.com/software/paperkey/
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.jabberwocky.com/software/paperkey/paperkey-1.5.tar.gz
-_md5_=3d8648cba438ce57145d585d31d5c8c9
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
new file mode 100644
index 000000000000..b38e04785edc
--- /dev/null
+++ b/app-crypt/paperkey/Manifest
@@ -0,0 +1,5 @@
+DIST paperkey-1.4.tar.gz 259446 BLAKE2B bdc011cfefb7fb6b6359bd1506825d4a65b0110ad302671aced6551bfd54fe4588d4adcb35159e9b29c0f056a1d7e0bc932ac1223b325ff4f04397c1a1d0b797 SHA512 d0e87760bfd66c39c407f59f94cdd3dfd8f399a51b854a2485f923f4f1faa95a40a68ffd018b9141b923c1db346993600e5e3644314e4f8c94585d47f1367e9c
+DIST paperkey-1.5.tar.gz 266722 BLAKE2B 8b838b70690a080ca3e579780af890021f218e86dc73099e2adc457c169d2268795e34779d839b63cfe4fec549f44df058d49a853f9c02a878c2163a5e03b393 SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6
+EBUILD paperkey-1.4.ebuild 342 BLAKE2B f0d8636fc7b87828cf0b9c1c4e01ec5043f4cb7c53a6fcdb269e209cfd26e2c4e2f13d3053d89cbe093391d925219b46db3e91b5395501ac5b975caa71f4732e SHA512 841f89c09c1af3c4e7a05a356bb3f90d04037ab17cd176d2b14f0827f7a26db630b66f3e559dbbc23563d04ad30019181651a4837bf9a72d7e9703f8892e9839
+EBUILD paperkey-1.5.ebuild 355 BLAKE2B cf4f8d27c330a6f85877ece6e80a168a07f5383fc1165dbe4b5f25d474815e826abc007191eb873d572676141742a0954a2952e87db0870fa8b12503b0dd2f13 SHA512 fbd1bd7574ad2df006caf82aa49d06a64b9ba990a557be1741581137e22ecdd728cb72778680a9d16a3623938663a559309057d38ed1d518818ba07c60a8fb73
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/paperkey/metadata.xml b/app-crypt/paperkey/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-crypt/paperkey/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/paperkey/paperkey-1.4.ebuild b/app-crypt/paperkey/paperkey-1.4.ebuild
new file mode 100644
index 000000000000..c9c2b53e63cb
--- /dev/null
+++ b/app-crypt/paperkey/paperkey-1.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP key archiver"
+HOMEPAGE="http://www.jabberwocky.com/software/paperkey/"
+SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DOCS="README"
diff --git a/app-crypt/paperkey/paperkey-1.5.ebuild b/app-crypt/paperkey/paperkey-1.5.ebuild
new file mode 100644
index 000000000000..0b743eab0fcb
--- /dev/null
+++ b/app-crypt/paperkey/paperkey-1.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP key archiver"
+HOMEPAGE="http://www.jabberwocky.com/software/paperkey/"
+SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE=""
+
+DOCS="README"
diff --git a/app-crypt/pdfcrack-0.16 b/app-crypt/pdfcrack-0.16
deleted file mode 100644
index 99da3116f545..000000000000
--- a/app-crypt/pdfcrack-0.16
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Tool for recovering passwords and content from PDF-files
-EAPI=6
-HOMEPAGE=http://pdfcrack.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/pdfcrack/pdfcrack-0.16.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=584e219995c18710ce5e89988218641c
diff --git a/app-crypt/pdfcrack/Manifest b/app-crypt/pdfcrack/Manifest
new file mode 100644
index 000000000000..0b79d99b5478
--- /dev/null
+++ b/app-crypt/pdfcrack/Manifest
@@ -0,0 +1,4 @@
+AUX pdfcrack-0.14-cflags.patch 236 BLAKE2B ce6e226f6bb8286437fa3a40abae4d1fbde59f7913f6d5fd0c3b510e8f92043f15e96ab790d777c4306a06291de9f8bab9633cf42b29ec0262f34558035b134e SHA512 8fd2f9bc024bff34bb1f7e90e7f27b80473ca12f340735f4cbb8d3717354df9907a9f05d57950a4a9f9604c2452a75cb7de341b4b84f2d248a63ca047131388b
+DIST pdfcrack-0.16.tar.gz 34467 BLAKE2B 7eda8dae9cec3117f410f9ebbe6d536ca627c72b53693d4021f3faf104ed0439e05dda5848d1f18911544336c6303f9b061c373da9a0a275ecfa2c29ed425b76 SHA512 460113f28249d1ea1cefc6dac8ff22b33849ccff50f61830144e41eeec47c4b9113845bb955d26757adb0552d8c0dfa43b3f5666c1419afe4063037a1e1c933d
+EBUILD pdfcrack-0.16.ebuild 521 BLAKE2B f5e34e7003e53327e53e094adbd49e5aac82220297fe678e60b1481ea81c0130926d35669346c26fb63ca85f8f1d21de67be4303df7ae3b468e48f669b257e35 SHA512 25ca773e64b143680011b193432b29f7a8d629977a1bf2143b2ebb292f375def1ef2eff6e8b79f3e9f94ef8b3fc590ad67245d66dba1030e33e554247e17f5fb
+MISC metadata.xml 318 BLAKE2B d6fc6a392870efe2b14c4fcde09a2b17806d42b8839124c079c87bd1b30c07054b3aaa3fa8a642f486155a6b1f9faf5a5e57cff7d6df12a7a8e464f1a261c762 SHA512 19b662a277c05c40365c89346bb98a42e1cc8924a0343899be55dcff0d38b919f681fd8b32ed8e0db0ef07b717847caf4df73d862bc73e46f2c6fe7985a94db5
diff --git a/app-crypt/pdfcrack/files/pdfcrack-0.14-cflags.patch b/app-crypt/pdfcrack/files/pdfcrack-0.14-cflags.patch
new file mode 100644
index 000000000000..7ea168878d1e
--- /dev/null
+++ b/app-crypt/pdfcrack/files/pdfcrack-0.14-cflags.patch
@@ -0,0 +1,8 @@
+--- pdfcrack-0.14/Makefile
++++ pdfcrack-0.14/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -Wall -Wextra -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -O3 -g
++CFLAGS += -Wall -Wextra -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+ 
+ all: pdfcrack
+ 
diff --git a/app-crypt/pdfcrack/metadata.xml b/app-crypt/pdfcrack/metadata.xml
new file mode 100644
index 000000000000..e76ba30337e1
--- /dev/null
+++ b/app-crypt/pdfcrack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pdfcrack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/pdfcrack/pdfcrack-0.16.ebuild b/app-crypt/pdfcrack/pdfcrack-0.16.ebuild
new file mode 100644
index 000000000000..206b6b4510de
--- /dev/null
+++ b/app-crypt/pdfcrack/pdfcrack-0.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tool for recovering passwords and content from PDF-files"
+HOMEPAGE="http://pdfcrack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.14-cflags.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin pdfcrack
+	dodoc changelog README
+}
diff --git a/app-crypt/pesign-0.112 b/app-crypt/pesign-0.112
deleted file mode 100644
index 2cc8558a4419..000000000000
--- a/app-crypt/pesign-0.112
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/nspr dev-libs/nss dev-libs/popt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-libs/efivar sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
-DESCRIPTION=Tools for manipulating signed PE-COFF binaries
-EAPI=6
-HOMEPAGE=https://github.com/vathpela/pesign
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/nspr dev-libs/nss dev-libs/popt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-libs/efivar
-SLOT=0
-SRC_URI=https://github.com/vathpela/pesign/archive/0.112.tar.gz -> pesign-0.112.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b084eee1f7439fc218d64613fd0ad31
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
new file mode 100644
index 000000000000..854c41c39c4b
--- /dev/null
+++ b/app-crypt/pesign/Manifest
@@ -0,0 +1,5 @@
+AUX pesign-0.112-fix-cli-opts.patch 2228 BLAKE2B 6037340b1bc0c659ec2be5358d781b29f0fe755a17e7c17f612ef7c8dc514dc5d5ed2c49121463caa269e01a206a160ec725f7545a004fe10ffc35841f23625a SHA512 62d2ec0059ff518b576b6399a217f47b1f361c41292055b8a7326e81cda30190b4a62dad7dd8150855b2025af1ad25458a2cbbfd3ae89ca6c870067224662695
+AUX pesign-0.112-fix-initializer.patch 388 BLAKE2B e5beacd2503dbde5c6e4ba748c4dc5151747028b3448e91fcb2e52f6e2622ba5f84cb29a816c67979dcf7ab40b9f3d2ea10ff31033027c18b68c863ab2eed86e SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84
+DIST pesign-0.112.tar.gz 107632 BLAKE2B 737b75aec7efa9f41dbdb509405dede914cd5aa563572f0d2ede96a321f4a669170c696c7bd93bad1a5c1a6f2c65715b66317544fa6fc55d6b7f85436d778e8a SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018
+EBUILD pesign-0.112.ebuild 1029 BLAKE2B 283075f097aa4a37aca9bd3b153044b9fd543f301774d926754fc6283d8d08c76c2953f790911bda0acf825dd0c543fc92a4e53eaa20d2ae0cb2dce7c4b91d2a SHA512 afaa06b5fb7c416b314d62dfcf98e9677d72c38ad18b9d9b4318d4362c94991b409d7fc5dcabc29111766ddba158309ec5d3ad41194ade0959dac99dc81159d6
+MISC metadata.xml 466 BLAKE2B f7c15efd0e75918931fb23acd033a3273820cd449e397af5dd1195e3de85e9b5b9510ac22fef9bcc3be820cfc2f09f61cb5e4fd8742797aa28d915cb275c098f SHA512 cffb289b804411ba72b52113ac4784e2873c0c0730496eb3b29a35c2d2a8891031f579e70cb7a64f0da685fedbcf3f0787ed2c630664cb6c363ddbd66e0d1364
diff --git a/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch b/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
new file mode 100644
index 000000000000..6271a999859a
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
@@ -0,0 +1,73 @@
+From 5be0515dee24308fd7e270bf2e0fb5e5a7a78f32 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Thu, 9 Jun 2016 14:30:37 +0200
+Subject: [PATCH 2/2] Fix command line parsing
+
+The gettext translation domain should be passed as .arg, not .descrip,
+otherwise popt won't process any of the command line options (it stops
+looping over the struct poptOption array when an entry has unset
+longName, shortName and arg).
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ src/client.c     | 2 +-
+ src/efikeygen.c  | 2 +-
+ src/efisiglist.c | 2 +-
+ src/pesigcheck.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/client.c b/src/client.c
+index 028419f..575c873 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -555,7 +555,7 @@ main(int argc, char *argv[])
+ 
+ 	struct poptOption options[] = {
+ 		{.argInfo = POPT_ARG_INTL_DOMAIN,
+-		 .descrip = "pesign" },
++		 .arg = "pesign" },
+ 		{.longName = "token",
+ 		 .shortName = 't',
+ 		 .argInfo = POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT,
+diff --git a/src/efikeygen.c b/src/efikeygen.c
+index 6278849..8a515a5 100644
+--- a/src/efikeygen.c
++++ b/src/efikeygen.c
+@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
+ 	poptContext optCon;
+ 	struct poptOption options[] = {
+ 		{.argInfo = POPT_ARG_INTL_DOMAIN,
+-		 .descrip = "pesign" },
++		 .arg = "pesign" },
+ 		/* global nss-ish things */
+ 		{.longName = "dbdir",
+ 		 .shortName = 'd',
+diff --git a/src/efisiglist.c b/src/efisiglist.c
+index cd3f1ae..40d6a93 100644
+--- a/src/efisiglist.c
++++ b/src/efisiglist.c
+@@ -126,7 +126,7 @@ main(int argc, char *argv[])
+ 
+ 	struct poptOption options[] = {
+ 		{.argInfo = POPT_ARG_INTL_DOMAIN,
+-		 .descrip = "pesign" },
++		 .arg = "pesign" },
+ 		{.longName = "infile",
+ 		 .shortName = 'i',
+ 		 .argInfo = POPT_ARG_STRING,
+diff --git a/src/pesigcheck.c b/src/pesigcheck.c
+index 1328fe9..0d49c1a 100644
+--- a/src/pesigcheck.c
++++ b/src/pesigcheck.c
+@@ -214,7 +214,7 @@ main(int argc, char *argv[])
+ 	poptContext optCon;
+ 	struct poptOption options[] = {
+ 		{.argInfo = POPT_ARG_INTL_DOMAIN,
+-		 .descrip = "pesign" },
++		 .arg = "pesign" },
+ 		{.longName = "dbfile",
+ 		 .shortName = 'D',
+ 		 .argInfo = POPT_ARG_CALLBACK|POPT_CBFLAG_POST,
+-- 
+2.9.2
+
diff --git a/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch b/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
new file mode 100644
index 000000000000..b6147fe68e6d
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
@@ -0,0 +1,13 @@
+This addresses a -Werror=missing-braces build failure from GCC bug #53119.
+
+--- a/libdpe/pe_allocspace.c
++++ b/libdpe/pe_allocspace.c
+@@ -61,7 +61,7 @@
+ 	struct pe32plus_opt_hdr *opthdr = pe->state.pe32plus_exe.opthdr;
+ 
+ 	Pe_Scn *scn = NULL;
+-	struct section_header shdr = { 0, }, tmp_shdr;
++	struct section_header shdr = { { 0, } }, tmp_shdr;
+ 	if (pehdr->sections < 1)
+ 		return -1;
+ 
diff --git a/app-crypt/pesign/metadata.xml b/app-crypt/pesign/metadata.xml
new file mode 100644
index 000000000000..ac456968425e
--- /dev/null
+++ b/app-crypt/pesign/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>david.michael@coreos.com</email>
+    <name>David Michael</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vathpela/pesign</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/pesign/pesign-0.112.ebuild b/app-crypt/pesign/pesign-0.112.ebuild
new file mode 100644
index 000000000000..314dcb7d8cd1
--- /dev/null
+++ b/app-crypt/pesign/pesign-0.112.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
+HOMEPAGE="https://github.com/vathpela/pesign"
+SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/popt
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-apps/util-linux
+	sys-libs/efivar
+"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.112-fix-cli-opts.patch
+	"${FILESDIR}"/${PN}-0.112-fix-initializer.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" VERSION="${PVR}" install
+	einstalldocs
+
+	# remove some files that don't make sense for Gentoo installs
+	rm -rf "${ED%/}/etc/" "${ED%/}/var/" \
+	   "${ED%/}/usr/share/doc/${PF}/COPYING" || die
+}
diff --git a/app-crypt/pgpdump-0.30 b/app-crypt/pgpdump-0.30
deleted file mode 100644
index a54b066be92b..000000000000
--- a/app-crypt/pgpdump-0.30
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib app-arch/bzip2
-DESCRIPTION=A PGP packet visualizer
-EAPI=5
-HOMEPAGE=http://www.mew.org/~kazu/proj/pgpdump/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib app-arch/bzip2
-SLOT=0
-SRC_URI=http://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.30.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=72f02644eeb3251268be6847cbae998c
diff --git a/app-crypt/pgpdump-0.32 b/app-crypt/pgpdump-0.32
deleted file mode 100644
index 47d0444606b4..000000000000
--- a/app-crypt/pgpdump-0.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-libs/zlib app-arch/bzip2
-DESCRIPTION=A PGP packet visualizer
-EAPI=6
-HOMEPAGE=http://www.mew.org/~kazu/proj/pgpdump/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib app-arch/bzip2
-SLOT=0
-SRC_URI=http://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.32.tar.gz
-_md5_=6c484f1e2e0ef71132b7589e27621759
diff --git a/app-crypt/pgpdump-0.33 b/app-crypt/pgpdump-0.33
deleted file mode 100644
index 6351725f3c6c..000000000000
--- a/app-crypt/pgpdump-0.33
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-libs/zlib app-arch/bzip2
-DESCRIPTION=A PGP packet visualizer
-EAPI=6
-HOMEPAGE=http://www.mew.org/~kazu/proj/pgpdump/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib app-arch/bzip2
-SLOT=0
-SRC_URI=http://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.33.tar.gz
-_md5_=f65fbcf8a31c216b064748cd20100cef
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
new file mode 100644
index 000000000000..dadfe6583cec
--- /dev/null
+++ b/app-crypt/pgpdump/Manifest
@@ -0,0 +1,9 @@
+AUX pgpdump-0.28-respect-ldflags.patch 977 BLAKE2B a1e2bc207f696e6382849995b69d90ab550d37e3b91a0f3b94ad1082656ef7f900f521d7704e27d098293e30a863ddf09545abbd41ce8cdc33e88f0c78010063 SHA512 3b615f8276ad4099c7963a53189af482b90143e1f36f14b596fb471736a7ee9ee13b6b873fa56dc7792605449c00a4e1a273c7aa35dc7de1ffd3fabacab6728e
+AUX pgpdump-0.32-respect-ldflags.patch 998 BLAKE2B fefa545f3c2d1d3ed3baa5a9d2b84b9b32745626883e9b8056fff045ceb0d06a490f5068782dbda07e4956429a2d2f31865c9c0e55b91bd9aa613f9ce6016537 SHA512 ed333769ded8acbec36d34bc86d935705294d96854e84af4673d44ed3d04f5272d2c1bba38b2742afeb02b2a307a983ff61566433ad1546769e6a68f2318e760
+DIST pgpdump-0.30.tar.gz 63152 BLAKE2B 71381c5be016761100d0274753b20b27b361f45a40d9407706057523248c442fba3e36c55d57db2b66d7f0c252844c077ff99f45cffaef8b233c79af10386e91 SHA512 e250dc82bb890a7645a41f6ddbfad9155ddf70f2ea53b09e771e9b6851d05d3fba88e16b106681ab092174e79ad709ed860be25bfded1ca7f369b357e8c72730
+DIST pgpdump-0.32.tar.gz 65444 BLAKE2B baa7d9077799f6295adf2927933f1ccb466dd7afedf496d5e4010d06f7111a2cf58ea4a48590d76bb166862c0315c333ae40f79d0946c5bb05092f6122f8a071 SHA512 3f28a301cce703e934eb8b6124af4db78801d444ce74f43f8511009ea0684f9e9c229ef2a18cc732fe0854f2e02c4bbfdee46ffee64a5f490ff06c060472e49d
+DIST pgpdump-0.33.tar.gz 65730 BLAKE2B 9941f55a070c219b1b6096939f1a8d775d85c8de60154f2ca93709b489605c8c3937bb4e250390fc71d152bf23c5a22f37226a64ff57036268cf49d793c215bd SHA512 976e2c185c9d72302c9c020dde1d2872b01fd9c2195be0d43441a03c3c6a4a70636f8ac2b35e3fde30e45ecc7fc1c23d7c92dcbd90fc503bbcdef73e3483e9c7
+EBUILD pgpdump-0.30.ebuild 552 BLAKE2B 7d1941dff7af58734a07664c8cb2ea84187ec8faaadee8a83118a5ecb1b552941858fcf1c6cbb5df83730ea481af2d37ab3189fa751030457874498bcd705cf2 SHA512 4d06ab2adcead278d58d1a9366919e83d57b32b98c89a2eee4bd667c8853f3ff7289be99c225179781cfb4d0e92823d7f2af41f5eb93f9ef1e3183efccfcf279
+EBUILD pgpdump-0.32.ebuild 528 BLAKE2B 77bc198cde30232d9d4b37928449b704857778f1b54dfc2bd4c23733afc05f19c7229f6a431ce0ac761e71a69d772575c316bc4ca8fbb49d298db85f96b1375b SHA512 f99dfcc371d372dc6cfa9613c4f40336dfaeacd08851f0302bed6d5f91814dc35e31d4a3ce0cf273c3e4a8781cb02aff907d31861f863a0c5f5d9e2dfa5126a9
+EBUILD pgpdump-0.33.ebuild 528 BLAKE2B 50a12fcf48bbb498debe29c1ee57ba15d83fe7eb0d9d6488efb49a0da5d949e03696ef97d5bc3c320c34a7ab5504f65663b6772ef58f72970defd0cb0362aff1 SHA512 bbc1474b856606b888002043d231d2a1fb082c13020d2ab58a5064baca69f770e31a3a358fd049b62a12dfbbcf68073ee7014a39d51467b06a50bf29a8692183
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-crypt/pgpdump/files/pgpdump-0.28-respect-ldflags.patch b/app-crypt/pgpdump/files/pgpdump-0.28-respect-ldflags.patch
new file mode 100644
index 000000000000..1e0f0c6f266c
--- /dev/null
+++ b/app-crypt/pgpdump/files/pgpdump-0.28-respect-ldflags.patch
@@ -0,0 +1,42 @@
+From 087f54f29dd679a9c6eb5cce075d9f4c6ccbc57f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@rueg.eu>
+Date: Sun, 11 Aug 2013 00:42:06 +0200
+Subject: [PATCH] Respect LDFLAGS, minor other improvements
+
+---
+ Makefile.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a0269a3..d174393 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,8 @@ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ mandir = @mandir@
+ LIBS = @LIBS@
+-CFLAGS  = @CFLAGS@ -O -Wall
++CC = @CC@
++CFLAGS  = @CFLAGS@ -Wall
+ LDFLAGS = @LDFLAGS@
+ VERSION = `git tag | tail -1 | sed -e 's/v//'`
+ 
+@@ -22,13 +23,13 @@ MAN  = pgpdump.1
+ CNF = config.h config.status config.cache config.log
+ MKF = Makefile
+ 
+-.c.o:
++%.o : %.c
+ 	$(CC) -c $(CFLAGS) $<
+ 
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
+ 
+ clean:
+ 	$(RM) $(OBJS) $(PROG)
+-- 
+1.8.1.6
+
diff --git a/app-crypt/pgpdump/files/pgpdump-0.32-respect-ldflags.patch b/app-crypt/pgpdump/files/pgpdump-0.32-respect-ldflags.patch
new file mode 100644
index 000000000000..44f81b451489
--- /dev/null
+++ b/app-crypt/pgpdump/files/pgpdump-0.32-respect-ldflags.patch
@@ -0,0 +1,42 @@
+From 43dfe847efa8e614b3e6f8d37ad04ba577ead595 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@rueg.eu>
+Date: Fri, 16 Jun 2017 10:11:36 +0200
+Subject: [PATCH] Respect LDFLAGS, minor other improvements
+
+---
+ Makefile.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f9bff30..969a16f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,8 @@ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ mandir = @mandir@
+ LIBS = @LIBS@
+-CFLAGS  = @CFLAGS@ -O -Wall
++CC = @CC@
++CFLAGS  = @CFLAGS@ -Wall
+ LDFLAGS = @LDFLAGS@
+ VERSION = `git tag | tail -1 | sed -e 's/v//'`
+ 
+@@ -22,13 +23,13 @@ MAN  = pgpdump.1
+ CNF = config.h config.status config.cache config.log
+ MKF = Makefile
+ 
+-.c.o:
++%.o : %.c
+ 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+ 
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LIBS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
+ 
+ clean:
+ 	$(RM) $(OBJS) $(PROG)
+-- 
+2.13.1
+
diff --git a/app-crypt/pgpdump/metadata.xml b/app-crypt/pgpdump/metadata.xml
new file mode 100644
index 000000000000..1b2becffa26c
--- /dev/null
+++ b/app-crypt/pgpdump/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/pgpdump/pgpdump-0.30.ebuild b/app-crypt/pgpdump/pgpdump-0.30.ebuild
new file mode 100644
index 000000000000..5f0612e01748
--- /dev/null
+++ b/app-crypt/pgpdump/pgpdump-0.30.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A PGP packet visualizer"
+HOMEPAGE="http://www.mew.org/~kazu/proj/pgpdump/"
+SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.28-respect-ldflags.patch
+}
+
+src_install() {
+	dobin pgpdump
+	doman pgpdump.1
+	dodoc CHANGES README.md
+}
diff --git a/app-crypt/pgpdump/pgpdump-0.32.ebuild b/app-crypt/pgpdump/pgpdump-0.32.ebuild
new file mode 100644
index 000000000000..13720556f1ed
--- /dev/null
+++ b/app-crypt/pgpdump/pgpdump-0.32.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A PGP packet visualizer"
+HOMEPAGE="http://www.mew.org/~kazu/proj/pgpdump/"
+SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.32-respect-ldflags.patch
+)
+
+src_install() {
+	dobin pgpdump
+	doman pgpdump.1
+	dodoc CHANGES README.md
+}
diff --git a/app-crypt/pgpdump/pgpdump-0.33.ebuild b/app-crypt/pgpdump/pgpdump-0.33.ebuild
new file mode 100644
index 000000000000..38fcf5506fc8
--- /dev/null
+++ b/app-crypt/pgpdump/pgpdump-0.33.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A PGP packet visualizer"
+HOMEPAGE="http://www.mew.org/~kazu/proj/pgpdump/"
+SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.32-respect-ldflags.patch
+)
+
+src_install() {
+	dobin pgpdump
+	doman pgpdump.1
+	dodoc CHANGES README.md
+}
diff --git a/app-crypt/pinentry-1.0.0-r2 b/app-crypt/pinentry-1.0.0-r2
deleted file mode 100644
index 99f2394fdf26..000000000000
--- a/app-crypt/pinentry-1.0.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
-EAPI=6
-HOMEPAGE=https://gnupg.org/aegypten2/index.html
-IUSE=caps emacs gnome-keyring gtk ncurses qt5 static
-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
-LICENSE=GPL-2
-RDEPEND=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] ) gnome-keyring? ( app-crypt/gcr )
-REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
-SLOT=0
-SRC_URI=mirror://gnupg/pinentry/pinentry-1.0.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=827e7d4de6ac59f9cd103078fa7f0687
diff --git a/app-crypt/pinentry-1.0.0-r3 b/app-crypt/pinentry-1.0.0-r3
deleted file mode 100644
index b1dc17df259a..000000000000
--- a/app-crypt/pinentry-1.0.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
-EAPI=6
-HOMEPAGE=https://gnupg.org/aegypten2/index.html
-IUSE=caps emacs gnome-keyring gtk ncurses qt5 static
-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
-LICENSE=GPL-2
-RDEPEND=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] ) gnome-keyring? ( app-crypt/gcr )
-REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
-SLOT=0
-SRC_URI=mirror://gnupg/pinentry/pinentry-1.0.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c349cc11f6589ff5fe93f15efe55f2ab
diff --git a/app-crypt/pinentry-1.1.0-r1 b/app-crypt/pinentry-1.1.0-r1
deleted file mode 100644
index c26f97ee4f26..000000000000
--- a/app-crypt/pinentry-1.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
-EAPI=6
-HOMEPAGE=https://gnupg.org/aegypten2/index.html
-IUSE=caps emacs gnome-keyring gtk ncurses qt5 static
-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
-LICENSE=GPL-2
-RDEPEND=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] ) gnome-keyring? ( app-crypt/gcr )
-REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
-SLOT=0
-SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7df7303c767e57d353c43d1ed63fe72b
diff --git a/app-crypt/pinentry-1.1.0-r2 b/app-crypt/pinentry-1.1.0-r2
deleted file mode 100644
index 420535a771c9..000000000000
--- a/app-crypt/pinentry-1.1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
-EAPI=6
-HOMEPAGE=https://gnupg.org/aegypten2/index.html
-IUSE=caps emacs gnome-keyring fltk gtk ncurses qt5 static
-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
-LICENSE=GPL-2
-RDEPEND=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] ) gnome-keyring? ( app-crypt/gcr )
-REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
-SLOT=0
-SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17195501c433b19dcdc518dd5faaf6ab
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
new file mode 100644
index 000000000000..8b99dd4504bc
--- /dev/null
+++ b/app-crypt/pinentry/Manifest
@@ -0,0 +1,12 @@
+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-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 2885 BLAKE2B 2338a3aaff93a76c8a2e6d621cfd011447f81eb21a5d957468504f4d4c2e77a7acf71c6c80ed8babb9f20879e603a87ffd3e3b88ef706cd06f70a9ec204cb38e SHA512 252e068bd96c9a9c406ba358a69e7f6b9ef6875072236a3cf13995a27524903f2bae1860c65ced27d2ffd532e8797a3ed8cbb180a76e80f2442d56f02010929a
+EBUILD pinentry-1.0.0-r3.ebuild 2958 BLAKE2B 350c3f20934857f72ce46dad5d8a047f5b04c10dbf4f398e346a5b1339a81fa1263296859a240fe717970840ed81b2f271a902d3e26b5d93f108bbdf3117cc20 SHA512 10c088dd6cd0efab43430856615cd795986c127765fbb47c0d324085aac9474da85bd317a8ec23aecc05fafba19f14392ccbf59b1820590223be0eb57855a2a6
+EBUILD pinentry-1.1.0-r1.ebuild 2809 BLAKE2B b67fe9e2549179f6a035e7b47a2a5041e97e2924c381a66f889d656176c1ee464ab023297801f7f0442390565f5697f2e5fb67a54d7a4c3cfb8f5a4aeae23288 SHA512 e27748277d88402c8c46251ab95f7852fc6ff0499b00823cc1a980ebc222568acf6c31d6ebe92a29b414aba0a6f1796679b43ec279e36bd423183a1a25431411
+EBUILD pinentry-1.1.0-r2.ebuild 2876 BLAKE2B 00a80e0c23694d45c5ac529e086934f1ce28be2c46594171d6de17a2eeb7904df1ab031f4ba4c76d00e61944d229feabf204643ceb5a806b98c56566e262096c SHA512 9eccbd9d41ebf030ad823fa66f25509b6f68b29c5ea85a772453dd81a86c35d0734fbdb4b1d24970a7d0e3851dedd9357bf0c804d3f3987f7f34eab86674f923
+MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch b/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
new file mode 100644
index 000000000000..3bb92c63d00c
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
@@ -0,0 +1,25 @@
+From bafe8608fc525ef103b3d1f3048ca28958bef596 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 5 May 2013 02:23:08 +0300
+Subject: [PATCH] ncurses: link with optional tinfo
+
+---
+ m4/curses.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/m4/curses.m4 b/m4/curses.m4
+index 3a01881..ffb6bd1 100644
+--- a/m4/curses.m4
++++ b/m4/curses.m4
+@@ -36,6 +36,8 @@ AC_DEFUN([IU_LIB_NCURSES], [
+       have_ncursesw=no
+     fi
+     if test "$LIBNCURSES"; then
++      AC_CHECK_LIB(tinfow, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfow",
++        AC_CHECK_LIB(tinfo, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfo"))
+       # Use ncurses header files instead of the ordinary ones, if possible;
+       # is there a better way of doing this, that avoids looking in specific
+       # directories?
+-- 
+1.8.1.5
+
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
new file mode 100644
index 000000000000..7724d1beae8c
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 000000000000..e367b8566450
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.0.0-build.patch
@@ -0,0 +1,218 @@
+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
new file mode 100644
index 000000000000..f7476de1ff67
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch
@@ -0,0 +1,47 @@
+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/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/metadata.xml b/app-crypt/pinentry/metadata.xml
new file mode 100644
index 000000000000..46f4637bdd41
--- /dev/null
+++ b/app-crypt/pinentry/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..84e0c01de1e3
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -0,0 +1,102 @@
+# 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"
+)
+
+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
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/pinentry/pinentry-1.1.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..cf2bbd6858a8
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild
@@ -0,0 +1,100 @@
+# 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}-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
new file mode 100644
index 000000000000..5b9da6b3a473
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
@@ -0,0 +1,102 @@
+# 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 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/pius-2.2.4 b/app-crypt/pius-2.2.4
deleted file mode 100644
index f95b85fdcaad..000000000000
--- a/app-crypt/pius-2.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-crypt/gnupg-2.0.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A tool for signing and email all UIDs on a set of PGP keys
-EAPI=6
-HOMEPAGE=https://www.phildev.net/pius/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gnupg-2.0.0 dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/jaymzh/pius/releases/download/v2.2.4/pius-2.2.4.tar.bz2
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b1b9832a52170dc05f12f9ad4b33b8d
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
new file mode 100644
index 000000000000..3b42343f0764
--- /dev/null
+++ b/app-crypt/pius/Manifest
@@ -0,0 +1,3 @@
+DIST pius-2.2.4.tar.bz2 40578 BLAKE2B e7989631813658ff888c72b825269482ff33296abf0b9780ecb24df4628c499087a7591372ef96449b4899b1bcd730b0c75411bcd3c8839c57d3d4b5de374862 SHA512 3a178d30d98d0ed7ddf6819578a54ccfb9719f77c1f6385e3b254e28cd890817f328685c02cc464d4d592961c28ba314ca3175056b412dcdb301b851d874eb60
+EBUILD pius-2.2.4.ebuild 491 BLAKE2B 61ece77e1bb6e0112561fa0cd104e855e0cbdfdbe2880d99454ffa8c44848dce2cfa7e162622ff86c38314c8bf2bcd1ef25ae62a744486aa68677302dfcb9906 SHA512 562dceeaa4fdaa16cbaa34f5e86db4c827d713048f3799746a988f9b10530e0b5a3431435d419aeb0485ac7da98f5b29eb5193b550de74a0ef2e94e1fb86e34b
+MISC metadata.xml 689 BLAKE2B 40ea626d106920eaf8d0e2ae15637e54f9f81933c222b058834f69e9ec1cef52c634fb176f1a6b8d48f4c0f664092cfcf2ee1f58bdec84f591410323eb0a4914 SHA512 77e117dc545213fdc376935a62d22a0b1db1aaa05fc5fc6ae83e0ffba49693411a451485c519c1bf1a17a829833a90d78472754600ed4dd5f779a772cc480218
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
new file mode 100644
index 000000000000..168be220f27a
--- /dev/null
+++ b/app-crypt/pius/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<longdescription lang="en">
+		The PGP Individual UID Signer (PIUS) is a tool for individually
+		signing all of the UIDs on a set of keys and encrypt-emailing each
+		one to it's respective email address. This drastically reduces the time
+		and errors involved in signing keys after a keysigning party.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pgpius</remote-id>
+		<remote-id type="github">jaymzh/pius</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/pius/pius-2.2.4.ebuild b/app-crypt/pius/pius-2.2.4.ebuild
new file mode 100644
index 000000000000..927947b3642a
--- /dev/null
+++ b/app-crypt/pius/pius-2.2.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
+HOMEPAGE="https://www.phildev.net/pius/"
+SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=app-crypt/gnupg-2.0.0"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
diff --git a/app-crypt/pkcrack-1.2.2-r1 b/app-crypt/pkcrack-1.2.2-r1
deleted file mode 100644
index 4b8775e75dca..000000000000
--- a/app-crypt/pkcrack-1.2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DEPEND=test? ( app-arch/zip[crypt] )
-DESCRIPTION=PkZip cipher breaker
-EAPI=6
-HOMEPAGE=https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=pkcrack
-RDEPEND=!<app-text/html-xml-utils-5.3
-SLOT=0
-SRC_URI=https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-1.2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3397644a56101ac90c6fdab69fefe1d8
diff --git a/app-crypt/pkcrack/Manifest b/app-crypt/pkcrack/Manifest
new file mode 100644
index 000000000000..d3072f582553
--- /dev/null
+++ b/app-crypt/pkcrack/Manifest
@@ -0,0 +1,3 @@
+DIST pkcrack-1.2.2.tar.gz 174208 BLAKE2B fed476a9d681bb9e565d05ef636f58d6643c4f8897725c56b66e64123e9435f9bf28e550f0249794e81e9f968683ab81c19baa1ee51478e1b91509e8e318725a SHA512 5c64fb9ae09dedc70fb20cd689f432059fcd64f689072b529b4045c3241760fee273ee921da081bc08be2e0594d27101c5d89d99cb2b84e16f80c011419b7200
+EBUILD pkcrack-1.2.2-r1.ebuild 1108 BLAKE2B 4aea9ef44695b89bf44baa0a795689e479610a308e34ba7a92a8d6dadfaf90acd76c5a44fc39c06b414bf571be6c67f81ace4c2b0ec1436ef75852b8ab231ce2 SHA512 1dd51a17e71b6f47fa04561f1235bc5628a77132a88812283b26a51593d6048d68cda2ba139af2ed9f08f9f8bb2e041f3bf5c7beecb9da5f4a9aabcaa2b91f57
+MISC metadata.xml 370 BLAKE2B 1d584e6fa52911c3d0f099c44193eeb00261e2f46f99dd2924744e9f4ce4af84bddc72b85415f85e3ca5ad11612914bcc022e494b9c4c00a5e95f8c1b5f1d72d SHA512 39a268538a1a2d5932b5295c4727c8769e4648cb94905ccead6b3941a7e8752b3992403f7623497267334f697478dc0db355e42bf2857b415f8ae06baa99d492
diff --git a/app-crypt/pkcrack/metadata.xml b/app-crypt/pkcrack/metadata.xml
new file mode 100644
index 000000000000..2507c03b02ab
--- /dev/null
+++ b/app-crypt/pkcrack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+<longdescription>
+pkcrack is a password cracking program for zip files. It works using a plain text cipher attack.
+</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..251eb649d276
--- /dev/null
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit toolchain-funcs
+
+DESCRIPTION="PkZip cipher breaker"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html"
+SRC_URI="https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/${P}.tar.gz"
+
+LICENSE="pkcrack"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+DEPEND="test? ( app-arch/zip[crypt] )"
+RDEPEND="!<app-text/html-xml-utils-5.3"
+
+DOCS=(
+	../doc/KNOWN_BUGS
+	../doc/appnote.iz.txt
+	../doc/README.W32
+	../doc/pkzip.ps.gz
+	../doc/CHANGES
+	../doc/LIESMICH
+	../doc/README.html
+	../doc/README
+)
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	default
+	sed -i -e "s/^CC=.*/CC=$(tc-getCC)/" \
+		-e "/^CFLAGS=.*/d" \
+		-e "s/CFLAGS/LDFLAGS/" \
+		Makefile
+	sed -i -e "s:void main:int main:" *.c
+}
+
+src_test() {
+	cd "${S}/../test"
+	make CC="$(tc-getCC)" all
+}
+
+src_install() {
+	einstalldocs
+	dobin pkcrack zipdecrypt findkey makekey
+	newbin extract "$PN-extract"
+}
+
+pkg_postinst() {
+	ewarn "Due to file collision, extract utility was renamed to $PN-extract,"
+	ewarn "see bug#247394"
+}
diff --git a/app-crypt/pkcs11-data-0.7.4 b/app-crypt/pkcs11-data-0.7.4
deleted file mode 100644
index 635d7a1dd277..000000000000
--- a/app-crypt/pkcs11-data-0.7.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/pkcs11-helper-1.02 virtual/pkgconfig
-DESCRIPTION=Utilities for PKCS#11 data object manipulation in
-EAPI=6
-HOMEPAGE=https://github.com/alonbl/pkcs11-data
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/pkcs11-helper-1.02
-SLOT=0
-SRC_URI=https://github.com/alonbl/pkcs11-data/releases/download/pkcs11-data-0.7.4/pkcs11-data-0.7.4.tar.bz2
-_md5_=2b2dc67bafca60f8367d9df8b82de3d7
diff --git a/app-crypt/pkcs11-data/Manifest b/app-crypt/pkcs11-data/Manifest
new file mode 100644
index 000000000000..b96796569f24
--- /dev/null
+++ b/app-crypt/pkcs11-data/Manifest
@@ -0,0 +1,3 @@
+DIST pkcs11-data-0.7.4.tar.bz2 226267 BLAKE2B d9390dbbf465e4ac945d5a5ed0d11ab538da269fed871a21b122e395c1080f9a1acf4eaea072e422a62b043d546d6a7c130f3c67ab07b953d3cbdc469142a3bd SHA512 79b13cbb7dbcb8a35c46e8de79d31e51e53a4e75783c3bef28a0d1aa8176db869a0bf984e516d21567619a7f8ea9206ac9ab5ee81672d9ae2a89efe713cfc46c
+EBUILD pkcs11-data-0.7.4.ebuild 441 BLAKE2B b1a1109448bf099d544eb4ac66ebf47a7fef9e42ec86689558218b06360758b954f779989bdfc107a0098e2cd5b3c20ecd9cc15b08a1096b6b02cb86a7675a3b SHA512 d6a93b46ffcec8583238e9abfbe830711381217fc7aebd1405b2f33444a361f7106c2e935c452c1b4ba3b24131cbe960ab4585442848b3461dc55ed334cca1f7
+MISC metadata.xml 380 BLAKE2B 396f8b58abe666f74fd4f00945406e8d583aa2e842b36d77e6afe683a2b4cb31b6a2af61c24b23d8541c626752192254373a19d67d5106c0f326f4573f0a6f4b SHA512 a449e49c644a6b4dd3758dd3f495a4fe4e7b0fba7c4e21250f13868b758a9642e8062adf1a29ac54fcf8211d38071724c489e25ac7078f4100f31e9adb0d98d1
diff --git a/app-crypt/pkcs11-data/metadata.xml b/app-crypt/pkcs11-data/metadata.xml
new file mode 100644
index 000000000000..47f64b59a7b3
--- /dev/null
+++ b/app-crypt/pkcs11-data/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">pkcs11-tools</remote-id>
+		<remote-id type="github">alonbl/pkcs11-data</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild b/app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild
new file mode 100644
index 000000000000..2a9e79a40f44
--- /dev/null
+++ b/app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utilities for PKCS#11 data object manipulation in"
+HOMEPAGE="https://github.com/alonbl/pkcs11-data"
+SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=">=dev-libs/pkcs11-helper-1.02"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-crypt/pkcs11-dump-0.3.4 b/app-crypt/pkcs11-dump-0.3.4
deleted file mode 100644
index 7511d8ec6850..000000000000
--- a/app-crypt/pkcs11-dump-0.3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/pkgconfig
-DESCRIPTION=Utilities for PKCS#11 token content dump
-EAPI=6
-HOMEPAGE=https://github.com/alonbl/pkcs11-dump
-IUSE=libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/alonbl/pkcs11-dump/releases/download/pkcs11-dump-0.3.4/pkcs11-dump-0.3.4.tar.bz2
-_md5_=17f85429352ff22bc88217c4a635c1e9
diff --git a/app-crypt/pkcs11-dump/Manifest b/app-crypt/pkcs11-dump/Manifest
new file mode 100644
index 000000000000..7f3a0683b17c
--- /dev/null
+++ b/app-crypt/pkcs11-dump/Manifest
@@ -0,0 +1,3 @@
+DIST pkcs11-dump-0.3.4.tar.bz2 255715 BLAKE2B 61545d1b929f47799fa1c3f2591b245b7dadf70df786d7c3574109e66cab407449ec158e2bf29fcdce2238bc316029293ee9f37586367da971f1a8aa777bc015 SHA512 b38dbe8d7b04d7227592c90f6de815da7a030014df2f5f18d8c81587a742c587424a0eea3a1c8ec6e5c8c8f6dccc144130b91c57bef3d5882ee161629a97781b
+EBUILD pkcs11-dump-0.3.4.ebuild 483 BLAKE2B 478068160f0552d802880d90401fb6e26ab2c595fdbaf83f136854f6f7b497e41c3b143d116589be317e8ff157ce0194830a90bbe356ed4bf95b3bbee029fe73 SHA512 e424bdb77f9353b62bd58a3e6271f6945c34ebca82d3ffe9c9c3b3bc5242daa54f1b7d2acfeea55d760b71f374a4fa16d008250e030066ad7acc0978818f1054
+MISC metadata.xml 380 BLAKE2B 0484e6749f0e9d27b41d0563f83c2b914ecc408621c507871dc9fb782cc4bcb0c6a09dacf4122db06a852ef5b2d284ec591779a1cff7bc75b169560b726d29f8 SHA512 158f5682664a88638cef415bb42b780b27142b9ef9f3ce182b83330bfa922dda8935d137e6f50f8150905b6ecf66103cfde7be3cfff0f111766e55e8ad5830c6
diff --git a/app-crypt/pkcs11-dump/metadata.xml b/app-crypt/pkcs11-dump/metadata.xml
new file mode 100644
index 000000000000..c34b4e770775
--- /dev/null
+++ b/app-crypt/pkcs11-dump/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">pkcs11-tools</remote-id>
+		<remote-id type="github">alonbl/pkcs11-dump</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild b/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild
new file mode 100644
index 000000000000..183662606ba5
--- /dev/null
+++ b/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utilities for PKCS#11 token content dump"
+HOMEPAGE="https://github.com/alonbl/pkcs11-dump"
+SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-crypt/qca-2.1.3-r2 b/app-crypt/qca-2.1.3-r2
deleted file mode 100644
index 3833c54f5b7a..000000000000
--- a/app-crypt/qca-2.1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-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:= ) ) doc? ( app-doc/doxygen ) test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt Cryptographic Architecture (QCA)
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/QCA
-IUSE=botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=LGPL-2.1
-RDEPEND=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:= ) ) !app-crypt/qca-cyrus-sasl !app-crypt/qca-gnupg !app-crypt/qca-logger !app-crypt/qca-ossl !app-crypt/qca-pkcs11
-SLOT=2
-SRC_URI=mirror://kde/stable/qca/2.1.3/src/qca-2.1.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8727e469a476712aa4c4d9499c33f3dd
diff --git a/app-crypt/qca-2.2.0_pre20180606 b/app-crypt/qca-2.2.0_pre20180606
deleted file mode 100644
index 2a798d1dc983..000000000000
--- a/app-crypt/qca-2.2.0_pre20180606
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) 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:= ) ) doc? ( app-doc/doxygen ) test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt Cryptographic Architecture (QCA)
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/QCA
-IUSE=botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) 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:= ) )
-SLOT=2
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qca-2.2.0_pre20180606.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80ced1181c2daef1fd07885072f8be45
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
new file mode 100644
index 000000000000..41cc66a16e24
--- /dev/null
+++ b/app-crypt/qca/Manifest
@@ -0,0 +1,8 @@
+AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb425d83bebf78bc0141411bd447223562c920aea80765811084360fbc964afb7841291081f80cc94060070b2 SHA512 605a602d184c86426d6d875954ad2cb3bee19252ce56e6581df7574a3e324f97ccfcb919fef32f6ff8a393683b8375d97586ed886ae01d87fbe015f2f83f0e3b
+AUX qca-2.1.3-deps.patch 1040 BLAKE2B 4bf0179bf2383328dd97f365c433ee40a87e465b8c0b5396d4cfde07f27a4aedfa2d229900e630606fc43e5a5a35042ffce999f59401c34439e656b0b6f1bf0e SHA512 e20a3a06fef8415287d8837ea5fa2acf3ef60f8a1da6aec7c994987f63336e52ac2460fa76694b82b59f30aa1d59cd22decac246423adbef8ae1658a7f7db78f
+AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
+DIST qca-2.1.3.tar.xz 686340 BLAKE2B 60ebf9add907632ed17426ee53c6c35a9aed279a4492012f1c174608cbe9579d366feb7ff7bff551d2e9e4ef2f271e8f340fcb4c9e1f67f209657d388567d44f SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
+DIST qca-2.2.0_pre20180606.tar.xz 700756 BLAKE2B 0204854a664f211e9289cd4609938fd21e62de5bec5d7f5a99843a12483c960b6f8cc7392dc84bcf0676220411106bf7f23c5059d4f7031791fe9a3259d21d2c SHA512 78f9f8ebc726e95768034c580d5ac30933f7c06e026b7daad04f11477dc623e4267895e409f7830c5149e620876dcc524278ef569956d03820b0864d629c4df8
+EBUILD qca-2.1.3-r2.ebuild 2180 BLAKE2B a74a2d7378bad48e8ad20c30ae91416b79e6f79393566e499a7821cf6fc904f6966c36751b285da4320da5a541fefadaf35df6df192ec4338dfc363323e20469 SHA512 ebca007f517945d9f26ca4fba9536418371013764c95f668774da8f23c1dce722ae1954e2e5505ea5b87446576ac757e2248f829ca515db7249c97d28e0d83b1
+EBUILD qca-2.2.0_pre20180606.ebuild 1967 BLAKE2B b67db5ec495c8bb1af48f65d2dd5b548f6a598b14be80c5691fd57d76a0950071b10d0370e1050c718ca7431c84bb48b6942b32b544f2912e90b1f867854eccf SHA512 4fdbe6f37d91bb2780d48fe720aa9356148965ca5f83085e63be54e46f4d5e30a3d7a150348a2b96528bdc0385b98136d1f405e74aef5c62cfd81c4b80eeef2c
+MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/files/qca-2.1.3-c++11.patch b/app-crypt/qca/files/qca-2.1.3-c++11.patch
new file mode 100644
index 000000000000..a12f96bfcf4a
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.3-c++11.patch
@@ -0,0 +1,97 @@
+From 5f18ebc705ec98e883aa63cb537e36e6a08b7e34 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 21 Mar 2017 12:23:17 +0200
+Subject: [PATCH] build: fix C++11 throwing distructors
+
+For >=C++11, explicitly mark throwing destructors `noexcept(false)`
+
+Thanks: Peter-Levine <plevine457@gmail.com>
+---
+ Doxyfile.in                                  | 2 +-
+ src/botantools/botan/alloc_mmap/mmap_mem.cpp | 2 +-
+ src/botantools/botan/botan/allocate.h        | 8 +++++++-
+ src/botantools/botan/botan/mem_pool.h        | 2 +-
+ src/botantools/botan/mem_pool.cpp            | 2 +-
+ 5 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/Doxyfile.in b/Doxyfile.in
+index 59d9afe..844c234 100644
+--- a/Doxyfile.in
++++ b/Doxyfile.in
+@@ -1070,7 +1070,7 @@ PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
+ # The macro definition that is found in the sources will be used. 
+ # Use the PREDEFINED tag if you want to use a different macro definition.
+ 
+-EXPAND_AS_DEFINED      = QCA_EXPORT
++EXPAND_AS_DEFINED      = QCA_EXPORT QCA_NOEXCEPT
+ 
+ # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+ # doxygen's preprocessor will remove all function-like macros that are alone 
+diff --git a/src/botantools/botan/alloc_mmap/mmap_mem.cpp b/src/botantools/botan/alloc_mmap/mmap_mem.cpp
+index 362b688..54f0d23 100644
+--- a/src/botantools/botan/alloc_mmap/mmap_mem.cpp
++++ b/src/botantools/botan/alloc_mmap/mmap_mem.cpp
+@@ -107,7 +107,7 @@ void* MemoryMapping_Allocator::alloc_block(u32bit n)
+             umask(old_umask);
+             }
+ 
+-         ~TemporaryFile()
++         ~TemporaryFile() QCA_NOEXCEPT(false)
+             {
+             delete[] filepath;
+             if(fd != -1 && close(fd) == -1)
+diff --git a/src/botantools/botan/botan/allocate.h b/src/botantools/botan/botan/allocate.h
+index 0ac351e..52bc397 100644
+--- a/src/botantools/botan/botan/allocate.h
++++ b/src/botantools/botan/botan/allocate.h
+@@ -40,6 +40,12 @@ namespace QCA { // WRAPNS_LINE
+ #include <string>
+ namespace QCA { // WRAPNS_LINE
+ 
++#if __cplusplus >= 201103L
++#define QCA_NOEXCEPT(x) noexcept(x)
++#else
++#define QCA_NOEXCEPT(x)
++#endif
++
+ namespace Botan {
+ 
+ /*************************************************
+@@ -58,7 +64,7 @@ class Allocator
+       virtual void init() {}
+       virtual void destroy() {}
+ 
+-      virtual ~Allocator() {}
++      virtual ~Allocator() QCA_NOEXCEPT(false) {}
+    };
+ 
+ /*************************************************
+diff --git a/src/botantools/botan/botan/mem_pool.h b/src/botantools/botan/botan/mem_pool.h
+index 32834b8..1cb903e 100644
+--- a/src/botantools/botan/botan/mem_pool.h
++++ b/src/botantools/botan/botan/mem_pool.h
+@@ -63,7 +63,7 @@ class Pooling_Allocator : public Allocator
+       void destroy();
+ 
+       Pooling_Allocator(u32bit, bool);
+-      ~Pooling_Allocator();
++      ~Pooling_Allocator() QCA_NOEXCEPT(false);
+    private:
+       void get_more_core(u32bit);
+       byte* allocate_blocks(u32bit);
+diff --git a/src/botantools/botan/mem_pool.cpp b/src/botantools/botan/mem_pool.cpp
+index 00280ec..baa47aa 100644
+--- a/src/botantools/botan/mem_pool.cpp
++++ b/src/botantools/botan/mem_pool.cpp
+@@ -171,7 +171,7 @@ Pooling_Allocator::Pooling_Allocator(u32bit p_size, bool) :
+ /*************************************************
+ * Pooling_Allocator Destructor                   *
+ *************************************************/
+-Pooling_Allocator::~Pooling_Allocator()
++Pooling_Allocator::~Pooling_Allocator() QCA_NOEXCEPT(false)
+    {
+    delete mutex;
+    if(blocks.size())
+-- 
+2.10.2
+
diff --git a/app-crypt/qca/files/qca-2.1.3-deps.patch b/app-crypt/qca/files/qca-2.1.3-deps.patch
new file mode 100644
index 000000000000..e1ef2e5c0e7e
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.3-deps.patch
@@ -0,0 +1,38 @@
+From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 12 Apr 2018 00:45:50 +0200
+Subject: [PATCH] Make Qt5Network conditional on BUILD_TESTS
+
+Summary: I did not find it in use somewhere else.
+
+Reviewers: iromanov, sitter, rjvbb
+
+Reviewed By: rjvbb
+
+Subscribers: fvogt
+
+Differential Revision: https://phabricator.kde.org/D12129
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28b0169..65b95f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,11 @@ if (Qt5Core_FOUND)
+   message(STATUS "Building with Qt5 support")
+   # Got from ECM
+   # Distros have no ECM. So I just copied required cmake modules.
+-  find_package(Qt5Transitional REQUIRED Core Network)
++  if(BUILD_TESTS)
++    find_package(Qt5Transitional REQUIRED Core Network)
++  else()
++    find_package(Qt5Transitional REQUIRED Core)
++  endif()
+   include(ECMQt4To5Porting)
+ 
+   include(GNUInstallDirs)
+-- 
+2.17.1
+
diff --git a/app-crypt/qca/files/qca-disable-pgp-test.patch b/app-crypt/qca/files/qca-disable-pgp-test.patch
new file mode 100644
index 000000000000..7944e3c358ea
--- /dev/null
+++ b/app-crypt/qca/files/qca-disable-pgp-test.patch
@@ -0,0 +1,13 @@
+diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
+index f4d9eb9..67ef281 100644
+--- a/unittest/CMakeLists.txt
++++ b/unittest/CMakeLists.txt
+@@ -23,7 +23,7 @@ add_subdirectory(keylengthunittest)
+ add_subdirectory(keystore)
+ add_subdirectory(macunittest)
+ add_subdirectory(metatype)
+-add_subdirectory(pgpunittest)
++# add_subdirectory(pgpunittest)
+ add_subdirectory(pipeunittest)
+ add_subdirectory(pkits)
+ add_subdirectory(rsaunittest)
diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
new file mode 100644
index 000000000000..dff1320aa6b8
--- /dev/null
+++ b/app-crypt/qca/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+<maintainer type="project">
+	<email>qt@gentoo.org</email>
+	<name>Gentoo Qt Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<use>
+	<flag name="botan">Enable botan plugin</flag>
+	<flag name="gcrypt">Enable gcrypt plugin</flag>
+	<flag name="gpg">Enable GnuPG plugin</flag>
+	<flag name="logger">Enable logger plugin</flag>
+	<flag name="nss">Enable NSS plugin</flag>
+	<flag name="pkcs11">Enable PKCS#11 plugin</flag>
+	<flag name="sasl">Enable SASL plugin</flag>
+	<flag name="softstore">Enable softstore plugin</flag>
+</use>
+</pkgmetadata>
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..a1d5bbb0df5f
--- /dev/null
+++ b/app-crypt/qca/qca-2.1.3-r2.ebuild
@@ -0,0 +1,96 @@
+# 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}
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-qt/qtnetwork:5
+		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"
+	"${FILESDIR}/${P}-deps.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 || die
+		dodoc -r apidocs/html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-crypt/qca/qca-2.2.0_pre20180606.ebuild b/app-crypt/qca/qca-2.2.0_pre20180606.ebuild
new file mode 100644
index 000000000000..3ed99ba69006
--- /dev/null
+++ b/app-crypt/qca/qca-2.2.0_pre20180606.ebuild
@@ -0,0 +1,85 @@
+# 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="https://dev.gentoo.org/~asturm/distfiles/${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"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	botan? ( dev-libs/botan:= )
+	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="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.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 || die
+		dodoc -r apidocs/html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-crypt/quickcrypt-0.9.2b-r1 b/app-crypt/quickcrypt-0.9.2b-r1
deleted file mode 100644
index 72c0cde9358a..000000000000
--- a/app-crypt/quickcrypt-0.9.2b-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/perl-5.6 virtual/perl-Digest-MD5
-DESCRIPTION=gives you a quick MD5 Password from any string
-EAPI=6
-HOMEPAGE=http://linux.netpimpz.com/quickcrypt/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6 virtual/perl-Digest-MD5
-SLOT=0
-SRC_URI=http://linux.netpimpz.com/quickcrypt/download/quickcrypt_0.9.2b.tar.gz
-_md5_=7a6d08f810aa71fae7f4d92498684ab6
diff --git a/app-crypt/quickcrypt/Manifest b/app-crypt/quickcrypt/Manifest
new file mode 100644
index 000000000000..a0b622012734
--- /dev/null
+++ b/app-crypt/quickcrypt/Manifest
@@ -0,0 +1,3 @@
+DIST quickcrypt_0.9.2b.tar.gz 2927 BLAKE2B ee5593ef6ee4f2b48b08713f98616220ab9170cf36ad8664fd9fadcbcdcb64ba9cc33689e9b5e79ec67493a5728de24a6cc9b86a2ff1e579b9a4c77f0ad177e7 SHA512 7b0efbe5aaf9f878233885470ed053124dd3c14fe2630902517388f3ecefda1bc89f3ec9a7edd6d7582f4108bfebf421d593f4b37ed66a7692e955c65003523e
+EBUILD quickcrypt-0.9.2b-r1.ebuild 570 BLAKE2B 7179cf5dd1e4b9c03dcd121bdadf37a8d340ff7415ba48183cab173938bbf9b5e8264b17698a72a369ce819e49a62af71e97c65f48010e4bc14d6978f7dbc16a SHA512 7b715127b94b8c21823e820dd06a2e917b7efa67802bf8217bda2cfa493c6a4303e8fc0ffe98a854e628f7ea2f28a3ba5f2c6ef09807cacfc0a8a23595d1730d
+MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/app-crypt/quickcrypt/metadata.xml b/app-crypt/quickcrypt/metadata.xml
new file mode 100644
index 000000000000..4f6e28828f65
--- /dev/null
+++ b/app-crypt/quickcrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
new file mode 100644
index 000000000000..0714052cedd3
--- /dev/null
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P=${P/-/_}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="gives you a quick MD5 Password from any string"
+HOMEPAGE="http://linux.netpimpz.com/quickcrypt/"
+SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6
+	virtual/perl-Digest-MD5"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	README BUGS
+)
+
+src_install() {
+	einstalldocs
+	dobin quickcrypt
+}
diff --git a/app-crypt/rainbowcrack-1.6.1 b/app-crypt/rainbowcrack-1.6.1
deleted file mode 100644
index 59c8232f8596..000000000000
--- a/app-crypt/rainbowcrack-1.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Hash cracker that precomputes plaintext - ciphertext pairs in advance
-EAPI=6
-HOMEPAGE=http://project-rainbowcrack.com/
-KEYWORDS=~amd64 ~x86 -*
-LICENSE=all-rights-reserved
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( http://project-rainbowcrack.com/rainbowcrack-1.6.1-linux64.zip ) x86? ( http://project-rainbowcrack.com/rainbowcrack-1.6.1-linux32.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2116de6828e8dabae8308abc3f9babe
diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest
new file mode 100644
index 000000000000..28e8a7253c27
--- /dev/null
+++ b/app-crypt/rainbowcrack/Manifest
@@ -0,0 +1,4 @@
+DIST rainbowcrack-1.6.1-linux32.zip 138833 BLAKE2B 1c4143aa4dcbe644c4d6f436d6624cd9b4b714c2efd95387fe3657251d05c214f2126a7f6f396ddd83eeb8ea83fdf8e758513609b082abee308d94aea5bfbf82 SHA512 0fc163c4a8a875149b479d74fbabbfbb5247b9e621e5362a27a8fb6d5dd64263ce89213b5f5a578ce09018cb2c93f2af51eae954e19fd448c490bcd0524612dd
+DIST rainbowcrack-1.6.1-linux64.zip 134268 BLAKE2B 3c3e8d1a385a3c973839d19a19ce8f16a12540ba2d461197e8363b2feb3380d931728761b3404de9e80b5c6a9df9e51d5463476088cffdc1fbccd5888bb85231 SHA512 6fd5a0356b76ed5e8062888aeb26755588d11aa5dab7fbb54ea92dbeac02e606b082e00b93a44203c158ee620d61c0f9051ecf62b60d8a83c4fca852af22144d
+EBUILD rainbowcrack-1.6.1.ebuild 992 BLAKE2B f5c23426159660edf2dfb0b49e7f7236edf2d21734e11fdbf9d1d1f76362279ef2f87515c4e0dbdf6e9ae50a42a7083bc41a34c172739b93fba148823511e414 SHA512 0844ee7770d748e82d8addae6fa0129f4f56c0ca9d815f442c91db4299161246d284682c966b756c781558a6ce3f29a32c400365021a362c62daf54a066ee08c
+MISC metadata.xml 982 BLAKE2B fbc05af924e12a9682024c9e24cb1c35f84874ad36b11c705a5810cab63f83e3c2abd89e828f231fb82fcf7e672ebaa9511b80fe749274d2b5e4e2ee1add26b8 SHA512 c76947d085f4c322baa8f15112f2e7a64887a025c5871f95f934f52778d0d714061fddbd2a8ed66b31e5cde92045cba77817c708533ba83fab89c9e46d6c8a0c
diff --git a/app-crypt/rainbowcrack/metadata.xml b/app-crypt/rainbowcrack/metadata.xml
new file mode 100644
index 000000000000..dba1a3e1b1d7
--- /dev/null
+++ b/app-crypt/rainbowcrack/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<longdescription>
+		RainbowCrack is a general propose implementation of Philippe Oechslin's faster time-memory trade-off technique.
+		In short, the RainbowCrack tool is a password cracker. A traditional brute force cracker try all possible
+		plaintexts one by one in cracking time. It is time consuming to break complex password in this way. The idea of
+		time-memory trade-off is to do all cracking time computation in advance and store the result in files so called
+		"rainbow table". It does take a long time to precompute the tables. But once the one time precomputation is
+		finished, a time-memory trade-off cracker can be hundreds of times faster than a brute force cracker, with the
+		help of precomputed tables.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
new file mode 100644
index 000000000000..214401f6c347
--- /dev/null
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
+HOMEPAGE="http://project-rainbowcrack.com/"
+SRC_URI="amd64? ( http://project-${PN}.com/${P}-linux64.zip )
+	x86? ( http://project-${PN}.com/${P}-linux32.zip )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -*"
+IUSE=""
+
+RESTRICT="bindist mirror" #444426
+
+RAINBOW_DESTDIR="opt/${PN}"
+
+QA_FLAGS_IGNORED="${RAINBOW_DESTDIR}/.*"
+QA_PRESTRIPPED="${RAINBOW_DESTDIR}/.*"
+
+DEPEND="app-arch/unzip"
+
+DOCS=(
+	readme.txt
+)
+
+src_unpack() {
+	default
+	mv ${P}-linux* "${S}"
+}
+
+src_install() {
+	einstalldocs
+
+	local bin bins="rcrack rt2rtc rtc2rt rtgen rtsort"
+
+	exeinto "/${RAINBOW_DESTDIR}"
+	doexe alglib0.so ${bins}
+
+	for bin in ${bins}; do
+		make_wrapper ${bin} ./${bin} "/${RAINBOW_DESTDIR}" "/${RAINBOW_DESTDIR}"
+	done
+
+	insinto "/${RAINBOW_DESTDIR}"
+	doins charset.txt
+}
diff --git a/app-crypt/rhash-1.3.5 b/app-crypt/rhash-1.3.5
deleted file mode 100644
index 1a4a37d1c33e..000000000000
--- a/app-crypt/rhash-1.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=Console utility and library for computing and verifying file hash sums
-EAPI=6
-HOMEPAGE=http://rhash.anz.ru/
-IUSE=debug nls libressl ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/rhash/rhash-1.3.5-src.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d889018abdcef45fc3ff02b529d49bd4
diff --git a/app-crypt/rhash-1.3.6-r1 b/app-crypt/rhash-1.3.6-r1
deleted file mode 100644
index d98c643e351c..000000000000
--- a/app-crypt/rhash-1.3.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=Console utility and library for computing and verifying file hash sums
-EAPI=6
-HOMEPAGE=http://rhash.anz.ru/
-IUSE=debug nls libressl ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/rhash/rhash-1.3.6-src.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5460f3faee7265c62db57c3b52d7e35d
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
new file mode 100644
index 000000000000..45bccad62707
--- /dev/null
+++ b/app-crypt/rhash/Manifest
@@ -0,0 +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 2696 BLAKE2B bcaedcbbf9641101617be2014b44a0ab0155f856f6382090e7195154e5a15a0709478eaf14ab1e79962da2ae2d9b5fbad7e9ceeee3f344293b678c6a032d7a05 SHA512 2c0553f10b23946c4edc61ef9db1b1f9fc99eed8dff2bbfaca85cf85929aec4c31df308cbafa94dd2c91f86a380933d79ffb5a4b46901dcdc4399272639f759f
+EBUILD rhash-1.3.6-r1.ebuild 1813 BLAKE2B e8093c62235027d5083b7af10c63138d5e39928637c98568d08057292a7fa52474fff68fd6431079b7289fe327320fb44e23af7bea8c7114ccd595412bb6e891 SHA512 04290c4db196edeca5b88a994d83af7e519ffc97a6faad31dea34e233f410f528325d6b1637b83e49789d45937da8331eebb126ad62fd8b537915ff95f664f30
+MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
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/metadata.xml b/app-crypt/rhash/metadata.xml
new file mode 100644
index 000000000000..a6651d883c41
--- /dev/null
+++ b/app-crypt/rhash/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rhash</remote-id>
+		<remote-id type="github">rhash/RHash</remote-id>
+		<bugs-to>https://github.com/rhash/RHash/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		RHash is a console utility for calculation and verification of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1, SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R 34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
new file mode 100644
index 000000000000..b086054c04a1
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -0,0 +1,94 @@
+# 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 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls libressl ssl static-libs"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+)"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/RHash-${PV}"
+
+src_prepare() {
+	default
+
+	# Install /etc stuff inside the Prefix
+	sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die
+
+	if use elibc_Darwin ; then
+		local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)'
+		local install_name='-install_name $(LIBDIR)/$(SONAME)'
+		sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \
+			-e '/^SOLINK/s/\.so/.dylib/' \
+			-e "s:${ver_script}:${install_name}:" \
+			librhash/Makefile \
+			Makefile || die
+	fi
+
+	if use elibc_SunOS ; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=12548
+		# skip the export.sym for now
+		sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local ADDCFLAGS=(
+		$(use debug || echo -DNDEBUG)
+		$(use nls && echo -DUSE_GETTEXT)
+		$(use ssl && echo -DOPENSSL_RUNTIME -rdynamic)
+	)
+
+	local ADDLDFLAGS=(
+		$(use ssl && echo -ldl)
+	)
+
+	use elibc_Darwin || use elibc_DragonFly || use elibc_FreeBSD ||
+		use elibc_NetBSD || use elibc_OpenBSD || use elibc_SunOS &&
+			ADDLDFLAGS+=( $(use nls && echo -lintl) )
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+		  ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \
+		  PREFIX="${EPREFIX}"/usr LIBDIR='$(PREFIX)'/$(get_libdir) \
+		  build-shared $(use static-libs && echo lib-static)
+}
+
+myemake() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr \
+		LIBDIR='$(PREFIX)'/$(get_libdir) SYSCONFDIR="${EPREFIX}"/etc "${@}"
+}
+
+multilib_src_install() {
+	myemake -C librhash install-lib-shared install-so-link
+	multilib_is_native_abi && myemake install-shared
+	use static-libs && myemake install-lib-static
+}
+
+multilib_src_install_all() {
+	myemake -C librhash install-headers
+	use nls && myemake install-gmo
+	einstalldocs
+}
+
+multilib_src_test() {
+	cd tests || die
+	LD_LIBRARY_PATH=$(pwd)/../librhash ./test_rhash.sh --full ../rhash_shared || die "tests failed"
+}
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..24efa6705413
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -0,0 +1,77 @@
+# 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-linux ~x64-solaris ~x86-solaris"
+IUSE="debug nls libressl ssl static-libs"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+)"
+
+DEPEND="${RDEPEND}
+	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 ssl openssl) \
+		$(use_enable static-libs lib-static)
+
+	echo "${@}"
+	"${@}" || die "configure failed"
+}
+
+# We would add compile-gmo to the build targets but install-gmo always
+# recompiles unconditionally. :(
+
+multilib_src_install() {
+	# -j1 needed due to race condition.
+	emake DESTDIR="${D}" -j1 \
+		  install{,-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
+}
diff --git a/app-crypt/rotix-0.83 b/app-crypt/rotix-0.83
deleted file mode 100644
index 544cb048f482..000000000000
--- a/app-crypt/rotix-0.83
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/gettext
-DESCRIPTION=Rotix allows you to generate rotational obfuscations
-EAPI=5
-HOMEPAGE=https://gentoo.org
-KEYWORDS=amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-devel/gettext
-SLOT=0
-SRC_URI=http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/rotix-0.83/rotix-0.83.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85431da29bb193acc18ca7e9979948d1
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
new file mode 100644
index 000000000000..b1022a311f3b
--- /dev/null
+++ b/app-crypt/rotix/Manifest
@@ -0,0 +1,6 @@
+AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb9263142404e495de64c8fa5cca8c1a1b4319a7d677ed930c02a6147e71f90f9a9ff0be4e80049c8540148191df170d7124be62f43c1d2c5515 SHA512 1b1fab8bdcfac682d0927075a0614ae888a1b23382ce8484b2ab9eac316f46a907bbd872615553201c5ccbf1d8f677491612956075bffacced0d408defad9e07
+AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
+AUX rotix-0.83-locale.diff 256 BLAKE2B a7564979a38ff517bbe0592ba12e2aab92c44fc828180c2587ec4b5db3acf4ffbf71feba959625faf93b9fd997d39c9330e4255e8c875bbc1653b66fe140e1c9 SHA512 7b8c82bac78c48f5d43c0246c41e7a7910f0119cc7b56500789d722d87f00e9d2356150063e07ae281435d5af60f9e15956c5bc0b236ea5f225435886117c4b0
+DIST rotix-0.83.tar.bz2 14685 BLAKE2B 296e094dfef2b35db39041e92d350befc970f3594c7aa2962b4dba0215e99b50ea887d3d636dc2e38ee570b60462bcf8304a6f7ee005315fa115b821ee0f29ad SHA512 1f318e15bd51cc197d9d9fc36e37b29c18fe7a8e8c40654c69ccf97d32b896afa7cc517c562750f6c1262baddbb451bd8a29ada994176e442630d8ed56ccf572
+EBUILD rotix-0.83.ebuild 796 BLAKE2B b3dd71c994b6e5ef8eaa720987e89676828327927f01ac9bb33ada4e0355431357f60ec5677e17d622d7a6a173ad3ae07d5671880205a6ff154f2c0ef8848888 SHA512 e0aed70e10de163f8659e8fede3da520621dd355fbe7efcf1fb50f4b294926a498e58b6bde604106cbafaaa352c5d011227e128d29fedd2f6452b9541fd4db1d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch b/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch
new file mode 100644
index 000000000000..ab23372e768f
--- /dev/null
+++ b/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch
@@ -0,0 +1,31 @@
+Index: rotix-0.83/Makefile
+===================================================================
+--- rotix-0.83.orig/Makefile
++++ rotix-0.83/Makefile
+@@ -22,12 +22,6 @@
+ 
+ include Makefile.settings
+ 
+-ifdef DEBUG
+-CFLAGS += -g3
+-else
+-CFLAGS += -O3
+-endif
+-
+ ifdef I18N
+ CFLAGS += -DPACKAGE=\"${PACKAGE}\" -D LOCALEDIR=\"${LOCALE}\"
+ endif
+@@ -39,12 +33,7 @@ endif
+ all : rotix po
+ 
+ rotix : rot.o help.o rotix.o
+-	$(CC) -Wall $(CFLAGS) -o rotix rot.o help.o rotix.o
+-ifdef STRIP
+-ifndef DEBUG
+-	$(STRIP) rotix
+-endif
+-endif
++	$(CC) -Wall $(CFLAGS) $(LDFLAGS) -o rotix rot.o help.o rotix.o
+ 
+ ifdef I18N
+ CFLAGS += -D I18N=1
diff --git a/app-crypt/rotix/files/rotix-0.83-interix.patch b/app-crypt/rotix/files/rotix-0.83-interix.patch
new file mode 100644
index 000000000000..b691478582ca
--- /dev/null
+++ b/app-crypt/rotix/files/rotix-0.83-interix.patch
@@ -0,0 +1,15 @@
+--- rotix-0.83.orig/help.c
++++ rotix-0.83/help.c
+@@ -24,8 +24,12 @@
+  * I18N
+ \*/
+ 
++#if I18N
+ #include <libintl.h>
+ #define _(String) gettext (String)
++#else
++#define _(String) (String)
++#endif
+ 
+ /*\
+  *  This function displays the help-information.
diff --git a/app-crypt/rotix/files/rotix-0.83-locale.diff b/app-crypt/rotix/files/rotix-0.83-locale.diff
new file mode 100644
index 000000000000..844a452b8af1
--- /dev/null
+++ b/app-crypt/rotix/files/rotix-0.83-locale.diff
@@ -0,0 +1,10 @@
+--- rotix.c	2002-04-02 14:48:42.000000000 -0500
++++ rotix.c.mine	2010-07-15 14:54:45.000000000 -0400
+@@ -38,6 +38,7 @@
+ /* I18N */
+ #ifdef I18N
+ #include <libintl.h>
++#include <locale.h>
+ #define _(String) gettext (String)
+ #else
+ #define _(String) String
diff --git a/app-crypt/rotix/metadata.xml b/app-crypt/rotix/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-crypt/rotix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
new file mode 100644
index 000000000000..927d06877da1
--- /dev/null
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Rotix allows you to generate rotational obfuscations"
+HOMEPAGE="https://gentoo.org"
+SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-devel/gettext"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-and-dont-strip.patch
+	epatch "${FILESDIR}"/${P}-locale.diff
+	epatch "${FILESDIR}"/${P}-interix.patch
+}
+
+src_configure() {
+	use elibc_glibc || append-flags -lintl
+	econf --i18n=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/app-crypt/sbsigntools-0.6-r2 b/app-crypt/sbsigntools-0.6-r2
deleted file mode 100644
index 6cd36e4f512c..000000000000
--- a/app-crypt/sbsigntools-0.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/openssl:0= sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/binutils-libs virtual/pkgconfig
-DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
-EAPI=5
-HOMEPAGE=https://launchpad.net/ubuntu/+source/sbsigntool
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/openssl:0= sys-apps/util-linux
-SLOT=0
-SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/sbsigntool_0.6.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68c7664c5d28d53cd277c0790c8c3a31
diff --git a/app-crypt/sbsigntools-0.9.1-r1 b/app-crypt/sbsigntools-0.9.1-r1
deleted file mode 100644
index c023618153f7..000000000000
--- a/app-crypt/sbsigntools-0.9.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/openssl:0= sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/binutils-libs virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3 LGPL-3 LGPL-2.1 CC0-1.0
-RDEPEND=dev-libs/openssl:0= sys-apps/util-linux
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/snapshot/sbsigntools-0.9.1.tar.gz https://dev.gentoo.org/~tamiko/distfiles/sbsigntool-0.8-ccan.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ed9f19230dfc962a5c0d7a80b4cceff
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
new file mode 100644
index 000000000000..f860b2c7ad5e
--- /dev/null
+++ b/app-crypt/sbsigntools/Manifest
@@ -0,0 +1,9 @@
+AUX 0002-image.c-clear-image-variable.patch 822 BLAKE2B acb775f625ecd081d9b3d7e497b066218e82d2dc13f80c473c25361dc85098ee15e5f14530334e47c33fe7cc9b2349ffb1aaba7abe4fdd33bfdde05ed9191c39 SHA512 004ba118cbe8fe5cc291888966e5994373c0b9d8149bc5c652a72971138fab5e64d721061c69e8b864d6ca5cdb4ffa193520156941b6bd9c998b256f8d72697b
+AUX 0003-Fix-for-multi-sign.patch 1452 BLAKE2B eaa6e39c18d13f3819d5852eda27eb5a8d589241224965392f1b1e067b5cb9ff0ece7fa83697e5fb6f5f8dd0acec15b7bbe57fcd5f761fcb2e8e1fc51193641f SHA512 2aba55a116536e7f41e4aac2fd33eeb92cf89b14bcdd8b93b6e9dc9bdaf2f0162134e56f7d365640445bf801ad8590f6d49f14cdf80b791324647067d52ae435
+AUX sbsigntools-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
+DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
+DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c
+DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
+EBUILD sbsigntools-0.6-r2.ebuild 1116 BLAKE2B 1e571c2018b72de8a454a380042897678f2308e8afab91b5e90c99eff266950e7374fc099b28d0d22b1a560bf6784eb6c77345c2b92e302f9ed98c80d4f3c45a SHA512 c11a43f77549f884c3a7c55333a62970239142340bc7ee6b85d029e3a07ee47a0b71265878ad99778bc7e48d7b0cee68c0e358bc8d914a0590796490e98aaba0
+EBUILD sbsigntools-0.9.1-r1.ebuild 1303 BLAKE2B c388a296e1395690072dd579dd762cd55c2f9f30fc31bfc1d54fbd6a2a6233c40a11bbe958f1cf7918637e952b8770618c947303bbd6a98f043c657dd653e63a SHA512 9779ebe157dab6501b6a8c98ed78fac81128394ae485e97c262985ce0ced84e97d5e2095f548aa38158d08cc235a5f81438ded30e6a84808e9a007994b7a964b
+MISC metadata.xml 291 BLAKE2B 0aeb75750176d719f10db508a8924d0bf2fe75e8544b275a7c7e11c44320ce4f7819febb093dd3083a33a998a225f2a3b882407a8ffc03d1a57d03cbfc0a7ff2 SHA512 f7a520fc9a216ff983bd3d361c6ddb3b635eb5dcd94ed042e7c5d0beb0b4e10cdb231e2b4ace599ebb93d4bb46e071a744f1a780ec83f451bb2ee6bad4c2d8cc
diff --git a/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
new file mode 100644
index 000000000000..dfe183e66cd2
--- /dev/null
+++ b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
@@ -0,0 +1,29 @@
+From 21e984fa9d93a760cc03f5d9d13d023809227df2 Mon Sep 17 00:00:00 2001
+From: James Bottomley <JBottomley@Parallels.com>
+Date: Thu, 11 Apr 2013 21:12:17 -0700
+Subject: image.c: clear image variable
+
+Not zeroing the image after talloc occasionally leads to a segfault because
+the programme thinks it has a signature when in reality it just has a junk
+pointer and segfaults.
+
+Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+---
+ src/image.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/image.c b/src/image.c
+index cc55791..10eba0e 100644
+--- a/src/image.c
++++ b/src/image.c
+@@ -401,6 +401,7 @@ struct image *image_load(const char *filename)
+ 		return NULL;
+ 	}
+ 
++	memset(image, 0, sizeof(*image));
+ 	rc = fileio_read_file(image, filename, &image->buf, &image->size);
+ 	if (rc)
+ 		goto err;
+-- 
+1.8.2.1
+
diff --git a/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
new file mode 100644
index 000000000000..f42c69616d13
--- /dev/null
+++ b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
@@ -0,0 +1,39 @@
+From e58a528ef57e53008222f238cce7c326a14572e2 Mon Sep 17 00:00:00 2001
+From: James Bottomley <JBottomley@Parallels.com>
+Date: Mon, 30 Sep 2013 19:25:37 -0700
+Subject: [PATCH 4/4] Fix for multi-sign
+
+The new Tianocore multi-sign code fails now for images signed with
+sbsigntools.  The reason is that we don't actually align the signature table,
+we just slap it straight after the binary data.  Unfortunately, the new
+multi-signature code checks that our alignment offsets are correct and fails
+the signature for this reason.  Fix by adding junk to the end of the image to
+align the signature section.
+
+Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+---
+ src/image.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/image.c b/src/image.c
+index 10eba0e..519e288 100644
+--- a/src/image.c
++++ b/src/image.c
+@@ -385,7 +385,13 @@ static int image_find_regions(struct image *image)
+ 
+ 	/* record the size of non-signature data */
+ 	r = &image->checksum_regions[image->n_checksum_regions - 1];
+-	image->data_size = (r->data - (void *)image->buf) + r->size;
++	/*
++	 * The new Tianocore multisign does a stricter check of the signatures
++	 * in particular, the signature table must start at an aligned offset
++	 * fix this by adding bytes to the end of the text section (which must
++	 * be included in the hash)
++	 */
++	image->data_size = align_up((r->data - (void *)image->buf) + r->size, 8);
+ 
+ 	return 0;
+ }
+-- 
+1.8.4
+
diff --git a/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
new file mode 100644
index 000000000000..2f9364f246ee
--- /dev/null
+++ b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
@@ -0,0 +1,152 @@
+diff --git a/src/fileio.c b/src/fileio.c
+index 032eb1e..09bc3aa 100644
+--- a/src/fileio.c
++++ b/src/fileio.c
+@@ -40,6 +40,7 @@
+ #include <openssl/pem.h>
+ #include <openssl/err.h>
+ #include <openssl/engine.h>
++#include <openssl/ui.h>
+ 
+ #include <ccan/talloc/talloc.h>
+ #include <ccan/read_write_all/read_write_all.h>
+diff --git a/src/idc.c b/src/idc.c
+index 236cefd..6d87bd4 100644
+--- a/src/idc.c
++++ b/src/idc.c
+@@ -238,7 +238,11 @@ struct idc *IDC_get(PKCS7 *p7, BIO *bio)
+ 
+ 	/* extract the idc from the signed PKCS7 'other' data */
+ 	str = p7->d.sign->contents->d.other->value.asn1_string;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	idcbuf = buf = ASN1_STRING_data(str);
++#else
++	idcbuf = buf = ASN1_STRING_get0_data(str);
++#endif
+ 	idc = d2i_IDC(NULL, &buf, ASN1_STRING_length(str));
+ 
+ 	/* If we were passed a BIO, write the idc data, minus type and length,
+@@ -289,7 +293,11 @@ int IDC_check_hash(struct idc *idc, struct image *image)
+ 	}
+ 
+ 	/* check hash against the one we calculated from the image */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	buf = ASN1_STRING_data(str);
++#else
++	buf = ASN1_STRING_get0_data(str);
++#endif
+ 	if (memcmp(buf, sha, sizeof(sha))) {
+ 		fprintf(stderr, "Hash doesn't match image\n");
+ 		fprintf(stderr, " got:       %s\n", sha256_str(buf));
+diff --git a/src/sbattach.c b/src/sbattach.c
+index a0c01b8..e89a23e 100644
+--- a/src/sbattach.c
++++ b/src/sbattach.c
+@@ -231,6 +231,7 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_digests();
+ 	OPENSSL_config(NULL);
+@@ -239,6 +240,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 
+ 	image = image_load(image_filename);
+ 	if (!image) {
+diff --git a/src/sbkeysync.c b/src/sbkeysync.c
+index 7b17f40..419b1e7 100644
+--- a/src/sbkeysync.c
++++ b/src/sbkeysync.c
+@@ -208,7 +208,11 @@ static int x509_key_parse(struct key *key, uint8_t *data, size_t len)
+ 		goto out;
+ 
+ 	key->id_len = ASN1_STRING_length(serial);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	key->id = talloc_memdup(key, ASN1_STRING_data(serial), key->id_len);
++#else
++	key->id = talloc_memdup(key, ASN1_STRING_get0_data(serial), key->id_len);
++#endif
+ 
+ 	key->description = talloc_array(key, char, description_len);
+ 	X509_NAME_oneline(X509_get_subject_name(x509),
+@@ -927,6 +931,7 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_digests();
+ 	OpenSSL_add_all_ciphers();
+@@ -936,6 +941,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 
+ 	ctx->filesystem_keys = init_keyset(ctx);
+ 	ctx->firmware_keys = init_keyset(ctx);
+diff --git a/src/sbsign.c b/src/sbsign.c
+index ff1fdfd..78d8d64 100644
+--- a/src/sbsign.c
++++ b/src/sbsign.c
+@@ -188,6 +188,7 @@ int main(int argc, char **argv)
+ 
+ 	talloc_steal(ctx, ctx->image);
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_digests();
+ 	OpenSSL_add_all_ciphers();
+@@ -197,6 +198,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 	if (engine)
+ 		pkey = fileio_read_engine_key(engine, keyfilename);
+ 	else
+diff --git a/src/sbvarsign.c b/src/sbvarsign.c
+index 7dcbe51..9319c8b 100644
+--- a/src/sbvarsign.c
++++ b/src/sbvarsign.c
+@@ -509,6 +509,7 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	/* initialise openssl */
+ 	OpenSSL_add_all_digests();
+ 	OpenSSL_add_all_ciphers();
+@@ -519,6 +520,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 
+ 	/* set up the variable signing context */
+ 	varname = argv[optind];
+diff --git a/src/sbverify.c b/src/sbverify.c
+index 3920d91..d0b203a 100644
+--- a/src/sbverify.c
++++ b/src/sbverify.c
+@@ -250,6 +250,7 @@ int main(int argc, char **argv)
+ 	verbose = false;
+ 	detached_sig_filename = NULL;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	OpenSSL_add_all_digests();
+ 	ERR_load_crypto_strings();
+ 	OPENSSL_config(NULL);
+@@ -258,6 +259,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 
+ 	for (;;) {
+ 		int idx;
diff --git a/app-crypt/sbsigntools/metadata.xml b/app-crypt/sbsigntools/metadata.xml
new file mode 100644
index 000000000000..20001d6eb7ad
--- /dev/null
+++ b/app-crypt/sbsigntools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">ubuntu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild b/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
new file mode 100644
index 000000000000..519693684dce
--- /dev/null
+++ b/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="${PN::-1}"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	sys-libs/binutils-libs
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	local iarch
+	case ${ARCH} in
+		ia64)  iarch=ia64 ;;
+		x86)   iarch=ia32 ;;
+		amd64) iarch=x86_64 ;;
+		*)     die "unsupported architecture: ${ARCH}" ;;
+	esac
+	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
+	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
+	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
+	epatch "${FILESDIR}"/0002-image.c-clear-image-variable.patch
+	epatch "${FILESDIR}"/0003-Fix-for-multi-sign.patch
+}
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..f87b1609d9d3
--- /dev/null
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PN="${PN::-1}"
+
+inherit eutils autotools
+
+DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot/${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${MY_PN}-0.8-ccan.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	sys-libs/binutils-libs
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openssl-1.1.0-compat.patch
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
+	rmdir "${WORKDIR}"/lib || die "rmdir failed"
+
+	local iarch
+	case ${ARCH} in
+		amd64) iarch=x86_64 ;;
+		arm64) iarch=aarch64 ;;
+		ia64)  iarch=ia64 ;;
+		x86)   iarch=ia32 ;;
+		*)     die "unsupported architecture: ${ARCH}" ;;
+	esac
+	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure.ac || die
+	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.am || die
+	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
+
+	default
+	eautoreconf
+}
diff --git a/app-crypt/scrypt-1.2.0 b/app-crypt/scrypt-1.2.0
deleted file mode 100644
index 6ba59755253b..000000000000
--- a/app-crypt/scrypt-1.2.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A simple password-based encryption utility using scrypt key derivation function
-EAPI=6
-HOMEPAGE=http://www.tarsnap.com/scrypt.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://www.tarsnap.com/scrypt/scrypt-1.2.0.tgz
-_md5_=3d67aae77bfae157a4f03b6710623c01
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
new file mode 100644
index 000000000000..b1a0a1855fae
--- /dev/null
+++ b/app-crypt/scrypt/Manifest
@@ -0,0 +1,3 @@
+DIST scrypt-1.2.0.tgz 107796 BLAKE2B 83ad13e83dad1ecf6a73553e2402c01409062e53089b5c6598607a50794113ad7ed89d855486e33464237b5ba033b57b72af851199e674235ac53e822fece865 SHA512 81ac8d82c38dc73981fa5bd4c011142c7ccef962a650ed849317a49e8aa66c26f4557dde326202792500a996178784d5eb0d28f909ab630cb05c86fdebfaae0d
+EBUILD scrypt-1.2.0.ebuild 370 BLAKE2B 78c4f5b45a6517332027a36d7f198ff54370a29301711d70d28bb77c4ea5a40ab644f5a693e8de9404da3ce7da8199fc9ee471dac00463f5e97add050fea867f SHA512 c58d42b7f9351f8044849aa5af60f8f09e0bb43caf48f69b2850180470d88bf1301a6c22d2f5ce1e0787046a295ad3be5d15deea6fc67c7e9b4f802eab4a4cd2
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/scrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/scrypt/scrypt-1.2.0.ebuild b/app-crypt/scrypt/scrypt-1.2.0.ebuild
new file mode 100644
index 000000000000..e3cc79551451
--- /dev/null
+++ b/app-crypt/scrypt/scrypt-1.2.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple password-based encryption utility using scrypt key derivation function"
+HOMEPAGE="http://www.tarsnap.com/scrypt.html"
+SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( FORMAT )
diff --git a/app-crypt/scute-1.5.0 b/app-crypt/scute-1.5.0
deleted file mode 100644
index 5da7a772e103..000000000000
--- a/app-crypt/scute-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-2.0.0 >=app-crypt/pinentry-0.7.0 >=app-crypt/gnupg-2.0.17-r1[smartcard]
-DESCRIPTION=A PKCS #11 module for OpenPGP smartcards
-EAPI=6
-HOMEPAGE=http://www.scute.org/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-2.0.0 >=app-crypt/pinentry-0.7.0 >=app-crypt/gnupg-2.0.17-r1[smartcard]
-SLOT=0
-SRC_URI=mirror://gnupg/scute/scute-1.5.0.tar.bz2
-_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=88894ca4b0c664004b2a17612a5fc239
diff --git a/app-crypt/scute/Manifest b/app-crypt/scute/Manifest
new file mode 100644
index 000000000000..f6e283bfd492
--- /dev/null
+++ b/app-crypt/scute/Manifest
@@ -0,0 +1,3 @@
+DIST scute-1.5.0.tar.bz2 991598 BLAKE2B 3a5fdcb5c7d1ae50ce5aa508388e768c6f59c366d81d91312a60ff319b3ad7e01b3bfe5986ee880980b0f5371402c21bd8da963977459d3b90fbd607e64ea2ae SHA512 ad1dbdba5681a92696c851eca7e2bfb61f7bf84f5e02728efc1f72cd25c4ee2dc18fe975e2903d1a85c635d16be1e2085ff2305827b48d80e18c9354e555b39a
+EBUILD scute-1.5.0.ebuild 919 BLAKE2B 70a700361e4c1a613ea336ad850997a2eeb16369ab8204a03dbc5a1a944df514c3ec1b5ad252db99fd7ae2a7e7c96c2b4b4695d5b95b075340e5c9358f69aa76 SHA512 2a3ada5f2e21995fcd4920b460c578d37421c3916193b4a499c95c51aec5984fd57579300ea5dddac299e6c740501ab26a00aa3969abdf7b4149443100c86940
+MISC metadata.xml 1031 BLAKE2B cbe957a386e02db4f584dd3e844b0e86da8b17b3c09e000821925be37196a5aac46f4d3a7730dfd4062ee91018be2428f1270202183b60225a9da8614d006317 SHA512 60ff0db241cca0cd3442e635b3579fdcb574d1121b47806a0046f77e6c4b5a32146c44779e52939570110ed7a0745b8606e7ea6b8e5b923d850d8d08a22dd1af
diff --git a/app-crypt/scute/metadata.xml b/app-crypt/scute/metadata.xml
new file mode 100644
index 000000000000..ef8bdd1eaecc
--- /dev/null
+++ b/app-crypt/scute/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lucas.yamanishi@gmail.com</email>
+    <name>Lucas Yamanishi</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    Scute is a PKCS #11 module that adds support for the OpenPGP
+    smartcard card to the Mozilla Network Security Services (NSS).
+  </longdescription>
+  <upstream>
+    <maintainer>
+      <email>mb@g10code.de</email>
+      <name>Marcus Brinkmann</name>
+    </maintainer>
+    <changelog>http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git;a=blob_plain;f=ChangeLog;hb=HEAD</changelog>
+    <doc lang="en">http://www.scute.org/documentation.xhtml</doc>
+    <bugs-to>https://bugs.g10code.com/gnupg/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/scute/scute-1.5.0.ebuild b/app-crypt/scute/scute-1.5.0.ebuild
new file mode 100644
index 000000000000..85adede2192a
--- /dev/null
+++ b/app-crypt/scute/scute-1.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+DESCRIPTION="A PKCS #11 module for OpenPGP smartcards"
+HOMEPAGE="http://www.scute.org/"
+SRC_URI="mirror://gnupg/scute/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# configure script try to check the version of gpgsm and gpg-agent when
+# non-crosscompiling so we need to have them as build-time dependency as
+# well as runtime.  Require a version of gnupg that is patched to have
+# gpgsm-gencert.sh working (as that's what the documentation describe).
+DEPEND="
+	>=dev-libs/libgpg-error-1.4
+	>=dev-libs/libassuan-2.0.0
+	>=app-crypt/pinentry-0.7.0
+	>=app-crypt/gnupg-2.0.17-r1[smartcard]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/pkcs11 \
+		--with-gpgsm=/usr/bin/gpgsm
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/seahorse-3.20.0 b/app-crypt/seahorse-3.20.0
deleted file mode 100644
index 510be515e45a..000000000000
--- a/app-crypt/seahorse-3.20.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 >=app-crypt/gnupg-2.0.12 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/intltool-0.35 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GNOME application for managing encryption keys
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
-IUSE=debug ldap zeroconf
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 >=app-crypt/gnupg-2.0.12 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) !<app-crypt/seahorse-plugins-2.91.0_pre20110114
-SLOT=0
-SRC_URI=mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8514b9ee7c24319ba3a6c73078ea61c7
diff --git a/app-crypt/seahorse-sharing-3.8.0_p20151117 b/app-crypt/seahorse-sharing-3.8.0_p20151117
deleted file mode 100644
index b667aac0c758..000000000000
--- a/app-crypt/seahorse-sharing-3.8.0_p20151117
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-crypt/seahorse dev-libs/glib:2 >=net-dns/avahi-0.6:= net-libs/libsoup:2.4 >=x11-libs/gtk+-3:3 >=app-crypt/gpgme-1 >=app-crypt/gnupg-1.4 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Daemon for PGP public key sharing using DNS-SD and HKP
-EAPI=5
-HOMEPAGE=https://projects.gnome.org/seahorse/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/seahorse dev-libs/glib:2 >=net-dns/avahi-0.6:= net-libs/libsoup:2.4 >=x11-libs/gtk+-3:3 >=app-crypt/gpgme-1 >=app-crypt/gnupg-1.4 !<app-crypt/seahorse-3.2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~eva/distfiles/seahorse-sharing/seahorse-sharing-3.8.0-19-g61de83c.tar.gz -> seahorse-sharing-3.8.0_p20151117.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18a51e0343a7545102a2052e529bcfcd
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
new file mode 100644
index 000000000000..8b8f6888deed
--- /dev/null
+++ b/app-crypt/seahorse-sharing/Manifest
@@ -0,0 +1,3 @@
+DIST seahorse-sharing-3.8.0_p20151117.tar.gz 496497 BLAKE2B 5107eb37c57d8311390399fda59d8df76f59afc6b21f107dfb1cb38dd6c68ea25bda619b1898637ff009c0e9f7617b0557b86f0194ee2c8704d804aa9f8827f9 SHA512 aa43240040f637e3c79c08f07620a92e5e76e81b758c939a8eee5bf43cdd32657f85d4b9d7440401e092ef4d556849ba0a64dc9d5a83e708bc84d9a2d7baf01c
+EBUILD seahorse-sharing-3.8.0_p20151117.ebuild 1571 BLAKE2B 0a77cd40c5e75dc56e174b808962761425e51ad503434a1d6065fc3359bf0ec388e844e0467b89eebb80a9307b0bc0e716dcc8df464ba8c11e8fb93f79753d0b SHA512 879cf863ebd9caf5a4df342d58e50e5ad03760330e3d24a7c756d07ec2c6f5cf4918d846879d1b7100b202fcba8aa76388314ad33b7e26b82777464786479f5a
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/seahorse-sharing/metadata.xml b/app-crypt/seahorse-sharing/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-crypt/seahorse-sharing/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
new file mode 100644
index 000000000000..94a36921e4fc
--- /dev/null
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes" # disable asserts
+
+inherit gnome2
+
+DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
+HOMEPAGE="https://projects.gnome.org/seahorse/"
+SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P//_p*}-19-g61de83c.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND="
+	app-crypt/seahorse
+	dev-libs/glib:2
+	>=net-dns/avahi-0.6:=
+	net-libs/libsoup:2.4
+	>=x11-libs/gtk+-3:3
+
+	>=app-crypt/gpgme-1
+	>=app-crypt/gnupg-1.4
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-3.2
+"
+# ${PN} was part of seahorse before 3.2
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-3.8.0"
+
+src_prepare() {
+	DOCS="AUTHORS MAINTAINERS NEWS" # ChangeLog has nothing useful
+	# Do not pass --enable-tests to configure - package has no tests
+
+	gnome2_src_prepare
+
+	# Drop stupid CFLAGS
+	# FIXME: doing configure.ac triggers maintainer mode rebuild
+	sed -e 's:$CFLAGS -g -O0:$CFLAGS:' \
+		-i configure || die "sed failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version net-dns/avahi && \
+		! rc-config list default | grep -q "avahi-daemon" ; then
+		elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
+		elog "system, you can start the Avahi daemon by"
+		elog "# /etc/init.d/avahi-daemon start"
+		elog "To start Avahi automatically, add it to the default runlevel:"
+		elog "# rc-update add avahi-daemon default"
+	fi
+}
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
new file mode 100644
index 000000000000..c4cb136fe40b
--- /dev/null
+++ b/app-crypt/seahorse/Manifest
@@ -0,0 +1,3 @@
+DIST seahorse-3.20.0.tar.xz 1556556 BLAKE2B e0742996045b50acb2d60f548f321e1ff0121c166209e2230d5839cc971f8560f316c91c3a88a30c302c5339ba0251e7faf64ae805c4f80e853cc67a6952d350 SHA512 a02d3da7af95256941ef065ac024bd5bfb53a026767b951fa2e26446fb0eed23707e69f72f6e8ebfa7d538823fa41411709fa2bebad4fbd662af1e81bc15ab82
+EBUILD seahorse-3.20.0.ebuild 1628 BLAKE2B 72e5b4170c9a9e57f8742b025bb9bb7a816e67dfacbf08e80f715178e06f9cbec10654366c0f74899a816f1f0cbc6d988fb17d258e31873e43eac7f337cb7e51 SHA512 d53d488ab47a2681e075df1894288e81e7c32d05c28b027a091fb91d903da3275e235774e3d0f0caf18dca51d077afce63c2ed40ad5af9a319682956521b593e
+MISC metadata.xml 871 BLAKE2B 5497bf54b134fb991034614308c76230b647a95ed4609d2271c83af737c5ff86325ca3e56ff3682752585d16cf9389e17bca47e3a673e386ca201aba78a006e6 SHA512 3e4844cf29c6343c93ee51a9d5643464256f7ad884e6af946166c251004d3cbbf6d1aaa6771faf27b1a531939a8401413b52aa84a6bee8a2a4365775b09e8514
diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
new file mode 100644
index 000000000000..6789dec723b8
--- /dev/null
+++ b/app-crypt/seahorse/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="ldap">Enable seahorse to manipulate GPG keys on a LDAP server.</flag>
+</use>
+<longdescription>Seahorse is a Gnome interface for GnuPG.  It's main purpose is to be a PGP/GPG Key Manager, though 
+it has other components including a text editor and file manager.
+
+Key Manager Features:
+Generating a key
+Deleting a key
+Importing keys from text or a file
+Exporting a key to text or a file
+View key properties
+
+Key Properties Features:
+Show key info
+Change owner trust
+Change primary key's expiration date
+Change passphrase
+Export key
+Delete Key
+
+Plugins:
+Nautilus Integration
+Gedit plugin
+</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/seahorse/seahorse-3.20.0.ebuild b/app-crypt/seahorse/seahorse-3.20.0.ebuild
new file mode 100644
index 000000000000..3a5351bb36e0
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-3.20.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A GNOME application for managing encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="debug ldap zeroconf"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.11.91:=
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-3.4:3
+	>=app-crypt/libsecret-0.16
+	>=net-libs/libsoup-2.33.92:2.4
+	x11-misc/shared-mime-info
+
+	net-misc/openssh
+	>=app-crypt/gpgme-1
+	>=app-crypt/gnupg-2.0.12
+
+	ldap? ( net-nds/openldap:= )
+	zeroconf? ( >=net-dns/avahi-0.6:= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Need seahorse-plugins git snapshot
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
+"
+
+src_prepare() {
+	# Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	# Accept GnuPG 2.2.0
+	sed -e 's/GNUPG_ACCEPTED="2.0.12 2.1.4"/GNUPG_ACCEPTED="2.0.12 2.1.4 2.2.0"/g' \
+		-i configure.ac configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# bindir is needed due to bad macro expansion in desktop file, bug #508610
+	gnome2_src_configure \
+		--bindir=/usr/bin \
+		--enable-pgp \
+		--enable-ssh \
+		--enable-pkcs11 \
+		--enable-hkp \
+		$(use_enable debug) \
+		$(use_enable ldap) \
+		$(use_enable zeroconf sharing) \
+		VALAC=$(type -P true)
+}
diff --git a/app-crypt/sgeps-0_pre15 b/app-crypt/sgeps-0_pre15
deleted file mode 100644
index faef4b4783e0..000000000000
--- a/app-crypt/sgeps-0_pre15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=simple GnuPG-encrypted password store written in perl
-EAPI=4
-HOMEPAGE=http://roland.entierement.nu/blog/2010/01/22/simple-gnupg-encrypted-password-store.html
-IUSE=zsh-completion
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg dev-lang/perl virtual/perl-Storable virtual/perl-File-Temp virtual/perl-Getopt-Long dev-perl/Config-Simple zsh-completion? ( app-shells/zsh )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~flameeyes/sgeps/sgeps-0_pre15.tar.xz
-_md5_=d4562dbd1d846dc4da6d9461c3a023cf
diff --git a/app-crypt/sgeps/Manifest b/app-crypt/sgeps/Manifest
new file mode 100644
index 000000000000..d9df51e9a507
--- /dev/null
+++ b/app-crypt/sgeps/Manifest
@@ -0,0 +1,3 @@
+DIST sgeps-0_pre15.tar.xz 3284 BLAKE2B e30662e1353e6b4bf1680f730152d972c769d7728b9d30fa8a01d76c40b65549f8cb63d616cf70119201952ee1b0f7ec7aae087a1e37f36e7c6df3ece1259494 SHA512 8ebf5f492baaf6ee7f93054a9afcc6c4318f755d85190ce2576c89a88908ee132283af873a37f60f611683689bc7e2e77903c95c6020c80ad916ebabf4583702
+EBUILD sgeps-0_pre15.ebuild 1061 BLAKE2B bd5e52dea7d2bf72c90a0d38a98f70995b83cec285320f473c48ee9f984096878e07ab235d1c9f45da6fd5dc2394d7794bc69f7e76d57e89d137b054016e7b46 SHA512 abb2a1b87a76543dcfcfbab1c2cc7e06ade77dfd8f6d98fe3c66d597e1b2077cb266a86f3ad43a8d235ff953c0729ca62b2018f6b38e9e7af1ad24a32e4ea868
+MISC metadata.xml 387 BLAKE2B e1dedc093efde04e635a60abe48bed920fb6a799faaeb8ff6ed4bf05ae3fcebaaa36b7ccd0b13db1940ba740fde5ed8e7a7931567f601bcd1797c5013c6fac5e SHA512 80eccb576d91e4abe4b472528f8a0f145dec34fdb8a120b43943e742dd077dbe6b45256c4634e6f00f7e240d46fcf174b5eedd9f10954b51b69e25d53ccbf22c
diff --git a/app-crypt/sgeps/metadata.xml b/app-crypt/sgeps/metadata.xml
new file mode 100644
index 000000000000..6bd8c99de505
--- /dev/null
+++ b/app-crypt/sgeps/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>enrico.tagliavini@gmail.com</email>
+    <name>Enrico Tagliavini</name>
+  </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/sgeps/sgeps-0_pre15.ebuild b/app-crypt/sgeps/sgeps-0_pre15.ebuild
new file mode 100644
index 000000000000..62be47628e95
--- /dev/null
+++ b/app-crypt/sgeps/sgeps-0_pre15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="simple GnuPG-encrypted password store written in perl"
+HOMEPAGE="http://roland.entierement.nu/blog/2010/01/22/simple-gnupg-encrypted-password-store.html"
+SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="zsh-completion"
+
+RDEPEND="app-crypt/gnupg
+	dev-lang/perl
+	virtual/perl-Storable
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	dev-perl/Config-Simple
+	zsh-completion? ( app-shells/zsh )"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	dobin sgeps pwsafe2sgeps
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins zsh-completion _sgeps
+	fi
+}
+
+pkg_postinst() {
+	elog "To make use of sgeps, remember to create a configuration file as"
+	elog " ~/.config/sgeps.conf with these values:"
+	elog ""
+	elog "store = ~/somewhere/safe"
+	elog "keyid = 012345678"
+	elog ""
+	elog "If you want to use the --copy options you should install x11-misc/xclip"
+}
diff --git a/app-crypt/shash-0.2.6-r2 b/app-crypt/shash-0.2.6-r2
deleted file mode 100644
index b6a81f0272ca..000000000000
--- a/app-crypt/shash-0.2.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-crypt/mhash-0.8.18-r1
-DESCRIPTION=Generate or check digests or MACs of files
-EAPI=5
-HOMEPAGE=http://mcrypt.hellug.gr/shash/
-IUSE=static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/mhash-0.8.18-r1
-SLOT=0
-SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=704864fab7c2ec6b3e92cef8ca743043
diff --git a/app-crypt/shash-0.2.6-r3 b/app-crypt/shash-0.2.6-r3
deleted file mode 100644
index 5929a1425b51..000000000000
--- a/app-crypt/shash-0.2.6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-crypt/mhash-0.8.18-r1
-DESCRIPTION=Generate or check digests or MACs of files
-EAPI=6
-HOMEPAGE=http://mcrypt.hellug.gr/shash/
-IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/mhash-0.8.18-r1
-SLOT=0
-SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d2ee8df2d025cf2f9e9af1588047d755
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
new file mode 100644
index 000000000000..549d4ad99f88
--- /dev/null
+++ b/app-crypt/shash/Manifest
@@ -0,0 +1,8 @@
+AUX 0.2.6-manpage-fixes.patch 1451 BLAKE2B bd67acde05230006a858d57adbe423960a625e095a80e94e4b43de0bbd4c2235fb5551a5b7612b1fe4a457457fbb7dc418aec68b831e1a523078924b28361da8 SHA512 10dbcfa52a7df57ef68dc58f21e1b2931adf0479697e13f99c56ccfbbd1c79188751d1ce7e2b160261170a678a4130a71a6b531820aa59e4ddbd131d5d9cb551
+AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df3754480ef0b18637eed5ab29ac0aa17f4172e7f327d0a28f39fbbf1f29e247fd934d3c18b0591b2dd8130930f7c3cea07 SHA512 47f299097b8a9907ccfe2f877c42ab8f76f02546211643573796b378d67dd7941518341f8fd07e646c1aa11a665ddbca6ae113a4d58f6995007d9b5aec171d8b
+AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04
+AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
+DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
+EBUILD shash-0.2.6-r2.ebuild 895 BLAKE2B c1cc57e9531b91cfe7da1d1d8f3bfab28ca536de1bf6d67e8c158bb21a34344bb1c69c799f858097827107868222af854f97a6c6a4008b859b665db5904ef3cb SHA512 ad6aeeda95e2c205af81816ca05593a163966bc0fff9ffd42aec90237d70d3331645fc711829b49685a219e2f383d36550e56b146c77ac7972308585a955588e
+EBUILD shash-0.2.6-r3.ebuild 923 BLAKE2B 5b41073761b2f723dad67298cf38adffc6f26dc421bf754b7dc7e389f11413aa2237bd513fc5ad92e830d990776ce98c09be92be9ad85900bc76da4114040970 SHA512 a75a9b80eb674812cf64cfc4ec2d69bf3aac8b6393b3e91132e10372940128cdf32777c131550f448ab3123a7fc2c32d8dad7a5f9411094190dc3444b029be66
+MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/files/0.2.6-manpage-fixes.patch b/app-crypt/shash/files/0.2.6-manpage-fixes.patch
new file mode 100644
index 000000000000..0376e15c3572
--- /dev/null
+++ b/app-crypt/shash/files/0.2.6-manpage-fixes.patch
@@ -0,0 +1,30 @@
+diff -pruN shash-0.2.6/doc/shash.1 shash-0.2.6-r1/doc/shash.1
+--- shash-0.2.6/doc/shash.1	2004-09-18 09:51:04.004647112 +0100
++++ shash-0.2.6-r1/doc/shash.1	2004-09-18 09:57:26.062565480 +0100
+@@ -31,7 +31,7 @@ Because of this shash also supports HMAC
+ a mechanism for message authentication using cryptographic hash functions.
+ So shash can use a key with a hash algorithm to produce hashes that can only
+ be verified with the key. This way you can securely check (i.e. you are sure
+-that nobody can modify the mac, without beeing detected)
++that nobody can modify the mac, without being detected)
+ if files in a filesystem were altered. 
+ 
+ If the list of files and digests, that shash produces, is stored as
+@@ -72,7 +72,7 @@ Suppress some not critical warnings.
+ .TP
+ .B \-b
+ Use binary mode. In unix environment, only difference between this and
+-the normal mode is an asterix preceding the filename in the output.
++the normal mode is an asterisk preceding the filename in the output.
+ .TP
+ .B \-c
+ Check the checksum of all files listed in
+@@ -94,7 +94,7 @@ Enter the keyword via the command line. 
+ keyword instead of prompting for it. Keep in mind that someone
+ may see the command you are executing and so your key.
+ .TP
+-.B \-c --config FILE
++.B \-i --config FILE
+ Use the specified configuration file. The default is .shashrc
+ in your home directory. The format of the configuration
+ file is the same as the parameters. An example file is:
diff --git a/app-crypt/shash/files/shash-0.2.6-binary-files.patch b/app-crypt/shash/files/shash-0.2.6-binary-files.patch
new file mode 100644
index 000000000000..1eb0cba17613
--- /dev/null
+++ b/app-crypt/shash/files/shash-0.2.6-binary-files.patch
@@ -0,0 +1,34 @@
+--- shash-0.2.6/src/shash.c
++++ shash-0.2.6/src/shash.c
+@@ -631,11 +631,11 @@
+ 
+ 		if (nosalt == FALSE && hmac == 1) {
+ 			if (sscanf
+-			    (linebuf, "%s %s  %s\n", hexbuffer, buffer,
+-			     buffer2) < 2) {
++			    (linebuf, "%s %s *%s\n", hexbuffer, buffer,
++			     buffer2) != 3) {
+ 				if (sscanf
+-				    (linebuf, "%s %s *%s\n", hexbuffer,
+-				     buffer, buffer2) < 2)
++				    (linebuf, "%s %s  %s\n", hexbuffer,
++				     buffer, buffer2) != 3)
+ 					continue;
+ 			}
+ 
+@@ -648,11 +648,11 @@
+ 			key = pass2key(algorithm, keymode_buffer, &keylen, password, plen);
+ 
+ 		} else {
+-			if (sscanf(linebuf, "%s  %s\n", buffer, buffer2) ==
+-			    0) {
++			if (sscanf(linebuf, "%s *%s\n", buffer, buffer2) !=
++			    2) {
+ 				if (sscanf
+-				    (linebuf, "%s *%s\n", buffer,
+-				     buffer2) == 0)
++				    (linebuf, "%s  %s\n", buffer,
++				     buffer2) != 2)
+ 					continue;
+ 			}
+ 
diff --git a/app-crypt/shash/files/shash-0.2.6-format-security.patch b/app-crypt/shash/files/shash-0.2.6-format-security.patch
new file mode 100644
index 000000000000..4e46639e2807
--- /dev/null
+++ b/app-crypt/shash/files/shash-0.2.6-format-security.patch
@@ -0,0 +1,28 @@
+--- shash-0.2.6/src/errors.c
++++ shash-0.2.6/src/errors.c
+@@ -4,7 +4,7 @@
+ 
+ void err_quit(char *errmsg)
+ {
+-	fprintf(stderr, errmsg);
++	fputs(errmsg, stderr);
+ 	exit(-1);
+ }
+ 
+@@ -12,7 +12,7 @@
+ {
+ 
+ 	if (quiet < 1) {
+-		fprintf(stderr, errmsg);
++		fputs(errmsg, stderr);
+ 	}
+ 
+ }
+@@ -20,6 +20,6 @@
+ void err_crit(char *errmsg)
+ {
+ 	if (quiet <= 2) {
+-		fprintf(stderr, errmsg);
++		fputs(errmsg, stderr);
+ 	}
+ }
diff --git a/app-crypt/shash/files/shash.bash-completion b/app-crypt/shash/files/shash.bash-completion
new file mode 100644
index 000000000000..15a677dce5ba
--- /dev/null
+++ b/app-crypt/shash/files/shash.bash-completion
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# shash(1) completion.
+
+_shash() {
+	local cur prev
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case "${prev}" in
+	-c|--config)
+		_filedir
+		return 0 ;;
+	-o|--keymode)
+		COMPREPLY=( $( compgen -W "$( shash --listkeygen | tail -n +2 )" \
+			-- ${cur} ) )
+		return ;;
+	-a|--algorithm)
+		COMPREPLY=( $( compgen -W "$( shash --list )" \
+			-- ${cur} ) )
+		return ;;
+	*)
+		;;
+	esac
+	
+	COMPREPLY=( $( compgen -W '-V -q -m -d -c -b -t -o -i -a -l -k -h -v \
+		-L \
+		--verbose --quiet --nosalt --time --hmac --doublecheck \
+		--check --binary --text --keymode --config --algorithm \
+		--list --key --listkeygen --help --version --license' \
+		-- ${cur} ) )
+	_filedir
+	return 0
+}
+complete -F _shash ${filenames} shash
diff --git a/app-crypt/shash/metadata.xml b/app-crypt/shash/metadata.xml
new file mode 100644
index 000000000000..67634f6f0db4
--- /dev/null
+++ b/app-crypt/shash/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>swegener@gentoo.org</email>
+		<name>Sven Wegener</name>
+	</maintainer>
+	<longdescription>shash is a command-line interface for libmhash and is used to generate or check digests or MACs of files.</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
new file mode 100644
index 000000000000..2c8f45a03e6e
--- /dev/null
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="Generate or check digests or MACs of files"
+HOMEPAGE="http://mcrypt.hellug.gr/shash/"
+SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static"
+
+DEPEND=">=app-crypt/mhash-0.8.18-r1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-manpage-fixes.patch
+	epatch "${FILESDIR}"/${P}-binary-files.patch
+}
+
+src_configure() {
+	econf $(use_enable static static-link)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT
+	newbashcomp "${FILESDIR}"/shash.bash-completion ${PN}
+}
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
new file mode 100644
index 000000000000..44336b6724d6
--- /dev/null
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Generate or check digests or MACs of files"
+HOMEPAGE="http://mcrypt.hellug.gr/shash/"
+SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static"
+
+DEPEND=">=app-crypt/mhash-0.8.18-r1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-manpage-fixes.patch
+	"${FILESDIR}"/${P}-binary-files.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
+
+src_configure() {
+	econf $(use_enable static static-link)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT
+	newbashcomp "${FILESDIR}"/shash.bash-completion ${PN}
+}
diff --git a/app-crypt/sign-1.0.7 b/app-crypt/sign-1.0.7
deleted file mode 100644
index 077a9aadf923..000000000000
--- a/app-crypt/sign-1.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=File signing and signature verification utility
-EAPI=5
-HOMEPAGE=http://swapped.cc/sign/
-IUSE=libressl
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BZIP2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=http://swapped.cc/sign/files/sign-1.0.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d52267e65a8f5d9897d7aeb51bf74fc
diff --git a/app-crypt/sign/Manifest b/app-crypt/sign/Manifest
new file mode 100644
index 000000000000..99728cb1abd1
--- /dev/null
+++ b/app-crypt/sign/Manifest
@@ -0,0 +1,5 @@
+AUX 1.0.7-as-needed.patch 383 BLAKE2B 7f657ee7a64f34769474174c948613fe376e17797d3416ef2bb64ef035790776aaeaa6e7e69e327ca71ed3600b1221e96726cb2966a2b93a1f94bcfb2e0be7ff SHA512 03ee8c34030077030e2a24f58bf7eb180b3bfb22fe92991b8231e3348ae522a34ca8ce9851a1654bbf562214dfb6f569297917ee0ae309c49ded23f6c0b97ec9
+AUX 1.0.7-openssl-0.9.8.patch 503 BLAKE2B 8e8625161458a8c7e46d6f4a4f02fd81695f93c02cc20e1178e19e413f4b735d7d7a19f5785e473f4ad7b8ccdeb09852fe1840f30241e3d772832db82188032a SHA512 ffb9d1390f3fa7cb9189ccb8ebe94a8fb5fc14de3cb487758363c405d44d07e4dfdb8b78b71b4b6e26c459ac8972e2b526316a8a1360db72879997683f592b6c
+DIST sign-1.0.7.tar.gz 28535 BLAKE2B e75811aa60f5408af8272503b7b6909eb03e58ab2f70a72efc73a9827af39aa9d5587e2366bc4be4eb67ca88b583d3c75927a0ab94f9f3441ffc60fb6e0e9d6f SHA512 9adb9e520da654e7196451e20501be8e1b84ee750a26344cb7e1816e56e4e8b88773a76a2707a6428faa7828658807eaaef2073b6940e212435ed915881885c0
+EBUILD sign-1.0.7.ebuild 861 BLAKE2B 6c5f5be4d07dfc84d2e6155eb337496518056fe8c449f043fb04a08d04534f9d58ef0f1aec79b32f5be31265f67001f5ccd8ca36e5f6d5ceaf682c809b700413 SHA512 2e874d30078cffab6dbe3a67941e5a1488b45494c67d11da43d0cd07c4db1c05f9581146574ea60d247cb2e3672721212b1a4299b85623c99b864fc8b0f6a45b
+MISC metadata.xml 548 BLAKE2B 8134e0f90d5a5edf3d879801beb54802689491bf47c5b1a8f0954c47c8549b722dfdc8100a5d0759d6694d42c44484f165f17cd79804b6fd1b4852cd1b9f9d59 SHA512 75eaa714f205bd2a5e46693c51dee25fec89447b4f0db2e8c3723ba8bdb17206fbb47ad667092541a8e186f727ee0063a0a58fc02719bab32b8052e07ff6e02f
diff --git a/app-crypt/sign/files/1.0.7-as-needed.patch b/app-crypt/sign/files/1.0.7-as-needed.patch
new file mode 100644
index 000000000000..56574d7131d7
--- /dev/null
+++ b/app-crypt/sign/files/1.0.7-as-needed.patch
@@ -0,0 +1,10 @@
+diff -Nur sign-1.0.7.orig/src/Makefile sign-1.0.7/src/Makefile
+--- sign-1.0.7.orig/src/Makefile	2004-08-07 07:15:00.000000000 +0000
++++ sign-1.0.7/src/Makefile	2006-09-16 17:21:12.400977608 +0000
+@@ -1,5 +1,5 @@
+ CFLAGS += -Wall -DNDEBUG -g
+-LDFLAGS += -lcrypto
++LDLIBS += -lcrypto
+ 
+ OBJS =	buf.o die.o msg.o digest.o uue.o pki.o str.o system-nix.o \
+ 	system-nix-readpass.o util.o
diff --git a/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch b/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch
new file mode 100644
index 000000000000..179efbe77ef5
--- /dev/null
+++ b/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch
@@ -0,0 +1,12 @@
+diff -Nur sign-1.0.7.orig/src/pki.c sign-1.0.7/src/pki.c
+--- sign-1.0.7.orig/src/pki.c	2004-08-04 04:10:35.000000000 +0000
++++ sign-1.0.7/src/pki.c	2006-09-16 17:17:34.335535125 +0000
+@@ -286,7 +286,7 @@
+ 
+ 		/* if it's not a decryption problem - bail out */
+ 		if (ERR_get_error() != ERR_PACK(ERR_LIB_EVP,
+-		                                EVP_F_EVP_DECRYPTFINAL,
++		                                EVP_F_EVP_DECRYPTFINAL_EX,
+ 		                                EVP_R_BAD_DECRYPT))
+ 			goto cleanup;
+ 
diff --git a/app-crypt/sign/metadata.xml b/app-crypt/sign/metadata.xml
new file mode 100644
index 000000000000..15e7b65be77a
--- /dev/null
+++ b/app-crypt/sign/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>alicef@gentoo.org</email>
+	<name>Alice Ferrazzi</name>
+</maintainer>
+<longdescription>
+sign is a file signing and signature verification utility. It's main purpose is
+to be a simple and convenient extension to a tar/gz/bzip2 line of tools to check
+file integrity and authenticity. It's small and simple, it does just one thing
+and hopefully does it well.
+</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/sign/sign-1.0.7.ebuild b/app-crypt/sign/sign-1.0.7.ebuild
new file mode 100644
index 000000000000..a1e2bbeaf1d0
--- /dev/null
+++ b/app-crypt/sign/sign-1.0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="File signing and signature verification utility"
+HOMEPAGE="http://swapped.cc/sign/"
+SRC_URI="http://swapped.cc/${PN}/files/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-openssl-0.9.8.patch
+	epatch "${FILESDIR}"/${PV}-as-needed.patch
+	# remove -g from CFLAGS, it happens to break the build on ppc-macos
+	sed -i -e 's/-g//' src/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	doman man/${PN}.1
+	dodoc README
+	dosym ${PN} /usr/bin/un${PN}
+}
diff --git a/app-crypt/signify-20 b/app-crypt/signify-20
deleted file mode 100644
index a0366685b17b..000000000000
--- a/app-crypt/signify-20
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Cryptographically sign and verify files
-EAPI=5
-HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
-KEYWORDS=~amd64
-LICENSE=BSD-1
-RDEPEND=>=dev-libs/libbsd-0.7
-SLOT=0
-SRC_URI=https://github.com/aperezdc/signify/archive/v20.tar.gz -> signify-20.tar.gz
-_md5_=f212f558583c3f13dc0cb52e6a69c473
diff --git a/app-crypt/signify-23 b/app-crypt/signify-23
deleted file mode 100644
index 49825a6b4e74..000000000000
--- a/app-crypt/signify-23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libbsd-0.7
-DESCRIPTION=Cryptographically sign and verify files
-EAPI=6
-HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
-KEYWORDS=~amd64
-LICENSE=BSD-1
-RDEPEND=>=dev-libs/libbsd-0.7
-SLOT=0
-SRC_URI=https://github.com/aperezdc/signify/archive/v23.tar.gz -> signify-23.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5de153a1cb0b3cd3168bcd6697b105e9
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
new file mode 100644
index 000000000000..5963294390fe
--- /dev/null
+++ b/app-crypt/signify/Manifest
@@ -0,0 +1,5 @@
+DIST signify-20.tar.gz 97765 BLAKE2B c2b086b59310cd364d28ee7f8802daa7f170eb2a19a5d6722d0b59202b7ee302f4b810a2809f8badfab38ae4d8402dec82141207be3d1b64f747c2e27b2c54f7 SHA512 993f02b10ef9c74a98455e2c93e094de40a40710c38ff35752decb87430895bd276cb5e6a46b5f7cf3f098d66562f1f0e134158d221a87fb33cfff09199a8773
+DIST signify-23.tar.gz 95335 BLAKE2B 4cdbee5dae7f217644a5df41d4253938c5cb8fb1f621f945addfceb64090234199e8dd81d7ef42c41aae13e9e5158541f40062296ca07562977473e39f68cd0b SHA512 f0330994f3d308e9ad7c7bf4b6d6f8e8bef914d6d10d83507002ad97f853b4e0a829997a0225373e2c34829a611b70980d7d3674247d4b5b447204ad7f039608
+EBUILD signify-20.ebuild 482 BLAKE2B cbefdf140048582568c52addd3d501bf27838b0a180376cd79d869e8eb2f8f4346419be53845a7e94e57b7eacec85debb0949a52d370ec370716adca3e365d79 SHA512 6972914c088bbf669a89c9f292ec3d3f84624c3c18b347c24147a2630e77c21713300d0a8cffb2a26106a6c480052aa1e651f0ec73f2e53635d623de5e59d223
+EBUILD signify-23.ebuild 543 BLAKE2B 4af7771a8feba476774c635481a7458ff74066d60dc1d51d034892e574ffec1349791d51e028e3b7d4bcccc58c7f067eeaa0a238822a9d7c727618826ee928bd SHA512 081dc53f0b48bd58f4b59101e59ec9f64fe641824142f056820e61107937c39283a5e33f2ce32d711fc46c802557f142f627f754d5b6823f2d0e16fd4ba1c5e2
+MISC metadata.xml 328 BLAKE2B 48c8809b13673350e0ed718437f90815703eb6977ad40b8ca9a2f17b3b51e4d412450a31e58369f49c14e3a3d20a704840ec3efd6e03b9b377c8378598150dcf SHA512 4958752eab2ed703ddab429c46274a605a4954a4da92131979fd988ece5a5a68d944feb60cd4a21e2b6cfdd320fcc00ea631c8befe4cf620cb6b4794e6107560
diff --git a/app-crypt/signify/metadata.xml b/app-crypt/signify/metadata.xml
new file mode 100644
index 000000000000..70c25da76340
--- /dev/null
+++ b/app-crypt/signify/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aperezdc/signify</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/signify/signify-20.ebuild b/app-crypt/signify/signify-20.ebuild
new file mode 100644
index 000000000000..c42b3262662e
--- /dev/null
+++ b/app-crypt/signify/signify-20.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Cryptographically sign and verify files"
+HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
+SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-libs/libbsd-0.7"
+DEPEND=""
+
+src_install() {
+	DESTDIR="${D}" PREFIX="/usr" emake install
+}
diff --git a/app-crypt/signify/signify-23.ebuild b/app-crypt/signify/signify-23.ebuild
new file mode 100644
index 000000000000..8fe565662116
--- /dev/null
+++ b/app-crypt/signify/signify-23.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Cryptographically sign and verify files"
+HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
+SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/libbsd-0.7"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	DESTDIR="${D}" PREFIX="/usr" emake install
+}
diff --git a/app-crypt/signing-party-2.7 b/app-crypt/signing-party-2.7
deleted file mode 100644
index 71e57c8b0d6c..000000000000
--- a/app-crypt/signing-party-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl app-crypt/libmd >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A collection of several tools related to OpenPGP
-EAPI=6
-HOMEPAGE=http://pgp-tools.alioth.debian.org/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-crypt/libmd >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.7.orig.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1f95452d32c4059380d51eb4849f2b08
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
new file mode 100644
index 000000000000..37dfd2721e1f
--- /dev/null
+++ b/app-crypt/signing-party/Manifest
@@ -0,0 +1,3 @@
+DIST signing-party_2.7.orig.tar.gz 201320 BLAKE2B 4fe5781b610dc8acd5166fc7ce7daa1b856f6617952d5eb226cae0c8c6fcaa196b88ffe313b2d71b8f11423a81e84f2124d9adea86edbfb0d22808473d1c36fe SHA512 d1599ca0cb2dd554b4688bc8c77f4a1dd907d00539bb11abe147300dd2184f8548ebe9fdf793e83e2956a220b1c4bf9e19bd543b77f724b0c8ea4794ac945985
+EBUILD signing-party-2.7.ebuild 2981 BLAKE2B 5f539f59ae0ff77ee900cd1cbec7d071501493b47b7855165b7d08d940cb05789e23c924d5bbf42df447805810fa391d9613bb48f37c78c629d442288efbbe35 SHA512 a34d407666181e4e157fa3eecd9fb447c91a915b7dcd1f2d872d80dcb18b2c346db7ad5360174d93774bc3c72f082f1da3c3883931ae5f2e41d371bd29ffd330
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/signing-party/metadata.xml b/app-crypt/signing-party/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/signing-party/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/signing-party/signing-party-2.7.ebuild b/app-crypt/signing-party/signing-party-2.7.ebuild
new file mode 100644
index 000000000000..f2044bcb3a12
--- /dev/null
+++ b/app-crypt/signing-party/signing-party-2.7.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs autotools
+
+DESCRIPTION="A collection of several tools related to OpenPGP"
+HOMEPAGE="http://pgp-tools.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/perl
+	app-crypt/libmd
+"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.3.92
+	dev-perl/GnuPG-Interface
+	dev-perl/Text-Template
+	dev-perl/MIME-tools
+	net-mail/qprint
+	>=dev-perl/MailTools-1.62
+	dev-perl/Net-IDN-Encode
+	virtual/mailx
+	virtual/mta
+	|| (
+		dev-perl/libintl-perl
+		dev-perl/Text-Iconv
+		app-text/recode
+	)"
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# app-crypt/keylookup
+	rm -r keylookup || die
+	# media-gfx/springgraph
+	rm -r springgraph || die
+
+	cd keyanalyze/pgpring || die
+	sed -i 's/AM_C_PROTOTYPES//' configure.ac || die
+	eautoreconf
+	cd "${WORKDIR}" || die
+
+	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
+
+	sed -i "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
+		caff/caff || die
+	sed -i -e 's/automake[^ ]*/true/g' -e 's/autoconf[^ ]*/true/g' keyanalyze/Makefile || die
+	sed -i 's/make /\$(MAKE) /' keyanalyze/Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP=true
+}
+
+src_install() {
+	einstalldocs
+
+	# Check Makefile when a new tool is introduced to this package.
+	# caff
+	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
+	docinto caff
+	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
+	# gpgdir
+	dobin gpgdir/gpgdir
+	docinto gpgdir
+	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
+	# gpg-key2ps
+	dobin gpg-key2ps/gpg-key2ps
+	docinto gpg-key2ps
+	dodoc gpg-key2ps/README
+	# gpglist
+	dobin gpglist/gpglist
+	# gpg-mailkeys
+	dobin gpg-mailkeys/gpg-mailkeys
+	docinto gpg-mailkeys
+	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
+	# gpgparticipants
+	dobin gpgparticipants/gpgparticipants
+	# gpgwrap
+	dobin gpgwrap/bin/gpgwrap
+	docinto gpgwrap
+	dodoc gpgwrap/{LICENSE,NEWS,README}
+	doman gpgwrap/doc/gpgwrap.1
+	# gpgsigs
+	dobin gpgsigs/gpgsigs
+	insinto /usr/share/signing-party
+	# keyanalyze
+	# TODO: some of the scripts are intended for webpages, and not really
+	# packaging, so they are NOT installed yet.
+	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
+	dobin keyanalyze/{keyanalyze,process_keys}
+	docinto keyanalyze
+	dodoc keyanalyze/{README,Changelog}
+	# See app-crypt/keylookup instead
+	#dobin keylookup/keylookup
+	#docinto keylookup
+	#dodoc keylookup/NEWS
+	# sig2dot
+	dobin sig2dot/sig2dot
+	dodoc sig2dot/README.sig2dot
+	# See media-gfx/springgraph instead
+	#dobin springgraph/springgraph
+	#dodoc springgraph/README.springgraph
+	# all other manpages, and the root doc
+	doman */*.1
+	dodoc README
+}
diff --git a/app-crypt/simp_le-9999 b/app-crypt/simp_le-9999
deleted file mode 100644
index e7cfa0f86f7c..000000000000
--- a/app-crypt/simp_le-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =app-crypt/acme-0.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pep8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Simple Let's Encrypt Client
-EAPI=5
-HOMEPAGE=https://github.com/kuba/simp_le
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-3
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =app-crypt/acme-0.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9598e10ac9384742b4d9a53b69278620
diff --git a/app-crypt/simp_le/Manifest b/app-crypt/simp_le/Manifest
new file mode 100644
index 000000000000..c5f7e139c599
--- /dev/null
+++ b/app-crypt/simp_le/Manifest
@@ -0,0 +1,2 @@
+EBUILD simp_le-9999.ebuild 974 BLAKE2B a082695b383776f5c06761b1f3fbe96080ef8b1879bed1edb6d8be7178111fa6674fa1e14905d11eb9274d8d05eae50c7758b38f49fb2cc57512bb14a69210c1 SHA512 e084a93c47f47633809da87926f43be029152040b44202191119d76fbfe712c01fc8fc3b25b92596a0d4dedcd028e02c351e821987bf9c2d0e9d0f3d509b915c
+MISC metadata.xml 216 BLAKE2B f1eb090754fb8175e134db2af7c1fdecac653f3fdf8b4fe6c1a1d620f14179f5fe438b215ba4ef12c28425bf75270cec5372fafe11d2485fc3ae3452b76492b4 SHA512 8bef1d32cbf417341184ed22b8cdae39c12ece60164324cb7a3e75bf6e1af0249225b79fd6d57a1e9a4edd265162b2030f9fa547c4f661d7fe577bc89d267026
diff --git a/app-crypt/simp_le/metadata.xml b/app-crypt/simp_le/metadata.xml
new file mode 100644
index 000000000000..0033a99cee0c
--- /dev/null
+++ b/app-crypt/simp_le/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">kuba/simp_le</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/simp_le/simp_le-9999.ebuild b/app-crypt/simp_le/simp_le-9999.ebuild
new file mode 100644
index 000000000000..8ff65c7a1ac8
--- /dev/null
+++ b/app-crypt/simp_le/simp_le-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/kuba/simp_le.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/kuba/simp_le/archive/v${PV}.tar.gz -> simp_le-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Simple Let's Encrypt Client"
+HOMEPAGE="https://github.com/kuba/simp_le"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	=app-crypt/acme-0.1.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? ( ${RDEPEND} dev-python/pylint[${PYTHON_USEDEP}] dev-python/pep8[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-crypt/simple-tpm-pk11-0.06 b/app-crypt/simple-tpm-pk11-0.06
deleted file mode 100644
index 9a5c2a7a6b3d..000000000000
--- a/app-crypt/simple-tpm-pk11-0.06
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-crypt/tpm-tools[pkcs11] dev-libs/opencryptoki[tpm] app-crypt/trousers !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Simple PKCS11 provider for TPM chips
-EAPI=6
-HOMEPAGE=https://github.com/ThomasHabets/simple-tpm-pk11
-IUSE=libressl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/tpm-tools[pkcs11] dev-libs/opencryptoki[tpm] app-crypt/trousers !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/openssh[-X509]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ThomasHabets/simple-tpm-pk11/archive/0.06.tar.gz -> simple-tpm-pk11-0.06.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=378b1a09274e9a6f38d5dd95c6245e69
diff --git a/app-crypt/simple-tpm-pk11/Manifest b/app-crypt/simple-tpm-pk11/Manifest
new file mode 100644
index 000000000000..45cba3cdf6cd
--- /dev/null
+++ b/app-crypt/simple-tpm-pk11/Manifest
@@ -0,0 +1,3 @@
+DIST simple-tpm-pk11-0.06.tar.gz 28993 BLAKE2B b592acf3d9fe334993ed1e72152ee2c0a25ea3be777035c2d113323522f7d99e6c564bd7c4de0725b0f04f5b6dad90c5a35ede815d28f40a3fb53a6cc9e2bee6 SHA512 72df0637cefdb0d81f741480cdfe24ac0d6a05a93d729f5e2180adf49b5d7ddb0b60d8c6f7d5e79a67bf4cea202067390c8d4532c906273408f7de4fcc5e66e8
+EBUILD simple-tpm-pk11-0.06.ebuild 848 BLAKE2B 55327268ec66292471dd4e3bd6dbd3b3b832eef815f69708b3c144e1683b837c55f9136242be15f64cb4657d7f52d7a8018e628f5f0c26abcf28a2effca96f57 SHA512 4dbdb971fbb5932ec8d13ef67323174dce7b637d00277d680cfb1901e10b24c4b94b6bd1fcafb56e228b7ebd0752eeb8244951d7aae7c11db2689d430c89ea30
+MISC metadata.xml 417 BLAKE2B 814380b49341b7c00e8b6866fbb0676cedbc843424b6fec5d2f88ff159be7eed8a8247dc302172d2548125b737617bc2a755041e7d8134877ae2a650215aece5 SHA512 f62211877cd878f6a1a05456dcafd7564e687308f40a9512c9dafb7a9175a4a31fa709db15441846b0495da65939c4e9fe7c86417ff047c08e7bf31699e04fd5
diff --git a/app-crypt/simple-tpm-pk11/metadata.xml b/app-crypt/simple-tpm-pk11/metadata.xml
new file mode 100644
index 000000000000..44b53b64f090
--- /dev/null
+++ b/app-crypt/simple-tpm-pk11/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>perfinion@gentoo.org</email>
+  </maintainer>
+  <longdescription>A simple library for using the TPM chip to secure SSH keys</longdescription>
+  <upstream>
+    <remote-id type="github">ThomasHabets/simple-tpm-pk11</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
new file mode 100644
index 000000000000..1c0e8dc2f60f
--- /dev/null
+++ b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Simple PKCS11 provider for TPM chips"
+HOMEPAGE="https://github.com/ThomasHabets/simple-tpm-pk11"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/ThomasHabets/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+IUSE="libressl"
+RESTRICT="test" # needs to communicate with the TPM and gtest is all broken
+
+DEPEND="app-crypt/tpm-tools[pkcs11]
+	dev-libs/opencryptoki[tpm]
+	app-crypt/trousers
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	net-misc/openssh[-X509]"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
diff --git a/app-crypt/ssdeep-2.13 b/app-crypt/ssdeep-2.13
deleted file mode 100644
index 167041630751..000000000000
--- a/app-crypt/ssdeep-2.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Computes context triggered piecewise hashes (fuzzy hashes)
-EAPI=6
-HOMEPAGE=http://ssdeep.sourceforge.net/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/ssdeep/ssdeep-2.13.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c6004a6922353eeae33824331464bc81
diff --git a/app-crypt/ssdeep/Manifest b/app-crypt/ssdeep/Manifest
new file mode 100644
index 000000000000..6b724e87e37a
--- /dev/null
+++ b/app-crypt/ssdeep/Manifest
@@ -0,0 +1,4 @@
+AUX ssdeep-2.10-shared.patch 174 BLAKE2B fff5447389ca80a63bf8ac422ca8c06aa1d17715bde05e00e9922b57004f807a435cef58d2d32af269eb39c764ba53b81daae4b745f69f74754f83f13923ee21 SHA512 9429c38e22cf100809062818c286419d141089e0dd081c11034d7f62143ef9fe2d2bac0ad67104d448c387b7bd4b84ff364933f363faae3dda527e5e8390ad1f
+DIST ssdeep-2.13.tar.gz 380712 BLAKE2B 8f5e81a7043fce72e05d45aed963067456c0f344ca66dc9c34cbf5206ba1a497315e0219344ac99815b342a811d2af16d2409421311102288e19084dafd80f22 SHA512 26473f1b8801398534c674d7fdd6e87cf4d7862ed91454bb22865f8b6cf885c777250d0d1cdf2c20a28fdf4961c3b21e505e82f37fb75486a9442902d96f5186
+EBUILD ssdeep-2.13.ebuild 593 BLAKE2B e435fb895d0657c8c1d49edf05ba7ea7cf3190fb8592cb7ff23e592afb703cb8d67e018f3df3efdf482c762b478736d9d2498ef2cc6d629720b98065e9ad2487 SHA512 e50c4a3d4764a7bf3076124231819f64770ef8f7d0080703235b63693cf032e08cedbf8b50de21131259c4a3189cebc73d46a62b0c5f163263114b853809eb07
+MISC metadata.xml 316 BLAKE2B 1916bbf9c489db6a30a7ee238630b4c5b137c1d795ab18183761dd49a5d7bdd40c970c916201c6e217435569f35e7e74ade29f1c3b65b43997dcc0f0f9625d4a SHA512 3fd64f3472e5d036fb4617b2f44d074eff34eeb940cc90c55334712f745b5f4abe02939f423fbf5e28ab6b4eddea2655016711efeffd4707932fe136b0562707
diff --git a/app-crypt/ssdeep/files/ssdeep-2.10-shared.patch b/app-crypt/ssdeep/files/ssdeep-2.10-shared.patch
new file mode 100644
index 000000000000..06cfc55084e7
--- /dev/null
+++ b/app-crypt/ssdeep/files/ssdeep-2.10-shared.patch
@@ -0,0 +1,10 @@
+--- ssdeep-2.10/Makefile.am
++++ ssdeep-2.10/Makefile.am
+@@ -2,7 +2,6 @@
+ bin_PROGRAMS=ssdeep
+ 
+ ssdeep_LDADD=libfuzzy.la
+-ssdeep_LDFLAGS=-static
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
diff --git a/app-crypt/ssdeep/metadata.xml b/app-crypt/ssdeep/metadata.xml
new file mode 100644
index 000000000000..ce7e1f31f036
--- /dev/null
+++ b/app-crypt/ssdeep/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ssdeep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/ssdeep/ssdeep-2.13.ebuild b/app-crypt/ssdeep/ssdeep-2.13.ebuild
new file mode 100644
index 000000000000..386169e63a0e
--- /dev/null
+++ b/app-crypt/ssdeep/ssdeep-2.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Computes context triggered piecewise hashes (fuzzy hashes)"
+HOMEPAGE="http://ssdeep.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DOCS=(
+	AUTHORS ChangeLog FILEFORMAT NEWS README TODO
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10-shared.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+		econf
+}
diff --git a/app-crypt/ssh-multiadd-1.3.2-r1 b/app-crypt/ssh-multiadd-1.3.2-r1
deleted file mode 100644
index f77359dd3f6a..000000000000
--- a/app-crypt/ssh-multiadd-1.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=Adds multiple ssh keys to the ssh authentication agent
-EAPI=5
-HOMEPAGE=http://code.fluffytapeworm.com/projects
-IUSE=X python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] X? ( >=net-misc/x11-ssh-askpass-1.2.2 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://code.fluffytapeworm.com/projects/ssh-multiadd-1.3.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=849c22720fce6e0a9b033961916926c4
diff --git a/app-crypt/ssh-multiadd/Manifest b/app-crypt/ssh-multiadd/Manifest
new file mode 100644
index 000000000000..e14f3feadac3
--- /dev/null
+++ b/app-crypt/ssh-multiadd/Manifest
@@ -0,0 +1,3 @@
+DIST ssh-multiadd-1.3.2.tar.gz 14035 BLAKE2B 1de9e8593be128b792d6babe9ada37e7f611045d573e3430c0bc08a66d9c6acb00f5f6c453b22fd2308233cc8e58c62ab116de1aae702d066f664036bb029027 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3
+EBUILD ssh-multiadd-1.3.2-r1.ebuild 682 BLAKE2B 03116f84d519517597ea91bad356c8b1f78fa976df95a6719d2c14c6d7d77abe5e9c82b77a6e7fb0ec498e170c63033fb1437324be4e6eb990ec499460e2321b SHA512 5744aadd5c4ae1070299465beecde93886f481d763576a6bcf09c03e13f9849dc4516bd5c435cd1b7ca1664dae2167c1a46650442b4571c4a7bac5e1a76646ea
+MISC metadata.xml 489 BLAKE2B ddca902fdd544bc9272fdf6ba38c9e84f6fe97f1b16fb3d118e8b1e8116d0823a8422a5a14e5b3542e06bb7d9424b1da3e53a65527d13bb0a7177c06ff47bcb6 SHA512 4b0ca57e691272aa2c8dcb4272a22d964355191b1dbed5751a58d6c4cad9b083ec0416b0583294abeccadec2f4da5334555484fcbd6f533a2033de129dcf26b3
diff --git a/app-crypt/ssh-multiadd/metadata.xml b/app-crypt/ssh-multiadd/metadata.xml
new file mode 100644
index 000000000000..d24c4924b930
--- /dev/null
+++ b/app-crypt/ssh-multiadd/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ashmew2@gmail.com</email>
+		<name>Ashish Gupta</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..e68bcf0944a4
--- /dev/null
+++ b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Adds multiple ssh keys to the ssh authentication agent"
+HOMEPAGE="http://code.fluffytapeworm.com/projects"
+SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="X"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="
+	${PYTHON_DEPS}
+	X? ( >=net-misc/x11-ssh-askpass-1.2.2 )"
+
+src_prepare() {
+	python_fix_shebang .
+}
+
+src_compile(){
+	:
+}
+
+src_install() {
+	dobin ssh-multiadd
+	doman ssh-multiadd.1
+	dodoc Changelog README todo
+}
diff --git a/app-crypt/stan-0.4.1-r1 b/app-crypt/stan-0.4.1-r1
deleted file mode 100644
index 9f1f56252b11..000000000000
--- a/app-crypt/stan-0.4.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Stan analyzes binary streams and calculates statistical information
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://gentoo/stan-0.4.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=33059c52e47c7189dd8877c37994766d
diff --git a/app-crypt/stan/Manifest b/app-crypt/stan/Manifest
new file mode 100644
index 000000000000..8cf77ddcf239
--- /dev/null
+++ b/app-crypt/stan/Manifest
@@ -0,0 +1,4 @@
+AUX stan-0.4.1-errno.patch 643 BLAKE2B 958dd753d5cca8ca9edde109b4242012af9c5098622ad1c737f4f655de69324295ceb80bfc52f4cf2754a94305a51fd143bc5ad2ec4857e3b2d77446ed052cbc SHA512 3b1aaa533559252136d99aad482e26b41dc1a8516dbaf56ca3e7c152378f622b44634d0e54cc5803f3fb1f7aa30a2305ab16535cf1c1d1d3de60c6ec5b75491c
+DIST stan-0.4.1.tar.gz 37471 BLAKE2B 6d2dd24a42daf56d06d723af41d89c243b7c511bc5ba51e673b6a6ee03685b460a05805942607a819c142ed4138970b9e510c307394bbc36f68cf455dc4f8fe5 SHA512 f7c123c9887a6cf994d66d950fc50c42340b35ae6353b69918be95cc7886b59ed2042a85c40596dcf25724043810c50f81c977c54af26af0e7131c12bda0e00b
+EBUILD stan-0.4.1-r1.ebuild 579 BLAKE2B bb9d017ffa1a19ddcba64d26488e0a20b8f7afa1afc5e0eb1194454431ac882ba028d63a6de1330f19077dd9ebc935daf56d4aac0902438bb2871f5add647176 SHA512 5984d5b4065af8dfd00b76487f00f7357b16de1e797c50366f4802969bf50fa7aa336ad07a84aa9dbe05867b1a3f4ece03938c7766bafbb93a0ca16ad9c1e35e
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/stan/files/stan-0.4.1-errno.patch b/app-crypt/stan/files/stan-0.4.1-errno.patch
new file mode 100644
index 000000000000..6bce4ba7e0d4
--- /dev/null
+++ b/app-crypt/stan/files/stan-0.4.1-errno.patch
@@ -0,0 +1,26 @@
+--- a/src/data.c	2005-12-05 13:23:44.000000000 +0200
++++ b/src/data.c	2005-12-05 13:24:31.000000000 +0200
+@@ -55,7 +55,9 @@
+ #include <stats.h>
+ #include <config.h>
+ 
+-extern int errno, verbose, progress, bits;
++#include <errno.h>
++
++extern int verbose, progress, bits;
+ extern tnode_t **treap;
+ extern bnode_t *bintree;
+ size_t size = 0;
+--- a/src/stan.c	2005-12-05 13:23:49.000000000 +0200
++++ b/src/stan.c	2005-12-05 13:24:57.000000000 +0200
+@@ -46,7 +46,9 @@
+ #include <bits.h>
+ #include <config.h>
+ 
+-int errno, verbose = 0, progress = 0, bits = 0;
++#include <errno.h>
++
++int verbose = 0, progress = 0, bits = 0;
+ 
+ void print_usage()
+ {
diff --git a/app-crypt/stan/metadata.xml b/app-crypt/stan/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/stan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/stan/stan-0.4.1-r1.ebuild b/app-crypt/stan/stan-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..91952b99aec5
--- /dev/null
+++ b/app-crypt/stan/stan-0.4.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Stan analyzes binary streams and calculates statistical information"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-errno.patch"
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	sed -i \
+			-e "s/-O3/${CFLAGS}/" \
+			-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" configure.ac || die
+	eautoreconf
+}
diff --git a/app-crypt/stoken-0.92 b/app-crypt/stoken-0.92
deleted file mode 100644
index 313324e09e8d..000000000000
--- a/app-crypt/stoken-0.92
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/nettle gtk? ( >=x11-libs/gtk+-3.12:3 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Software Token for Linux/UNIX
-EAPI=6
-HOMEPAGE=https://github.com/cernekee/stoken
-IUSE=gtk
-KEYWORDS=amd64 arm ~arm64 ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/nettle gtk? ( >=x11-libs/gtk+-3.12:3 )
-SLOT=0
-SRC_URI=https://github.com/cernekee/stoken/archive/v0.92.tar.gz -> stoken-0.92.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=42fb07b0626cc7e2fdfc0487bd47870b
diff --git a/app-crypt/stoken/Manifest b/app-crypt/stoken/Manifest
new file mode 100644
index 000000000000..de91d1f9d782
--- /dev/null
+++ b/app-crypt/stoken/Manifest
@@ -0,0 +1,3 @@
+DIST stoken-0.92.tar.gz 117212 BLAKE2B 8d236a73b0626ab91d145d01fa07c28ba8c54a3053aaba32b64b4dacc39dc8265d5740630ec2495d678c975b1bfa480a79a5ec1115accf39170229b444673f48 SHA512 b41262320c24e487ece884fc431d835c787f057947a92e3d57ed2047bc02b576b072e8a69f4b58b47ab1f913b5ae8c3ee8108d3b55c1477f15848420b668fea3
+EBUILD stoken-0.92.ebuild 635 BLAKE2B 4ad1ad155df7f4f933cbd9137637ef5f9dbeea5be8722b1ce7d9afe5df0cbdfe0b0d9e9e21803a1d3338adf6a5e6e5c6ca24ecae5daa543e67846967e86bab58 SHA512 207e1881941c7b3a8307b8d885d7105edd1b1c1ac56e987bb5b957e7987a08d18e0230c1ea2db5e70bc4cbe2d8d3ad27a0866a693f2ae009de83d803d387b30a
+MISC metadata.xml 620 BLAKE2B 2655c4310ae4cc76e7609e4646879d81ef6ee26b9dff67b922822c89de19416c96bd63762920633ff4e018c8431fbb45f8dc93971f2fb8afbe1dd66c8ea2e318 SHA512 bda231308c073a40db47dfaca96c6af8bf194d5ef4727e8c8c99ad1492150f79a9978daeb3ffe503db03501a0a6c6c465d036bec7ad58398319f8d01d27f7931
diff --git a/app-crypt/stoken/metadata.xml b/app-crypt/stoken/metadata.xml
new file mode 100644
index 000000000000..920373f43e65
--- /dev/null
+++ b/app-crypt/stoken/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cernekee/stoken</remote-id>
+		<bugs-to>https://github.com/cernekee/stoken/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		stoken is an open source tokencode generator compatible with RSA SecurID 128-bit (AES) tokens.
+		It is a hobbyist project, not affiliated with or endorsed by RSA Security.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/stoken/stoken-0.92.ebuild b/app-crypt/stoken/stoken-0.92.ebuild
new file mode 100644
index 000000000000..06a2e2468cfd
--- /dev/null
+++ b/app-crypt/stoken/stoken-0.92.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Software Token for Linux/UNIX"
+HOMEPAGE="https://github.com/cernekee/stoken"
+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"
+
+#	|| ( dev-libs/nettle dev-libs/libtomcrypt )    libtomcrypt is not packaged
+RDEPEND="
+	dev-libs/nettle
+	gtk? ( >=x11-libs/gtk+-3.12:3 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with gtk)
+}
diff --git a/app-crypt/tc-play-2.0-r1 b/app-crypt/tc-play-2.0-r1
deleted file mode 100644
index 2047a82c47f7..000000000000
--- a/app-crypt/tc-play-2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/libgpg-error sys-fs/lvm2 sys-apps/util-linux dev-libs/libgcrypt:0 gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=a free, pretty much fully featured and stable TrueCrypt implementation
-EAPI=6
-HOMEPAGE=https://github.com/bwalex/tc-play
-IUSE=gnutls libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/libgpg-error sys-fs/lvm2 sys-apps/util-linux dev-libs/libgcrypt:0 gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://github.com/bwalex/tc-play/archive/v2.0.tar.gz -> tc-play-2.0.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=98043003d98d0ca1588e2aaa2e96d6e9
diff --git a/app-crypt/tc-play/Manifest b/app-crypt/tc-play/Manifest
new file mode 100644
index 000000000000..0cf1b5eaeb79
--- /dev/null
+++ b/app-crypt/tc-play/Manifest
@@ -0,0 +1,4 @@
+AUX tc-play-2.0-build.patch 677 BLAKE2B 1b0f8372a6e94a7ff2cc3c1236855d6d1973172b78586e6ee72f29723841aa700ece23be1c985b00c37196da20ea18c1b30f13d0e00fa8de6bf603cfce769110 SHA512 0f41f59b8fe4376f5d48dcb3e3ca76698b141924b6f0b3768eb46238f6d597f2a8cf3c6aa840bba57ecfd61337182eb48e627fc1a04b348849e8bc5346c82e9b
+DIST tc-play-2.0.tar.gz 1015525 BLAKE2B 1481eecc8aaf2cb9698eed96a9cdabaa2b74daf11865dd29a6fab7e66fb76aa2f6e544fe7ac53a2510415ee6ddf3c5732c774a26708fe354113eb9de6a9b62d9 SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7
+EBUILD tc-play-2.0-r1.ebuild 1153 BLAKE2B 8e7959946df7d19265ca17faea0544aa5edb181fec7a5a86113fd98d7572a6f0aff7ddebc81645812c3aafe6ef916bce222a3362fcaf904c1d7efcdceac6f6e8 SHA512 30557168783f5b4b002610d424a01410f0cd2e845f4dac399a57bcfa42761823a391a5cfb717d9b4da1af9c5e09f87d114cb571524a6d32cbfc47b0bafd79410
+MISC metadata.xml 329 BLAKE2B 09a867de52dae3e8b79438e2aa2893b7222dc9aa25013c2fc922fb2e1159f4dc96d57836f524770c284372ea9cf0a4056adc6ec425ccde5f6c3fad035d369ca7 SHA512 82f9a92ca705a89f30dd5ae33f45c7b233cd39894083572f8a17c60207d9de15d2188ebe6330da1765b5cd37ce656d904689c8862d3301fb1bd0bb001c1cef73
diff --git a/app-crypt/tc-play/files/tc-play-2.0-build.patch b/app-crypt/tc-play/files/tc-play-2.0-build.patch
new file mode 100644
index 000000000000..0385f33b45b4
--- /dev/null
+++ b/app-crypt/tc-play/files/tc-play-2.0-build.patch
@@ -0,0 +1,27 @@
+From 3f9235841ba4494962b3c7dafcd16fd3ff5f6575 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 8 Apr 2017 20:27:17 +0300
+Subject: [PATCH] build: include sys/sysmacros.h for recent glibc
+
+https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ tcplay.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tcplay.c b/tcplay.c
+index cd882cf..a6d4655 100644
+--- a/tcplay.c
++++ b/tcplay.c
+@@ -47,6 +47,7 @@
+ #if defined(__linux__)
+ #include <libdevmapper.h>
+ #include <uuid/uuid.h>
++#include <sys/sysmacros.h>
+ #elif defined(__DragonFly__)
+ #include <libdm.h>
+ #include <uuid.h>
+-- 
+2.10.2
+
diff --git a/app-crypt/tc-play/metadata.xml b/app-crypt/tc-play/metadata.xml
new file mode 100644
index 000000000000..5f7a0a616455
--- /dev/null
+++ b/app-crypt/tc-play/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bwalex/tc-play</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/tc-play/tc-play-2.0-r1.ebuild b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
new file mode 100644
index 000000000000..16df65d19d06
--- /dev/null
+++ b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="a free, pretty much fully featured and stable TrueCrypt implementation"
+HOMEPAGE="https://github.com/bwalex/tc-play"
+SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnutls libressl"
+
+DEPEND="
+	dev-libs/libgpg-error
+	sys-fs/lvm2
+	sys-apps/util-linux
+	dev-libs/libgcrypt:0
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	local backend="openssl"
+	use gnutls && local backend="gcrypt"
+
+	EXTRA_MAKE_FLAGS=(
+		PBKDF_BACKEND="${backend}"
+		WARNFLAGS=""
+		CC=$(tc-getCC)
+		AR=$(tc-getAR)
+		PREFIX=/usr \
+		LIBDIR=/usr/$(get_libdir)
+	)
+}
+
+src_compile() {
+	emake -f Makefile.classic \
+		tcplay \
+		"${EXTRA_MAKE_FLAGS[@]}"
+}
+
+src_install() {
+	emake -f Makefile.classic \
+		"${EXTRA_MAKE_FLAGS[@]}" \
+		install_program \
+		DESTDIR="${ED}"
+}
diff --git a/app-crypt/tinyca-2.0.7.5-r3 b/app-crypt/tinyca-2.0.7.5-r3
deleted file mode 100644
index e7b4b10a2707..000000000000
--- a/app-crypt/tinyca-2.0.7.5-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-perl/Locale-gettext >=virtual/perl-MIME-Base64-2.12 >=dev-perl/Gtk2-1.072 >=sys-apps/sed-4
-DESCRIPTION=Simple Perl/Tk GUI to manage a small certification authority
-EAPI=6
-HOMEPAGE=https://opsec.eu/src/tinyca/
-IUSE=libressl
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=Artistic
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-perl/Locale-gettext >=virtual/perl-MIME-Base64-2.12 >=dev-perl/Gtk2-1.072
-SLOT=0
-SRC_URI=http://tinyca.sm-zone.net/tinyca2-0.7.5.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=091a419657eb282a1f36ee5fffa9a992
diff --git a/app-crypt/tinyca/Manifest b/app-crypt/tinyca/Manifest
new file mode 100644
index 000000000000..899c0bedb4d0
--- /dev/null
+++ b/app-crypt/tinyca/Manifest
@@ -0,0 +1,6 @@
+AUX tinyca-2.0.7.3-compositefix.patch 317 BLAKE2B 821c7758eaf7058b3f5bea17796fe9c4406a2a93725c7992c9c6b5fd7d326ea699e8b324091f905fa4e572a9324ced05d66991fd363dc8afbc43e8af2ec8d390 SHA512 c254b7fd39ffcc381c0d7b6787322e289a33d4d5c780d9cca6fad22033ffc7b933bafef464b20d8c01025529a2dc06eb8d9a41f6c01d2e60401792b18a4b743f
+AUX tinyca-2.0.7.5-openssl-1.patch 1468 BLAKE2B 338c4666f5d3b231b449c3118b1f0eb14b8d469c505cc7818abc3f12b4a76f8f8aa23c0aa1391e2fedc1a26300be46d429ccde334d5043cef6bd7f5536ca88d1 SHA512 5c5487eef82d30cf2cffc75d1fbd331a7c490dc30befa91ee753f4dd82bb8492089d162c3f15c20722df00adedf7db0bd30cf2b83363922a9402d66fc1abe8c4
+AUX tinyca-2.0.7.5-perl-5.18.patch 1738 BLAKE2B 7b5af07210a41573845ab97f5337c46110c5422f2065eea81d41a35eefda467c30cfa3ddd42c944fe1db64f392e7c72a828b853c216e4c9ce93143df37eedb45 SHA512 528a34b9ca9ace403949b6d347f91a4a33d94e92f867ea476adbaef745439706014c478be36ac6dd45d15f56f0ba2e1314c633d68285ca7879fa25dd0d3cee33
+DIST tinyca2-0.7.5.tar.bz2 172779 BLAKE2B f6a4b1d9d2a22416ff8bbec9fa0fa3aa7f6cae4ff0b32dd9ab9063760b47d91c931d13c73268c2f627411e5e02ec99231ea847ecf30a963a027552bb3990b38b SHA512 47df0b995715ad973b12da7d2999ae90f8887549437235b287e1d294331adc8d527bf4435ce1c30df278db8e5f8fc7df29a35d3650d41bfd4d0a0a7c193994aa
+EBUILD tinyca-2.0.7.5-r3.ebuild 1486 BLAKE2B 8412f05f6e35893a5ac881651a0ed738abd52799e36f1fdcf974fee2961df4c56bf342acacc704e62df901c537918f04f0cf328579cc7c63dfaf0c305678d32e SHA512 6736299b1c124d0cf8e0af68a771d19bd0a382a09a12c70718f77b2e8a354d2e179573a79de87a1c670e333533ed49c3c873bd79f04b6394f3c76f12aa56d582
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/tinyca/files/tinyca-2.0.7.3-compositefix.patch b/app-crypt/tinyca/files/tinyca-2.0.7.3-compositefix.patch
new file mode 100644
index 000000000000..01a757cc778e
--- /dev/null
+++ b/app-crypt/tinyca/files/tinyca-2.0.7.3-compositefix.patch
@@ -0,0 +1,12 @@
+--- tinyca2-0.7.2/tinyca2	2006-05-28 21:45:03.000000000 +1000
++++ tinyca2-0.7.2/tinyca2	2006-05-28 21:46:38.000000000 +1000
+@@ -87,6 +87,9 @@
+ 
+ umask(0077);
+ 
++# https://bugs.gentoo.org/show_bug.cgi?id=78576
++$ENV{XLIB_SKIP_ARGB_VISUALS}= '1';
++
+ # create main object and initialize CA
+ my $gui = GUI->new($init);
+ 
diff --git a/app-crypt/tinyca/files/tinyca-2.0.7.5-openssl-1.patch b/app-crypt/tinyca/files/tinyca-2.0.7.5-openssl-1.patch
new file mode 100644
index 000000000000..27831c6854f9
--- /dev/null
+++ b/app-crypt/tinyca/files/tinyca-2.0.7.5-openssl-1.patch
@@ -0,0 +1,48 @@
+--- a/lib/OpenSSL.pm	2013-03-05 15:57:46.332286060 +0100
++++ b/lib/OpenSSL.pm	2013-03-05 15:57:53.408466038 +0100
+@@ -605,6 +605,8 @@
+          # dirty fix (incompleted) --curly
+          $i = sprintf( "%x", $1);
+          $tmp->{'SERIAL'} = length($i)%2?"0".uc($i):uc($i);
++      } elsif ($_ =~ /^\s*([da-f]{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2})\s*$/i) {
++	$tmp->{'SERIAL'} = $1;
+       } elsif ($_ =~ /Signature Algorithm.*: (\w+)/i) {
+          $tmp->{'SIG_ALGORITHM'} = $1;
+       } elsif ($_ =~ /Issuer: (.+)/i) {
+@@ -823,10 +825,10 @@
+    $cmd = "$self->{'bin'} $opts->{'cmd'}";
+    $cmd .= " -config $opts->{'config'}" if(defined($opts->{'config'}));
+    $cmd .= " -inform $opts->{'inform'}";
+-   $cmd .= " -out \"$file\"";
+    if($opts->{'outform'} eq 'TEXT') {
+       $cmd .= " -text -noout";
+    } else {
++      $cmd .= " -out \"$file\"";
+       $cmd .= " -outform $opts->{'outform'}";
+    }
+ 
+@@ -859,13 +861,17 @@
+       }
+    }
+ 
+-   open(IN, $file) || do {
+-      my $t = sprintf(_("Can't open file %s: %s"), $file, $!);
+-      GUI::HELPERS::print_warning($t);
+-      return;
+-   };
+-   $tmp .= $_ while(<IN>);
+-   close(IN);
++   if ($opts->{'outform'} eq 'TEXT') {
++      $tmp = $ext;
++   } else {
++      open(IN, $file) || do {
++         my $t = sprintf(_("Can't open file %s: %s"), $file, $!);
++         GUI::HELPERS::print_warning($t);
++         return;
++      };
++      $tmp .= $_ while(<IN>);
++      close(IN);
++   }
+ 
+    unlink($file);
+ 
diff --git a/app-crypt/tinyca/files/tinyca-2.0.7.5-perl-5.18.patch b/app-crypt/tinyca/files/tinyca-2.0.7.5-perl-5.18.patch
new file mode 100644
index 000000000000..e8ca5d695daf
--- /dev/null
+++ b/app-crypt/tinyca/files/tinyca-2.0.7.5-perl-5.18.patch
@@ -0,0 +1,47 @@
+--- tinyca2-0.7.5/lib/GUI.pm	2006-07-25 16:12:00.000000000 -0400
+--- tinyca2-0.7.5/lib/GUI.pm	2006-07-25 16:12:00.000000000 -0400
+@@ -978,7 +978,7 @@
+    $piter = $store->append($root);
+    $store->set($piter, 0 => $t);
+ 
+-   for my $l qw(CN EMAIL O OU C ST L) {
++   for my $l (qw(CN EMAIL O OU C ST L)) {
+       if(defined($parsed->{$l})) {
+          if($l eq "OU") {
+             foreach my $ou (@{$parsed->{'OU'}}) {
+@@ -1003,7 +1003,7 @@
+       $piter = $store->append($root);
+       $store->set($piter, 0 => $t);
+    
+-      for my $l qw(CN EMAIL O OU C ST L) {
++      for my $l (qw(CN EMAIL O OU C ST L)) {
+          if(defined($parsed->{'ISSUERDN'}->{$l})) {
+             if($l eq "OU") {
+                foreach my $ou (@{$parsed->{'ISSUERDN'}->{'OU'}}) {
+@@ -1029,7 +1029,7 @@
+       $piter = $store->append($root);
+       $store->set($piter, 0 => $t);
+    
+-      for my $l qw(STATUS NOTBEFORE NOTAFTER) {
++      for my $l (qw(STATUS NOTBEFORE NOTAFTER)) {
+          if(defined($parsed->{$l})) {
+             $citer = $store->append($piter);
+             $store->set($citer, 
+@@ -1045,7 +1045,7 @@
+    $store->set($piter, 0 => $t);
+ 
+ 
+-   for my $l qw(STATUS SERIAL KEYSIZE PK_ALGORITHM SIG_ALGORITHM TYPE) {
++   for my $l (qw(STATUS SERIAL KEYSIZE PK_ALGORITHM SIG_ALGORITHM TYPE)) {
+       if(defined($parsed->{$l})) {
+          $citer = $store->append($piter);
+          $store->set($citer, 
+@@ -1060,7 +1060,7 @@
+       $piter = $store->append($root);
+       $store->set($piter, 0 => $t);
+    
+-      for my $l qw(FINGERPRINTMD5 FINGERPRINTSHA1) {
++      for my $l (qw(FINGERPRINTMD5 FINGERPRINTSHA1)) {
+          if(defined($parsed->{$l})) {
+             $citer = $store->append($piter);
+             $store->set($citer, 
diff --git a/app-crypt/tinyca/metadata.xml b/app-crypt/tinyca/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/tinyca/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild b/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild
new file mode 100644
index 000000000000..274da28fc848
--- /dev/null
+++ b/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_P="${PN}${PV/./-}"
+DESCRIPTION="Simple Perl/Tk GUI to manage a small certification authority"
+HOMEPAGE="https://opsec.eu/src/tinyca/"
+SRC_URI="http://tinyca.sm-zone.net/${MY_P}.tar.bz2"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="libressl"
+LANGS="en de cs es sv"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-perl/Locale-gettext
+	>=virtual/perl-MIME-Base64-2.12
+	>=dev-perl/Gtk2-1.072"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.7.3-compositefix.patch"
+	"${FILESDIR}/${P}-openssl-1.patch"
+	"${FILESDIR}/${P}-perl-5.18.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e 's:./lib:/usr/share/tinyca/lib:g' \
+		-e 's:./templates:/usr/share/tinyca/templates:g' \
+		-e 's:./locale:/usr/share/locale:g' "${S}/tinyca2" || die
+}
+
+src_compile() {
+	emake -C po
+}
+
+locale_install() {
+	insinto /usr/share/locale/$@/LC_MESSAGES/
+	doins locale/$@/LC_MESSAGES/tinyca2.mo
+}
+
+src_install() {
+	einstalldocs
+	newbin tinyca2 tinyca
+	insinto /usr/share/tinyca/lib
+	doins lib/*.pm
+	insinto /usr/share/tinyca/lib/GUI
+	doins lib/GUI/*.pm
+	insinto /usr/share/tinyca/templates
+	doins templates/*
+	insinto /usr/share/
+	strip-linguas ${LANGS}
+	local l
+	for l in ${LANGS}; do
+		if [ "$l" != "en" ]; then
+			has ${l} ${LINGUAS-${l}} && locale_install $l
+		fi
+	done
+}
diff --git a/app-crypt/tpm-emulator-0.7.4-r1 b/app-crypt/tpm-emulator-0.7.4-r1
deleted file mode 100644
index c2187c9e5d35..000000000000
--- a/app-crypt/tpm-emulator-0.7.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !ssl? ( dev-libs/gmp ) modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Emulator driver for tpm
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/tpm-emulator.berlios/
-IUSE=libressl ssl kernel_linux kernel_linux modules
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) modules? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/tpm-emulator/tpm_emulator-0.7.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=396d5e96e98f54026c7c10fd459644e1
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
new file mode 100644
index 000000000000..19e3c1e1929a
--- /dev/null
+++ b/app-crypt/tpm-emulator/Manifest
@@ -0,0 +1,5 @@
+AUX tpm-emulator.confd-0.7.4 34 BLAKE2B 39d858219bf12309c361bd65070df3a941de10d073e3014e0196bc3f100c605a7be1700c1e25d46fa94a27778c453732e9102be3fe11260f6b3bf617c47bb5ec SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504
+AUX tpm-emulator.initd-0.7.4 1100 BLAKE2B 19736ff8ad067390adb951f4b3f30656bf7345f36cba51b5a96114f3acc069391f3c4e7ecbb563f2ad6fbb25263b950b907c130b5dd0a6523a607a264de61469 SHA512 5fab6f4c9b7057fa1bf23b179747d125ec77729a1a69b762735c429824ce6dfee3033012b027a44e5c731ec86a4e78b8b64c44d27b207867a26a9663382a84f9
+DIST tpm_emulator-0.7.4.tar.gz 214145 BLAKE2B b8bbd53ecfb90e87f1306c03d2c65a472819d23d10bd63fa966bfadef4776c3876c2f6fc03cc878ece670bdfcd22c9f403ef4bc7f4593a0a6c7f8d17051ac3ba SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35
+EBUILD tpm-emulator-0.7.4-r1.ebuild 1722 BLAKE2B 7cfeaf2ccf0e9099fbe583182bbf7afcd744225bce28b295b6bbb191a624bb4814bd286bf055e68c88ba6cbda63fcd31ecd17846169bb1a81f1ab1da56d146f6 SHA512 31a65b04536fd43e20d6b6d5215e8eea7d5710fafa79ebd48757de80b1e9c0890269130f8f5ec4a764987d18b0dcd879405337a056a60d8ae2c33fd1a39c6eb6
+MISC metadata.xml 322 BLAKE2B c136948fea0130f683bd8ff1c52e03707b801a446859dd4e03ee34965ccf5babd69f28c437f5b568a6f9e308669b23c49127a3592ef702fa06323f368f1fd8fc SHA512 59ca2140630f6c408c51176a30ad8357ecaf8c1a3b37b495176b25cf2b1cb259882dded5072440cfbfe2d16741520a0b30b41384db89c794ec183b318419b578
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4 b/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4
new file mode 100644
index 000000000000..da24e57840b9
--- /dev/null
+++ b/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4
@@ -0,0 +1,2 @@
+STARTUP_MODE="save"
+#DEBUG="true"
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4 b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
new file mode 100644
index 000000000000..8d5b9be561b1
--- /dev/null
+++ b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
@@ -0,0 +1,59 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+STARTUP_MODE='save';
+
+extra_started_commands="clear save deactivated"
+command="/usr/bin/tpmd"
+command_args="-o tss -g tss"
+
+depend() {
+	use logger
+	after coldplug
+}
+
+checkconfig() {
+	lsmod | grep -q "^tpmd_dev\b" \
+		|| modprobe tpmd_dev &>/dev/null \
+		|| eerror "Failed to load module tpmd_dev";
+
+	if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
+		eerror "No TPM device found!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	ebegin "Starting tpm-emulator daemon with mode '$STARTUP_MODE' (tpmd)"
+	checkconfig || eend $?
+	checkpath -d -m 0775 -o tss /var/run/tpm
+	start-stop-daemon --start --exec "${command}" -- ${command_args} $STARTUP_MODE > /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping tpm-emulator daemon (tpmd)"
+	start-stop-daemon --stop --exec "${command}" -- ${command_args} > /dev/null
+	eend $?
+}
+
+clear() {
+	STARTUP_MODE='clear';
+	stop
+	start
+}
+
+save() {
+	STARTUP_MODE='save';
+	stop
+	start
+}
+
+deactivated() {
+	STARTUP_MODE='deactivated';
+	stop
+	start
+}
+
diff --git a/app-crypt/tpm-emulator/metadata.xml b/app-crypt/tpm-emulator/metadata.xml
new file mode 100644
index 000000000000..e3da96029705
--- /dev/null
+++ b/app-crypt/tpm-emulator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tpm-emulator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..3bd4cc56bd52
--- /dev/null
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MODULES_OPTIONAL_USE="modules"
+inherit flag-o-matic user linux-mod cmake-utils udev
+
+MY_P=${P/-/_}
+DESCRIPTION="Emulator driver for tpm"
+HOMEPAGE="https://sourceforge.net/projects/tpm-emulator.berlios/"
+SRC_URI="mirror://sourceforge/tpm-emulator/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libressl ssl"
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	!ssl? ( dev-libs/gmp )"
+
+S=${WORKDIR}/${P/-/_}
+
+pkg_setup() {
+	enewuser tss -1 -1 /var/lib/tpm tss
+	if use modules; then
+		CONFIG_CHECK="MODULES"
+		linux-mod_pkg_setup
+		BUILD_TARGETS="all"
+		BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# do not build and install the kernel module
+	sed -i 's/COMMAND ${tpmd_dev_BUILD_CMD}//' tpmd_dev/CMakeLists.txt || die
+	sed -i 's/install(CODE.*//' tpmd_dev/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_OPENSSL=$(usex ssl)
+	)
+	append-cflags -Wno-implicit-fallthrough
+	cmake-utils_src_configure
+
+	# only here we have BUILD_DIR
+	MODULE_NAMES="tpmd_dev(misc:${BUILD_DIR}/tpmd_dev/linux)"
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use modules && linux-mod_src_compile
+	emake -C "${BUILD_DIR}/tpmd_dev/linux" tpmd_dev.rules
+}
+
+src_install() {
+	cmake-utils_src_install
+	use modules && linux-mod_src_install
+
+	dodoc README
+
+	udev_newrules "${BUILD_DIR}/tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
+
+	newinitd "${FILESDIR}"/${PN}.initd-0.7.4 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-0.7.4 ${PN}
+
+	keepdir /var/log/tpm
+	fowners tss:tss /var/log/tpm
+}
diff --git a/app-crypt/tpm-tools-1.3.9 b/app-crypt/tpm-tools-1.3.9
deleted file mode 100644
index 1a1ee6469c34..000000000000
--- a/app-crypt/tpm-tools-1.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-crypt/trousers-0.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pkcs11? ( dev-libs/opencryptoki ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=TrouSerS' support tools for the Trusted Platform Modules
-EAPI=6
-HOMEPAGE=http://trousers.sourceforge.net
-IUSE=libressl nls pkcs11 debug
-KEYWORDS=amd64 ~arm arm64 ~m68k ~s390 ~sh x86
-LICENSE=CPL-1.0
-RDEPEND=>=app-crypt/trousers-0.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pkcs11? ( dev-libs/opencryptoki ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/tpm-tools/tpm-tools-1.3.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e2497839aba698f26e9c2aa34c30d2d
diff --git a/app-crypt/tpm-tools-1.3.9.1 b/app-crypt/tpm-tools-1.3.9.1
deleted file mode 100644
index 1efa2c9cbacd..000000000000
--- a/app-crypt/tpm-tools-1.3.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-crypt/trousers-0.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pkcs11? ( dev-libs/opencryptoki ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=TrouSerS' support tools for the Trusted Platform Modules
-EAPI=6
-HOMEPAGE=http://trousers.sourceforge.net
-IUSE=libressl nls pkcs11 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86
-LICENSE=CPL-1.0
-RDEPEND=>=app-crypt/trousers-0.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pkcs11? ( dev-libs/opencryptoki ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/tpm-tools/tpm-tools-1.3.9.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6796fdf8e650b548e533bf6577b358a6
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
new file mode 100644
index 000000000000..d6f97db1ffaf
--- /dev/null
+++ b/app-crypt/tpm-tools/Manifest
@@ -0,0 +1,6 @@
+AUX tpm-tools-1.3.9-gold.patch 451 BLAKE2B a322007af718189bd2a05da19c1b67ee0f630515233515569661e16b1a9f36c82c2b97a998ec526e0c9c617da3a4e5bf08b6c0eeb3642b16e65a47757ae59f36 SHA512 7f9473a456c5901c28ec0394158e43b3d8cc3a9a994e5be5d1a45b20f5360f2f0b7778eb93246964192e19fdd140ee5b50d1852500c9aface2824d83c6907c41
+DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
+DIST tpm-tools-1.3.9.tar.gz 484023 BLAKE2B 5f9809a8dd4c565c647ceb394e6a6086cd42d256feb39599331b979f73150f60881ba9f25a3b0171173d66da8718f1475c6945b243b86c2261c4e8c489802803 SHA512 460e56031aa65ede6b7aebf0c594d4093d870fb46f7c453c429e53cca442d4c7797ac29b519bca28d42133bc6d7701cdf938adbdf11f8be841157d4f4a3e17ca
+EBUILD tpm-tools-1.3.9.1.ebuild 1022 BLAKE2B 4cdff4f76c73f77207e4a8e368cbdadf206648b095c07b496fb334edadbbd462663d73598c10400b8a0f58b7c5bd7fe2e85a29d497a167c9622b3b046fc6715e SHA512 d230f6b7379fa975d0ea284e661f6b169b2bd559f959ef57db54b05edcb81eeb104081794ed625334c3797aeccc0c40a21d75370c4dfba13e38ac0daed150e07
+EBUILD tpm-tools-1.3.9.ebuild 1063 BLAKE2B 942d5fa06f92c84fed92068b3b9fd266081cc6822e5589725dc10ec6f48a5ccbdd0a2b27ebc7c50eee09f2139ce3d5a29e0834e4a56e2369c98697e322fc5a5f SHA512 a6b15b03b9d4018932080890b5bf9f156e600e8b89a033b895d0be5a6d304571acbd601775886293db542800f76d2805b613298f01a802a2ecbca4a9ba2c9120
+MISC metadata.xml 515 BLAKE2B 06991185c31f6e40b7cda3c9842339911e9806d024e1493ef674751b4d253f5f701a8386a8969f7124b29b2c984f109ec98cb767380b48781fb22bd266d7863a SHA512 5aea8cabd5ae0a00b4a49717efaf8ed6d6363131ff8bdc2a9167108297d32dee72c5419bbc84ae9ba1263d515dff2aa092b991c8411771a2b8c361bcf000258a
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
new file mode 100644
index 000000000000..1745c690e570
--- /dev/null
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
@@ -0,0 +1,10 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index cef6a2f..d7092a7 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -80,4 +80,4 @@ endif
+ # Unseal library - for addition to existing apps, counter part of seal cmd
+ libtpm_unseal_la_SOURCES =	tpm_unseal.c
+ libtpm_unseal_la_LDFLAGS =	-shared -version-info 1:0:0
+-libtpm_unseal_la_LIBADD  =	-ltspi  libtpm_tspi.la @INTLLIBS@
++libtpm_unseal_la_LIBADD  =	-ltspi  libtpm_tspi.la -lcrypto @INTLLIBS@
diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
new file mode 100644
index 000000000000..31ebf3b6ac32
--- /dev/null
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <use>
+    <flag name="pkcs11">
+      Build Token data management utilities based on OpenCryptoki's
+      (<pkg>dev-libs/opencryptoki</pkg>) PKCS#11 implementation.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">trousers</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
new file mode 100644
index 000000000000..4b922742df44
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+IUSE="libressl nls pkcs11 debug"
+
+COMMON_DEPEND="
+	>=app-crypt/trousers-0.3.0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pkcs11? ( dev-libs/opencryptoki )
+	"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	sed -i -r \
+		-e '/CFLAGS/s/ -m64//' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+	econf \
+		$(use_enable nls) \
+		$(use pkcs11 || echo --disable-pkcs11-support)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
new file mode 100644
index 000000000000..ff712c720ce9
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
+IUSE="libressl nls pkcs11 debug"
+
+COMMON_DEPEND="
+	>=app-crypt/trousers-0.3.0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pkcs11? ( dev-libs/opencryptoki )
+	"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gold.patch"
+)
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	sed -i -r \
+		-e '/CFLAGS/s/ -m64//' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+	econf \
+		$(use_enable nls) \
+		$(use pkcs11 || echo --disable-pkcs11-support)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/trousers-0.3.14-r1 b/app-crypt/trousers-0.3.14-r1
deleted file mode 100644
index 45c7a150992f..000000000000
--- a/app-crypt/trousers-0.3.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0 ) libressl? ( dev-libs/libressl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
-EAPI=6
-HOMEPAGE=http://trousers.sf.net
-IUSE=doc libressl selinux kernel_linux
-KEYWORDS=amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh x86
-LICENSE=CPL-1.0 GPL-2
-RDEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0 ) libressl? ( dev-libs/libressl ) selinux? ( sec-policy/selinux-tcsd )
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=2b30b563ddde3b8eedd2fe6aa8c36b52
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
new file mode 100644
index 000000000000..3afca5f19167
--- /dev/null
+++ b/app-crypt/trousers/Manifest
@@ -0,0 +1,9 @@
+AUX 61-trousers.rules 96 BLAKE2B ba66e3652f5a82f4b86fb45f556322046b06b2aacbd4b0b8e118f86dd612eea9ad0c67dbd037fd738ef48f74dea3d8699acefd224d33350e54db94238b4fd479 SHA512 83fa5b8666bcb0111f69456e6b9ea73eca2e1933e44bf7b705ff4d3c7b63a63ae4d0a1c30b0a00ebe6a8b4206ed7df80abca8503ace1c795119213f3546e9307
+AUX tcsd.confd 372 BLAKE2B 535a5bb44cd18e4d0b7520a8ea840159d35e4ae0c557b63ec7892b7827bfb8d4924e4d226baa25d5d6b1c7c68d552da916d7e507339c2af4138441f66d165683 SHA512 1e33f521156d55ff450907e01a7c60750e2880520700de1e8fb42ed03d5a16a20332f6f437f2cc7ed155f65b9306bf2d670f46c4b7055d4c9248beaeb06f8a75
+AUX tcsd.initd 843 BLAKE2B acbae99796e45366d2034c7353a1490b6e1829444013bb29a0e04f5d9bfedd33f44f85a369c51c5d0720b6419c60199448c60595fa7ee3ddcb0bda03186bfc93 SHA512 7bbf7e7bb8829d8aea8d8cae060bb8cb4bf6d2ca9396970e95d082792597cec0babb26913ff28afb1bdbfc781286f7795161e074c1da97a95a1e33d8814af480
+AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f67578185dbdd81b8a3a55000029215d28d99e8e3ccd73f64b85b66cc4f4a337f28ee9d9ade4222067 SHA512 e516bde8ce45fe4ad687aaaabae475da9c20a9fbd8ebee736d09ceb6efa597efb6f3bb99840a4c0d2c9eb77c2824df6ee45985b46dc8cf924b4eed67eeec1468
+AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783
+AUX trousers-0.3.14-libressl.patch 783 BLAKE2B 4d9b40e23fb10d382906d5057663043ce8334ae143470e9ed9386351f831432d6618cbcfecbf02e783e1b691151964c97ad3e1a4855b89f25c8735e935a92fe9 SHA512 5d813efbe5cb5568ef084c32d5c049f73943b3c08645fb1b8ba31b188c5c332bc39713bc6895573f472cff94124823c9f545498d7b774027c2724733be910f42
+DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
+EBUILD trousers-0.3.14-r1.ebuild 3010 BLAKE2B d976ad11e8b7350cef0787d6f60ae3d3b1fb89dfe110ab62c8d93f30a0b1a80bad9b96330826f6ab6399277ddbe6d1f4bc825f0a5c9bb83bef6657fb0e822065 SHA512 8eba2e532b2c55f035f8d25cfeec1367db9406c686cad8ccdfb644e065284169471a97dcfce07b6af90817398bc351f4251b176c70ab3d8b0f548b17e1169d37
+MISC metadata.xml 389 BLAKE2B ba31172c2d03711712dec442f87ef9af448357d14ea90f973284b7d142a052f83798e0ac48d76f35d94a2efce6f050b456b0401562a7fb9d05f055e2defa923e SHA512 82ef49bce01041185282168653e951f7fc2b68e6e00a2e604765640b7a5ab3f3f73244ee6837004415612358d89c7347cc7c19df333539b534d04308d8f1b4dd
diff --git a/app-crypt/trousers/files/61-trousers.rules b/app-crypt/trousers/files/61-trousers.rules
new file mode 100644
index 000000000000..20e89cbe3acd
--- /dev/null
+++ b/app-crypt/trousers/files/61-trousers.rules
@@ -0,0 +1,2 @@
+KERNEL=="tpm[0-9]*", MODE="0660", OWNER="tss", GROUP="tss", SYMLINK+="tpm"
+# vim: ft=udevrules:
diff --git a/app-crypt/trousers/files/tcsd.confd b/app-crypt/trousers/files/tcsd.confd
new file mode 100644
index 000000000000..78bedb9fda30
--- /dev/null
+++ b/app-crypt/trousers/files/tcsd.confd
@@ -0,0 +1,9 @@
+# /etc/conf.d/tscd
+
+# Configuration file for the TrouSerS' TCS daemon (tcsd) init script
+# Have a look on /etc/tcsd.conf too, there is more to configure there.
+
+# TPM_MODULES: name of the module(s) that should be loaded. You only need to
+# set this if your driver is not compiled in kernel and is not already loaded
+# on boot.    (default: unset)
+#TPM_MODULES="tpm_atmel"
diff --git a/app-crypt/trousers/files/tcsd.initd b/app-crypt/trousers/files/tcsd.initd
new file mode 100644
index 000000000000..19278c5658d3
--- /dev/null
+++ b/app-crypt/trousers/files/tcsd.initd
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use logger
+	need net
+}
+
+checkconfig() {
+	local mod
+	if [ -n "${TPM_MODULES}" ] ; then
+		for mod in ${TPM_MODULES} ; do
+			lsmod | grep -q "^${mod}\b" \
+				|| modprobe ${mod} &>/dev/null \
+				|| ewarn "Failed to load module ${mod}"
+		done
+		# Should we sleep or something to wait for device creation?
+	fi
+	if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
+		eerror "No TPM device found!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	ebegin "Starting TrouSerS' TCS daemon (tcsd)"
+	checkconfig || eend $?
+	start-stop-daemon --start --user tss --exec /usr/sbin/tcsd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping TrouSerS' TCS daemon (tcsd)"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/tcsd --user tss
+	eend $?
+}
diff --git a/app-crypt/trousers/files/tcsd.service b/app-crypt/trousers/files/tcsd.service
new file mode 100644
index 000000000000..4a46e6143bc1
--- /dev/null
+++ b/app-crypt/trousers/files/tcsd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TCG Core Services Daemon
+
+[Service]
+User=tss
+ExecStart=/usr/sbin/tcsd -f
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/app-crypt/trousers/files/trousers-0.3.13-nouseradd.patch b/app-crypt/trousers/files/trousers-0.3.13-nouseradd.patch
new file mode 100644
index 000000000000..5426e9929f13
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.13-nouseradd.patch
@@ -0,0 +1,12 @@
+diff -urNp trousers-0.3.13.org/dist/Makefile.am trousers-0.3.13/dist/Makefile.am
+--- trousers-0.3.13.org/dist/Makefile.am	2014-04-24 21:05:43.000000000 +0300
++++ trousers-0.3.13/dist/Makefile.am	2015-04-08 10:05:51.018955728 +0300
+@@ -11,8 +11,6 @@ endif
+ install-exec-hook:
+ 	/bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
+ if !NOUSERCHECK
+-	/usr/sbin/groupadd tss || true
+-	/usr/sbin/useradd -r tss -g tss || true
+ 	/bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true
+ 	/bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm
+ endif
diff --git a/app-crypt/trousers/files/trousers-0.3.14-libressl.patch b/app-crypt/trousers/files/trousers-0.3.14-libressl.patch
new file mode 100644
index 000000000000..927626892b19
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.14-libressl.patch
@@ -0,0 +1,26 @@
+From b8b1cda430270f03dc556cf9cf7d2fd478101525 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 7 Dec 2016 09:36:34 +0200
+Subject: [PATCH] tspi: support libressl
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/trspi/crypto/openssl/rsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
+index 2b1205f..3e56015 100644
+--- a/src/trspi/crypto/openssl/rsa.c
++++ b/src/trspi/crypto/openssl/rsa.c
+@@ -38,7 +38,7 @@
+ #define DEBUG_print_openssl_errors()
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100001L
++#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER)
+ static int
+ RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+ {
+-- 
+2.7.3
+
diff --git a/app-crypt/trousers/metadata.xml b/app-crypt/trousers/metadata.xml
new file mode 100644
index 000000000000..090e56fab7c0
--- /dev/null
+++ b/app-crypt/trousers/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:debian:trousers</remote-id>
+    <remote-id type="sourceforge">trousers</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/trousers/trousers-0.3.14-r1.ebuild b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
new file mode 100644
index 000000000000..0709846429a1
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info ltprune readme.gentoo-r1 systemd user udev
+
+DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
+HOMEPAGE="http://trousers.sf.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh x86"
+IUSE="doc libressl selinux" # gtk
+
+# gtk support presently does NOT compile.
+#	gtk? ( >=x11-libs/gtk+-2 )
+
+CDEPEND=">=dev-libs/glib-2
+	!libressl? ( >=dev-libs/openssl-0.9.7:0 )
+	libressl? ( dev-libs/libressl )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-tcsd )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
+
+DOC_CONTENTS="
+	If you have problems starting tcsd, please check permissions and
+	ownership on /dev/tpm* and ~tss/system.data
+"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	# Check for driver (not sure it can be an rdep, because ot depends on the
+	# version of virtual/linux-sources... Is that supported by portage?)
+	linux-info_pkg_setup
+	local tpm_kernel_version tpm_kernel_present tpm_module
+	kernel_is ge 2 6 12 && tpm_kernel_version="yes"
+	if linux_config_exists; then
+		linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
+	else
+		ewarn "No kernel configuration could be found."
+	fi
+	has_version app-crypt/tpm-emulator && tpm_module="yes"
+	if [[ -n "${tpm_kernel_present}" ]]; then
+		einfo "Good, you seem to have in-kernel TPM support."
+	elif [[ -n "${tpm_module}" ]]; then
+		einfo "Good, you seem to have TPM support with the external module."
+		if [[ -n "${tpm_kernel_version}" ]]; then
+			elog
+			elog "Note that since you have a >=2.6.12 kernel, you could use"
+			elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
+		fi
+	elif [[ -n "${tpm_kernel_version}" ]]; then
+		eerror
+		eerror "To use this package, you will have to activate TPM support"
+		eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
+		eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
+		eerror
+	else
+		eerror
+		eerror "To use this package, you should install a TPM driver."
+		eerror "You can have the following options:"
+		eerror "  - install app-crypt/tpm-emulator"
+		eerror "  - switch to a >=2.6.12 kernel and compile the kernel module"
+		eerror
+	fi
+
+	# New user/group for the daemon
+	enewgroup tss
+	enewuser tss -1 -1 /var/lib/tpm tss
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# econf --with-gui=$(usex gtk gtk openssl)
+	econf --with-gui=openssl
+}
+
+src_install() {
+	default
+	keepdir /var/lib/tpm
+	use doc && dodoc doc/*
+	newinitd "${FILESDIR}"/tcsd.initd tcsd
+	newconfd "${FILESDIR}"/tcsd.confd tcsd
+	systemd_dounit "${FILESDIR}"/tcsd.service
+	udev_dorules "${FILESDIR}"/61-trousers.rules
+	fowners tss:tss /var/lib/tpm
+	prune_libtool_files
+	readme.gentoo_create_doc
+}
diff --git a/app-crypt/ubuntu-keyring-2018.02.28 b/app-crypt/ubuntu-keyring-2018.02.28
deleted file mode 100644
index 8e6e9a797a22..000000000000
--- a/app-crypt/ubuntu-keyring-2018.02.28
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=GnuPG archive keys of the Ubuntu archive
-EAPI=6
-HOMEPAGE=http://packages.ubuntu.com/zesty/ubuntu-keyring
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2018.02.28.tar.gz
-_md5_=9a9dd87df7a8fb20b3f501a097fbbd0d
diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
new file mode 100644
index 000000000000..30d219899e0d
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -0,0 +1,3 @@
+DIST ubuntu-keyring_2018.02.28.tar.gz 30181 BLAKE2B 1dc1232aa3ddbbb4a908e2b0deb035fd2ae61ddad4ebba99cce43c636af30760a09bf46f05c35c8205ccfaf526ed8b0a3b9daa308ae5d7272da078903ee15557 SHA512 60f3a792d095206466f4c39672affb261b4520fb7b5b9df47487741e0d6613cd1076fde0e30120bcbe161b170c41f7ec1bbb2c36cddf13ee69a457df00c36fa8
+EBUILD ubuntu-keyring-2018.02.28.ebuild 455 BLAKE2B 34a105976cad44dd824661c9417d34c933688b808542031c2e1b8b5c40caa071d21187b8b8584bccf0eed79a43624fe585f214987d3d9b6979486ede836bf1ad SHA512 1e3a21cfecc65ea64aa5eea251ec7ee69677e4fde2c66f9499df4cf000621de8cacf44688db2f1baf466d5f7f5e07c736c4eef4c5fa7c28a602eb193903f4536
+MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/ubuntu-keyring/metadata.xml b/app-crypt/ubuntu-keyring/metadata.xml
new file mode 100644
index 000000000000..6d2298876faa
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
new file mode 100644
index 000000000000..4b624c322c14
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
+SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}
diff --git a/app-crypt/veracrypt-1.19 b/app-crypt/veracrypt-1.19
deleted file mode 100644
index a40ce4df6fd9..000000000000
--- a/app-crypt/veracrypt-1.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=sys-fs/lvm2 sys-fs/fuse x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/pkcs11-helper virtual/pkgconfig asm? ( dev-lang/nasm )
-DESCRIPTION=Disk encryption with strong security based on TrueCrypt
-EAPI=6
-HOMEPAGE=https://veracrypt.codeplex.com
-IUSE=X +asm kernel_linux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 truecrypt-3.0
-RDEPEND=sys-fs/lvm2 sys-fs/fuse x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/pkcs11-helper
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.19.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=a3a3368901287391d5b11eb4bf52020b
diff --git a/app-crypt/veracrypt-1.21 b/app-crypt/veracrypt-1.21
deleted file mode 100644
index c5c82aa7d904..000000000000
--- a/app-crypt/veracrypt-1.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/pkcs11-helper virtual/pkgconfig asm? ( dev-lang/yasm )
-DESCRIPTION=Disk encryption with strong security based on TrueCrypt
-EAPI=6
-HOMEPAGE=https://www.veracrypt.fr/en/Home.html
-IUSE=+asm +doc X kernel_linux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 truecrypt-3.0
-RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/pkcs11-helper
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.21.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=9bd7101b0f2b609caa7997622da74126
diff --git a/app-crypt/veracrypt-1.22 b/app-crypt/veracrypt-1.22
deleted file mode 100644
index 6f13f12f5fa0..000000000000
--- a/app-crypt/veracrypt-1.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test
-DEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/pkcs11-helper virtual/pkgconfig asm? ( dev-lang/yasm )
-DESCRIPTION=Disk encryption with strong security based on TrueCrypt
-EAPI=6
-HOMEPAGE=https://www.veracrypt.fr/en/Home.html
-IUSE=+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X kernel_linux
-KEYWORDS=amd64
-LICENSE=Apache-2.0 truecrypt-3.0
-RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/pkcs11-helper
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.22.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=b629e6d3b51ab0f09d06c5a2909956ca
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
new file mode 100644
index 000000000000..ac809c557726
--- /dev/null
+++ b/app-crypt/veracrypt/Manifest
@@ -0,0 +1,12 @@
+AUX veracrypt-1.19-execstack-fix.patch 1682 BLAKE2B ce050f900ac6504242941322b910c74c79128d132a372b89070cf6939b5b55c6853617a8c2e49019d4cc4bc1eb872b0753c9287b3e500613bef63f74ef5ba48e SHA512 df7e64a7badfdf97447991cba7c7f87c291c89735b1ffc72b2cc882da05b2df2e2c31ee9aef4415c4d0316bc6e0a9c6c10e01406c00bd0f032931e55cd6465bc
+AUX veracrypt-1.19-makefile-archdetect.patch 743 BLAKE2B 3eda2de96eb095cf51a806d7a8b06a79edeb03425ad6106a6ec72de0d76da8988dd953e58b4b5b321ee64d3d810ff8d312efddaabea0c8083b858430525a7ae0 SHA512 aa805312c5e3782452ac936a3772a0877e866e1116f2da56747b72a6f585538fd1e45a7c7531c426ff0245b5b3ac4964065e1196874aea4c11e91ac59bd6fffd
+AUX veracrypt-1.19-remove-packaging-from-makefile.patch 2098 BLAKE2B 7588a0de42a5e561dea67c04b0056bd483ffdac0e407a640440d0b7d2723a66368c1eeebaf10c95e31a0114acd013e4d24d138a4aebc876fae51b2da0c9bcffe SHA512 e6485ce39ca009cfabe5656b3ed81cd72ca0207d9b1c310738be60705e3c94f2364cacf393b7f1d0d3e79a1ee58794dfda1d01aaa03778597c149a9dfc5634dc
+AUX veracrypt-1.22-sysmacros-fix.patch 1190 BLAKE2B 33130133b9bf3708eed0d2fa304850e216db9918c326be1aa78d06fa6ace1566fb03928731b096948a5dd9ee47accd10698496f6b1f1626acf2c6eceeefad9df SHA512 fbb1d411755669849fc343c8dd729cb804ec70f0ff1736faf864850e496628b6697dc3e4a821f31e31462e833391c30ff7c8883d014cb5b4ff3b853c6769fc15
+AUX veracrypt.init 387 BLAKE2B 7f16dee40bceed81ca092a3be6a2cd71f24f5cc8b4e4b143bd6ddde046e1ecce0cd674f52e7adb406893ef57c5b73462157832ff279114a2079c0ff84839e0dc SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d
+DIST VeraCrypt_1.19.tar.gz 23235780 BLAKE2B 0d02b3c6783d233f7cc64956eef58077e8a125fd5db28c1374921d8f2ca6dc9e1cde5402917c1ed4e4a626901e24c566ee834a12e41b6bcd150b8d64851f1ebc SHA512 ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164
+DIST VeraCrypt_1.21.tar.gz 24106162 BLAKE2B 5afe48830bde81d91d16f0bdf16010bdbdb885df84b9cd3e48191e468be51a485dfb3fc4f95da71d6d973a2f22dfbb92ee2b912dcf019921b37e1d4479c8c8d8 SHA512 5186d339f8fb0d88acfc35b1e7a916f797e30be93e8f252cca542b6d5c1cd916110111ef7b859d66b1790ce05d7d02bc72def26857eb003ea114a911fcec6c41
+DIST VeraCrypt_1.22.tar.gz 24820384 BLAKE2B 52fb822d07af96a9f47c17f8aacf13a949fb5a7c5d064a720e003e6d1bfbb5f221a5823720527e1f2c82f08547d77349cc90bc839336a622efcf1836dd97bb88 SHA512 83cdaf673bc9cdeadeb70b2beeabf87a2a9a65d3b0b0cc7fdf9c87671714af1e207ddd1db716302919e2d14414f5d4dd9d8f5203847d72834f53544a04c1a62a
+EBUILD veracrypt-1.19.ebuild 1988 BLAKE2B 20e3a4725dc5b8d319a11cb44d5865afcdcc6f956ff8c3390ed225f605e01b01537db1af5aa1c82deb7c236b27eea69cbc0c29b2f2f4b770fae4514360c45a2d SHA512 b9829bad13c5ba781d9ec2e8353ed72f30a23459d3e9eaa7384a5718be051f1eeff70c3c097225c8f557c57634d7b14b5db83bb189671630c673568667e67da0
+EBUILD veracrypt-1.21.ebuild 1921 BLAKE2B 1adf1a612afa33dc2cdbed7f0bc971e84e3ec45236ee6d7d7bf317c00a6b03a57eda5b30c85f8aeb4684abbd9879b9dab40b9dc2ceb6cffe36946a74ba1544dd SHA512 1766b6db76015cc6fb6f147a8ba1f75795b7038d402c38129c60cbdb09831dd0aed2241d4ec9d403cffa8dfe38f3481085c64ae653a49362be39c08f462de1dc
+EBUILD veracrypt-1.22.ebuild 2065 BLAKE2B 98dcdbe443fae6ad4a4fa0e6086fe4c171ada85fc69f3fc9bb79d61cb512dc5f8ed6339cff5b2705a35ed7d74449bebf04dba626e63d26fb7530dbf4a9566aeb SHA512 169f927f0745dc1e6d0d6c2c6f9c25f93240b09301cb6f318a28decb4f367b35e035f5eff57d2e9902e4e8bd9a496246e580b3c2d5d57380d1aada9cc1c24ada
+MISC metadata.xml 726 BLAKE2B f70a62997301172fd3e6928dd694720fe1e7a8a41a2eb842800a220bed3531828423e2b4bcbb6c6d7f2d1d8ec96f74d1a987fac64390323662028efe57fe5d72 SHA512 7898d7a419ba57600609578ae308d558d2aacf6b7dcc625adb6adfadca9b6f580123650d63ed8a618131459f71fc9a1b2b367745e2f07da75cbdf6ef9c1595bb
diff --git a/app-crypt/veracrypt/files/veracrypt-1.19-execstack-fix.patch b/app-crypt/veracrypt/files/veracrypt-1.19-execstack-fix.patch
new file mode 100644
index 000000000000..9b1e634bd4cc
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.19-execstack-fix.patch
@@ -0,0 +1,60 @@
+--- src/Crypto/Aes_hw_cpu.asm.old
++++ src/Crypto/Aes_hw_cpu.asm
+@@ -328,3 +328,12 @@
+
+
+ %endif	; __BITS__ != 16
++	%ifidn __OUTPUT_FORMAT__,elf
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf32
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf64
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
+--- src/Crypto/AesSmall_x86.asm.old
++++ src/Crypto/AesSmall_x86.asm
+@@ -1442,3 +1442,12 @@
+     db  v8(0xe1),v8(0x69),v8(0x14),v8(0x63),v8(0x55),v8(0x21),v8(0x0c),v8(0x7d)
+
+ %endif
++	%ifidn __OUTPUT_FORMAT__,elf
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf32
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf64
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
+--- src/Crypto/Aes_x64.asm.old
++++ src/Crypto/Aes_x64.asm
+@@ -905,3 +905,12 @@
+ %endif
+
+ %endif
++	%ifidn __OUTPUT_FORMAT__,elf
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf32
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf64
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
+--- src/Crypto/Aes_x86.asm.old
++++ src/Crypto/Aes_x86.asm
+@@ -644,3 +644,12 @@
+     do_exit
+
+ %endif
++	%ifidn __OUTPUT_FORMAT__,elf
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf32
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
++	%ifidn __OUTPUT_FORMAT__,elf64
++	section .note.GNU-stack noalloc noexec nowrite progbits
++	%endif
diff --git a/app-crypt/veracrypt/files/veracrypt-1.19-makefile-archdetect.patch b/app-crypt/veracrypt/files/veracrypt-1.19-makefile-archdetect.patch
new file mode 100644
index 000000000000..41fc6d521c66
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.19-makefile-archdetect.patch
@@ -0,0 +1,26 @@
+From 181857089b11045c701e9195275a408430beb580 Mon Sep 17 00:00:00 2001
+From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
+Date: Sat, 5 Nov 2016 23:39:46 +0100
+Subject: [PATCH] Linux: Always use "uname -m" to determine processor type.
+ This fixes Slackware build issue.
+
+---
+ src/Makefile | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 7bfc5ad..00e6e5b 100644
+--- src/Makefile
++++ src/Makefile
+@@ -131,10 +131,7 @@ export PLATFORM_UNSUPPORTED := 0
+ export CPU_ARCH ?= unknown
+ export SIMD_SUPPORTED := 0
+ 
+-ARCH = $(shell uname -p)
+-ifeq "$(ARCH)" "unknown"
+-	ARCH = $(shell uname -m)
+-endif
++ARCH = $(shell uname -m)
+ 
+ ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH)))
+ 	CPU_ARCH = x86
diff --git a/app-crypt/veracrypt/files/veracrypt-1.19-remove-packaging-from-makefile.patch b/app-crypt/veracrypt/files/veracrypt-1.19-remove-packaging-from-makefile.patch
new file mode 100644
index 000000000000..5aad4b9fb74d
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.19-remove-packaging-from-makefile.patch
@@ -0,0 +1,52 @@
+--- src/Main/Main.make.orig
++++ src/Main/Main.make
+@@ -190,49 +190,6 @@
+ 	rm -fr "$(PWD)/Setup/MacOSX/VeraCrypt_dmg"
+ endif
+
+-
+-
+-ifeq "$(PLATFORM)" "Linux"
+-ifeq "$(TC_BUILD_CONFIG)" "Release"
+-	mkdir -p $(PWD)/Setup/Linux/usr/bin
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc
+-	cp $(PWD)/Main/$(APPNAME) $(PWD)/Setup/Linux/usr/bin/$(APPNAME)
+-	cp $(PWD)/Setup/Linux/$(APPNAME)-uninstall.sh $(PWD)/Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
+-	chmod +x $(PWD)/Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
+-	cp $(PWD)/License.txt $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/License.txt
+-	cp "$(PWD)/Release/Setup Files/VeraCrypt User Guide.pdf" "$(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/VeraCrypt User Guide.pdf"
+-
+-ifndef TC_NO_GUI
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/applications
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/pixmaps
+-	cp $(PWD)/Resources/Icons/VeraCrypt-256x256.xpm $(PWD)/Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm
+-	cp $(PWD)/Setup/Linux/$(APPNAME).desktop $(PWD)/Setup/Linux/usr/share/applications/$(APPNAME).desktop
+-endif
+-
+-
+-	tar cfz $(PWD)/Setup/Linux/$(PACKAGE_NAME) --directory $(PWD)/Setup/Linux usr
+-
+-	@rm -fr $(INTERNAL_INSTALLER_NAME)
+-	@echo "#!/bin/sh" > $(INTERNAL_INSTALLER_NAME)
+-	@echo "VERSION=$(TC_VERSION)" >> $(INTERNAL_INSTALLER_NAME)
+-	@echo "PACKAGE_TYPE=tar" >> $(INTERNAL_INSTALLER_NAME)
+-	@echo "PACKAGE_NAME=$(PACKAGE_NAME)" >> $(INTERNAL_INSTALLER_NAME)
+-	@echo "PACKAGE_START=1107" >> $(INTERNAL_INSTALLER_NAME)
+-	@echo "INSTALLER_TYPE=$(INSTALLER_TYPE)" >> $(INTERNAL_INSTALLER_NAME)
+-
+-	@cat $(PWD)/Setup/Linux/veracrypt_install_template.sh >> $(INTERNAL_INSTALLER_NAME)
+-	@cat $(PWD)/Setup/Linux/$(PACKAGE_NAME) >> $(INTERNAL_INSTALLER_NAME)
+-	chmod +x $(INTERNAL_INSTALLER_NAME)
+-
+-	rm -fr $(PWD)/Setup/Linux/packaging
+-	mkdir -p $(PWD)/Setup/Linux/packaging
+-	cp $(INTERNAL_INSTALLER_NAME) $(PWD)/Setup/Linux/packaging/.
+-	makeself $(PWD)/Setup/Linux/packaging $(PWD)/Setup/Linux/$(INSTALLER_NAME) "VeraCrypt $(TC_VERSION) Installer" ./$(INTERNAL_INSTALLER_NAME)
+-
+-endif
+-
+-endif
+-
+ $(OBJS): $(PCH)
+
+ Resources.o: $(RESOURCES)
diff --git a/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
new file mode 100644
index 000000000000..702e8f702ecd
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
@@ -0,0 +1,36 @@
+From 0a50becec3a3cca71e575dfec35d69ab295c85cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Tue, 3 Apr 2018 23:06:20 -0400
+Subject: [PATCH] Platform/Unix: include <sys/sysmacros.h> for major/minor
+ macros
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with glibc 2.26, macros "major" and "minor" are only
+available from <sys/sysmacros.h> [0]. The build fails with the
+following without including this header:
+
+Unix/FilesystemPath.cpp:84:49: error: ‘major’ was not declared in this scope
+Unix/FilesystemPath.cpp:84:113: error: ‘minor’ was not declared in this scope
+
+[0] https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
+---
+ src/Platform/Unix/FilesystemPath.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp
+index d6c9cd2..7c28af4 100644
+--- a/Platform/Unix/FilesystemPath.cpp
++++ b/Platform/Unix/FilesystemPath.cpp
+@@ -15,6 +15,7 @@
+ #include "Platform/StringConverter.h"
+ #include <stdio.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ namespace VeraCrypt
+ {
+-- 
+2.16.3
+
diff --git a/app-crypt/veracrypt/files/veracrypt.init b/app-crypt/veracrypt/files/veracrypt.init
new file mode 100644
index 000000000000..972a9daef809
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt.init
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after localmount
+	need device-mapper
+}
+
+stop() {
+	# Try to remove any dm-crypt mappings
+	if [ -x /usr/bin/veracrypt ]; then
+		ebegin "Removing veracrypt mappings"
+		! /usr/bin/veracrypt -l > /dev/null 2>&1  || /usr/bin/veracrypt -d
+		eend $?
+	fi
+}
diff --git a/app-crypt/veracrypt/metadata.xml b/app-crypt/veracrypt/metadata.xml
new file mode 100644
index 000000000000..823abb296b3c
--- /dev/null
+++ b/app-crypt/veracrypt/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<longdescription>
+	Platform independent filesystem or container encryptor
+	derived from truecrypt
+</longdescription>
+<use>
+	<flag name="asm">Enable assembly for optimization</flag>
+</use>
+<maintainer type="person">
+	<email>fdsfgs@krutt.org</email>
+	<name>soredake</name>
+</maintainer>
+<maintainer type="person">
+	<email>gokturk@gentoo.org</email>
+	<name>Göktürk Yüksek</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">veracrypt/VeraCrypt</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-crypt/veracrypt/veracrypt-1.19.ebuild b/app-crypt/veracrypt/veracrypt-1.19.ebuild
new file mode 100644
index 000000000000..e2b31e79b342
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.19.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://veracrypt.codeplex.com"
+SRC_URI="https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
+
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X +asm"
+RESTRICT="mirror bindist"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+PATCHES=(
+	# TODO: remove in >=1.20
+	"${FILESDIR}/${P}-makefile-archdetect.patch"
+	"${FILESDIR}/${P}-execstack-fix.patch"
+	"${FILESDIR}/${P}-remove-packaging-from-makefile.patch"
+)
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+	)
+	use X || myemakeargs+=( NOGUI=1 )
+	use asm || myemakeargs+=( NOASM=1 )
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	dobin Main/veracrypt
+	dodoc Readme.txt "Release/Setup Files/VeraCrypt User Guide.pdf"
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		newicon Resources/Icons/VeraCrypt-48x48.xpm veracrypt.xpm
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "System"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/veracrypt/veracrypt-1.21.ebuild b/app-crypt/veracrypt/veracrypt-1.21.ebuild
new file mode 100644
index 000000000000..dd4f4dc2c80e
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.21.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
+
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm +doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+HTML_DOCS=( "${S}"/../doc/html/. )
+DOCS=( Readme.txt )
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+	)
+	use X || myemakeargs+=( NOGUI=1 )
+	use asm || myemakeargs+=( NOASM=1 )
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	dobin Main/veracrypt
+	use doc && einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Encryption;Encryption Tools;Utility;"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/veracrypt/veracrypt-1.22.ebuild b/app-crypt/veracrypt/veracrypt-1.22.ebuild
new file mode 100644
index 000000000000..c1e8355fcbf2
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.22.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
+
+LICENSE="Apache-2.0 truecrypt-3.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+HTML_DOCS=( "${S}"/../doc/html/. )
+DOCS=( Readme.txt )
+PATCHES=( "${FILESDIR}"/${PN}-1.22-sysmacros-fix.patch )
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	dobin Main/veracrypt
+	use doc && einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/xca-1.4.1 b/app-crypt/xca-1.4.1
deleted file mode 100644
index 74fdf19b5f43..000000000000
--- a/app-crypt/xca-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=dev-libs/libltdl:0= dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
-DESCRIPTION=A GUI to OpenSSL, RSA public keys, certificates, signing requests etc
-EAPI=6
-HOMEPAGE=http://hohnstaedt.de/xca/
-IUSE=bindist doc libressl
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-libs/libltdl:0= dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
-SLOT=0
-SRC_URI=https://github.com/chris2511/xca/releases/download/RELEASE.1.4.1/xca-1.4.1.tar.gz
-_eclasses_=xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=34e9862d76457b88710a794b7ebca3be
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
new file mode 100644
index 000000000000..644facf944cf
--- /dev/null
+++ b/app-crypt/xca/Manifest
@@ -0,0 +1,4 @@
+AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
+DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
+EBUILD xca-1.4.1.ebuild 1180 BLAKE2B f865e4def8314ca7effeb87b6a38c30a3ce2a5f96fff87fc25280459e1224bdfce0623a5d3f6e21b435ba0c2dc0abe1e69e34e2c085b7a10d082d884ef9d33a2 SHA512 35e94c1323c4664cca88e396a45a6d06c50d98535349d28311edd774907aaa5d7815b93018d9ac6872815e39b763652188a953d4d8865b5f8197a5192fd8e693
+MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/files/xca-1.0.0-desktop.patch b/app-crypt/xca/files/xca-1.0.0-desktop.patch
new file mode 100644
index 000000000000..e2da3a103cf8
--- /dev/null
+++ b/app-crypt/xca/files/xca-1.0.0-desktop.patch
@@ -0,0 +1,8 @@
+--- a/misc/xca.desktop	2012-05-12 05:37:14.000000000 -0400
++++ b/misc/xca.desktop	2013-01-03 19:43:35.877856711 -0500
+@@ -7,5 +7,5 @@
+ Icon=xca-32x32
+ Terminal=false
+-Categories=Application;Utility;Qt;
++Categories=Utility;Qt;
+ MimeType=application/x-xca-database;application/x-xca-template;application/x-x509-ca-cert;application/pkcs10;application/x-pkcs7-certificates;application/x-pkcs12;
diff --git a/app-crypt/xca/metadata.xml b/app-crypt/xca/metadata.xml
new file mode 100644
index 000000000000..27fe33dd45b0
--- /dev/null
+++ b/app-crypt/xca/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xca</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/xca/xca-1.4.1.ebuild b/app-crypt/xca/xca-1.4.1.ebuild
new file mode 100644
index 000000000000..06f30c351d9c
--- /dev/null
+++ b/app-crypt/xca/xca-1.4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit xdg-utils
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="http://hohnstaedt.de/xca/"
+SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bindist doc libressl"
+
+RDEPEND="
+	dev-libs/libltdl:0=
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+)
+
+src_configure() {
+	econf \
+		--with-qt-version=5 \
+		$(use_enable doc) \
+		STRIP=true
+}
+
+src_compile() {
+	# enforce all to avoid the automatic silent rules
+	emake all
+}
+
+src_install() {
+	# non standard destdir
+	emake install destdir="${ED}"
+	einstalldocs
+
+	insinto /etc/xca
+	doins misc/*.txt
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-crypt/xor-analyze-0.5-r1 b/app-crypt/xor-analyze-0.5-r1
deleted file mode 100644
index 3606d6c35d29..000000000000
--- a/app-crypt/xor-analyze-0.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=program for cryptanalyzing xor 'encryption' with variable key length
-EAPI=6
-HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=xor-analyze
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.habets.pp.se/synscan/files/xor-analyze-0.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=358e8fca1643b17fd8bed6f6af42daeb
diff --git a/app-crypt/xor-analyze/Manifest b/app-crypt/xor-analyze/Manifest
new file mode 100644
index 000000000000..e1c3420f870d
--- /dev/null
+++ b/app-crypt/xor-analyze/Manifest
@@ -0,0 +1,3 @@
+DIST xor-analyze-0.5.tar.gz 26635 BLAKE2B ad5134b50366cdfb4af31d1944cc4c02c43b2bac171b20054fd7960e62a96b3b959f5b973ab82076ca8cdb0ae7068c0917f89c581936e16723c0223ac64d78a0 SHA512 e28aef799dc6f64a57609638f578bbe66c3ced5784599a65be6bf4ee14921600b7d292880f1288b5ad81ed3dd0897b6aeff2d741b96efc30cf0eab453e4b21b1
+EBUILD xor-analyze-0.5-r1.ebuild 614 BLAKE2B 7122073e7238af80bd7469a9df8e9d0ee7ebb896688b7f1d5ec5cdc94c6886b2611cd1eefef0be7ca04379b89cfb0e4948cb1e143f81e477400d81c0e3017a4c SHA512 2077ae200122f2c1e2d3ecadaaa9053e2fcf43efba003d3ad48e7b6612d98bfbcec2980c86098f12878bf93e11a156b8be482b78f92fd6310defb8e6a90aba76
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/xor-analyze/metadata.xml b/app-crypt/xor-analyze/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-crypt/xor-analyze/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild b/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
new file mode 100644
index 000000000000..07b15f1f1e7e
--- /dev/null
+++ b/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="program for cryptanalyzing xor 'encryption' with variable key length"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=xor-analyze"
+SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_compile() {
+	rm -f Makefile || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" xor-analyze xor-enc
+}
+
+src_install() {
+	dobin xor-analyze xor-enc
+	dosym xor-enc /usr/bin/xor-dec
+	dodoc README TODO
+}
diff --git a/app-crypt/yubikey-manager-0.3.3 b/app-crypt/yubikey-manager-0.3.3
deleted file mode 100644
index 8f7a0ad54529..000000000000
--- a/app-crypt/yubikey-manager-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library and command line tool for configuring a YubiKey
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.3.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b900bc7e8db4d7f0506645b87dd4a457
diff --git a/app-crypt/yubikey-manager-0.4.5 b/app-crypt/yubikey-manager-0.4.5
deleted file mode 100644
index 343f10778fc2..000000000000
--- a/app-crypt/yubikey-manager-0.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library and command line tool for configuring a YubiKey
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.4.5.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d19ba0191ed14eae98b6b243b1735f64
diff --git a/app-crypt/yubikey-manager-0.4.6 b/app-crypt/yubikey-manager-0.4.6
deleted file mode 100644
index 62be6f729a7d..000000000000
--- a/app-crypt/yubikey-manager-0.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library and command line tool for configuring a YubiKey
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.4.6.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d19ba0191ed14eae98b6b243b1735f64
diff --git a/app-crypt/yubikey-manager-0.5.0 b/app-crypt/yubikey-manager-0.5.0
deleted file mode 100644
index ab77d3f84cac..000000000000
--- a/app-crypt/yubikey-manager-0.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library and command line tool for configuring a YubiKey
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.5.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d19ba0191ed14eae98b6b243b1735f64
diff --git a/app-crypt/yubikey-manager-0.6.0 b/app-crypt/yubikey-manager-0.6.0
deleted file mode 100644
index ddf4179e8ae5..000000000000
--- a/app-crypt/yubikey-manager-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library and command line tool for configuring a YubiKey
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.6.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4eeeafbbf8db34967b5ec170e25d21de
diff --git a/app-crypt/yubikey-manager-0.7.0 b/app-crypt/yubikey-manager-0.7.0
deleted file mode 100644
index e903e05dcf2f..000000000000
--- a/app-crypt/yubikey-manager-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/fido2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library and command line tool for configuring a YubiKey
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=dev-python/fido2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.7.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8af1f590fefc56794d7b3261bc712e11
diff --git a/app-crypt/yubikey-manager-qt-0.4.0-r2 b/app-crypt/yubikey-manager-qt-0.4.0-r2
deleted file mode 100644
index d1c98e3c3b3d..000000000000
--- a/app-crypt/yubikey-manager-qt-0.4.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=>=app-crypt/yubikey-manager-0.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
-DESCRIPTION=Cross-platform application for configuring any YubiKey over all USB transports
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=>=app-crypt/yubikey-manager-0.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/Yubico/yubikey-manager-qt/archive/yubikey-manager-qt-0.4.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=23f892e0afa9d47fa891f4b897af23ab
diff --git a/app-crypt/yubikey-manager-qt-0.5.1 b/app-crypt/yubikey-manager-qt-0.5.1
deleted file mode 100644
index 86039b73826e..000000000000
--- a/app-crypt/yubikey-manager-qt-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=app-crypt/yubikey-manager-0.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <app-crypt/yubikey-manager-0.8 dev-python/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtdeclarative:5 dev-qt/qtsvg:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
-DESCRIPTION=Cross-platform application for configuring any YubiKey over all USB transports
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=>=app-crypt/yubikey-manager-0.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <app-crypt/yubikey-manager-0.8 dev-python/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtdeclarative:5 dev-qt/qtsvg:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/Yubico/yubikey-manager-qt/releases/download/yubikey-manager-qt-0.5.1/yubikey-manager-qt-0.5.1.tar.gz -> yubikey-manager-qt-0.5.1.tar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=400ea37d25d73cd08a284c9b49282ea6
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
new file mode 100644
index 000000000000..b7a7d4d5e306
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -0,0 +1,5 @@
+DIST yubikey-manager-qt-0.4.0.tar.gz 183566 BLAKE2B 2364d0d257ab5c05d0555aba4bb01ee1639a2c3a42b47173ae905945a6265b123985ad7d8fe50b0cfd38a1a0a588f3e1424aa46585ddbf50337ce2456899067e SHA512 12cef9636f06a92fdb3fce7cea5b97af3255b9cdd1b4feb4e184999eb77c17e465db927f56cd0e443a8ce8afc27b7e4be19ed07da7c41259f909ac4e98971de2
+DIST yubikey-manager-qt-0.5.1.tar 655360 BLAKE2B 6b109190750bd9675e32c836831a7e0ea286021303deffc64a351f2a127f5a5ee0190e3ca99abf0407bbb34a1a1c454f453fab464de2726f6cae539d5f865da1 SHA512 a8ceab5fd8d20eca2424d3f9a92ad12066e8fc26a7640df478965e5d9e2896fbc64885b26f599fcb2588f5b64d2f046af373f87e23ef266178ddf877e422ed36
+EBUILD yubikey-manager-qt-0.4.0-r2.ebuild 1211 BLAKE2B 50e1f5f13343fd19b9b871f3c15a62bdbdeebddc9721d9aa7ac81de7c3312811d7cec0985e1063fdfa9d13b542cb03e0eace12c01d40c248df04c940fb2cb2d0 SHA512 d0511a033597c2e901736aa73b6b840fec03adabdda384a026ad4047be0d5ad0a3373ea2519b62e91efb0d864129d5d14a571a351ffc03477b899349985da64c
+EBUILD yubikey-manager-qt-0.5.1.ebuild 1445 BLAKE2B b11dd07d657c4e61f284d733ddcc71a3a2a0860a39b0a8d6ae9f3895cda38922dacb3816cd4464c91664f456e8edaf2b06175a07b1c8ad0d68cc2a616f00c881 SHA512 6beafa82aa84056534d0a99dac7438da46f7d9fd3328b220c39fed6da7da6c24239c8d2e68c48a994d6b691d4fc7ea832fae953243b6138df078ae16e0d226d2
+MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/app-crypt/yubikey-manager-qt/metadata.xml b/app-crypt/yubikey-manager-qt/metadata.xml
new file mode 100644
index 000000000000..332501283a9b
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..dbd42b543c6d
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils qmake-utils python-single-r1 vcs-snapshot
+
+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://github.com/Yubico/yubikey-manager-qt/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=app-crypt/yubikey-manager-0.5.0[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtdeclarative:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	rm -rf vendor ykman-gui/vendor || die
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/qtsingleapplication.pri/d" \
+		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+	echo "${PV}" > VERSION || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+}
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild
new file mode 100644
index 000000000000..b9627b57544b
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,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"
+# >yubikey-manager-qt-0.5.1 should have the tarball issue fixed: https://github.com/Yubico/yubikey-manager-qt/issues/49
+SRC_URI="https://github.com/Yubico/yubikey-manager-qt/releases/download/${P}/${P}.tar.gz -> ${P}.tar"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=app-crypt/yubikey-manager-0.7.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-0.8
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtdeclarative:5
+	dev-qt/qtsvg:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/qtsingleapplication.pri/d" \
+		-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
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
new file mode 100644
index 000000000000..0cf420a9e9f2
--- /dev/null
+++ b/app-crypt/yubikey-manager/Manifest
@@ -0,0 +1,14 @@
+AUX yubikey-manager-0.7.0-fix-tests.patch 599 BLAKE2B 1c1bf0c540a413a6aa380d89cff2e62675a1783971b44d09d1fd006aec248ebeb63dae0ec2ab1d7128f3ed4cd159e7efd80e274689bfc9592bee1288c2b6ea49 SHA512 5c97d10946f54d47373f8aa4d5ea0680eb00203c22427a63fd9ff4a401aa8316326148b72c10442672406dc2099a767aba41d83bef240d7f67561504acf55f10
+DIST yubikey-manager-0.3.3.tar.gz 51223 BLAKE2B 41bf4e6edfb597420ebc438315c2482bf82d608e578d6adb60e1213e7445add91e7edafc246eb1041fcaefe43b22408fe39e6bfbb5f1eb2e1a6d83ffe68b2c71 SHA512 ced7acb848747399d4b9f0214044dd40c38b332c2f8557485d61f2f0cb857a9f47d12df59ea6a7bded1076b5d539bc171d1dbc9fd8899699c0cb3cb65b0800d7
+DIST yubikey-manager-0.4.5.tar.gz 55315 BLAKE2B 231706a14ba9d65474c8bd92cc57fec3f056da1e84b2303b370a7d9e29d3570283099ec30ed803ce53e6388afabee7bae4674ca34e8dc60d30e0443d4686e204 SHA512 232ce7557aaab3c8a27dfa2ceaab0491ac1f97d4332b25e7f77c968da48c9303627defd0246b1e97c7ed766e6a667ac996ac0430cfeb4e7310a0cfc4a633d1b2
+DIST yubikey-manager-0.4.6.tar.gz 55065 BLAKE2B a0e8d85252836a6d99e68f637f42397266187372b0fd0723ea6d330a01e42a2b79d9fc5f283d7fab2378fe847aaf0cb307f16694ce59f41aabd7fcc668be01fe SHA512 fd52cb346e95b3184fd8e4bbb8e227c75780d7fcf5057712c6def866ea951700f8cdd1286ff857e32754d539dfc7093d809fc585191b05c57f5f983d5b288e7e
+DIST yubikey-manager-0.5.0.tar.gz 59672 BLAKE2B e5dbd32ba644e7b20f03c1511a4ff608c0e6dc93c115edd50077a9a41699411a5fd0eff3d62af1fb13545d977037510f696cbd27150e21308624bfc8613f8bcb SHA512 3a503ced29a557c5adafdd1bc6025a405962cabab7388c96e8f5582165bd33111adeb3b77c7c928cbac905fb085d53ddaefbb12169b54e62b7337c1989636a8a
+DIST yubikey-manager-0.6.0.tar.gz 77823 BLAKE2B 37d9a7e72135ba859521f209896c47423f3573b2f14a56956d145334124f7bf5a4259401a9e89e3f19b2e01a476b96a984e801a28a256815a7773baa44e71773 SHA512 fb49887f4646fe63874be9cb3510ef0d1f9b931ac5fb78f3cc82fb93ada94b36aa06fd91e2ee9d4ea868abedfc206dbedd02fa0c4385d5557d33e07e8099e761
+DIST yubikey-manager-0.7.0.tar.gz 83385 BLAKE2B cd0c440f8ce81549e52dd8e546d82678c19d95d2257c878b48d69719031317943bcca4ee713c03ca8f3fa1de4363df629b09b005955a1217adb2dc5ce89400aa SHA512 0fec23dafd2502a1508648fc96f1dcc873eaf3ad089f87b1afd94b35391513ad3a799985fcbc201c2fb4a3a3e473d24483c04a6862117d211c4cb6b294f74be0
+EBUILD yubikey-manager-0.3.3.ebuild 736 BLAKE2B 4d8cbfd4942f9dbca49240ed76c701d2bcca2e23aa3ffdb0f5346206938ee21fa003a197161e909a14c5d08b54956ecd5aefb659f363e7ff86d1e4994f23c685 SHA512 16b96e49659f6a5a4b9b3e90a61896de9d6cbcf991e2d9a44df81c48be8f7936f5de7aec380538cbc8ed034b54617928b456b53a2c322631dda476c6e6fe2d8f
+EBUILD yubikey-manager-0.4.5.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
+EBUILD yubikey-manager-0.4.6.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
+EBUILD yubikey-manager-0.5.0.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
+EBUILD yubikey-manager-0.6.0.ebuild 1206 BLAKE2B 108de94576641f16b0a706d50c6d313ce14f437416bc05fffc3593ae37024d0043f323b13a0f6e31564307652a34ba5c057f8932d79c6a2fefea7035e68dc225 SHA512 6e5d43facf6e57595d118bab7402d75504073a39a21c06475add9cb50682fc45518d8179ee90fec4c6bb2bc6cf326cd03448071da81f7be6688d76625d418c3a
+EBUILD yubikey-manager-0.7.0.ebuild 1434 BLAKE2B 0109266dcac3d0a2e3f99f10858c5a9637f23d97d9a909e49a8f8b984511a14f9a1d06b8f6d1b2f8b414fef96ce73aae982016f575a69e8074eadbaf8d7921a2 SHA512 5fb2ea58c782336d6730ab5295fc008c8b87d3ac72fb43b10c0c54a0885755b00bd641160d1491686b4cca5a7293af0fd74a17ba8cc60afe9fae39da16abdb0c
+MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch b/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch
new file mode 100644
index 000000000000..46074d2241a5
--- /dev/null
+++ b/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch
@@ -0,0 +1,24 @@
+diff --git b/test/util.py a/test/util.py
+new file mode 100644
+index 0000000..0551d06
+--- /dev/null
++++ a/test/util.py
+@@ -0,0 +1,18 @@
++from click.testing import CliRunner
++from ykman.cli.__main__ import cli
++import os
++
++
++PKG_DIR = os.path.dirname(os.path.abspath(__file__))
++
++
++def open_file(*relative_path):
++    return open(os.path.join(PKG_DIR, 'files', *relative_path), 'rb')
++
++
++def ykman_cli(*argv, **kwargs):
++    runner = CliRunner()
++    result = runner.invoke(cli, list(argv), obj={}, **kwargs)
++    if result.exit_code != 0:
++        raise result.exception
++    return result.output
diff --git a/app-crypt/yubikey-manager/metadata.xml b/app-crypt/yubikey-manager/metadata.xml
new file mode 100644
index 000000000000..b1146bc56722
--- /dev/null
+++ b/app-crypt/yubikey-manager/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+  <longdescription>
+    Yubikey Manager is a python library and command line tool for
+    configuring any YubiKey over all USB transports. It's a CLI
+    successor of yubikey-neo-manager.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.3.3.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.3.3.ebuild
new file mode 100644
index 000000000000..eb81ef9c289d
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-crypt/libu2f-host
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.4.5.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.4.5.ebuild
new file mode 100644
index 000000000000..d5ad29c57862
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.4.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # Testing requires RSA keys which are not present in the tarball
+
+RDEPEND="
+	app-crypt/libu2f-host
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild
new file mode 100644
index 000000000000..d5ad29c57862
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # Testing requires RSA keys which are not present in the tarball
+
+RDEPEND="
+	app-crypt/libu2f-host
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.5.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.5.0.ebuild
new file mode 100644
index 000000000000..d5ad29c57862
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # Testing requires RSA keys which are not present in the tarball
+
+RDEPEND="
+	app-crypt/libu2f-host
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild
new file mode 100644
index 000000000000..3379be37dba5
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild
@@ -0,0 +1,50 @@
+# 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,5,6}} )
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-crypt/libu2f-host
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.7.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.7.0.ebuild
new file mode 100644
index 000000000000..7b8bda82e71a
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.7.0.ebuild
@@ -0,0 +1,62 @@
+# 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,5,6}} )
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/fido2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-fix-tests.patch
+)
+
+python_test() {
+	touch "${S}"/test/__init__.py || die
+	esetup.py test
+}
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-crypt/zulucrypt-5.1.0 b/app-crypt/zulucrypt-5.1.0
deleted file mode 100644
index fe99ebcc93d4..000000000000
--- a/app-crypt/zulucrypt-5.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret ) qt5? ( dev-libs/libpwquality dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kwallet? ( kde-frameworks/kwallet:5 ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Front end to cryptsetup
-EAPI=6
-HOMEPAGE=https://mhogomchungu.github.io/zuluCrypt/
-IUSE=gnome kwallet +qt5 udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret ) qt5? ( dev-libs/libpwquality dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kwallet? ( kde-frameworks/kwallet:5 ) ) udev? ( virtual/udev )
-REQUIRED_USE=kwallet? ( qt5 )
-SLOT=0
-SRC_URI=https://github.com/mhogomchungu/zuluCrypt/releases/download/5.1.0/zuluCrypt-5.1.0.tar.bz2 -> zulucrypt-5.1.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6395d08fc541b747a5a14c3fe67fedd4
diff --git a/app-crypt/zulucrypt-5.4.0 b/app-crypt/zulucrypt-5.4.0
deleted file mode 100644
index f713869c612b..000000000000
--- a/app-crypt/zulucrypt-5.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret ) qt5? ( dev-libs/libpwquality dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kwallet? ( kde-frameworks/kwallet:5 ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Front end to cryptsetup
-EAPI=6
-HOMEPAGE=https://mhogomchungu.github.io/zuluCrypt/
-IUSE=gnome kwallet +qt5 udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret ) qt5? ( dev-libs/libpwquality dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kwallet? ( kde-frameworks/kwallet:5 ) ) udev? ( virtual/udev )
-REQUIRED_USE=kwallet? ( qt5 )
-SLOT=0
-SRC_URI=https://github.com/mhogomchungu/zuluCrypt/releases/download/5.4.0/zuluCrypt-5.4.0.tar.bz2 -> zulucrypt-5.4.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbfc6f2b244bff16698a431147406742
diff --git a/app-crypt/zulucrypt-5.4.0_pre20180223 b/app-crypt/zulucrypt-5.4.0_pre20180223
deleted file mode 100644
index f0c20568e5ae..000000000000
--- a/app-crypt/zulucrypt-5.4.0_pre20180223
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret ) qt5? ( dev-libs/libpwquality dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kwallet? ( kde-frameworks/kwallet:5 ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Front end to cryptsetup
-EAPI=6
-HOMEPAGE=https://mhogomchungu.github.io/zuluCrypt/
-IUSE=gnome kwallet +qt5 udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret ) qt5? ( dev-libs/libpwquality dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kwallet? ( kde-frameworks/kwallet:5 ) ) udev? ( virtual/udev )
-REQUIRED_USE=kwallet? ( qt5 )
-SLOT=0
-SRC_URI=https://github.com/mhogomchungu/zuluCrypt/archive/76637bb05af13744bf1734b56f67d6d5cc2343b1.tar.gz -> zulucrypt-5.4.0_pre20180223.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3f5c0a1337bd6f7baff4b5ce89b149e0
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
new file mode 100644
index 000000000000..8f421d3290a9
--- /dev/null
+++ b/app-crypt/zulucrypt/Manifest
@@ -0,0 +1,7 @@
+DIST zulucrypt-5.1.0.tar.bz2 1610597 BLAKE2B 3b77676912f0cd8990ba307ff04309f308ec29cf76cad37ac28ebb317a7e42ee93ffe9deb1db12a80c4d5b235c2a83bc8e5ddeb6082e5f1be9d91425d06f4334 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0
+DIST zulucrypt-5.4.0.tar.bz2 1704452 BLAKE2B b0ef9e33b7261087b97186dd49672ea115c4792c04a64700cba5caa9c9e63d84818904c078a4d6663c6f420bbd19b0593af84210010821e2b8bae5f19947ffec SHA512 65361ef885b68a13f435704e0e1dbc9b7ae4df9525900ab60665c29e24574dcadb4afb27a7c595db33021c07086de92332f1a52189cfd674991b95e208040074
+DIST zulucrypt-5.4.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
+EBUILD zulucrypt-5.1.0.ebuild 1025 BLAKE2B 8852e894526d6b4db119e06f5d903226bb7c30aba504dbebde4bd93caa16162fc1f0562f314922de4f4feb3ea447c83659b5daabe35104f5182211c7a35b1106 SHA512 4f5411bfdfdf7c2f1b73602df3a9b1334f1f833cf3b4685d51381ca017870b02f270307447f8ea996b280d017f43b5d759f0ea087f600b54927ed314cddba96f
+EBUILD zulucrypt-5.4.0.ebuild 1082 BLAKE2B 8c5f7ebad6b607bb58580b74e450e7449c09a53a1ba43dfa3f39e3cd7ddac08f3a553d1da16ab1074a4aa3585ddd9ce0611a8ee3f5e26516fe7f368e5f72ee51 SHA512 98da7b2cbd5c8b270bd7dbb6f8dc018489682fec0409f9cb00df476ca03514952bfd622a084fc14295d06f5536bcaa861e495fec71bd1485ffa4dfbed20b4e72
+EBUILD zulucrypt-5.4.0_pre20180223.ebuild 1143 BLAKE2B c4e505eba9cdb13453dabbb4cff8afba36f0d86d60a3cd906ef658db26d5feb97af00bdf5a935f7e2655ae818f424f607e7cffebf320193a3c8ff823b4d175f9 SHA512 72e9617b6b5f98374d404cad23df38347e804ac9f13130e72c061dadef54ab809715e67bb0fbc8f8723d4c1875567f108fa5d5c093352d3aa1b889743d2cc086
+MISC metadata.xml 809 BLAKE2B d4767573d6ce0d1bab6f88185e9da74e6d4551a55f9cd56f8b762609b7d8b74a87cef5cb5b8332950906e722e1c82df4a2546a99da53d5feb11a5e2e673fcfb6 SHA512 0a4482ec6bd63bb8da89a94be28eb536e59285191c084b132d43c5e6c395c8e26b38fb64c61852b3b891eb5e3ff80ada06314f67c29ba7162c1f22339cac1eef
diff --git a/app-crypt/zulucrypt/metadata.xml b/app-crypt/zulucrypt/metadata.xml
new file mode 100644
index 000000000000..4a83a2a8ac5b
--- /dev/null
+++ b/app-crypt/zulucrypt/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fdsfgs@krutt.org</email>
+		<name>soredake</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="gnome">
+			Enable support for the freedesktop.org Secret Service API via <pkg>app-crypt/libsecret</pkg>
+		</flag>
+		<flag name="kwallet">
+			Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg>
+		</flag>
+		<flag name="udev">
+			Whether udev will be consulted when deciding if a volume is system or not
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mhogomchungu/zuluCrypt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild b/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild
new file mode 100644
index 000000000000..231dceb6d05a
--- /dev/null
+++ b/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Front end to cryptsetup"
+HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
+SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome kwallet +qt5 udev"
+
+REQUIRED_USE="kwallet? ( qt5 )"
+
+CDEPEND="
+	dev-libs/libgcrypt:0=
+	sys-fs/cryptsetup:=
+	gnome? ( app-crypt/libsecret )
+	qt5? (
+		dev-libs/libpwquality
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		kwallet? ( kde-frameworks/kwallet:5 )
+	)
+"
+RDEPEND="${CDEPEND}
+	udev? ( virtual/udev )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/zuluCrypt-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_SUFFIX="$(get_libdir)"
+		-DNOGNOME=$(usex !gnome)
+		-DNOKDE=$(usex !kwallet)
+		-DNOGUI=$(usex !qt5)
+		-DUDEVSUPPORT=$(usex udev)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild b/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild
new file mode 100644
index 000000000000..9edd794f8a6b
--- /dev/null
+++ b/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Front end to cryptsetup"
+HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
+SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome kwallet +qt5 udev"
+
+REQUIRED_USE="kwallet? ( qt5 )"
+
+CDEPEND="
+	dev-libs/libgcrypt:0=
+	sys-fs/cryptsetup:=
+	gnome? ( app-crypt/libsecret )
+	qt5? (
+		dev-libs/libpwquality
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		kwallet? ( kde-frameworks/kwallet:5 )
+	)
+"
+RDEPEND="${CDEPEND}
+	udev? ( virtual/udev )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/zuluCrypt-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_SUFFIX="$(get_libdir)"
+		-DNOGNOME=$(usex !gnome)
+		-DNOKDE=$(usex !kwallet)
+		-DNOGUI=$(usex !qt5)
+		-DUDEVSUPPORT=$(usex udev)
+		-DINTERNAL_LXQT_WALLET=true
+		-DINTERNAL_ZULUPLAY=true
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild b/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild
new file mode 100644
index 000000000000..934b576d92c1
--- /dev/null
+++ b/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Front end to cryptsetup"
+HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
+EGIT_COMMIT="76637bb05af13744bf1734b56f67d6d5cc2343b1"
+SRC_URI="https://github.com/mhogomchungu/zuluCrypt/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome kwallet +qt5 udev"
+REQUIRED_USE="kwallet? ( qt5 )"
+
+CDEPEND="
+	dev-libs/libgcrypt:0=
+	sys-fs/cryptsetup:=
+	gnome? ( app-crypt/libsecret )
+	qt5? (
+		dev-libs/libpwquality
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		kwallet? ( kde-frameworks/kwallet:5 )
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	udev? ( virtual/udev )"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_SUFFIX="$(get_libdir)"
+		-DNOGNOME=$(usex !gnome)
+		-DNOKDE=$(usex !kwallet)
+		-DNOGUI=$(usex !qt5)
+		-DQT5=true
+		-DUDEVSUPPORT=$(usex udev)
+		-DINTERNAL_LXQT_WALLET=true
+		-DINTERNAL_ZULUPLAY=true
+	)
+	cmake-utils_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-crypt
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)