reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-crypt
703 files changed, 22359 insertions, 0 deletions
diff --git a/app-crypt/WiRouterKeyRec/Manifest b/app-crypt/WiRouterKeyRec/Manifest
new file mode 100644
index 000000000000..7dcc92abb828
--- /dev/null
+++ b/app-crypt/WiRouterKeyRec/Manifest
@@ -0,0 +1,5 @@
+DIST WiRouterKeyRec-1.1.2.zip 117262 SHA256 3e59138f35502b32b47bd91fe18c0c232921c08d32525a2ae3c14daec09058d4 SHA512 a3c449497e3f3fed88dfbb35a90a2cfa5937efa02393e825ec51ab390b7094ce619d3238a916afd2b48e35e0e261b454f7d7005af46d6a45d77b2e1d4faaac51 WHIRLPOOL e52d316a01ba84bbe34f3a7b8abdf94287b67f3b28bc4ccfd0036fb21cd38c711d1bb2388b9b55f9253cd01ae26e032547624d8a25b55acfa9ea4e1ee36f96f2
+EBUILD WiRouterKeyRec-1.1.2.ebuild 756 SHA256 bf1de9c350d4f9b359defeadb0b102db84523a518851aaab656fb546d6b93c0b SHA512 272cd360a50a78096a67bf76087c2685ac5a604f69cccc1cb7e10080467d318d2f39cf9208bfd42267367d1e57b4913ad28e70c77d55177ee13e1ce684c658ee WHIRLPOOL f9705dcdf6fecd51d9b991835d924cbb8a71dd3bf2b4c371dc66ca51e10da03da398361f9139b4f3dccaa15c4826fe95670b54d22121c139a4530f717ddc051e
+MISC ChangeLog 2591 SHA256 38bc093647ed03344de2382015b68fe3c81f109fef49dd33988fee1d58ce75bc SHA512 84931cd3c3bfba3685201762b48d319c2da98d73877682e2a6df3566539ba74615254d35c593e6f7270631fa4fb48230edeaad234d0001c8816a8bf6d68c9a22 WHIRLPOOL 5689aaf3c38ca3483dfd19399bf6b40563c96a6f3dd7e667d68a7d2084949d410fe69f9987537dce4f2e580874ce70e1e6111875d03833fb0598faab8c658a7d
+MISC ChangeLog-2015 3788 SHA256 3392db029bd444d1cfdd60875e8431e4a48eca02d89363c6685f6109731917d9 SHA512 a51edc0bcf9e46848560166018c43b546e857383eb9d9d8ae9639362d4b7e32e1fb5f2e9b1a3a17cd81f3c471d78d777deaacd6ca0c38fac24c69b82f175b4d4 WHIRLPOOL 5c202e95aedcded4d1ef3035ffa0d8e76915596d8db7e944a42c597219b3bf2235f1d69d57fecef5bc19633c6fea0559dc825d752c052199e1d5279b6c09906d
+MISC metadata.xml 246 SHA256 7865004b5e3824d4a508188497473a0a56c96498237986c4f1f692151bf0a01e SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c WHIRLPOOL d7c29be66bc7bb8ea3a5c4948597ab70efd83982aaa759f621477aefa2a1203186473bc0ac961685249cf48560e011e1d457a934982c562392c289c85edd39a0
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..d9c19ac4b9d2
--- /dev/null
+++ b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 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="http://www.salvatorefresta.net"
+SRC_URI="http://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-client/Manifest b/app-crypt/acme-client/Manifest
new file mode 100644
index 000000000000..ba819894505a
--- /dev/null
+++ b/app-crypt/acme-client/Manifest
@@ -0,0 +1,3 @@
+DIST acme-client-portable-0.1.16.tgz 53129 SHA256 e9e705a362f6d450f4a229b34199cfb8022b8268cb86accf75d6b5b0c62a0003 SHA512 730c20bdf9d72b24e66c54b009a282e04da3ea8ce3b9eb053750672c53c9586b2879d87a565ddbab033d7ba6a577dd6399313b20cf654b185905db4de988b6b7 WHIRLPOOL 3a8972ece2dcd5a700e0c49c9eea03430789b7e32d51ffc1952c7fd011fe1bdae7fe1f521741b271b7abf043444efec62df806ca4ef602379415c421b8557d50
+EBUILD acme-client-0.1.16.ebuild 611 SHA256 2a53acb881cabe9a9b21ff3d7a2639ff536e5285c074ba835612e854fa22d166 SHA512 7dd8c35117b0fd66ee1dfbcbf83cf36407b547b9c47cf124227f5532a63e6044715db69a688f98910d35768f36b504d02cbc128e2782d554ef0786dcf9ab237e WHIRLPOOL 179acc120fb22ca57e5ada61eed94798af9f8baf54dc945233d87c4a097d5ae4e826b6d497a5afa7c652cb85df7a4878279b7624c5ba81d0b341342116f28035
+MISC metadata.xml 500 SHA256 e79db2b7e70dcb24f9b3b63cad994a079949dbf484653b3d166b0d7418105b2e SHA512 a07671d8912b83c15baebd76cfd41b8e023f8796a18a4487f6af712f3dad1967b90e35f366e1751cb1574b1b94f6746e464240ff2974cdb033895c8a8fd8c80c WHIRLPOOL ad1f3bad38095aebadc8f7c403091a14acc54a7cc8b78bc674227ffb927c5b37c7e93ab149aa19bbe17931674bc3e17df2cff83abad7ab02f4c150285fa079f9
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/Manifest b/app-crypt/acme-tiny/Manifest
new file mode 100644
index 000000000000..23c13a8d3d6d
--- /dev/null
+++ b/app-crypt/acme-tiny/Manifest
@@ -0,0 +1,7 @@
+AUX acme-tiny-PR101-contactinfo.patch 4065 SHA256 0e78f8e7ad56389507bb003f3edd8c32140955020b42bd78e8eabaceeaaf10b3 SHA512 2a473486a7d33026bcaaf01d5cbda40809c6a3a8e01b047ec7ea8283c993b94c2f090774f38e1e25924a8f36df342e36633acaea2749042c034ebcb0bff5a4e0 WHIRLPOOL 92498bc8a3b489147516330b3d543f28b94ea87b3a4ab19348e899fea2a7235b5a84104d7abc930c9215b481238c9629b14a1cee87c1a4ba36dad52e34e5352f
+AUX acme-tiny-PR50-setup.py.patch 4568 SHA256 66e20c59f4b549f43c3c073147a9e98955681f7b3dc25918e9b68290af204ece SHA512 41daa64e2517950f3863bf0573aa80304fb43a2221f4ea048b52fac64c5cc3b91b52d3dd6b6d791760c29accf26383a559f2956f27467528a1f7eb11ae8449d3 WHIRLPOOL a63766d0a4643b26ceba26e641d5ad02f83c6e794af2274a1f8b19789e205e4a10e830e59355b7091bc67c29f38709500c4847cebb49148feeb13034c3b31c95
+AUX acme-tiny-PR87-readmefix.patch 821 SHA256 7a07c9f00e018d1b630898d6be27d5e8ca779e0132c5260a89dbd16dcd02a073 SHA512 20dde53915bfc93cd48811cedfdf95405ed7322c277615c0f24969d9071a416db9dff51ce8c0c93af46e9ecfc3ae10bf0ab777576ea2f30a0a5419bd2b406404 WHIRLPOOL c6b9691faf5db09f99db0f6bea62d959c083dec928690b556f184db5561dae3330862e78708b0876dc71c86e0e2c90abeeaf45737fe718d2698d0e011cf0f1c3
+DIST acme-tiny-20170207.tar.gz 10510 SHA256 aef2541c7270a9aa4d4ce49509d6a0f48e59eccc116df0fe7defe77df724f544 SHA512 260de3fe3052e3eba3e8438b15e34d95c99f95d75137ddabe9c031a83bd7b967bebabe6916fa23de6194ab19cc687942af0cc700b7095b7c810820800c26061e WHIRLPOOL f16ed8b8f0a096bf379ad203343061b9bc078999029254b9462178a930e08728f370f0837991676f5d6bad41cd5279fbecc27dfa9b08c307341e1052cd9bbdfb
+EBUILD acme-tiny-20170207.ebuild 1097 SHA256 b8c4075daf23e36be842593b52df502be9d947dd9cb999f48fd81a68c73e8e39 SHA512 4552e2bd2a8fede28d931ef1513126b88d641b2fe4e8256f61596b2eff267689e508ff12151299d77b488d2a1c9a3ef1e62c745afeaa804787b7e3a89c6a1603 WHIRLPOOL 8dd306ed5652c4a1dc18f54aef5bc02d87d1ab44ee077a576696db4ce9bcb6b0009d801362dcea55b0b363acd7be515278cac24a9d59069b5e74e23ef30e474c
+EBUILD acme-tiny-9999.ebuild 1097 SHA256 b8c4075daf23e36be842593b52df502be9d947dd9cb999f48fd81a68c73e8e39 SHA512 4552e2bd2a8fede28d931ef1513126b88d641b2fe4e8256f61596b2eff267689e508ff12151299d77b488d2a1c9a3ef1e62c745afeaa804787b7e3a89c6a1603 WHIRLPOOL 8dd306ed5652c4a1dc18f54aef5bc02d87d1ab44ee077a576696db4ce9bcb6b0009d801362dcea55b0b363acd7be515278cac24a9d59069b5e74e23ef30e474c
+MISC metadata.xml 429 SHA256 8e80cf0387e6d1acf07894035290b6402fb4386bdc0b47e8ac54c27ddadd3be2 SHA512 7c0ff5126424ad18a75bd73fdab208397aedf79df6c6a3fc776efe1000ac9f41e3cd056e65da68fbba507940328c0308074ce9335c4be38a8197f7545728d9da WHIRLPOOL 487fa6da1a67ce50fc0f4d5c7aeec453918c12e8f6aaf7c8b77158ed813ae42122c63ef798c6f52069348ac9bec762cea6afa2df514610c241e955b9d3c457ba
diff --git a/app-crypt/acme-tiny/acme-tiny-20170207.ebuild b/app-crypt/acme-tiny/acme-tiny-20170207.ebuild
new file mode 100644
index 000000000000..05ce311583f1
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-20170207.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+	KEYWORDS=""
+else
+	HASH="daba51d37efd7c1f205f9da383b9b09968e30d29"
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${HASH}"
+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="minimal"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" )
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)"
+	fi
+}
+
+src_prepare() {
+	if ! use minimal; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-PR87-readmefix.patch"
+			"${FILESDIR}/${PN}-PR101-contactinfo.patch"
+		)
+	fi
+	distutils-r1_src_prepare
+}
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..05ce311583f1
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+	KEYWORDS=""
+else
+	HASH="daba51d37efd7c1f205f9da383b9b09968e30d29"
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${HASH}"
+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="minimal"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" )
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)"
+	fi
+}
+
+src_prepare() {
+	if ! use minimal; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-PR87-readmefix.patch"
+			"${FILESDIR}/${PN}-PR101-contactinfo.patch"
+		)
+	fi
+	distutils-r1_src_prepare
+}
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch b/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch
new file mode 100644
index 000000000000..787b66c1129f
--- /dev/null
+++ b/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch
@@ -0,0 +1,97 @@
+From 86083e6f79c6af99a59d8ee27c61f5d9b407f436 Mon Sep 17 00:00:00 2001
+From: Phiber2000 <phiber2000@gmx.de>
+Date: Thu, 10 Mar 2016 16:43:54 +0100
+Subject: [PATCH 1/3] added contact key in payload and email parameter
+
+---
+ acme_tiny.py | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/acme_tiny.py b/acme_tiny.py
+index 34a1863..bd79321 100644
+--- a/acme_tiny.py
++++ b/acme_tiny.py
+@@ -12,7 +12,7 @@
+ LOGGER.addHandler(logging.StreamHandler())
+ LOGGER.setLevel(logging.INFO)
+ 
+-def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA):
++def get_crt(account_key, csr, acme_dir, account_email, log=LOGGER, CA=DEFAULT_CA):
+     # helper function base64 encode for jose spec
+     def _b64(b):
+         return base64.urlsafe_b64encode(b).decode('utf8').replace("=", "")
+@@ -80,10 +80,13 @@ def _send_signed_request(url, payload):
+ 
+     # get the certificate domains and expiration
+     log.info("Registering account...")
+-    code, result = _send_signed_request(CA + "/acme/new-reg", {
++    payload = {
+         "resource": "new-reg",
+         "agreement": "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf",
+-    })
++    }
++    if account_email:
++        payload["contact"] = ["mailto:"+account_email]
++    code, result = _send_signed_request(CA + "/acme/new-reg", payload)
+     if code == 201:
+         log.info("Registered!")
+     elif code == 409:
+@@ -188,10 +191,11 @@ def main(argv):
+     parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory")
+     parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors")
+     parser.add_argument("--ca", default=DEFAULT_CA, help="certificate authority, default is Let's Encrypt")
++    parser.add_argument("--account-email", help="contact e-mail address")
+ 
+     args = parser.parse_args(argv)
+     LOGGER.setLevel(args.quiet or LOGGER.level)
+-    signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, log=LOGGER, CA=args.ca)
++    signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, args.account_email, log=LOGGER, CA=args.ca)
+     sys.stdout.write(signed_crt)
+ 
+ if __name__ == "__main__": # pragma: no cover
+
+From b128ae1289b106e1ddf20d3787a431d8ea949cf3 Mon Sep 17 00:00:00 2001
+From: Phiber2000 <phiber2000@gmx.de>
+Date: Thu, 10 Mar 2016 19:27:17 +0100
+Subject: [PATCH 2/3] code style correction
+
+---
+ acme_tiny.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acme_tiny.py b/acme_tiny.py
+index bd79321..cea57ee 100644
+--- a/acme_tiny.py
++++ b/acme_tiny.py
+@@ -85,7 +85,7 @@ def _send_signed_request(url, payload):
+         "agreement": "https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf",
+     }
+     if account_email:
+-        payload["contact"] = ["mailto:"+account_email]
++        payload["contact"] = ["mailto:{0}".format(account_email)]
+     code, result = _send_signed_request(CA + "/acme/new-reg", payload)
+     if code == 201:
+         log.info("Registered!")
+
+From 90eac8d6f22e858168ead32f00f13e7c997b64fc Mon Sep 17 00:00:00 2001
+From: Phiber2000 <phiber2000@gmx.de>
+Date: Thu, 10 Mar 2016 19:33:21 +0100
+Subject: [PATCH 3/3] updated email argument helptext
+
+---
+ acme_tiny.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acme_tiny.py b/acme_tiny.py
+index cea57ee..930cd43 100644
+--- a/acme_tiny.py
++++ b/acme_tiny.py
+@@ -191,7 +191,7 @@ def main(argv):
+     parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory")
+     parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors")
+     parser.add_argument("--ca", default=DEFAULT_CA, help="certificate authority, default is Let's Encrypt")
+-    parser.add_argument("--account-email", help="contact e-mail address")
++    parser.add_argument("--account-email", help="set contact e-mail address, leave empty to keep current")
+ 
+     args = parser.parse_args(argv)
+     LOGGER.setLevel(args.quiet or LOGGER.level)
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch b/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch
new file mode 100644
index 000000000000..c7e2c08a7c6e
--- /dev/null
+++ b/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch
@@ -0,0 +1,150 @@
+From 9bc3865d8c86392ca115ffb64a9389e92e00e861 Mon Sep 17 00:00:00 2001
+From: Jonas Haag <jonas@lophus.org>
+Date: Tue, 29 Dec 2015 14:14:49 +0100
+Subject: [PATCH 1/3] Add setup.py
+
+---
+ acme_tiny.py          |  2 +-
+ setup.py              | 28 ++++++++++++++++++++++++++++
+ tests/__init__.py     |  1 +
+ tests/test_install.py | 24 ++++++++++++++++++++++++
+ 4 files changed, 54 insertions(+), 1 deletion(-)
+ create mode 100644 setup.py
+ create mode 100644 tests/test_install.py
+
+diff --git a/acme_tiny.py b/acme_tiny.py
+index f54db0c..ca9ad3d 100644
+--- a/acme_tiny.py
++++ b/acme_tiny.py
+@@ -165,7 +165,7 @@ def _send_signed_request(url, payload):
+     return """-----BEGIN CERTIFICATE-----\n{0}\n-----END CERTIFICATE-----\n""".format(
+         "\n".join(textwrap.wrap(base64.b64encode(result).decode('utf8'), 64)))
+ 
+-def main(argv):
++def main(argv=None):
+     parser = argparse.ArgumentParser(
+         formatter_class=argparse.RawDescriptionHelpFormatter,
+         description=textwrap.dedent("""\
+diff --git a/setup.py b/setup.py
+new file mode 100644
+index 0000000..9ed597e
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,28 @@
++from setuptools import setup
++
++setup(
++    name="acme-tiny",
++    version="1.0.0",
++    url="https://github.com/diafygi/acme-tiny",
++    author="Daniel Roesler",
++    author_email="diafygi@gmail.com",
++    description="A tiny script to issue and renew TLS certs from Let's Encrypt",
++    license="MIT",
++    py_modules=['acme_tiny'],
++    entry_points={'console_scripts': [
++        'acme-tiny = acme_tiny:main',
++    ]},
++    classifiers = [
++        'Development Status :: 5 - Production/Stable',
++        'Intended Audience :: System Administrators'
++        'License :: OSI Approved :: MIT License',
++        'Operating System :: OS Independent',
++        'Programming Language :: Python',
++        'Programming Language :: Python :: 2',
++        'Programming Language :: Python :: 2.7',
++        'Programming Language :: Python :: 3',
++        'Programming Language :: Python :: 3.3',
++        'Programming Language :: Python :: 3.4',
++        'Programming Language :: Python :: 3.5',
++    ]
++)
+diff --git a/tests/__init__.py b/tests/__init__.py
+index ce89619..5ade34c 100644
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -1 +1,2 @@
+ from .test_module import TestModule
++from .test_install import TestInstall
+diff --git a/tests/test_install.py b/tests/test_install.py
+new file mode 100644
+index 0000000..005f36c
+--- /dev/null
++++ b/tests/test_install.py
+@@ -0,0 +1,24 @@
++import unittest
++import os
++import tempfile
++import shutil
++import subprocess
++
++
++class TestInstall(unittest.TestCase):
++    def setUp(self):
++        self.tempdir = tempfile.mkdtemp()
++        subprocess.check_call(["virtualenv", self.tempdir])
++
++    def tearDown(self):
++        shutil.rmtree(self.tempdir)
++
++    def virtualenv_bin(self, cmd):
++        return os.path.join(self.tempdir, "bin", cmd)
++
++    def test_install(self):
++        subprocess.check_call([self.virtualenv_bin("python"), "setup.py", "install"])
++
++    def test_cli(self):
++        self.test_install()
++        subprocess.check_call([self.virtualenv_bin("acme-tiny"), "-h"])
+
+From cdf1bde83d6b640a8896722557386b6d9b6a9fbb Mon Sep 17 00:00:00 2001
+From: Rob Speed <speed.rob@gmail.com>
+Date: Wed, 10 Feb 2016 21:53:24 -0500
+Subject: [PATCH 2/3] Added setuptools_scm for automatic versioning based on
+ tags.
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 9ed597e..7ec7ef1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2,7 +2,7 @@
+ 
+ setup(
+     name="acme-tiny",
+-    version="1.0.0",
++    use_scm_version=True,
+     url="https://github.com/diafygi/acme-tiny",
+     author="Daniel Roesler",
+     author_email="diafygi@gmail.com",
+@@ -12,6 +12,7 @@
+     entry_points={'console_scripts': [
+         'acme-tiny = acme_tiny:main',
+     ]},
++    setup_requires=['setuptools_scm'],
+     classifiers = [
+         'Development Status :: 5 - Production/Stable',
+         'Intended Audience :: System Administrators'
+
+From edcaee1fa841d49a3fa488288faa8e6573269413 Mon Sep 17 00:00:00 2001
+From: Matthias Bach <marix@marix.org>
+Date: Mon, 22 Feb 2016 22:53:06 +0100
+Subject: [PATCH 3/3] Mark wheels of acme-tiny as universal
+
+Ensure that wheels created from the acme-tiny source are marked as universal.
+---
+ setup.cfg | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 setup.cfg
+
+diff --git a/setup.cfg b/setup.cfg
+new file mode 100644
+index 0000000..434559d
+--- /dev/null
++++ b/setup.cfg
+@@ -0,0 +1,2 @@
++[wheel]
++universal=True
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch b/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch
new file mode 100644
index 000000000000..1f576d50c755
--- /dev/null
+++ b/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch
@@ -0,0 +1,23 @@
+From 85df9d1217341893ab6dbbe58fb7c878e15d832b Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk@jwilk.net>
+Date: Wed, 24 Feb 2016 22:10:01 +0100
+Subject: [PATCH] renew_cert.sh: fix unusual shebang
+
+sh is normally lives in /bin, not in /usr/bin.
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index dfa562c..5c83a67 100644
+--- a/README.md
++++ b/README.md
+@@ -171,7 +171,7 @@ for example script).
+ 
+ Example of a `renew_cert.sh`:
+ ```sh
+-#!/usr/bin/sh
++#!/bin/sh
+ python /path/to/acme_tiny.py --account-key /path/to/account.key --csr /path/to/domain.csr --acme-dir /var/www/challenges/ > /tmp/signed.crt || exit
+ wget -O - https://letsencrypt.org/certs/lets-encrypt-x1-cross-signed.pem > intermediate.pem
+ cat /tmp/signed.crt intermediate.pem > /path/to/chained.pem
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..3f41f197c61e
--- /dev/null
+++ b/app-crypt/acme/Manifest
@@ -0,0 +1,15 @@
+DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
+DIST certbot-0.16.0.tar.gz 992700 SHA256 9abac759d7d72b520693ff806479e87609059a1546bb6ea26416267ebeedd25b SHA512 4cb6ec06c6ec71cd6886a716100f269de3922f17a582c8c20ec40327b65e1c16347a5b33d44131e56a7667233ebba88ff36a4e854beedd13e848897ba09a7e64 WHIRLPOOL 34dae0b20d472b4020986d0768ea6757c977fa4626666a9f81711007c051e76f9ad60f5a3bc77c768975e71a791f20e5ca2bb6f2fc41d809ebe2541129c975ef
+DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
+DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
+DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
+DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
+EBUILD acme-0.1.0.ebuild 1234 SHA256 8720192872d7fa7f7d40bbfd8bcb47da11c9ee53ef5491436844f907f087b2ed SHA512 a86535b4848749ad221269f2cc8494bd61cf7ae3e0352ab1d4d60c2d0b56b34dc2d0fad77786d49dfed08eb22c48cce936cddca97b9fccb946b7f9265695f5e8 WHIRLPOOL 5d8e66b8eccaf0cdc5cef94ecb0206b9e70f16d375775603a2d0322c09983c5218264468ec09f5e7265c367f8ea06debe1b138f1c4d50f43ac1221d16dc785ed
+EBUILD acme-0.15.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
+EBUILD acme-0.16.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
+EBUILD acme-0.17.0.ebuild 1088 SHA256 3901459c800d46b169a5c26ef8ccd97c8f7b0f08583f1181e4cf675d965561ec SHA512 4368b0a3b7442122bdeb5295988f3151000048c708cb86f8faa552670fee8d54a314c27a900bc14adf46545799ddc6560df2807263eacce9ae5c20e6361ebc9b WHIRLPOOL 9da58a0a770583d3f3c7b36682bf47a6a842927c5fa89eb75df2fa674bc4532f6524057e96f6d4ab5fbd7056f53501e6f9058377e3491b0fe8dc65b50d10da63
+EBUILD acme-0.18.2.ebuild 1095 SHA256 64e48f47a416b6fff4fc89f734fd798d81cfefc818cf0a6e8f7e5ab20a9b8971 SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4 WHIRLPOOL 4d1ece95d63fe48939ef8ea93ea0f15626ed2d39b72ac14fcc31c1904bc12d399239177f511e8c3d992206081aab1ae2871af38e905ead350be61a82c7eb2585
+EBUILD acme-0.19.0.ebuild 1103 SHA256 da323dba2cfc558a07d29a372e95ab0ef7c96764ec719c17739f44b8d49a6c46 SHA512 37c78b40124c666e76d6579c14b03e47ac54d0fd2157a42cf62405e2f485e05ab9d0416cc9ddb2db66786f5524b392cdf7d38a59ceba1dff577d795abd8e9aed WHIRLPOOL dc6a244eee32361d1d6bd9374a89341722417f6515655aec5b2846f82bc405c9cde05613839f22754f5e2d032419d7fcb83f151ec31b63571dc1322b9fcbb22a
+EBUILD acme-9999.ebuild 1095 SHA256 64e48f47a416b6fff4fc89f734fd798d81cfefc818cf0a6e8f7e5ab20a9b8971 SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4 WHIRLPOOL 4d1ece95d63fe48939ef8ea93ea0f15626ed2d39b72ac14fcc31c1904bc12d399239177f511e8c3d992206081aab1ae2871af38e905ead350be61a82c7eb2585
+MISC ChangeLog 5917 SHA256 bdbadcd2933561b28889bf9b42c7d8863ecdf550db5b65662f3fb9096031b160 SHA512 63e3bf1a22642138436d2c123c9e25c33cd9b17ba6be7953a95babe7541ba0fafe82a1f504b3b1647eb08e19714075c79bb1fac3f7334b94ee6d7a740347b540 WHIRLPOOL 9eaaedda59338c0c9bc3e0188d2dcc08ed17b83adfc49a7afa21c7883d97ea07a4d457be8546c92354ce7eb85bc59dbea905fe09e5a9ea6809e879f2ba915eeb
+MISC metadata.xml 342 SHA256 cb538c63739de15c65069f536cf05b70d203ff46e6782d7671fa465eec4ce641 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb WHIRLPOOL c74a8e573a993be6355b81149e5b4fea5cd67d9cd3d6bbb27df1cc2093e87d78dea1ab0994d1b7e35e17f14cbb2d2b655f86870366dc86e0bd58ad92654960f5
diff --git a/app-crypt/acme/acme-0.1.0.ebuild b/app-crypt/acme/acme-0.1.0.ebuild
new file mode 100644
index 000000000000..efb7cc2d870d
--- /dev/null
+++ b/app-crypt/acme/acme-0.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+	inherit git-r3
+	KEYWORDS=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S=${WORKDIR}/letsencrypt-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/ndg-httpsclient-0.4[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-0.15.0.ebuild b/app-crypt/acme/acme-0.15.0.ebuild
new file mode 100644
index 000000000000..bf3eed8aaa75
--- /dev/null
+++ b/app-crypt/acme/acme-0.15.0.ebuild
@@ -0,0 +1,38 @@
+# 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 ~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/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[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-0.16.0.ebuild b/app-crypt/acme/acme-0.16.0.ebuild
new file mode 100644
index 000000000000..bf3eed8aaa75
--- /dev/null
+++ b/app-crypt/acme/acme-0.16.0.ebuild
@@ -0,0 +1,38 @@
+# 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 ~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/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[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-0.17.0.ebuild b/app-crypt/acme/acme-0.17.0.ebuild
new file mode 100644
index 000000000000..bf3eed8aaa75
--- /dev/null
+++ b/app-crypt/acme/acme-0.17.0.ebuild
@@ -0,0 +1,38 @@
+# 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 ~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/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[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-0.18.2.ebuild b/app-crypt/acme/acme-0.18.2.ebuild
new file mode 100644
index 000000000000..135b289d3d81
--- /dev/null
+++ b/app-crypt/acme/acme-0.18.2.ebuild
@@ -0,0 +1,38 @@
+# 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/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[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-0.19.0.ebuild b/app-crypt/acme/acme-0.19.0.ebuild
new file mode 100644
index 000000000000..a8fc5d0ba458
--- /dev/null
+++ b/app-crypt/acme/acme-0.19.0.ebuild
@@ -0,0 +1,38 @@
+# 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/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/nose[${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..135b289d3d81
--- /dev/null
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -0,0 +1,38 @@
+# 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/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[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${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/Manifest b/app-crypt/acr38u/Manifest
new file mode 100644
index 000000000000..07fdb113d0ae
--- /dev/null
+++ b/app-crypt/acr38u/Manifest
@@ -0,0 +1,7 @@
+AUX 1.7.11-bis.rules 590 SHA256 afb057dd48cbb46a24e358edfe5a8e100fb25642194ef2e8df688c72d15f7add SHA512 9e2d806a13a978f1a27a9b3bb6bf4f63809bc3cd03057b513f48bee0d2f2589f75484ff4e0e18dcf8b1b37b9af2465014fc3bcf87b48dd330a375fee3baef52f WHIRLPOOL 7fb9d3406fde2a37941ad8d32ec9dbc45e2e5b2c1d2cfc08543d1542ecb4c6d0c0ae781d14da370e7fa3cd052fe23f135190558ad7b1239990849012acc041c9
+AUX acr38u-1.7.11-build.patch 6299 SHA256 a9758edfbe70fd4e55a004032d487a1ba5377f8f967bb35818eee9f34dd0de06 SHA512 9979ca060a4dc4da526e0a0fbbe45a09e5e261cfde4f928f0dbc514af7d799796a2edf2f81d4015f512d9a374aeab57e971ce34f62cd7b0ac024ec2662c4a029 WHIRLPOOL 50b57c87e75642b5f8b457b6cd844f10cb21dfc4bc49a9d0d88a9c53ec5ef7bf8016827236c2b0e7c3d06dc00ad99792d7ce980dcd7e3c1841d250fd24c03a79
+DIST ACR38_LINUX_100711_P.tar.bz2 274137 SHA256 7d7e4fa97def2415f4b5c9e90cfedc2f7acbe94ca8b1653a5d8a85e24fc0ab53 SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7 WHIRLPOOL d63f7d1a8ff51ff131e0e0bcf943bbb5c38773b707019e695377fc42b5a91029ac22736dae95f10342a8d44370f90f766c9bdbf23f5c445c8f41c051303f87c3
+EBUILD acr38u-1.7.11-r3.ebuild 1427 SHA256 0dd953ecf47114c78e96795bfb8ebda6591768e1a98ce46e3a70f5d501ec7cea SHA512 d7707ef223b52136953520a40b20b7365a5cfdb4623ff097500e8c6f312d6f1e004aa9a2e5c214c7d41f955c75a53370b3689c0a705804bed6e81dee65d90063 WHIRLPOOL 10d4b8ce563766397839e296f4cc96d270cfdbabb623e156b811ab8684f9c871054e40efd0bb9b273b49ea723029b17ec33cefcbe609aa9816f7b8ccce0f00d1
+MISC ChangeLog 3022 SHA256 1cdc67eac5074d718626feb926d7a4e8ff483b202564419378c6610d11ea370d SHA512 8f89cccf4e31c2a0686541afabb14ca011b228af0a43a75fc18f14fe0260db89efde5f84a5c07c34660dafb07679907e0d0d6ad087b574b0a05c9f8620a120d5 WHIRLPOOL e0a612f85a8b80026d1a5684178c5b6f32f8e84337efb81c043e1de2ac7f113750fbd90e95315db94b62b70c4a3f8e2717e856d47300ef3b19401c735374e671
+MISC ChangeLog-2015 2215 SHA256 50bc9a24a0c2c3dc75a5f008eaebcba3fae184416a36f2f18d670bd21fa3fd4b SHA512 12a19bdf09960d54b05e724438ea4ce1dc255ba0f672b986456237ec605fc733f9286ad1c2652aaddba1a4caf3a490f636edab7e142bdb4fa67c051d626996d8 WHIRLPOOL 5cea56b2762e9521c0d1460fd1641ac2deaa4331bdfe7c4228a60b85f29ab1b2ad1667046a9cc63762809d8e6a0f88a1f9c85afa0de51e12d374cbf8854cb1a0
+MISC metadata.xml 526 SHA256 e95fb95c60fd1d728d03f4d81b4d58a9915282296407c09672227276ac0d4182 SHA512 8228c380a3dd574785b66d451cd008318f37f73c56da35c1c516c1fee96c68221a36aee6e0079df0b1babe24c4e41bdaef3cebb8e635a50b72a754685098b614 WHIRLPOOL 9e5690c9130fe775f25cf3761ca93c8d677320f17003932cb486b032c14ede205f699778ca5cb63f77d4ed589e5b1a492a0e2e9763e88fabd6a9d1d58089f3dd
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..8dbe56e40ef1
--- /dev/null
+++ b/app-crypt/acr38u/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>vincent.hardy.be@gmail.com</email>
+    <description>Proxied maintainer, assign bugs to him</description>
+  </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/Manifest b/app-crypt/aescrypt/Manifest
new file mode 100644
index 000000000000..2d7789891559
--- /dev/null
+++ b/app-crypt/aescrypt/Manifest
@@ -0,0 +1,7 @@
+AUX aescrypt-3.0.6b-build.patch 1711 SHA256 cfdc935d2faa72a1eae6b48193541deb99c4b93a1df780a3f73cc5d62f1bc2f7 SHA512 b19e4eba11753bb8929d14eddc4ef391c8ec62b2bb57cf63b1a74b9a27250b4719ece8f1a6b790c1f662738b92bb37da96c973dd38cdf059c7482edb3dbd0f0e WHIRLPOOL 22c975f5eebd92b8826bc1b1c14c9101e124ec547e3cb4eebea1e872fbb07ad9f3d494e8aa41fe70c714e5c707dbb4ad9c82eae6899354b5204d5a5672cbabd1
+AUX aescrypt-3.0.6b-iconv.patch 1096 SHA256 f19b4ac404077503be19faf5425ba4d865a56ef71d6a85ec96fd184c58eb9cdf SHA512 bf8d564493ae9396f024c1e33a775a53833da9d984ff059f714362a2cc112c3e6bd575c5d64fc0f7118fd578af645f386d649483ab56c2a0cb8d9b0795161409 WHIRLPOOL 4c9e91f85ae9f240a43b874f6a4b37f7bda024889040c114d4155f4752530310525203dd08ddd81b398acc23469397e3cbb4280f9ea9ac372b340193e1b3854c
+DIST aescrypt-3.0.6b.tar.gz 28272 SHA256 88a5efe11ede495688e409807c33c09d3df6595acbbf2639f5a93d0061ca3dfd SHA512 4c88abc9bff50ae5d310be7dad8f29843941843f9b484d9846b08dc76c605940adbb375f7e8ffefd6e8236f35ff860a745f89226e9c171bfa70c28c16aa6626a WHIRLPOOL b8fc56084af1b8296a531ff1bfbf5b70d2ea79cb3a2a0539f21e01d443f549016d52fc73f2e94033d82ec1f6a9e4ef2124d7fd9d1971a6364f91d4e35393db7a
+EBUILD aescrypt-3.0.6b.ebuild 638 SHA256 0f37fbe6e9193517d324899e8f073d8cfc169879d7dcc48b18d1ad58217c00e0 SHA512 00bce3b1a9526fa1144e234cd4326ea4afdcaec7a9f29d62e1f532bfd2f6dec19ecf868fa92ce7c1dfbf66e5063d0762037c6b1b267857280158b57562842993 WHIRLPOOL c95d9a090cde62398f4d74641f0d9a8610695dc0d2ab7e4b4d090403c8d80f4dfbe8dd681c4b31aac7e589ba9b3830555a9a93c7fc764ff4ae11df2932397d26
+MISC ChangeLog 2507 SHA256 95e273b6b02b95583ddf09ec158d2f93e39b63ea51f2a176eb4b8f0caa94c2a0 SHA512 1a8d288ee8b643925109fbfa33d1e83e1febab6b3ce21521edb11036513e5798ab3608f3b3075b88eeb218faa1a5a5ddf1ad9f083e0cda019a58c36f22003ffa WHIRLPOOL 43bc9ad8abf70eae779761917b911035ed8ca195a6e44f10d275f4ea2417ad2d3a64539d4bde80de46e6465dcd92a229076b8a8c968c5b1ab3fe875108d13646
+MISC ChangeLog-2015 444 SHA256 e4d7f5eefec98572d26f1bca53df199d50e3c988b7f170e5480c6561c740a8aa SHA512 3a40dbbe1800d050d9ce2f8de757f1cb377a15137c65a3afb1305d198a51df48fe64380955078b357bdf36ec41469f57738052384dfaad4a234ef31c277143d2 WHIRLPOOL b76ccb975f88440b9c511f2d99118ec8b415ba439241d01a45628b618185c43f9ad36cece3effc1c3e5012c6428ac67c92a91f213008ce340eaedcc080494b0d
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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/Manifest b/app-crypt/aespipe/Manifest
new file mode 100644
index 000000000000..c97fa9aee6a9
--- /dev/null
+++ b/app-crypt/aespipe/Manifest
@@ -0,0 +1,5 @@
+DIST aespipe-v2.4e.tar.bz2 107741 SHA256 bad5abb8678c2a6062d22b893171623e0c8e6163b5c1e6e5086e2140e606b93a SHA512 e038f710ac971e5ba740648c0f255e8bc9fcea9be1a6b76208a453f21f013e1662c006d4f4495fa2b2560fd9b0c236947462a9b337a120073c6a5335b29f077e WHIRLPOOL aa6cffad21a537afe198ef97170dc312d76cbd38eabd3c3e8ad9f4333c04269ba639da3d732b94792ac9dbdf6c92d066f86a595f1cc55548b958114d1edb80bc
+EBUILD aespipe-2.4e.ebuild 749 SHA256 ea77047446e7c562b674dfe012e5828e9758006acee2b2bf86eb2ba7d3e6d941 SHA512 aee20bf51f635afc122eb35e88038cf0441d5bc80cd13d676d2877644422dc762f9a5f73c253d235367a2a06a5e6ece931be14d55fb842f7b89861ba8b6fbac2 WHIRLPOOL 32f9a0e8e75d5e242230d5146a73f64874e174a9c863e32d592d41666a89e3bd81cce76d0d2042ec86dd7da2f4a1d67a903310d162ffb50fba3d75293b9a5216
+MISC ChangeLog 3178 SHA256 f29299fd01078f8982d6831cd3d85fafa09cb29444bcc5aeb89ef065bbe6159e SHA512 5835eb9fd88f3fdc487f7af80867a66ad5c0ed5550451de4b2767d94368efb4d863589cb21a3feda40a6508bd1b8057cd658494e575dca631af007089c5b0e54 WHIRLPOOL 6f9ce1f170d6c41f2d75592cd269c035ee798ed18bf2e55f53c225f3b7bc77b37155e0d8572129bee67cbbcef6a487c708aa096a5eaabdc97ca41b6aa8d6d796
+MISC ChangeLog-2015 3697 SHA256 5b605bfff765e1776f1796416fe91a1eb0a6fe552047d3faad7313f31e64215f SHA512 d2fafa182c38fe2a0698c29926e254c451297b4f0992dff183f4a2b4bdbbc2ec25d4d01079f9eab4b763e2280b85ebf43c571ad1aa8fa5dc490a00a7f18931d7 WHIRLPOOL 44786f09d261983c4c5e28516ece92b97e2a63840ab8114ea92547fe1d82730eb8c0bf144d3bdb82f5db846f34a8654251000ee44f1f309f332a15f12b753151
+MISC metadata.xml 524 SHA256 6f75651fe680d0b91925d8732dffb2ad21c5716b815482409725b46e97c4dd17 SHA512 f4f83f8a2e74c242163be7fc553e522b0fc6c910718658d1ffce1767193a042c5a4e86bd7ccbf8bc6cd37d68f71ee763dd02bf4df2a73845e83eee0dac6db8b5 WHIRLPOOL 8d1c0ccb5b18614fc1cee80438be17beccf959ad0af02a83931530df615b4a854062270a66d5db07ac492e845ec5d51dabac21ad814160fc1e20b29ec379b25a
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/Manifest b/app-crypt/af_alg/Manifest
new file mode 100644
index 000000000000..acbdd07d4fa1
--- /dev/null
+++ b/app-crypt/af_alg/Manifest
@@ -0,0 +1,7 @@
+DIST af_alg-0.0.1.tar.gz 332007 SHA256 aeeef47027b06208207553ffc477758d6d4b8334c26b2b233af5127ef7e0a5d9 SHA512 10860268dbff65e20d78c7d251b5ac4e63342e01c30af72894baa63a625f11900a77a8d0cca29d93bd3a06ae29c16c5fc4d71843e7379b7d948ad1b6e6b58b5b WHIRLPOOL 86abc4aba4977f0c0ac83a07f7f4dff250445d6cfc7dc6112bb97f290711d3a16b7ccfb29da5b553cfe5eba08b42d0d333da92afe53fd99ce27f4eda78c35434
+DIST af_alg-7b13512edbd77c35d20edb4e53d5d83eeaf05d52.tar.gz 5362 SHA256 5fd78ccf5f815ac89d55bf53db6a41a720100325e2ecb7dd7c2b459d30bee88d SHA512 c897a64ce12c5ecbdf8147a8776b646b9fed7d012cbc913e1f047eff4dd81fe1783733d64e711ab3702923b57055e4ca923cdf4f90bef6a4868f803be11239ca WHIRLPOOL 53c1972c01833f7a4151f1613095a53a5fe46ed162296c2a082b1c647e038c1367c70a3dfdb4399e3ce2244d7b3a544614805e0f40a69b63ae2cb996d7dd3d61
+EBUILD af_alg-0.0.1.ebuild 1004 SHA256 6212ce18abfc2f22a5444d2b83080236898aeef228f7f5b04e525a7fc3a1f371 SHA512 e866279daa5ea16c83bd8b0135a68f069b9256e7da41992e84e86504f92ee3de8f761377f7ef0bff40c3822e1c453bab2a2a1d046115e6190b4f293ff9a3d42a WHIRLPOOL 964429faff8bfb469a344e13dd0ad91751fce769a04919a756aa433e8f410ba0d941d04c4d6687693a117c7bf617bb3eb28f366ed5dc3d595385c586feb1714d
+EBUILD af_alg-0_pre20120229.ebuild 839 SHA256 678f03269b448fd54d94fe166e12c3e102552b4b14ecdbe175efd5426306d0b9 SHA512 f0cdf0c4d7639ccbe3007feab6d321afa3620122095fd7eb90af4ac0e547ad4958cefd34aee2158db88dbcc21f11e9d4b678eaab110dce55a9319dca4c656ef8 WHIRLPOOL ebfecf4c9a3a1b3efad993b9026c71090e45389aa68eb0dea9698840c0903156688b5543bcd92a9bb6fb1975c52504568de4b40263fb033f21ede89bd26b186b
+MISC ChangeLog 2944 SHA256 5c2444d0e74f2ac5c0d4ae4d2624b9bbc4f5c334a9d398f7f4523db9b0a9ae89 SHA512 dfdfe98d83081fd23ba1889f9b7793ea384cea59b746755fcd6fffa523a8d42aa5a60520b348c43d288725e09574df41eb6a5eae60986ae1275a8c3bd9a67cda WHIRLPOOL c63f6bba9711ea7e582368c51f450b52716d21111762156859bfc57d0f032bc719ccf33e938101bd87e4381c3a4089ac23a8c88e8471f9368699e9cde9ab0b86
+MISC ChangeLog-2015 812 SHA256 79232d1dc441d7a050cc8b81d6540f30b81e4edcc8c82dac3e3bc14f29399ebd SHA512 281bd92bc1e6699fbcf20b0844dd24ab591630e7553506422fd8612c8f43115d55e9bdb5c92dd4556508804ff117de2af24324a30dbaa1a730e7f5216dccf447 WHIRLPOOL c1aeae07e4069841fd203317900d6fd75634f7c3b787cb8a8a4e446d421eff7d769617fae6a9ff0da5156b2e0f662a6987db94c801254ae7461d5050e9a9ac76
+MISC metadata.xml 775 SHA256 77afcdb23e5370b03af0e51b743707aaf0148e2ec282ec3eeba0d92ad3a0a80f SHA512 0e58d079d14a8559c56780c77eb6221ef1abba227b5b2c32306eed7d9b562b84724868488680adc2b21c3e810cd8700649d89cff0821583657b619c1a5ae4671 WHIRLPOOL a662cd8a7691d9602f9e5a088f27db3bf92e0b323492acaebc213ffb3a39901258eeee5034380443b4c5d3649ec73510bd47b5e682499b4880d4f4c7721b59a0
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/Manifest b/app-crypt/argon2/Manifest
new file mode 100644
index 000000000000..1541ee4830d7
--- /dev/null
+++ b/app-crypt/argon2/Manifest
@@ -0,0 +1,10 @@
+AUX argon2-20160821-makefile-install-target.patch 1170 SHA256 3f0696e8111c5cc01a0f2c5ba815d19f7d848e7603b79200091db029ad4f00e3 SHA512 33650ebcda89330aaaff917fcc699f3192c1a59fcd1b639f20fced6dc18d8286f83488e88aa11ebdf0dc0b7405dbfb36081951b5b9d946d15c895895036c0187 WHIRLPOOL bfe31a0a845404cad7ac78268e82d6fe269a27e8846cd823b2f1b2247ec8c9e1f3a8ed6d2f52679873b12c8ae0014dbb99e0add13ad26491edeec8830cc8e488
+AUX argon2-20160821-makefile-soname-symlinks.patch 807 SHA256 29456a542de4f9138313cc1068a2e078292872043dffd2287461f78c2dea601f SHA512 de2e9e0f5b378700aa01004684f7aa9fc60d6e49cd6f994663bb8bb7c357732cbf19c31a563c44b485d5b85a75ea76c283f606ce1d453864b987febd2cbeaa27 WHIRLPOOL 8bb32294ffc1c1197e9ccbea131c6173f2fda66d50fef5d7656af9a37c344947d4a4c0cfe0dd7fb3113e6bf8dc4aef2930e27d53137f60b7975b75d05ca0151b
+AUX argon2-20161029-makefile-soname-symlinks.patch 807 SHA256 29456a542de4f9138313cc1068a2e078292872043dffd2287461f78c2dea601f SHA512 de2e9e0f5b378700aa01004684f7aa9fc60d6e49cd6f994663bb8bb7c357732cbf19c31a563c44b485d5b85a75ea76c283f606ce1d453864b987febd2cbeaa27 WHIRLPOOL 8bb32294ffc1c1197e9ccbea131c6173f2fda66d50fef5d7656af9a37c344947d4a4c0cfe0dd7fb3113e6bf8dc4aef2930e27d53137f60b7975b75d05ca0151b
+DIST argon2-20160821.tar.gz 1170019 SHA256 f81456ae31337a13a1a1b8ffe994d71ace741833a97a75f0c1a76259639bf3b8 SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f WHIRLPOOL ad476d23572ebe8701a71a79aff09dd08a0db3dde9b0a6104884a91309d651298adfb514cc7de9c585672ffbc816c9afae67cbbe09b3f9a300624036981c3d78
+DIST argon2-20161029.tar.gz 1506864 SHA256 fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892 WHIRLPOOL d90a0bbd17abf146e47ef5f1c9a759234396d9779213210484047120091b9e420f11926d502c1bb03a464625f64d3ec1df34f10ec5ba23572d18184fddaf113b
+EBUILD argon2-20160821.ebuild 1000 SHA256 c84b13af301cd8b51f5d16a3aa5e3f3c2132f39e829f90b7cc33134fd857dff6 SHA512 31d61e573417378f1b913c107c32c1951f4aae0a876c249bd615a1c6d2cb6ebe3943347cf4d2a2b86e61959d43bbbbb74012e518ce662b35d1c561953873d4bc WHIRLPOOL 044d2b5650f9fdb362e52d99caeb05d1600e5df169f8ed7a041fe155ea48bc1987cb3b90011cc12722a39e6c0d9c15b9b5ab819980110bd272825c8201328693
+EBUILD argon2-20161029-r1.ebuild 1050 SHA256 1f7af06f0ef02440953cec516bca5bd00a60963a502a04f87adcfc5f492c758a SHA512 5fd9536715c7a860cc0bf4151869a754e41c9c2332834ca9441ea2f1b092922ac358010ae05c1390e23165b2a4d649eea9beb47994eb077a04fa51b1090a352a WHIRLPOOL d1dff91a01b64b21a787ca3c871efa020650e7572dfe56d2d8414b1d385c91e3da099517b890d80a6898945e77efdbd07534fbc98211d7a5a2cf4f591b8d9c24
+EBUILD argon2-20161029.ebuild 950 SHA256 fbac825e55999d5438c59434c4200814b3406b8915354c2d247939f6b6f17f20 SHA512 02bc9f738cb35cc7df1a69cdc3549b4429d5c3b0d612924856ab0e409665aa81a061fba23559ab304713a5e7377ddb3994e7e0ba8d2267384fc2b66365b33153 WHIRLPOOL 410ebb3de1854b3584e47a02128b2d070a256b5313b0ac158f88d79ba3c27a91726bde246531db63f7935eee340ff2628f32d8ed6197b456661dd26a43c34808
+MISC ChangeLog 615 SHA256 23c995cebbcca07ff5edfca8694b486aa54bc7719ecee47e23585420c5a2d786 SHA512 cf0ecdefbaf389a74814412b20d5730e1b74bde0e725e6b64e38a7366f72e39ffb38c2044612b8f056944cdb19bcd50ed3229c7fcb8a7af7f9b02a15019557fc WHIRLPOOL 118bac2a8d445107cc629c3140245f215b565689c0f9d993ebd60d6eb63e01def04a9790d18ce9d436e3794ec26bb5fb07b7f5de2fd6dcd5f3ba6e26045704d8
+MISC metadata.xml 589 SHA256 1c9ab41b59e93c92979e66284130eaf2caefbee9be21a38b909015167a2485bd SHA512 929d78d8436196e717c57041b83fd01e48619a74e740c75148f8c347902aa154cfb350df5c294866c8e125363808b1b125731865a9f702b9a1e611cccb310d16 WHIRLPOOL 0fd6551d7f2d8f4c7532a5ac89558a1801271e7d0dab02f674a0ae276297560f97950d2ec71621bd82377f0beab64900e1400cb02f0b28f7ddc25aef03629715
diff --git a/app-crypt/argon2/argon2-20160821.ebuild b/app-crypt/argon2/argon2-20160821.ebuild
new file mode 100644
index 000000000000..b407a8dd9f52
--- /dev/null
+++ b/app-crypt/argon2/argon2-20160821.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+S="${WORKDIR}/phc-winner-${P}"
+PATCHES=(
+	"${FILESDIR}/${P}-makefile-install-target.patch"
+	"${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"
+}
diff --git a/app-crypt/argon2/argon2-20161029-r1.ebuild b/app-crypt/argon2/argon2-20161029-r1.ebuild
new file mode 100644
index 000000000000..6a2ac3f2695c
--- /dev/null
+++ b/app-crypt/argon2/argon2-20161029-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 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"
+KEYWORDS="~amd64 ~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-20161029.ebuild b/app-crypt/argon2/argon2-20161029.ebuild
new file mode 100644
index 000000000000..ca5a7d99ac39
--- /dev/null
+++ b/app-crypt/argon2/argon2-20161029.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 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"
+KEYWORDS="~amd64 ~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"
+}
diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch b/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
new file mode 100644
index 000000000000..bcd8562a21c4
--- /dev/null
+++ b/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
@@ -0,0 +1,44 @@
+diff --git a/Makefile b/Makefile
+index e9d27c8..90c1818 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,11 +80,25 @@ endif
+ 
+ LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
+ LIB_ST := lib$(LIB_NAME).a
++LIBRARIES = $(LIB_SH) $(LIB_ST)
++HEADERS = include/argon2.h
+ 
+-.PHONY: clean dist format $(GENKAT)
++INSTALL = install
++
++DESTDIR =
++PREFIX = /usr
++INCLUDE_REL = include
++LIBRARY_REL = lib
++BINARY_REL = bin
++
++INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)
++INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)
++INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)
++
++.PHONY: clean dist format $(GENKAT) all install
+ 
+ all: clean $(RUN) libs 
+-libs: $(LIB_SH) $(LIB_ST)
++libs: $(LIBRARIES)
+ 
+ $(RUN):	        $(SRC) $(SRC_RUN)
+ 		$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+@@ -129,3 +143,11 @@ testci:   $(SRC) src/test.c
+ format:
+ 		clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
+ 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
++
++install: $(RUN) libs
++	$(INSTALL) -d $(INST_INCLUDE)
++	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
++	$(INSTALL) -d $(INST_LIBRARY)
++	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
++	$(INSTALL) -d $(INST_BINARY)
++	$(INSTALL) $(RUN) $(INST_BINARY)
diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
new file mode 100644
index 000000000000..11892de11158
--- /dev/null
+++ b/app-crypt/argon2/files/argon2-20160821-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/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..d4ab4191e921
--- /dev/null
+++ b/app-crypt/argon2/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>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>
+	<upstream>
+		<remote-id type="github">P-H-C/phc-winner-argon2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/asedriveiiie-serial/Manifest b/app-crypt/asedriveiiie-serial/Manifest
new file mode 100644
index 000000000000..6349bd4c88b5
--- /dev/null
+++ b/app-crypt/asedriveiiie-serial/Manifest
@@ -0,0 +1,5 @@
+DIST asedriveiiie-serial-3.5.tar.bz2 32461 SHA256 77743ecb79f08ebd70d9c254d4fd35331eaa06bef528cc813ecdbb378b274120 SHA512 b74ea2225990c36e86d106fa7e9e844e1f99d87f9869416faf3dfaa1ecaca34b4bdd4e5887746c6b039de325e03ede3ee78aadeaf20d0fabc8deba48a72a93b3 WHIRLPOOL 1adacde0df7dbedf5edb120dfaff9b341c40b5220467412ce58e04fc6a7dd7083b7b757305aa86cc2e2492e54a39f732c068f1f0fabe8bd711a21dea0bf3c211
+EBUILD asedriveiiie-serial-3.5.ebuild 1033 SHA256 5073f54f2a4d3bdd095fade3d4fd8e5fb137c51da5d7223fd1762dfb035ae13b SHA512 86ae19c705189914c94ce4be71648ba55554c5f6b8f037d3d8dc6ffb0de90036aa128d93629a68bfe6ae32bd2c116ae3ce2258e9b05f4cfa49d688bb10114193 WHIRLPOOL f34bd3eba0c7b93be1674d09757a5a583e4028e76e0f6dee7549c7fedfdd97f43fa63a93c6f554fd56c2312e1c95ce5bd253faefbcfd19b0e5f1b45f233c7970
+MISC ChangeLog 2460 SHA256 d206039fb386af103cd34886629f86a5f2993f9f5c7ea1be4d9a6936ee7148d9 SHA512 301c0dcb23c201e6fbc8a0461c42169f1188b813c2aea361ee2d0446b01c7d19438ea3bdab87caed327c05046245eb17998ab057f4e6c04b5e7edf80e36d705a WHIRLPOOL 48c55be475173221c95bff9addad922c1d0900e5081b00a9e5815423b8528fa5f26c0b79ba45494aa7f7506f1bac63cc9410ec5564bdc1377c3fde48e1532e7b
+MISC ChangeLog-2015 1711 SHA256 8523964ef37c64007d63fc2e978f2bda74574d191d17eb6dc2255718a47a801e SHA512 cd99091fd1f1f93d8ba7f656c351ad9608683722ba2e86d406528bdfff6833cedea0592a7e591f008e60314b2cd03cc603b4d47956e82d84cb5638ebb90967aa WHIRLPOOL 52706801a56a47a89c21a7574b3a5ae7aa827dfb391b4c1b8cdf59755326e87c5024d769c2da77074ac322c94e2f04df657087291b3036ed6cc5fc92a021708c
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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/Manifest b/app-crypt/asedriveiiie-usb/Manifest
new file mode 100644
index 000000000000..ff889fb99edd
--- /dev/null
+++ b/app-crypt/asedriveiiie-usb/Manifest
@@ -0,0 +1,5 @@
+DIST asedriveiiie-usb-3.5.tar.bz2 32595 SHA256 3cbdb3491422678fba970a2364c9aba71fa463e6f2fc2321c0618cdd311cc3a2 SHA512 aa718a1f4b28c9186e120bb8e2216389a8a9f54ac3f299a9cd72c398594fcf23229ac4a14e5358cc02e6fcd2ce3abe0e1e4125e4dac8d302bdc325a3f410744f WHIRLPOOL adc59ccffecd9c82caa02496164c1d93b0354e0beb950a6111de482ad5a63ca801173f83d60045e79ffa200353863af748fe39b4507a0e7f701173ba5d3ab2a5
+EBUILD asedriveiiie-usb-3.5.ebuild 473 SHA256 3980d91239cca39e5694eb277fedfd9ee2a9e33f1715933b4029fba721f07684 SHA512 8bd16c54f44e8a69b51d79d8c9cb59539ff61a33333a6e339ecada178b30332bd7e857e582a142fe709d01fe8cc7a97f721dee46a6609287c0aca4f92844622d WHIRLPOOL 566bad13d3e762b961fb597c9f457faa75fe26258b806a79e7b80da6dc9898267cc1c6b39486cb7f64c21065f18109c6b9b7893fb59621a26f1c14e1dbeda513
+MISC ChangeLog 2451 SHA256 cf37bf100d8e925b969f943a19c794faf50678e7a950d937f4d85c0d4711f2c0 SHA512 4275300fb9782ef1a1b6a40984eb1d10625186fcfc1718840cf3c052d8a74ac30e8a08380b4df44f0c3e2026a5121720f8cabe0028d68c92a9b2f44b5752211e WHIRLPOOL 9987432565823be49bea8c26fced1b000e02f79041e55fc569e3e2b0c19032ea1c9943fd6472f44ec64f62eeec449e3bbe8473d14155b29d8278d0aef0bd368e
+MISC ChangeLog-2015 1541 SHA256 b15eeabe4718e738a127134db2e3d95c2932965b399ae6ef65fbea95cfa78964 SHA512 3f668b56431705d2913302ce25858b98993904adb3948f7a85191980f1134c8f424227af5661647743a47bc4f6b61609d6519b30e7a845b656757ab62c5628fa WHIRLPOOL 8f180983f8bb510861b424fc91ff1be1a87a91dd5ae40a09ed0b684e96be54ae0fa8834737100b0f860d093c0d923d9478c0d3643c21bad4b70fa45d018b1dbd
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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/Manifest b/app-crypt/asekey/Manifest
new file mode 100644
index 000000000000..c184a3421ef7
--- /dev/null
+++ b/app-crypt/asekey/Manifest
@@ -0,0 +1,6 @@
+AUX asekey-3.7-bundle.patch 727 SHA256 de817123161ee36634462d1a394d5a5ea7d96fdb7c544c34717f186e9a3ff686 SHA512 4cc556687f59371d0f1919f8649b705801da4427cdc011a40b9627601e90cd27f3a06684a721cb25f1c51b10ec28f6ae728e33fbc30217716250d42c6c15efe2 WHIRLPOOL 5b1af5c948b4972df06193b6972eb42103dc265ef3b3157fd451ae8923b7f5b5264f9ff2dc0e3821aabad8e0baf88471ec41eaeb85bb40c448c5bb5c2691d137
+DIST asekey-3.7.tar.bz2 33304 SHA256 5561c54d0629489fcf689ebacc4f8bc3b6305b02ef5675a5d9669dc6669fd6e7 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647 WHIRLPOOL 3e38ef00b20abca33a980b0ffe05db9469945a574b3e71f9c4dbbea87a41857b9a0a69db748698ed368dcb5e34989c6b917b3c39c2e55f4a26e9923cafbc5149
+EBUILD asekey-3.7.ebuild 695 SHA256 f921d6943228f65ee13eda68464fd1c663c601b8987c8f97cac6bc1276c01c5c SHA512 ce08ce55c3469ffeea99c6b9532cae49abd820b473f659ed0a15ead69629774a2aceb25a8007935616e52c3fd6eeb90c071f24a320fe6199905f6fe8aca2f047 WHIRLPOOL 565d3fe564e56d81803bd26c888427b9765fa16c615ce316002477b7954716d3b4f6a69352a0211bc43e0823b5ae44bf74add123798c038177b241e591f786db
+MISC ChangeLog 2453 SHA256 49655cb98a069309a022e1adb19812c31719b07f2ce1cfb688811829138c7f78 SHA512 06a629e801a5967d859de97575d119fc4085487a2080af326e7c994dc2f9a0fee76848bd860ddff497300351838194753b9e8fbaac55f1dd2fbf8b60123dea42 WHIRLPOOL 8de90b89aa6e9df90e83ffac04b16a1970cee7b60e37b505a0b3a84ce5c6b58c5ac867516bf7e6c8a1b8c65da264147f147933188843acb2b3d9981f146bec72
+MISC ChangeLog-2015 2036 SHA256 79838d046dccfdff815ed16669719caca747409c007e7429bedcbd9626f3a89f SHA512 70a706ce3aa13f9523e9d0efdc8ddc21a471ea0c1e9b816cd09b417e6471fdbe258ecd23894f2e7e98ef3481e6e9ff39922e2a834775f510088f0f3c38f76d06 WHIRLPOOL 1b69e999cf03670ad8dbd0c447f4eaddbd7a19e917cdd15e387fca2794f35ca9594ee26481ac0a3cfec7cebe124138c5cf7106966085c1783d54bd0e746ea9ec
+MISC metadata.xml 240 SHA256 d1d2aa7abc46b180b2494a0cbb393768f12073097a3ddf9d118cb9e2cead8317 SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d WHIRLPOOL aad153df696809789d129412e71fd5eca91f7b230c22a10c70baa6f79e3ab57cf8890540fead3d9587f76b4396a7089921b207165fe0505917ad76b5cf86af90
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/Manifest b/app-crypt/bcwipe/Manifest
new file mode 100644
index 000000000000..5fd6f2ad3798
--- /dev/null
+++ b/app-crypt/bcwipe/Manifest
@@ -0,0 +1,8 @@
+AUX bcwipe-1.9.7-fix_warnings.patch 415 SHA256 0f42b0c1e01d4a37a7b4078cfab78b33ef28fad9f619238d7cbe78df459f6e00 SHA512 504487c91ba3ed47f5d32ff5c4084bfcc10999d5ab42018d233ca160f55631daf466015e8aa81f644b834c00529a984ec026a05f28d7401162bc786a8bdcd5ad WHIRLPOOL 3346580d255a1e74b569045d043a17544d6b865d845798ea9d04b37a81e043dfc96f36d8045b84a873f7f77720de4065d59c6e37f3ddbbc9aca0900c8261e049
+AUX bcwipe-1.9.8-fix-flags.patch 603 SHA256 3caec904719fc43db10450c72c213cff920a82eb716aba15a1db2bf04752d8eb SHA512 9141f81dd722bfe59466bab3d547869aca9178d27912edc61f9ab95044d0e57151870400a1550fe59e0f3c252878b6971486d0b38e2fb24da3241b0dca00ca87 WHIRLPOOL 6fd609f8ec20764c00b8182dc18d32b67660bd2f18c66a508cff1a1cd9ec46903a84181a4526924c8015ba1af602baf1b3bb078bbb21b2123a4623b9f1631168
+DIST BCWipe-1.9-13.tar.gz 141092 SHA256 c5e95d003f291d7c9c7c0a6ac76d03ae8fc48225292507581f949f81074126c4 SHA512 801b6d3c55d82915da14b3136c9ddba7fc947b40c07ba135c410e1e2703f74735d32ebb043d44325f615005631930ce48b4075885f1a928cf8f4a2d4c67ca5cc WHIRLPOOL 631f7af570898c61ad7559c427b8d4677ab62a85189d72539b1f9cf89cdee0fc8fe61a7524299f691c3358b38b0502d1ee1ccd5c035e0479adfb7dde1d6c5047
+DIST BCWipe.doc.tgz 21218 SHA256 afa50bf8653bb6bee108f0ae8b3dc35d289dde3d5c513b7e9ae7fe373635df4f SHA512 5aa402669ded46b6dc680293f18aea4ab20a7d6b7d9d7bf8e63003e557b953e8f8019431ea69d96d2236121e754bc456b3700a0895f4fff0573d2e9bac2e2ee3 WHIRLPOOL 2f6475d9395d2424cbabb046085ce0a016ecad4e76f195e51fb385e57f68f13313587b52c2776ad29798b682eaa8503bae4186029b698a2405f08187180a904f
+EBUILD bcwipe-1.9.13.ebuild 1036 SHA256 2dc1dca1a5ab5b603d7c7165da05af25ead6cf35f23b4bc83270df0a621e2404 SHA512 7a68bfbf12923948a6bebf5ddd1f6d111f2c3d2870a2f4e7f40b67179cd1aca58e6d8e9de01c3705eb7118cbcd8e2059908e5d3297f4753a134e509f4c5fb38a WHIRLPOOL 3e2535744e2b67536c2271c550b553109900468b28a987a5ced37e7ef5c32bf80df53d529d5a8678187ebdb25283c7685fdefd28f60e89139a28e9c17b8e4295
+MISC ChangeLog 2827 SHA256 a91b623974e29a104d970da1c4312679f4d0b198c967f51594f07da1364cfe4d SHA512 0197216e31e0c3d1fcda9198abb2ef5b4772f08c80e65368b03343e3f6a5b494321079f41b7aa70458098422b0c9981433fd3b655aed1f0dbda06e04160ead82 WHIRLPOOL d38ebbbc4c78115f822faa48d4dc0538c63f3116e3caa3161c20689aaed996739d1481b879fc896fbb1e1fbca392140fbebf767df2462037b945ada1ee6ef318
+MISC ChangeLog-2015 6804 SHA256 05e088f1ed46041990e42e8b871aed9d91e3487664698f19bae7a358b2b29bea SHA512 8e18c697ec7ed3f14c7777335846325c2fa8db4b31dad3d148347a2ce1c9061415c3f26560929b55952f1dd0ae029df5b9094d3992c1e09ac337ee54b3a33c02 WHIRLPOOL 4c411e63b4df34394ebddda93069e81988e83baf1e73c0efec655ec4644b2d8c20c1873296f30abf20e885f77cd9f5a99ea6785d4b954b40834f33ae67c805e1
+MISC metadata.xml 240 SHA256 d1d2aa7abc46b180b2494a0cbb393768f12073097a3ddf9d118cb9e2cead8317 SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d WHIRLPOOL aad153df696809789d129412e71fd5eca91f7b230c22a10c70baa6f79e3ab57cf8890540fead3d9587f76b4396a7089921b207165fe0505917ad76b5cf86af90
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/Manifest b/app-crypt/bestcrypt/Manifest
new file mode 100644
index 000000000000..dafc28e1f53a
--- /dev/null
+++ b/app-crypt/bestcrypt/Manifest
@@ -0,0 +1,7 @@
+AUX bcrypt3 3197 SHA256 0e376838176e367d9932c630b5e2e3c46e79831080de89c95b1e8e44ecd26929 SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b WHIRLPOOL 63a87ea4b7014f71c9820dbcd753820c18647aeeee4506f87340e927472857cf78d5c413771ef42ba4b3f64c02b4a53f7fc08035ac9e2d97a8708faa06657510
+AUX bestcrypt-2.0.6-build.patch 10878 SHA256 8d9bced77a0be44d627900a23d72043bd99365f2e5f2488c9d5e7259f66653b9 SHA512 34e150087fadfcdba5c05c0a4e1d2bfadbc448fe3214663c86ef3a692ec924da011ba11da3fb8f26692c2a52a6ce8c5edd8f20549de42c8dedf965cf3b74d530 WHIRLPOOL dd4968ec04f10bb0c5ce45d1ccd4f77a8c1b6841e0e4682250c2569c956b8b587bd8977b00902945f67fa8ce1a35594fe0b31b8bb35e6d90f555f56bbaf1f586
+DIST BestCrypt-2.0.11.tar.gz 2191182 SHA256 f6aef665eb8ff5eb1ef0f15ce496d7ac62d13e7dbc3031d5d4555a0a5de22ad0 SHA512 f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2 WHIRLPOOL 036e7e967a3ef963b481310aa7732cbb764e0647f05796038892fcdc7ab772c48e5d57476ea7ba293d44a877fb42a55858f92fe018d54729f9845ccfd4f41988
+EBUILD bestcrypt-2.0.11.ebuild 1791 SHA256 23e6b2b8ce0cd119bcc1bc0dfb2a32bcc6367a2c1bd9d142be99e1f600225202 SHA512 c15210495dccb9d40117d74b80a6e1d991f88916c7293207fcf1c16879b9379a6d486feeee8f6663d0be40026834521070a90d9c8433394a89d4a4cc20f25b98 WHIRLPOOL faf8aea9f33def8e73736f827fee2ee953d4f7c0c014ac415286770219c2559706094b8d9c612aced7fbc80f6567752005f0d46143163b5e405a5e7218813507
+MISC ChangeLog 3668 SHA256 7f25d3745df2b596707b3f1ffe43934821e716623590eca9c6d3384a1dde9920 SHA512 14a6e7ec871ccc53deb1f32982cabd050c41b2834e7a3ec14ebc7195ade228e527b5472dbf08cdc8202d54079b38d495e27fa684603963ad3f730b80023e8239 WHIRLPOOL 8056744b26c58723cfaf64dda90d96b23c525f71a025ad31e114726f547c740e2e8d937d8a961e520e62a4118f6ef7be54e29ea36c53945ba24fb3c16b8357b2
+MISC ChangeLog-2015 13847 SHA256 bbfb6c9c42995a16414f5f73449109358ba146eb0b5cb1a01672964b932dfa4e SHA512 79263905cbe32e97a299cfef7b76690a172c8db8ab3d13f201675d86089470d22b4a2f19ac9f5ef12d3ca66a21997b5178699d29f5f762f58164064adb4ae2fa WHIRLPOOL fa01dc3b0d56d1994dd41a9ffaec5f0da89984d360119382d741eea787b48bd947ab54b2a4b44d1915a2f5687077af053e379eb53d63a61c3813446fa00321c9
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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/Manifest b/app-crypt/bsign/Manifest
new file mode 100644
index 000000000000..83e9d479a581
--- /dev/null
+++ b/app-crypt/bsign/Manifest
@@ -0,0 +1,8 @@
+AUX bsign-0.4.5-build.patch 993 SHA256 62910baf3387a9db873195578414ab37b64217f91925d25b5ae432749d53e00b SHA512 367596ffc688f679bfe160731a57e191894794f7de522f3390dd494fa0757b8bcf1da2d7618e4652b355b18dedc69d402abb0879b440d41227ce4b2b3b384d8e WHIRLPOOL 65d8f1625d0237e3a5227d514e3f5a9f09a6a02d434344fcf7d50d5526a2fb4858ca7ee9f3a25994dbb7c6fec727e00c31da5b1616500d4d3d40e004d9e51927
+AUX bsign-0.4.5-non-gnu.patch 1409 SHA256 56d129e815eb41ef108f7c3380f07820a8b11c69f341740469868cb988eda5f3 SHA512 800e04dfe4c6242c250167076eaa360e626cdff9beb63ab2043611a10331a20f9354380bda2b387f0bb63a06fac9372502166bf49ec025945be1c2dc84ce0c88 WHIRLPOOL ae22744d96e711a0e12bbd46a731836ed8051dc123b0ca18a9e7958c38cafda84cb83e8bb29265015ec708fb1c81d52a1533927ba521e90c8c86c8c49a4ccf93
+AUX bsign-0.4.5-scripts.patch 2172 SHA256 b27003cb1b2370520c283435b407807286a48b7607ab5dceafda29ee31311fc0 SHA512 fbf7e3fadbbcc82b6647f77232715d7baaef5d0ead5065e27e10f038e9cf5734808d29e8814762014d3d26ec4473a86ab9da139dc7f2d1b16770db3e7ddfb494 WHIRLPOOL f9a0efdbd4d3e7507a84c088475fae7b9a47244ebd9a2b3d4df94e4bd68c2e27a197f638df31ad72a27d4cd7addcfc9838962422cd56957006a2b185eec74344
+DIST bsign_0.4.5.tar.gz 77471 SHA256 a80b27286a3b1b1be6df7b93d27457a4a6941a1eaf797070b1044412f47d3106 SHA512 a4dba37d648f683bb5b14bc9aafeb72fb0bd06e21cedb1a4bbd73dfc0a5f7bb22b5b33ef8727b5070d727afb2d97489ed4b9be28bf1025c9e618ccf47f1ef634 WHIRLPOOL 067ff40119578e6208beeba7ebe9ea21fcb0667abe1ca9780f858a250048035705faad5009d5dfa6814cd4778338722c596caab469d3f8b6d7da05794f1fcbd9
+EBUILD bsign-0.4.5-r1.ebuild 872 SHA256 1b14267c46cbbc50a7a5ab32ad96e8ecdb30abc462441bdc6550fd1acdde92b9 SHA512 4d52c7a8148f76d0b9566e16c717638768b004c5643221146a55f85ebb38fde93eb9631f4caedf9b698c6f2f17973023a486b4bea375ba29fcf9b16ca9a09471 WHIRLPOOL 47f52add8c6a7af0e977b2905d529a9592f2281bc439021f328989d28cd05dc605bfe7d84ac75df14ae1ae7f49e1275fbb58386d31e75283cc531e03ae3a00ce
+MISC ChangeLog 2580 SHA256 f3fb01dfc6e3f26df76efa5a4f33bffa5f4ae6a39b72e317ef07ea9196198378 SHA512 29909accff265aba3e0d2f1174e36db7a4809db9af0d49470fcbf6e9dbfae64bed75c8cd10c4ca5a4834b25c4abf3fd2096a0ef6741eb9f7a7152cdead465c73 WHIRLPOOL 8bd1e57994ec758d5d703385495ce1078e98a11ecec8efb98a003fa023cf115a2e327662bfb3880132eb122eac0a59920c0ec4a0671307e16c44a6001b9c0c13
+MISC ChangeLog-2015 2202 SHA256 7bb11a0be309ec4e14cbc20efbaf1ce53fa7f949d58704aa0ca164cc4a4690a4 SHA512 3c44538737afee1635d2315babe714e8343b2534e17322bbe28c5370624327dbb5d3a966a6fcd5f0be0e7fd613877702ce025a8f464e0290c5b12e8e932cbcb3 WHIRLPOOL 6430ea107866f76c46c7e964687d272a282fb0a820eb44e7faeceb09c4087ff30333eb2e881133f28b90eafdb9d465ee7fe46c4a5ca51c59ccccfd62fad81af2
+MISC metadata.xml 645 SHA256 9fe8d495b022224ff33a2a28175e12cdcec3f62e05c1893c96010e7f6f355c53 SHA512 2201dd583881aa72a4cff33b4a6d226dab5e1fbf49d9ea52dd85ad9437fd2bc54858824aa361ea9b473df43d211bddc96830c83fb8275c4db7a91cb3735d4919 WHIRLPOOL 54e19746906fcad184cdf05f1e7adaa6be6bd94751f5d12ca12e57f194c75b842322f670132d77dd80651656ab84155270c57b7f95a09394983fafe9bd3e8c03
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/Manifest b/app-crypt/cardpeek/Manifest
new file mode 100644
index 000000000000..330951c00dd0
--- /dev/null
+++ b/app-crypt/cardpeek/Manifest
@@ -0,0 +1,7 @@
+DIST cardpeek-0.7.2.tar.gz 1130295 SHA256 9908b38a91b4df80ec5a6d6a89780dd41684dc1f203587c1bcc8e4a13cb24ed2 SHA512 9fd1790794b8d092859670bb36a0cdd235e7d098d563032ccdb8143eac00bb77532f1ab918897c4b753afd184079975de34a6f645e31eadb28b6c5a81d344ecd WHIRLPOOL 777397ca535d820453e4d315be495fc5cf845feea457c666cf935d19b8e2c7556b51e4e23f8d009c6165626c450fe5b92413841d0ee56fd6f1d549716ee05e56
+DIST cardpeek-0.8.4.tar.gz 1520613 SHA256 9c78dfdf84493c551b49447e4bb46c8d7b33f0785b93893222b70b6115013a85 SHA512 f6eebc7a17f270dd56529ee36815fee72b2f9d62b24d6cc90060f20c7604b9b99ab76858d9c04c60aaec838b02b8db76476a91ee22a4e10f01f852cd1f536efb WHIRLPOOL 5ba058911956b2d9fbe1f0f191c81a7def01c75d618e1f6f4810c9159147fe5937dbed00840f7468aa14601170c16558ff949d2c28c2747035b7ae020f8e5d37
+EBUILD cardpeek-0.7.2.ebuild 510 SHA256 e4cf1b773f3240e705934b8d0c193607152f592262d679643260f8703afb3fd4 SHA512 464920c4eea13c1273f6a55a3e1075befee15d7530f703bac877e807873861d8ce50d5a1466a4821c766f9ba54755107f0ca0e4829b086a2e8fa3e2c2092ba04 WHIRLPOOL dddba5b0b9e4b42deeda3b651c7dc63bc94aebe3c1e98afba476f1081daf1770ab2a88c1d66393f604abc74d1e7179da056e65d2a3063e30e333a83019129a87
+EBUILD cardpeek-0.8.4.ebuild 518 SHA256 979df9cbc7265b7810c5d270112018cba00be21389a115ebabe91a8a45f17bca SHA512 a87e453287923528bfbe8f2b404386c303612d699727e4330edbea63607cd84859030c3faf53ce9dc23b0602ca35c2436568987abf07835ca83d716b67088e93 WHIRLPOOL b801a5d339ca02f0a3eaf3f2267baa1781bf84e8cd5f5a34dc0141e714b844e0898e77528d5e6c34c3e53caa1d9f879a2576c4bd63434dd86e8721d7fd0d00bf
+MISC ChangeLog 3176 SHA256 4d23b50abd4ba7ad076c784bcaf455312e483e0bab6abca4398f6bacf825a609 SHA512 747f3206e14bac25825aeaac62153587c769b0eda2932bda9dd96c1cd040113e5880fa3ad941ecaad0c4f10a0bb5c2b4fc1886990037328be37808b2f732d7e7 WHIRLPOOL 515cbf07c2b1ffd13faf408494e0c78ff776cedf3ed065f2fe12cbf3d4ad18be47b2735f3b1fc928bf69fb85f46ddc02e84c83d17c3c263ba6163d3d417781fa
+MISC ChangeLog-2015 701 SHA256 97b7fe3b27a8b4cfd1aacab8e237ed22449f41a74d8eb12a99eece46db79ef8a SHA512 afef08898a02b687db244d993e88a910a9177a0f57f211cdd873f46920eb7c2abebe4dfe805b634e78e6ad8e544c9bcc0f64c18ec765d1fd355f78d67c2bc9e7 WHIRLPOOL ced4e7d435be369380969a6ab08b66855c3f1d6c13a8f89234834fa0a3222e35b263409635b774b4d293c9c04dfc22b4280dc47ef4e9ffdf95f847aaa61fc106
+MISC metadata.xml 246 SHA256 97a4242ddb39ec753b766e7bd7b94f9486e997be8bdcf8b86b24e2ed72417f19 SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015 WHIRLPOOL 1c881073f2000444080ab705b5ea51ddb4e3f62c4e952a69415e259d9fd367192e9687023e96233b3d3686528a4f8b63dd99000d11486e7a80922c93f0b1d7be
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/Manifest b/app-crypt/ccid/Manifest
new file mode 100644
index 000000000000..11970f194936
--- /dev/null
+++ b/app-crypt/ccid/Manifest
@@ -0,0 +1,8 @@
+AUX 92_pcscd_ccid-2.rules 2275 SHA256 b387f25e1e2f86476c0877fc34c08d29c86a50f599840faa0f65ebb3143c2c6a SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477 WHIRLPOOL ef72c7257343e1c9db6dabeb8b3e3027b216fbc84b98d4f7b7aa65fd5fa1c80c8f25f798d836d91e85a018eb825f7918c337281c9311ddd938bae96d4993d921
+DIST ccid-1.4.26.tar.bz2 628038 SHA256 3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c WHIRLPOOL 7118e57ca9a394de3b37166bb2c4f4d398fdf744caa0803ef9f1470db7020d999f795ca816a5a70db2b59b64db7225df2dd9366fd329ca34d52b5e4611fd5d21
+DIST ccid-1.4.27.tar.bz2 632817 SHA256 a660e269606986cb94840ad5ba802ffb0cd23dd12b98f69a35035e0deb9dd137 SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522 WHIRLPOOL 062ebe1be40ad09865db642c763cf32cc471b860df66072fe5e98c4b3b5a5efced7b2aeba1001a635231adaf9569e3e4fc2746ad9ebaa921b62302a0ebcf2273
+EBUILD ccid-1.4.26.ebuild 1566 SHA256 c8a7231efa56ffbacb999c29dee4785090bac851e31ad8bfeaa0aea842711153 SHA512 e3f1b727f9889c9f41e15fb9f7da382dd8b83039634f24a22fb09171bf4690f51e9ca004dd885d2e2031a42ba47c7b090a178fbebd7c2c08d04c17bdcf4c24d2 WHIRLPOOL 31a3e7f73505df14e646f71910d84e6e376d728acb22a637b4aec086f87005235977741cc51fe4975a78f694f75e57e6bddaf8122717713732802f67b8df8992
+EBUILD ccid-1.4.27.ebuild 1572 SHA256 eeacac399795a4fa76dc2ddd89cef648a3ac0f606b4411361c2617b97817a559 SHA512 58139c37170080b0fcad6920559133b9c9fb1a98846b362a0ad5bfdb60c11463216848bf658da48677f908d8184bf081ad8c676f5c70da76c9a1e825a67007f7 WHIRLPOOL 35119dc46f1c129a06a39be086f0df2df7db241e892659c5c38115a12ca7c6c648121a6c51ade1bccb5560ff41c94240704f9fff28e070f0a72a34dfef3c229b
+MISC ChangeLog 4315 SHA256 a92ea2d504ae2add8c4ed87e6001a7369ce0a861167432db7622af60c3148f49 SHA512 f0a12fb122def254e804b41e9903701126718a925f13a25ffc6389afb4eaf8dc86a705ab80426fb479228053e616ed82835a2d417c1be5b2b83b1e61ea7d7591 WHIRLPOOL 8d65aeabecd12378f3e5e685b0baf2566dfa282392e0d5b7f5fc54f0522f7aafcbedddb56fca17edad57c66b637c3f4f6b463654c8f917d264363493ec09fab8
+MISC ChangeLog-2015 16072 SHA256 88b02e9d853c989f0f4427c2e8946016c52f9f730da3423d62906a8c49a4b54b SHA512 4c230e925bc65a261d26f7edbfefd68c5369b567440c187917710605a164fbf11ee1b8b36205ea609b24de6ce58254a46072623f2950cda3d08b3937c09f0aad WHIRLPOOL 4a39ed6deaabf0063ceeddc835bfcdb5b57d973a0fd20ae278155627a9fb7c62fb78d3f558cedf481259e9c8db327634d3c1c708bf2853d8cc18c1fb0d5ac978
+MISC metadata.xml 397 SHA256 4bb378c2dd7fb9873b3950e3f05e659c713ee2cf20c37bce87806ecbe12ae0a2 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b WHIRLPOOL 83ef5bad15119742db6b8d8715c8dbf03936c21c967c8abc18827139a39c16d433683bff9dd90480c652607ae18e7221344a4ba46e292e8c88fde1428e4d6d36
diff --git a/app-crypt/ccid/ccid-1.4.26.ebuild b/app-crypt/ccid/ccid-1.4.26.ebuild
new file mode 100644
index 000000000000..f5d0eb72da13
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.26.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+STUPID_NUM="4205"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
+SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${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.27.ebuild b/app-crypt/ccid/ccid-1.4.27.ebuild
new file mode 100644
index 000000000000..5ff08306450c
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.27.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+STUPID_NUM="4218"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
+SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${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/Manifest b/app-crypt/ccrypt/Manifest
new file mode 100644
index 000000000000..bc5990ec586d
--- /dev/null
+++ b/app-crypt/ccrypt/Manifest
@@ -0,0 +1,5 @@
+DIST ccrypt-1.10.tar.gz 669491 SHA256 87d66da2170facabf6f2fc073586ae2c7320d4689980cfca415c74688e499ba0 SHA512 b0130998f9830f63e8181340b3138260ab3c2014174e74fbcca77299dc9e0f807471fbfb7cc403dec7d0809f136e8afcb4c9bfd4ee5e43a1b3cc7185e14c3188 WHIRLPOOL aa65659fecadfaf1a9323b5a80c00eeda41ff7e3db40151abb678ad1c14de1310ba7954d2042baf6bb230ac2fdc52368a367cf91cb7a9ab5d0fec51d5937872b
+EBUILD ccrypt-1.10.ebuild 364 SHA256 28e4946cb924fc328474b8c279c380f77ae612982ef8aa2821d6cc35ef5148c5 SHA512 fb7b156727d9de9bed8812141e6ee036ea4c5a470cc494cad4f5aed2d86fb2d2ad8b0ef55503ea807e2af84425482c880349c2e2aac6085c9b637e41e4996c8d WHIRLPOOL 1c6e7c1044cda99ce152b7e14a614b181c0c761b21e1d1707e63e77c8e22a9ce762dbfb7764e8cc8cbb3d0d086ee3b5b7fb1756d86ad265d3c6710b05dbbb31f
+MISC ChangeLog 3015 SHA256 399a143f2726f9f14ce5b17784b520bac727a82eaf210f7225abf64bb074b202 SHA512 64b981a3f95a956c9a9aedaa1d229d28eaf0e348d7426cc5329c5d0a9e104edcaf978ec58aea70e3b5cb0c70e8e686eb5765fa5ba99db3e69fe1b9d98fb51983 WHIRLPOOL 0ad028f32e2919101a68f54eb51d9dae1aa29aabe1bad8867295627453998b41678bf463ccd645c8d42d2738af4898e742803775688fd49f1143bc87adbc31bf
+MISC ChangeLog-2015 3048 SHA256 6e25b85159818d0fbe1ed17fb21983e220f180da1334094a86b1ef40e39246e1 SHA512 9b8ccf9fb5c7255b33277e5e5ea4a5a834d96652c56d55cf822117ee469af56ca212160a90cca28aa1a47ab05a8e196b6707c91b0f1bcf4ce4b9688cae0c8fb0 WHIRLPOOL 2058834565dbd3a974cb8d041d08608f4d44658c63af9c5f054aaaa8bf4f72f2cb40e640d69f596b1f5e9878a1009b2bc51c3e35fae7833def3adb45e1f058e6
+MISC metadata.xml 316 SHA256 52a268b6ebb064878cf9e71162c306dc5088884e1081aa1561112cdaf5a3cd19 SHA512 fd88aee15282c7205e31caa296006cb6e6d887843b5757676c00d7a0ed054046d9285c9d01ddf120131463eb03cef1ad7e9835a01f4fd71d9483bae2ecde296b WHIRLPOOL ce5143f07099081ad9645a72f5c077ce7f7c96292cfaaf350bb29ca13da59fd2c7a48bd45c364c22f83a276103bed71be25d0996b587f99df4ce14d33696ec55
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-apache/Manifest b/app-crypt/certbot-apache/Manifest
new file mode 100644
index 000000000000..02d94ab82dad
--- /dev/null
+++ b/app-crypt/certbot-apache/Manifest
@@ -0,0 +1,11 @@
+DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
+DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
+DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
+DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
+EBUILD certbot-apache-0.15.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
+EBUILD certbot-apache-0.17.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
+EBUILD certbot-apache-0.18.2.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
+EBUILD certbot-apache-0.19.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
+EBUILD certbot-apache-9999.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
+MISC ChangeLog 650 SHA256 0ceb4da791e6e05a4380d4db4297da391135e1ce24d0658b3697a0598bffbf75 SHA512 c841c9a2340dbb950dd8fa0861a84c18744cce90c4c6bc0fcb5a1a4caa087c9ad69ce0e5b4d344107f3eff6fa579a60ec054fc3c159318e872413fd968b6a85d WHIRLPOOL 2bea921c94946c02aaccfa5b1be5d05e3103a3927d71425b68acf46762a6e20a8a023789b920136d30bede21359deee5c3746306d0ad7e1022db8dbe3e3a82b3
+MISC metadata.xml 334 SHA256 e1059ce7794fc4edc2c39a6a55932cfaa9e6d4b6de59d4b9dafdfa8f6f790084 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f WHIRLPOOL 8a5d0b99f05b3f8097607db4c03ceedea11dacf064a1acdbc9b97f8ec3a7379e487e9470977cf61ef2cb21ccc29959b371f3f7caec322648091d84f95d7db5d8
diff --git a/app-crypt/certbot-apache/certbot-apache-0.15.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.15.0.ebuild
new file mode 100644
index 000000000000..93bc95551953
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.15.0.ebuild
@@ -0,0 +1,38 @@
+# 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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	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-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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.17.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild
new file mode 100644
index 000000000000..93bc95551953
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild
@@ -0,0 +1,38 @@
+# 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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	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-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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.18.2.ebuild b/app-crypt/certbot-apache/certbot-apache-0.18.2.ebuild
new file mode 100644
index 000000000000..93bc95551953
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.18.2.ebuild
@@ -0,0 +1,38 @@
+# 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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	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-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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.19.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
new file mode 100644
index 000000000000..93bc95551953
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
@@ -0,0 +1,38 @@
+# 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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	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-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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..93bc95551953
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -0,0 +1,38 @@
+# 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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	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-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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/Manifest b/app-crypt/certbot-nginx/Manifest
new file mode 100644
index 000000000000..ddb857820682
--- /dev/null
+++ b/app-crypt/certbot-nginx/Manifest
@@ -0,0 +1,10 @@
+DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
+DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
+DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
+DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
+EBUILD certbot-nginx-0.15.0.ebuild 1007 SHA256 92328a779013918cd7e37b929e5d37ddb613f59d0fe818cbf8d1a39ddfc4cfb5 SHA512 580e0d41237668b9d97d675743b6b80d7ddf7ad6baa62513224a6c79cbda3c197c8562a8f3548066216543eede2c0e21158363f8d545782920811aa01d6c4e56 WHIRLPOOL a1f69031ab8bd1062cc1173939b2f7b626bc0bea5e72429434d96c56b1b8e3c5953ec42096b7c3ed6231cbd27072bfacc81d14ab938a0a3c8402f04670fdea52
+EBUILD certbot-nginx-0.17.0.ebuild 1019 SHA256 4684022d68c2d0723af47361ad0d1810f0417e817719f4fd1cc6f1bae57f1184 SHA512 fd46383fc11f3d538d92341ac2ead040bb3e1f6dfd1d8bd05d415accc4321f7bd111d9b7217884cda7a54283ffd1d164e00776f8058e2e05f852e68576d36964 WHIRLPOOL 24a2761f1d9c09e8a08d3966b3fc4df84a58ae818cddcd140af3996be109be5977854836e6c6b3721d32de3be7b211c63e589f8c62db74dcf3fe2ed3eea7ebfb
+EBUILD certbot-nginx-0.18.2.ebuild 1019 SHA256 4684022d68c2d0723af47361ad0d1810f0417e817719f4fd1cc6f1bae57f1184 SHA512 fd46383fc11f3d538d92341ac2ead040bb3e1f6dfd1d8bd05d415accc4321f7bd111d9b7217884cda7a54283ffd1d164e00776f8058e2e05f852e68576d36964 WHIRLPOOL 24a2761f1d9c09e8a08d3966b3fc4df84a58ae818cddcd140af3996be109be5977854836e6c6b3721d32de3be7b211c63e589f8c62db74dcf3fe2ed3eea7ebfb
+EBUILD certbot-nginx-0.19.0.ebuild 1019 SHA256 4684022d68c2d0723af47361ad0d1810f0417e817719f4fd1cc6f1bae57f1184 SHA512 fd46383fc11f3d538d92341ac2ead040bb3e1f6dfd1d8bd05d415accc4321f7bd111d9b7217884cda7a54283ffd1d164e00776f8058e2e05f852e68576d36964 WHIRLPOOL 24a2761f1d9c09e8a08d3966b3fc4df84a58ae818cddcd140af3996be109be5977854836e6c6b3721d32de3be7b211c63e589f8c62db74dcf3fe2ed3eea7ebfb
+EBUILD certbot-nginx-9999.ebuild 1002 SHA256 6789f86bec3256aaaaf8ca42ac94c97660c2c95d99b2d622497aeb4bcea66c4e SHA512 c52f1ad93218421dcd0192605ab8540593bdd9c9ca475691d889662944295cd91228c84bfde9b9ca3af12784783ff17c8511e048ba3ef685bc3a76d9295a6d3e WHIRLPOOL 323f8b85458481b9ae09d1881edf207f3c5141e3e64afd8ab05f3ac3f6a6132e782e00e42ae78d7b6749063725ea61174a522fbd47eaf6e221bf1b23503a64e7
+MISC metadata.xml 334 SHA256 e1059ce7794fc4edc2c39a6a55932cfaa9e6d4b6de59d4b9dafdfa8f6f790084 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f WHIRLPOOL 8a5d0b99f05b3f8097607db4c03ceedea11dacf064a1acdbc9b97f8ec3a7379e487e9470977cf61ef2cb21ccc29959b371f3f7caec322648091d84f95d7db5d8
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.15.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.15.0.ebuild
new file mode 100644
index 000000000000..54f5cf0aa674
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.15.0.ebuild
@@ -0,0 +1,34 @@
+# 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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+	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-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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.17.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild
new file mode 100644
index 000000000000..94d8fd922794
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild
@@ -0,0 +1,34 @@
+# 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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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.18.2.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.18.2.ebuild
new file mode 100644
index 000000000000..94d8fd922794
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.18.2.ebuild
@@ -0,0 +1,34 @@
+# 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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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.19.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.19.0.ebuild
new file mode 100644
index 000000000000..94d8fd922794
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.19.0.ebuild
@@ -0,0 +1,34 @@
+# 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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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..a50019015699
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -0,0 +1,34 @@
+# 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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	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-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/acme-${PV}[${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..46f15a315a22
--- /dev/null
+++ b/app-crypt/certbot/Manifest
@@ -0,0 +1,11 @@
+DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
+DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
+DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
+DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
+EBUILD certbot-0.15.0.ebuild 1500 SHA256 1d53e382a60512ee5527fb76eaae0d02cc5e9bc03bb853ebfcf3fa4e68187769 SHA512 e338028b2e4357527f0bbffa28d7a1b66798c047a488cf791f26477135513510e11c3e96d19981be372bc7de02f7a2df13bef4d07bbf2185a648fcf04a1a5219 WHIRLPOOL 47fa9b2c46fad4a3b2662e91c4318fc21a75ff15c09cdba6faf5407296468d970695ee9636bbca31136bc5445559487aa7140501cf640e0828cdfc500e535a5f
+EBUILD certbot-0.17.0.ebuild 1500 SHA256 c96ee09cd0f271d16cb0826c187634599746647a39bde38af91ed3142582714a SHA512 0b503c738a4d0ab32ecff828b6437d69e2b05191d641a921a199ee061ac4912530a7ea5362ed9b8307c69c553110f347cfe7284c8de50e4a0b36259ee5b48168 WHIRLPOOL 5e735f8f4b3221b6d62dcd7e946990c9e3785be9d8e682b0d6b01db928c0289fc569e53c728580d173ab575644d6ad4b5e8ea2493a26b8743c6641c752624931
+EBUILD certbot-0.18.2.ebuild 1507 SHA256 3d6ede4ae1fd388cf18137deb6f5fa157081baffd9146c4935f4075ddc48bb0f SHA512 791726c0f1964f2287bdfb04d276abe3650bf70e4826c1b16077b6fc81398e397387e0d89a9d6391dccd2ab6ca330610a689ef1b32f839619af91b7c9678a1b7 WHIRLPOOL 1edc3540fab11b4fb01fe2af9074895adfa07f8fd225101ec64be1203d97070023c14f8463d3a39a1f90e3d2f213cde083bb944acfe14284701afb54d980abd0
+EBUILD certbot-0.19.0.ebuild 1507 SHA256 3d6ede4ae1fd388cf18137deb6f5fa157081baffd9146c4935f4075ddc48bb0f SHA512 791726c0f1964f2287bdfb04d276abe3650bf70e4826c1b16077b6fc81398e397387e0d89a9d6391dccd2ab6ca330610a689ef1b32f839619af91b7c9678a1b7 WHIRLPOOL 1edc3540fab11b4fb01fe2af9074895adfa07f8fd225101ec64be1203d97070023c14f8463d3a39a1f90e3d2f213cde083bb944acfe14284701afb54d980abd0
+EBUILD certbot-9999.ebuild 1507 SHA256 ac6e46c228ed15ac2ae1d4ede6c5ce49e93b594a2f24de6b794d7ba2159bdd88 SHA512 f655df51f9235d44d672ad111cb63af517b04cab347d0d4b541a2e83a483c9ad90aca4461dc27a556edc811f94a8b382e8dc4a214063890bd32b0d5d93b82766 WHIRLPOOL 172ff59b5ae439115855ab1ae093bc8216db23987326f0c38ff7e6b9ab460d982bc6d632ea344427132835dab9d03ec32c9f07ef745df92dda8c3b43200447a6
+MISC ChangeLog 1863 SHA256 9d89a7d29808f3035d10942923d1edd5cad4451c6c5b2192ec6a56e54a3a2179 SHA512 dfccd3086c1dd58a1d786c0568183b9b3b1a392682920db4e30d5a11e836064fc45b2bfa4f1f1444e1a876b39922196ca787fa8d830cc3bcf2bc0deb0089b4da WHIRLPOOL 3c8a8db43ccb599e2347ee24a90de65f6cb89d70dd4068950297ff89877dc85792e98d3a0a5fc833aff1f55a2cad78f6bb280c071ff7b4dd07c47e82ebbcce14
+MISC metadata.xml 334 SHA256 156199996685469be6c4b52dd59947499eb3e259d6f708be37b140615d6ae9ea SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70 WHIRLPOOL 7e6e327b96ca1d13a8412b2d7e7979018cd215cfff302755e40264de7fc676666748a0bd1294d1573e0f5e8cd7c75fbcfff3c0cedb7a9d715186bbdac656841f
diff --git a/app-crypt/certbot/certbot-0.15.0.ebuild b/app-crypt/certbot/certbot-0.15.0.ebuild
new file mode 100644
index 000000000000..bb11ccafc1d6
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.15.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~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-1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pep8[${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.17.0.ebuild b/app-crypt/certbot/certbot-0.17.0.ebuild
new file mode 100644
index 000000000000..4075ad538f38
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.17.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~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-1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${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/nose[${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.18.2.ebuild b/app-crypt/certbot/certbot-0.18.2.ebuild
new file mode 100644
index 000000000000..d0a136c58375
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.18.2.ebuild
@@ -0,0 +1,52 @@
+# 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
+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-1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${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/nose[${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.19.0.ebuild b/app-crypt/certbot/certbot-0.19.0.ebuild
new file mode 100644
index 000000000000..d0a136c58375
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.19.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+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-1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${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/nose[${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..925097b6b3c2
--- /dev/null
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -0,0 +1,52 @@
+# 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
+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-1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pep8[${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/Manifest b/app-crypt/cfssl/Manifest
new file mode 100644
index 000000000000..5265775a9b55
--- /dev/null
+++ b/app-crypt/cfssl/Manifest
@@ -0,0 +1,5 @@
+DIST cfssl-1.2.0_p20170601.tar.gz 8025105 SHA256 4a9a1a801dd10c7cfbb1e98ce60f8bb0df407282dbbf1e8f75ff55a7909aba6e SHA512 f89d6b142eb5286b720c9d94534c474b15738c6a856999588392b37ffa753e0f0c9d663debee9cc216be765d8f39a71872401173a56293cdca2f2d1791c3d758 WHIRLPOOL 44019b727a66758d56c0ee9064a26b8b43d367bef0212f1a50aa8eeaf827a1f09590b4b6eb50ed5fff10b3ad72866526761a8522236fd82e1a5ff3850780254a
+DIST cfssl-1.2.0_p20170915.tar.gz 8027590 SHA256 11c9997eed939fd53237e27cc7d20a422045837315d58f3091449716ce34c4a5 SHA512 247ee892f7785ae11e8b2d38c1fdad0a3bcea9d9e410ce1bc985d15fad65b981c46e317cbb0fe0cacf190dfbbad7b9f8685f6ddd2a24056dd61e621b2cccd232 WHIRLPOOL a4aa35c8cbc0c3531c5b0bb49dc0376ba00603f4c95a686b5e012be409b4d39cdfa3196bf7ca4e0cdd010217d43e68ceb3d403b813dcac064e6b0d1aafc99336
+EBUILD cfssl-1.2.0_p20170601.ebuild 853 SHA256 a9d8ea0b16e78508cd6f034eea1af3b3a2260b8881f41276e2638b853bf14014 SHA512 629df8b18734def976f92fd14002edc98d1633cbcf7ad1884f5cdee0c80d30f14879bb1e8689ab05db31a19dffd8d7fd682b72065ae3666cef4efa339ccd69da WHIRLPOOL 2b55aca51bce579ef1e571a765fb9ad97b06edcbbeff0bdaf6b752e51ce28e8d7a51929dfcdb9114fb378769c821c94fae95a6990f24504c0c0a84079fc56a17
+EBUILD cfssl-1.2.0_p20170915.ebuild 815 SHA256 e6790c5847bd456fef2c4dd4e605aabacaa0217c6acd59fb295184a45ed9e583 SHA512 8501dc18bb7796834fd17dec4387c33b3c94dcc9f3a24d55d990c8cab994c64db0831474d7ddac2030c39a3649953d998f0f32b506b86aab4cc06804da2a38d7 WHIRLPOOL e39e331eeddd73cddb1b26dbe77ffdf21cda6ac6895e5bbfb432d112f050c99424060bac374e3289f8a81106cc9fb2aebab7ca75c6cc977cfc97e97619ed5174
+MISC metadata.xml 326 SHA256 2ac6e23f66f333bb107d8fde8ae69ee239d8603cc32749337e1beda378df426d SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa WHIRLPOOL 399824a203c3cf67be7f5a0296026a60d71ef8a8ee5ba6a8c57b302baef22ae99516e2105bed07f921c9c6d3316058b841ffc9fbd403d05172b2c9e83cee5389
diff --git a/app-crypt/cfssl/cfssl-1.2.0_p20170601.ebuild b/app-crypt/cfssl/cfssl-1.2.0_p20170601.ebuild
new file mode 100644
index 000000000000..7b35026cf94e
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.2.0_p20170601.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+EGIT_COMMIT="9c06c53d4dfb9c0272c983a26ea10a6a2da12392"
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Cloudflare's PKI and TLS toolkit"
+HOMEPAGE="https://github.com/cloudflare/cfssl"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="hardened"
+
+RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
+
+RESTRICT="test"
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	pushd src || die
+		GOPATH="${S}" go install 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/cfssl-1.2.0_p20170915.ebuild b/app-crypt/cfssl/cfssl-1.2.0_p20170915.ebuild
new file mode 100644
index 000000000000..17742ad0c2ca
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.2.0_p20170915.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+EGIT_COMMIT="7d88da830aad9d533c2fb8532da23f6a75331b52"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.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 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/Manifest b/app-crypt/chntpw/Manifest
new file mode 100644
index 000000000000..952f0b1ea8eb
--- /dev/null
+++ b/app-crypt/chntpw/Manifest
@@ -0,0 +1,5 @@
+DIST chntpw-source-140201.zip 1404098 SHA256 96e20905443e24cba2f21e51162df71dd993a1c02bfa12b1be2d0801a4ee2ccc SHA512 a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa WHIRLPOOL 87284c123d2ae1965d069d4d97cda23ce757305b3521f84089e43a9f1fa8aaa48f8fbad5bba19b3a439cfb16d270e0f77f528664fdba895c65c100492eb9e42a
+EBUILD chntpw-140201.ebuild 1043 SHA256 72d78850351c145b0963caf3153bcbdda05d5506d5635321a85ccfbc77c8ef2e SHA512 606c62f15973aabbedf2a7912cb248ef0f53d5cc3975abe9003b239fb2e4393a7cb8033671457960d61d5fed665b001ca60c41183c84c4eb093194241e8e6557 WHIRLPOOL 359ffda5869136cf75c790d08d4b89d695cf40122485d152d14e970452082864699e1f282c3a37d718b71e01766ff0a8274a83f3176e207e4c5ee725dea1bc19
+MISC ChangeLog 2732 SHA256 99f2f65bc545603743a39b7b9be747cce9eb866499f1596ae580deecf7d99367 SHA512 4b631faba991eb9cf84fc40ee5a8bfd292d1af63b45e3a7c4707772fb2a47dcb9f7c83d8ae535044a75c659ffebdb05edd7849b5bc1ed3a5760bd65132fcb06e WHIRLPOOL 80e7a0c144309e0627f3748df41aade0eccaaa49eaf14d258b3773527b98751eb8e0dcfcea97aad8e0f9ce867e1cd2653ea8377b3e0e0d010d2045d849fcec22
+MISC ChangeLog-2015 3321 SHA256 827aea09b5309de050099a1a9d578ab76b960c32666a2b78833a3aed8f5cfaf8 SHA512 c7657da1b5fa9da7ccbe1e72e9ce7bd54256d8a064307e882b5033d065492066a86b4cd24cd082029bfe3912c6335cf8ed287c81f7ed6870600e55cc617f1f05 WHIRLPOOL 2b8e5881a283c74d53e8f2c946d84e11541baaa88387793b470887f1893392eeb5f082675d7f20f2d1d309d1782256cadaf1b8fc17088b51a0294ab1748f6b3f
+MISC metadata.xml 240 SHA256 d1d2aa7abc46b180b2494a0cbb393768f12073097a3ddf9d118cb9e2cead8317 SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d WHIRLPOOL aad153df696809789d129412e71fd5eca91f7b230c22a10c70baa6f79e3ab57cf8890540fead3d9587f76b4396a7089921b207165fe0505917ad76b5cf86af90
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/Manifest b/app-crypt/ckpass/Manifest
new file mode 100644
index 000000000000..d0491b02c3df
--- /dev/null
+++ b/app-crypt/ckpass/Manifest
@@ -0,0 +1,7 @@
+AUX ckpass-0.2-tinfo.patch 417 SHA256 8868f6ae84f5652980d2ec5ca2d873c8f6d59be9ff6d4e837c6fbe31dbc1e147 SHA512 172753fa8d0cc6050e06010e721a69c99aab3d743af80a9b63949ed0a79a4c39fefce9cc34fe711caab89c20715b982142379d57f6acac92a762d19fdb805220 WHIRLPOOL 70e67fdd6031463a266febb3945f3293bc79bbaaa972013c6b2b7a5c589a444bd1b0f387a77915abc7bfab355dffa2b76246778de5ea7372b954010c3899f00c
+DIST ckpass-0.2.tar.gz 95921 SHA256 4027708b9518e7d320958f186f6b932001a3501c88773a88191fe5c976fe0686 SHA512 aca439caea2e3736539f5ec6bb235e51c59fed627eb9b414e629ad246c301e6f1dc90594826f6d95be9963aa4af0dae64419d08a44beb0a02d16a9fdf42a9a0b WHIRLPOOL 462fa8b7a82176ce01d1801525cf2b06ba6702cc2a7bf6e2d38d15a2879366e22524721f990ae36ba7a1c004eeab103ac23490faea9b6fd20a682dc70cf85afa
+EBUILD ckpass-0.2-r1.ebuild 498 SHA256 4434022c8c25ba636de2abb29e3633b33ddae3035497965bff1ebbe8061006de SHA512 24de0a86d026ae6e92fcc86dd725c7c03401bc6631ef54759bf5549dc1b2c739cdc7faa5eb3e4ec6a7cef4c8b247dda33bb7f3509929d06533181094ba7821e6 WHIRLPOOL f4202dc3a0656269233defc6a98d1d2262cb67a4248280b8054207b5415da9d444f91a78669f9c6414c2ef8831715523f91852c39112fb992e7c27c0f4fbd18e
+EBUILD ckpass-0.2.ebuild 508 SHA256 e44f882be2cbb299d6f6dfbba4e5b7727b79fae93cc78ad01d0ae5b55f05bfc8 SHA512 7c8efe9c494ee07c47b7cbf5f1f509315c3d96fc7933929b5bcd6d3e70445ed28e793959ea42bbaff51828839940863e9981b7479044480847c897e406e3dc30 WHIRLPOOL 21b9b9eb0c5808b95b09b6e961e7e0e1327f960efe6d125edc31a2229b4c609cbb4240499efe5b52e273e661ca321e9c68c473672f4ae7a669dc3b70b7dff88d
+MISC ChangeLog 2524 SHA256 04ed78d4ba70be3e99b6b57d65aa06c70db920a4122b082eecd4ecb25e2bdf2f SHA512 c18c5e7b6540ea25f9a98392bc6110a84f8ecb5403f70563638868484ec2cafadb28d0204a36d03ee31294f87cf5e63843627e546e7268286f2fa49c4762c3ee WHIRLPOOL 8ab4fde19b33bbdc2db9e8389ba36cf65c4d74bcec3dadd04d7f1d0aaad284293795c74b2b60a1a66ed79d238cc428dbcecf270f034eed6b538a75dbb93a5094
+MISC ChangeLog-2015 821 SHA256 5cd0d552e00fcb3a0fc26dfad3138a3efb916329ecee4540e98704a320127a3b SHA512 a6c3644743eb3c35354da796fb5f1f6f3304ab0de1e850398eae94e19fb523c924dd67faab0755e42cb70273af5bd3c0448fb7c3fdc1bd32fef4c2e54f2ae718 WHIRLPOOL 23707e57c62bfb0b0d60de01d85eb0961f3c194bddbc0ce6d5a1f6d8a44719acd3ad22762bbdf3dac248040dede875e3a8babfd7c8cd8fa0a1095df7189edbd3
+MISC metadata.xml 243 SHA256 0b9645d61b7dde468565cabca849d7bcc294719ce71235883fe8154f5d5bf790 SHA512 c1819159451450ef4228df48702ae486aa5caca6ba53523f4c667fb76cc8a36388697ded12851290f2698596803a64025862b8dc5aa5c22ea0c328359d2c5014 WHIRLPOOL 110d9700f5814e6c78714998dbe2e16a555787f81eac578cb3c2e6edf532ceba80e0acffe05a27e9b36cbc493ce52d7d5e8094bb62701b93e4015eab0eb3a08b
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/ckpass-0.2.ebuild b/app-crypt/ckpass/ckpass-0.2.ebuild
new file mode 100644
index 000000000000..176807619aad
--- /dev/null
+++ b/app-crypt/ckpass/ckpass-0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+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}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+DOCS=( AUTHORS )
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/Manifest b/app-crypt/codecrypt/Manifest
new file mode 100644
index 000000000000..8dca858bdb09
--- /dev/null
+++ b/app-crypt/codecrypt/Manifest
@@ -0,0 +1,9 @@
+DIST codecrypt-1.7.2.tar.gz 446975 SHA256 dfe932b6aa18e85d3f1f5324dd11f1b02a75e2225748d91e07020b31eb721906 SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0 WHIRLPOOL 804980127104da801556a2bc09cd018a215a68c10147e0a2f2380e5f0c92f4063b390533d65a1a4d810e6c27ae912897a345a025d48362d2937c8e8ebfa5d527
+DIST codecrypt-1.7.5.tar.gz 464250 SHA256 873b6849bfb2ac0a530935da43422a763bc5763a01026c467ebe164eb41c3cc3 SHA512 237459ec4387f068d39946c1360e27b02f1cfd34a78eef0d3c3eccf31604f3d27b9e5c9c091b88257231bff02f7bf9fb82f7a9e8a8e8a6bbc27091c83ab1f880 WHIRLPOOL ecfcfaf62e59d1f62000e7c1c4a290483c7731f90e1271b1b0acfbc58cf1ce0799b23cb616f5b4d8ee5fc5a2e670d5c148ea1d893abae63aed18dec87ec843a6
+DIST codecrypt-1.7.6.tar.gz 463999 SHA256 6cb8728d7fee9eafdee1277fae810955f1c418755ccfa69ec8c1e86cac6c9873 SHA512 1bd1432c75985d2ff968095bcb9e23ea2c6e91bd7009c9c50a5ab90123e14db0937e0a945a20a6c7f540a5b52e3f1d9ea2dbf779406d43a203f1d1bcafb94406 WHIRLPOOL af45ef6d548ad5e39268ea408c54e2235a90566a22fe9dc9e38882c1ede093835460a81bae128e49272344e0332c2fe0379fcd6c2858d97f3c9521c9d0259d45
+EBUILD codecrypt-1.7.2.ebuild 672 SHA256 a4c50eaa4a4a054709cd7f17e2e772dbda55f0f4525798ca497abdfc0a4fa5ab SHA512 a43435250a021b7418bf2e5eb1573237bfda0690bd65e6df597700dd9ef3bdf7ac316ae164bded683e8e7412fe1e57bf7428b0f629d6f614f1b2b7ef64d68f5e WHIRLPOOL dc5646bca3bbc30b1265ba74193bd2db1512377b4e4fcab9ad6da31abd3ef2ca60ff34dfaf2038f61d99d0ad7b03ae4089c35c19ee6c5117d82613fc39d3099f
+EBUILD codecrypt-1.7.5.ebuild 677 SHA256 0fd75da8bcc75c0c645bd2a70ca9eaca390cffccd6ae803d46098be602dfa2f0 SHA512 f39a62e22e29a39bde6aad8df33a4741ab6b94d0f797b1c5907511e7f5e5f1005516935e7d0801c246cfd2f843348666db78af3bc822c6cd7a6ed638cbfecf56 WHIRLPOOL 7a409eb23a4dda591c08c259ae55cb8329eea228d9bd484fb54fe4508123c7474a3c8d2aefa0a31f1b3fc199bdd83d09249d225e5ba62ae855a5e41bf234bcdc
+EBUILD codecrypt-1.7.6.ebuild 677 SHA256 4e1f077258fd12fce720408772583494fcd9124f2826b02dbb7cee156c0557e0 SHA512 fd767cde802038e27f375727adc48894bb588ef434e42dfd5e09dc6efb3c98b1048aea533954c5bb91447c7388ddc1c362f8cfd0f394284f935366d1ab72f17f WHIRLPOOL 0a52b0dd89bf3a54658d2df9f711345c56b614a022e012cd7c14d31a22230bdf1cf2e2f8c8cdadc45468484a828c23628660741645155545a031be1822ff8fe5
+MISC ChangeLog 3510 SHA256 84d50bf3d69a80b6a5508ac4e52aeb5f9cf95c0715f6d5a12da477352946055d SHA512 0e759c05149d11a06b66f8c42b2df4ed437a8746d89b9e31ad72b190da6bc29a9c7969f280e9696b69d8e477b75562b333c9555eb64edd837fc20084628c363b WHIRLPOOL 7c7c9d0986e29f02f60c1eb4305c42e8aa023b8c2bedb421b9e5d9b7e9afa5734d758b99b8e4affe235ebed0969affdd426a9fe4db705dd6e35218fbebb9ed44
+MISC ChangeLog-2015 1176 SHA256 7f17a79d73ac0a615d2a6389bc6265a31ddd94754bd893336813f884f5e977be SHA512 0c873280b142a24e7d4e0edcc669240468962e4a46855421ca795d147fe1118686641577269150c510d5febbcd12191a2ce0b85aba6a6bb1e4cee3531a5ba2f4 WHIRLPOOL 97a0a9db014125b657cc0f499dce29c62693367385408c546fe717e1360d8fc4e64b5efdbf432e1d857c3541ece6067588359d1ca6a8daa32aa1ebde9e6d8806
+MISC metadata.xml 836 SHA256 1445317f37513f33f4c94f9d65a32eeedf21212e46fa45c3832540ddf228a506 SHA512 ed4b650c46107ef4a1ae4d903c525553abb0d1863a438fc72721d0599f404d0825b8e669b33d975838f9f77b494ca131a82b4a528cb68e444f797aad6f66f28a WHIRLPOOL 67fd95af3549eab1beb20283a19234bcd236b1f5502cd50f339f930c227be5b638552bb92fea5ca622dec942b21f1bf7ad9954f3520c6af9eadaf0c5ac51a032
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.7.5.ebuild b/app-crypt/codecrypt/codecrypt-1.7.5.ebuild
new file mode 100644
index 000000000000..929eb593187b
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.7.5.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 ~arm ~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.7.6.ebuild b/app-crypt/codecrypt/codecrypt-1.7.6.ebuild
new file mode 100644
index 000000000000..9a1a3f9e686d
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.7.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 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 ~arm ~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/metadata.xml b/app-crypt/codecrypt/metadata.xml
new file mode 100644
index 000000000000..757e4a3209d4
--- /dev/null
+++ b/app-crypt/codecrypt/metadata.xml
@@ -0,0 +1,27 @@
+<?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>
+		<description>Proxied Maintainer</description>
+	</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/Manifest b/app-crypt/codegroup/Manifest
new file mode 100644
index 000000000000..39efed3f3735
--- /dev/null
+++ b/app-crypt/codegroup/Manifest
@@ -0,0 +1,6 @@
+AUX codegroup-20080907-Makefile.patch 407 SHA256 6236a315617bed2b7488c45060967962d4c789502c8c70da4f30a871bd167d25 SHA512 7702ee68dff4fb3b633554bf0781e80fb2143f8c82563f957e7f199d96db0bbe699b0e19618fc06359d3451ffd4000ae6c60229a460bcb49bee670caaa7dcb87 WHIRLPOOL 9c046028b08a2fbc696600c80e0896a203943be0c38ec67a0d0fcbeb1a80a8d0be0c641b5e5db74ead31b7b125ec5eaa54e271dcfc718e068fe502dd64344372
+DIST codegroup-20080907.zip 69123 SHA256 fe0dfb5b320b97afd0b639c76a796426bcad50a33a05399ecddde0189133b45b SHA512 3cf7816fe1c4c3b70cabb6e8518f6057cd04e735bef5569aff4b8753005ab33e5c4ac80bc434a45fef75267964ffe25fbfae9d72cffe6db075b4cafeb2b80e93 WHIRLPOOL 16e2e437bdb7b56e0c0d8990edb5071d24ee2f51920a9239c96a2c04f57be7fc42600baff4a0d9a7f835db957a8000576e1a96f1b51ab3944ef07117faf25cbc
+EBUILD codegroup-20080907-r1.ebuild 688 SHA256 7f9b31ed98aba6c5e2694c7cc6907c05a052c5098be2e75562b7a1cefda66406 SHA512 e02b714e09d4887264f79ba99d5bae84b0962d75543d2050205c626793be26425001ae268d2418ef2a3533304445c7164ae15c7cf04260d4cfac2f30a4bd438e WHIRLPOOL ffc5266876b8671ea75e1e83dabb38b1beb699cf31fe1a4d63afc1f9ae79e7261a23564d55930ba63623787e74754a7a9881b3e3caa04bbc0d6636c99819f845
+MISC ChangeLog 2632 SHA256 3296fc073ce188db54692155b8f1bfdb4e2f80fc27bd93a393f162329deee623 SHA512 7eb917a1e1b76f39be7d5910d9af22c1dca1910859115e7f942ce3c7e3550ed70de6bdaf539d653d0114390d8c9744ae4469b4a13b6f3336d127ee51cb028ae4 WHIRLPOOL 322909dca5a14d43bf3b41e354f430b6a018c43c2e5238b5a08542343f485adf58d1d41484a8c8fed30822c62b0de5b201ecf5631acf7a943a2b9c2b6421b237
+MISC ChangeLog-2015 703 SHA256 6078c4f9f0578c6a07accbcab3a43883359e294966585f3af1903f6b56123c66 SHA512 b67344bad7ed9943203c52ef7f0fd6a7467788e7dbb8625de033c83b46241bdeac23cb079beebf96d7c8ca3bd21493ebe55deab4403c1bac8ef53f6f1bf3a253 WHIRLPOOL 98bc21ac2157d82659495dbdb8bdf0472a95faf5c69ec3fafa457e2c48446ba755a89b6328203524c5bb30d8270c8238fc0664fb1d5585434f1a44b37e6856a0
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/app-crypt/codegroup/codegroup-20080907-r1.ebuild b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
new file mode 100644
index 000000000000..182c7ef8e455
--- /dev/null
+++ b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils 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=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin ${PN} || die
+
+	doman ${PN}.1 ||  die
+	dodoc ${PN}.{html,jpg} ||  die
+}
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..4fabba6cb3c6
--- /dev/null
+++ b/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch
@@ -0,0 +1,20 @@
+--- codegroup-20080907/work/Makefile
++++ codegroup-20080907/work/Makefile
+@@ -1,6 +1,7 @@
+  
+ PROGS = codegroup
+-CFLAGS = -O -Wall
++CFLAGS = 
++LDFLAGS = 
+ PAGER = more
+ 
+ all:	$(PROGS)
+@@ -9,7 +10,7 @@
+ 	rm -f $(PROGS) *.o *.bak *.zip core code.* *.out
+ 
+ codegroup: codegroup.o
+-	$(CC) codegroup.o -o codegroup $(CFLAGS)
++	$(CC) codegroup.o -o codegroup $(CFLAGS) $(LDFLAGS)
+ 
+ #   Create zipped archive
+ 
diff --git a/app-crypt/codegroup/metadata.xml b/app-crypt/codegroup/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /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/Manifest b/app-crypt/coolkey/Manifest
new file mode 100644
index 000000000000..6a2caaeda8fd
--- /dev/null
+++ b/app-crypt/coolkey/Manifest
@@ -0,0 +1,6 @@
+DIST coolkey-1.1.0-patches-003.tar.gz 21263 SHA256 af04f104a2ababe5b4cc7cd9e870918c24b2baa2599ddfe7a8eb0114b63428e0 SHA512 25a5fac68ca041fcf9e927d134d0179fa286e6de75019e7bbf205edeaf73222d9fb9fd3861a8f6e0d933d1a09229e3e727278c3a9b3cc63390ef07774c46390d WHIRLPOOL c272e01c61ec66c2f06b75370ffca33c067b0fbfea16284b8696484dd80b161ec86688a9b4af5ae433e9582ebc914bc10ee4d387dc920e989a93b514ce881746
+DIST coolkey-1.1.0.tar.gz 432808 SHA256 8448e3abb81bffc593c96b577dcfbc05b40e8684188456c31be15fae73d730f7 SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b WHIRLPOOL 60408f606a5cf5d9ec1ba3938a96a6f938c8d9f4b7ace2677ff35ce125104995675bf0decae92575e82dfc1a2eeaa26c4197ad174a4d3901250c43d906976c24
+EBUILD coolkey-1.1.0-r7.ebuild 1947 SHA256 0b6c37b79d0543ed96a1a411d9b283141c5f7d0f21e739290bdeb9dfff6ce6e1 SHA512 7997511e43ffa4969a05523cbdfe5c757ed5bc80ca284bc072f5f78ba4ba9841df04835e2cf90a3142d8d2f8a2dde22becc37be3590462387c44aadcd09b8f35 WHIRLPOOL 7a6d6034a78c885250987275aa4293b190ee879a0a499f4f00f84b93966051d742140380f6ab51e678bdd4855ceecd19e7fce36b39189b0c77148089c7212b4a
+MISC ChangeLog 2774 SHA256 3d03b09bc51bb31f868b876613310414dec77e969b7f14a5f28c38d042bce751 SHA512 33f47969f59c284b9d8be4225d135cb1393137124bd8d9a036ed11721692e47fe09a01e22acce244e6c3cd46459ff8ebdf5a56ccc85c92fcc12d3dd22cfca452 WHIRLPOOL ce5598f17262d547d2b816deadf1a308ed56a6aeafd9690e04f84653f1a0d2e2d8fbb0bceeeba9008f0dc77a83d0a5b1f9bdbbb750847159e9bfa5c5a03bfeec
+MISC ChangeLog-2015 3298 SHA256 efc372dc58ff4f2473fc0c07eb40a409be5f1ed037c49cc9576d0880f2e548b7 SHA512 95e7210b6dd0c5b270cefd5583c1c038b49653ebd8cb9affb82f2000a6fa6ec3b315e98e799f8a4e014028bff375f5575c35719ee1ecfd7064ab2ef14f77ee2b WHIRLPOOL abea4e508cf605790c0fd0aa562eb871222e81ba2b8b444d7c90fafaee2343cb9443e750b6237ce6f72fbb32960d5c1dc90fb7e4b76daff7b99906a778e04df0
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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/Manifest b/app-crypt/crackpkcs12/Manifest
new file mode 100644
index 000000000000..0a4e11f1aabd
--- /dev/null
+++ b/app-crypt/crackpkcs12/Manifest
@@ -0,0 +1,7 @@
+DIST crackpkcs12-0.2.10.tar.gz 94473 SHA256 a62a7b8d9693082b5209752187ebe9101d7c15c79f5e53fb9cc4ec9533da966a SHA512 5a2217e7809bef90a983cf8b7efff394bf59dac8ebea2b44c241b27ff07af59c86ce72db77ca1c9b1cbea15245165c200711bcb0bb64ccd4f3b38d3a2dfecbc5 WHIRLPOOL eff1d16169d77c37b874c9c08498c5c8b691fd07679b03a313718b5e056bd0a08826350fe8be605b639ac61f6f83dfabb66a92e2bf8ff867d8b6a798446c5256
+DIST crackpkcs12-0.2.9.tar.gz 93931 SHA256 0c9aa4e643986e71866f185cb0fa09c74cb1f4c95ff48ffd013a5a4677bf49e0 SHA512 6c2463a7a76d2e2ef728b37f46f818ad279e3bd828254f54ac6c0d44e737436d7d026af2a54a54e07910d9b54058b3c5764e4066f7a8e40ca75ae7d8970f9eaa WHIRLPOOL 4886c14768b6b4fdf2ca02adad2e4b2a00486084cb5cfa5f29459254d00c6dac287877ea913a4900036bb3367e3cb5c7ac0f68d931ac0ed02fd7bb760f3dd4f8
+EBUILD crackpkcs12-0.2.10.ebuild 441 SHA256 2c5b4969c62d76ae766e930d38d5c6f24e6aa24f018e83c665ea8429fde1d9cd SHA512 d90673a093059df5f5373cdabde7fbca1cdc75210191351b6085dca899dc7fdb99d63f20be41440edb6ff9d65d466c72a32612250ab1741da2e04ce68f51c08f WHIRLPOOL 965a13166631bd809b0dd3cc90df68cc06fe183cfbc0446b2fadcc6bc192c5a34140fdfed4b93bfeb444ea9c41a908c649155ac548e876ef5f6f0b43694b6f00
+EBUILD crackpkcs12-0.2.9.ebuild 441 SHA256 2c5b4969c62d76ae766e930d38d5c6f24e6aa24f018e83c665ea8429fde1d9cd SHA512 d90673a093059df5f5373cdabde7fbca1cdc75210191351b6085dca899dc7fdb99d63f20be41440edb6ff9d65d466c72a32612250ab1741da2e04ce68f51c08f WHIRLPOOL 965a13166631bd809b0dd3cc90df68cc06fe183cfbc0446b2fadcc6bc192c5a34140fdfed4b93bfeb444ea9c41a908c649155ac548e876ef5f6f0b43694b6f00
+MISC ChangeLog 2512 SHA256 ac3c7d29133c561ec10497307e405fbb2b4e9429f1b261d11e402c3e2a0184dc SHA512 7a76926423928497e3b0bce3e05487745a6b27e19732bcd5c610750e03e17788619eb105e3202aed5139a039b55010bbb531c6ad8eb938d3f57b04a662aba58e WHIRLPOOL eb0d89e7b550347e87d7783183467d09d24e004db51c710c2f5ea14e18d67f12f3208e7505d67cb8d8d471726aa1627c362352b49d802ee1062e021ba91a38af
+MISC ChangeLog-2015 485 SHA256 a84bb486e3c07e5e836a9cc20e540d2da3bc6c2ff30d3d49f2adaacca41c6393 SHA512 0c9336d1e1883326fe833430ea0e83f4ea2b74130d8897de6ad16cb6cc5a86e1fdcf00d83eea56ab44908f0e5b974bcb9a70d9533dbe3a79f82a3124f9b28f59 WHIRLPOOL 941987550c051a81e981d329e2d4ffcfa19f83e929de15bcb0322eab673a8317aef10ed2016788c546b396254239f36ab4979bd0bae3f4052503586431672d56
+MISC metadata.xml 298 SHA256 ca9e5cb29cc796673f722db0d6342c21f14dc5bc3322230e6eb417a0ca331404 SHA512 759f5b65c7d9bc956d9c1ff3ba906f1d9d70c9561d505f90f4e59fad37a33003b0c7d35a5124099d12d1e79c04d1d940b76b472ca6b4a9be2eb074aa85ebb795 WHIRLPOOL 4a4ee7475188ab76019f7df05ae28d2fa9d3c7d1b39162bc5a1eec7285dc02346debe33151a4d9af2292c7cccf1c717b2274d91f3105a2a9d207356b76cf2d50
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/crackpkcs12-0.2.9.ebuild b/app-crypt/crackpkcs12/crackpkcs12-0.2.9.ebuild
new file mode 100644
index 000000000000..e120fce2d803
--- /dev/null
+++ b/app-crypt/crackpkcs12/crackpkcs12-0.2.9.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..3c8846617c3f
--- /dev/null
+++ b/app-crypt/crackpkcs12/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>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">crackpkcs12</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
new file mode 100644
index 000000000000..9418a66b3a34
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -0,0 +1,6 @@
+DIST debian-archive-keyring_2014.3_all.deb 40060 SHA256 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0 SHA512 7a24596f250eafb6e62d19523cd13c3b1809bea3f694bd92f3d427f67cd840e0292200e6b033b5c5c5cf41ab40233ae17d133a846be483afa1da3b67cac72931 WHIRLPOOL a533e18402fd85e08f4ce1e96b6c9c79e8ec844afdc588557cfd730cd5cc8b36e711e4629e9d74c7f36b129d02c711b24f8626a00489775c8ef7bd29c567ce0e
+DIST debian-archive-keyring_2017.5_all.deb 56438 SHA256 6a38407c47fefad2d8459dc271d109f1841ee857f993ed3ce2884e33f7f0f734 SHA512 8e7dafd850a7ad0a322790e41ace819ad51c1a17be4bd506c5790ccef97f1a0dc0cb78841225b4c6a85c20d502800fbfe991ea9c8c48a5bb58598754dcbd6173 WHIRLPOOL aa2dfc6d859e92175130efe5214f5bbf539652f4612a1f1bb69ab32ba320470fe0793a313fdcea49257172311849b47cd55d1c82be40bf20aa8fe7ab86124564
+EBUILD debian-archive-keyring-2014.3.ebuild 432 SHA256 a2ba516fe347db8905818a8ce78a837a09e4edd39476aa6456f8220fa6c76e37 SHA512 f1f30dd36d9ebc007f616d8f47530e73440556c1607c31542c66671a5d15ee8c28ca76d2036bf379a1600acaf1db805fc8af5090308873e621b13587c20a45ad WHIRLPOOL fa46dc9e2e1c36f55b3dd82d31539adabe10016223fc21a34c8c8d43e9455b829d3c54576e942dca8ab658210d991e0d014867e69cbb1891ace4bcda138a64e4
+EBUILD debian-archive-keyring-2017.5.ebuild 432 SHA256 a2ba516fe347db8905818a8ce78a837a09e4edd39476aa6456f8220fa6c76e37 SHA512 f1f30dd36d9ebc007f616d8f47530e73440556c1607c31542c66671a5d15ee8c28ca76d2036bf379a1600acaf1db805fc8af5090308873e621b13587c20a45ad WHIRLPOOL fa46dc9e2e1c36f55b3dd82d31539adabe10016223fc21a34c8c8d43e9455b829d3c54576e942dca8ab658210d991e0d014867e69cbb1891ace4bcda138a64e4
+MISC ChangeLog 378 SHA256 3b1749b1953570ca56812b81862f40c06ddcdd5b95045c8597370184bc32802d SHA512 80ecf84a0fcc98bf169f3e1bc846430eebb87760f2f511f2045364af626dce28a908b8bed017169668cd432ddf0918d2ff0fed560d3f87a4d540c07140b7a7d6 WHIRLPOOL b60b4bf84c8b61af702c9f03e4609ec2fdf981f5a210cccb96b4f5511aa851db6885f0d2e07977d4d928ce8c3738ba974d1d631e30d3d1afffa4484b64f2ea3d
+MISC metadata.xml 255 SHA256 6f6f18748aebf4d54ee0d1defe3252823590b6e06258774ff2cfed84c390291b SHA512 92faa797311ee8b7bab9f5f5070d5fa6b75ca5f3a07643f8fc4d67a28d50d746e904009b7fb1a8214c4b0fc296b4b3ab3f695786103dc6c26479c5542165a587 WHIRLPOOL 63cefeb493d9454744badf3186e558301ff2c46997068926f3eef2e03fcb96802943b5b0ee4435eec6c23d2e39830c166535ace0499f56a9171186616134deec
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/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/Manifest b/app-crypt/dehydrated/Manifest
new file mode 100644
index 000000000000..3b5c89f92162
--- /dev/null
+++ b/app-crypt/dehydrated/Manifest
@@ -0,0 +1,9 @@
+AUX 00_gentoo.sh 115 SHA256 c28bd21162d4a3d8d566570794734e27648429aa24e512c4951b8ab294ba7908 SHA512 2092f8bffbc6b34fa806276194873fed42146d8c8a434bb68088e03ec9eb0a2e0c1862a9ade67d56a6bd553119cd00f8815353b71345e451039254708430e52b WHIRLPOOL d1e9f2adae49ae650a29157e8d989f0cb7f9b6658ef3dde727fb606f3452d5c28faf1a3ddc6d28b4389ce443ca80e83c1ed1effbe6fece0c03e7061da823e8f9
+AUX cron 71 SHA256 f6b640ee36fce07365ee4a3eee3627cd9f8a2477e8a9d7c0583f1d921cb01fb3 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6 WHIRLPOOL 83813cb976a9b03f0989a4766ec518e61bd235074c99a1df4b555bf74e48ab485632706ec8fbe85754ee81f12258edbaac758d18f2c473bb3263a78dd7b9f4c7
+DIST dehydrated-0.3.1.tar.gz 71375 SHA256 7c9b9475b442dd19dbc33a26426444054781e14a2f122d2a2405f81093484239 SHA512 34b57edc6ab950c2c0163795ef45d6fa104dcf02978bbfa325da63f7d844176ecf20cb8d7604cfedc6b2f47d8c12ce1db5b37f532eda7fffa194b4603e4ee3b9 WHIRLPOOL 4d96d8a2b8d09a5800b1bc4236d82632199860c64a29a1d49ea7a377611a98b90bd0b0059323e588d9a53a2168ceb1239d678514c39176da38286d349b201fc4
+DIST dehydrated-0.4.0.tar.gz 74005 SHA256 611da321330ffd43d1dc497990b486b2dec12c59149803ad7d156980c8527f48 SHA512 3c8c0f2fab57a432b69451f8372c02666dd953985679d12a2af9f6b917335b5b10a1196699106e317660039178ce1139a4d5455d4825a152b6911596fba16738 WHIRLPOOL 1fb07445673698e15af61fc94006d7ac712f7751a092d370816527b7d831befc55001b4c6b38a294de1c09ffbd5e94ca6fb384439cf3cb4f70b0988edfc68d0f
+EBUILD dehydrated-0.3.1.ebuild 527 SHA256 3c305c5f1c28937c3a21e20adaad264494e617c2af7b5b9a29dfdc70aa4f61db SHA512 33a13b923a48fdd5e78456f2bc1825dc858a175198af802ab4ff6fee35a3470cce6c2424eedba6970fe4611aba82c0c72983f7b6dc7e22410d58d7a0062b211e WHIRLPOOL 0ee8caf5451d629498587ef7f069dd9184235c732af461d9b4566b508ce9ac8593a83253b9718a1ad131be99e5b2d26cff222954f86e48235da82d07a96dae78
+EBUILD dehydrated-0.4.0-r3.ebuild 1554 SHA256 bbb2588ceb94dc643662cb85237a364a63b3e8f6d670b4a45a46781335a4b256 SHA512 619e37279c8f7070d2e74f15033d7b6d098479b1837d73cdc9789b6a810160643b2561f268a63acc712abad365ee645150c76bd8c6f5c35e75d734dd3ec280c4 WHIRLPOOL 4f42dd7c43c8027dc74e05918e505eefdf8642ed9b3bdd1089457ecff0ad040696001539361d4e37ad85e4517a53800525bb5b767dbfb87fdfbe55c34f855cf2
+EBUILD dehydrated-0.4.0.ebuild 523 SHA256 a877141bd253642be44ff901ffac6d38cb13de5fc716f895bb9cfd1e9e05eed7 SHA512 1be1cd3bf9e5f4c78b5506ab33c8189e73ddd9c322334c993a85247770d6c647aef5460a7f2aca55434b90effb0ceb8a3f6b4c19c42cd5a6edcca88793f56d17 WHIRLPOOL 1aeea58e66e6a1ab0c5d734a791672996f01bf65c4e83a35fda00236574ce3ea02a28f66d2a0fbdb3a493869c19a043aef8ada2632be21d6916a251857e26206
+MISC ChangeLog 319 SHA256 6969c100abdc82ac89ef4eaebc2d1c6fd0db16fb5981ad05b8e7160d82720f2e SHA512 37667b26ccbfb16f11a69c986157a200d761350e082a1d03cd3ed2757344c8b904dd923c32ae7400865a292f3bef6370b4dc63e714f82ab3fea38807c1e20432 WHIRLPOOL 530ad03632a34caa800e6d35094ce1a34f4c5e488ce97144f6bc1f8d2bac6012de27d39bc2b80f599c5a4f9df3e38c046140cc8b03b16479606a423304382397
+MISC metadata.xml 303 SHA256 97a7ae91ef655caa9e91c0832b3915c2d08e251b567ad7a30e133b776ad18544 SHA512 d0612583d0803dd4cffbc723df0d2e4f0897729cd607a5a7ea278e602e667d02f58a7794debcf2ca81fee877a2f9f2e3d8ca978b85d2ae4995040ca5ca5ce1e1 WHIRLPOOL 0ddcf6bd8dd52e231d16dca261ca9b83212a3c50598a157fae4ad34bc0c40a52ae460506c9b8c470f18bf84f9efd690823a555bfa28bae886b475f543cd47aa7
diff --git a/app-crypt/dehydrated/dehydrated-0.3.1.ebuild b/app-crypt/dehydrated/dehydrated-0.3.1.ebuild
new file mode 100644
index 000000000000..9034d53551a7
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+RDEPEND="app-shells/bash"
+
+src_install() {
+	dobin dehydrated
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+	default
+
+}
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.4.0.ebuild b/app-crypt/dehydrated/dehydrated-0.4.0.ebuild
new file mode 100644
index 000000000000..33ae0d078c0e
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+RDEPEND="app-shells/bash"
+
+src_install() {
+	dobin "${PN}"
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+	default
+}
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..87c8df609c97
--- /dev/null
+++ b/app-crypt/dehydrated/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>mschiff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lukas2511/dehydrated</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
new file mode 100644
index 000000000000..f78e8c6f4079
--- /dev/null
+++ b/app-crypt/dieharder/Manifest
@@ -0,0 +1,6 @@
+AUX dieharder-3.31.1-build.patch 623 SHA256 fe93e67a6ee62f9653949552f7fa44292e8c888656df97896296ff97b9198064 SHA512 8d98efdcbfd4cea06d1cae1a1fbea1305e366c030c99b3abb944d1a47543e9b592304f60cd8dbfe9b3fa77ec9ee61c2537bf2390f072ced7d36ad7eb9550e4ea WHIRLPOOL 6f6d6bfaa5402df95bd4334d0de7871ff292ef93abcc3f75a0efe1b041e4ef34886385274c3936b2b8142cd46f6af6831117b75e2eb435942a9cb95f191eacac
+DIST dieharder-3.31.1.tgz 1149780 SHA256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5 WHIRLPOOL eb10fffbe839b2448b1955841dd4c3dee45f21ab89eb5107e82c3fef8706f7386ee6b6c21aa947c2cbe1f16075c7882975c9eff5fb17876799c15ccce9b5eca1
+EBUILD dieharder-3.31.1-r1.ebuild 919 SHA256 a4cef92a8aab20aea1569dbbaeefd974c1ee318daf1b6d30df345c6b8f9bbec8 SHA512 90f366343406cb52924825d09c6057d321c447135193995167ca01cc83a1adf0f3efb9ed6d0ef92c6c5d7999ee9bae8dec2ff29e97651c707ff29901faf2842d WHIRLPOOL 5063e0fcdd58ab9b2b2109d48708aacec8de7c2b4913c82879387553b0f4770f0c66490c35a804170d46862415c3262bd1f03542f23e45474630eb6e088925b5
+MISC ChangeLog 2825 SHA256 13aabd85b1f932a36f114280ec7ae7fece0f4d320323b53a105cc50744d755e8 SHA512 5da51e8f7c0c13e5edd881e5a30c3a8acf9536c2b89ab635a440dc215d26d54259bb3a5f3076103d2246ed98c309378325622fc35dff21db00788bc0f0cf465b WHIRLPOOL 2e2be3fc84cbbf111e9101f70f75385001382f2c9de8f27da25b023ffd9506b75752869bd5dd30d4115936c977f8e77715e8cca1777cd4f67ddc706a6d0e3dfe
+MISC ChangeLog-2015 982 SHA256 bbd04fe9d44bfde253b677bf1417315a6c7315f0635769e0576ee84785378c1c SHA512 d44a7fd0b8406e69f8c958a9dce056de565e2a63cf9b6b854b65d924deb0abb68631c277faa3e96e2060a3aed69d3eba68ba0b07c5283de0d8aaae8d8dc4900c WHIRLPOOL 92be7392081bc2b09e568133dbab1c83a434d50c088cde84e6081089632aff8640bdf22644bae2cfde98676724828cfd144c32d85e1563cad61ec43206187056
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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..68fb80d3fb6d
--- /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 ~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/Manifest b/app-crypt/easy-rsa/Manifest
new file mode 100644
index 000000000000..69152a38e32f
--- /dev/null
+++ b/app-crypt/easy-rsa/Manifest
@@ -0,0 +1,8 @@
+AUX 65easy-rsa 37 SHA256 685842f170ec8ce19be9de1681ec8f8121e677e6b3bcd21dea89b843e68e2839 SHA512 2f8c4f489ebd2ad2e5a0d45351361ecfc06a9481d9e15ea48215addb82ddf2083a85acb0a5c171d0c7e5406152d3679a5a7835e22ba9953e554614d94026d778 WHIRLPOOL b757f05f78d1e780b5991e5b19889d2692be188fc58e67a9606ca6334b0452d63302c4c5e556f2fdb542c6d86026e0f31c76845607b275f14e0875b1c518f303
+DIST EasyRSA-3.0.1.tgz 40960 SHA256 dbdaf5b9444b99e0c5221fd4bcf15384c62380c1b63cea23d42239414d7b2d4e SHA512 d20f646e33ec803444dfcd446553f1d6001227fedec93280c212b34cccee11b184599f1b2ae6a3ce9cf6c9ac52f2b840ebb645536df6ddf55382fa25c22df81f WHIRLPOOL 64d54af059e136409f4ad3488450cccc846e2b5d9dfb9e002dd466cf603b6677dc8f0b788471b73eebda918c5773673efc120e6a76dbf407a3e1605db14e62cd
+DIST EasyRSA-3.0.3.tgz 40960 SHA256 fb239d67f4bd09f817b0025450d422ed7ae3ee93af737c57d4acd8fdb646079e SHA512 c8cdc31d67e63f9e8338095fa4534bb141d857a8a9f510bef1af32270b8421952e569253bc8b7a51ebf1b443a6ad5c7cd011b258d7c9f56426ecd3f2b710b6f9 WHIRLPOOL d80a74b6fe22dd748eefab9c9ef3e0c726b2445e1bd4d89e137a5a0aac9754075ab7ce5e28c15951048adc7e69c9573b36c6dd57b61476bb4f1d34e4fd79868f
+EBUILD easy-rsa-3.0.1-r1.ebuild 856 SHA256 294e8bbca5aab6d5bd46b69428fac174b8de5b17ee80e504a7bddc8277291ef5 SHA512 8be27d7faccabeb9468d4b914b690a95f11dd02225759e51042b8f54043253570fc2a06b2173aea31b2c33ebba879effffbba4d8cb95a6f51871b3d7760a11a9 WHIRLPOOL 29df1744c31e1623f73f1ccef0b273e10f0d27b764f30d16fb918518e4b3a871d03b3a954c5c37abf4a7bf8b3af83ab151e92da2203309c8f1c7af7d46c4bb9d
+EBUILD easy-rsa-3.0.3.ebuild 862 SHA256 4b237e611b80f56e271296fa985b4f4c2c7e1ea12cba8acd588580365809b319 SHA512 2c030b2a4fc5ed9fc02de403560a0cec4ffae94ff18611b7942408c937e36544aeba5b6cb87b7db23734b3f2ea0b7f6f19699e789013761484a374bd093f5df0 WHIRLPOOL 7c6f3bb49d12e4b1dafaf35b1ed967c6b876cb59d51d7e031069084b76b74d14d2ea4d303912867cb2f4d3980a21738f0bc0bfcc27f3eff3bc759abd803d58d8
+MISC ChangeLog 3729 SHA256 eed1fb90ddd2e88ab2ab2d63b75a5788dc92337da68c7864e4c54c1d604cd5d4 SHA512 af7e552d47ed6590857418c6d5b686ab04d1b9e03815eb8dfa2aa15a26a87a8749b6482847c93218c6707460c27b7ff78245b132211603bb16a23784f917f4e2 WHIRLPOOL d8eff7d428687802b87752c2dabaf7aea6d9411cef5811c5e6ba234b4ab82aca78d8460e95e5f03f6879154e578102dfc0c7f97452f7805b9b7cb4f20faa4e95
+MISC ChangeLog-2015 3271 SHA256 0a2236d29760e1552d9f263845c2a9a55418026ec5ef3110cade31325ded68df SHA512 b39945d8ec2691004a6311f83e790a8b5d45280049cf7b1212ea8a5b494f8e4413459b57f09d9a31013b73d7ce6a26ea06f33d8489151019ab0dfcc8b13efc46 WHIRLPOOL b07605482d0f4876ee8685c2263c3221c0d726356f500729f00b617b8e2d91e9be3845d01411bc0c01949cf69c3f8740bdded40419a9a86b721e57a30fab7f24
+MISC metadata.xml 253 SHA256 9ed7b7735ddd664ebd9ccd44a4acec74a032bf23bc8210f444d2410371df3489 SHA512 514b8f53c2debe0ff7fcc49e68347d148d5955114bb26f93d86deb9cffcb17f9081cce239beafd37ec47c43ec01743eb999b7cf2b5dc1708948567865d9d6531 WHIRLPOOL 6065ede175c562ee1175a4930cac3e69d02b8b8814d2da2bbb995cbe956cf167c42e6e89fc549e3f2a910e4f489d3520618f58ac603288c6f6889177962dd762
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..393d4f048431
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.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
+
+MY_P="EasyRSA-${PV}"
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="http://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..cf48b3864eeb
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.3.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
+
+MY_P="EasyRSA-${PV}"
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="http://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/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..c51dccf760d3
--- /dev/null
+++ b/app-crypt/easy-rsa/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">OpenVPN/easy-rsa</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
new file mode 100644
index 000000000000..f4155dded743
--- /dev/null
+++ b/app-crypt/efitools/Manifest
@@ -0,0 +1,5 @@
+DIST efitools-1.7.0.tar.bz2 96042 SHA256 6221323665359ded31aefd2979853203cc08509d35bed09b05a28a9c060866ea SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb WHIRLPOOL fc1762b5a35111f5f103273615b03318a4c319147e1e66898ceb748fd767cd977d8cf4d466e2cd7289fea66a755a4b13f44d9f7498a6a2216213045439726bf7
+EBUILD efitools-1.7.0.ebuild 693 SHA256 b7101bfbc454c6d0f382e85633c9f2f7fe44f8c61a9775afa98396b21aed309f SHA512 6bd2ca3c90dda101443dc94a7403e2dfe736f993104d2eb0e0746af21826716e3e137946d8309e2482244f27aaca693585f46e4f4f76f5eaf37d54bbdfe05f8d WHIRLPOOL 2a598d9c9576e00b1587b57fbe162bc4be67fc1bcd7050974126eae0fc67490b54e8840e68e6746bfb9a8ef992911ccb3063b42dd0968b2c9fbcb757ba388b58
+MISC ChangeLog 3267 SHA256 3bc27f7c3377b0f84b3367acae9a187a43007b139c4269f01b7a2f356569b92e SHA512 a08d53000c3f036a7992bd61867ff61850b5fb6ca2c7a4bdb46d63022906fed350cde91a66342b2f5105aee5435130c1d4a2fa397f1abe975ca56709fa7f4e5b WHIRLPOOL 74fe9a045eccb6967c0ef52f21acfb09bd3c57f2dbfe54ea95f4ca7ae54ed7ea0ee18868aed584031805102253cbbc2f7b4fcf7622831989624e8fd4d526525a
+MISC ChangeLog-2015 1595 SHA256 b86883dc282706b827b9e280575cd1369a3fcd86ad1f955e533684205b96f1a7 SHA512 4d98c320824d9f6b7772ae0e05e8f3a22819d8c3f6f10680601154114dea1d8605543af7921e3c6731df38a58d1859fa7078865ae31e1e698ca9f706b2efa34f WHIRLPOOL 669412323bd1ce9ac3a7d774e34834fc60e424a390a74324bbabdb3f8fd0bd789ffdc9ab1f89361452a1735ced79aed526814d93e436d327a8fb80f9c37a1963
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
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..0baf83e20fc6
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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/sbsigntool
+	virtual/pkgconfig
+	dev-perl/File-Slurp"
+
+S=${WORKDIR}/v${PV}
diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/app-crypt/efitools/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/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
new file mode 100644
index 000000000000..ba8f062e17b2
--- /dev/null
+++ b/app-crypt/eid-mw/Manifest
@@ -0,0 +1,13 @@
+AUX fix_libressl_check.patch 1623 SHA256 7e03bd13210e563a704f7b70ba4e3da098cc2134c002eb4bab0d21414fb083b0 SHA512 0d834c62623e312b37e5908dbe6738efc726ae036bb7576cd25cb88156519dee17e35711ae4d583aeb4ea17e7220ff3210334c78d1e314fa0b972025250194fd WHIRLPOOL b5830b05fdf9c248d2d4f21d961f5dce7251b26dfd057e6558f2a45e65cad0fbd5e83f265930abb95e4ab0d0de99d7d0ec796c3a5f92776e3621f824fb235db1
+AUX gtk_not_required_4_2.patch 3247 SHA256 ea891a12c8b20c7a99d96ac99cae071ccb391e8bd73a23f03f96f1527a957ba0 SHA512 32e2da278c1fc8fdaf479a575daf65a1a3ed49475568556fba91cdca081b39fe6e7533f98aba4774f7eb00a04911fec3cf55fb2a75c57465d992801d3a4ee11f WHIRLPOOL f6ad905735777614d8df4ab2d05a3b6a88b8606582fec1057333d8ef80a32f2f6e61a971970927fdfefd85afb2bd053b6357505651ad11e31d8d15929eef6f2d
+AUX gtk_not_required_4_2_5.patch 3495 SHA256 e0cd5768121f624b13da33da3713ee7de7dc3786482c62f280d90c0d4d3c8d23 SHA512 9c5e1b614bb4230b67e1c11fed3693c1aae0b982ca7c5a26678ee6af7da48d0ef2eef479335d498ea5f75408a2a957763a611367aa39585c50ed2556aa09232b WHIRLPOOL 246311f3877fafce5eb8b4956446c4d31083015dc6f9df116e4588c694f74c6037a9bf06a13096825037ec43ff3b3d1336fd401e24411a5a2c0efad1aa941f3b
+DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
+DIST eid-mw-4.2.5.tar.gz 7751526 SHA256 d2c46a65026790485f39db0b6d9b66a65b1d19061f3682a0b6da2e2b0c54bc81 SHA512 cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075 WHIRLPOOL c24186b1f2b6b02df4a790e3a8c3d1f8e762b1e556d8f55aeeb4523a71387045827b47444246334933fc3d746485ea14086cfe41c5ec23f43826e6a7375c7fc3
+DIST eid-mw-4.2.8.tar.gz 7076407 SHA256 6b998bd14897f640e29f9140ee457ea963162a409c7aff646e3346b0b0ae2e65 SHA512 bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb WHIRLPOOL 12f998d6065ed0eddbee5c6f99ef75f2bd3b3344314c7dd2e2e8a5652ea0f5adc9159af22d30ff8c4349bf75a71f982c26de886bf287d379fc99e5b341b4c303
+EBUILD eid-mw-4.2.0.ebuild 2490 SHA256 da8aee4b60dca369143677319ad2fa576bf322089cc3098119ae3ea4271d8345 SHA512 77e4b91adaae7953444ad2d6ec196978d29c06261ff0ab0a29eba330986adfb77e11fc48e826b3e35b928b60e46d24f93f1907692f80573a22b1e57c14ecbf5e WHIRLPOOL b61cae37f4999bc0c0a7423347e9694f09cd36e3b1c743bddf86165bb384367bc2339904fdea6e7f90ef94bd24e6371c6bc3f6d1d3913c64366dfc0f9317e2ba
+EBUILD eid-mw-4.2.5.ebuild 2492 SHA256 53912a1cc114213151552ae18299fbc995d19cf3d7515daa760cd4632f6feea7 SHA512 6b8c30204dccfed98dcbd77d914503691579788b86d45803a8c43b18c77a3aea71cb41f320db344cb054d3ea02b11d356d59199f79d1b38ff303c054693c041a WHIRLPOOL 41320985ae4457b9b8dea6430956a9b79e86e64085572f6f48f70eb9b5f4d367d2f6b9262c9784cd21bae2dd03d854865f19103539f6456bfa14c42614e45c1b
+EBUILD eid-mw-4.2.8.ebuild 2433 SHA256 780d202d2e323c1c2701b58b58008026636afbe26b97372213d1b88ca71255f0 SHA512 b1157739db92af6d0b69fd373104578e4e40b13713e37f24600113fcb6ad710e151450a1207c4a18b7c1dfaaccb4317171d2fc1ea02c4b3042a37adc9a0ca589 WHIRLPOOL 92d95f29733c89c8535121254e0cd9b13239821986cc0c49d03f5988427b870c7ea90d7088582af8311776b17e0d484150cdcc817b71a187eaede0b35b7f3739
+EBUILD eid-mw-9999.ebuild 2386 SHA256 ae5e3f92c1d21de6cd6c4749c300de9bef62d24d1b4fadfa6d367bd70585c786 SHA512 5874bbc8ada17f8e0e6a5a48e9af15c56274fcc544fddb9ca3180bda83f72b0931309f12be6faa8ed670baf14b40d518a5b7d3b45ffa6df6e95dd426cfad90c9 WHIRLPOOL 2a744491be471cc911c7e0cb28527ef2c126af5ccc9455071b6199990d4d4e8ea41811a7b0660a807f4335e9b512319231b20b2d1a15eb92ba8fb9ad29fbdccf
+MISC ChangeLog 6022 SHA256 40003eb13dfecea94d0e9c8db15dfad65a86ac1140124202d08f208c68ed7437 SHA512 3131bbe51c42f51e689b99d99a75726ffa4bc7579f663a41a28f1f81835fe6dbda984650342a9621dcd776aa88d062ff39b687a6437fb8d022087fdacfb8e22b WHIRLPOOL 18a35068ec6bc520373b104a53a4433a2e47f34c84d2ce520929c3e5742a9886d351acdee997a78fa7915aecaec3e3706a1b8f73f257ffb21468080e12309d43
+MISC ChangeLog-2015 2329 SHA256 088b0d80f50d8e70360e034b4041bb2d6d5bf7a26e2cd20342b4fb1b8f99d571 SHA512 eca6e772f8cea012cf3f4cef551dac4142fec2379d5259f693b3c3c38c21c62be4f3953c0166e7c9be9822580dee836a93c827244387d1d4f75de70b16018e8a WHIRLPOOL c9fd64b8f14cc2cc2a992e1193871f8e0927f74e6a7366bf0c0d75782f7adafc3eb425d86ca75771ee2fbdf7ceb30c638b8aa86d736aaa487636e49927831970
+MISC metadata.xml 1464 SHA256 dd5948b75903563ff3cd32a63e3c955553471813f4cda99bfa9013ea8dd7b49d SHA512 ed78298a9b246f9f8f9591dbb9fe54ab311d525db86166bcf66574c9e365f1476234d5bac3180226dfbdb5c4014dd5dae4598b670cd7c6c9538282940a0fa9eb WHIRLPOOL 4bec780651918f869a296b440a7f87610c1d14f48fbcd52fc5b2b3c8d3ff5fe67c16517ada165b09f39fe6b0a6f57d8c08bcf8e59297b8857d4e4e7ff0ba4210
diff --git a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
new file mode 100644
index 000000000000..3ca653162f92
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+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
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="https://eid.belgium.be"
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	>=sys-apps/pcsc-lite-1.2.9
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+
+	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
+
+	if [[ ${PV} == "9999" ]] ; then
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
+	else
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	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 "${D}/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 "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+	use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
diff --git a/app-crypt/eid-mw/eid-mw-4.2.5.ebuild b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild
new file mode 100644
index 000000000000..fe66ca2e579d
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+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
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="https://eid.belgium.be"
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	>=sys-apps/pcsc-lite-1.2.9
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+
+	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
+
+	if [[ ${PV} == "9999" ]] ; then
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
+	else
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2_5.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	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 "${D}/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 "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+	use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
diff --git a/app-crypt/eid-mw/eid-mw-4.2.8.ebuild b/app-crypt/eid-mw/eid-mw-4.2.8.ebuild
new file mode 100644
index 000000000000..deac90da0861
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.8.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+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
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="https://eid.belgium.be"
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	>=sys-apps/pcsc-lite-1.2.9
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+
+	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
+
+	use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2_5.patch
+	eapply "${FILESDIR}"/fix_libressl_check.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	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 "${D}/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 "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+	use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
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..4b7c9eadb75d
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools mozextension multilib
+
+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
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="https://eid.belgium.be"
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	>=sys-apps/pcsc-lite-1.2.9
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+
+	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)$(use gtk && echo =detect) \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	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 "${D}/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 "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+	use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
diff --git a/app-crypt/eid-mw/files/fix_libressl_check.patch b/app-crypt/eid-mw/files/fix_libressl_check.patch
new file mode 100644
index 000000000000..5476e3e4aaff
--- /dev/null
+++ b/app-crypt/eid-mw/files/fix_libressl_check.patch
@@ -0,0 +1,45 @@
+commit 53289f71c53f3aa8047b34d6db9b0ca2ac35f4cb
+Author: Cédric Krier <ced@b2ck.com>
+Date:   Wed Jun 7 11:29:13 2017 +0200
+
+    Fix OpenSSL version check for LibreSSL
+
+diff --git a/plugins_tools/eid-viewer/certhelpers.c b/plugins_tools/eid-viewer/certhelpers.c
+index de9f8bf4..1e3d1ee1 100644
+--- a/plugins_tools/eid-viewer/certhelpers.c
++++ b/plugins_tools/eid-viewer/certhelpers.c
+@@ -12,7 +12,7 @@
+ 
+ #include "backend.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define X509_get0_extensions(ce) ((ce)->cert_info->extensions)
+ #define ASN1_STRING_get0_data ASN1_STRING_data
+ #endif
+diff --git a/plugins_tools/eid-viewer/verify.c b/plugins_tools/eid-viewer/verify.c
+index 04016a44..f144d2cb 100644
+--- a/plugins_tools/eid-viewer/verify.c
++++ b/plugins_tools/eid-viewer/verify.c
+@@ -22,7 +22,7 @@
+ #endif
+ // All valid OCSP URLs should have the following as their prefix:
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define X509_get0_extensions(ce) ((ce)->cert_info->extensions)
+ 
+ #define X509_get0_tbs_sigalg(ci) ((ci)->sig_alg)
+diff --git a/tests/unit/sign.c b/tests/unit/sign.c
+index 31a1ab7a..0e0e3011 100644
+--- a/tests/unit/sign.c
++++ b/tests/unit/sign.c
+@@ -37,7 +37,7 @@
+ #include <openssl/rsa.h>
+ #include <openssl/engine.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
+ 	if(!r || !n || !e) {
+ 		return 0;
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
new file mode 100644
index 000000000000..7990acaebdd2
--- /dev/null
+++ b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
@@ -0,0 +1,74 @@
+diff --git a/Makefile.am b/Makefile.am
+index de5416f..8e55277 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath  debian rpm doc
+ 
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi 
+ 
+ xpipackage:
+ 	$(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 6e33315..fce4494 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
+ 	dialogs/dialogsgtk/single_dialog.c
+ endif
+ 
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-
+ if P11KIT
+ dist_p11kitcf_DATA = beid.module
+ install-exec-hook:
+@@ -176,28 +174,4 @@ install-exec-hook:
+ 		$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
+ endif
+ 
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_changepin_LDADD = @GTK_LIBS@
+-
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_badpin_LDADD = @GTK_LIBS@
+-
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_askaccess_LDADD = @GTK_LIBS@
+-
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_askpin_LDADD = @GTK_LIBS@
+-
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_changepin_LDADD = @GTK_LIBS@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+diff --git a/configure.ac b/configure.ac
+index 92bbb3b..a47e7c2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,14 +59,6 @@ fi
+ 
+ AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
+ 
+-if test "$have_gtk" = "no"
+-then
+-	AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives         ######
+ ###########################################################################
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch
new file mode 100644
index 000000000000..a1680c2353d0
--- /dev/null
+++ b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch
@@ -0,0 +1,75 @@
+diff --git a/Makefile.am b/Makefile.am
+index 393ecb3..0e14661 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc
+ 
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
+ 
+ xpipackage:
+ 	$(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 02e4e36..86d607b 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
+ 	dialogs/dialogsgtk/single_dialog.c
+ endif
+ 
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+ 
+ if P11KIT
+ dist_p11kitcf_DATA = beid.module
+@@ -176,30 +175,4 @@ install-exec-hook:
+ 		$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
+ endif
+ 
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_changepin_LDADD = @GTK_LIBS@
+-
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_badpin_LDADD = @GTK_LIBS@
+-
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_askaccess_LDADD = @GTK_LIBS@
+-
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_spr_askpin_LDADD = @GTK_LIBS@
+-
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_spr_changepin_LDADD = @GTK_LIBS@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+-
+-SUBDIRS = dialogs/dialogsgtk/po
+diff --git a/configure.ac b/configure.ac
+index 9bf10f9..f0120b1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,14 +59,6 @@ fi
+ 
+ AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
+ 
+-if test "$have_gtk" = "no"
+-then
+-	AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives         ######
+ ###########################################################################
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/Manifest b/app-crypt/ekeyd/Manifest
new file mode 100644
index 000000000000..409b4ed33a2c
--- /dev/null
+++ b/app-crypt/ekeyd/Manifest
@@ -0,0 +1,21 @@
+AUX 90-ekeyd.rules 691 SHA256 73e779a2e421b79882309120f4039809063f73f0cccc3c57d491134f1c6f8414 SHA512 12d949e90af31992ac671ae42172a2169592dfba9b921ed684a37e7fe330bef44abb2c0a1a5df63ddde940b00fb10fa9cfba493c69614ce0f10aba4de78ea6d3 WHIRLPOOL e4583a9c56c827a2e9b37644edafe3288359aea57c016e844ac2a478135a72aaf599549673c753e88216cf30b8b27639bb4eef463351324e606c3f21bd33a13f
+AUX ekey-egd-linux.conf.2 266 SHA256 89b5cf30b7cad64503f85c6bfc7e3868245870aae659d79dd05cc50869b5eaa8 SHA512 3e8db66552a5c04045226debbf6a7add01301bf98bb26c48033f4bceacde82f25e449fced2d46667009165e9d2f327134e6c963142295d7ef065eaa47b383393 WHIRLPOOL 2a34d84d96a53c5f8c39bff0d5b39c6a88f1cfeca44d1b52c7e7c3aece453bcb51cf00e9f1f1c6ed2a91cddc944857eae31bed67980805e9dcbef020c7de081e
+AUX ekey-egd-linux.init.2 456 SHA256 1ccf667df6fa449934d60dd1f90aea389634411fbd50766e3621c0c4345dcd83 SHA512 55e7be6464b685aa5b290bd310020f4a01926d07a9cb071fc117081bc751a902ebbb9db51a81a5168a34cebc2ecc02360b4917356e25a2e205f57491739ff190 WHIRLPOOL e50c57a54e8a89f0221b873dc29a4de2f1ad4586f86b99448aee5a92bdf6fb8e5b5b243bd418ed2afc7429413946dfc9cac2154625a58710ea570367bf5a21de
+AUX ekey-ulusbd.conf.2 495 SHA256 f3c246cd68840e48e39ba211fb8b49dea779a7fa660a7fc0854c6be000680ffc SHA512 9d4b5d594790d34ed4b513a00b60518c0770ccba87b159e1f9eaac382275658e53f5274ee24743e8d103bbe4a2351ce865157013e0dfeefa32e37fe4d2348677 WHIRLPOOL 54b831fa3b3b9c79d3a4d259ef28ca971e72c29320152ff546dd5da8b275952a4fefdeb990627467493dc0de266fcbfadf3f4dcf9e48a857bd780d112cfbd5a4
+AUX ekey-ulusbd.init.2 900 SHA256 da05b3819c08511d3c71046f277c23407526d325a8490cf2b51e84fba0d38cd4 SHA512 cae15995b8d8b66ef4209fe3cd8a14edcc2645b10dbb6f4da54e929a9347db675abcf9232841863c14a450789768247eda5929667021b5bada041365fbc1470d WHIRLPOOL b3134dbbed5a114e257e05d09ece4dfb36766a2f992d34f488612f2ebce51c8abb26ad64b4d4c7ae29c2e8ad8bac966977e6f0bfbed7372db97a43a1da07342c
+AUX ekeyd-1.1.4-gentoo.patch 6565 SHA256 ed663baf91af89db437150e04a1ec8dacfeb990c6c0659b632d8e895e2230f1d SHA512 f65a1cef8bd4e280a8dd8ce51f23661286ed3fd688d34943793eb326d417016a53312c6b344aab3465a8930c7de8cd10d6d572bd67f92cf8f65386f2f5ca1875 WHIRLPOOL 40e642b074031a538f2e2bba0a55a7d9c2ed83a22492c0cf1f3e4cb8fe2a360fd021ec0370264c81f611531748f1e1887a18df6665a1f8bff7938f56da9197e6
+AUX ekeyd-1.1.5-const_char_usage.patch 1094 SHA256 5cca2edeacb1ff188a47d73b7df8f63d15debca4f6fca61e2f7e1a95dcf9f69a SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5 WHIRLPOOL 1562ad67c31d4ea9903a67651d3dbfce49b848c7a5a4f5da6ef46f33527f6762dc58e579ff3e831852c484a091af1dd9d924355d7a628e740d3604b8fee57cc3
+AUX ekeyd-1.1.5-enoent.patch 863 SHA256 8055cffd030a97c9011b9f3aba9ee4558a93e2da919c25c8cd7d73c3a571423b SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50 WHIRLPOOL 270b12c836ce9231ce5bcc5331feb9261a541e251b553dd08cabc5dfe6ea0c9707724b4d42c631a36e51b1c626a2431565c175445cfd9446c4cbc41dd9fc55fe
+AUX ekeyd-1.1.5-misc.patch 1245 SHA256 9643e1e185447afaa713375dd4e5ff768223580c9fa917e61eb87ce5e00e560d SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04 WHIRLPOOL 6d5ac6e136814ec155c5a557bae12ff9b3c980049ee5e9c50ca2338bf74b6c3649b0a80c1d0f8667c8bfaed6fb873ee85872692d1e55e6b6fc7cb01c0028bc0a
+AUX ekeyd-1.1.5-path-fixes.patch 1918 SHA256 cea37f22aac5264eacecf640bd7199cc9b2adf116024ad8ecaf2dd3b926e823b SHA512 aba7b1cba96e678725fc8b47b56d815d59ce015ff6a4f72eaaf5fe8b7a99ddedf05ef3534a51772330209fb3cef235d76207103ee1e7a1f3315f4a52d2c0c2be WHIRLPOOL 23c101d3bf410c76d7bf09230f0564415c32fa44a1de92b64dc369dd0c3c495b3b76ab97bd8dd901056f4e15d87d48da866826e8c27b5de13db1efb481f1246d
+AUX ekeyd-1.1.5-remove-werror.patch 1205 SHA256 98cdb0271ed3f97f00120ff26e480ec0515662062f3059467ddf41b50bc57212 SHA512 2ea01bbe642bd52351e8ab9b7b62147c5bec7918305dc2c5be9291e3ae98fdd90f0e6e36c450e4db6220076a45a22cf870c81b3e23beed9170f262c857acecfd WHIRLPOOL 1a242838e5ddf710841313542d30e4111320d406139747d73d0ba770155fb87a6c151b01b87b7f8d9f4cb75a4cfa2d2e2386ac314a039c8852188712b16c0c63
+AUX ekeyd-1.1.5-udev-rule.patch 2325 SHA256 cc233ecb5ad894e5a8585028b4ed5679f1d99997393fd4acc1373b18f3ab78bd SHA512 05023ef85c454a9092cecf7f3826430caeda1e66ba5759ffe1e6f4c42f4da32048862dba6c6e19ab32febadc3a9f65cf5e1b8f0562a71fc854134b60df28a80c WHIRLPOOL 8f9ad5c55836e2370bb88a2721869f7212c8e652e6cbb6c1b424aa712fcdc69b3e6704ea27ec9547b2e5d451abe999009ba141ce455e96fcf075959b9b734ef0
+AUX ekeyd.init.2 699 SHA256 93084107879d8513e9ccfa825c01b95f86f397d5f452a33c5551faf3cf6d834e SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71 WHIRLPOOL 31954b74514877ebcf56e73e74007519b2a590066d82ef1edd5234e66957be1a9fefd66b5a908b6c8e3e7589672c936d500c1bdf87eb980042800a566fc4c767
+AUX ekeyd.service 117 SHA256 4b676db5443cf088256add409414e944da3ce9f00f9b7ca55a8d0fbfd1802d86 SHA512 3372ed067594cd7e1c0f02402ced141fe9e9c96e6df0dbfeae2ed707c837e48860450ec1971689245d62f79351c294c222456dcb489629095e7707a7026a878d WHIRLPOOL 67a93e965c938bcb0d816b4b2072357392166de546d292251da67739c66ace97e218e8aa29ff92c745cac6966b265037b85772f7233ed80f2b254cfb17305663
+DIST ekeyd-1.1.4.tar.gz 100911 SHA256 147ca4ff964ab7b344a08d3cd6f9b1bf03ba18776a1941d603681d8102cce0c8 SHA512 40632722827e07ebc643fa32af9910b28053873329772681dba2b029ad0b3c63d1d6bba3fdd0549b84e23779d2e2ae0323a53e1fdf93eb963570bab2227b63e6 WHIRLPOOL 1dc89c735befeeb8fb2d840d27ddcce0b8b15cffb8be0b9e6fa978f0c14bc9cef8345b8b1f4a3c6140031b1a01d92c26674e011acec3c6605ddf7b5c2e56d248
+DIST ekeyd_1.1.5.orig.tar.gz 101366 SHA256 4aa8abe4bd8bb4517be3f751a75ae270ac2855ba4ba465099a3f29a2c8602ec4 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a WHIRLPOOL bfa6cbea82bea8aeed7a86cc5cc0e8e95bd9ceba00d57f78a0bd5bcf6694d4c37db1a43ff01a92493d83a33b41c2a17ddac366c6d2281b848d5f239b4240ea39
+EBUILD ekeyd-1.1.4-r2.ebuild 5604 SHA256 fbdbb221c58dbff2f821702481ca4ac6a3105540e24a2c8a2e79c77b28c10531 SHA512 67f60f6aef075cbe8c8be460f953c66191b0e4e4c88c5b5ed98b2fce9d3cb79290eda3e79668a9b0bc3a02fffab47a4b62fbd9a4ff6c9bb8e0925917f3c12d9b WHIRLPOOL 3c83f5b7f32362415385ff25bbe8e7c1f4125f8ef8f947633048023758888b24e92f63e8ac23f1e5406a0b18c5ad40438a8c2073c0b3e531ea6104c476bfebcf
+EBUILD ekeyd-1.1.5.ebuild 4865 SHA256 2790597ca52fa8c0f4c19d6dcd00c8317465c2ea3b997d2fe2ff40634da03d94 SHA512 dd6e8b2913eb2628c70aa3d22687982fbbfad2c084a5407f693429c7bacb7c55f5d20f2ffb35df13fcd2f644b1a648c1985b2ec71bdca8c659f2fc5bda6dbce2 WHIRLPOOL 1c358605f0a33c826cac5f5d28c3bf8a1cf9ee6494fa575dea682811be63967180beb299edbbf6d794afb838bf2056cbe01f48a578583498f05dac3440bfef31
+MISC ChangeLog 3249 SHA256 4224ea2c3909ad8dd91fcd0079084b39cfaf27e86beecc8dd180f84ca8a1ec6a SHA512 2a5227fd992d948e88b3328d3eebc1561485ff4630148b55c9590fbb3553143ddd30ca9bb0fdb6440460424bb08aaac1287715b32b7561c6046b200c74e12e7d WHIRLPOOL afeb007631d25b3b923efe040b9a25039ebb0cb15062df80dba6b390227ecba71ea69af09b986d0dfe2af87539362e21a8308c27011ad10455f26ec6e62bd746
+MISC ChangeLog-2015 8657 SHA256 5ef046dadee3586af77b50473e25b9aa891035a3fcdff52c61a133d0571d4e22 SHA512 ef13f0aa8947076d394c5d7666f3eb536cb1c84be8fad47a0b2e2f596a194a2a7e46e2073bc892953e4709bd774ab4eccf30c28bc888da04074f5c7eae6db85d WHIRLPOOL d4e423df01bcc8d7e23c6cd057e79fac7653e77f28fd5d4e6e7c1cec2ec267cc4311a15913c279a94888ce7e4945163fb5d4fca95475efb6920d12de50e66a35
+MISC metadata.xml 904 SHA256 490111f22e49c1ce205398f642501a190c5bd0e5f2de1f400af9435ef46c3315 SHA512 506c932025deaba744e1a06b75821fa3f65b0770b94f5abdc76c4f1647fbb888e1217d1bcf6046d11cd49f12d53235b419e6935735e08d447ae886513cdc052e WHIRLPOOL 1c7e42a0e644263d83dddc2654aca4d89f09fa1054ec7fe1aeccc592de055ec67aab5904dc02410bafa59e61f006b1dfe5154ebf48905a941728b5584370f3e4
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.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..637b424b703d
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Entropy key daemon
+
+[Service]
+ExecStart=/usr/libexec/ekeyd 
+
+[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..e97586d5296e
--- /dev/null
+++ b/app-crypt/ekeyd/metadata.xml
@@ -0,0 +1,27 @@
+<?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/Manifest b/app-crypt/elettra/Manifest
new file mode 100644
index 000000000000..8d21dbb0b442
--- /dev/null
+++ b/app-crypt/elettra/Manifest
@@ -0,0 +1,5 @@
+DIST elettra-src-1.0.tar.gz 16102 SHA256 fb0c4e3f624c02a613e34abbf7bc03d8fc0d43b4967c2b51b202d7201d95e05b SHA512 341a83436d9c163391eabbc06600b29e8ee837bb805f2f9ea922ffa8d8dcb9ec53e50ae475e13e2810ac69419b86072cd7e6c44d13c80e43ee67071e6864d5b3 WHIRLPOOL a5aff8c548c71181686b8724c4b2080b3b42b151747573c89cbd82579e8ad5a527204ceb24f04c39fd6f53387702410b9e6edf59968d2f563e94c2f4ead09827
+EBUILD elettra-1.0.ebuild 762 SHA256 b3202340d7f867108f3f1e484fcfcecb7b075548d00a85c3059733c402d0c0f5 SHA512 9385fd622a55e2d0f6c2ff047c3eecf2a6718f536f06969c17811f8ea9003990e9aa23f1c7b0692ad8a5ebd4711896b7ccbd8c1a83c02ba728358d4a4936e939 WHIRLPOOL 62cf199c5f4dfc5368d544a1c76524723508ab5365254e74794749aa8f5b76b3b80d250f7437f40e5c1f6aa900b6e0c85fbe8cdfd0493a1c6a4deaeb8c1312e0
+MISC ChangeLog 2173 SHA256 82245a7616c40abbeb46e8fe13c14dcdb17711a6210dcdcd32e601a5f87ec4f9 SHA512 a4de3af0523e45607b853290a39cbd17f50c4af58a74546c82e64732a09a4ee604879c769b1d0c8a29c5315dd8580f194c7d8dd90270da29e71c1d2f6b60ce69 WHIRLPOOL 317a61527a205917d03bef3850831c041904658ee3b26c80c97b444ee888121e506e932e292113d1d8569c1266f961125190ce092826b934067740a857347558
+MISC ChangeLog-2015 566 SHA256 00663ce34b968e4040e09f77902270b31906552c13787ceea284651654f1a98a SHA512 98cc6010f13fce8cfdc60d73d95710356745c354e746110d41276c2c6e1cef19f6847eb5e872d5577c72b57fad3c533ded78139109d48770cd01b29560609558 WHIRLPOOL 258b3c973621212c27c390632e76153af0dce17c40919d280bf63693bbc5d968e10a353f5b0545e0bf4774838b14d2e1660e67748ec468c737b121914d18ae90
+MISC metadata.xml 215 SHA256 ec941e5a9b17fa2573265412968cbb8492b06a48563c5fd46e7d8d3a856d345b SHA512 49695b6fe6c6840d991013455f167da37a67fa9fd326f2241778caeab2b7ab38bbb36b2f383ca6736c465b65cce7338ebb90468ceb30bdf5b5989449bb2d2ebd WHIRLPOOL 8e4e516fcbea41dd0d5bab3cb9029ef9e25e7d4bbdb3f30fe55b2fea193600b116d470070b6787b66770caf66cc62f183dbc56e48b26968c758b6a6164c83eb9
diff --git a/app-crypt/elettra/elettra-1.0.ebuild b/app-crypt/elettra/elettra-1.0.ebuild
new file mode 100644
index 000000000000..e2c94db63b25
--- /dev/null
+++ b/app-crypt/elettra/elettra-1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-crypt/envchain/Manifest
new file mode 100644
index 000000000000..04e379d5921a
--- /dev/null
+++ b/app-crypt/envchain/Manifest
@@ -0,0 +1,4 @@
+DIST envchain-1.0.0.tar.gz 8252 SHA256 cd190c8c9a86ebf0723491b5372051e84eaaf3252ccc9da6554caa45bd5eae20 SHA512 0c7e129509fa60adbbedd995c30a11e981171b85dfce60385a0fd4a3d8264f1a2d65300f882e45075556490dfff0255eb6a6688066455809653b81e83d29c514 WHIRLPOOL 52ba2d9bcece8494bb5ae4fdaa8a29c722eea6f0911d157af5b6be3b9b78849b7635199385008af52fe3980541303f72cd086d0171415b0a8e6c32c797d4ac41
+EBUILD envchain-1.0.0.ebuild 476 SHA256 e183b48dc7c3fd3027e65215ea440cfe51020a3839f4c5462da31918887de249 SHA512 09f8a61e03ad2115a5db8005f4fbd90bb7599c51e6d8bcbda7baffe399116e36a89b07ee7176a13039ff67548a9ae5f51a19967701ef37dc0c7220e5d0f30e2a WHIRLPOOL 1f9d30b7f9b2e8acd91f7434b7c859e62eecb5d05fe4dbfc9d1e8b7b761dd79fc37b63eaee77e2c8f539e8b3d58fb8498578393b133add1f1fb04257b0a13782
+MISC ChangeLog 851 SHA256 1e9e0f67f069c3708316121651efbff7ecbeba3c6395fb9d6ce8dc84c3df3b14 SHA512 56ccac00fabc30b241da0a5696197a580f02a1c69a6c245bc8cfe3f6355329f9ae8d1c118aee876d21311401464879e9e5d352881a792e7f60ac811e19e69050 WHIRLPOOL aab095ef46fc216402b350ada30ca220121ba75adaeca7e3612b4d31186bceda47b6e512d36f65ddc2e93650915e774d6d04941249d4c708563190c05a847deb
+MISC metadata.xml 766 SHA256 c7cb9e218bf6d36fa7217000b9b57c73532d70c59b9a347cc1bf141c3dfe37a2 SHA512 d9896d24c0ba5a9b7750d907277946a3b592e9dafe4d162544a8f202ed6b01aa936159f5520d7eb79e01d169c2cde04db9e84d91164c2dffade31785f4102839 WHIRLPOOL 85e93d79d077d706d5bac771b109ccac2cffff358841221b76cf2e2f7a9d53217d6519128b496a242702e565bf5bb1e9f5d7858d95e56bb592b46fb1103719b0
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/Manifest b/app-crypt/etcd-ca/Manifest
new file mode 100644
index 000000000000..fd55380414c6
--- /dev/null
+++ b/app-crypt/etcd-ca/Manifest
@@ -0,0 +1,8 @@
+DIST etcd-ca-0_p20140903.zip 1178338 SHA256 5da9f7afad6dd373d96c5d36dd30e9f43cfc8fc2359bbf2d0c6a864fff139f81 SHA512 f421be2c835e7ed701f698d8a48cf25fe011ba3a831ff8fa3a80f5f074f6b70fed7f71d64c488cce5e12af8b8ae29685a1b19f8f2cd487954019d483d90f5e1c WHIRLPOOL 8f1db212877eb522818a96b45e21946e27fac716acfe924ea45c0b8f20b253905eccfeffa1fdf47c582f6cc8866da812462cd71e2ddc6c5abc969f71737cf749
+DIST etcd-ca-0_p20150423.tar.gz 55031 SHA256 53e5083db3bee32a991a118be0386bfeadafc3173a707941c3a12284a7f97abc SHA512 8c7ecb80e056da77997283ff2defb6df9a9acef250b0fac8e18c2bca71cccfedf6d782b7c9bf6491574d88ac5fa358f9bc5f540aa718a2470655d75f2f54fff4 WHIRLPOOL 3f7b5a77787f6ed6474fb01bfcf02d394616d609d8cb815086b730499eb7293c9125c09abfa4a10a2c6ca375176a82d75fb3fe304fc1f9f53385f9b552ebff12
+EBUILD etcd-ca-0_p20140903.ebuild 929 SHA256 09831b60be804063f3e0ecce9d5e81cad3df3930630bc4dfc6f3a59b5a5749ba SHA512 98a1776ec66eabf0ef6affb98d8b776f2daad41ff8720f250544244771e84527dbc98696d3e0a72ea65f6566b5bbc6fe3b5d025866637af3f1b10c1bc66c1454 WHIRLPOOL f4e2c7565902f41fdddd78df319899140d827aabcbd5bc7ee30eadde8a3988d5f77acb4086d60d90846dcc76613759fcae804072a6c21371982dc779b538d35d
+EBUILD etcd-ca-0_p20150423-r1.ebuild 937 SHA256 d08691b60e562b104faad3d3fce469094630e1aa75faba8053287de1d08e078a SHA512 ed1420735f5e2cbf8d1e7c046ddc0173106df26dd6582c966c85c896db89de314f69917cafad5745f9a823f4457b742a6ada32297371cd77b65e39167d0b9cc8 WHIRLPOOL ef4785770749b343c948e5028a1a9259cbfaf10b3ea594ca4d061f05acb054a8389f5aabb3b23838f746526b78f117d334eb8e3480bf93f3fe2c52b456463761
+EBUILD etcd-ca-0_p20150423.ebuild 935 SHA256 8f8b837ab55b099a4c507c5d6ded7ec02af117a564552d82bae1aee02e9122ec SHA512 604b68e2d014312880926d96c60ad2449c778212da665c8dbe7c80df8037a6a4ffe2f0a5f5907965d43bbaa50bdd52e1e23c60233091557db469fb16f692c494 WHIRLPOOL 4996eba8c086a18d3237fd4eca0fb1904ab95c9d615c289ce25e22fe72e327af449317e813aa6db36e0c617714d5f2bc22f1e48d67ba145f01c65260da458156
+MISC ChangeLog 2325 SHA256 a0e1fb1364162aba91e692a07d7758baf01d177794c12a6074b61f507e21a3ea SHA512 a865917585ac1ef560cf2a17454586537d257cb6cdb38c95d539f878786e694bb8da7c2f491c07355ffb6a59bbb78c8f1b1afed1ea1ca38a5b5071b9bf6d7336 WHIRLPOOL 85cae6f38735f6cf2d7e585446dbf8c3fad050bc9581e07b048f2ec6c5c465d8a67a145ed8d9077ed7937f6962c10b11b890c84c4a6fa9e05a68eb3678815212
+MISC ChangeLog-2015 781 SHA256 3873be82bb3d9f316912516d49fa93774ce564e4e440fef63f29c76fbc67d2e6 SHA512 0ec5543867f5ce4ef3758c6ea200989038305b81df54f6d0f1434281c8b22204dc8bdf5288745bcd351ca443ce1f02e3ee9a2968739b5d8bc94c6e65ebedd78d WHIRLPOOL c32e24e6499a903ac50b4ef57da125cca65d15ff92d325936269eb5a91634d5b86e372e0d23a7b0d39c4d71780fe81ab99e72cf3a7ab5087ff563cdd6ba06b83
+MISC metadata.xml 516 SHA256 1099fd9554be08b98bccd74e54e61372cf7552d1843e2a22efe58456e3a9a7af SHA512 9ff6311f1a9df79aacd48286034c31cbdfd7adad917b3e0206d457b2ea42524b7690e48e9dce982d7661407b3e8ea1237f7321f75048d9439ae89c0f759c159b WHIRLPOOL 8640d13a869fc40679cf5274e2f82c9be00b90a0c6e0a36abccb137176ed8da370a03eb32324d16436f03fd567d75d5bea3071c662869b3dcae49b3a74c4f3d4
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/Manifest b/app-crypt/fcrackzip/Manifest
new file mode 100644
index 000000000000..71ec17e6bde8
--- /dev/null
+++ b/app-crypt/fcrackzip/Manifest
@@ -0,0 +1,5 @@
+DIST fcrackzip-1.0.tar.gz 114786 SHA256 4a58c8cb98177514ba17ee30d28d4927918bf0bdc3c94d260adfee44d2d43850 SHA512 c18d45b5a4ec46411d455a0c10cb9faa7a1060a48936a820fff9b1f8af7f7158ac09da44d39673e4bdfaf0f370ee425e8df0a0dbe98a2a930049ecc2a1419048 WHIRLPOOL fa86ec55174bd04aebca3bb5cfc6b70482ed4b9fef4fd9f4fb80ecaf7a16b8bbd99bb39501e587dc9477999b5db695620dc0b365566eade8bf7756a943a2a623
+EBUILD fcrackzip-1.0.ebuild 510 SHA256 597b959b4b05ca1ccbedf5c74f6f6ff2924ac1ad885cd82e36ac74a1661cfe97 SHA512 1844a2dc97fc09eb389a185aee3b1b05e4a86503868d1b306363edd612a7f43478764e7caed933e7c4c8a55fe4c20fe13c6efba8578e94722e9561f119dc8afc WHIRLPOOL b9733eb6b965a07711a762cb797de6e48576c6cb4cb39a429c7fa6bc59b4aeb03fecc3c7ede20d68069b1e649e73749bee6e6c79ed589295af05e5eabddcfcca
+MISC ChangeLog 2727 SHA256 c00b5cf0a76042d92ffb4f6174ace56933da2f1068d0284b14f58a80c500375c SHA512 a8b7c1a9abd568603a4b1f8be07e967fe9eb233ab4215a8f6679de41c79c587f24729613ac71937f322a8e3041b71f937e559d8896708c18b963cc4cac0a6958 WHIRLPOOL 3fc082584a2fd14042a0b68c00098ab913ac1862978ea3e12f05d9543a455781e58d75062202ab189507c4cfeb314028645c2e1e26a37b52bbc2709aa86ded5a
+MISC ChangeLog-2015 369 SHA256 8dd926a87f1f774b4dca12923215b0d20af4f2fe4ee2d60f6a1117fca6c0f9e5 SHA512 f93a593214f9dd1a97541019324347ae34acc4951fdd766a35f2dd7ff81e160a51700fbdcf602f9b42d43b329861148ea8779458079f61ab242c3bc7dada5c6e WHIRLPOOL 2508e6e1fbe1b2bada519da4b9a2801885f8fdca6f725532ed4c286446e35a01545e06bc24d568cd514ee72c4b43a0255f68188a9d9b61b14dfc2a5e89469a1c
+MISC metadata.xml 244 SHA256 314cf9dff9677c9f4a13126b78ca5ac0400872718a20f20946ddfd29c743ca1c SHA512 369af9aeb291abf5f4ad1e75411ea1988671f116f7e44e8d5fc58fc2e2a8bde047783c23a71f2b2b5445b20873e5c38265714332dce289dec4e21d0b2cd76e44 WHIRLPOOL 62a911e5e49c39ba11352178b4d84d448cdfde0c7f51eaf4bf701458b7925267a4ab1a22b1ddd7616a9dd70974a859d5848ab6774c6994d7e9a8f6c52ad1cfec
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/Manifest b/app-crypt/gcr/Manifest
new file mode 100644
index 000000000000..6a3708bb33c6
--- /dev/null
+++ b/app-crypt/gcr/Manifest
@@ -0,0 +1,5 @@
+DIST gcr-3.20.0.tar.xz 1324216 SHA256 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7 WHIRLPOOL f9872c7c0f2480b868451775b5a7c63f7cba0d00702660417b738c6260706c8144bf73d36ddd0339b3acbfc010b4ceddef080a3dc1570de875b061e2053ba46f
+EBUILD gcr-3.20.0.ebuild 1862 SHA256 ee01fe7167201d6c6def0643e2f2949e759a54e8f65fb4894309964a19ebde36 SHA512 b66e96c94fa8a8d19f3c4fb26b5c3902a56baffd21fd883fb4971a88341ca2c62257db86679c3d2eaf054ea40ec284929adba5b174dc566471965e162d589713 WHIRLPOOL d1ed9c318bbe88335342f12b3a4c3f5740b399f23a65f9b5f7676568321ec54c436fabecdd9963926df607f3163aaeec5f1f88ddaf3a0cbcb44947ed68c3482c
+MISC ChangeLog 6905 SHA256 1bbb562085db923fe464f7a4804ba8e08073bb20c5e46f83f7dd34f2c59b68ee SHA512 647155bdef05a106218cd64911dee1592994c9f06e5203dc14987cba7f1eada11c7a5efcd6d983369a5fb18288556f22a2279c577a2c34eca662b60a4830777f WHIRLPOOL 9b5645daac029e22e208ba72c6410078d9d632a78610754e16a7b5223d23b0b8922bb506bb4320c2e90987bf3f0bc1a53828f4bcd38fb324d32e9929bfd36b31
+MISC ChangeLog-2015 7761 SHA256 ee08f4e34701a75188db4b766fc2cac926c786ae8606e83b2a3dd40faf2e45d3 SHA512 c3c262c149a64dd69391189ed59a4f8021c570b18d8e8b49e5b6d6c60e1fce723ac0c173b2dd0a210c877a446c41022f77cbeadabaa8aaad15deece69c8a6f3a WHIRLPOOL bfa2fd98ce20e97e97f462e1269f539c5b8aaa66c23f17d0a3cf19bacae0d3d45032f0972908337b6168badc20e9b09080aa89fe9d1197b4a97d1460a78d1b79
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
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/Manifest b/app-crypt/gentoo-keys/Manifest
new file mode 100644
index 000000000000..4394c7144229
--- /dev/null
+++ b/app-crypt/gentoo-keys/Manifest
@@ -0,0 +1,5 @@
+DIST gentoo-keys-201607021514.tar.xz 32324 SHA256 5c9b3f47c00967534368e4a4e6e9cafa8ceee7c1b7bddf1a619bdf08a1c6b3da SHA512 0d41270ce04a5ecccc059112bbf16aeaa083fa18c921e1fd0412fee1189863cb2fe416105fd0952d30151935651c1cfa24c650b9201a0e231563efb0a0c55f89 WHIRLPOOL 811f6dd86ddd077bde823c172695248c64f1231b6c65a7562f3bc55bc397bc2449f55cc59863fde9918e7264d0a4faa7f159493d74f1f30a13d581fa8d199f5b
+EBUILD gentoo-keys-201607021514.ebuild 607 SHA256 1f93b48182e4e113772b1fc47c9f23cb38f327113f3a9ad5c9c088b32946edfb SHA512 18e5b969c4859d36b1deb694486c400d09433739d95d43595e625ced45c12ab3005621b70425c06a92fb5a691f8686aa7faaaedcbb9da647d21db7053228713c WHIRLPOOL b18d2563980c03f83fe319a37307c6e20b62151186093a7d67ea13ece169b92f8b0372dd8cbb3d9e6bd5e3960736885df250af5182734d4a06ca6da90d8bf01d
+MISC ChangeLog 2698 SHA256 61d2762434ff2001546293a5395a427f0db7e2c81456cd81f28991fd790fbf25 SHA512 dc9d70e7334d245180ba6a059739c1c3948716a0656fa973bb8dcb37befb163be0081b067c8c944c4601ab76625009e0d4b7fa5f3928bd3520204a2b38a2638a WHIRLPOOL 1d82fc745484170984486f94787ec032e036e81263a9524292306b04873399aef289e4bdfe8247626affd4ebddeeea5ce82333ea26ab8729bf6a4c9c9d2e3daf
+MISC ChangeLog-2015 874 SHA256 f04ade72c200e76ada4a57ad8a5a4332982047c8d6a5b69e62afa172d279016d SHA512 4cbb28306182954294d0b94aa4abe2c503f3239d8b9bfe2318d2f9854643eb5d86a95e783a162f0c704e701bfaf5c128be4508dfa9b5c793f56e1a0cde5c88a0 WHIRLPOOL 64351f549aa264313f8a6f3c363d26814ede8d25c6c0e241269c5b441253e30490311656208e7c05136d890c27160284b0d0ff0c9b2252c31d18e4c1843469b9
+MISC metadata.xml 257 SHA256 c9e4a7ec0cf5e1bfe6ce98475f7859dfdc7a7618f5349f77fb3cf156b20c16aa SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c WHIRLPOOL cbfa473855550538c0928e9d652ac5c52443e2536498234c9a894eb3efe1a1daf708fdbb39b180858fea9d1a35c9ce0cbc9b82e9b6ac22094f3c3c87df7b0320
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201607021514.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201607021514.ebuild
new file mode 100644
index 000000000000..baf15238849b
--- /dev/null
+++ b/app-crypt/gentoo-keys/gentoo-keys-201607021514.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2014-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc64 ppc sparc x86 ~arm64 ~x86-fbsd ~amd64-fbsd ~m68k ~mips ~s390 ~sh"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare(){ true; }
+
+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/Manifest b/app-crypt/gifshuffle/Manifest
new file mode 100644
index 000000000000..9a35736ca47a
--- /dev/null
+++ b/app-crypt/gifshuffle/Manifest
@@ -0,0 +1,5 @@
+DIST gifshuffle.tar.gz 21509 SHA256 5341ccbe850cb687213fa664ba3a791f5b304278fad8a9b09df172c53a829342 SHA512 0a0521f924c508c80c11309203e64cbd948945ddd557f01008a39987602320be780c1710dfcaa8ec9886fff4e9745465f2f242919ede4cedb2af9f73e5cc54be WHIRLPOOL 8e6dbfd50013a8bcfb72d2d71567e4d1ea918f3ed500fe1ca2aa6ce79312b686e00c0b95300a22629282a5b21382b173ab817d4bfea88d567180324e459cc82b
+EBUILD gifshuffle-2.0-r1.ebuild 607 SHA256 ce0c2a389fcaaea87fd1930ba17791f4786cdd117f3a83335a46ee8852f88989 SHA512 c177eb84a8386c33163d9d47b1952c86b1a9963dd4c8c347d2fc4df24408fd26254270331df80873a0f5af145fc6012e75feddeec0d98d21d3068a86424938da WHIRLPOOL 5f0df42b866f166e62adab3180f7466305bb90121f2bf2d5b6041bed1898a35bfc3ea2f9ccf010bdecf527436682fc701b16095f63fba64aa1cd211320e7ede8
+MISC ChangeLog 2528 SHA256 6bb93287f25b34daa060aeac7be70b749d7aa0a0936398f18b28712ce28c4089 SHA512 07215c52425b341db5c877393e10cc503341d26ff496d4ffeda9a57694c58b328e99a212da50dc054976db44f894ad302f9a2f753403382e2f953329e953e952 WHIRLPOOL bcbe6067de5e0165a6aa5dbf393eaed89af82ecf0d00db821c100a04d360f6855f22b043acd7231e313046035f216012edb50c39352b42817f206e83fec47473
+MISC ChangeLog-2015 536 SHA256 24c45166fa4ec1a19436de434551d770039ca58993e0c5997c16c3c2e1596461 SHA512 8cac1ff340c6bf685eb2a87c2592155fdcb84ed72026a5a65976b2133af87913582f7d80e4baba7b539a64c8da5e99aa7ffb37977143fe20d34457083f596229 WHIRLPOOL cea6505341189cf14e56a65cc08edbe5729c9781461f33e93ca21404c9f746817e02b2b283e469074934e89ffe1121e7ea9a198736645257a27465e5b5f35786
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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-gen/Manifest b/app-crypt/gkeys-gen/Manifest
new file mode 100644
index 000000000000..1b6ec8b8368d
--- /dev/null
+++ b/app-crypt/gkeys-gen/Manifest
@@ -0,0 +1,6 @@
+DIST gkeys-gen-0.2.tar.bz2 19160 SHA256 7e5c77a48d735014ba8f0ec70b85dfdd555dedacebfeb25b08c28c6018bce60a SHA512 ca46d8cc32f80ac98dfafc0b6ab3e543dc0cb4ee6db2938917d4c6f4fada980996e1ddd48f3ffe563893b973b5763e7016a66f67d4a2f8eb57ee227b1e71a1c2 WHIRLPOOL c7025f3697556cbe40b3ff18eac8ce608409e82388ef37e82da181fc15cd2c29713e6b823b1822e22b1273012fd0edea976196a7290853a8d9bcd68bfe41820d
+EBUILD gkeys-gen-0.2.ebuild 1079 SHA256 d620fd8abdadf2cee55b21451073d58000fe9c3fc77b5573938d93962f8689b5 SHA512 6d54c3cd59f2e6611560618a4c882f0f3ef8b0089ab177a333ebb3489b3232a673d9b5a71409c1e2812b7fb88dcb3ae7f5d5d994be867938402be326f000c3cc WHIRLPOOL 01a11eaf64d1522ce55f0c0050a9c446a59161b4deb844db8e5f123f35044867a46128739bd0eebe5db6f9014f06a313ca80a6f7533097c9aae993351a81f066
+EBUILD gkeys-gen-9999.ebuild 1463 SHA256 4c8d86c4e56ef31e056bceb3afd525af5e2245a7c361d97706686d80f0d65bb0 SHA512 346dd2dff96e942a89ba549509465ace606421a427593075500f02cc3cf98b158cc1148dd6d919432c9a52931f910f82799f0c8b51cd23a22d9ee450e07ae6cb WHIRLPOOL fcbac6effb97089bdd8591579868d0bb199fcb44978433f894c2f0db72c7c4f08e15c8e8f6374ce4bec0564f56f7b2e99364219688774b3d34235d545d2f650b
+MISC ChangeLog 2931 SHA256 82e310ef99c4f4cf0ff7984cc9fe557322597734211b1e5b70fd2fabfa1fe64f SHA512 3cc643dfc4210ab2ef2c478cc9a27b23ec21bd1126ec7660e1406fd520e533e4de625436cc0ee02fc4c031cae6ed02cce2f233359d254d06bde088245c76029a WHIRLPOOL 7ee6b55ba77c2765f8479e776019a2d36993fd643f23865356ccec2e90fd000ef38764007c501b3a3f5b1183bfc8eba9852c86e7b5fbfe9ba55847b7d65f6792
+MISC ChangeLog-2015 1399 SHA256 b0fb98ff0351395aff14ecaee2c14498c414eb218ee4a661d5b17274b1c257d0 SHA512 94c469aa8f6a6813e2c1066d8451c80e3fde29a51748bfdf641781eebdf28589dcb53053c3027c7f9f30667bd5e138d8b59e7f7d0ebd4a763deb2fc6a5fa53eb WHIRLPOOL 98f849a3424724cc1fa573f04bd170f262b8f7b4903f61fceb60ef858e3d062f8d20b71a6c676c6f5d856498a8cb632f702ea22e75ed098f030b156b824d0c3e
+MISC metadata.xml 257 SHA256 c9e4a7ec0cf5e1bfe6ce98475f7859dfdc7a7618f5349f77fb3cf156b20c16aa SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c WHIRLPOOL cbfa473855550538c0928e9d652ac5c52443e2536498234c9a894eb3efe1a1daf708fdbb39b180858fea9d1a35c9ce0cbc9b82e9b6ac22094f3c3c87df7b0320
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..45d72bc86f2b
--- /dev/null
+++ b/app-crypt/gkeys/Manifest
@@ -0,0 +1,6 @@
+DIST gkeys-0.2.tar.bz2 47726 SHA256 5e890992e5992ab168b34d9a731b75b2638ab35cf466b1c7615725a3b19646cc SHA512 0c594b5f451329e5e85998bb96243812e0c6e7ef7fa4db0f276a870148adffcf41acc31631fb28c44c473690f154e130ddcb10b986d4546ca19e2cc8cda95036 WHIRLPOOL 458c38e97cd3dccf3eec834bc0e7ead5a2b83e148999b087940dd66accf178bb2ee1c4daceecdcf8f79469fc69c1313cdbbe00f1ddb9defb0b676ce1c794e0ac
+EBUILD gkeys-0.2.ebuild 1695 SHA256 d20137c7cb056a52529aa45a84e39efd18f650e8239ff68bfc9749cbc44ad643 SHA512 5d5f50b3b660fa70a73df0c31c290280d7995bc6474a0cfaa48fba0778e4f5b00a29bcae8af3a267e04b08e0e93cf500e940a6ad3b64179a3f4415fe392f6496 WHIRLPOOL c584a7bd5f89561dfabd35b267bebce1ab488b2d1bbedc4f87d5446ec5a9590bee2d9d3dac28b6a1ee400cd41dc4e84b817c7922ce90fb135b15463ff3ffd230
+EBUILD gkeys-9999.ebuild 1610 SHA256 dac000dc0f6915afc26841b56032cd1c4bc01a9a524acec774334448194662f8 SHA512 2b5dbde064a50f4b507c5458f8b63f1c00d24a80d88209ef87dfa52ece79a41ab8f5225bfe88cfe5898069d8e1a3a62236888381e02fce298935ac209bdfd322 WHIRLPOOL f8860d6005ab6ddb3236cc3854b433f4aaa3920683b142a93931ed18fa1971c89b0de35780af34677142e00b73f5f99a3e3298aa173b1e5abd3a5f7be9019512
+MISC ChangeLog 2970 SHA256 bce5abd800923a02dac58e863b60bcd625ded1a34179b40f2345038e467268f9 SHA512 fcec9a7fc7be689c65c21563e3b734f8f3ec308da67992e4ee500ca6062555c3a690e20f36fd15961bc7e40510615edb2a9c8121c9725a48840c87a1c9d7b300 WHIRLPOOL dcdf58fbed78bc36250015b700f5ec6d1b12abb6d6392ebd8a3c4771b3a84d1c06dde93af0c1b8a59a76dbd8535d11972d3e3cd2122593469eb06eec3f95ec4c
+MISC ChangeLog-2015 1484 SHA256 211138d810a1acc3a47d9cbca1d41ceb3af51f578b6f55ca6b0ea81af4ce3a2f SHA512 e2e5a6494592d6ad0bee2d3063631f2f59a872d264a27cc69dfbea9c248d4251059dec4caefd05b2cb4f70d75ebb5e7cf0dbcbb1b56639a1242a862682e2ba0d WHIRLPOOL c8aea1bf4853322c39d7e6cf6209345dff661fce145ca4ce478e767645e2985ce5e6524820e8c8215f4ee4148cc5beea7160a46b8f9eed0f1ee354cf1b5b5c44
+MISC metadata.xml 257 SHA256 c9e4a7ec0cf5e1bfe6ce98475f7859dfdc7a7618f5349f77fb3cf156b20c16aa SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c WHIRLPOOL cbfa473855550538c0928e9d652ac5c52443e2536498234c9a894eb3efe1a1daf708fdbb39b180858fea9d1a35c9ce0cbc9b82e9b6ac22094f3c3c87df7b0320
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..e79d59e06bc8
--- /dev/null
+++ b/app-crypt/gkeys/gkeys-9999.ebuild
@@ -0,0 +1,66 @@
+# 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_PROJECT="gentoo-keys.git"
+EGIT_BRANCH="master"
+
+inherit distutils-r1 git-r3
+
+EGIT_REPO_URI="git://anongit.gentoo.org/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/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
new file mode 100644
index 000000000000..39bc58eb1855
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -0,0 +1,7 @@
+AUX gnupg-pkcs11-scd-proxy.confd 38 SHA256 a9a3a6e8e521d381931284fd96ef13cf428725161fa7e16b30f88a35d59c47ec SHA512 15a4e6534e5069a9f02050e0d7dc5a27609065fafa789985a2ab448033811c9099fbc00ded558b98797b6191c5ced94cbd1bda626a1dab85cde747a856ed1ecf WHIRLPOOL b598c0931171903b7eb293c935ba727902f19f69cbfe6876ee872481534f74cc9247329374d90f748926b8d1f907811e911ef6bda48e6d465e057fbaeffcf75d
+AUX gnupg-pkcs11-scd-proxy.initd 716 SHA256 8684fd85795eab28ba62d11f563cbd76a1bd2ee944f5c65a7aeee05511b19893 SHA512 b1719720150d7380c96e987bfa0f7932bdd30aa9462f9c11d9ac06ed58efbb0ef8c60df27b50dceed812a238ee01007abccd99edf7dbea0efcf0de2d35d032bf WHIRLPOOL c0406656d9b334d16659344e7136962cc625c5de8205e00c79546b38b846d7f789f520dd48141c7fbb8f1194e094c560cd9e8f972da9e3269167c9dc7279ace0
+DIST gnupg-pkcs11-scd-0.9.1.tar.bz2 145814 SHA256 abd3d13eb889c3793da319ddedd0f9b688572abb51b050d8284d1b44dfca94a9 SHA512 66ac4b2d4ed2106bb0bfe40bac00cdffc36f7f10ace15a232ba475d1a152439fca2bde3f7a6eaaae8b9f17fb3e6371207f2e689d3d9557817ef54984858a3489 WHIRLPOOL e38715ae2db915e833d5c7c9aba4dad8d62474d9aa6ced6e4e21a386398da16be91fdc4adaae5c0f9feb50952ede1ec4be922d56e68e3ef3c8452ac3c176042b
+EBUILD gnupg-pkcs11-scd-0.9.1.ebuild 1098 SHA256 49f06118af85e14f7b462743ac42856daa83c72b4a43393c168e91276ab784cb SHA512 85b6db37a0d6b04a5cc2c0ec2a3d638f616e4230d337905dd740e05132076cdf8c86d5d2165c0a3d610163d55d3fdf37cfe109506fa060a4efe6f5ccd026ee2f WHIRLPOOL 46dd286c62fbc2e1e6209ee6f99a67af5be25f37ced63f5d61ba24a32835b2bf28c340ed5eb6b7e31116bf3a150565eccc2662449b2ba0ebf24a96b5055209ca
+MISC ChangeLog 2602 SHA256 b02c2b13717b2c1f01e3e8ae9df82ba5412cfc48d74f477b74100dbea23da302 SHA512 668e6d4ef91214a3b24aa221e03c7d5d0de536ab7251f96dc411e5550c5d47855af7dd8c6f31d614cdcb7d10f82ba8ce5d0cfa24d211d8d3d57a090b8163e440 WHIRLPOOL 9c4317eacc74ba741960d56defaeb95d5977a8874aaed8fbb343c9f9aa453214a31dd5b9b08318f489099fb862131882b3d6d3806fa773d55968101fbe18f1e6
+MISC ChangeLog-2015 2809 SHA256 6d2953fc892ed3fbab04cf224d51fa6e8362cc11504c6010e1da1a771ae6d0f4 SHA512 eb1ff00f24a2a0ae6ab7e8c1ab94b8fb4d5499f6d27e3e4f351cc56451414c355f48c825dd1ded40d99a2762bc5e3bcb2117dd60dfe75e17628ebc5983b35f6c WHIRLPOOL 94f960389c5323f01bcc6d4f9d7f6c31e73038a05ba69d326dbdd38c5046dcb69612bc0de30e8c839039ca7092a2762f14f40068cfd4671918f71ce142dce330
+MISC metadata.xml 563 SHA256 94e00cdcff17b2846255d1bfe80f77316bcf2e80c16aa56aa0e324d9e66db135 SHA512 6ba21eb5bd095961e91f699864f08d07ef78207d656ea6f89a3b7c49d0b2a6aedfe1b912315b9730c3f2615428ec4bedb0f03599c5a76739b8bfd51735ab8c20 WHIRLPOOL 55b6030f307be454106fd0a2c72909e073f88903639795b633ab5471287694b331a2fc5d4805ed7eebacd527f047459a72bcbf281b51e2b568b3b41b6274cb72
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..5d74585ffe30
--- /dev/null
+++ b/app-crypt/gnupg/Manifest
@@ -0,0 +1,17 @@
+AUX gnupg-2.1.20-gpg-Fix-typo.patch 843 SHA256 bd465cb0a40e83825b5e95ba0d9886be433e1b3dc85e78558c8abf103801ba59 SHA512 eb451eedb3e0282f3b7d10d0b12753a55b6bd92b2cdfc1dce5a9ffe1f0015cc598193193a8c8292371fb285517016d69ec70b7820f9dc0047e33b2e3f16214ed WHIRLPOOL 507a2206694a77dab35482e4701be13a062f7f983f80e3b632a10939d3229f756014f7d9f0b85b2214bf44e0d6ded16580bf4c4946682c5eeaa1c13731f2c29b
+AUX gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch 2987 SHA256 55e997ebfb0cb49e8ad5b10fdbbb742986a6ee51f41f8a42334fdb30cec49de9 SHA512 2cf3147638c69f49b4d792a01321b5892f882fc67a1aee8f51f9b35761e6961e9c46d9abc92b0e5250a85b7145e69ba9583b3ce2323943587feb52a029e95deb WHIRLPOOL 06a9fb5a569fe8adfde5168f5f4c604ba4b80351870c3a595b8711ef5a1ecc3076a1ac5f297e593a3e35aac27565dd2d092a8c9729c6f3ce9b98f2fc507d975d
+AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 SHA256 cc24f9fdccbeab4d7101b982e39d6df69e4d7da677bd580c0cc8447d23421eec SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce WHIRLPOOL 7fae3a8805b279b5120a975728cc34bc026a3e1f83aaaa7b9b410f62daf2681bb05a3daf5ca4f7b1d28c85d91d5ab4209203eb95da7a48062efa2120d1af78d8
+AUX gnupg-2.2.1-fix-gnupg-wait.patch 2881 SHA256 c831b1eb578e60defb0a8a71def67b450b17f9f4cb614798c9ae2d062c681c04 SHA512 3622c1667c3f0b0acb28fd3ac440af76c0f2757e1d654fbd85344a1193a088db087861f7410e249ece5c99fd7afd7d7a24c43f58e88f5c21949195714be4cbf6 WHIRLPOOL 77825329ed39e583dc7084a8213f67b5adaba2e6e24bcc5d9d13e095821fef3505cf61c67cc89d8c0f5ba04f7d976b976d24b607f8b17201a02cffcc136fed87
+DIST gnupg-1.4.21.tar.bz2 3689305 SHA256 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984 WHIRLPOOL eb596be347dd90be93d381fe405e50f5808160b546705493bc9d817d521ea236a2374648e6c2cab396f54bba74de4caf2b92e894df3a17aa339f014ef8cc8802
+DIST gnupg-2.1.15.tar.bz2 5723689 SHA256 c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 WHIRLPOOL 4c5a8cd4e8b7196f4a355ce7739cf6e23c43817414e10bbba219117e4e51c4c618ffb5dbce27cb836a2171eda58e003d5ddf78d4af09a813c2a1729963413151
+DIST gnupg-2.1.20.tar.bz2 6456128 SHA256 24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d SHA512 14a9890bc64e143f87cff121dd298d490d78dbd34e36883e0f25763ff9064e5706a7632893d7c5d0e8e9b8cf9cdb0d378b4ce1715348729f0fc080455b61eca9 WHIRLPOOL fa6cbd66031cac41db308b10bebec87e37a19d3c63219d22fb874d7d016bcad057b93eeece7a64001718ee1f881199e3d3eebc8ef6625691f553b0d2dbc92624
+DIST gnupg-2.2.0.tar.bz2 6532475 SHA256 d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6 SHA512 8ab7c4183d2ec2e6b62066e3cbcba95babaa0ae22da47feab716698792d26495f072d50e8ec612b8d26147636bb316320c78940184373b3f4cb6ec411933361b WHIRLPOOL c918b6a7e40ff170e1ff3b77978cb7f0d9298a3410204677955dc167b114a1f85d32deaca4f006c2bd621f532379ca9631b96913bf660394a82ab4ee0bbbaecb
+DIST gnupg-2.2.1.tar.bz2 6537959 SHA256 34d70cd65b9c95f3f2f90a9f5c1e0b6a0fe039a8d685e2d66d69c33d1cbf62fb SHA512 fcda7ea360d9928bf9e410afe3806ee0692dd533443b0c0e050605a9e2e37ec16f3c60a30b30ab137155327bc1f5d2107f1e792582e3ad245b47bf39a1a61a8f WHIRLPOOL 032d26c79aebcda3529f7cfcdec467e1058d19fa939eae48fd086e7c9f585a7b02dc9e6fb04a342fab845b9eb0d51c3bc2cca4a4d9677683a23bdd5c479b4eba
+EBUILD gnupg-1.4.21.ebuild 3345 SHA256 6b441756eae4e86f212092330acea93ef31e82be0903df125e3060746726eecb SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257 WHIRLPOOL afc261211aa9a4620501359bc7622e61916db6144d70dd3d5e48fe471952c4b865b1fe7911c64bdcdb848120b5620ad445f24aa36b452a02aaafcf21abde998d
+EBUILD gnupg-2.1.15.ebuild 4570 SHA256 8a8a2a347184293403d78eb604f2c520ac716e162cb8acfc21795952abe9b07f SHA512 385f5c40a42559e3b686d16dedc2ca442dd0a075514184e67eef97624cc419bd0bfc7f7ca6fdd3dc549cb4e3beafce656b725adcf201d27b151dab6456346875 WHIRLPOOL be781ec9278f2b9284e139dccbaa986a2c2860f74bd3933a6ce5e325b4ac6cd7b0301c31331955e308d71c754c2a00922a8a2ea8db7178ed73e9135a8d3293a8
+EBUILD gnupg-2.1.20-r1.ebuild 3102 SHA256 1e8c8bdee0c90d9ea51b3ed3e940a4f4e7e67c823816961ca75e02e8b726dc03 SHA512 68eafca6339bab0f118c5ff9119a984ee2b7432942929d429a430c053da568ed7729d13a507d073bebc8a273e74eb40f66585ef84cc9b83181f2ea5d6990d615 WHIRLPOOL 99ee773c6aec668d1e4ebbb9ef65792e26f01088d54443dff0578de61ca9d665ba30e96be80cd7e447abb9fed56f3061aff7c224941de90f31ee2134995a8adc
+EBUILD gnupg-2.2.0.ebuild 3124 SHA256 7605f5d6f19bf50ef51ba29412ac7d2be64bf7412678312f835557ae52ed6bab SHA512 3891728ab252676b298b4f5dd5791856b688f61baaf1f86be387195177331f5a296dad965e248595c1ccf150d15c74e3e8ac30ae74e205a1f45f2a32753ee09f WHIRLPOOL b2002be1e997cdfb3f264385795d5a03a0964cdb28293b7e5de511c97cd9bf6cae7d9b80edced641b99972323adb2b1bfd2fc8eeb4148c5e5bfbf83990f73284
+EBUILD gnupg-2.2.1.ebuild 3224 SHA256 8087d59a0748422d7888180f3e7b4692285cebb9ce7a8ac802bf563558ef9e9d SHA512 ebe3107c7444f4f821760d854da5376a9953b7e6781673cc55b3704ce9accf5306277140648a047f9fe705c7e5ef7922e45c0fceb8508d80edd63b6dab08b579 WHIRLPOOL 1c9745178e0276a11bf73d31705318c40e6a0c2c9191cee90df14fc0e02856f0eb534ef036b6ee3815dc4eb574f31e12cb5b433424b9362e4d1513c7dde55699
+MISC ChangeLog 17653 SHA256 0f85d5aa5e23837a910ad2d14a05a1a3cd8a3bc9f59d4e0fcbc1b6cf30d8f166 SHA512 8e8d0cac1c1c9662d9754e1ee04399bffbd41eaec93d361bb01ac753d9907c60d56f184eb5e265f4817afe681f090b4d796274a2bb33988764e036fdb71dd2f1 WHIRLPOOL 960f2283993b2d007df253abd5a5b0eb0d1441df64262825785793cfd756f6d314c3186948fddfc946ed801e64834ac4909ab9654ceb8e2c45d9df3543ea6812
+MISC ChangeLog-2015 89046 SHA256 295a825284cc7d9b7148c77733782937402db7e07fd7fbf0a9f44861d2018ce7 SHA512 9920db843f9cc1863f3529ac2022f591de8f0b930f82b64ca2859d542af679de3dcc733e5b55b8de060df9bf01ce68cd1828d0c179b1f9f05093cd6566efddc6 WHIRLPOOL d21dbe313d4c1b0e50012e0cc05560d13b712875514dbbea2f56be40ce85c99db8a7693a0f4492dd631119d37cbc796546fe5b62f5d6a6baf598d0a94c0ac0a3
+MISC metadata.xml 1198 SHA256 6077905daacd534deb51d99622a7c18e7db3de5cb2f12d7eb0aef5cbf7557afe SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069 WHIRLPOOL 2283e4db26f6a39ccac72c73f7efd9b7013c6b55a92937d8fb464178d8b0c7afafa749900d4a58fa4f339887bafa0118e9996b15a9e1fdd1e68d228828be6895
diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch
new file mode 100644
index 000000000000..292fc264ac84
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch
@@ -0,0 +1,27 @@
+From 692208fd6c1547cc7dd2062a1d1c9499bc0a8be4 Mon Sep 17 00:00:00 2001
+From: Justus Winter <justus@g10code.com>
+Date: Mon, 8 May 2017 13:52:39 +0200
+Subject: [PATCH] gpg: Fix typo.
+
+--
+Signed-off-by: Justus Winter <justus@g10code.com>
+---
+ g10/packet.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/g10/packet.h b/g10/packet.h
+index a10495c..d42510d 100644
+--- a/g10/packet.h
++++ b/g10/packet.h
+@@ -623,7 +623,7 @@ struct parse_packet_ctx_s
+   iobuf_t inp;       /* The input stream with the packets.  */
+   struct packet_struct last_pkt; /* The last parsed packet.  */
+   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
+-  int skip_meta;     /* Skip right trust packets.  */
++  int skip_meta;     /* Skip ring trust packets.  */
+ };
+ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
+ 
+-- 
+2.10.2
+
diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch
new file mode 100644
index 000000000000..58568db47d2a
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch
@@ -0,0 +1,86 @@
+From 22739433e98be80e46fe7d01d52a9627c1aebaae Mon Sep 17 00:00:00 2001
+From: Justus Winter <justus@g10code.com>
+Date: Mon, 8 May 2017 14:24:00 +0200
+Subject: [PATCH] gpg: Properly account for ring trust packets.
+
+* g10/keyring.c (keyring_get_keyblock): Use the parser's packet count
+instead of counting ourself.
+* g10/packet.h (struct parse_packet_ctx_s): New field
+'n_parsed_packets'.
+(init_parse_packet): Initialize new field.
+* g10/parse-packet.c (parse): Count packets.
+--
+
+The 'keyring' keystore depends on the number of packets for delete and
+update operations.  With the rework of the ring trust packets, the
+trust packets were no longer properly accounted for leading to keyring
+corruptions.
+
+The 'keybox' store was not affected.
+
+GnuPG-bug-id: 3123
+GnuPG-bug-id: 3135
+GnuPG-bug-id: 3144
+Fixes-commit: a8895c99a7d0750132477d80cd66caaf3a709113
+Signed-off-by: Justus Winter <justus@g10code.com>
+---
+ g10/keyring.c      | 4 ++--
+ g10/packet.h       | 2 ++
+ g10/parse-packet.c | 3 +++
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/g10/keyring.c b/g10/keyring.c
+index e223f0f..50f1b82 100644
+--- a/g10/keyring.c
++++ b/g10/keyring.c
+@@ -409,11 +409,11 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
+     pkt = xmalloc (sizeof *pkt);
+     init_packet (pkt);
+     init_parse_packet (&parsectx, a);
+-    hd->found.n_packets = 0;;
++    hd->found.n_packets = 0;
+     lastnode = NULL;
+     save_mode = set_packet_list_mode(0);
+     while ((rc=parse_packet (&parsectx, pkt)) != -1) {
+-        hd->found.n_packets++;
++        hd->found.n_packets = parsectx.n_parsed_packets;
+         if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET) {
+ 	    free_packet (pkt, &parsectx);
+ 	    init_packet (pkt);
+diff --git a/g10/packet.h b/g10/packet.h
+index d42510d..cf2121c 100644
+--- a/g10/packet.h
++++ b/g10/packet.h
+@@ -624,6 +624,7 @@ struct parse_packet_ctx_s
+   struct packet_struct last_pkt; /* The last parsed packet.  */
+   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
+   int skip_meta;     /* Skip ring trust packets.  */
++  unsigned int n_parsed_packets;	/* Number of parsed packets.  */
+ };
+ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
+ 
+@@ -633,6 +634,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
+     (a)->last_pkt.pkt.generic= NULL;\
+     (a)->free_last_pkt = 0;         \
+     (a)->skip_meta = 0;             \
++    (a)->n_parsed_packets = 0;      \
+   } while (0)
+ 
+ #define deinit_parse_packet(a) do { \
+diff --git a/g10/parse-packet.c b/g10/parse-packet.c
+index fa44f83..dbb7af8 100644
+--- a/g10/parse-packet.c
++++ b/g10/parse-packet.c
+@@ -764,6 +764,9 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
+                 partial? (new_ctb ? " partial" : " indeterminate") :"",
+                 new_ctb? " new-ctb":"");
+ 
++  /* Count it.  */
++  ctx->n_parsed_packets++;
++
+   pkt->pkttype = pkttype;
+   rc = GPG_ERR_UNKNOWN_PACKET;	/* default error */
+   switch (pkttype)
+-- 
+2.10.2
+
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/files/gnupg-2.2.1-fix-gnupg-wait.patch b/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch
new file mode 100644
index 000000000000..6a2c18e9b63f
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch
@@ -0,0 +1,85 @@
+From eeb3da6eb717ed6a1a1069a7611eb37503e8672d Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Tue, 19 Sep 2017 12:28:43 +0900
+Subject: [PATCH 2/3] common: Fix gnupg_wait_processes.
+
+* common/exechelp-posix.c (gnupg_wait_processes): Loop for r_exitcodes
+even if we already see an error.
+
+--
+
+The value stored by waitpid for exit code is encoded;  It requires
+decoded by WEXITSTATUS macro, regardless of an error.
+
+For example, when one of processes is already exited and another is
+still running, it resulted wrong value of in r_exitcodes[n].
+
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ common/exechelp-posix.c | 50 +++++++++++++++++++++++++------------------------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+
+diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
+index 7237993a2..3acf74ad6 100644
+--- a/common/exechelp-posix.c
++++ b/common/exechelp-posix.c
+@@ -784,30 +784,32 @@ gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
+         }
+     }
+ 
+-  if (ec == 0)
+-    for (i = 0; i < count; i++)
+-      {
+-        if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]) == 127)
+-          {
+-            log_error (_("error running '%s': probably not installed\n"),
+-                       pgmnames[i]);
+-            ec = GPG_ERR_CONFIGURATION;
+-          }
+-        else if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]))
+-          {
+-            if (dummy)
+-              log_error (_("error running '%s': exit status %d\n"),
+-                         pgmnames[i], WEXITSTATUS (r_exitcodes[i]));
+-            else
+-              r_exitcodes[i] = WEXITSTATUS (r_exitcodes[i]);
+-            ec = GPG_ERR_GENERAL;
+-          }
+-        else if (!WIFEXITED (r_exitcodes[i]))
+-          {
+-            log_error (_("error running '%s': terminated\n"), pgmnames[i]);
+-            ec = GPG_ERR_GENERAL;
+-          }
+-      }
++  for (i = 0; i < count; i++)
++    {
++      if (r_exitcodes[i] == -1)
++        continue;
++
++      if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]) == 127)
++        {
++          log_error (_("error running '%s': probably not installed\n"),
++                     pgmnames[i]);
++          ec = GPG_ERR_CONFIGURATION;
++        }
++      else if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]))
++        {
++          if (dummy)
++            log_error (_("error running '%s': exit status %d\n"),
++                       pgmnames[i], WEXITSTATUS (r_exitcodes[i]));
++          else
++            r_exitcodes[i] = WEXITSTATUS (r_exitcodes[i]);
++          ec = GPG_ERR_GENERAL;
++        }
++      else if (!WIFEXITED (r_exitcodes[i]))
++        {
++          log_error (_("error running '%s': terminated\n"), pgmnames[i]);
++          ec = GPG_ERR_GENERAL;
++        }
++    }
+ 
+   xfree (dummy);
+   return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec);
+-- 
+2.13.5
+
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.1.15.ebuild b/app-crypt/gnupg/gnupg-2.1.15.ebuild
new file mode 100644
index 000000000000..2e4b59ef30a0
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.1.15.ebuild
@@ -0,0 +1,157 @@
+# 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
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+MY_P="${P/_/-}"
+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 ~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 +gnutls ldap nls readline selinux smartcard tofu tools usb"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.4.3
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.24
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	gnutls? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+		   !app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch_user
+}
+
+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 \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--without-adns \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable gnutls) \
+		$(use_with ldap) \
+		$(use_enable nls) \
+		$(use_with readline) \
+		$(use_enable tofu) \
+		$(use_enable tools wks-tools) \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd doc
+		emake html
+	fi
+}
+
+src_install() {
+	default
+
+	use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+	# The help*txt files are read from the datadir by GnuPG directly.
+	# They do not work if compressed or moved!
+	#rm "${ED}"/usr/share/gnupg/help* || die
+
+	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+	dosym gpg2 /usr/bin/gpg
+	dosym gpgv2 /usr/bin/gpgv
+	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+	if use doc; then
+		dohtml doc/gnupg.html/* doc/*.png
+	fi
+}
+
+pkg_postinst() {
+	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"
+	elog "the right viewer."
+	elog
+
+	if use smartcard; then
+		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+		elog " - sys-apps/pcsc-lite and a compatible reader device;"
+		elog " - dev-libs/openct and a compatible reader device;"
+		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+		elog ""
+		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+		elog "app-crypt/ccid first."
+	fi
+
+	ewarn "Please remember to restart gpg-agent if a different version"
+	ewarn "of the agent is currently used. If you are unsure of the gpg"
+	ewarn "agent you are using please run 'killall gpg-agent',"
+	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "If upgrading from a version prior than 2.1 you might have to re-import"
+		elog "secret keys after restarting the gpg-agent as the new version is using"
+		elog "a new storage mechanism."
+		elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
+	fi
+}
diff --git a/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild
new file mode 100644
index 000000000000..5ce9f46cd62e
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+LICENSE="GPL-3"
+
+MY_P="${P/_/-}"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+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"
+
+SLOT="0"
+IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.4.3
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.24
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	gnutls? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-gpg-Fix-typo.patch"
+	"${FILESDIR}/${P}-gpg-Properly-account-for-ring-trust-packets.patch"
+	"${FILESDIR}/${P}-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 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 \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+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 gpg2 /usr/bin/gpg
+	dosym gpgv2 /usr/bin/gpgv
+	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+}
diff --git a/app-crypt/gnupg/gnupg-2.2.0.ebuild b/app-crypt/gnupg/gnupg-2.2.0.ebuild
new file mode 100644
index 000000000000..ba5fbde5fcc9
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 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 +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.4.3
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.24
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	gnutls? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+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 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_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.2.1.ebuild b/app-crypt/gnupg/gnupg-2.2.1.ebuild
new file mode 100644
index 000000000000..0cdc74c459b4
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 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 +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.4.3
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.24
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	gnutls? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${P}-fix-gnupg-wait.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 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() {
+	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/Manifest b/app-crypt/gorilla/Manifest
new file mode 100644
index 000000000000..22ec5937fa76
--- /dev/null
+++ b/app-crypt/gorilla/Manifest
@@ -0,0 +1,6 @@
+AUX gorilla-script-destdir.patch 503 SHA256 cefae52454d98bca728e2be003623495bdc6fe8b6a2c6e4e730cc9f4526b5365 SHA512 d39601d0fbd2e25eb540fce4b837fbc86782d643577389a518312a23249c8930a3a784d03ea6a65753135660bdeed425b4906812f420b9f625e613ca2fb237c6 WHIRLPOOL 1b2ba36518130845979fa97b59cb443376eca1e8a1bbb37fde478f4a1692aa084720e3aabe6a411aacb248fd342896aef838ebe51b4c76c6b6b5dd12f7ba57c2
+DIST gorilla-1.4.tar.gz 190766 SHA256 3184ff802d0f96250302e2ce1a966d5eca328e8e0becc44e037208af32ee0551 SHA512 56328068506309e99f9bc8b095048840eabacb794c742b36c4b855501d2973646e6e5ef7755f0aa29e636c5f5463fa1b24f0f627cb691511e4a48e1f062ce44b WHIRLPOOL 63b94f0daad92bb734c4319f82b0606ab990a552902f38a6c11a64da7917d000bf43b72a2754d2b72d310e57cffdbcbdcf9427d4c030343cb76cf588629fa57c
+EBUILD gorilla-1.4-r1.ebuild 778 SHA256 ff51dffde430bc2ddab741364029a7f41d794a65b01ea6297e37ad3981c69777 SHA512 b137ab3c328a65a4c7d892a3cb14de66f5ff9b67a299c8df71de8eb7c73c1e40d4e6a9474f36a41b035c0392aeeb71983f472a7f98ac25cc668cb276f5434595 WHIRLPOOL 3bf9ce7c56302259e414180eb4e4fe83329bfac47146d400ac4a91266f5d6a20ec754e9f4e33eb42c23903b7410e9a07a4764d040059172fca7744e3c8afc01f
+MISC ChangeLog 2216 SHA256 5012b370588fb077de6d5c1a01e7cab9dd3831fb8b4bde0cb4bfa564369cb96b SHA512 db4df94e6037ffa36463aa8c9d2afb0d9005d48310e31aecd077166d2c6b25128a26e01fcf2af0e9d940c3dc7358ec15373f5d07c909c8c5abb63d9913751319 WHIRLPOOL 7a7763f64372b9d272fad8e5d0eba94130943dc27bc15830cfd842183145f737a2683a911ae828f99ba2dced9b03b8ff6d4a00185575180c13e9e2b658b12f5f
+MISC ChangeLog-2015 1531 SHA256 1a61fd938ca79b175f0a584648c1697f34e09a3a2143045f0d453eb5190984c5 SHA512 fedda3c9559420c3938ad26113fdd00e359e512912c84f10dce42715d1df9e8755153d9ac67d748a15d21da287497810d4a2832117e3f59b09848de5f2217b3f WHIRLPOOL 5dc28a5cf9a375ea5a5783827a2e99a85f8681b00a6310a9fc79ebd430f67e49e40ae5a3106387bea8bec507d4c3a2b289a0aa46e3aa15f371ffce36af940aaf
+MISC metadata.xml 334 SHA256 c977e213ec24ca6de82f0139fd8348acfc6aeea7c3dbf9b8050b23965cfb0762 SHA512 82e606fd71fd8dd152b2e3a0638a6d503789226dcf0fa89d25066af33ae8f648da132578bfa506c172596b0a265590428b6444bdeda54d98dc7f1e80b5939b54 WHIRLPOOL 7df375cc943b9443fcec768dc9bc54f923779e3f852f03505acfcfdf7b97a85443c8a66364d67fd3096a6721f4eccbb63be93f08b9d86ca917c845fd23c8e861
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/Manifest b/app-crypt/gpa/Manifest
new file mode 100644
index 000000000000..2e54f9ebcfb0
--- /dev/null
+++ b/app-crypt/gpa/Manifest
@@ -0,0 +1,5 @@
+DIST gpa-0.9.10.tar.bz2 763239 SHA256 c3b9cc36fd9916e83524930f99df13b1d5f601f4c0168cb9f5d81422e282b727 SHA512 ff81a78e6b7c46307af6648a2e691a5e8185db229ccc5e259f2c3c05a3c86b337dde492069e7e9510c155fbc64d71cc4e2f109a00400bfb7560c558b753c42a9 WHIRLPOOL 93bb328178fea40f7e74053ec526c850c3a1c3c9b41218fee1e326f260633032117e294e864258474345057c3211f7fc81f9d0716ebad749225cfc1af4cbaca5
+EBUILD gpa-0.9.10.ebuild 895 SHA256 aa831c23ec7368bddca7d3786fea38b66cb8310b271a5476ef488e29eecbba6e SHA512 3602732c073d8f87c64f711becf8fb2659d172e9934500fc83655c1b391bd553839e18685f70eb65a23dbfb90ef4ab1f4bf7646fa87fb510f1b394bdee74f0e7 WHIRLPOOL 745c8c3956c3ff5339d335991d3deddcb5d2286f27086e6e691386086339d6eadb43892e1941c607d85558d545ca270af3597dd593de5b198b7854cda0c95ed9
+MISC ChangeLog 3415 SHA256 6103951a3a384c26016087ed105d9ab3ecc38bf91cd50feacd649484d0ca2aa3 SHA512 851b1a83290f1a3267df1f37a4f6679ff6ee42ff6408ce0add6b477edb1d03824720e257bea2b700b5e82bdcdf46a2ea63538e1e0c3afe36ea889e9c7b188764 WHIRLPOOL dd27fe7f24311a457858f6dbfb5bede0e5e73da719391ff967d48f465b3640ac6a6ac90dd1006909d033e2e1092137895d7c547dc86a63581fcd4f5e2b935c5a
+MISC ChangeLog-2015 11815 SHA256 8f8a313a7bf2f30b9e4c19781afb1b4d3dc353d25b9bbbeec4f82ba91f7bbe42 SHA512 1e14005d295408a90501214fef7d66fae5e9dd657be28970da0204544442d3b21ec89210fdcc92c59b3eb1b2be50d0933b98a83e17b2276ebd2df9cd512e20b5 WHIRLPOOL 74c69f0f7743e20c855d6a4c5020d6f3b457b5d96050d3789dbfb6843ea6cd93a0ff79e6853bb98d4e23a7f3aa0713e8c000a14f1849731cd188a749833a6c8e
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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..fdcee55b529c
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 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_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
+IUSE="nls ${IUSE_LINGUAS// / linguas_}"
+
+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/Manifest b/app-crypt/gpg-ringmgr/Manifest
new file mode 100644
index 000000000000..996d4d1ae496
--- /dev/null
+++ b/app-crypt/gpg-ringmgr/Manifest
@@ -0,0 +1,5 @@
+DIST gpg-ringmgr 9378 SHA256 acbd407b5859c13095e0a77ca206a2d6119722140137e9b9208a64be54b2b16a SHA512 f6aedf0db58c15163f6f08b37a5fef43a80655f5602d8ee856764177a33e2f5eb4c0b8a09e9f3ee5b36544039051909d48397be5793243eba5002526652dd194 WHIRLPOOL b558d8166657a709d3e8b5cb37e72086c2a19ea795ed4bbd713e1ab280307e2a42eeec7b0f380a91b32cb307fc493845c85283950f3beec8a3156b96b3e1ef6b
+EBUILD gpg-ringmgr-1.12.ebuild 631 SHA256 304f39e31838c10b2cf07384d598c724b4830ef0cdf6cc6a1c30114b048806d7 SHA512 a64928ec024455908a955461d8b49106d625ef1c28da49ea32dfae1f9cfe7450f39b22eda2d352e7b6f86d12c868371fe1d6daa592dbbe153be3500bf6be1e6c WHIRLPOOL 92b4da08199bf4bc55e75f6fbd6657479f350b27b200960b4051116adc8854aac9ce80796ee353f7208636090df0c87d76eb8a16526ac2406034f589ea87ef1d
+MISC ChangeLog 2187 SHA256 30febe9dedf1a76f58a3a5ac748a0859e31008ecb02806491c45995cff4c9230 SHA512 c5349464ff9e0942f59c2b79a958ef710a80ef9590dfa59e1c6b499b35a5737cc2a0b912276a6b581e3fbd021af08ce63b5e4e8b9e47e274e8db6884fa2c8ae4 WHIRLPOOL 64d09b5d08d950f5052419ca19c288c96d979cf81fc56578047e8e56fc041c765482092a3f9a88901284ebfcf356da975981fce5dd50a4de3ae6909708476a6c
+MISC ChangeLog-2015 1536 SHA256 5e84d7b490e0aa6a651533b555cc5c78629d6d9b136fa43958302421bc342e69 SHA512 b835706fab5ace678fe3376e3deee401dbdd9778e9cecc10fd8faff7a436359736842458dac846596c50fc4d48e9d0324f327dd7c51a058d2df909ee95d329b6 WHIRLPOOL e6594bc9cc4050e2e2940b0e4e849c0fc278b619ba38b2056c607f242e685168f956fd866179db439aabf368e55df53fd5274fa649d2ad3bc5b41e23fd09085d
+MISC metadata.xml 268 SHA256 972faf76e6638f2159ef3c7dafdcfef26d582070e6f0064d9136d1c6b2bee905 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850 WHIRLPOOL 759c32dcdde671d2fda0269ee9326f6d0f0e44966f767ac7becc40e6efb5429237b683cb23867d76a8d13dde79fe257e090ef890761b20f9792172a90369296d
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..b924156c2b13
--- /dev/null
+++ b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-crypt/gpgme/Manifest
new file mode 100644
index 000000000000..9a7b314cc13d
--- /dev/null
+++ b/app-crypt/gpgme/Manifest
@@ -0,0 +1,10 @@
+AUX gpgme-1.1.8-et_EE.patch 347 SHA256 1c315576b34f1b68b264b3fc5762d0107c444bc76cd58af04c6304551ed8fb64 SHA512 69577d0a1ae9061277cd502d72c2add13b61def4990c09c6181a14b4792745a4e2e467090019ab1ed8d3dc6df6f09b63230d2d21974e0a802a1e976fe5de18d5 WHIRLPOOL 93e3166033d76cabcfbc4109dd2da8da5a4cb35fb612758a210782bccf1fb8f4c7a8569064d621e6d4d03b7ed242362e605c4d642a833b8e3db5b699d526cb21
+AUX gpgme-1.8.0-cmake.patch 1216 SHA256 fb743604a031b9f8be816ccb643a78ed12a660d7cbeb8519387d7f44c7d33c8a SHA512 be2788db4a796fdd21524d20a8bc7ad52f7928fbd6e9945e5a2be048cc6251bf593a3d46623c589cbcd4491a3e5abdfc14b618098113c0e1ddcabdb4e7701f57 WHIRLPOOL ebd9435780cdedb5139cd3ccf7d7f108a16fc70c5698e62ee822333a272dadfc6a86706c59a332bf3412720a1eb197895c185173324d446de0ca2a2189685b81
+AUX gpgme-1.8.0-gcc-7.patch 554 SHA256 53aeee5535a8c22fb8c6540ef7bb60bf0c47b64dd728e228860bba5887c76593 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7 WHIRLPOOL 076d69f78bcef3b8f505f12c84ced95ce7eed59ff597ba1137ac8c85caec45ac244750d53c85ed4bff3dfb1404ad27cd8830ecb29597644dce5da7899706c02f
+DIST gpgme-1.8.0.tar.bz2 1298407 SHA256 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de WHIRLPOOL 79ed725e24302d4d738e90739cf3c5e6e9fa89c3e4fef87a4fca569abb7f7b7f0140e62e76161f747b555f49166fd0ccda277dbd6cc46c00ce2797c32d442f7b
+EBUILD gpgme-1.8.0-r2.ebuild 2526 SHA256 138cdb23adf656a3aa84aa3d6f54c1893e70787d2e279b7e6f844de9556da7fe SHA512 bb3849e3f0e2de7326c9f9c49114c0ad98827e8d72c3aad7d22e8ced2e65bb505ce79c437808e1b38e0c2d02bb2b26363557be6eb5898d062afedc87e1770a46 WHIRLPOOL 5e8c6dc600a2f8adc19dea6f4ccb6bdb4fc28383029c9e220542ee01d28ee52303a9450b784d59ff035983ac13de51a516b74217aa8de57ea44a999fa150c4f1
+EBUILD gpgme-1.8.0-r3.ebuild 2678 SHA256 1666cf1d3f1d5cd2d9a6c473db058b3ed7cc01617b98717670a4557245171933 SHA512 3b201fbf0d78b94091bee410d12b599c1fc51ff9ca674437bb7dfbcc1bf97084002a02e05b26dd6e48b53483f78b8e2009a01fdaabea4312a4eb1062b8999d72 WHIRLPOOL 7e344a9d66d9636c47b6a200eec3817cc17a5c9ea18e5827402c1df81e08052cecd6713292a81f7157873afc7a50a191dc95c9a8d64410372445fffafdfb7831
+EBUILD gpgme-9999.ebuild 2783 SHA256 7eeff16f2c0705828ab91c7a9703ac9a23bcec5b63bcb2a618497fdeea871d92 SHA512 8a100c6a5760d652fca76f58725599dbdeca8202701435f519c44ab88cd4e2b97685aa9798f21e6449b8bc3a3986df9c113645c5d86d3c382bbb9a7585afaa86 WHIRLPOOL 912aa6889c3ba6fbdbd749b59243bd8269cfa960392df4ebfcd40df874519e8c34b7c94fc86f47f3567c47c42cb5fe71cfcb032d0f12b5319d007e34e27a2281
+MISC ChangeLog 5742 SHA256 8060ac424bf3f337c32009675e575544c8933459b6665747c7335c65440725db SHA512 cdcc4075a86a46782d4b1b8fa60eb6495e60f8dffbed8e641019d05deac0721943512a8485547d3ace85908ced93680b6479fb61864bac073f6aef359177112c WHIRLPOOL df77c632e3cedd8f6dd1ba18106142b49877bc8d196528397c5ac7af22ddf6daa8d031ef5d9cb80f3f2a6d1dd8f51b6d9574977dc132401e5ceea580bb210611
+MISC ChangeLog-2015 32588 SHA256 365de278987394de285f4976fb94e094cdfe3d1e48a838209497301f2b108610 SHA512 4e5621b504fa9f9477adf17db0c36c12c9f56de3283015dc4954c4634202641ae0eb738c2449851bf840edf9a1851261243460102a1ae3d9dbdf3a104586e264 WHIRLPOOL bcb8b98517bbc5a2be7732585375d9e079940f19478f6a09f0ca3c2ea43dd0992aa4f482bc3b8dd3d9d683eae9870334768fa1faf44da22b807f9f160db2859d
+MISC metadata.xml 315 SHA256 2090c9e52f91c000c11e53d0215dd327d8274ab13f3a4930340a608afe10c5e8 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334 WHIRLPOOL dfd45c75e635ff36c55dd60b7c31a59ea22792fc07f6ba4cf493e99a4d55c3466e86cab704736a6b1547b9fb0b30670e839150f163643b1ebd9d98d6af814576
diff --git a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
new file mode 100644
index 000000000000..293debb5b91d
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch
@@ -0,0 +1,11 @@
+--- gpgme-1.1.8/src/gpgme-config.in	2009-03-08 10:25:48.000000000 +1100
++++ gpgme-1.1.8/src/gpgme-config.in	2009-03-08 10:35:53.000000000 +1100
+@@ -64,7 +64,7 @@
+ while test $# -gt 0; do
+     case "$1" in
+ 	-*=*)
+-	    optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
++	    optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'`
+ 	    ;;
+ 	*)
+ 	    optarg=
diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch
new file mode 100644
index 000000000000..09775b868eb6
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch
@@ -0,0 +1,33 @@
+From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 16 Nov 2016 23:09:45 +0100
+Subject: [PATCH] Remove a forgotten instance of @libsuffix@
+
+* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
+instance of @libsuffix@.
+--
+
+b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
+cmake config files, but missed one instance.
+
+Signed-off-by: Heiko Becker <heirecka@exherbo.org>
+---
+ lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 928d19f..cbe9713 100644
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
+ 
+ set_target_properties(Gpgmepp PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
++  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
+ )
+ 
+-- 
+2.8.0.rc3
+
diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch
new file mode 100644
index 000000000000..9dd3e85cbfb7
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch
@@ -0,0 +1,16 @@
+diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
+index eb3af56..af47594 100644
+--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
++++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
+@@ -51,2 +51,3 @@
+ #include <cassert>
++#include <functional> /* std::mem_fn */
+ 
+diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
+index 32b23db..c4f85c2 100644
+--- a/lang/qt/src/threadedjobmixin.h
++++ b/lang/qt/src/threadedjobmixin.h
+@@ -53,2 +53,3 @@
+ #include <cassert>
++#include <functional> /* std::function */
+ 
diff --git a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
new file mode 100644
index 000000000000..ff2d22ee82e3
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic ltprune qmake-utils
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND="app-crypt/gnupg
+	>=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
+		!kde-apps/kdepimlibs:4
+	)"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+	"${FILESDIR}"/${P}-cmake.patch
+)
+
+do_python() {
+	if use python; then
+		pushd lang/python > /dev/null || die
+		distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+src_prepare() {
+	default
+	do_python
+}
+
+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
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# FIXME: I don't know how to select on C++11 (libc++) here, but
+		# I do know all Darwin users are using C++11.  This should also
+		# apply to GCC 4.7+ with libc++, and basically anyone targetting
+		# it.
+
+		# The C-standard doesn't define strdup, and C++11 drops it
+		# resulting in an implicit declaration of strdup error.  Since
+		# it is in POSIX raise the feature set to that.
+		append-cxxflags -D_POSIX_C_SOURCE=200112L
+
+		# Work around bug 601834
+		use python && append-cflags -D_DARWIN_C_SOURCE
+	fi
+
+	econf \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+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.8.0-r3.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
new file mode 100644
index 000000000000..c18cb6e64d68
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 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 ltprune qmake-utils
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp cxx python qt5 static-libs"
+
+COMMON_DEPEND="app-crypt/gnupg
+	>=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} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-gcc-7.patch
+)
+
+do_python() {
+	if use python; then
+		pushd lang/python > /dev/null || die
+		distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+src_prepare() {
+	default
+	do_python
+}
+
+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
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# FIXME: I don't know how to select on C++11 (libc++) here, but
+		# I do know all Darwin users are using C++11.  This should also
+		# apply to GCC 4.7+ with libc++, and basically anyone targetting
+		# it.
+
+		# The C-standard doesn't define strdup, and C++11 drops it
+		# resulting in an implicit declaration of strdup error.  Since
+		# it is in POSIX raise the feature set to that.
+		append-cxxflags -D_POSIX_C_SOURCE=200112L
+
+		# Work around bug 601834
+		use python && append-cflags -D_DARWIN_C_SOURCE
+	fi
+
+	econf \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+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-9999.ebuild b/app-crypt/gpgme/gpgme-9999.ebuild
new file mode 100644
index 000000000000..62097f8115df
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-9999.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 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 ltprune qmake-utils toolchain-funcs
+inherit git-r3 autotools
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+EGIT_REPO_URI="git://git.gnupg.org/gpgme.git"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS=""
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND="app-crypt/gnupg
+	>=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
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+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
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# FIXME: I don't know how to select on C++11 (libc++) here, but
+		# I do know all Darwin users are using C++11.  This should also
+		# apply to GCC 4.7+ with libc++, and basically anyone targetting
+		# it.
+
+		# The C-standard doesn't define strdup, and C++11 drops it
+		# resulting in an implicit declaration of strdup error.  Since
+		# it is in POSIX raise the feature set to that.
+		append-cxxflags -D_POSIX_C_SOURCE=200112L
+
+		# Work around bug 601834
+		use python && append-cflags -D_DARWIN_C_SOURCE
+	fi
+
+	econf \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	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/Manifest b/app-crypt/gpgstats/Manifest
new file mode 100644
index 000000000000..7b11934a54b8
--- /dev/null
+++ b/app-crypt/gpgstats/Manifest
@@ -0,0 +1,6 @@
+AUX gpgstats-0.5-flags.patch 668 SHA256 d840597717c14959ea6a30e53ce08758838c36673b1e519fdcf4efa472973cbc SHA512 8f54993f957d8d93da495530dea25734f9e5fedc1d5dc17aa4b517daabc88f8162ab2565159a51daa203ef2b039e80122e009bd23dab862be87ad5a75e072546 WHIRLPOOL 16173559238a05bf0f2ba42a3ee940d571847a370987e785bcf123683689dec54c4e7288073f096a7b798c2a3dcc7145ab24f30f0b4b512754dc747e61a04cb4
+DIST gpgstats-0.5.tgz 6691 SHA256 beb3c5037b27e1edf10c47ceefaebb39c7f75b42b376a03ba3d43d2e219676d8 SHA512 273f08af37089eb43cee65fa06ff8023e1951fa4649bf208e01d6bc453e4131c11128b511c6cbd8396a7bd93722904e8930168656994e3d4d055024c3d5fb649 WHIRLPOOL be8d7a3d905ecf18a52e528d9c450c95900d1175b62ea2c6c708829f6fe230b1f67e75160049a3419c6c8933e14dfd3b33372d8913b9fa71a3f9150e7db4a63b
+EBUILD gpgstats-0.5-r1.ebuild 583 SHA256 a24758c39284aff7d2b583e2d49f8c282190510f27a58398239d18f7d3d1afe4 SHA512 810bee4395d77df0d3cc70fce767a4c04e42c57eeaf0cf9e47e404dd861798cb9e1b5f0e04bff281b9c516f96846f8c063416386a8aaa28613b19b9647ed17e0 WHIRLPOOL a4440e8cf4001fb81b92b55f7673fb3bc579816dc644d9af1061639cc9c71ee4fba9b29cd677deeb02c24c08f86ce372bab9e5ebee53e6f4f9bb395a719055a3
+MISC ChangeLog 2466 SHA256 544d63d822af1b4d6a0f89cea5dd7ade51e18d019f149c236b7ec8a9fb02d588 SHA512 2b51ec67e6aae0ffdaa8ec7a503f9dfce0bada4bdbbd65d4c68d0b4da2af9370708324230e2d62b8552e660496570bdbbbaeba5ba824925a7b268630296a7ffa WHIRLPOOL 21afaa74e06b67c23941c0dc1a4e6b7c026819c1ee561e103b32fb4ff9620da93b209b34c2fb15adf4bbff918c49c6204ac9421b890f458ef8854acc6fb1b734
+MISC ChangeLog-2015 1215 SHA256 495c48c95b5417e1ef7596a43927d39a887126792eacd44c77b4867409c2e48f SHA512 eb7fc81729f3fa22d79952e864abb72d4784acf6b4eb05c275a726b0160062d88da5b219efa4dbdf481d66a79a21af24cebc4cc86b4dd6e31a7f5ceda3484241 WHIRLPOOL d420a89202610e74988ba5c7f58713d22ed7009105cab36938bd7bdc14d21d228359f523c90f846d5d2ed20cee7fcd1ad13bbb0d7420065b288decb140b3d1d7
+MISC metadata.xml 315 SHA256 3a46cb25a0895c22304f0c5cda9fe8ec0e64107180db41da6864dd7403a509f2 SHA512 2b356b01e98ef77d3f356dbc758f08c0ea5438a0df80b2b2dc16c90cec34c437ec51b6f3b7f81ea321d9e42ac4016e7c9e83417e476c0ecb1b3741f709a469be WHIRLPOOL 24914ee9f38d640d05cec00a7208b835af06e13698c61b9e2f35e20cda2f686663f87c7cc1629e5bec0053a61a13bb2e4406a3a7c9a473999f888beb557f1a83
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/Manifest b/app-crypt/hashalot/Manifest
new file mode 100644
index 000000000000..7b0b3260ded9
--- /dev/null
+++ b/app-crypt/hashalot/Manifest
@@ -0,0 +1,5 @@
+DIST hashalot-0.3.tar.gz 80284 SHA256 6015b8e519da6d2ca49bd21a417145ff982af35e6303176fce818189fd816967 SHA512 c9ee39cefce5cc73b9a3a67b240616db9b66cde94fa351e6ebd4d13fd0f9195de9021c07d223809107e50b0a091d0d55e4caf2f71bba93f6d0da86af10632145 WHIRLPOOL 5a2323c6acea1fc6b9014824b5c644f165f510e3bb4ab7ffd870836ff5d6122f11bb52c0ddcc3e38ff3a272f8e47d306d02e549c510408682801b2b9d1597266
+EBUILD hashalot-0.3-r2.ebuild 507 SHA256 9f33c70db4658cdb3c7093acd99e5815c0a090951626eb1d641c5ba7ded9ded2 SHA512 f458fd09a3fd828735d65685f8379963581b65f7ffd8ab09173d5881f3fedd53a58de17554e17e82be33d7d8de01ed96b0e56e66e294568faa181439d17629b3 WHIRLPOOL 0e44d29a908606e8a4afd0d66ababb3e862aef42aacd7ddb5a08b6f3cd0cc9e5bcb2e5c950b3af60c9e900b331a8e821c91d8b3271227c7c0745c3ecc72b80cc
+MISC ChangeLog 2433 SHA256 9b3251ad94d2b65783224ee58ce8da50180f59085ddb0ca2463313683ce1b984 SHA512 f2c8d3bff0102d8188145d6a6ffd05684020e5a33d061989eaee784f0b14d251700c06d8f79851aa112ff45ac1e1d553a95d8e98b8548e213937daa9da0189b3 WHIRLPOOL 7e9380d079ed59eb096e4e4dcd8d9cf753db4cd0f1a43424c0116c85e94f49b7cb4ec384642ca8bef05878036ef7078097bcc2a692b49547142c603714d231b5
+MISC ChangeLog-2015 3587 SHA256 a91017d02a6c8a9b0628e1114bab4d12e6f8faab5a70662ffdadc8f2bf177bd2 SHA512 b181b6917b4d4aaaa72c309da41d767b086e606a6bcbe4553712e769cad982b1627fb9e6599edd69bed30ec26335bf31cca427339182d66cc0ffe63eef93f923 WHIRLPOOL b6aded6b33909326b98564c47ed2e891ea9ad2350c8c26c5c9dea822ae4796155d0d4c899c5e6acd1263ee8c86fa4809dbad0f5973185aee6bd1d898b846d185
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
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..9a5da3a11183
--- /dev/null
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-crypt/hashcat/Manifest
new file mode 100644
index 000000000000..b1634b3c47ee
--- /dev/null
+++ b/app-crypt/hashcat/Manifest
@@ -0,0 +1,4 @@
+DIST hashcat-3.5.0.tar.gz 4103461 SHA256 af764698f48145ac96cf01c65cf76bcb88e205aeb4614025ae32d847571c4390 SHA512 7efc860461894a550fbacc406a40fec400232a120818180abba3d53f26bd3a503f58e7d189e4afad0f871c2244ff68371b145af58ab097478fe2d73f39c9a6b3 WHIRLPOOL 927ac7bfe902fcc9ead971f785f8231656335c1c190ffda1bb40b5affb8d7a3fb67d084102513a44e457a9d5ba1fba3969aa0e954669a33071fc65fba0b2424f
+EBUILD hashcat-3.5.0.ebuild 1281 SHA256 c485fd46eb57dd134d03b0f2c4ea08e0f1b42998e1f3e5802d2ba513e0558998 SHA512 a1fb965e13c1f72b340ce47b5993cd1323e01e02140da8072f75d312d1742d048eb8ddd9790507690bc089e27b3e0b21409be0b7dfe4fb71f82396d60116c0f3 WHIRLPOOL 9e8c164db1cc0a5dcf5eb87ae970547ff1c51f0a7326680726e9d64cb7ca9b7f027737cf167bea9a37375d6184176b5339d5b04810ab1be59b982b21e20bcc06
+MISC ChangeLog 474 SHA256 a9a08248c1c54431f0b8195351cdcc23b8cc38d5adc604a89eda25af1e2c69db SHA512 17ebcf872bc6746259a2c1356440d7ffd3d7c9e988bf3dec4e1e0bdc5023207b8db06fff2b4e3593d9b16778a782688dc7ce284856c07bd187a441c6729f5492 WHIRLPOOL a9099f55d14e4ef44d06754988f855b83c85f4d4a024a2e5085f030ef98b8dfaf4ef9bf7aaa248ae151206f2c88c0483e71b6253843dc7ccea349f090662ec15
+MISC metadata.xml 327 SHA256 de3c2f59eba3910a5b71700bce3f2e1b6e9f0e87c160f393a1d6543cfd728a74 SHA512 024401252f35e93caa0ec7a48a7df7b71c18e4c7e71eb495f3ee5598fec5f3332c44fd3cf5d6b86d3d885649e6da15a8e7b5bac4e9205f552f8c8ec3f0fcd496 WHIRLPOOL 1511b3bb00c72cae914a5a763101d87657ecc65908524b6cd1a4f730a118eaf2de6eefc160ec51e878427deb8c1a2d325e6fabdd200ee1ad34e2d3a3492c43ac
diff --git a/app-crypt/hashcat/hashcat-3.5.0.ebuild b/app-crypt/hashcat/hashcat-3.5.0.ebuild
new file mode 100644
index 000000000000..3d4a6f2cc029
--- /dev/null
+++ b/app-crypt/hashcat/hashcat-3.5.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 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 video_cards_fglrx"
+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
+}
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/Manifest b/app-crypt/heimdal/Manifest
new file mode 100644
index 000000000000..54db65477c82
--- /dev/null
+++ b/app-crypt/heimdal/Manifest
@@ -0,0 +1,27 @@
+AUX heimdal-kadmind.confd 151 SHA256 892f9650d4eb631eb1ea435dc8d3defd3805e6d1f2fa59a698d424c44915d644 SHA512 2e2852fa6bebeb58da4bd80fb584339ab8c95fdc1e37f957045f9fcc9b212ccf61145d16c6f7a2fae6245e977200e48150f25bc4ac1d734692555ccfd9911810 WHIRLPOOL 89127ebe4a9134d67b43a84648fa77157a5e876e9b9259d698946e7240d3f7b1474d7322fa62916b418490d302acdfd33be17387acbdb2454bc7aebc840532d3
+AUX heimdal-kadmind.initd-r2 427 SHA256 69266bb48a58b485598d734a0c8731f2159c5237d4a6c3aff4b012e2280fb4f7 SHA512 fd8cf77b7786a6b78d775be3ee769a31ec27a085f4e0764722948a02122e9a4ce52143eb1d3ac2acd7c74a5bee4432220155eb9a49bfbafc0c23431b18da64b2 WHIRLPOOL fb75b14b7eef6e8e2976071f623ad60cbe7dd73422312d61ba22781d1915475a465c1b8388b257823cb3a4780767c91dd13a419c149e5217fe3f0382a6fd33e6
+AUX heimdal-kcm.confd 130 SHA256 04d90973441ef7b274986152fd78ca6b145fe022fe630d39bfa165cd25b63890 SHA512 dd70d57c3be5f0d4cf872463af1df6bec82774314e6462cd2433ff9fc4d2ff585210581c75bc76b33085e58b16e3ca795bbd531eba6b5f7a3f7f505b7e9ed50b WHIRLPOOL ffc5a9dc222c1d4e48284706406681efe3045d4758011b45c385a7b2182f6aab5b442c588b784f8fc7516ee2a3b6f3ab2e4e2d402dd6db8d6d9f4fbcdb41f180
+AUX heimdal-kcm.initd-r1 463 SHA256 478c9b7191a4e30f531e124c4a311a4c92524417a3e2d4060a8ef92679d785d6 SHA512 f80e2543637f273aa38d2265e6c33dda21e1fd677e7ada3f8234dbbb295baf96e63d7bc25f2420f200191a041dc2abbac056acc405970d2ba862bec216f1b274 WHIRLPOOL aa921995569bd4b47f8f16f47fb1a94e90a09b3bdb224e1351d8dd93ed7755616d733fb82b3f4c18d0f16faf3b94c7d535661567761e7fd450f9d40e324c8b2b
+AUX heimdal-kdc.confd 130 SHA256 c96bedd8c989378cc427da77862353a879bdbfdfd9c9e4b7b3ed1fa09f3d2f93 SHA512 817a3565948e75c01aaa3e8fd3d5d77715be4aecb51c33f61f0f4342fd8c4cfb458c20b71fb78d309becf600276cd5ea695c83e2cd17a9f99dd67f35d2c58b12 WHIRLPOOL a287e2efd1ece08161b47d978cb54c4f4b63915421d35bb5f1b7ba3e15cfe072a57abb3d1bcbcc9a2987bff2e7b3c2b28b8da013e53159ccfdb494d658a1e52b
+AUX heimdal-kdc.initd-r2 434 SHA256 b5062b49e6205e0ac6bfdc26cdfe520621c6a702d9e82b00e5ab34244e3ac24d SHA512 1698a29ff23aef6bcc83153076036297639f38e5b42f12a3f59324ecce3fe7483f99f84e2bc88d27f010d07ebec4f2758d0249a9cb5bd62be40c3e6cc79353c1 WHIRLPOOL e3bd02558862814a82dfb4ea180483cf6240df7e7fbab8e2c8e2c21ce4a3d9881fe605eda8401117abe175af8c37c826a4247d062912856518d1ca13e78d8a45
+AUX heimdal-kpasswdd.confd 148 SHA256 ee533af2cb109038108649bf3f44988fbb63d5a7fd2bacfd9842140790116003 SHA512 198d8f219abdd349213d26119e7cc343956981a5cb7d031186c81cb1a0b3f017097f4a429481089787b1cde6f8f013a8ee3909f6807f44b51531ac19a7a3a17e WHIRLPOOL bca32249a033919dd8b00ce94010408b8d2e259a11653372bd02f52a044a216146fe488ca91165095880cdc19bdc7a74fb9b9ce16ff803eeff760b6c39b70444
+AUX heimdal-kpasswdd.initd-r2 448 SHA256 8e9086554d2e9e71acc31fb6dae51af0b1f311094fd7906a0fa72f9993c724b8 SHA512 e7de18a197ec6d56fac61c3d014c9f7d5cc10e4ee6c7ee432f9e4658ad5feee7be6c26d175755863321bf927e082e9da34a576647eaa428c98cf80f9eaa99176 WHIRLPOOL 8796a499982eaed9059b98cf9d0f25af0d0c0e55d5f0f74b7186b7877bbf5243b8d191a8c9497d8a36dc5c9f38eca3b28c44f93ef08d64c3cee0a689d28d4428
+AUX heimdal_db6.patch 1241 SHA256 a8b4385ce097b02317786f7227e55431253ea319bcf6364aff6bd17b484e84bc SHA512 923f045852ddfab6b1102ae69dff66775ae417384833afc36ff96c480f2809bca01e72a3d4f0b4bde6b3269cfcdf719ab8bdc9a0639d316ee384e7d1614724f0 WHIRLPOOL 4575687c8902b97b2ed23dc28c213aa38f792c70f29a10ca094d8b608f91b48fa491e6869e340d26514ad7bf9899d6c544db643fec26cb4b537888bafc73ef74
+AUX heimdal_disable-check-iprop.patch 577 SHA256 b2ab6f335b5a756856a5df635df82488f9dcdb3ed02a7114f90b4a34911f9721 SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e WHIRLPOOL 115bcf67b370a24aa911bfcaba5c9eee3015d02e14dd5522f9038bb31cdd968f046225eef064fca9134db885719e00499cba48ea43248f6793c4b3d477f6c52d
+AUX heimdal_link_order.patch 1164 SHA256 794560047c549a996d03140ebcbd0476646f4a8e9e36d0cfe6cbaddba611e754 SHA512 f3e411592a87ef49695641ccc30d2ff9d08310df6a157dfc4c366f0a909340a7a5c2667b57dc5f736e8b0e76d13461770191dbe826fdf179023547d15fcb30cf WHIRLPOOL e2e66bd92ca5e5e1a53372c5bf542cebea665bd32a3d281cb858a36bda98932cc1506c32d874cf9126d156d06f1bf481cda13ebad8853c121676cf6dde792f6d
+AUX heimdal_missing-include.patch 255 SHA256 1ad9d71d01776e2d2dd49da5951f6f02630ce137be910ff8484968e8327837c3 SHA512 18f4a5b0c74ae11fbd8874d2954639f36d480655d978af2b2dd19a8ec2b206057ef4be5861d8daca0725926b295604daeaa895b6024b2098922cd189d3e4484b WHIRLPOOL 346f1117fb5558203e0b01bb5f35596fd9e89b3fc0b8ddee58e331fada9024f9cf6b8dde20773f26079a4d9d4f9e1fe224d4a24a1c51ac6d9475f3519dd5a521
+AUX heimdal_missing_symbols.patch 821 SHA256 f8ef2353ce328e444dc48e211a32e77af16b5877e9d3679bf36825e7e37911fd SHA512 75847162665a575424ac7f5dd743120b44b3b11747542c61a5605000bbf94672747b12b82a60afd080fa0b1cbf80611078f38bfd5e6a6992748ade70a1610cbf WHIRLPOOL 7219d08c36811e734f6ea1b51416a1dc08d57ea7234bd5937754bdc8151da5bf0bf4658c854bbd4efd8461a44d80734bf66ab6b7bb8bac5220fc0931dc146134
+AUX heimdal_texinfo-5.patch 617 SHA256 4010cb2f6d09585aba071b9c9891c77704b62468d9583f82088d020b9538a24d SHA512 0e61e9c93263fa8f6d308315ca907b75d7957fd73ebb6d500efaf6b9920e70623b2f9382cc565ee35dcfeb0eb0e350e2a165cca98f9017153ccf1154f258fb5a WHIRLPOOL 976da1d738205a3ef7ca313e4b81ca658cfdad8e33f115a6ffc7c603dac845c7033fa88fa6bad3eaa69ecb2d0350bd29388d4eeb8b30372bdbcfed1540890856
+AUX heimdal_tinfo.patch 711 SHA256 1d68c036d1f375417f52a8d79812e2e717b2ac178b6bc20bd294eea270740157 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d WHIRLPOOL 945e032c0e7deabe0346f22b396eda86e9ba3267af285331ab98df4782a2fea7fc869abc319e3dc274561ea075c0af9a13f6b3d63a001d6724dd906b3f331243
+AUX krb5.conf 424 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38 WHIRLPOOL 43526f52aee4dfb456058001bc553a81e478edd315c7c7ce8e639958afdb3049ccaa686234066b17b2edfc5aee0b4af95596e0fbebd0e66455ff0599de1af5f4
+DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
+DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d SHA512 5afc9d183ff0db6e82e83d47955cc77e775bc60569e2905f9106c31b8a33e8d67fbc042dd4836ebae094db38bf70ba858c224189fed8d55f277738ee6e76352e WHIRLPOOL cd6507c5f6a800e645a146d94fac41d1fbf4c3283c5c4ab4a40bd2229efa4f1a16be71aa74fc5d8f41023bdff8ff141419ce0b99f5cb7aaf09f22824db1d2df8
+DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95
+DIST heimdal-7.4.0.tar.gz 9928553 SHA256 3de14ecd36ad21c1694a13da347512b047f4010d176fe412820664cb5d1429ad SHA512 3bb83974180e0f6fe2e1b2a11c51cf136c9a64f13f9ed7592f0039ccccd03c1a22081b7d88ae631f94cf46589ed399b79666eb814104f915faa70b53749863a7 WHIRLPOOL 337a6da67bb48e08ecab2119598c19e2ca9b0cdbd7ca163f6ea55ccb0a1290cc2906eee106b625a43243edd7d1677ff36ae318ab82f2d3e439b8f25002f7f001
+EBUILD heimdal-1.5.3-r2.ebuild 5024 SHA256 092d8f1583803c851a41fc2d1729ba0f8ca44a565a27b8eb9259229fab30a98c SHA512 bb82e78a56c619470f245b3cd65f8d8e3bb86bbc41d8217028372f15977603e10f6075aac8c08a7daf1e5b8cf85c50c5b95a344288f81b1dcaae3c0959002a8a WHIRLPOOL c276149edcef305a279dfc0d72e28c1a2e918a817f2ebd75ac084469de22c18b44bfe31ac2d5aa2dc1b4692c6673bbc99bd46df3deb191341a2b78f1451c04c0
+EBUILD heimdal-7.1.0.ebuild 4308 SHA256 66457b3af786a1bf0bc25c29e2ea65dfceb1a536d714ce07f87c133f4e75b386 SHA512 e31b14de2393c0b85042012abb95dcea54206187618d04f4414ecfc1ffeddc9db707cd7d87bd4ee3bbcff4f9d6156a5918e2810eb9da312859ebc97a76a6f5c9 WHIRLPOOL dcc455f8f4eafe97eee6a89f74bdc5b35f9b0beb9797eea4e293f5db1ce1ebaad66d2deaeec3dad05cacb46c8011f15ca8320fe3f4b2c87921fef13a216a9151
+EBUILD heimdal-7.3.0.ebuild 4308 SHA256 0afe18acc33d3b75b2ec2dd15d0da667ea49c8466eccf19d4cc8677092d50b87 SHA512 9ed5513715e4aee7b6ada52ce784cd84f105ddefcf0c2b5a6ee227f0d8c30e25d9eaaf0c8bf9e3038e09ce7cff2ac0eab7d532e61b6a8be1b8e998e33440e597 WHIRLPOOL 47fd1f2dbeb884bbec49404b1e1a73baa184c8eca81d8f1bbb1121f9bc7928a98acc23a3652b13736178289bf9c55a343e73640b3808ec5928c39f31e13e64ad
+EBUILD heimdal-7.4.0.ebuild 4304 SHA256 0b9b14ea382ae65fe378409b31b9ecbe38cf3ffd33b1022f0ce9351dbfb2f724 SHA512 d984b44fd34a60b9e67fb9021ab50e0ebae97487ac6dd4bd319d05616511e11d046f8bb5f29a67ab4f1cbb83b8a1d4624ac81c2e808fe7c510e638252207931d WHIRLPOOL 30baa69b42629fa2830c8be5a224ddbdf77122c31f5c5d9ddba31ed380336d206d39c03504bd9f0401b451750dfb7acfbefa5cd928b45f15a8e5059633c822fe
+MISC ChangeLog 4413 SHA256 4c9d94b05877452f2233be9ffea999aba04d4078e63f17341138d0fb831105d4 SHA512 6a4e11a4509c2722a1e6e1bb65c6ea070b849b05aee166bd94dbd1fb831e5eb4af7c927b7735650d407732f11eead38816fd4d8693195df9378cb69d9e6cdfad WHIRLPOOL 13253e869e3da54af008bbf03059f3f9f150390b56f02e048e42fc9547e94d637b98d8579d1f488afe3805e7a38238d64eec87304c5d64d81c31b3b12f372df0
+MISC ChangeLog-2015 36803 SHA256 fe8e5e58312adc75a5d62ccbf1684f06783eb9aed087d8ffad5cd9c9179aac1e SHA512 48b692393c72ed2e98eaf8473bec195ea8645a14c4c7aa8c6318e567c110b3b2fda0fc745ca11487b2cce51fee6cb1d165e9bf6c7fcb60c05e8a2b1dfdf57bdf WHIRLPOOL dfc81a3dfba814ef43a5fc4d9ee965680b24320501f40b7218aa5a84002acb791302dad8718747bcf68a208aec306e65746b5c166b0492341b08c5a0c9f5045e
+MISC metadata.xml 638 SHA256 4abc8c61e0d5f828d838329d247bc6843cba316784ac65c59abd553b94138aca SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f WHIRLPOOL a565b94ef0058dc1318db1d141d538d28c93f0bdb3e85765420f1328afc1e350d76cba8ff0b75de0b7ac4bb0b0ca528608373166075e2f89a3108f5862471ed3
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_db6.patch b/app-crypt/heimdal/files/heimdal_db6.patch
new file mode 100644
index 000000000000..316cf1533791
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_db6.patch
@@ -0,0 +1,41 @@
+--- a/cf/db.m4
++++ b/cf/db.m4
+@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5
+   #include <stdio.h>
+   #ifdef HAVE_DBHEADER
+   #include <$dbheader/db.h>
++  #elif HAVE_DB6_DB_H
++  #include <db6/db.h>
+   #elif HAVE_DB5_DB_H
+   #include <db5/db.h>
+   #elif HAVE_DB4_DB_H
+--- a/lib/hdb/db3.c
++++ b/lib/hdb/db3.c
+@@ -276,7 +276,7 @@
+     }
+     db->hdb_db = d;
+ 
+-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+     ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
+ #else
+     ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
+@@ -284,7 +284,7 @@
+ 
+     if (ret == ENOENT) {
+ 	/* try to open without .db extension */
+-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
+ 			 myflags, mode);
+ #else
+--- a/cf/db.m4
++++ b/cf/db.m4
+@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno],
+ 		    fi
+ 		   ])],
+     [AC_CHECK_HEADERS([					\
++	           db6/db.h				\
+ 	           db5/db.h				\
+ 	           db4/db.h				\
+ 	           db3/db.h				\
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_link_order.patch b/app-crypt/heimdal/files/heimdal_link_order.patch
new file mode 100644
index 000000000000..fdf6a0af9bc9
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_link_order.patch
@@ -0,0 +1,41 @@
+--- kadmin/Makefile.am.orig	2010-11-25 12:39:31.000000000 +0000
++++ kadmin/Makefile.am	2011-02-14 21:37:29.000000000 +0000
+@@ -64,10 +64,10 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(LIB_roken) \
+ 	$(DBLIB)
+ 
+ kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(LIB_roken) \
+ 	../lib/gssapi/libgssapi.la \
+ 	$(LDADD_common) \
+ 	$(LIB_pidfile) \
+@@ -78,12 +78,14 @@
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	$(top_builddir)/lib/sl/libsl.la \
+ 	$(LIB_readline) \
++	$(LIB_roken) \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+ 
+ add_random_users_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(LIB_roken) \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+ 
+--- tests/plugin/check-pac.in.orig	2010-11-25 12:39:31.000000000 +0000
++++ tests/plugin/check-pac.in	2011-02-16 13:24:50.000000000 +0000
+@@ -62,7 +62,8 @@
+ test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
+ 
+ KRB5_CONFIG="${objdir}/krb5.conf"
+-export KRB5_CONFIG
++LD_PRELOAD="../../lib/roken/.libs/libroken.so"
++export KRB5_CONFIG LD_PRELOAD
+ 
+ rm -f ${keytabfile}
+ rm -f current-db*
diff --git a/app-crypt/heimdal/files/heimdal_missing-include.patch b/app-crypt/heimdal/files/heimdal_missing-include.patch
new file mode 100644
index 000000000000..e245cf8fff07
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_missing-include.patch
@@ -0,0 +1,11 @@
+--- base/test_base.c	2011-09-30 15:58:45.000000000 +0300
++++ base/test_base.c	2011-12-27 23:04:50.482955923 +0200
+@@ -39,6 +39,8 @@
+ #include "heimbase.h"
+ #include "heimbasepriv.h"
+ 
++#include <stdlib.h>
++
+ static void
+ memory_free(heim_object_t obj)
+ {
diff --git a/app-crypt/heimdal/files/heimdal_missing_symbols.patch b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
new file mode 100644
index 000000000000..aa915fb130dd
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
@@ -0,0 +1,28 @@
+Add missing symbols.  Cherry picked from upstream master.
+Bug #420821.
+
+--- a/lib/krb5/version-script.map	2012-01-10 21:53:51.000000000 +0000
++++ b/lib/krb5/version-script.map	2012-06-13 16:23:26.000000000 +0000
+@@ -42,6 +42,7 @@
+ 		krb5_auth_con_getrcache;
+ 		krb5_auth_con_getremoteseqnumber;
+ 		krb5_auth_con_getremotesubkey;
++		krb5_auth_con_getsendsubkey;
+ 		krb5_auth_con_init;
+ 		krb5_auth_con_removeflags;
+ 		krb5_auth_con_setaddrs;
+@@ -383,6 +384,14 @@
+ 		krb5_h_errno_to_heim_errno;
+ 		krb5_have_error_string;
+ 		krb5_hmac;
++		krb5_init_creds_init;
++		krb5_init_creds_set_service;
++		krb5_init_creds_set_keytab;
++		krb5_init_creds_get;
++		krb5_init_creds_set_password;
++		krb5_init_creds_free;
++		krb5_init_creds_get_creds;
++		krb5_init_creds_get_error;
+ 		krb5_init_context;
+ 		krb5_init_ets;
+ 		krb5_initlog;
diff --git a/app-crypt/heimdal/files/heimdal_texinfo-5.patch b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
new file mode 100644
index 000000000000..b16a90cefdb0
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
@@ -0,0 +1,28 @@
+--- a/doc/whatis.texi
++++ b/doc/whatis.texi
+@@ -35,10 +35,11 @@ services can authenticate each other.
+ @end macro
+ @end ifinfo
+ 
+-@tex
+-@def@xsub#1{$_{#1}$}
+-@global@let@sub=@xsub
+-@end tex
++@iftex
++@macro sub{arg}
++@textsubscript{\arg\}
++@end macro
++@end iftex
+ 
+ @ifhtml
+ @macro sub{arg}
+--- a/doc/win2k.texi
++++ b/doc/win2k.texi
+@@ -311,4 +311,5 @@ Other useful programs include these:
+ 
+ @itemize @bullet
+ @item pwdump2
+-@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize
++@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}
++@end itemize
+
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-1.5.3-r2.ebuild b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
new file mode 100644
index 000000000000..b1ddcdedd4e6
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use eutils multilib multilib-minimal python-any-r1 toolchain-funcs virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="http://www.h5l.org/dist/src/${MY_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 otp +pkinit selinux ssl static-libs threads test X"
+
+CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${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[${MULTILIB_USEDEP}]
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? ( x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!!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() {
+	epatch "${FILESDIR}/heimdal_missing-include.patch"
+	epatch "${FILESDIR}/heimdal_db6.patch"
+	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
+	epatch "${FILESDIR}/heimdal_link_order.patch"
+	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
+	epatch "${FILESDIR}/heimdal_texinfo-5.patch"
+	epatch "${FILESDIR}/heimdal_tinfo.patch"
+	eautoreconf
+}
+
+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 \
+		$(use_enable afs afs-support) \
+		$(use_enable otp) \
+		$(use_enable pkinit kx509) \
+		$(use_enable pkinit pk-init) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread-support) \
+		$(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 base -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 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 base 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
+
+	# Begin client rename and install
+	for i in {telnetd,ftpd,rshd,popper}
+	do
+		mv "${D}"/usr/share/man/man8/{,k}${i}.8
+		mv "${D}"/usr/sbin/{,k}${i}
+	done
+
+	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
+	do
+		mv "${D}"/usr/share/man/man1/{,k}${i}.1
+		mv "${D}"/usr/bin/{,k}${i}
+	done
+
+	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
+	mv "${D}"/usr/share/man/man5/{,k}login.access.5
+
+	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 "${FILESDIR}"/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
+
+	# Ugly hack for broken symlink - bug #417081
+	rm "${D}"/usr/share/man/man5/qop.5 || die
+	dosym mech.5 /usr/share/man/man5/qop.5
+}
diff --git a/app-crypt/heimdal/heimdal-7.1.0.ebuild b/app-crypt/heimdal/heimdal-7.1.0.ebuild
new file mode 100644
index 000000000000..416e7858a1c7
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-7.1.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+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 otp +pkinit selinux ssl static-libs test X"
+
+CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${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[${MULTILIB_USEDEP}]
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? ( x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!!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/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild
new file mode 100644
index 000000000000..4591ceb4645b
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-7.3.0.ebuild
@@ -0,0 +1,171 @@
+# 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} )
+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 otp +pkinit selinux ssl static-libs test X"
+
+CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${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[${MULTILIB_USEDEP}]
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? ( x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!!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/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild
new file mode 100644
index 000000000000..b0582cd41968
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-7.4.0.ebuild
@@ -0,0 +1,171 @@
+# 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} )
+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 otp +pkinit selinux ssl static-libs test X"
+
+CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${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 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!!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/Manifest b/app-crypt/hmaccalc/Manifest
new file mode 100644
index 000000000000..b3d65d7faff9
--- /dev/null
+++ b/app-crypt/hmaccalc/Manifest
@@ -0,0 +1,5 @@
+DIST hmaccalc-0.9.14.tar.gz 111893 SHA256 5fb659153a5748653ae45ce94700932a08796f972eedb3220750f93037b558a3 SHA512 688a72b4e534ca4a1d45a116c0361ffd389de93dfdeec68e35cbffe0be13832789abaf33300003e12c7317ba473d3a0415f4b22cb3b7b36946c04bd40aa49184 WHIRLPOOL 00a7b2be3776aeb6ecc2baca59694312d1cd4e491671b505464008bd4525c8fba0175baf241936caa7d5a43d16645022b4d1e6475bc4a60d8903d955c969dc64
+EBUILD hmaccalc-0.9.14.ebuild 597 SHA256 dc42dd0baebbaeb5e437d310c553ecc25fa3891659a9fd96bba6e1ebf10d6ff9 SHA512 449917ee87cb06a939087f8a8b1d6006cacb8e600cfc416030e881f1eef0ef71723459707f80e34404af92ade592149695c18e70109821a7a34455e1a3e28920 WHIRLPOOL 41fb3bcdac6724a04e2b41c865e43d84f00b05d7dc7cb0f45869270e7f8c0aaa219f8f8f25af4e802f20bf7aaa22841f6a3421b7051cbfcc5256d91a5072e7d6
+MISC ChangeLog 2708 SHA256 ddb694385f6c93bbfa9b2fb5cae1cf5b57189b52dd035050d1cc87e63f0b6aec SHA512 46b5b775bde34e8e42c9214a94a7e5f141ca2f620fa822f5e6bf3f356ae4273eada1fdfc9f9833539ffd21c7b72e982b1211d04397dc006b0be2822e4c6c704e WHIRLPOOL b1578960447a17a73461e68c0831846fb8aacd6d408fcb94718e74f3902f96d78aea1c1fe35fbc35d7816129eda04c121033ca8e9437cf981ab979394bf1c6bc
+MISC ChangeLog-2015 729 SHA256 55665bf5e430f8d8a689ad50fc4c14f37c522941b81c308202b3fcaf008c207f SHA512 1ed8c6c544e9a6040fef23aae7e8ddf92b66f9bfbb795c35d3d9706eb4710303f1179243561a3c03c2a62d7c3253707c828396f9b85eabe2b857222454d6a580 WHIRLPOOL 5deaa5b7e8d7ebc1c207fd7545db5c7228e253de0e74e4b64e231621cc92a58c5275c52c139b9ad514612d6526a7a5cc15088c6f4d1c7a87fc0852901e9e2668
+MISC metadata.xml 671 SHA256 24efb894a5f17b1be6c58e48459e6f305f3983754b6cb582968e62daa62a9786 SHA512 d4bb7d03ed78f667255e38138262ccdfe33c42707e967817c52d8f445552b9502d6ed1a10a96df7e20cc62f7fa06c2285057a2f81cff1004b28c6e0c20fb17b7 WHIRLPOOL 662369e14132e1d4084e2c8820210d90930366eeccdc2b458e8a6583a7e06372c932cf836459acf36a969255dcb558875f0d89a366f8732278c987f64035a4e6
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..01eab6cdde7d
--- /dev/null
+++ b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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://fedorahosted.org/hmaccalc/"
+SRC_URI="https://fedorahosted.org/released/hmaccalc/hmaccalc-${PV}.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/Manifest b/app-crypt/ima-evm-utils/Manifest
new file mode 100644
index 000000000000..689e05edb8fa
--- /dev/null
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -0,0 +1,10 @@
+DIST ima-evm-utils-0.2.tar.gz 16329 SHA256 ca8c238562c205f265ff76db7af15df90eea7335db82f6c2fe82def34315aba6 SHA512 44d5ead01d0d1241d743a8545a619308a1988f2188384571d7d37dca567598f46d1d7d8b8a6ba3fdaf5b5e980f4c8a80f1c098ec4dadf082393a727f7a266229 WHIRLPOOL db21f3cddd0f21f23605c3abed0b2ea9f864b63c7715605bdd24c0345527923d51684f57c7d0b18a6eb5590882530e2f13d52aa3d908353d3c69657b4e499a32
+DIST ima-evm-utils-0.8.tar.gz 32025 SHA256 4d9b467ba31305dd815c56ddda5969db45133c7bd14f4a5356df58ed35221cf1 SHA512 cfa90963426c9adfaa3b61e31c1b63d87407a1dfadd39d4c00f5c16b2b312d7535159c84c7f1854bb143147b5b097ef41dde22f8bba30555eecd8ed0255f3630 WHIRLPOOL 32d47f8f23d4a28ae96178ac443ce9ddff102ccfded22f06796ad23bdff375272cc3f2d4c92eb6bc2d5b9df92fde45e5af4161f20ea9eb1ebc8e0ef2c5c83005
+DIST ima-evm-utils-1.0.tar.gz 35601 SHA256 5701d98069311d0a84ffd67eba047cf46c591f93a55c382a449d10e930b85858 SHA512 f7edec4c2cd0f72291045c0096d198bff49bf892f5c5f7bf772f104613295e7522e96cccb89261c0ac035b0265c9574c14758359ab84c47180095630cf60802a WHIRLPOOL b7c0f41f4b09e141d47906a5c23dd8b729db176df87b59e583bfcf413a51dfd353e3249120a5ee07b7dd12c2bf4df29dc1d6dfe2540267d4746f983937df95c2
+EBUILD ima-evm-utils-0.2.ebuild 648 SHA256 993d32d7480c7515867bebf609bacbd50a8bc96a1e4f4ec86a067b40a843ca80 SHA512 c0b554baba358548e12cb82375c6b0bebfebfcfffce553e5d0efac779a2ec498d355e39377b3ff56cf9f2ac0896ad10db433dd9fe8e006741fe6d7d77a399eca WHIRLPOOL 743a462d428e939687b183fa2613f3a83c4b3afda1e061003765101e102c2023151f1699d8c4de933159c09f4565aebc182f38d213115bbda4859365fd2fb0b1
+EBUILD ima-evm-utils-0.8.ebuild 648 SHA256 8b5fcbfadcd45b22dc100a54e01506fc06252c8bcd95901dc5842766465ebaf2 SHA512 041926b0b5f24446810ae458d8d3f63130fb2b1a87f35e00962191e4c4ae5d8b51608fd0f0980601f6b858ecdf5b97364b0846d9a722846e13115f50f0257539 WHIRLPOOL b5315ddd855f4f170c36e757f7867ecb4cdf9bc1131f4cad7b1175a8c40f5dc12f1cc2414f0e4605cecb7d07d126c05eb5abacbacca83622cc9d2a6c5448feb5
+EBUILD ima-evm-utils-1.0.ebuild 701 SHA256 0b908cd0e8c1d2f6d1ad96988711fb32d2cba9d7eb2cdcdfd92ee47f4ce615a4 SHA512 8770aad2f0d0a60058a91d28214264fc1256d2945c2dcec4894de2fa067d764b37bd7be2f6278a889681d9b2c4419e47074b5126888e2d30b32693365c191a31 WHIRLPOOL f3a35fa75b5227f2507378c57b02cf8cf3c760552a614850d94c71a535043680c8eeb716cef5423d3459444d63a94fb7cf05d3d464a6df72d234e596741cf4bd
+EBUILD ima-evm-utils-9999.ebuild 427 SHA256 088862ee3562c1e89d6519f7f3fe2689b2a23f6ba369913a14e18503c1c724fc SHA512 990a0e5ce17c937156ff56cf23798b623a02455ea3d1f54cd8ceff30e8ef42d90c4b67951dbfab83bda9d335da6d8b283569b6167bef1751650966f4695771c6 WHIRLPOOL 01594dee1c3e06bcc3f073a68d251062e719a6e1fcf9dc4f33efa1299bd2021a241f173dd26684bb246bfd4fc2a421d76ce552f7e18b41a914a9103b55d95370
+MISC ChangeLog 3414 SHA256 11442f6ebaaf06d6740a16fee95b38b921d3f20e6b5295fb48ea4f9389940713 SHA512 429683aeed94bf7562800fcfbe831239983cfe440288f40e9a2042da0388073172f5c8b925cd581480231da15814116232dbf890eb7a723a3e8cfbbcbe6c1017 WHIRLPOOL 53fee7c76f2e1405ef2acb80f3ff931884f37e0dc18e4bf35e48762b0ef0163fb51dc04084f99a4d4b3d11844cef6e1bb07ae1125a452c2640cbe849892c18a9
+MISC ChangeLog-2015 653 SHA256 faa50fd4aa289f14821f02809eb488426bb1927e42872bdb9a5dd8358aafc8aa SHA512 58871ee8e1f87ec6183c59ef1900c9bdc34f66711cdc2981449136ed47919aa73256b1fec6f2e4e4cf7e02a49722929c9f4dfbb7bc2681ee2d3ce68566f16a72 WHIRLPOOL b838e93eb9eef5d62007df6455bccaa59a23971f5a185516e64edc49c2e1ad7fd0418fee98bf8fef364f5e5af42ccc94314c53574591d06f4c48f9f406bdde1a
+MISC metadata.xml 559 SHA256 bb7e28270460b9d82c7f4242d4342cb5af03d8ce4e6541adfce8c8ddaf9a716c SHA512 64c2c269f117b48550db69b200d716d0498d2b320e2ec1c2295684b28a016b7803ee62cc07ba7162aa8b30781334f9a7c8821dded79697c82bfbe4f03e6ea506 WHIRLPOOL 028f91882beb7466f6828b0d1b854618458141ddf2fcf6d086d43058275d6258adeba69807abc4fbe58986659cb2ff1d7c3c85953768d44490dc631cac8dcdc6
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..a7366acbcaa0
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.code.sf.net/p/linux-ima/ima-evm-utils"
+EGIT_BOOTSTRAP="autogen.sh"
+
+inherit git-2 eutils
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI=""
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
new file mode 100644
index 000000000000..8d9db951aca3
--- /dev/null
+++ b/app-crypt/ima-evm-utils/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>swift@gentoo.org</email>
+		<name>Sven Vermeulen</name>
+		<description>Maintainer</description>
+	</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/Manifest b/app-crypt/jacksum/Manifest
new file mode 100644
index 000000000000..5463b17ea133
--- /dev/null
+++ b/app-crypt/jacksum/Manifest
@@ -0,0 +1,5 @@
+DIST jacksum-1.7.0.zip 446595 SHA256 c6e2136b7adfc0ee78c273fdd0ddf7e2fc5741a5bdf46ff3c01aeff2bee519cf SHA512 dc3f96e39fed4f2ca3a7b41bd8a6685cf96673293ff12f3858707a2d61144d74fb89db0218ed1a04164173e2d7fa6d1b973b68ca4c138213ca7f03e03628f21b WHIRLPOOL ef9ac6f701e31f1ac5d9d485f47b03a576c53c0101d0bc2fce414e24cb186a14387eb96a6104013f913d55e7b49fa97fcd35d3e8439a64fa4cd68a9a266f2990
+EBUILD jacksum-1.7.0.ebuild 728 SHA256 d416d5c38d8f3b077d1ba0daad19c46fab82d10652c8c10e3f5cfb25d6f261ad SHA512 e0a8cdbb657cfcfa98c656710c867403291ffee9ef62033853ea92a22b33d3a9d3a1347393142da8dd4c4829ebe121c8cf84428ee226ae66ace5daa763419e13 WHIRLPOOL 3b4127876a67f295787e4763d4eb729a42cd4864bc8278065ed8b843d46404bad8cdecec71f4acd72b5acf3cbc6aac3d2e90a1ef6ff6cc3a472bc87921d16bb3
+MISC ChangeLog 2566 SHA256 bae9aa96908c8567eab197cbed89449325091b0ac71213c390c7f2cca389fb73 SHA512 4d811ae1c6cb44869e1424e1c2cf3287b5c1d4c52bedbb8abe37098757b6e21fe74873e53db244b070cc317b7ddbfc0770b81e7a89ffa68417e57f679c07c493 WHIRLPOOL ced288763a747eeb53caace46b6edaa3e6a91c34c11935e55e3e38237919eaf0f1e724cd0823f878cd656f19c7cb6db5c0c0e6630bba413316f136055b47df2f
+MISC ChangeLog-2015 3683 SHA256 726cbb19a7f552fe29aafeeeef5f5c7fc430a2f9b53c7ba6f5676083cfca6fb8 SHA512 6d96be6cbb5587f9650282911811c24b97dfff1c9201cab4d80598da1af3c0269b18555277634e79e6452782dc2e2efc73bc2aa406897a6ea3cd4f26872a7fed WHIRLPOOL 89283f47cea53b845380db64f1b7ba5a355c3ee6cb1e077d420aaff9e489709599a9d9f72a055be095b527f1a0a5f8110a9cb5a131d9dd413fc005e11ce533ff
+MISC metadata.xml 313 SHA256 01cdcb1c8f89c7ad718dea3b95dcaccc407f2882beee39c5225a2fd17ddaf2fe SHA512 e2c52edb5560223fc1abe958eca1d02e7a42c143c324c898479d6354f03898a38549831d25968ddf48d480c4aedd7430560cc22555dc7582acf07d87481dd06e WHIRLPOOL 06d260b4bc1823d40ba6aaa1a52220d99305c3f41941fd2b577d35f580310b9f8e3e6bb7d10daca25b3fddaf30110526293490e51b3e2b48a26fc6d0a0a23e64
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..7f7f2f04b868
--- /dev/null
+++ b/app-crypt/jacksum/jacksum-1.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-crypt/jetring/Manifest
new file mode 100644
index 000000000000..798fff53de36
--- /dev/null
+++ b/app-crypt/jetring/Manifest
@@ -0,0 +1,5 @@
+AUX jetring-0.21-parallel.patch 762 SHA256 ee283341ce3b3d375c17f9275c517239909288fa564d368e0d53942a2604eb5b SHA512 67f866eb53bf6aab22ff955a8ecc4ae9907f2b6cc430e12c5183a18c23488b53ec1de8271dc853f1a429463228f80aa2f90b6161a5350bc6d85db50de95a5f0b WHIRLPOOL 4785159691e894c6c9cd1602de32b12a8a0ea46333602f4191f7f7ccace8fc2e67dd5dd195aea3fd587b687b1e8e05144714b497131609f0257ca53317816961
+DIST jetring_0.25.tar.xz 208944 SHA256 fc4249e0f874ce9dccaa3a6d8e0207e4b531a245c16d5b37022b0c08b8b50c6a SHA512 aa9de0c7c034093789bf74c75533e678b0822cf0d1261d1b906fd5ef2decb41654bf2facc5c06b469367bb1a0fea4c862c0836fd00635779a2e8dd4f3c08ff46 WHIRLPOOL 5e20d39f77a8db95b77bf643e3e7a9a62be940adcc63cd7bc03569abcdf1179ccf7019eaaa0401f31627d0be4f362e3b3a9f85b6ed2e1cc390dbb078a273b367
+EBUILD jetring-0.25.ebuild 595 SHA256 667f9728412d4000d2f631cb7e2a93a83df457039fb2a53e49308252bf12a197 SHA512 43f69b5b8ce3550ac8d178ae12f6284956c29440eebbeedf2ddac1daedba1984f2765f17336c18b8d436b5318e3a9a3e9970f2c1597947c41df205497eaebb90 WHIRLPOOL 297f2de1562112a9d070b61af7eaae94625e138a9653919e8941b3a0989dbf2a0f8e64b5761e84105438062f3dff4680ccac0f49f98c283b25e022141260dd60
+MISC ChangeLog 486 SHA256 227f9066311857539194d515b42ff8d58d61411624c4d9db81134e7283ab2c9d SHA512 f5813344d8a92c7dd6bca1d8e009c355bc2f7340b4639561b96ac5a1e6ed1fc0efe89a1bdad8458003f88a356d5aa7eeae28083e63cb39f79c421d2f2a12fe31 WHIRLPOOL be238865fea385e4a8b1842d5c5fa3da6bc83998e4bf4ab299214dd5e9b499e2cff4cd0b699684d967b6c4312e76054b6f01f5491c2598a92302615b6725b09b
+MISC metadata.xml 249 SHA256 abaf8c3d7632caaacd242fc7f4d5b1377778c50c7bfa5c356b35773f377d4f69 SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273 WHIRLPOOL cb6e12eeeb412f25a85ebc6322f4b22a14c7c23fc7d49a46e8168cdbf425e121a276fc4e915c4626ed9b64d7f7aef50ee11c428ed149126999d277adbea1f57f
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/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
new file mode 100644
index 000000000000..118a65f34402
--- /dev/null
+++ b/app-crypt/johntheripper/Manifest
@@ -0,0 +1,12 @@
+AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0 SHA512 7aac967890dd57a67b6248722cefe9764e6ddfb280cb06f511e3f71e16527689098d39a80c32316f343030e3e5161e0e0003b83f95707b6a89dbf590fa5256a4 WHIRLPOOL 470ef8046765f009f367adeb217eb1300f99e517d07e3ff01aa4b38d2a529b39a2ca9a8d7dea45956c2f209b3acf5d0aa3d442cab5c148d05be893a0646e33e3
+AUX johntheripper-1.7.6-cflags.patch 2927 SHA256 3c4438ec4dcc3e8c81f1180544cd005f561a013b25ea51ad36189ced8a29f36f SHA512 47d9f074c9a639caf2366c425220f03c4daf882cbac3d86fa2649a5b12de3784713800be0f719a37b0b92c0c4b0a36ded247c351f894514cfa8fe67a0e23c732 WHIRLPOOL 9e209861eef8276515fdc46573a5ed2ba9dda658aebc6c767481cbdd0ccb1c30d35a8b1463b973a81c957dcb76455697814a8461f790415a7c07730bfdfba155
+AUX johntheripper-1.7.9-clang.patch 454 SHA256 8a6b1816e2251a467eb7c03c251d62ddd802204de0b8c42acdc3641bed5735b3 SHA512 8fe7579f9ff27e43d1d42287823a8c885b8095600a076cb5807c4fb9f94798e730b817a56f8e3120a762959d06a09e9a4e312656bea4cee858198ae4cff0b5e7 WHIRLPOOL dfb0135cdc432fa42d41d25e48a037ea2ca86234b704e93509f19849bbf3c521a4ea68ea2cea64652d6031dae232d7b14fe5b76c3faf9cebb620eabb5e655272
+AUX johntheripper-1.7.9-ppc-compile-fix.patch 444 SHA256 cd7174313d4592f39274e473623a8943c86c92ba896df23ee9cbdc6c7673d4fb SHA512 4af86bb0c5bfc4d88914f195744a596a71236fa49340b47748974a242fde82266fb6bfb41cb266980a3367b1c1a3797960f057a42c5ece3cdc09229c5a4a1513 WHIRLPOOL 6da1106b38cc3129ff1e170366c255c44d1e159bd158c5a743279225134c4899c8a7325f87cbc40e269e64aaa00d33ba0a6972778e6b44e10c01925bad0ba948
+DIST john-1.7.9-jumbo-7.diff.gz 1074044 SHA256 9e87e5660965e6e55214176299f67dd1b8a40820805441c62a57af6a6a4a19f5 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a WHIRLPOOL da09df93277d90580cd08de2981a9d45df89f9a82f901f8bdc43acc66b97b6eb5515e603dc691cc000852a0847b943a104dee1826a59a000e09488604224f15a
+DIST john-1.7.9.tar.bz2 717505 SHA256 1d40083e37a7bc1ba1177651cbb27898dcf2a812b8ccf1430db0c372ac6dc199 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b WHIRLPOOL e217d3ae3bafaa0d2465402a1c98f05018da9a95ce61effc7f2f20af4aa9ef9a54a636fc7025dfc283e815f5ebd07fafd64e4b01564739fe97053dbeafbd2b13
+EBUILD johntheripper-1.7.9-r10.ebuild 6458 SHA256 fa3a2b3305e0fb345b4452a34fd32a8a6abdc4eb14c9a19f8f450c0eba8d3445 SHA512 8f501299c07785dd117729a0b7140c06f95c821079ea3aaa8012d0915ba74e248de7a9da33e462ace27ad93298f0f08261689c5bccbf7df07e86fd13c4faa641 WHIRLPOOL 7c11364916aa3b8bccfa4c88c742d3f7e75ab6d38fd402c70a0cbd2f6f3ead82ed812dd0ae2012fb3e271088c8308bfe52242e97290a0202ee67310b1ec2c613
+EBUILD johntheripper-1.7.9-r11.ebuild 6502 SHA256 44db878d9cee087a49b3829fb36cffc06339e3a515c878149ed75228e367b36c SHA512 3c622e14aa90edef71ee68efeb514d7a99c94b8759b621f6b6a4f06fc60867b612c9ba9c4c5ebc92966efd28c25177eb1464923ba77006569ca5de51a86e0f96 WHIRLPOOL bdbaed8ad25838369eeb182ac738dac436f2f6ab56be79c39904652feadbc669d5e3b8b37db5db7e310675f038da29ec867ea128982859c48aa1ad20b362eb34
+EBUILD johntheripper-1.7.9-r6.ebuild 6006 SHA256 2faba4c76ed7789b584ba389ecafb23752ad8c92280587989f2d23b228c2ba1a SHA512 c9d890a764acc3e6231203c486da1870d31c70596e8543cfae61bf276c6cc08bac5b211946b1ec78644a1b6307ac854d3dc046fce3e89e294ee6210c9d7b1a90 WHIRLPOOL efd1dd9bce6c628f31eaf24f3aa6af5b10e11202f73472f5e70b3c50bdb515f5cbce42734c6de223eb529d42222ced55492d54711326fa7dde82bf854c670d6d
+MISC ChangeLog 3375 SHA256 a64a3e0d13ba813acb0dc3df0956b606c23fed899594d9955ca2c0cb0674c7af SHA512 5d72d92970b32c4f1bfad49b93b1c38b1968fcd5b21ad907cac67fedcfd5a016b237cb781a3c553bdaecc615d5e9dc3d95a577ea79933a5c27bb15bd5af0247d WHIRLPOOL 756739c72aee260361343f5e4d5e57f204ccdcd55318511ea081387a455c381fdc4b1568c02cb594fe6864a283ac1e924c0d1717d5d518a08b375a3314143b54
+MISC ChangeLog-2015 28703 SHA256 374cbf05dc93924e08b672c8266bf686248aab8593a11ec91de2f71f4f14458a SHA512 d88a87a673d00584eec8c901f6156ab4500a7307f889a297eb32f3cda7c94533c3b1e5a6c3602e36869513c25b469338b70c8acffb8f5334fc4ef06c9dfcbd1c WHIRLPOOL c08eb6745d969aad7598c51a65989c528059905859385f1b81f2a7d5ba3bd98b7cf206fbf4420fe86d78b3888c24be4a9206baa88281c899fe2f2978271366ea
+MISC metadata.xml 698 SHA256 1cc08fedd1da223180d854c2a62ca74f141c1f0b84574ca6ad70d4bba081d63c SHA512 148a01668f397d5e9cceacd4eb7ec903da251db713ce31a5a82d1e57af2aecbf9483f07226776039c3886ce96bc064199277e1d8af26679ae27630bb65d35feb WHIRLPOOL db488b951aac23e9ff34c353ed8831dcda22f38c5a165f74256bc65af44226d02d712eb9b8a2fa26d7e3f456e2471c3413064fa411756af3e88fed6e96427ba7
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/Manifest b/app-crypt/kali-archive-keyring/Manifest
new file mode 100644
index 000000000000..e60fdc38c096
--- /dev/null
+++ b/app-crypt/kali-archive-keyring/Manifest
@@ -0,0 +1,4 @@
+DIST kali-archive-keyring_2015.2.tar.xz 6448 SHA256 11c065a216b4743f66df3faf7a1e6b461a5a0827fe30eb066acc5460fea6fd25 SHA512 3f680fb31f0723f0c4b8aa7053488637c23ef2804a688ad307365c6eaa71b9559dba31c8aee6e9804b9f03e24397c077f4f057e58da8f7e06ffc5d36003d23ad WHIRLPOOL d72ec06be2b6a7532e5576326e1b80c9ffd97a2a614b4feed6dac0af05e66ecb033824ed43b9d7d6e7d0dc410ecc4a4459c6ec9c08252f7347c44cb7160bbc7c
+EBUILD kali-archive-keyring-2015.2.ebuild 387 SHA256 0f613a5deb0b667b0e912e5d54a7b4ad7d4e2f4e84de71c06fb07b09dcefa47b SHA512 0cdb25c89101417df9fca24ef7f17a639632d7553b7b359768e1bb01a48f8b69e2dbb3d1586811401cc399955ffd635b2705fae00c1b01533235ab8a69682aa9 WHIRLPOOL bf4d82df6bfaad094f0c1313f18cef96f358705070977c956bdc5f0a079d8c9aecd3c75278e03d88fa5229df3122a77ffe77de5cbb7a7da6e2c204b08cd329ea
+MISC ChangeLog 461 SHA256 ea21efcf5c8d3f901063c456eb7d1418ded49bf4d30eaa97228b7f51417c1311 SHA512 9809d7eb184f7ed319a6a01f098a0acd439eb134d961a71af7b7e31b45c1b9b571bd88e589f21a5d74116b05c366cbe6af736088206aaca9a6a593d6aae4c54c WHIRLPOOL f5694ae7f5fb7374739f72ac31aa534435b87512ca5d1de2bfbf66dc8524050447934b0521d1454a3dd4329dce90052b2e38cd57feab41462dc6ad7ca3762de8
+MISC metadata.xml 256 SHA256 c0f7da0ba00ad77a64c842528a2c4b966497bf5e1771fdf5a6c393e6cf5154dd SHA512 a67fc42e4fdc5839523b9ca9a2d84c65e9fb0a57305d6b7e0d5b309769825c98df750e903665df1fdcf14326820982965a489d5fb39791e647949fbcc8b04bf9 WHIRLPOOL 825a2688ed13de9f7c0422fc88abb8251fd10df166e54396bb15557910482365fb17d541adc6a1229547ea193805ebf574bd82d273f1a74571ffbadab08232aa
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..17144c57503f
--- /dev/null
+++ b/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Kali archive"
+HOMEPAGE="http://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..7b40a4a52cfc
--- /dev/null
+++ b/app-crypt/kali-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>steev@gentoo.org</email>
+    <name>Steev Klimaszewski</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
new file mode 100644
index 000000000000..467a6790710c
--- /dev/null
+++ b/app-crypt/kbfs/Manifest
@@ -0,0 +1,3 @@
+EBUILD kbfs-9999.ebuild 752 SHA256 b5abdbf2a7d44fb06da258e513484fdacb1842b6e0af64d8a4a38391a73ba5a7 SHA512 0b574434c4ddc944b55553233e8ddea35c3e4f9098f65afd97b72ff44c970dd8a0a54536f9a24ce3fa32c56e0a71a9540abc6a7414baa3d9ff527d82e59afd27 WHIRLPOOL 94db70cc1d7b1b79c7e405a1f2740b530b45406b0714f5fd55a613fbb8afba68db983794ab601e71091b18ed3051f6a92a7b1cd8a4b7334aa7239a65214559e7
+MISC ChangeLog 545 SHA256 7c3d6193bd8654db693f401ed27d9cc60dd12ff2a1e744134da2145a6760dca4 SHA512 6c61730b6049b93d8b9022fbd93cb94196c0b034c958008a03e5c357ffe5e2fe22666a09680db2e4969636a36d637d01c8b18149d5e0ef4b8fcb2bd02a5e2ccf WHIRLPOOL 534b0d371fa15d662c4ac4b2dee130ccad594eefb509804d7054266a42b75cf35fd3e7c5411255272436a2db5c4c01abbe41033a7d692afcb04e195b89bf3f06
+MISC metadata.xml 370 SHA256 7e81ec48aa303ecdf8c2328b1ec9017508864114a7bf600476ad16684c965bf4 SHA512 47d589c916847a608e4862d2c8f20d9207719c4feaa896a173456d419794d1528b63d0fb62effac28f309951215cc042f62cac44bdee384b4d50b4f626362c89 WHIRLPOOL d2c308a0d02e55a5e7b4cb81b24dff43e127f5fd921eb0360432d25c807fe0284a2cdc12c31bbe4ebfcda6554359a60dea2c46c6f2619eb3580b5e6c1f045117
diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild
new file mode 100644
index 000000000000..4da71bde3c9a
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+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=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0
+	>=app-crypt/keybase-1.0.17
+	"
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+S="${WORKDIR}/src/github.com/keybase/kbfs"
+
+src_unpack() {
+	git-r3_src_unpack
+	mkdir -p "$(dirname "${S}")" || die
+	ln -s "${WORKDIR}/${P}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/kbfsfuse" \
+		github.com/keybase/kbfs/kbfsfuse
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+}
diff --git a/app-crypt/kbfs/metadata.xml b/app-crypt/kbfs/metadata.xml
new file mode 100644
index 000000000000..b925088bda74
--- /dev/null
+++ b/app-crypt/kbfs/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>nicolasbock@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		The official Keybase implementation of the client-side code for the
+		Keybase filesystem (KBFS).
+	</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
new file mode 100644
index 000000000000..334d6e22b548
--- /dev/null
+++ b/app-crypt/kencfs-plasma/Manifest
@@ -0,0 +1,3 @@
+DIST kencfs-plasma-2.0.1a.tar.gz 216580 SHA256 8a46fd2f2f490323350ae17d34d7c10de1afe73943413a3e2cc10e52d3dd6eb6 SHA512 a9093680bb141c18e2d4ed8a966f7176c40c10fa0ee6e5cee25ae26ef3f94e6ffc7e3f0a7b55321640e4ba6e484d75755f901b53688dbfc5c22a1c0b1e01cfac WHIRLPOOL 146aedf68686611be6bbe69c7b9370e27780c7bf33f1ea962c4b48a895770be0b50a03257a8d74b38eef99fbbdfa85a7c116b7f7385b80e343a3063b79f895e6
+EBUILD kencfs-plasma-2.0.1_alpha.ebuild 896 SHA256 6988818e053f2daa732fe7fe75ee996960cda99570291c57bd3b365b03607fd2 SHA512 011f88640c115e3770f1fc58a01864d847b6e3d3b01842b55211241bbf6f01d3e1816cb034f09e569c70e60056705d06239a420af8150885b87be681f6c0c328 WHIRLPOOL 2bb43b2a5edef7af4a4f63d6e4148c1aae0dbbb4f24742c805576a366994cf70a3e0ed614c2a3a2194eeb31ccaea10526d8657f48ca5b44d6a8b64c704e22e9f
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
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..51d97e164f65
--- /dev/null
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
@@ -0,0 +1,48 @@
+# 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}
+
+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/kencfs/Manifest b/app-crypt/kencfs/Manifest
new file mode 100644
index 000000000000..3241f02151f0
--- /dev/null
+++ b/app-crypt/kencfs/Manifest
@@ -0,0 +1,7 @@
+AUX kencfs-1.4.0-encfs5.patch 413 SHA256 4c0eab8077163535d519cdd9de70c8561a4f3f5698f8c1a9c559d3271b1ee317 SHA512 47cb411f80bb4270d3c7e0b132949e2b0185b5170228120ee336fc1bb8ee83c9c0a960746407e8934097381a558be941d08d6e28b774423e58102a3f82a66ae0 WHIRLPOOL 5565e1de3feb3c10ef76afd90015f633e7b90ea985956ad0e2f6d37905bbd4d8ca2c0eb93bf67140bdc7b9c7d3c56d3cd16017b530ee87b6ce4950c401cb035b
+AUX kencfs-1.6.2-desktop.patch 228 SHA256 d39d44d5714e6976e7cdf18abe22e0134b02800ca7c45651d98225fa310ddcf4 SHA512 0f96b65f43fd08cfa116381e5db1ceec81eebb076dca9349d7d3781651bdc7d04e8f4d0cc611f793e581416304174286db98c6aee814059520a47f26bf885d92 WHIRLPOOL 2685f3cd9f7fc2bb385a19d228e95d254255fd010f4dbb37ecb3b2ce7f506ff74d032874540d674ae915997a12c3b780d10e25952e19182b832ccef41d317b49
+DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
+EBUILD kencfs-1.6.4.ebuild 832 SHA256 e695d523b5078cc5537bf8323e25c9a681b892d932c7007831f368fe96b9e52d SHA512 a849eb9d03e52c4401f1320d2aa2d51cc60f5411748a3c7b06c88efc1f18fb0db8be77bc7e33b531287b4e0e491b7160ea35a281d66b3b85845a5a1e4736a7fb WHIRLPOOL bd2327b4d5cb1f4f19e56a7420997fb33e8eeccbf5adb98dfbcb7d580010307e4dc2c8cf6b45bdb1c5d151d60a3767ff5250c81b95dcf09fc20587d41cc1e6e5
+MISC ChangeLog 3459 SHA256 b79badaf2ac0ea794180447405622082098e4e7cac9a35435ec1ee44c58d8032 SHA512 16d14016c0d406385e5c95926dd4267ef49904b86843220f1a7bee6ae095286324a98973c6b540c953e269e15e4fa2784189caca43f5489423235e926899009c WHIRLPOOL c1d29c802eb5da17421e02396725ac04b604accf9042213c667fd0176d52308f982d84112e25f3ed2234a5b0f7b218f4ec084cea11f801857ca5a7c3ed423327
+MISC ChangeLog-2015 2644 SHA256 01a32d4dfeca20561235cc382f170cda00ea155b5863970820ecfe5298e58f84 SHA512 24df8a5a5ead26fe64c9f9059d52fa74be7bf5da54ca07eb327b57f38f30c90221c519868ad9c8deffd16a9f3f71022848d2a5b7adbed3dcef03679094ea0141 WHIRLPOOL 1e4c5302fa53aa2b738c4b8c9e619b6122ee391e574986fa8943a8f5f50baaf04a471d76f0371e00befe5fa27e8da65a5196c8d72507df012d68ae44897c5f6d
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch b/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
new file mode 100644
index 000000000000..6687ac0f1f9b
--- /dev/null
+++ b/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
@@ -0,0 +1,13 @@
+Support older encfs5 volumes wrt Gentoo bug #446652.
+
+--- a/fsDialog.cpp
++++ b/fsDialog.cpp
+@@ -161,7 +161,7 @@
+ 
+     arg << cr << pm << "-S";
+     p->start(prg,arg);
+-    if (! QFile::exists(cr+"/.encfs6.xml")) p->write("\n");
++    if (! (QFile::exists(cr+"/.encfs6.xml") || QFile::exists(cr+"/.encfs5")) ) p->write("\n");
+     p->write(pw.toLocal8Bit().data());
+     p->write("\n");
+     p->waitForFinished();
diff --git a/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch b/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch
new file mode 100644
index 000000000000..2d8683f11e46
--- /dev/null
+++ b/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch
@@ -0,0 +1,11 @@
+--- a/kencfs.desktop
++++ b/kencfs.desktop
+@@ -2,7 +2,7 @@
+ Name=KEncFS
+ Exec=kencfs
+ Icon=kencfs/kencfs-icon
+-Categories=System;Security
++Categories=Qt;KDE;System;Security;
+ Terminal=false
+ Type=Application
+ StartupNotify=false
diff --git a/app-crypt/kencfs/kencfs-1.6.4.ebuild b/app-crypt/kencfs/kencfs-1.6.4.ebuild
new file mode 100644
index 000000000000..f998854329f5
--- /dev/null
+++ b/app-crypt/kencfs/kencfs-1.6.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="GUI frontend for encfs"
+HOMEPAGE="https://www.linux-apps.com/content/show.php?content=134003"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	kde-frameworks/kdelibs:4
+"
+RDEPEND="${DEPEND}
+	|| ( kde-frameworks/kwallet:5 kde-apps/kwalletd:4 )
+	sys-fs/encfs
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.0-encfs5.patch"
+	"${FILESDIR}/${PN}-1.6.2-desktop.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i ${PN}.pro -e "/^doc.path =/s/${PN}/${PF}/" \
+		|| die "sed docdir failed"
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/app-crypt/kencfs/metadata.xml b/app-crypt/kencfs/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/app-crypt/kencfs/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/Manifest b/app-crypt/keybase/Manifest
new file mode 100644
index 000000000000..1dba45d89cca
--- /dev/null
+++ b/app-crypt/keybase/Manifest
@@ -0,0 +1,19 @@
+DIST keybase-0.8.25.tar.gz 7109238 SHA256 e34b128f48e27a1c3066b5f3f19d99df735f9be4f1c867d1d3d408c8e12983fd SHA512 b6986063c34a18bd91148e588d43545f8baf7849cf80ea03b88d26e1f3dd6684cc9e5ebd5e10ff5ac0639fa308c2e07f577b6a7ded6f5bf4bd4510e64bb31025 WHIRLPOOL 1413eed7f26ec6b2d17f63d6315baac48d6a7f0935c3608e4ffcd5cd8df7f13db01e8d93ce76b33b4e0ceb322f508a3601e37be6cad86c20e976bb33012f28db
+DIST keybase-1.0.15.tar.gz 45781588 SHA256 6fe66b07772ca000879bda65cb9d112d2dbbc301d6afa4d4b46055d385f86e36 SHA512 623a952d88e4c9519073c9e8c81b2d53bddd081e048dbe127b658f91e97a37493767ced36a07dcb65791f1f3abc398bcb6456a921b4301f86c31dda5b8fdccce WHIRLPOOL 64b8456bd12452a70920e3dea93b0fda6c2f0f3a48449d0aeefc1e335aaa140f25ed5f2c5bb3c61828dbe268851631553b760c0e1a6a43fdc3d1198d2d2420a5
+DIST keybase-1.0.16.tar.gz 41810206 SHA256 e8a7ecb56153c1068432ee7d13b861987066217eaa8d5346cc518468b618a112 SHA512 47fcc2034070e84f9d1f1925a98e030c95ccc766b52ac734c2b746bd719cabc3f3cac95ea00efacd42ccc95945318c5fa5e3272406f32c50530339fc4524ef23 WHIRLPOOL 1ea1d2b14852e63aadbf0607255ae0dd37d7e27b34d6ba86e8ae656146c0d81956c8ea65386f574893e5c5343f660ca7b131b9fd356a306566cd726217fe6794
+DIST keybase-1.0.17.tar.gz 33200376 SHA256 937b4bc61c889ef3982a5352d8a49cda8a4f4db28732d4cb21df1fe20128399c SHA512 56334779ab7c11a947557af7d22c662d862804104fff7c853776b0bb28116ae4b789abecd6b75d07a440fae0fc3af4438b85fbd271eb1310c8bf77ce1017e145 WHIRLPOOL f2d44ac207796b1d514e8bb87aced0ba0cd82f64fde87b910f603926364f70d7fdea79b23e1dc2c29efc0278f5c2eb80a53b3efac2d157008eb327a38622566c
+DIST keybase-1.0.18.tar.gz 19860878 SHA256 8a4ebcb3ce8e3ed3649be870ab407fafeaeaed23c399f18dc25cba50fbb7f5a6 SHA512 3b8938839421da0fca2958c576e5987abeaf178c01ad979fe0b88d55bc5e93180951747dbe59bec26597c1ce41075e80a76af5a3666e7c248b640ad6b1052ddc WHIRLPOOL c48d3417833a6f9bd835d85cd4116923bb35268182983181297e4811c4f76bf730713dfeb3d61dd89ae280b2e318e8fb34ae54f5dc515a96350f0cda12c9388c
+DIST keybase-1.0.20.tar.gz 21506558 SHA256 792545bd527ccc815f2edf8efebddefcd55417c25f6ef16b85e95e9d79227023 SHA512 dcb727b701d0178c94232e3746fd0de6f13121c10d8c6be714f082d382881d727e0b751e0deea184a4ee2bedcfe56b7ba72e60cab5671f2388d5d9f7f53ca05f WHIRLPOOL a91f657ffe4ed98fd4d76c77bd5cfc5263d5d2b1d228ed485ba02eabd5a395811a35152ac718919f2c82f7b128ace708adfcf6d2388bb5427ce49d4dc3c54e46
+DIST keybase-1.0.21.tar.gz 21127410 SHA256 a9bbaf16cb7b7cc3614ca5e76e0fb1b3bd164f38e14b9d49d4ca351941c8c0a3 SHA512 60801ece5dc0df9f0da58143baf00729e1a79183d2b8209c405749f422dd8cecf7f4059e0799c88ca6e3f1e5a7ad8bd6805dd2401b0945954c6b1465c04974b5 WHIRLPOOL 796d5e89f87575cfc621c714c304b0a502773511f5d43d178c0f4484e3386df6975f665b723ceb0f834fc5d4be0c5c288324a15e5d0d9b2633fb984e3f8cf183
+EBUILD keybase-0.8.25.ebuild 705 SHA256 130b3f2c0763e60d48b2065629ef092c58ead2e23e326439fa1719bb0e9d6ca1 SHA512 c41b070e838e1e2521d38f66b49150bca7767486665fb9f5e69fc882c4f18b7dc4908b2398573f41f426dd2efd172e8c85f84a69be491b081dab2f8563d45ef7 WHIRLPOOL 7f506a8e49d028ead470b04c9821e35662da943e244ba9fabb3dfe83d65af7b0d886886381a55c7a2c273442d706b22a3c74ed9fd21168470af172ee721666a1
+EBUILD keybase-1.0.15.ebuild 844 SHA256 cb25f42f2e8564a7e422e7c7dc321dce0293a8f1369aeaf29c192d3cd3302e63 SHA512 fd348963b7796b54dc5cfa7ab00bee2c7868756b6ea7689f44818b04814bbc5cf824795a5b8789a203cc85590966c43af2e5a7c0dc6128ddcc6ac88811f9f570 WHIRLPOOL fbb8263c270f10cb56441688b473ece571d09829b1ec3daa8eacc88f17c49283ad619cdaec112fa59567578820035735c292635d6fd2edcf34045cf6cfee25a2
+EBUILD keybase-1.0.16.ebuild 844 SHA256 cb25f42f2e8564a7e422e7c7dc321dce0293a8f1369aeaf29c192d3cd3302e63 SHA512 fd348963b7796b54dc5cfa7ab00bee2c7868756b6ea7689f44818b04814bbc5cf824795a5b8789a203cc85590966c43af2e5a7c0dc6128ddcc6ac88811f9f570 WHIRLPOOL fbb8263c270f10cb56441688b473ece571d09829b1ec3daa8eacc88f17c49283ad619cdaec112fa59567578820035735c292635d6fd2edcf34045cf6cfee25a2
+EBUILD keybase-1.0.17-r1.ebuild 917 SHA256 688e5d0c6312a7183898a6163c9d985f3f8654bbd1062b25c7b069f5da293cfd SHA512 bae77091cdb2e7b8b0448f900ca8e469d3be61c0940f246c70cce6a9fd074be116796284d217518a7dbcc0305433c0293fc0b649d79c289116399b5d6d37861f WHIRLPOOL 4b74b1bbb0fa62e18443ee9d4967d32a7ac951966545a3bac237e5f029fa2c878f33f4797070f809e494c25761385bce116270060da56959e42870d2d5fc27dd
+EBUILD keybase-1.0.17.ebuild 844 SHA256 cb25f42f2e8564a7e422e7c7dc321dce0293a8f1369aeaf29c192d3cd3302e63 SHA512 fd348963b7796b54dc5cfa7ab00bee2c7868756b6ea7689f44818b04814bbc5cf824795a5b8789a203cc85590966c43af2e5a7c0dc6128ddcc6ac88811f9f570 WHIRLPOOL fbb8263c270f10cb56441688b473ece571d09829b1ec3daa8eacc88f17c49283ad619cdaec112fa59567578820035735c292635d6fd2edcf34045cf6cfee25a2
+EBUILD keybase-1.0.18.ebuild 917 SHA256 688e5d0c6312a7183898a6163c9d985f3f8654bbd1062b25c7b069f5da293cfd SHA512 bae77091cdb2e7b8b0448f900ca8e469d3be61c0940f246c70cce6a9fd074be116796284d217518a7dbcc0305433c0293fc0b649d79c289116399b5d6d37861f WHIRLPOOL 4b74b1bbb0fa62e18443ee9d4967d32a7ac951966545a3bac237e5f029fa2c878f33f4797070f809e494c25761385bce116270060da56959e42870d2d5fc27dd
+EBUILD keybase-1.0.20.ebuild 917 SHA256 b61d8187307807e750719164f6192910b171c2b034343287d63273769ffbd43d SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38 WHIRLPOOL 9e86cc30fc8c3fda7bb1ff7c32339d55257f6a4bacbccb5a2f55f1f3f868c23759a2b573004a4809156c9bc9eb0315e89eae1b48e1a8a86f2fb3296df49cb691
+EBUILD keybase-1.0.21.ebuild 917 SHA256 b61d8187307807e750719164f6192910b171c2b034343287d63273769ffbd43d SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38 WHIRLPOOL 9e86cc30fc8c3fda7bb1ff7c32339d55257f6a4bacbccb5a2f55f1f3f868c23759a2b573004a4809156c9bc9eb0315e89eae1b48e1a8a86f2fb3296df49cb691
+EBUILD keybase-9999.ebuild 893 SHA256 cd796970b88c6c66ffe2619061a4f4b572da4352d8925bca3a03b38a62977fed SHA512 763f66c3a48a668a5382cad7ddef2d1bc2c4874a6bf226f2930401f1e932104631a68ee89b9cd37bf794959447b64381c04ea60567c38ecb625b64d9267ed5a5 WHIRLPOOL 6241205fc9248327b9bc1d680382c39494dcd8c9b6fed97f8f864b6aee31339823f4b4db2376a5452ed435a9fd83ddced5841f7c1e0e61695ee276bb74120555
+MISC ChangeLog 5985 SHA256 1ba6960f91cbd196f2f77be504774e96386a2013f958de0de0f1061b076e28a5 SHA512 c865f93f64987be8820bd5fb469f8d66d1febb993968f6dc7d149291eb46d8f58c2a126926581c3d0615ef65133629ee0a5b4840580622ece91c8c57ac9125bc WHIRLPOOL a084e1940ef4eb3388828a389746e117323a4bfa89dd44a046ba135536f5b9070fe694f9e2d94bbf48989b8239a7ff96cd7aec4e5a524f62c9c3dd544fd474d8
+MISC ChangeLog-2015 1372 SHA256 38d5368a564264c24ab0a7bd33c745af8dd2519491894034b0a5259755ca3def SHA512 d8dda73484d0c2fc63b89eaeefe83a3cb9292da5cbe59aec3c5bc4433656f335787e3f0557a4242e51e56e562d466b2ec95f715dbb6377f788290bad59d07c21 WHIRLPOOL 6a4faa59700ae2c2c1cec0ad4a83c2f7822fb878d9ab66a1eb061036702e5bb48f4f5e7688062be8b53a714ba48708e48b14c18b44685cf3866b6b617c80b1e9
+MISC metadata.xml 465 SHA256 81beefc9e9a77f06dfc91d137fca419a49735e73ac2e52806867ebafcafba4fd SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810 WHIRLPOOL 5c988e5531892d1e7fcbc67f6a9af8543f89627707136aff83b5502be4cd5b532cf6fc1eb8f799dbf490e56799f44450e259417ea2b5e77e9288d65d0712ffeb
diff --git a/app-crypt/keybase/keybase-0.8.25.ebuild b/app-crypt/keybase/keybase-0.8.25.ebuild
new file mode 100644
index 000000000000..52d988620f7d
--- /dev/null
+++ b/app-crypt/keybase/keybase-0.8.25.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	net-libs/nodejs
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mv "node-client-${PV}" "${P}"
+}
+
+src_install() {
+	dodoc CHANGELOG.md README.md SIGNED.md
+	insinto "/opt/${PN}"
+	doins -r package.json bin certs json lib node_modules sql
+	dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
+	chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
+}
diff --git a/app-crypt/keybase/keybase-1.0.15.ebuild b/app-crypt/keybase/keybase-1.0.15.ebuild
new file mode 100644
index 000000000000..b69be35c597d
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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.5: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() {
+	GO15VENDOREXPERIMENT=1 \
+		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"
+}
diff --git a/app-crypt/keybase/keybase-1.0.16.ebuild b/app-crypt/keybase/keybase-1.0.16.ebuild
new file mode 100644
index 000000000000..b69be35c597d
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.16.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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.5: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() {
+	GO15VENDOREXPERIMENT=1 \
+		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"
+}
diff --git a/app-crypt/keybase/keybase-1.0.17-r1.ebuild b/app-crypt/keybase/keybase-1.0.17-r1.ebuild
new file mode 100644
index 000000000000..8f9e2fe6b952
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.17-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 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"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/keybase/keybase-1.0.17.ebuild b/app-crypt/keybase/keybase-1.0.17.ebuild
new file mode 100644
index 000000000000..b69be35c597d
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.17.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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.5: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() {
+	GO15VENDOREXPERIMENT=1 \
+		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"
+}
diff --git a/app-crypt/keybase/keybase-1.0.18.ebuild b/app-crypt/keybase/keybase-1.0.18.ebuild
new file mode 100644
index 000000000000..8f9e2fe6b952
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.18.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 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"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/keybase/keybase-1.0.20.ebuild b/app-crypt/keybase/keybase-1.0.20.ebuild
new file mode 100644
index 000000000000..92df05b55e79
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.20.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 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"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/keybase/keybase-1.0.21.ebuild b/app-crypt/keybase/keybase-1.0.21.ebuild
new file mode 100644
index 000000000000..92df05b55e79
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.21.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 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"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/keybase/keybase-9999.ebuild b/app-crypt/keybase/keybase-9999.ebuild
new file mode 100644
index 000000000000..09718d4794cd
--- /dev/null
+++ b/app-crypt/keybase/keybase-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator git-r3
+
+MY_PV=$(replace_version_separator 3 '-')
+
+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="
+	>=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	git-r3_src_unpack
+	mkdir -p "$(dirname "${S}")" || die
+	ln -s "${WORKDIR}/${PN}-${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"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
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/Manifest b/app-crypt/keylookup/Manifest
new file mode 100644
index 000000000000..eea9ac92cd63
--- /dev/null
+++ b/app-crypt/keylookup/Manifest
@@ -0,0 +1,6 @@
+DIST keylookup-2.2.tar.gz 13188 SHA256 8c8f4f488e144761bbe80cb5de0927ca2acb8c0fae3b50c667a061b4a4dba917 SHA512 e9aa931bdf33a720b1262449d63e7e9592b375526eb33832ff966968a20dac1a0362e0db0e4444dba868ee4ad8c3e553e9cc3f3c60376d95b8a303e05d722abb WHIRLPOOL b4ae16896350df9bc35b30ce8a7cb92926e85d64cf254a0deb46be53bd35063351999cddf33c930d7e39c0f195fc2e6ca6cb3a363a7ed523a567e260a1e9ae88
+EBUILD keylookup-2.2-r9999.ebuild 364 SHA256 747cdb90af2cbdf2350a4229b7549e6b4db0c82f4f0c501bd01fad2c8c6e7f6a SHA512 06759099403a2e0088e259c67f851eea279643f48a2f22ac590aea8b30c4bf03580c16b008a86e57c00c003f02de208115555ae97801beaab187c2b33e8dff18 WHIRLPOOL 8af4364a945263fabe25ef2b3facbe2e63512b4f4ad12c542ca3008361233a43fef861e4f2ceb01a18820a4b2ea84ed967ec108ea59a3af8ed8d0e8d6f2bb2af
+EBUILD keylookup-2.2.ebuild 488 SHA256 31c5aa9f8bc2541ac8660642bd3d8b78cef19c56cc100763d9b23fbf5197904c SHA512 51ed69920a60eb4fd4e8d8e0a84d22c35c1cbd2da4eb83ff10e19e9c8b284a267d740b4f8ef0d7f014c3ab80875204b89629c1077f54f8e3a6c1eabfd1f008cc WHIRLPOOL 7dc8f7042f098386066b1b38e80458d219c8747301cb0ac50968f4bdbd158cbd2c35e46953ff7a21e5986099c353568eaa8402a1e730d0446cc65441930131c8
+MISC ChangeLog 2589 SHA256 8d917ddd51387d0d3eb04cb6abeac215a17d5821854b953e1a340dcecd7b23ce SHA512 0a5dde72192513533a1713f62ca80a110b99469f9a20a7575054a76b2a5004d9f1ee04ec74c7a150553f53919994a53f3c6f6a8d2d54aa2366a9cf1277c9e443 WHIRLPOOL 4e1363b5bcac552e0af08573134b90a5efb1eb99feddffb1af6d6dddf8133b1959908cac2caf6a11fa34d3ea49e7cac01f415693029f9f1e12deb3f395154253
+MISC ChangeLog-2015 1448 SHA256 da13f5141ef34d93377b03a8ff0307b1f310b89eafecd0d317f56e1bb2f14391 SHA512 23f0f1d7351921bca266e6128177f73aa276ff07fe95e69a636f7f4b4cd5e391d55a18c585e7717afae1d4506ab0ca543bb93f0f6c700a38620eb6914f45293e WHIRLPOOL d0a989f8a52cb74c91300fe0efcaa5c17f50808395f52ae695c2717501ce3258c45c72b6cd163cd0ab7621aea2b00d8bd5b99dad90165dadc0269e61dfe5d159
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..cc2c9a894c6b
--- /dev/null
+++ b/app-crypt/keylookup/keylookup-2.2-r9999.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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..1fd4eae0c0be
--- /dev/null
+++ b/app-crypt/keylookup/keylookup-2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 || die
+	doman keylookup.1
+	dodoc NEWS TODO
+}
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/Manifest b/app-crypt/keynote/Manifest
new file mode 100644
index 000000000000..808731bc35e8
--- /dev/null
+++ b/app-crypt/keynote/Manifest
@@ -0,0 +1,7 @@
+AUX keynote-2.3-parallel-build.patch 477 SHA256 3e8226e9713382301a6f8cbb53c583154ecb05805907c55578fc8c56fdb76930 SHA512 1c1934150dd9137d410755e2c6a85f17f3b84e60f24abac070ae240c6b6581b3123f35b927edc2bf17296a0d797409cd1865d7d72b58f15488b66ad26c6bf996 WHIRLPOOL 60301609d78990d67f97fb7263cd1d8a0ad10365cec37f4dd87098be0bf2164d090594c34bea9b29fee169c4dc21192950cfcf63dc4d6e5410599379756e49c6
+AUX keynote-2.3-qa.patch 1112 SHA256 11a207689b7052413825b233e1a74f56211ba819238d991494bbb461a3f11b05 SHA512 ec681de7b3f4372a07c0b8a693e4d83d12cdd28fcd605044a2afd8dc9645eb09815efa1d1c74232deb96bb88c394a05ba803e61be912c3a4369f07d62e0eb4a2 WHIRLPOOL dde2c4ee4c77b8bded4b3ede85bbf3aada71dd6e046afb394c6cf7c7687ee60db63ef75d1889374806ccb4db81a401601b9dc6514de39ffe6ea1efea7a8b7656
+DIST keynote-2.3.tar.gz 141930 SHA256 62f7a9d57ceb6bcdd47b604b637a7ac8ed337cef0ab02f1fa28b7e61c9b15821 SHA512 c4f2f70718cf6092a9af82d6f6e1d8e24d03be9a938e2bde830b24794cd20610b8f647c552d46e37e840f1a1a432dc797b65548c4d39cdbaa65ec2d11f6cfefe WHIRLPOOL 42cc4830d06f59fe0bb26a52ddd5c40c2192d1d44e7ece99a5013c4fb31cc7f4e284d46c21c9ec4f448e20642b0b00735435801854f217c800cedca9f43ecbf4
+EBUILD keynote-2.3-r3.ebuild 959 SHA256 fea08651c1e073b6cc83d391eed4ee12779e163c56d10be5485266486f0ca461 SHA512 b581c7d90e4e8b5db0028f435ecc1810f3fd180260ee2892fee537598dcc4458ef8e745a1570224859605e27e7d850098251702e0b68804733ffa431ebdbcce4 WHIRLPOOL 957c746363e52bfb8ce3fa962a1d6fd06ab5a4e723cd565500e7f910b6f27a3443b0d9b686630a76c4e4949476b17954d42e8afb3577ca0bf13e1525a05add3e
+MISC ChangeLog 2881 SHA256 322a1c8badc0bc8fb58a41349d4eb123e8b62e9a2dcedd6f1569577a9591aae3 SHA512 9d0d89faa4a7e62b6bb4258bc2d8f72e959fbbe9db30f66a70db5a15c519554faff748665c5ace2b771637a45b1f9832c24a47ed44f47e4a83cc923608ed1d57 WHIRLPOOL 5c74ee9aaf5e7484b96fa6289b66118b5acdf6e8cefc03abc9f7f8348b7ad5357ba95de5d6a586c4fcb196b8a6939982bd60ba23763184ecef339bbea1682294
+MISC ChangeLog-2015 2843 SHA256 f296b88ee9148d98920e70c147a96275b3c6fcc4b3f5ef8b0b00032835bfb6e8 SHA512 66a393840e3a1c4ef6881b75078d0356f3547fe0dd6e7635e165f89a06ac17f8f1ee0d56c14fcb77463ef8028491e499b3eb706a3e69ddae85a7a5b66ee11674 WHIRLPOOL cbae6287b5e4ce31cb7c9560e831bdc23f5802d785fdce3fd90def16d6152f5d3e954cf60d6461622a071ed4149812db7ea4e8df2bd02ffe00611b161df88ade
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-crypt/kstart/Manifest
new file mode 100644
index 000000000000..c37b4c196ca1
--- /dev/null
+++ b/app-crypt/kstart/Manifest
@@ -0,0 +1,7 @@
+DIST kstart-4.1.tar.gz 269215 SHA256 ad1a71be149d56473319bf3b9bca83a60caa3af463d52c134e8f187103700224 SHA512 74a8a3f2c8d2c95f166f5861fb05a2d659a31db3165e27e81e5cf216bde44809d937ebc00995f89fa3b9df68609e3081303eb30742f5c4d90151b1410f0bd3cc WHIRLPOOL d72c71729eb1eb972eec4329ffb442b02856ddfb73fffca5ffe97f8a8d299155fe5535b0ca59e98197c2b2214bd56e3f5739a42d269fe3dac011556eb588bd13
+DIST kstart-4.2.tar.gz 296651 SHA256 2698bc1ab2fb36d49cc946b0cb864c56dd3a2f9ef596bfff59592e13d35315cd SHA512 7ce9c1f964c0d469b4b8a5de88ae83186e99116959941c4e7f69c59165d0c22aac432ac26dd5fe54f7c2f725048bb55b787107aea8408e2fd6c9ad02dcb31552 WHIRLPOOL 8b3dc378c57498915d2db81da20e1dbcd0df41e7cc549ae79f8658bd4c682055df4d90b1efa49b58f754fc99b96f813581979d994db4e1db573503f035644bff
+EBUILD kstart-4.1.ebuild 703 SHA256 d72a83a255bfd57d773dbf2a55677efe84d52734db50ab51369b9bf3c6757f49 SHA512 386e094d7e64e97ab91fb6f9d7254db7cfad903d308cc630429ce8181e1d51e4ba01bfe18f71bf78183913dc3e9c8b376c9a314bdf4ee4a95984202a0bdfa9ad WHIRLPOOL 515bc4421757e20a4574a4c45f16f1778750a10395c7b4287c1720c278b4fa67c6b5eed5ab4a273582be079e0e0a42e754272ce44964be2a9f2c1caa7429a6f6
+EBUILD kstart-4.2.ebuild 663 SHA256 655748fa80d8b197cc4fc92bf032a41e2d3d646db15e67dc55b9515bcec4a7e0 SHA512 adbf1bada5c2c0b9d55932d2823c6873462125a85427a83955bae3a1451f1faa5b1a062b9cd9c34099a2013e597d1156654aecc1ba773a97431d701381d02c6d WHIRLPOOL 96f5869f7338058996c94050a311c6f4091e422115b3a17d3aae92ba3d13b1e741e5230abab9d3ee97e943379068a2501c88f47b3837dce37ff22f6875cec2c4
+MISC ChangeLog 2576 SHA256 1a6888aa92e94e2d3668accf8f8a0dd05c4789a22b5f048d32d61eb738db46c6 SHA512 1e6263b7fd644bcd248c89bd4cbe0baa0bf23694780d3ce33122d01b77529e36459b8334c339fba832c92edcc93fee7f7284543ed4ee855143d7c1e254556b13 WHIRLPOOL 0666ec379c3d17664ef02cd876dca9028f08cff725bcee93aa9faa7d317e34b3444cb9dca83179977b12dc3305e9c00e2758f7bf5575e92878382922b30f0873
+MISC ChangeLog-2015 2432 SHA256 8e90abd6ccf66d1bcfd0328973e97443ae64d1b92eeb94bbb3e21a5dcd9da643 SHA512 15ba218ea2654e00dfc849bff7adb9f7becd5097c96e84dab64606841bfaa77667a4ea3b80a5d53f82e14d3ca29b06bb8075e90c287e2d5fde2bb5e3c506555b WHIRLPOOL b279cb2672aca6229dd827e96e2f9145df654a92c593904c48a18401052c5002b12d297b8fd8c948540434c018fcf57ad6dc59da1b71a97377621295cb4fa9cc
+MISC metadata.xml 807 SHA256 a8c015baee0d86ae5e2fc7d634a3c249489c353015c4c231c9303856226c8f7b SHA512 d854205e8829d141c3cd94cc00db039fce23376cb4f75c2498ae46d714765103890329526d2fe85f2eeff238fe2620f616686e78c62c9a115051d5fc161d19b5 WHIRLPOOL 71adee114f1f0d9afe2c3db685c5b2782c4d7111782f9146eb3aa0d30507560e426041c54b8804cc49fba469f0ae8f5410d61367dc2d959cf3adaeb7b7b88a89
diff --git a/app-crypt/kstart/kstart-4.1.ebuild b/app-crypt/kstart/kstart-4.1.ebuild
new file mode 100644
index 000000000000..e3ad1f1dc019
--- /dev/null
+++ b/app-crypt/kstart/kstart-4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 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="http://www.eyrie.org/~eagle/software/kstart"
+SRC_URI="http://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..076efc616f77
--- /dev/null
+++ b/app-crypt/kstart/kstart-4.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="Modified versions of kinit for refreshing kerberos tickets
+automatically"
+HOMEPAGE="http://www.eyrie.org/~eagle/software/kstart"
+SRC_URI="http://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/libmd/Manifest b/app-crypt/libmd/Manifest
new file mode 100644
index 000000000000..8ddc142f2711
--- /dev/null
+++ b/app-crypt/libmd/Manifest
@@ -0,0 +1,4 @@
+DIST libmd-0.0.0.tar.xz 252384 SHA256 fd3f2366236fb3fd0dac0c0a77ffff8511e2939c79d1d58daf56e3f5ee383a88 SHA512 6677959b7725114d7ebb747e0746d2712fc9b65f688eb28fa931c9042cee10cda3de33a1496b0220141800e98cf923d95dd5a5f3c2b8a68c3e169ef9fdaa39ef WHIRLPOOL c53c805ef892e2c08e150a387185442ce62f08887f4f0d0b3517109c4e12400fb0c39132afbe548ba9f7258754d5543949f5a7f28efec32e32ecdc20958aa34b
+EBUILD libmd-0.0.0.ebuild 386 SHA256 98ce0e28ccd111e8fcea4e15084df775127ceb892b0c7354bffd549f64b2cc8c SHA512 b60e55904bc356ec87b60ace12914bc5d301a07939092615c3fe38f2eef4258b30d04e2b2cd3f5a39b28326a08f28bd0949363c172d29f9c6c021aceaba0193f WHIRLPOOL 40f11c0110ecb17dafc679655069cfdfa76dfb9339fe416c75f0ea2ebaa614c0b4627979b2e523dcf35501c3eca32393fa464f6911d347fb1204673a9201c3ab
+MISC ChangeLog 424 SHA256 0faef74c4e4acd948e5cc116bb37d5594dd7288cd6146177ec3e347167862cdb SHA512 51994031674129614bd5ff28650a3d68d3041cafe3869b6ad663e6e42f651c46daa3e7b37d5a99ff931555f8d62872fb99103074859d326a857024efea3e8771 WHIRLPOOL d43c81e8249c8b2255b9e68d99f888d81cf035c7dd4a07958bccb3e89665a67b290b1328ba7475937e1aeceef21746e5c536ee5b1a48c37d26a53b2409581e15
+MISC metadata.xml 167 SHA256 5fe493e76bba84455c54b3a46adfae5a1bfe01c764ef0d9e5f6d3e8a1d142188 SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 WHIRLPOOL dc6c3dfc7fd7f0d76c97f0786cb76a55b8564f8437f96d4ccebf985817b9f6dcc4c61830aa5df80d725e4a54b281ea2e03d6b0859214af081112cba15025e64b
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/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/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
new file mode 100644
index 000000000000..28ea9eb26afc
--- /dev/null
+++ b/app-crypt/libscrypt/Manifest
@@ -0,0 +1,8 @@
+AUX libscrypt-1.21-build.patch 2460 SHA256 00b2c3a5f2f4692d25e3e6c411e146aca50b74cca797334f4f9351745f09195b SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d WHIRLPOOL facf16c15bed5bd38d8e3d9513d7dec10caebee1533996a8a83183655d59207a733e84846cddf595fc296a00dc9dc284305bcb45c2642fc6aed15a26eb07bc58
+DIST libscrypt-1.20.tar.gz 18451 SHA256 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21 SHA512 c7db096c740681c328d4c156372147331c0441906c1f17656a8ddd8345348091295749c4e3105bf26106f826327acac9bda97efec4ce50ac56d64f903c59e9af WHIRLPOOL 5d854936f955fbc08ec7d31e89396d3198ea58cac326ea8ceaedcc360e412cefc9e75b49a959870924cabe79ccf14453209cf450ff0256873c1de744f65706ac
+DIST libscrypt-1.21.tar.gz 19425 SHA256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 WHIRLPOOL 7fda5f5118c981d595f9f624ae40674c29fba6ee529ec8f4861b88d9bf11321b7a1285fabd1218356b59e889ddb96c4018513441fb4cebd302639085fcc097d0
+EBUILD libscrypt-1.20.ebuild 722 SHA256 1ab36b25bee260ef3ae5026e0a303fb92d82f7d072e4cbe98b402d78e3b52870 SHA512 482d125da9d0f3a062c84ef70452f6da4c24d3b6fac1eed53b2ffae2faf6b15e14216b8d95522d3fa45306a64a97ddf0e0b5e91f15d0d9319caf174182ca07ec WHIRLPOOL 88ef5dc28d4cc45db4fd515b6e83c090adcd5eb006d995a2db89bebcb823af6cbff87ad429872d70de9c12e2cb5bd209e2764dc50146745f049cddc2618f4bca
+EBUILD libscrypt-1.21.ebuild 712 SHA256 7d067c5d9056ede1c25711c588c596c4629136d15606a2ef1b6bf972c6f15cab SHA512 a370183447611325dbb99fc3706764eb78ea321d09c80d57eb8870ddda76dce0a02f0254fe2bb1259a426eb9cc7439a4b1ffca703ecf1b07fb80f1ce433a33fe WHIRLPOOL 3ae71038cf9454f08ccf1c6bf05b83742db960bc4bd29ce7b115ded9d19e22adb4c9d03168b33f5b5f94e2c5a15c3ce3d65214fa837b3d0893fdd641999ec638
+MISC ChangeLog 2235 SHA256 21a74e80d7dadde6500f36f2081d49630f95ae0b1c3567ae0b4171af45128369 SHA512 5b1798c1479023fe7c895ec5be6db22e40937415b296066de34d0ee02df7750c2d2bfbdf4f4bb3ff738fedccf64b5603d4d1796ffd63525491628727981bcae6 WHIRLPOOL 64021d97cd706b62d3056db19c4336573d55e55043bc581daeb96114be0bcc981d82619283fe02e93f8df51ab65dc18a974e43aa96400572fb446c2e840b8245
+MISC ChangeLog-2015 1140 SHA256 a4212ea3aa533d9b211b3e83f179f0e4d09b0bebd48ef69a1df2e3f736ee4afc SHA512 606ad54de1d822941fa5dac04d6c962ae5eb3059a0819bf26d19ba985b3ebdf0768ae66d7ff02c722711bb216bec08a6c6c5cc55c035622b995b19db1905b14a WHIRLPOOL 028fa99a6acbe34a196e6d3ddf14ec422ee0394dee5f1a0a39e5cbf8282ecc9c388cc249629522bfd32606b4c91ad91218e573c1847d7a0beb5bb7ec596cf399
+MISC metadata.xml 345 SHA256 2b9eaf348e1fb04d7b556aff418828ed4fd94c3f97391cf82d2185822f766091 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383 WHIRLPOOL 7f355b8ac2c2547ea7ae61e0c17adc027216cf63e468a133a523432189ddf72d51ebba4400ea9ea23a991e2ceff43ec819c0c7230a70c1667fe38048f2f98b24
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.20.ebuild b/app-crypt/libscrypt/libscrypt-1.20.ebuild
new file mode 100644
index 000000000000..d0238e0ba978
--- /dev/null
+++ b/app-crypt/libscrypt/libscrypt-1.20.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib 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}"
+
+src_compile() {
+	export PREFIX=/usr
+	export LIBDIR=${PREFIX}/$(get_libdir)
+	export CC=$(tc-getCC)
+	export CFLAGS="$CFLAGS -fPIC"
+	export LDFLAGS="$LDFLAGS -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version"
+	export CFLAGS_EXTRA=
+	emake
+}
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
new file mode 100644
index 000000000000..62eb7435c9c6
--- /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/Manifest b/app-crypt/libsecret/Manifest
new file mode 100644
index 000000000000..8117df1cd4ee
--- /dev/null
+++ b/app-crypt/libsecret/Manifest
@@ -0,0 +1,5 @@
+DIST libsecret-0.18.5.tar.xz 508556 SHA256 9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3 SHA512 4ee297b556d3b555b6ca9f5eb5cc87425b782491d0550a75873aac0f7019b123f437f0731c85bb058fc65b50a589d54d0697657a50bef4ac2952e9e40a916b5c WHIRLPOOL 5ee5ffb4235c75a20475777ee09c96869c59eb01374743a0e0af0139f76e1e21bf57a15dbca72c6a2f70b4809eb2848776a0a3cba187c8f725b19ce68e611e23
+EBUILD libsecret-0.18.5.ebuild 1503 SHA256 e61c04050c861e5a566d043a38ad772e5a25c194a9ccce0be00615d1f0e4539c SHA512 40723ae7e695db86f6e8d9dfede20cdb65e5f9730b9530d36fd6c405b9cc9e75111865e103f3367dc40b3a1fcc1f50c00dd38a6c2dba67de8b7336c7fa442877 WHIRLPOOL 6f6c25c436fcc20e7b86e926212b6b72cc6462023eca0feac4f3ae596b84c421e50ce2d763ca5ce7ab2fec88f773f280d4fc833c9fa82dca98a78ee9310cb48f
+MISC ChangeLog 6793 SHA256 36000fbbeff6d34dddb781435ff8085ae168e7d6a0c091fc964f24fbccb780ec SHA512 dfdcacc796d651a01636a58fd76346546070c411367e5a83485bbab51e4bf2339b3acddca5722ca681836d7b25630d5ca2ef07e5364a58cc1dd9d0a2c7a48db2 WHIRLPOOL 60d521891fbb5133ed727e8cd78a14b14ecf1b5180b6a18f43434e4e749f9a54ca7a57c153943f72c9a741b375fb23f1e9a32ead511dd51a0fe6ae16f3d1f55e
+MISC ChangeLog-2015 7586 SHA256 56004ebf0e4281b425bfee228e1e788d088ea5df33ca608bffc12db5da9750c4 SHA512 59d91289d511719251494af837b9000df6ac329d95db3d37472345fcfbb829d2f254ad4bd388abc4c098053828b2fcd2179fc28381614be2fe72d4e4ab0a5b12 WHIRLPOOL 7d9a225a7e23d7906d2a86e8f1803e1e721aa56b15ec52cfbd3b6b63a5fe10dabd6a5bc74b722ef6a3504069a0266e6dd950b22223aece6a08201fa09ddbe842
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
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..f9b593ab90e9
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.5.ebuild
@@ -0,0 +1,66 @@
+# 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)
+# 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/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/Manifest b/app-crypt/libu2f-host/Manifest
new file mode 100644
index 000000000000..e6b729c1e6c6
--- /dev/null
+++ b/app-crypt/libu2f-host/Manifest
@@ -0,0 +1,7 @@
+DIST libu2f-host-1.1.1.tar.xz 455652 SHA256 e14d06196aba1fcf80498929e6460370e58b96e8298c57e4660030c045000e3c SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693 WHIRLPOOL 46fc4e087e2679bf8c07922fbd31200d702c5c88838812618c763615f24f7c0ecdc71ed4bd436fde1a9526eea23820bd6f2448040ce711f7fd87ca5c96281efd
+DIST libu2f-host-1.1.3.tar.xz 469480 SHA256 3e00c1910de64e2c90f20c05bb468b183ffed05e13cb340442d206014752039d SHA512 6729dd35beaae1c96283f81794ac6c058ed6446f935a5cee7dc1a3db594201c9f049de6a58ac2e544e1c6ac0c1e9815cce5e2e46a6e45372e419078307a57f55 WHIRLPOOL d14d288d160a83e32484910aa66f027bf8f268e915b9651054089c91ad59818b556a011e818beb527f99b95b972ff3755b081e378b00cea530b7cb4c8bd318fa
+EBUILD libu2f-host-1.1.1.ebuild 1296 SHA256 6b7125ab06c942f94d8b395b3700166b7c36ce2e27b65fe711e68798d510ad26 SHA512 ef4064dcc84ae1e8a81a2a2166d473fb55c26bddb22277c34893a781a51d9795791695220bc2fab83821989961b4f85afaa59475449833268232f46dac21f3b6 WHIRLPOOL 9afc4f154d39e23e1b2207db3249bba899082577ab81ea07638d3b0938fd829ce92407cd47a49446b271b956356160e07d3d5c273365247167e55081f21ef77c
+EBUILD libu2f-host-1.1.3.ebuild 1186 SHA256 0280194aae5264fdb81b5b6a5fc6d32233d11ca661b0dbc89397437d1e82aacb SHA512 caf599a130a5f882d9522e8d29ffd42f728c483da8c6769188b8fef93a60e5c194b99ddf57316534c38d7901a1d4bd9f2dc66e13db921eade3054108b235f80b WHIRLPOOL 53b04627cba936a90d8f43c6836c633a9c356fc8627d8bc7acbd5dda03be63cffb1b06ee144a0548281d756027c19590625c49efcd1fe3b3090b41888c8a8209
+MISC ChangeLog 4413 SHA256 db38bdf129aa2b6d33fdebdb09519f66f8acd5e3613181312320bfb107280bc9 SHA512 ca8361d00bd6fb0095014528d87a0dc1e9e7572c3362a8998d51f997f1b6e62ea6b1d1a291d72dd9f3389289927bef198afb1fe7520d666c65d0993616a3e095 WHIRLPOOL 5d3cbaaa853748b1703171084cc71732598190085457590756114ddf329a9c04d66851a8ef868a7447c2e34f519b37305a189dfa497745e655832f95d3f69c82
+MISC ChangeLog-2015 2133 SHA256 3d7ffd9b6837711427ad55900ae8d1b86604a402bcbf68eef1cf0b2505b7a0bb SHA512 1b3d77426205539397fe682d3aa87610959b60753317051bc61d1f4453dee35423787f42eb826bc3109f21f11a45443886dfa3efe43db96d8a10bae70788e63f WHIRLPOOL e5efbd77cd337779edbff94d99c6a293eb7465e449d44d3d46f2b5dcaa35bb82116565b46eb6e7fe850f9ab5916a6ef7501a95a9bf1998835d4a1cefccf9bedc
+MISC metadata.xml 550 SHA256 e41a2704d99e076ca470f13f43fb46913b1f3d28c53b8718d8a4af17a1b8fd35 SHA512 9970724fffe49705d8dedc85522cbe3040c4e542fa5a56c2cbc428df2540975e76a84fe8c4819bfaacc085cccdf6e5a996a058c14f561b9ef10c7d705f98bfa0 WHIRLPOOL 5e51b7e276fbb5b6278e1b831b90cc14baca8ad5e3a2c99a2b65b86c6e3a4d136f35cca805b3352f702dd4ebdfc1762048e22f2fb831791bba006dbf55c488cf
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..418200fcb7b5
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 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..ac49c6a9d25e
--- /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/Manifest b/app-crypt/libu2f-server/Manifest
new file mode 100644
index 000000000000..34ca5a27746e
--- /dev/null
+++ b/app-crypt/libu2f-server/Manifest
@@ -0,0 +1,5 @@
+AUX libu2f-server-1.0.1-tests-fix.patch 1486 SHA256 02a1e49c4edad91024401f53e4f19a072d86b982b497ced1ebb332c705300cb5 SHA512 3283f95308f72a13ce8575969992c633705eacacf3c01546d1fd8c35c3a5499a1229d8dd34f493075b4f145f2e722fed6568d75c8f37729f6b18d5b9bb553e45 WHIRLPOOL ef778927d5c77efacb0c955db125dfe4d5b43f8f301bcc099fccadccb0ef92e6a098a52d6584241fab11946ed403a499caff970893a76162d48e69f002f79ab8
+DIST libu2f-server-1.0.1.tar.xz 268648 SHA256 a618f59051209d6d70c24cf42d64c9b67bd7dd5946b6dbd2c649181d7e8f1f6e SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47 WHIRLPOOL a8f4a50be8c9c09446ac6517e9e7a6609c0306aedeb683f911f89ac63a16cee2b88d7b551a1a8e20182a3c7cfa72ee86ce1d5105256e42c19affb2ad201139ea
+EBUILD libu2f-server-1.0.1.ebuild 1139 SHA256 bd2f6e9ee74c476da084cf00a7923c5e777c17b2fab5a463c37415aae647be0a SHA512 8498e04c2d4c9e59a94833d58d7a3d450fd205950022a141569c8c26314932b7f167ca43143ce8738d6fa6c0e5df092631471dcd54a225f4fa62a38f986afdbb WHIRLPOOL 37039196e2f3771e2b78ae473b00f7f26b0c54a88d41f7273f7833d2757ca708ebc29aaef74d9a8fdc7642193eea47e27f5ce3ede6ae9aa0235c454dbe1e6b55
+MISC ChangeLog 880 SHA256 67835c3dda309de95663bfda8b86a3497340e71695ad9d4424147e7cc47ac13e SHA512 31622128e2551ec22d6a9ace530773bacc49e9b8bae6595116cd0ee22a5c3ef7983c07e15b613287de600702cc547f839c4a715ff7662d7a3c853f9a49473301 WHIRLPOOL e796c348d741d5395a6f24a621b9b1885f4a4a406a92b0661011e78b4972374410826eb5e409dbfcb81d7f2a26c40d649cac8a285fa6e0bbdfa4f2d6e853f90f
+MISC metadata.xml 377 SHA256 aefa43e895e74601f3a934780ca93d6a50944ee144519e0b8976a979f15cbd86 SHA512 361c84dbc545a3abc64b10dabe57f6286055a5ed7f41f87189240a24406e735f2d79fbbe166c1240536057abe376ea0d4f5ec2d91b6b9fc90c8210c5d2b8ecaa WHIRLPOOL a903fd5eee2c4ce486319d7dbd0618c9c4a64a98117ebe59dfdcb1253d2e981fe93745f2018314f97bf6ab9d0176efc7f01778f9fe452a1306913aab68a6542c
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/libu2f-server-1.0.1.ebuild b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
new file mode 100644
index 000000000000..803c78639a95
--- /dev/null
+++ b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 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/metadata.xml b/app-crypt/libu2f-server/metadata.xml
new file mode 100644
index 000000000000..2d0a0e34de1c
--- /dev/null
+++ b/app-crypt/libu2f-server/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>shirk+gentoo@bitspin.org</email>
+    <name>René Köcher</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/libykneomgr/Manifest b/app-crypt/libykneomgr/Manifest
new file mode 100644
index 000000000000..286175ed592d
--- /dev/null
+++ b/app-crypt/libykneomgr/Manifest
@@ -0,0 +1,5 @@
+DIST libykneomgr-0.1.8.tar.gz 626257 SHA256 2749ef299a1772818e63c0ff5276f18f1694f9de2137176a087902403e5df889 SHA512 536db3a81b74d24e727cc09c5bb898723b602e6c55e249745ced59d5f9416673fdbecd80bb7ebc7031be349092c8fb4f5623c8f6972ab870ec1f50ac1bc2f795 WHIRLPOOL 8b3b6304910e0a50fe54c658fe6fa00e86e4add41a966cc0a5941410e5fa6bfba2219f86f102c1cfa170165880c9b80dd599591f45e06d61607505f8cc5b752c
+EBUILD libykneomgr-0.1.8.ebuild 575 SHA256 ef2e017905e8c4ca82e3084301c58454127e2229f333f59434630bd6ae708321 SHA512 07378321b01b7ad884471eb0d2e69df7d995a9f4ed0f8282547d0653702c955b65b4b03db37e95d965f7ab05c520cd3334e77bcc2e186caaa452a7fed00df5a3 WHIRLPOOL e1beb497330b7fda58178ee9d9ca66c8aefda8a34edef9492355f520470e69028679ed3e7934ff69377aa50c262488e1700a187a62bad0cc10346d7c983a67a1
+MISC ChangeLog 2930 SHA256 d4ecfd0971c90f9cc5ea23a5c236f4410cb565d07c9a032a7a07ce3c5fcb0b0f SHA512 5abb5891df16c22041e433abc4cea9da30d1c5a3413243f230be3c85056f3c3dec1695c4520c3790b432b965735e668b5ee205d485a9744d6b8459dacb3d3bf4 WHIRLPOOL 3242710e4bb7b5eba03b4aba519326e17070bcd59ad84555138d8f02ec6b8d769ce1034c640a7d2163f7bc7ccb46321fb2d9bbc4230d012d21129f620318627b
+MISC ChangeLog-2015 792 SHA256 9997f3af5f3bf55765ddbbe5b93bf9593fdfb8c4d63b91d8e83fa8bf96370c6d SHA512 4b0a272d72f6a3a6845482024bafd891b8fa3cf25b2b45870f81662d9bd2c1c7da0286f325d32de9890b5fcea6e7a85561e05b424b57f579fb9439fb7b69345a WHIRLPOOL d2d555b040eb46dcecb65e2a9c71a5e82bf8f04f2a479c577cab80de10bbd7608135aa7857ca1aacd6823f6d2a704a0e375ce1e147cca89c7a2bc775eaede4df
+MISC metadata.xml 401 SHA256 ab782c15e363f0dc915611148d2191462034ec97150e19ec80176809fa416c92 SHA512 90b43e61063738f2821f8f4134f5e5457b40840ae72097dbd01bf27cfb2dbd405941902bf414be2b67b10901708ca6c80d6573f0f9ed42828e1a83e635761455 WHIRLPOOL f4562fc4cbb2ef17dafaa7d4f702adcdcbb1b38a1b84d2b87e25f0a8193cd3fd5d8fa00181801e74c7c9a7066c055fe2c359f744a52e66b114a9c68d27b4ab8c
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/Manifest b/app-crypt/loop-aes-losetup/Manifest
new file mode 100644
index 000000000000..0a3486d60237
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -0,0 +1,6 @@
+DIST loop-AES-v3.7j.tar.bz2 326818 SHA256 67ede839d4cac657359c39b05eac46f6991054768a7e1096bef5b92edb3b8aba SHA512 e1b59680680e2b40bb42cad9f1e89a344c7bfd0ee01fdc26151e9edea64b5111744588bc05c672de16c76ae0a3e4d6a8d4c4c9c09709a9f93bfc62a2f64ba7c7 WHIRLPOOL a3798edc3f1393ddf97aeada84c1c5a6e74b8cef94e72629774c4db70001206d5cd429df61035a215131f0281ef284469751eefad1f7ee3fd7cf24153b57077d
+DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
+EBUILD loop-aes-losetup-2.28.2.ebuild 2390 SHA256 fec37cbf5b10a0ba3173bfd293b21362d7683708072b518adea5ec774fa6740c SHA512 c71049614a40863c8634b142d16beb671f0cf77607b541018cfc44ab4bcfccf8b85e6f568e55963a30be8650d86c8fe6b0138914c7b0449592fe27062a6bcab3 WHIRLPOOL cb6c1d5cf8a8d0db3d4cc63278a7d3ff8d5cd7ea7eb869b735740092c706b3aed7231f66813dd968420705bc7b358912dc68566e83bca45f27389893aeb8857d
+MISC ChangeLog 3464 SHA256 2eace3ab41d744146f316c61ebee3496bfc7a89ec32d7940d0b59786a6cb8e59 SHA512 c0d0f4ce45927b76b515e9517e8cac18b69661a63650229bde42b38f7bff3733c2fc94f54929b4a997fc1bc8897b6bbaa43404c277451a39bc43aa7e47ec97bf WHIRLPOOL feca1a95fb9eccf93cb728273fc4c477b39709cf17ce509310c02bc728a024f6b3b7549d75265da7e02a8cc6c9d6fb84dff32641bc093ee0eb2b422eaed4d67b
+MISC ChangeLog-2015 712 SHA256 6f90106007eadd547894ff998ef2b1c3799cb3f90efccae8306d6c229aa160c3 SHA512 39277f20bc45bc85aa1756b5dd1e78d6a307b896989fa1ccb6f5958c0237fc4190acb3549e2fd9842486f74f056af518b42cf9e210eb163421c1eb20063ee116 WHIRLPOOL 5ed8049747d2055b75b0586a4c98427389d091c3a521f272897ee63e7f869d462928982d721c0f7ebb88e65100e192e2cd9f8925e2a7080d4363990dc29d967f
+MISC metadata.xml 318 SHA256 a980037629c41bfe0eae2f18978291a66d249c8b3072ebee3fa786c23cc4453c SHA512 93c67a250f19a2a17bde884a0f493b5b675ae2e0b4dd89164dc8a052e7adb9b2b5ebd07a43fb5432a8198216134ed3a0eca4b14bc98b9be71e9d947f51b77439 WHIRLPOOL c5253ad1c639309c61950071f2e0bf460b381e1288cf97c6b232375033eb627cf979faf562765452b51efc00b4b9e9fb43ce40067220ec571ab15da2fdca212b
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/Manifest b/app-crypt/manuale/Manifest
new file mode 100644
index 000000000000..f53326143649
--- /dev/null
+++ b/app-crypt/manuale/Manifest
@@ -0,0 +1,3 @@
+DIST manuale-1.1.0.tar.gz 14015 SHA256 e39ec3109153b1cd171678fff130fd36a6bc8ac129d24be8283854945069c3de SHA512 b78d6468fba14738f0b33cb11817a61692bab2b18a3331b2696c6e1c070a202903be6d6f642da7dd35560b15ee5fe24afecebe51395bdacae59f04cc582b6b44 WHIRLPOOL 8b22942b6384c7bd9d09dc1540b7a6fb0b4ac7847cc7fa60778743908e8d930eede4a4f23e9a360e72534ca3402824978bd926defbbea085d33055f42273d6b4
+EBUILD manuale-1.1.0.ebuild 584 SHA256 4f2a65d64c1f2e2c3926d49374f6b56caf9ac716a8e13423da02277e23f2cbcd SHA512 5f0fa3fe24306081cf81c4a49ca947f37ef391a5abe88bf494726e8390b38b9cf1c96fe58f4140ccab0ccb4449e9650f308163f162a7ae69878b6bfe781ba842 WHIRLPOOL c86207a32606cda79656f4f6ecdefb2bdd87fc82966362fbcafd988e158aaaa4f72eb29155927f3eb0eff002eac61e22c136191458ab317ffcb7bd9d21431dc6
+MISC metadata.xml 245 SHA256 3026a79304b249ac20004bf5e4e3797b33847416c5395aab80297677be9f1395 SHA512 959004edbb7652a51b20d5c16dcdc270389d9ea656a795928323ca071ba51cb34d25b4bedfdc0cabe9e95301986aec7b8f3972bf1a50df4253b6364da932b232 WHIRLPOOL f34385fe307d89a823e5844755ba9cc0bb3785fa70a24f1821fdd1c4cd7f8a1d76683826823f221b133607e95b01d5d28177bda50727c9c216c7b382d085958b
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/Manifest b/app-crypt/mcrypt/Manifest
new file mode 100644
index 000000000000..abc7cab05257
--- /dev/null
+++ b/app-crypt/mcrypt/Manifest
@@ -0,0 +1,11 @@
+AUX mcrypt-2.6.7-qa.patch 736 SHA256 8cf4a65124e6354797e7c37f54a182758d3b24f1789c04948ab71dde6309c643 SHA512 f50e2db738583b5dbca80e7458cc341787b94bd475b699de1333e4839b1bc448c0a6d7c759a71849c60fc97d45dbb0f075ad6c5d67d312865eea26118bba4dee WHIRLPOOL f02ecd9a785d2edd1eb28553f714ff93063d64704f04a522323a7e731264e500b845e7bf314b902265b130849760526f99f72d0b15030f3d14f026043d08aa11
+AUX mcrypt-2.6.8-format-string.patch 518 SHA256 9ccf768febe0f9a376c5d1bab939bf0df9e3485bf0c93e3f0f9687286ebb393b SHA512 3056177ad2bf9cbf7cc9a5b3ae272407c0e38ed495ca665a26a9b36d5a0b5c874aff90a28903a6673e35b2691b036aed71721515cadd80c56a96d7604c4cee4a WHIRLPOOL bace7109a43da80fee90776c86c65bf152c7aa7a2e94e9bd7d49213b663801de186b9fe21d9cd4e0f1a81b72b6073e170386781af4cac58721f56ab4cb92835f
+AUX mcrypt-2.6.8-overflow.patch 810 SHA256 b65c8c66dac700b46f29b36bcef19d20d163651b8e48d3daba5f8fd096fca425 SHA512 c884f67011f07245b7dc3c0a689c9bd33664a402ad5585823319084b74c758046938364372ce0ebf2cc898cb704375ff1f1cbee40d6e3d622641a16193857426 WHIRLPOOL 82eaaa94a8f993835bbaf2c8a517256e7e30e30a5b447d5e19e41ac6d09eaa989b8a08d5664d8b6321f7b84a195f0e5a7f452c0263a062b306fdd78572c2b15e
+AUX mcrypt-2.6.8-segv.patch 1330 SHA256 3d93cbb71c9148fbf01a5ce2fe57bd78c33e93acb6fa2d79b756f4d1132436e9 SHA512 7bea9f7731f39d2fed3920cbf6efaf006681e59eaa5dc3a0e50ac0cd3166c959e1ebd06c449329865501bd525a22c49380c4f72b27693f8bc0b0c0c4141a5af2 WHIRLPOOL 5a2e0f71b5237da83fe15556daa9a109ae0b74d63cce5220a1167e1030da92c3b4a8c80beece96e77974391bb34d262887d8bea4725fbe26a2e7a7981359cf01
+AUX mcrypt-2.6.8-sprintf.patch 3617 SHA256 d1cc7f8768afb0cee2fc84fef4a2e9265edce92935050a055a11fc61658dee9f SHA512 36163d3c782a29ab70527d0389e9ee4fc0fdb6d92300a5a576f3702c4b6a63f598e3832fd704570cd3c8da79182e2c57473b84932c26b08d3c8bd509f475a7d8 WHIRLPOOL 6603699756fa5033993177f5e7dda4f3bfa7e96a57e640f484e1cc92b3eb4fd573ce246dbc28d616a90b9dc683caf4f0135789bf38a7f7a62b24100b4988eac0
+AUX mcrypt-2.6.8-stdlib.h.patch 262 SHA256 4654005774c49ab0e36ff0d48fff1a34439e73d1b5a83ac29c8403b4062a9049 SHA512 6f20fe8982cca9fb448ace79c8b8b04260dc63f6a372da4cbf8a7a5d7458f32527e0f31d32387c9f326906fe6fe98013dc49a388b1c987ccca096c9796b409fd WHIRLPOOL f9f949a51db3f8f7ac9f9f197e821f65b6c772f102ac97665c89b4c1d473290f7e781b17cb447a7e964a820516b5933eb07880213354414df2b9c4b1ad0f60ca
+DIST mcrypt-2.6.8.tar.gz 471915 SHA256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098 SHA512 eae5f831e950df69eb93efc8314100b4b5dc8a535b1d00f500e6b25382efcec321346776a92dadf101b878ef46a47de2e9e81f5ddf5c73563ece4741f169c8d1 WHIRLPOOL f0853fd1d244de6310a4236fc0922a7d19e8c418b8d4b9cd0a66c4571843ffaf421dca7064c82ae0fde5f3aae4806fe27aa9dc05a705768f52a80586f941b538
+EBUILD mcrypt-2.6.8-r3.ebuild 707 SHA256 f8fed747dfd8530781332e4eb4558ae0c1d4ee6b486ae9971a7e8ba8f475b4cc SHA512 9378c7d796775b8e1edca96194a8d52663f91455cc6df20b76d79b417b7cb43d7309e9682c70c0fbdcb060b92e7d72c5771b1febdb127956e8282cbf95450893 WHIRLPOOL 30a4aea5329c582547fe1adceb17652f47cf459bf3ce4b830f4788d0258190524a5984d95b1b2c7cb97e1687770578e07d6e56643c6be03e1529f6029479e5b1
+MISC ChangeLog 2647 SHA256 5c815c07612b59c3b278dbfbdffba335105c34e163c6c8738307e521038befba SHA512 58279b94249ddfebcc105a1e7413d63bc32192018c4f5b52e3db58394d2fe035aa53db3b2c0c0bc530065bf63dbde14b74e0a224dbdb47576c24e11a02e89870 WHIRLPOOL ad168980d8bbffa353733ce15e6e2841869474cb3504e6371ff7b3226e490f5a00454f5898e8432a22cef64ffd673541199fbcd53be9589b95fd041367b01e9f
+MISC ChangeLog-2015 5454 SHA256 e4517592aecb4cc7986d02bd7badec590d03af33ae4c262018def592fe6639b1 SHA512 f220c802eeb6d0f703b2d4f556c55579b9ce1c8dfd8081452445a3a6d06f6ce47c97917704dd8a59856255e84612974142eee600563be3f026172ab40b15f6b8 WHIRLPOOL 0d06c332640907a30f0312490ab5643d2de5b0cf71cb78229a6ea62e8175ed5443ffd8abee97a98a45372fa9dcbae3ea13155fbdeafadbd6b48e5541d2d8172f
+MISC metadata.xml 326 SHA256 f71c1849263bd37b84b42e4ccf0a1dd61337c20d107d65d477409de9d62f9aa8 SHA512 a5d7a15b6084aebe038f38dc8003040c42434d415ebdb33b225e2772047950d35b2328dba5a7194533608b74ec47ca6a1bfccb56540f3a67308b499b04774207 WHIRLPOOL d0c24732d78b652c61e7cb5c132d9a5562721384cd9115d362481f22e6a788f51a8db7b94eb62615a9b1ab74046fca7ce60648ae2507cbd0c89a9745f088464a
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/Manifest b/app-crypt/md4sum/Manifest
new file mode 100644
index 000000000000..9e9178eec1b0
--- /dev/null
+++ b/app-crypt/md4sum/Manifest
@@ -0,0 +1,6 @@
+AUX md4sum-fix-out-of-bounds-write.diff 271 SHA256 29548c9e6cd3db8cefe08ded0cf9893942376922eb573a1a979e0837878332bb SHA512 bcf06b6da80b67965547d359774c4462516dd69d36ed84723d9baaa93472405ed4d790ce687affa148be39157137ef46399e355540c18271f9164318f7731d65 WHIRLPOOL b13ab81b9add57a71cec10d58bee25c15a6f698b19f244af7e73d533bf0a67124de10a6fae92df3dbe5fea2ea7cf69e606689f9c7fb7573c280527900c16a42f
+DIST md4sum-0.02.03.tar.gz 26819 SHA256 241eb780282923fbaba5c2b2f1d72516bd47a14924c57790fc18ba05480e57c7 SHA512 5a05760aa6a770d9f55a41e42bdf6801dcd67bc804ead5bd84aecc48e5ee5a7c8b01d4a1e1767a4cc1f8695d66ed16c6a1f09b58d236c27db317f227e02e3762 WHIRLPOOL 90db3f2aa906d647d095d876ea471d01674b65e654b7fb5d56c19c0f5964814509a24351fe92279c63aae5bf74dc2e71e232f638289164403d6d9496236f92bd
+EBUILD md4sum-0.02.03-r1.ebuild 687 SHA256 cd113ddd5141af026b96be1b4a6160cc5ccb0cad3151b19e7263e29ed36d27bc SHA512 d6eb35b2f85b0948094f84d0f9b47c5166b3dd4b02ec10bdea8bb5188e25aedf370b2e2425f2f6b9f35d97e2a396e99e2c4843fd3988f3e9168d0081c42783ff WHIRLPOOL 99f4cca151a5124fc7caf5df3eb0db28760632c46284c0c1eb6f1b1336dd763dca67c1aab627d9b20a4066f82c49578754212ee387d6cbae523f8e45b62cdd36
+MISC ChangeLog 2230 SHA256 4c4dd3123dc30f3dfc6bb0550c5cc6e84d0cf2ad4a95b2bfd9cdb11f3b7cf579 SHA512 82cbaa6c68745179bf3fd6de108ebb014ecece016c79b08763bd622adee2d2944a027698a3ef56ee68475b86da8e1ac61aa11ada3432e1b9e0e970c9c001e94c WHIRLPOOL c6a25e33f1f7f382724bdd1cf73d94138819d5b399d0ed9e12fc9bb3e285b0e447459af26b49bb734a9fb522c5e4fa99983c43c29a8b3cbdb1b4f36a049f4526
+MISC ChangeLog-2015 1557 SHA256 13532f8974f5d28509cb7a28a708afd531f9c92e456558a0cdccab35682b65ff SHA512 cd6a67b7a05e2348e743f6f912b8644964837e47c9d0dc22462e3a9f7ef32b4688cc98e8c76390a5086846c07c60a0fbac421762d0c01c5582af46eadfe1f7a3 WHIRLPOOL 38fe5b06d66f92cc4ff6d628445ab2b173cd21549a0fd4f238397aab0deadcbc2ab0a239fb0b9b42be88195caf73ccdd982e01a727f7f0d6dafb3d3207f1a222
+MISC metadata.xml 210 SHA256 261430405ac37ae531b59949774ba64133ecc8593015df002402afe0f0f60d7e SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f WHIRLPOOL daffaf412be04b8235613f91913fd8a88e1650897a3563641f50de943a4cdee417461a6627acdf7a99a3ff9f5ccf080c0676ae37105f6bfcda3a8200718d1ada
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/Manifest b/app-crypt/md5deep/Manifest
new file mode 100644
index 000000000000..a351646993a2
--- /dev/null
+++ b/app-crypt/md5deep/Manifest
@@ -0,0 +1,7 @@
+DIST md5deep-4.3.tar.gz 1416180 SHA256 905bcf8bddf0e7e2650b280d5e7af8cb8cd41dad4f299751dfec397dcb4f8d54 SHA512 fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14 WHIRLPOOL 89fe1f5a5a9502660f823608b7fc5c752d3b71acbb210a4ce7c9349e02bbbc131b26df29f69cbae2ba234685cf0db38014d71f2b019f8189bd0e05e6c2b81e52
+DIST md5deep-4.4.tar.gz 4534687 SHA256 dbda8ab42a9c788d4566adcae980d022d8c3d52ee732f1cbfa126c551c8fcc46 SHA512 c37ec85ed04d4452f9038f43434c02e064cf9e17c4eaa233867dba0236443922a14ccb8ec76c68820087751c2ca3db014d3f17dd8fcd2c2bde84d620aae50de1 WHIRLPOOL 2b85d77c6108b012dcca632b54a55b1fc7c942e7efbf6be26ffdf6ed17ce66909fbeae397f139f494385856f7acfaebf4041677c24e0b4ef9e5803f776fee1f3
+EBUILD md5deep-4.3.ebuild 480 SHA256 376cd915146f4336c2cf9357999f0869d445e10ce3bf4b896b8834d06b0e65be SHA512 0200309a8e3acf89df5ae5ff5cccea3cf379d17341a4ff46b4df95d0111ef4e6a4e025d6162c31283a3a9ed1e3ad09ef9e7b5c3e0093bbff136f213972d9f238 WHIRLPOOL aea1ddf205cf63cdf25dd985f1834cac5b86d2b74e7d71213bbd2158504a22f19e13d1f5f3005294c64269650eed8a3773f6e318c854a44ef4196fd36463ff9f
+EBUILD md5deep-4.4.ebuild 598 SHA256 2b9c8f66dd6337248926b3ececd89879c4d6803bafb8d983830f4118d04ccf40 SHA512 63a6002ca2a95b67a2b8f4bddb66130d1a02e4cfef7e5a66145402102cda56e64f0ff87708b8560c66703279866d65e47b7f834e3e3c4ab993152d3002737a66 WHIRLPOOL 03eeb20c59f13cfef0cd0e782417a13b18d8badd8898fe59a167ea32439764cdb590b55a1d0c2143bbd16c927591481192fbcdaaef9e214c81f7821c8a74fd3b
+MISC ChangeLog 3020 SHA256 c52f68487211442b3fb70b23a160a93494c59d3e6bba57c9b5ba4377a4ff21e6 SHA512 e10ae89508e762b5b2ed70e68e18a25cd94508910517acf07eb3862c30030a5b1fc76774328284ca2b292e1d45fbb93288baa2b28045c8443c1e2ef1cedaab06 WHIRLPOOL d30b1a3039d72c7614d26aadd33cb96d89f75c8f9c41afbd154c4a8f51d4c580dab42ed7657ec0855918e949b834b4b12a6a88658f36879f85c59be4189680ef
+MISC ChangeLog-2015 9764 SHA256 86e2c0ee24d919b5338b55b7a170d8a6ec44a57110253f59980ad5453341ac14 SHA512 721e280475fc83e89938c7f274d45cfb9a93fd64fefd8760474cb9f18dd2ee3193a1bd409179397c14565234deb8201b812f6cbe2a37aa82eb13661a10051861 WHIRLPOOL a96441cf29d9f1f4e1fa3dd0b4887eb3093202336b77d23e4768bfeeb8c9becb24d911c24e35039a7b3d2280ab5be2879c2aa13205fd4034bf096a8e7de1ed5d
+MISC metadata.xml 396 SHA256 004c8e0289fbcab19df00aa35a646105d35e4741c0c1b20642b862c93c44d78d SHA512 2d4907761039f21088a1644f5da3b764ab55d37513195f0b04c8110a80f638f62f1322ecaf58bb3c506f69449b56e8f430130dcb3906738f0893a5cf83ae4e30 WHIRLPOOL 8ccf618fb43c7a6c0b4a3a885ad857014ef5f078707ff7616edf80df640cc41923f455a0127ccc19f3119c84610c89f534d780cae7d5b38c08e6cc8284c0e3ca
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/Manifest b/app-crypt/md6sum/Manifest
new file mode 100644
index 000000000000..ec4bbd311b83
--- /dev/null
+++ b/app-crypt/md6sum/Manifest
@@ -0,0 +1,8 @@
+AUX md6sum-1.0-cflags.patch 791 SHA256 1ce1b6680745083f0ec273be081cdafc9c96da849a674654fa926451cd452346 SHA512 dbd6cadb05b4bcf6dae2efc970de71678eb4f78ef7ee743c08b17782ed052ada29c083da94185a7a37c461823e4c6c10a978bee79791e2e8dd22e604817813b2 WHIRLPOOL 6fc17b7ef3f06ed4482d09feb9c871867d872c5e2ef54ac07935987ca85ad656fafeea945e4a0d931a3146174ae9a3bbcf35d6f3588b3a8b6b17abba8703a3d0
+AUX md6sum-1.0-format-security.patch 620 SHA256 13dec5c113e66d50eefccefbe3caaf67cc2d36923dcfbb61172e6ff6b5594e8f SHA512 b1ec3b1479ce58e9e2aa4a43982b61932d7ed099d1246dd00e7d6f183b1087dda7c446a63ceea06006ee905a167bd3cb7485d208d95a7860768b680670f0fd88 WHIRLPOOL 84074d09048142644ee6f425731b365cc0fe1d692413fa4d9dd202f7b1b2d8721394f4d8ce1cd7ce61585b0b36a679731ebf3603c18b474ad5980e540fb449ca
+AUX md6sum-1.0-ldflags.patch 427 SHA256 699b86db61f451a07a5e1c3f69e51d4e159ec486b26cc547f52996ff7a75c07d SHA512 2ed3dc38eef78f365bd8e03e22264488c6a0d089c30f827e90ca5dd5ada9ad061e0c1a736c3ccc81c05fd172ffc8140034d703993233e5e3f8877cfb298fa1a1 WHIRLPOOL dc24ad00f6e2c9d44a58bad7ad94e6863b71386bbf913f58b3cbf058936ebb57778fb042c34fdef1f8a62184ca0875cf6d99e32327e3e7018431dc9a4c9aaff0
+DIST md6sum-1.0.tar.gz 125626 SHA256 5812286dabf26d576cf9b30d3088da1e7924362442144ecdfa38738530e297e0 SHA512 8253a68dd036dd98b22c39a35a75f9bbdc4018ea63dc8f7823c831090d19f2f92a727458b4dc35388e494dbf496b9f5de693a1cfb3e5a8ca8441f31f0e817d46 WHIRLPOOL 05d3e1c8c5065b8003e620b3824310393ad64c22e94d4e3acc18f508e5a6461ba222c1b53e782616a0bd5372c3cadc7e774b24e9782e8137b1336af5740b0a04
+EBUILD md6sum-1.0-r2.ebuild 429 SHA256 0ba6ad2bc11b2c72592cdb6965b1301469cb2677763f6858e1d0f334c533b869 SHA512 bf2cf213c35fe4768836bd81fba9962bf76e3aca9ec5f3d023cb752f25b311f35a5db6d3222d5667b3454d7439fe866f42f592583c98b8fd128f9025606a11c0 WHIRLPOOL 9eb632c83e1a450bebb4ff5d03a4a7f0475ee5b4a5ba2a50670a237b7987ec6555ab9093847cb97ffb7f027fa5d580e022fe3cdbfa70a1034064bbacea286efe
+MISC ChangeLog 2535 SHA256 b354f4e3a2ca83e311b789737fa901c86ba29a03357b0c5bf74696112c812718 SHA512 f06a64e0a0fcc404b3b9af6566ff8260a7dd829fc64b60ec9a545c35d93e3fd47aa73018be0cb02523a8f6aba2102949813c75b81c7ab9f75094994ccaeeb362 WHIRLPOOL 2fd37fca5d65bdcc24eb6f4c0af8ab6c2416881e2f332a545d1f9ae0511f2c95d8c92e3634fc0b6e10b7d78a951924c21517ca8b51a1d6c1720ee65a986fba26
+MISC ChangeLog-2015 1653 SHA256 5e699e799c618e2c0e48a57394bc2fab6b59a61e790002a65072ee9c2288bc9b SHA512 c94c795c7a03aa6795c71734a20705a85ecd1ab0c39892f019b737f5d6d482f125fe2c07c1dd1bcbcaadf1a80bbf59a2e9d82b17723792c23f15db12be32f94c WHIRLPOOL 0b9bbd94719897be06ba7d7c1d7a79264fd6cedffaf22d0b1313a134fb20fffadf3a9a10cbd4ab6eb2626cc7a8a2a8c7b4c31d65406ca10ddeff8ed76fbaa25d
+MISC metadata.xml 316 SHA256 5b4355895d04759452e565554b90227874dc4639c4853f1fea37d93421ac35ff SHA512 c6ae22608f860eaf81fcabca3750fe7a1b24249c5d6eb8aa33867c4a8fba5f1ac6203f298667db39dba9fa9164109bc59267f31e6d9435cd40a242c0055fa3a2 WHIRLPOOL 57cda94c2bf838b60900b12574b56aad1d1c3a1bb2cc71f779ba7c6133c876fa307e24ec18baa6b1f020debecc6cc0f58c02687036d2d6153818dc95361cf312
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..0447b87fa2ed
--- /dev/null
+++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="A C implementation of MD6"
+HOMEPAGE="http://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/Manifest b/app-crypt/mhash/Manifest
new file mode 100644
index 000000000000..b4d9fd094135
--- /dev/null
+++ b/app-crypt/mhash/Manifest
@@ -0,0 +1,13 @@
+AUX mhash-0.9.9-autotools-namespace-stomping.patch 3087 SHA256 42dba3baa4c1fe43104b026c3ad4903e6ba2ee043268336a3e84a7b66cb8fa0e SHA512 f32bcbf244aa38755b99c0bb1b328974a9dc6b927bf56073061821827f7b2017c98eb042d11f52d0befb654c58db6540fe1bec0ce7d5f980bfd26914ac49b596 WHIRLPOOL ba70f44cc758c9bf963fd8b874d6d6a1a753fc721588bc76c904eb6899adc7512827b35f3b1ed551bb142f9b3b1ebac718b5c906cde7c2aba53fb98f84c7d7d6
+AUX mhash-0.9.9-fix-mem-leak.patch 1016 SHA256 87cd9ce4cda5f1fd18f629595f8d468b3600586207bf2b4c37c7091382cfb3c0 SHA512 2255a24f1053ef657750196fbf3e07cb68fc630db5d07356e048a4470a99b2eeeb932a7ecc344211b08bb705a176083f7f36bf0cf245ae684d8cc76b37dcbac0 WHIRLPOOL 3b01647ee05265a6785886dcbddfd6adfd86919a7636509feacddae28475db356701dd199a6fa6392a09a65c9d36ef133092b3f73418c83ed8022b686f4ffb41
+AUX mhash-0.9.9-fix-snefru-segfault.patch 1005 SHA256 f35b6aed2c48fcf7cc43c40475786d0d583b0fd38cf3fa470f6c7d139d51864f SHA512 20f23f4d3ba20b61942e09915fa3e355f679f3e9747fec888d1c576c0e7144611b432cf005184938b86d080d8e626bc31af6ea2877762ec3e3205563b5cbfb09 WHIRLPOOL 0d70787f7e7950c82837d875f547d0bc7bbd4a4321da18649f7e9f506be25dd58c92267d5ee5694435154f35fa3bad20cc21aaaaaf0113e8621e33df1fcecbeb
+AUX mhash-0.9.9-fix-whirlpool-segfault.patch 1011 SHA256 cbf742203022b6a0ab64dd927c084ccfdc07da31ee5a180371b102dccf177795 SHA512 4132174e3b1bf08a296fb36a1bc516eedc79d59c5bd5f17e32ddcf70ad243e24bc733fecafe9bbc3a776c573022496ab2593a0201d3576ebf94402588a4f4889 WHIRLPOOL cdf6596a2c5a641ac948a57e31fc1bba9ef9165465c5d8991ace196a8253c6e928f48c6e82956565b1fdd2d4efda1d5f13269acefc89138225e67385fd5f4916
+AUX mhash-0.9.9.9-align.patch 3037 SHA256 cef76a48a440d428d529746afec665ae9cb78f27d8303886f8b0ea3b12077125 SHA512 ce52d1caf3f9dc5bcc388aefacebb93fd422f905ab82f4d7aa6b66ac4ecfcbd32d576778cf3c0ad34f48461a016a08f2cc9ea7063fcb1f29b5188dea04f1ae03 WHIRLPOOL fdd3ed7caeb213b0eff3c82e2aab1a2ad943f3884f16bda7915c7696398acfe2ef1996d23bee721aba291a6d0c00274d6bbd5027a4e65831a0e31949d8cd453d
+AUX mhash-0.9.9.9-alignment.patch 579 SHA256 f64d52ebe5018a9d850ef33afe94c4488f695bb1948dfe6e57697f1ff4d75d06 SHA512 6272d5e346067861235b8c5cbb5f4ec1bbb1cd80910ea913860e09ed34661df02ed3d4ed9fa55e870d7e22827fad84cc56bb701195908acca435643018fe81d3 WHIRLPOOL 3b123c494991cfa8374550afb2a8a07a303622e715dc13c8d2c1360fdeb4b7443f9bf7b1a5235f8dfd3ffe5e40a8aaf6985c2ac9e931a939c2a733fdaf2cea07
+AUX mhash-0.9.9.9-force64bit-tiger.patch 537 SHA256 708b048c79270330eb072118b5fdb3338900da9ddc0b6bf4ac3260c7d02593e0 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454 WHIRLPOOL a2c40f9c6f455027ed336200d00afde7b559ed22bf9bed2824eff131c023fc701c1dae23ecc3be723cec435e5316a469db3e23c83cb1f14c276643d705639f7f
+AUX mhash-0.9.9.9-remove_premature_free.patch 464 SHA256 b750eef6fb406eb73e2ea46ac6d173587e8a75bdeba75bdb57f572e596844e53 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e WHIRLPOOL 62ac0710bb716d0217f77726e8e5a47cd667d57ecc6112dbf17a5e3f89deca509d1db956ad79c7c207b9ebd2c9d2b5096e8ec1638584123efc41c4fbbaf9428e
+DIST mhash-0.9.9.9.tar.gz 931437 SHA256 3dcad09a63b6f1f634e64168dd398e9feb9925560f9b671ce52283a79604d13e SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee WHIRLPOOL d1a77b1ccb172af9ee4c7769b6f1d1f53f3b7cb1d87f7aad0c5fb64ae40302f21134a1cd05447dd766bc4408ae2dbb014db77d68a052a57131c955d3ca6453c2
+EBUILD mhash-0.9.9.9-r2.ebuild 1453 SHA256 ebb2af9fae385e3a8b3497c40319e0b77e11e099086b738f37733e701b819c79 SHA512 dd8fc19c9504c1e61b25593c9c428a4562bfca7b4a129bdfe0ec541b9f1a5967a354db34336ad5a93587a0bf1e9cc6d1e6237dc093e967403c2e2fa8c3d5a6cd WHIRLPOOL 94209e46c2010eb4ce35fa08aa736b69ce136294adf57b3942e7863577c67ffb39e4b75e5b61d6c12fd5cd04cdd38fa0f23069238807ade68bb81ffe9d70d273
+MISC ChangeLog 2592 SHA256 fe59285f96aa727c42eb4a146c58d5e764c8fac0060f441c2b90ed58670418f6 SHA512 2bdf2713cbadc6ce26ac691cc87b49bf210e75cc9db0d6bba4b2f711a37a3dd45ebd1c8b52b6da61943e098c56dac57b803d18be895543c85df58d40775041ea WHIRLPOOL 946603b5173bf5f764864600ce309520cd8ee74bae55576b34dbc86f5cb4ea88ae014e7243c5910c6360dbb912f4788755758ebf93407b474576952187c42acc
+MISC ChangeLog-2015 8953 SHA256 4fa39e356da5c9318e0a0946e8e0dcb36c11f19011e8bfdebc0011fbd07aa3ef SHA512 4cc3126f2e9d49aa3578620b8ee84c7bc028765ccc6cc8672f9f6dcc44942097296910925e54d64f0753714c6adf16c98d96654d3c5d14f7bc6928957fbe4e80 WHIRLPOOL 4225dd9731f15b121ea64cb960a0c548640959c369ad57473d199126599e9d53919797dc0c4184d61d22933ce786e39306e0682e3bdeae4b99a5293a7aec71fa
+MISC metadata.xml 325 SHA256 5a9d0d4cbaeac26bb9dd267d8739e6412899f8a5a169dd6ecbb546755faeb03a SHA512 32c365b53e7c9d2a3c6dcef43cc33163a690a0e2f3401e275d3511faa388149ade4b9f5c583307f5b94e6df005796b4ec935ecf35c6cda8d236e46ed0ab7336c WHIRLPOOL a3b828e57608ee232a3b8a2b04230f3ff1a564a90b0e5c4d44eb463c2ce62a1927f4df7e0fc82382c034c4c93df60d114d25f11256db6216af78c7af42fa57ad
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..e719837a52ad
--- /dev/null
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 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 ~sparc-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-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
new file mode 100644
index 000000000000..06748409d603
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -0,0 +1,7 @@
+AUX mit-krb5-appl-sig_t.patch 1411 SHA256 81d681fcbf96f7baf8452cbaa089de931cc3915f1a1202a16ef1808ac0a08150 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3 WHIRLPOOL e92b0b5ca3cd8be2f8e7fe15dc8cd1719784b6d79e70e0d239b90f73833ca53d26fda6c9c70bc1e3a504c7eedb4b6480f8ac9eb11719db5f567166d8b9d58321
+AUX mit-krb5-appl-tinfo.patch 575 SHA256 c75e6ebf90a691680ccb37459342de5004eeaa1b88214dddf5100bd795144cb2 SHA512 076f34d70f43ae34fa6bc5e23171b2b31f579812527b7f78ba40ac3fca0cd92000b8caa40b8773bd2f9cc3ce0f6bcc6815f83422d5f8d320d34c4feb580231ab WHIRLPOOL 0c8321e40373869c76a9b4883c603dcc5cec14dffddb9b8645823b0ffd7b7a6fcca7885c9401c8f9b841569680fae74543a47d0eb839baf58dc68bcae122962f
+DIST krb5-appl-1.0.3-signed.tar 634880 SHA256 feb88581eba566554ad515a6fcf18cee11e8409a2c4755bf5188db96f0b7f039 SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23 WHIRLPOOL 091525cd162375b383f41f0627fa3dba2468459e2aa8fdaf8fff6c01f2bfd27af45990fc68ec0a0eea13288e3288c967e55346c53165ea1238ddea9b94a94364
+EBUILD mit-krb5-appl-1.0.3.ebuild 1642 SHA256 5d1b96b57caed906b83909224414942660c5387042a61f3f739b47b881f34160 SHA512 c246be6deaf8fe6651ab8b6c61cdc47f5e1afb73c7913beef5b66d571622e318751fc5e7514ef662c2ea0c4196a4dcdf64b4f685e2cef6435bc2cb6796f80bc9 WHIRLPOOL 9c570698ec7b588e96a49e81c93117e4c386a09d7cc1162cc247675b331ccb759bdd7761b45c5a8f868885073601256b306f57cb3588a9cfce05da8582e66f90
+MISC ChangeLog 2516 SHA256 22cd410cf1e2d0abe239e8cdab9ec94eccceafd87c974a8f9c2df5778b94613d SHA512 c039d76caae8c21281123fbbb482a42fbfff4000b8b4282a8d7db0a3d0a200db845d980692f412999cea6cfe9957803ec27fc6e065d8aca7a793d24aa4d3f43e WHIRLPOOL c2d132e3cec0349a052a9932bece32cb190fca2f28f325b2a3dedee664d4ababc15d7872ee763169c3a006982b66cb432aec3b97e77cf1452cc0b2f3ef5c48d4
+MISC ChangeLog-2015 5041 SHA256 09837683a44cbd0c5a96c60622e5a4c101dfe403390d342570c1a5a6bd041ec8 SHA512 9d5b9a75e36aa6ab0387cf07d0fde01efa93de57789671a3d3588bd9972b3349f77396295e3fb54fbb3f7c7c02f177115e78a2e19c2c46532e6723e786ec6b07 WHIRLPOOL e05d7e4eed2cc9c5e72f9fca23574909cedf8ed1c4c18b4c918813958290918db7f4ffd63a2c7f9cde4dfccb087bba2a6feb9148883bb0038719c57576b271e0
+MISC metadata.xml 240 SHA256 d284cd6fb691c9d01be24b5715b4feffda7e1a4949d3b1d48070b73e2d116fe7 SHA512 57354970f719cd4e3a27f6024addadbb81919a5eaaefef094d3d2b362c44b5ab5cec740090ffce89730cc52f469bc93957c129865a71a4583e0309a93e6f970d WHIRLPOOL fe21f3f603ca001ac072ec14b2bec8f094f00bb29e91781610984fed075069d046f42249defc03dd1736ce9718ad1569a858a3725b8f3d506bb939026c1a5150
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..01eb8e93637e
--- /dev/null
+++ b/app-crypt/mit-krb5/Manifest
@@ -0,0 +1,28 @@
+AUX kpropd.xinetd 194 SHA256 eaa3838a6ca8db901db359cac3435d4f703a9a10534f02eeb37f494dd21a1736 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f WHIRLPOOL d77ae7b0094c4f42a7ea9cee5d36d0dba844a9ed5d59c621e47c7fa4b75c84fec3414e079c570513711b378d1b0fef61156f675a0df79ee61540d9492416fe42
+AUX mit-krb5-1.12_warn_cflags.patch 448 SHA256 67d3c91061933bd5393b9a6ee8fe2e3f5cd287c4eee7b92798cc2e201712c681 SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b WHIRLPOOL 9fa704dde00b0201d765199893bf787c5c104070596b05bc12e7f41ae21c4c60c8d25b21fe8573ecd3e63ab769238a78c5cf70f4d086a23f71423b1cad283eaa
+AUX mit-krb5-1.14.2-redeclared-ttyname.patch 660 SHA256 dc55c696421dedbc8b9933d05792b85e009195c464aa689f372acb714682bc73 SHA512 90a2adedcdca4e2079daaa613e2d4f08e948ccfaf56aba19a08b4cbe2257a6a60dcfd5bbc4b19ca64f584759b1a374d1894729a423e636bfec1969a675a1628e WHIRLPOOL 3dc18520d2dc3ccb80a1aada18635178c6920d59a496ac5ea404ca37f03580665486f5a8b7ee11601dc44fc9df77cb48035f231df3e13dec8cb56885a4ae9b0d
+AUX mit-krb5-1.14.4-disable-nls.patch 1247 SHA256 1921304d585bbbcacbd5012a4ef6b696041aead8768c53b25c974f9b441ca901 SHA512 5fecc719c5c8a1f5c971443d42561615b8fb8c6b99b735a633c7479f109cfb6852eee5179e267a1e2576e52faf2311395ddabdb47f749b573ead3ddd86714e2e WHIRLPOOL 53d09ca0d1e1f49e2815dedd9b502707b268cebc73315fe87eb379c63c2967a7027a2457f90227e4bec851075bfde08a1a418eee976f4022c13e236f51677e91
+AUX mit-krb5-config_LDFLAGS.patch 466 SHA256 fbb4d9be71ef536a344d415b9c56ea42c5c2a2ef02ec3a866d9da47b3acd93d3 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7 WHIRLPOOL f6c58e652c4c365c4f28894d404413a075cc6c5323f83b18d711dc831bb574623db371ccbc1a5aae0ddf030a1b85e1ad50c06f5904ae5554bb4026e464a2c75f
+AUX mit-krb5kadmind.confd 76 SHA256 f1b6c29defb5a37c83e6e3fd52c57f4a538a64a1cfe6e114663150fdf1042796 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3 WHIRLPOOL d3b92cf015b58724124edf0bc107cb0b5bcae347cfc6690689b4beb4a82ff8e445225eb44cd6be43ccd10082d0905e64bc28bcf88e32048205d5ec07abdb8295
+AUX mit-krb5kadmind.initd-r2 612 SHA256 0b3b5bcfdb5010d20e3d4457f4128a4fb9f2d91261bfcf489601b1c714f9d815 SHA512 3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98 WHIRLPOOL e1ab90540909d1da6d9b39d7149b2cdd43a01e703cf8b09c28ae3463e0d655bcec506e65305c772176e5bd7b16c43d15bfec1e342af3428bb0d074290718c7ee
+AUX mit-krb5kdc.confd 54 SHA256 351b9d541a4d8cc423f277585f5330772c5aec6f43170df7bbf17078990a04c8 SHA512 bd51139b644350f464fe4d254cc5036e96a7f5b0156033e1fdeed1acee6867052bddfe3495893295e83f56dfdff1c30a606bd64faeba58cc9a5bcd6cde5c6b9c WHIRLPOOL 595361668318589819b11eaee3bce4d5f7bbe46c6930a99ce744639381e649d176f74e01da1ab98e1efdb091601537cc2b46c7e38de44d0c830686e4fcc53703
+AUX mit-krb5kdc.initd-r2 572 SHA256 30572eeec9013fbfb6170f2b0bd1016582d2664268e4019fa8e2edd41e52919d SHA512 42cbc315a4e28a78cd29ee6f9aa9401ac6185cc78d39528f0c498d6b04a8edba7b7efadaaeae52ac2c4f89faa846787da9aee645f9ef0bdb79cd6289454586a3 WHIRLPOOL 66cce4b84d38fbbfb4800ca129530c9e8f50668d5369b7a22ef12fad0232b4a00c4d713a64c4963edbba094ca5e6962f9f4738edf2f8a0912556632690e35c0c
+AUX mit-krb5kpropd.confd 84 SHA256 9e93615c951ef5f598f09bf6b679fefb3d7943fef1373c24b9fdfbded9cb8cef SHA512 afd1cf21a6afd3bc73b1ef3cb0a26ec3420b26ed31196f8c092ae880b235043273c95e2ecb3b88e65ea008cd8ea6a10553d1966f45646cf5993d5752dfc945ac WHIRLPOOL cbb4ab8f7fb1f605d2fbce09d259993ba908f5880f54b4d6cc5e81a6ffd2c4a26b80b0e122bc4b0af0b4bd6383732a0ed5ddef9f654b2f70482855d165757065
+AUX mit-krb5kpropd.initd-r2 608 SHA256 bf8539b70561d9eb495f55141a5295a8c2e8246af4d1990af94e98be952dcdf9 SHA512 28b9d9bc9d132d8bd87d5fd9e74103d4772f26cba48d28ad53f40ade037a5ac91e07c01aa3180d50c3624673bf4e534f76689b03feb4888cdd9198755576b6a7 WHIRLPOOL 0b4d4160cba2517e0fde61619502485cea9a9d9d25d53341ecc3eca9ba3394aa190f21986a83d6c3697e4ba0bdeb42de265f90c80fe700e29ca381e85ea8b8d8
+DIST krb5-1.14.2.tar.gz 12264762 SHA256 6bcad7e6778d1965e4ce4af21d2efdc15b274c5ce5c69031c58e4c954cda8b27 SHA512 8e0d8203740aac78b65a62c0f79998b56dae23725763f645ae13a92dc4263d193e7334f84e278ca873d2b72d425f47cd4b68b58690d029dccce41e8a157b16f0 WHIRLPOOL 18a3729f5bfb928318f5cc28c919cbc49ee9179199ee82445922a5f2e8afbf4ed5a31f7e710877f8c12ef75f326723e7410608ce538983ce1b811e16091d72a1
+DIST krb5-1.14.3.tar.gz 12279888 SHA256 cd4620d520cf0df0dd8791309912df2bb20fcba76790b9fba4e25c1da08ff2c9 SHA512 97f42bb7e0f69e337b949b451bf925f604e7ef9336c32bd4d62224a8c4a37e631f5a6fc01016bbdf268bbb60fa58712e244e00a1ab5a8bceede6a676482235aa WHIRLPOOL 30803fbd74f90c1b0e16783d36b7a648f4bf2fd8391f722589cdcbea28a7e826789fd7da3ed984f4555b18e72aa7f4e3096299f0edc7a9165c98eb078f5efe07
+DIST krb5-1.14.4.tar.gz 12283989 SHA256 03a61a4280c9161771fb39019085dbe6a57aa602080515ff93b43cd6137e0b95 SHA512 5eb16b909d69143bfa8b2a7ba4c0deb74408462a5ec1241e97f37e30d29e259767be91a4533119e2c5e92d1fcbcab97038b2e45ad3361b5a61c3dc562c6d0d67 WHIRLPOOL 9a4ed044fd96fef4875ba9d281a94b5ee9d393e9f2c92c3bc65600fb447928358918389aef2d1f371e4726213b9497d63719b981a819cdacf791eb1385f5b850
+DIST krb5-1.14.5.tar.gz 12322802 SHA256 262485c15af1208b69b55bef39cd246a892b5f41adf1956055ba52884a4dc7bf SHA512 2484f9581b5e0b99cc49ba7f8770ea3a8751e756c98cc552d92ca223575eac58f6f1a9c268254ead4435d2d49b50ccf3181eb7bdbd56874c43f91bcfc2a66d3b WHIRLPOOL 638c046cf257cdb0f5b940681790ab779f103b4488413979ac3072b3117f251710a284910dbcb8806d965c3a97ea2f62965050de0e07356208b23786cebfde08
+DIST krb5-1.15.1.tar.gz 9375538 SHA256 437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45 SHA512 068b4c012722d8c232049d2a617f7ee28ceeaba6be94a78439e69e37b66cfdc49085641e42cfb03b2fbb72d21517b537e437061ec4dd2bf864f31e55e05fe918 WHIRLPOOL 1415295882eccbaf550d05d4b5bcae77c3c6fde1f5354b2ffac09f73148f22a223c38d73d80eb4c0e3b7e9fd528891645e114713e11a5eaa14520cdbe6b097c6
+DIST krb5-1.15.2.tar.gz 9380755 SHA256 1639e392edf25e3b6cfec2ae68f97eb53e07c2dbe74bfeede0108465d5d1c87e SHA512 e5814bb66384b13637c37918df694c6b9933c29c2d952da0ed0dcd2e623b269060b4c16b6c02162039dadebdab99ff1085e37e7621ae4748dafb036424e612c2 WHIRLPOOL 5b798a677cef9b32ef9320fab142f33cd1f420264cd29299a15834955a0f323001fc9fc5054eb41ef23bd33709ce47aad6436f8c54ee9e6e8c85327db6f0adeb
+DIST krb5-1.15.tar.gz 9327157 SHA256 fd34752774c808ab4f6f864f935c49945f5a56b62240b1ad4ab1af7b4ded127c SHA512 e71008ac3055a511ecbe6adfb9b328f0a01b33e8a73276d75b80d5db783f7bde63987c855584fb6075a6f5c88135d9871f51b2469e34ac8ee3d89b9add22d8f1 WHIRLPOOL 77572929805f2db35b46e6cf5d83058376025c7a924c1f5034ffaa18c209ecd9078c9ff5142f7848f76e6d586db8ec4c985dba32bbbe27d439c3cd8288ef59e8
+EBUILD mit-krb5-1.14.2.ebuild 3949 SHA256 95091b58c43ad08681813b8b752069c4449529792779e82f99337f96075d9d5f SHA512 e33508d5d4b8f0e0f5fe2197e789f74c3ce35e8c1136ae39a45c0f63c977c0776e140381451f68313464481f1c2c27c9be728acaf02d0e68362b97afe24ee773 WHIRLPOOL 715ac57e1c7be2be36209c5cb1b2b5eea55590890209104978a6ac78f486923be9b64c244e399687c0a8f64460600826328d86f32f7a48f167107c3caaeb35d1
+EBUILD mit-krb5-1.14.3.ebuild 3641 SHA256 ee5e3ac9e0ad5d22f5ac0c243a692d73a50fdf5120fa0cfdec6526a60d8c2df2 SHA512 0e0cc615cbd6a8e9ef162ae9a9d5fbcff8bc43fb98a9bd90f742cd5175fb6a05f379ee7d021c837f9a872628225f52038d004ed48604944cbc9386bff98de92c WHIRLPOOL 3bfb29c2145403f737038face6709c4231ce70b845ee6f4d6846eeabc4a66214e0d3376b9b9a75bc476673abb11c197456d382bc2c414bb20236f8381f6982f2
+EBUILD mit-krb5-1.14.4.ebuild 3853 SHA256 32f1855442a041fea26339374946c627d2f41a9d16e85a3e6f6ff5faab9c3e8b SHA512 90ca4cda193fcd9b8bf448ec97fbfcd6ceb41cea7c1253739405e428ff4f382c4996638bca465c899eec63ac5f5e391826a066ebd29f582c309c5759a7d5e2b3 WHIRLPOOL c300ea6ee6b3e6948a253a33cc55574fc132ae5520adf67941b30b67bd06b3260ceef03e39b7afc8c00860bf056e5f4229826bbe917c324ee0700da3ef31f47c
+EBUILD mit-krb5-1.14.5.ebuild 3853 SHA256 b7636470f22928156f9f298662f33c78941e47310fe47bda8bb49adc9589f2d0 SHA512 c9dbaa7d7a9432b263afbe37ba27f86ec5b656be84e16a0d3772fbce5e04a2cbba26008135d7d1b9509db10770f8ff879c2748cca5421571d560b3e5917c475c WHIRLPOOL 513819e5acad6c0f0488b8833b67bfe57813199a9de86db8ad954e144f9c6248743c70fa1294277c117dcaaeb6684d2f01814b716acae1e4ff3da38c5b63f10c
+EBUILD mit-krb5-1.15.1.ebuild 3864 SHA256 38920b114635a7d0823871b5b5a57b7f228b1ae9f3bb9e48b3c0622291accb76 SHA512 2b46e5d462d0b2fa3ef760415b6d5d7e8fa453c129102d0e92074b9a5ee86007d9376a27fd45c5dcdae93d59462edae7d5ca1a1ba89e75d64c95758b9d59e948 WHIRLPOOL 949b176ba9d8ed46764328d174f209296db0ef3c65d3057f767a42d5e2c5c6a1145cc3725e51486054bb24a1b2c0328bdd5a544de163bbb73462b2e17b309d9a
+EBUILD mit-krb5-1.15.2.ebuild 3864 SHA256 38920b114635a7d0823871b5b5a57b7f228b1ae9f3bb9e48b3c0622291accb76 SHA512 2b46e5d462d0b2fa3ef760415b6d5d7e8fa453c129102d0e92074b9a5ee86007d9376a27fd45c5dcdae93d59462edae7d5ca1a1ba89e75d64c95758b9d59e948 WHIRLPOOL 949b176ba9d8ed46764328d174f209296db0ef3c65d3057f767a42d5e2c5c6a1145cc3725e51486054bb24a1b2c0328bdd5a544de163bbb73462b2e17b309d9a
+EBUILD mit-krb5-1.15.ebuild 3864 SHA256 ec62511317c0754144467a732223b1dd1dfb76e5aadd9620d6611c4378a5fc6a SHA512 43878eda33aa3842e46753fe08e3a25e2102ece093b5a86b5a26ef20178917dea34f45c17f97e35d63bb9505dcef07ea26b2403daff3bf4b7df9c8e5423719fd WHIRLPOOL 75e27ef87ac4876d67bf01d4b250d46522e8d45138eaa0adac3c9332dbf93fc644edd09fbcb7ddb055e4f93444422d0faca1df7e19aaa956623f6b5983636546
+MISC ChangeLog 11631 SHA256 47629e47270ddce6f7ff35cf51ae9ba2ab357c284adca567278a4c5b98c06fe4 SHA512 07615910b39d1840caac4849aa054428e8fd5e1725d41920b46755501bcf54d9da0e05cbb0c1c631b4b51ffd99ee1b77d97eab43cc35e1304942b13b46d917f4 WHIRLPOOL 2e096d4afb254dec1a9f10a007f1293c58fd2838d13dc5428796ac19efef27620dec7188980b4dbf98ccbe87209d572e784574bbae764c01adb78f5fe2dbffb7
+MISC ChangeLog-2015 69731 SHA256 b36a2d9ca5172503de725c371c312d47f4eea26af2d43011d1c2c23f6f637a6f SHA512 9d54838fda9eade825266ff2480848c0d1cdd89dba306fd2598f75399eca04440517ed78844d742c17da48cbb6f3c80c6212eed2fba715a0f8dd58f8635badfa WHIRLPOOL 47435d373fa97d0eaa99f92870f7e759b8a1defc0f41b668ea05b3c72b93d0b4d0516639f326417744cc30008a871b20365301c5bf0b6676b22e61d092c7cd4b
+MISC metadata.xml 828 SHA256 feb9a8f215ec3f31f6045c702f759db218b8061a6a41cbf7cfe3b419575f1afe SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c WHIRLPOOL 5e11cb19050ada41ce7bc3d627e37f3a1ffaf781d231684835ead25f5f32d150dbf7fcc6c61cacf917ef444056f7f05f2772113985f6e5016622502536cba396
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-1.14.2-redeclared-ttyname.patch b/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch
new file mode 100644
index 000000000000..a76cd3a7f843
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch
@@ -0,0 +1,26 @@
+Fixes the redeclaration of ttyname which was preventing
+enabling clang fortify.
+
+The error was;
+
+main.c:858:15: error: redeclaration of 'ttyname' must have the 'overloadable' attribute
+    char *p, *ttyname();
+              ^
+/build/samus/usr/include/unistd.h:784:14: note: previous overload of function is here
+extern char *ttyname (int __fd) __THROW __CLANG_NO_MANGLE (ttyname);
+
+https://github.com/krb5/krb5/pull/568
+
+Patch by Zentaro Kavanagh <zentaro@google.com>
+
+--- clients/ksu/main.c
++++ clients/ksu/main.c
+@@ -855,7 +855,7 @@
+ 
+ static char * ontty()
+ {
+-    char *p, *ttyname();
++    char *p;
+     static char buf[MAXPATHLEN + 5];
+     int result;
+ 
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch b/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch
new file mode 100644
index 000000000000..63cb0fc0c55f
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch
@@ -0,0 +1,45 @@
+Adds support for --(enable|disable)-nls configure option.
+
+This enables\disables the generation of language files and
+sets the ENABLE_NLS define appropriately.
+
+Default value is enabled to preserve current behavior.
+
+Patch by Zentaro Kavanagh <zentaro@google.com>
+https://crbug.com/654842
+
+https://github.com/krb5/krb5/pull/584
+
+--- src/configure.in
++++ src/configure.in
+@@ -118,15 +118,22 @@
+ ])
+ AC_SUBST(LIBUTIL)
+ 
+-AC_CHECK_HEADER(libintl.h, [
+-	AC_SEARCH_LIBS(dgettext, intl, [
+-		AC_DEFINE(ENABLE_NLS, 1,
+-			[Define if translation functions should be used.])])])
+-
+-AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
++# Determine if NLS is desired and supported.
+ po=
+-if test x"$MSGFMT" != x; then
+-	po=po
++AC_ARG_ENABLE([nls],
++AC_HELP_STRING([--disable-nls],
++               [Disable Native Language Support(NLS).]), ,
++               enableval=yes)
++if test "$enableval" = yes ; then
++        AC_CHECK_HEADER(libintl.h, [
++                AC_SEARCH_LIBS(dgettext, intl, [
++                        AC_DEFINE(ENABLE_NLS, 1,
++                                [Define if translation functions should be used.])])])
++
++        AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
++        if test x"$MSGFMT" != x; then
++                po=po
++        fi
+ fi
+ AC_SUBST(po)
+ 
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-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-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-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/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.14.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild
new file mode 100644
index 000000000000..4cc211672819
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://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 openldap +pkinit selinux +threads test xinetd"
+
+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}] )
+	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 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+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() {
+	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+
+	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 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
+		dohtml -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
+
+	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
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+		elog "MIT split the Kerberos applications from the base Kerberos"
+		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
+		elog "ftp clients and telnet, ftp deamons now live in"
+		elog "\"app-crypt/mit-krb5-appl\" package."
+	fi
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild
new file mode 100644
index 000000000000..05e7ee3e071b
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://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 openldap +pkinit selinux +threads test xinetd"
+
+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}] )
+	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 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+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() {
+	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+
+	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 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
+		dohtml -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
+
+	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.14.4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild
new file mode 100644
index 000000000000..1c5115ab62c5
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://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"
+
+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}] )
+	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 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+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() {
+	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+	epatch "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	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
+		dohtml -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
+
+	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.14.5.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.5.ebuild
new file mode 100644
index 000000000000..c4ebe7f83b23
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://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"
+
+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}] )
+	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 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+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() {
+	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+	epatch "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	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
+		dohtml -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
+
+	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.15.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.1.ebuild
new file mode 100644
index 000000000000..43d73e446296
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 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 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://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"
+
+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}] )
+	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 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+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 -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+	eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.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
+
+	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.15.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
new file mode 100644
index 000000000000..43d73e446296
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 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 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://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"
+
+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}] )
+	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 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+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 -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+	eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.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
+
+	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.15.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.ebuild
new file mode 100644
index 000000000000..530c7a37380c
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2016 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 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://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"
+
+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}] )
+	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 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+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 -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+	eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.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
+
+	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/monkeysign/Manifest b/app-crypt/monkeysign/Manifest
new file mode 100644
index 000000000000..024fedfb402c
--- /dev/null
+++ b/app-crypt/monkeysign/Manifest
@@ -0,0 +1,9 @@
+AUX monkeysign-1.1-basename.patch 393 SHA256 68fd68a6c2aad7780a6e940c12d55f65cbcf06e2574b5537e066fcd300b5066c SHA512 ae9e01a6aff91231c700f1e46ef7f4dabed8ba6d3d3a275bb6405b767bcb6f40c96ff7563fe693a17d76e26b63b2ccb0e66e834e910cef5bb94d2a9f9cd366d3 WHIRLPOOL 05f6ed59a288d8868e0ec4faf8e7f5a0c2a14cfee860d3562cb50035544d4130ab95c9d1e2f1ccb0e1c4af70ef1a4b2cac88c29751148af00dc94bc5a680ffc6
+AUX monkeysign-2.0.0-rst2s5.patch 963 SHA256 ba648d952f4175fa12beb346442dfcb58702ed0ee6d1100b18238c305e68368c SHA512 c738d3a29dd272fe7bbc1108371b302d3b551bb61c8a2725c39ae57804f67539fd9fc2222fe9a53d2b2a213280b6c1707dc9f8fdc541264216f92799d7930d58 WHIRLPOOL 9840e2deee4fd8c5b3baf77a4ade21be4520e124b6cfa36b011d4f1410ccef45c9312096a01391f361220358656242884dc0b325db362fac7a4c80566c5760df
+AUX monkeysign-2.0.2-smtplib.patch 1187 SHA256 74314122d91fb2eb580f060d2f9cf856bebbc6e42abd8c3fbb910bb81d3ded3e SHA512 b62c7b087f4c44b6078be9a49d21790888b5c6313d5780e4b9dcfeb86d879552fe0b3f9c410eaf53327ba0dd8ee056643f7c9b629fcf48251e1b8ebf598a34c6 WHIRLPOOL af1322a26cf05d8d655aac6945127aeadbaf8f367f42ebc12843733337f71d46a774736bfd48884c14290a86d66a36d74cef09985544967e7d4adb397a580711
+AUX monkeysign.desktop 181 SHA256 0b84e2ecc02c760206c313e8a53c4de835896b59536174cec6e644edf55b4d32 SHA512 ec4442e2467700e355a3ed58cb3512119e70d76e5bf75acba4ee8109bd0fea9066cbb23ad7f93551c40a6f8f345f255e7ab73cbcfd974a878275004d8c7cfb98 WHIRLPOOL 54fdb196b97a67730dc658363c6b12a728e048c23d1e7e96333134da0214701aa36119f5efffda22534ed20585fbb2f513eb6d6dded089e088cd015e86a4f4c6
+DIST monkeysign_2.2.3.tar.xz 1145852 SHA256 b33a2154c55cdb2b215d230b0e998c325fc0f9782c13f35e368629478b1b76e5 SHA512 accbe2b2350ad0ba8ab05ec0da759c95d705b69c149045875cbcdcc35d4c776f13339fd8fa97203fc3ebf23e4f1c70a9776767c39e92196545b1b3905cd25caf WHIRLPOOL 5a79db13d79d6a89e9e2f9b5253044c0d759c22af6640a808db9607b21da5aec99c188163d9687918e6eaff054a4c139e0c367c81e955a4d0d74f53e14f8b152
+EBUILD monkeysign-2.2.3.ebuild 1270 SHA256 0ff6535c609a8e4723bbf1fb0923c016d442fe897d73691d9d955905f9acaf9a SHA512 879fc03171e33e48a91459f85385bd73c86207288410f0c8ea265ca24c85cf869737d81569b9f1e3dbec52be472d16c9401d9c685a0a308a6a2bd2403d4d2180 WHIRLPOOL cb73ee9e219aa3aa0806fe6020cf98c210072428da956b89098ddf70f96f86300879480c94aefb23a3ed1c480c8256f6fcee4502943859e84eba48c4f6b274c7
+MISC ChangeLog 2764 SHA256 bb61fec4b2f1808e39470d292ff8debf049c00562fb80aa335d3ce9ef25f1ad3 SHA512 e47907dfce9662276f17ffdd497ff5dee9ba08bcc02a84afce902182dc864fc2dbe10710e5e22865dcbae5fb3b4ee300d9e1a1d0234a07990d8c1c01e96dffc2 WHIRLPOOL 1d85a73d4352906fa5eaf71d15f924f15fc1447af0688127a47f27e36acae6b3b9110a968642e21790cb112fc2454783664ea368534b9439b894e262c7d3dfaf
+MISC ChangeLog-2015 2083 SHA256 151ed4b2582a2ee9c30facfb8bfbc6a984c600c4043618a0cc71afa7f2af90b9 SHA512 e1744885a54a32356af2f86aa77cc4fe24236715366174ce474aa0b4e1fd5818c84b92edda5218bad7aeff56bcc7b03baaac20107bab425ae98f24dc8c2f6c2c WHIRLPOOL fe34a8d60b44ad6f239387c363494f2b2c3850235ad0156f2012fad074c6515ccbf810644765876bf57ac02e902872281ee4ad909ac485a76c51e9242bb467ec
+MISC metadata.xml 251 SHA256 66d741cb041462a1b2c366c3a5c5f7c6d04490659f6082997971fffca955b5b7 SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd WHIRLPOOL f46e8d77ccedd8078b4c5c3c48f4724ff604a3c9071c844a7014a97e61594da3c8750db5d3263c17c97d439c5cbcae378dc10cadd425ed43169223d61a1a8bf5
diff --git a/app-crypt/monkeysign/files/monkeysign-1.1-basename.patch b/app-crypt/monkeysign/files/monkeysign-1.1-basename.patch
new file mode 100644
index 000000000000..dd9011239f08
--- /dev/null
+++ b/app-crypt/monkeysign/files/monkeysign-1.1-basename.patch
@@ -0,0 +1,12 @@
+diff -r 954b8fe8cdb2 scripts/monkeyscan
+--- a/scripts/monkeyscan	Tue Oct 01 00:02:17 2013 +0200
++++ b/scripts/monkeyscan	Tue Oct 01 00:04:27 2013 +0200
+@@ -25,7 +25,7 @@
+ if directory == 'scripts':
+     sys.path.insert(0, os.path.dirname(__file__) + '/..')
+ 
+-if basename == 'monkeysign':
++if basename[:10] == 'monkeysign':
+     from monkeysign.cli import MonkeysignCli as ui
+ else:
+     try:
diff --git a/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch b/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch
new file mode 100644
index 000000000000..2c3c66c884ed
--- /dev/null
+++ b/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch
@@ -0,0 +1,17 @@
+diff -r 9cf95971dd10 monkeysign/documentation.py
+--- a/monkeysign/documentation.py	Sun Oct 19 12:34:21 2014 -0400
++++ b/monkeysign/documentation.py	Sun Oct 19 12:35:30 2014 -0400
+@@ -161,11 +161,11 @@
+     def run(self):
+         html = os.path.join(os.path.dirname(self.file), os.path.splitext(os.path.basename(self.file))[0] + '.html')
+         self.announce('processing slides from %s to %s' % (self.file, html), 2)
+-        os.system('rst2s5 --theme default "%s" "%s"' % (self.file, html))
++        os.system('rst2s5.py --theme default "%s" "%s"' % (self.file, html))
+ 
+ def has_rst2s5(build):
+     """predicate for this class: do not fail if rst2s5 is missing"""
+-    return (os.system('rst2s5 < /dev/null > /dev/null') == 0)
++    return (os.system('rst2s5.py < /dev/null > /dev/null') == 0)
+ 
+ # (function, predicate), see http://docs.python.org/2/distutils/apiref.html#distutils.cmd.Command.sub_commands
+ build.sub_commands.append(('build_manpage', None))
diff --git a/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch b/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch
new file mode 100644
index 000000000000..e920acfa3797
--- /dev/null
+++ b/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch
@@ -0,0 +1,28 @@
+From 9e6699ec432b23d56a0728bb25fc2ed1a47a85e6 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 2 Feb 2015 20:38:07 +0100
+Subject: [PATCH] ui.py: Make sure to use smtplib namespace
+
+Make sure to properly use the smtplib namespace for SMTPException
+in order to avoid a NameError for undefined exception in global
+scope.
+---
+ monkeysign/ui.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/monkeysign/ui.py b/monkeysign/ui.py
+index c9b6a30..c2308c8 100644
+--- a/monkeysign/ui.py
++++ b/monkeysign/ui.py
+@@ -359,7 +359,7 @@ expects an EmailFactory email, but will not mail if nomail is set"""
+                     self.abort(_('Unexpected SMTP server error while talking to %s, code: %s (%s)') % (self.options.smtpserver, code, srvmsg))
+                 try:
+                     server.starttls()
+-                except SMTPException:
++                except smtplib.SMTPException:
+                     self.warn(_('SMTP server does not support STARTTLS'))
+                     if self.options.smtpuser: self.warn(_('authentication credentials will be sent in clear text'))
+                 if self.options.smtpuser:
+-- 
+2.2.2
+
diff --git a/app-crypt/monkeysign/files/monkeysign.desktop b/app-crypt/monkeysign/files/monkeysign.desktop
new file mode 100644
index 000000000000..6289800f2e74
--- /dev/null
+++ b/app-crypt/monkeysign/files/monkeysign.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=Monkeyscan
+Comment=Monkeyscan part of monkeysign
+Categories=Network;GTK;GNOME;X-Internet;
+Exec=/usr/bin/monkeyscan
+Terminal=false
+Type=Application
+
diff --git a/app-crypt/monkeysign/metadata.xml b/app-crypt/monkeysign/metadata.xml
new file mode 100644
index 000000000000..91439c59951d
--- /dev/null
+++ b/app-crypt/monkeysign/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/monkeysign/monkeysign-2.2.3.ebuild b/app-crypt/monkeysign/monkeysign-2.2.3.ebuild
new file mode 100644
index 000000000000..eb83ce43fc82
--- /dev/null
+++ b/app-crypt/monkeysign/monkeysign-2.2.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A user-friendly commandline tool to sign OpenGPG keys"
+HOMEPAGE="http://web.monkeysphere.info/monkeysign/"
+
+SRC_URI="mirror://debian/pool/main/m/monkeysign/monkeysign_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	media-gfx/zbar:0[python,gtk,imagemagick,${PYTHON_USEDEP}]
+	media-gfx/qrencode-python[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	app-arch/xz-utils
+	${CDEPEND}"
+
+RDEPEND="
+	app-crypt/gnupg
+	virtual/mta
+	${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-basename.patch"
+	)
+
+src_prepare() {
+	sed -i "s/'rst2s5/'rst2s5.py/g" monkeysign/documentation.py || die
+	sed -i "s/'--list-dirs'/'--dry-run --list-dirs'/" monkeysign/gpg.py || die
+	rm CHANGELOG || die
+	eapply_user
+}
+
+src_compile() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	domenu "${FILESDIR}/monkeysign.desktop"
+}
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
new file mode 100644
index 000000000000..64f98e7229a1
--- /dev/null
+++ b/app-crypt/monkeysphere/Manifest
@@ -0,0 +1,26 @@
+AUX monkeysphere-0.36_default_shell.patch 466 SHA256 637f4cf6e83ea01e5a981f940618127512ca1171498b0d03a7779d2b50e80124 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8 WHIRLPOOL 295bc1d61f26f214020f1ac753a002911e2d775a6d7e46e847b091980d385245be12961b79949d77826ead3852e5058c45b512f28a44a36f20afd3a8f98538d0
+AUX monkeysphere-0.36_hd_od.patch 528 SHA256 f09320e4e69b12e8756e927f5965a59a7b437be6aa22f7ab22a3d6dc449313ab SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55 WHIRLPOOL 6fe6a702b8e21b05f6fc1aa8e0b46ea0c90ab66dc488c0792815750d85958dbbd31d2a1994e92b89e827bc562b0450594a3553d15466d4141e56b15e2894ddfe
+AUX monkeysphere-0.36_non_default_port.patch 418 SHA256 7d20a74a0ec3d49b93d1d881d22d5d13316b4c16c709cfab23782cd0ed03b41c SHA512 2a173500e0b659a79a7274e042e49a282f708cda0f6a78ce8fa126013e35c4f6f117e606b90ce31da5158e58ab52a236038a913cc98c5ae1fc8e04a5dcbf816e WHIRLPOOL 825bfa045f03444bdd301cac503a6932d0f75c52bfa72fa8f07e79a1ba359600c8f15e7a930d349bb8c2afa4aedc5f3a6e4f22436fccbf4f60a22060a66c8c4c
+AUX monkeysphere-0.36_openpgp2ssh_sanity_check.patch 1194 SHA256 e179ae2226f04f87bb0f64c3722a299ae628a0cce4eecb3e8a6fedb82ce2ddb6 SHA512 b14c421e5880407b3acb845b235c89c5338a1fc1285b514679de09371db38e42aa3371ef2916c57d5ab10f08bc19f5c864762ff7eaf0a054d2817bc6bcaab488 WHIRLPOOL f5e7b7ce0f8c8a10786d61563763113c6d8d6a67b662a23a5911a1e8f036bbcd578510217f17b2b531098881d5682dac0dbb432785f9072b8a7597b9059f7036
+AUX monkeysphere-0.36_tests_gnupg2.patch 2272 SHA256 381c351000d940e8b1e1a429265276266e590b5dc02c865e30780f723fa9fb9c SHA512 e75f82793419dd2e99aa95765e9d954437d0e78294ed4188a9e7fa246b85ddbcd755eb566a1e9a9c20f2f2634150d65caa0715993863f59f9146f5cc95457975 WHIRLPOOL 36ffb05c4362fb3b193187b3637263b95aef95b85ed70d6bb51a36bf8e8dba392b2363b401b8902b0a9ef7f91ddba304c8982d32815d273c9b009652d482e334
+AUX monkeysphere-0.36_userid_empty_line.patch 292 SHA256 bf3eefe21edd72ad813888bcd91a9c6cef8a90d0e5f8272f847cb278750ab787 SHA512 15b8e8ff71537e79d069d0f298326cc6705931c58ff1cf2f16c5486e587fe69f610dc1e0ebd0006e0bdef12f936685a0594dc3f9dbdadb928fba25a8e2982eb7 WHIRLPOOL bf27a00f18407a616e22340d10d15837fca21b659ab57fbd603718c49fb15533734d660ee061bc544cb281c6d4bb073aabff6c85d3f4b232b0872da512ae8964
+AUX monkeysphere-0.37_default_shell.patch 466 SHA256 637f4cf6e83ea01e5a981f940618127512ca1171498b0d03a7779d2b50e80124 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8 WHIRLPOOL 295bc1d61f26f214020f1ac753a002911e2d775a6d7e46e847b091980d385245be12961b79949d77826ead3852e5058c45b512f28a44a36f20afd3a8f98538d0
+AUX monkeysphere-0.37_hd_od.patch 528 SHA256 f09320e4e69b12e8756e927f5965a59a7b437be6aa22f7ab22a3d6dc449313ab SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55 WHIRLPOOL 6fe6a702b8e21b05f6fc1aa8e0b46ea0c90ab66dc488c0792815750d85958dbbd31d2a1994e92b89e827bc562b0450594a3553d15466d4141e56b15e2894ddfe
+AUX monkeysphere-0.38-asprintf.patch 1569 SHA256 fec5a2ccbc3c7a38b2de5b29ba5b4b8da65fe3e2480bb539573a01ab9243145c SHA512 d750a948a9149c6110ca513743403588b4d861fbbe5c661401f4e0406d4ecbf03d9ca02e4eaf4f469aaa23925f2bc8dde4c155d72fadf26c02291e76571a6c70 WHIRLPOOL caf81e2e06c8f44275e3acd08a13e25ccccdb35d0600acc87994cf76dc51356ce062f5d9ea74d06ecdb40602a8ac9132d64fdb132f58a67824f70dd41cea2548
+AUX monkeysphere-0.38-revert-executable-patch.patch 4379 SHA256 4f6d4172836f6ed834f035580c3c1b056d39978c431a7db5b1b5bd2933460061 SHA512 21c38c63200de7250ce90724f3dd51ee39fc2110f52b0815a592d4c49e7c32e08b3aa56b17b5a680e77727793768bed04938e7d3e85a15308ef894fbe2593f8b WHIRLPOOL ed1c99a9e81ec8ad3995e33dd550613640c235ea394c24eacf57730853764937bc571f33a6529b4cd798a5f0ee3178f148a8da00762dd9932fda2c60b1b06d50
+AUX monkeysphere-0.38-syssharedir-whitespace.patch 2408 SHA256 d954384292719e04c47f34b50bc7fd1f84e99a34b9dbe79ae64a65ba42ab2856 SHA512 7287ddcead490b188265c7bd001072125e5abe25431303853ba7bd512330d8bef9197b563745211dbde358a4107880915bd8489164be1dce72e46d9d790d2620 WHIRLPOOL e4194afcbbf09b1054385d9d047cc8b6d89b671cb566cd8d6492175de8dddd47d67fa7145aa4987430ce7f75923d588ee46402241e05fbf3fd4f2e30469797ee
+AUX monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch 1700 SHA256 ea2652b9ad44a026f5ba5e4a86409a3e1700b04b6855d3af9fbc5436b9dee57c SHA512 1a23a1f02e98c86f45701105819ea1ff78f87132d7195ac2aebb0fda8c867b360e12ab8701c9579625af6d54851db30a93647c351ecbb3d99c5963b039628cbb WHIRLPOOL 837421719107ace0452e1095fa3144c454af0eb528d657ca20dabf1236197c7f42840bbce86f2a7e906bbe1e6dc8c00b5956b26d990954c29d9535ab90fcba34
+DIST monkeysphere_0.36.orig.tar.gz 98876 SHA256 6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7 SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8 WHIRLPOOL c163d0be77d3c6d838f752c8f53d967b17aeafd798e4fca694a31bf55628fb57d18b6a4664ca9552bd3daf3b89b6f86452d430529985ca0a31c3c4aa48470bc0
+DIST monkeysphere_0.37.orig.tar.gz 99557 SHA256 b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59 SHA512 ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512 WHIRLPOOL d27a3712ce4cd529986c4ac0af7398f8d69d66c1b5aed9842d3b21f417bab5d2b3afc7be9e069ce0e9f307b17ad33ef9e8d49d7624ec0d7d2aab60949982b9c1
+DIST monkeysphere_0.38.orig.tar.gz 107546 SHA256 6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073 SHA512 fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f4155557a8354cf38d89159422dca390f WHIRLPOOL 26f96f1d845ce1178337cc23e50140576a785536f656e73ceaba4d64192106b2462bb046328758c2771b48de64abe1a3d866cfc2fadc7ac0d0e2341778cd9105
+DIST monkeysphere_0.39.orig.tar.gz 107735 SHA256 73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f SHA512 069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2 WHIRLPOOL 3b0b260e002e5bbc4f894f468da77c9b3eb0c020316ceed920663f66e0db525c2baea4d9be7a36e82544c02bc3ece3bb0bbfa455c47d8f89896de08e4ff7211f
+DIST monkeysphere_0.41.orig.tar.gz 109040 SHA256 911a2f1622ddb81151b0f41cf569ccf2154d10a09b2f446dbe98fac7279fe74b SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962 WHIRLPOOL 3a71264e78a8b2fa5cde35167df219d6becb082d87dfd8dd22902e0091bbf5397c380c1b5609e79d8743219d948a4ee89b354907cc5aab95275bd805b6ebc223
+EBUILD monkeysphere-0.36-r1.ebuild 1187 SHA256 4bf909b5a78dfd13929709d2df8a5c41eb05ce5e03188053546567840242e1fd SHA512 380cd2eb925360506c6a3237d642131c9a6e257e219d19d5b6902034b056f6984296f9f1621d81c012f75456658eb57487fa609a0748df7aa11397fc0d5b89bc WHIRLPOOL 475001e7cbe2d968011d08eefb9cce3e8ae146640d9e6284b6c09bfc654efad0d88df078ba4b45fe9d5935ff56053b3ae49b81052422303ee996bdf16ebe9445
+EBUILD monkeysphere-0.36-r2.ebuild 1781 SHA256 5ac4b16eac6fc390f3b5d5a09fd1726e09bc5f03ea72888ae05a6cf6f7cd9bf8 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8 WHIRLPOOL 8537f02164a8ff84a694e87609c7f524bedbaaa916440da9420e6cdddb819ec617b454861d8613ea2dc4aef4dc265b903fdb76447a64e4900597cc4206dadbcc
+EBUILD monkeysphere-0.37.ebuild 1459 SHA256 77d51e95f81416e6d8d5fbdf815fef6e7f70959dec72004dc230ec222efad750 SHA512 5181dc7b06a7a5910bafe37438c152f54d4c0f6949cc6fc8a8e203324d16c345e18475c7a854709c722ff3d4d72c66b121a653c6f86d3a33a24ad16b0097f0c3 WHIRLPOOL ff1c6bde11f5083268918e58e16d6e583796ecba34faa30672182d306208634b5478de8015b779872dcd87073db99aab87d03fdfc8ca1b03ae4ec51b98be7592
+EBUILD monkeysphere-0.38.ebuild 1635 SHA256 b534abafa64aeb4aa72dcebea0ef295200262a12be7583150384571c80c1c837 SHA512 6dd69c21f73158cc68e4df4c4ba9a3e15387d20effadf8bb3566955acd8b62d9c5e59c8b47d98d3470dc5cfaa9e28e343ac8cec43aed5642b1568352150c3041 WHIRLPOOL af8478ef12cd867dc081a6bd3937e82ae0e7d7214b05d562e929e5b9de1f12633560eeca71052a9a8196697f1e0c35afcf258e5af37e766d2eb39039457db6e7
+EBUILD monkeysphere-0.39.ebuild 1441 SHA256 e5690c8aadae858eafcbbc0fd0d4f5f833eb75f236e71f177ea8c27df06c2958 SHA512 1eac7528acd605c46e1b0c869afc43e6e603b4f191650568b5ca9c478f22efdd0b41c31d09daf341309d8a31cdac8f2bc1ac29408f48315709a9923589f46b1a WHIRLPOOL 6279baaf8df793f0060b7ab68068ed7ac5f6fc07acd890119edc3d870ae4b6f411b8ba9270283e111f5e80f61912ac4d7caf7e7e91b51fcdb9c563b1213d1ce5
+EBUILD monkeysphere-0.41.ebuild 1374 SHA256 57a671d4ae28c7eba72fe80d8e096af50f6eff928437a77d757895d72891af2e SHA512 d163997b672964a3788203c4cedef6510704475c8e285a947f34a06cd428fc7a46a5a1fdd4fe8eaa0fefdf976778317c771d5b04f119d459006d7b75a0a20025 WHIRLPOOL 206b5a21a75ebea0f6d3d1b98d0f5c27335f45ab05757218921137b64194fad8f1fe5a575b9befd9a9b526d0a04d978fa3580533d6a2cb0361f700bc8264d79e
+MISC ChangeLog 3745 SHA256 5b6b225bed016b4b58b556795996cd943ab8c1cc20c3e94c259cbbfd4664b422 SHA512 b7a443d552edfd460c77cf09a4b2c70f7703c1a9ffb7387051dc96eecb44c2a57f2e63c702720dcb2b479b6c6619d09da21fc50e432f8d0b3b964455311f5477 WHIRLPOOL cb3e642af879ae32f652a3a979713f0787a484370b60733c995aeacdc287c82b6fbd92361412353594f28e2997e0acc0f634f1ba6fb6577c6a168abf0feab16a
+MISC ChangeLog-2015 1984 SHA256 8efdfa68e46c5c5162ee9c398bb94cae4ec6f5f3fb4aa40879ce6e35bcade543 SHA512 892bc9fc70ed99cdd64c450c543ec9b561956d9fd934b8e293b8f610fb4f2a298632b4227bd32163beb7015a41f8d0df92109103149dddf7e0534da21879cdec WHIRLPOOL 31894bc83cc97e61515498ebd932270875506b99cf69fdd26022040b3f38722106be332095da474352bd6eec4d222a49d37307cf561ee9fee3d40e7dc74ef0c5
+MISC metadata.xml 251 SHA256 66d741cb041462a1b2c366c3a5c5f7c6d04490659f6082997971fffca955b5b7 SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd WHIRLPOOL f46e8d77ccedd8078b4c5c3c48f4724ff604a3c9071c844a7014a97e61594da3c8750db5d3263c17c97d439c5cbcae378dc10cadd425ed43169223d61a1a8bf5
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..6c792e154275
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
@@ -0,0 +1,54 @@
+# 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()
+{
+	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/Manifest b/app-crypt/moolticute/Manifest
new file mode 100644
index 000000000000..ee44331bd24a
--- /dev/null
+++ b/app-crypt/moolticute/Manifest
@@ -0,0 +1,6 @@
+AUX 50-mooltipass.rule 84 SHA256 82e6af786f2ac972a4dc026d092ad3d0c8d5ecde791996e399a2a8a23e4333d0 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d WHIRLPOOL 1956cc3bca8bbcf2161a6f3ebd6025faed18fd7be3a842370b27948b13da27a3c8fb0138a656b3355cde44b6a5abed65f6b6f4c7c73d04d22917d1ccd105a69b
+AUX moolticuted.init 309 SHA256 9b5b4d108c3210d49738eec163d01b14e202a211f4e4938bda8f20aac79deaa6 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0 WHIRLPOOL 48508997019dce13265e78ab324b50f23bb5bca4273e10947694a35cd9de8fd6b2e91757d7794596434a51fe527297c640c8f8bc8e55b2e42eaca9fdd9799078
+DIST moolticute-0.9.8_beta.tar.gz 4471922 SHA256 6d1524d104579c03901e1727c7eed3511fe74ce4dc538d846e69d28652129ddb SHA512 9b5829105172b9e461bfccf60de42aa0dc8529e319292006449f54f8590b3cf002c0e9b555b8ab379a6bfe6dad2e40ed142ea140e254337fa035f09e97e49465 WHIRLPOOL de95aed7084b974e370c14bafd989c4f07494fa5bccec64543bb944db73baf3cb0c5cb80bd7fc6314c38b3d30c661862aae72f19e098411f24db73710ffbf60b
+EBUILD moolticute-0.9.8_beta.ebuild 1048 SHA256 795f7434f151f2d15fe5992b9588a8490e08b749893e8f49aa354467d066ff5d SHA512 553568747fa2c363fe33ee9e82b06516c32194a708344c09f38209d9734fcd9ad80400765bd2e2a03384e4aab105fef3b5842aedcedcf1cd4118068401e9ce5e WHIRLPOOL 741be8ce0f09c9542b504f0aefff7fcf66db37d361876cc461078c364964107264928378893f56615b7a632a0b1bc75731412ebd660856c1b48659e8e7e69ccf
+EBUILD moolticute-9999.ebuild 1048 SHA256 795f7434f151f2d15fe5992b9588a8490e08b749893e8f49aa354467d066ff5d SHA512 553568747fa2c363fe33ee9e82b06516c32194a708344c09f38209d9734fcd9ad80400765bd2e2a03384e4aab105fef3b5842aedcedcf1cd4118068401e9ce5e WHIRLPOOL 741be8ce0f09c9542b504f0aefff7fcf66db37d361876cc461078c364964107264928378893f56615b7a632a0b1bc75731412ebd660856c1b48659e8e7e69ccf
+MISC metadata.xml 522 SHA256 918331854b3e9d97086f0d5dc7981dd556fa6c341d7d4de027fe5c0affa814b9 SHA512 a08a366830b4fa1cc03a49d0e8af159908a9d5d13e9a4e8e910fd133671da66893010707cfafd1c3548899a54e610e249085583def235bb8e3b32862d960dd45 WHIRLPOOL 80033ebbea02e82fc40c709e4ed6755d6a89ea34b7c2f51b2ab00b75a41650273c34c477c7d14548f732762045f32c818799b3e4f87eee63af596f43cc5715f9
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..ff819ee05d46
--- /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">raoulh/moolticute</remote-id>
+		<bugs-to>https://github.com/raoulh/moolticute/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/moolticute/moolticute-0.9.8_beta.ebuild b/app-crypt/moolticute/moolticute-0.9.8_beta.ebuild
new file mode 100644
index 000000000000..8609d2fec945
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-0.9.8_beta.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 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/raoulh/moolticute.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/raoulh/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/raoulh/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libusb-1.0.20
+	>=dev-qt/qtcore-5.6:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+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..8609d2fec945
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 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/raoulh/moolticute.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/raoulh/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/raoulh/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libusb-1.0.20
+	>=dev-qt/qtcore-5.6:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+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/Manifest b/app-crypt/nasty/Manifest
new file mode 100644
index 000000000000..8925ab991b2b
--- /dev/null
+++ b/app-crypt/nasty/Manifest
@@ -0,0 +1,6 @@
+AUX nasty-0.6-flags.patch 468 SHA256 eb36ebe8d6203642e2b7330efde9afc1088bb718a1098a8a98d8df23e8f40cf3 SHA512 56d808209a9ba1fd1fa3b77ed90398cded9adb08c271ed74c80c5dff793413f1e7270ab057bd253c8c1e951dec7e7b8ad6c92976abb7c267109f517ccb81d4a1 WHIRLPOOL 68046281c5be87a01a110d866bf01c1e6f3be688a0db039185334d8042afb566c236597aab4308061965b328a2a46b9d7f3b8f65aa404d2e55619675eabb67fc
+DIST nasty-0.6.tgz 3811 SHA256 7607256d4672f1c52f2603d7b9691e7250bfe3a9b4f219fcbb61227172a7f6b7 SHA512 6803c1ccb843934ab6d2bd173c4cf154124926ee493a79072b351167f7fbbc08f90226ba63d2c591f2ae122d33d7cf1dc6b60e8684dc7ec650c8bcf3f04b3e07 WHIRLPOOL 77f03804ae4f3f8ea91f86cd70da2f63adc105cc50a985a667ec063066205fc388acb33a1464fc748901983ed6fd523b235c572906ff1fd7b7b43b7046e22bb9
+EBUILD nasty-0.6-r1.ebuild 563 SHA256 43afb4679001be46e613fb175dfafad33d15cfcaba59e69d004df73d1e7e01c5 SHA512 a71d286a93f11ae9fda832d5f475cfa7b6dcd74575517dcc7783106a4b1e62e635be70106e1a4e64e2df59880cdda36db79ea21a770768f1dfef16ba527978ea WHIRLPOOL 39c1401a0bfb0bbaaecfc023fa68ec79e95ece168d1383e69a26a5170ca8cc4c71277ae8a4fa181dee0e6f60ec7126b8c5fd3c39793dce7c2094b90a3d9ddeef
+MISC ChangeLog 2454 SHA256 6b8095c9c9a7f9000f073fcbf7cee6bbf6c7516a90f9eb395329dba0ec3fb6c5 SHA512 f4b3e1282fcb94ab732732c82d866531fd8df20de241dd252af8e6a660c50ff1368813e8453c923fb54a68b43f67dcc3bbcc340c44e31da0f6e809c323b4ecf8 WHIRLPOOL 7e05fbb8af1598ddc7b8e1d06c221779f1b682b57efed5dc217ce59f09ab79b79f28909d7e35727064b242e42eac5a39b5e1d8b3d2202d10856ffcce31c84171
+MISC ChangeLog-2015 1248 SHA256 e410854a02a2349ede889514824c306abbcc2fb8d782b219b246d9fd3dda2a33 SHA512 1eb878aa2dc23ec8686f141ee39fe5b9ac83e872349356bba7746f8be55d238b4c47be358a1aeb33c34a44deb5004c55bb399e178c229bc89bfe48c78b69beea WHIRLPOOL fef38da97189ba35bf64c67851f361faf517b067ab2a5f4eecf41a8497750e05810edf6e97d257379f9e7e9eb9042705460752cd87cffcd6e78b2ad75cd5cb8e
+MISC metadata.xml 246 SHA256 97a4242ddb39ec753b766e7bd7b94f9486e997be8bdcf8b86b24e2ed72417f19 SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015 WHIRLPOOL 1c881073f2000444080ab705b5ea51ddb4e3f62c4e952a69415e259d9fd367192e9687023e96233b3d3686528a4f8b63dd99000d11486e7a80922c93f0b1d7be
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/nistp224/Manifest b/app-crypt/nistp224/Manifest
new file mode 100644
index 000000000000..2e3243fb281c
--- /dev/null
+++ b/app-crypt/nistp224/Manifest
@@ -0,0 +1,8 @@
+AUX nistp224-0.75-asmfix.patch 1360 SHA256 8fa379e289034ac2b0d33aa1b1c77da8a53f23348a311d3ec67c3e0e742b5504 SHA512 36f7cd43b1b2dbeaa166c9cd9c47e8b9043642ac22ad47c1766dbd8b69b5e56a4d5abe9eb1bcafe19b2a75641e010e003d569d2f8bc0538a7d859a8d1962ca3a WHIRLPOOL dc4e5aa1fcba303fbfb041c31a65b6cfa9e6cafcd720653154b4c82ac407216746c4d0631699d7b9122d8707511cec5b7281f0123bf49fc1ab9ab2e2f87c49fa
+AUX nistp224-0.75-declare-exit.patch 658 SHA256 dc69eaf6f8c3d5d145910dbc96785ded8d65838ab002582df563f1541e71add7 SHA512 9dacc2b7335002b2b755da4f693ac5d2660d29847773640f126fd1d33cf83af2abb18163351392ab87cbee8ddba119f706c0b3d7763b0fef1c20b379c9610117 WHIRLPOOL 667fbec61020ef2ae9fc40e81c29d6385ba0f26813815491929de3fbea3e4b715ac16aadb35bb8846c028dcdb94e910fd604ef96797ea6b1be6e9ec49face3eb
+AUX nistp224-0.75-honour-CC.patch 1909 SHA256 d39678ef56d6268ed91c4b1104dd90473eeaf13d1c39a35742a27a09b92ec1de SHA512 3e37154c522432ef68bf5531bc31a4c7bc772f23af34d3b8cb60dfc7fcddbb1cc9770b5d15f9c06bd46b952edb96036f8e8b0222d33f51afde43c0bdcbd2bbde WHIRLPOOL 5fae8a0712fa0341a284811fa876dfeeb3cacfb417e1c0ff713dbd012e5df9740cc85a66f670752581f0f745d29999cb7e7336b751e4724d2d02e7a51e95ba14
+DIST nistp224-0.75.tar.gz 204747 SHA256 4e033b1bd0bb906229ed8c42cf87aa03cdc54ad40593ca262c7178fe3425351d SHA512 1f15000e2d62b4a550599632949728b8c81cae61a91c28685c808263d363ef6985fda343ba982ea6ce48314bc4c245b3f099c5e05d2ebac81a0410f4960ffb88 WHIRLPOOL 6ff0b608d33e9c46c017e66346b1bc67ec011a316ee7620a497a8962b2466d3799d0fdcfbf255713395f692ce45497a6e208206154e224792a743df977953c3b
+EBUILD nistp224-0.75-r1.ebuild 1220 SHA256 02d97e39cef6edb6c8817f6ed9b51591ef8dc76476b1eb8f27c3880a9c265dee SHA512 eeeefa2b7d3ddc29ef1d08de94f86d2246c50cb25a0a5b5fc95a02e8cbe0f1a65c43e9288e7b468c5e06b0a7e2144b83af7b2ed16cee443d8552de09aeed7754 WHIRLPOOL 9e4cab97a357834a78bb4c5a8ee70ed26bc45d9e86e5fd2d461c0b1e43201b5c439ceec3ad2168ae76f08e1eb00dac086462bfedf750a8afcc74792e80d95047
+MISC ChangeLog 2648 SHA256 114c6ea4a36cf41fd465a21551b4b376fe2eca4758c42714039e596ef3c868c7 SHA512 7662d2cbe33990ed02f1d07fe84604deb0b29e4e9131c7c93ba5ac2b975e99c4e39a7a13cd412d07b718c6c6c6a53abc7e76848d379be9d1ee6ee44716ad2dac WHIRLPOOL a22ecb605de249f1ea33030ea67e775b9a75e56e15feafc26c1823e36fec96df109c27f9c3330e56112162aa04a246c44a162cd33c3ad7526670314ce3610dd6
+MISC ChangeLog-2015 1496 SHA256 3fea91707e8e433d59224a9449f37926d8702bcd6aa8b93e9a0dcb98787afca3 SHA512 ddb88ad0c157be6335aa1f6066325eef61cbd8d3f9ac4e3a8e301bf66cc1dbd7b9647d57fc239d547c8a59fc4a526acd304a0f396a4c307e3e3772a16cb1a6fb WHIRLPOOL c9f0c5e3e57a099ac10213ec81ce73747603742e9a32b6f843cb22d1439e63b82e9ca270d4c39a73ad31e8daf8aef90def87e48e6702aa8811d71da62a47d25e
+MISC metadata.xml 528 SHA256 1ff8c867addfd5c797dd64ef6337640c576b2a4dfc51b35525cb7647abe5c6cc SHA512 b14e8bc33cc4cf4806dfd37b39d4c80166b9fc533b780b87f17a64d191a38be12404a0c722c72a8c211864d065d6fbf7547fe02bb28467311c08fe90f8c594f0 WHIRLPOOL 278b94b54941b3058d6574a4ce593deab8bba7dea64dcd6b87ad44d349a6bb2e4686605934db8c2be2948a12a12b8a906e0f8c405c8cc2c0f06c997a53397d07
diff --git a/app-crypt/nistp224/files/nistp224-0.75-asmfix.patch b/app-crypt/nistp224/files/nistp224-0.75-asmfix.patch
new file mode 100644
index 000000000000..fd6bfa17109a
--- /dev/null
+++ b/app-crypt/nistp224/files/nistp224-0.75-asmfix.patch
@@ -0,0 +1,39 @@
+diff -ru math.orig/nistp224-0.75/src/opt-idea64.c math/nistp224-0.75/src/opt-idea64.c
+--- math.orig/nistp224-0.75/src/opt-idea64.c	2001-10-19 06:39:19.000000000 +1000
++++ math/nistp224-0.75/src/opt-idea64.c	2007-01-30 11:30:08.000000000 +1100
+@@ -2,7 +2,8 @@
+ 
+ static void fpmode(void)
+ {
+-  asm volatile("fldcw %0"::"m"(0x137f));
++  static short int x=0x137f;
++  asm volatile("fldcw %0"::"m"(*&x));
+ }
+ 
+ #define T0 1.0
+diff -ru math.orig/nistp224-0.75/src/opt-pentium.c math/nistp224-0.75/src/opt-pentium.c
+--- math.orig/nistp224-0.75/src/opt-pentium.c	2001-10-19 06:39:19.000000000 +1000
++++ math/nistp224-0.75/src/opt-pentium.c	2007-01-30 11:30:44.000000000 +1100
+@@ -129,7 +129,8 @@
+ 
+ static inline void fpmode(void)
+ {
+-  asm volatile("fldcw %0"::"m"(0x137f));
++  static short int x=0x137f;
++  asm volatile("fldcw %0"::"m"(*&x));
+ }
+ 
+ static void p_sqrt(double out[8],const double in[8])
+diff -ru math.orig/nistp224-0.75/src/opt-ppro.c math/nistp224-0.75/src/opt-ppro.c
+--- math.orig/nistp224-0.75/src/opt-ppro.c	2001-10-19 06:39:19.000000000 +1000
++++ math/nistp224-0.75/src/opt-ppro.c	2007-01-30 11:30:27.000000000 +1100
+@@ -120,7 +120,8 @@
+ 
+ static inline void fpmode(void)
+ {
+-  asm volatile("fldcw %0"::"m"(0x137f));
++  static short int x=0x137f;
++  asm volatile("fldcw %0"::"m"(*&x));
+ }
+ 
+ static void p_sqrt(double out[8],const double in[8])
diff --git a/app-crypt/nistp224/files/nistp224-0.75-declare-exit.patch b/app-crypt/nistp224/files/nistp224-0.75-declare-exit.patch
new file mode 100644
index 000000000000..a1ecb432a022
--- /dev/null
+++ b/app-crypt/nistp224/files/nistp224-0.75-declare-exit.patch
@@ -0,0 +1,18 @@
+diff -Naur nistp224-0.75.orig/src/main.c nistp224-0.75/src/main.c
+--- math.orig/nistp224-0.75/src/main.c	2008-01-26 21:56:34.000000000 +0100
++++ math/nistp224-0.75/src/main.c	2008-01-26 22:05:17.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "nistp224.h"
+ 
+ unsigned char e[28];
+diff -Naur nistp224-0.75.orig/src/nistp224-56.c nistp224-0.75/src/nistp224-56.c
+--- math.orig/nistp224-0.75/src/nistp224-56.c	2008-01-26 21:56:34.000000000 +0100
++++ math/nistp224-0.75/src/nistp224-56.c	2008-01-26 21:57:10.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "nistp224.h"
+ 
+ unsigned char e[28];
diff --git a/app-crypt/nistp224/files/nistp224-0.75-honour-CC.patch b/app-crypt/nistp224/files/nistp224-0.75-honour-CC.patch
new file mode 100644
index 000000000000..1f5a938c2cc3
--- /dev/null
+++ b/app-crypt/nistp224/files/nistp224-0.75-honour-CC.patch
@@ -0,0 +1,79 @@
+--- Makefile.orig	2008-11-04 22:36:26.000000000 +0100
++++ Makefile	2008-11-04 22:40:08.000000000 +0100
+@@ -1,3 +1,5 @@
++CC=`head -n 1 conf-cc`
++
+ default: it
+ 
+ clean:
+@@ -108,7 +110,7 @@
+ hasrpcc.h load rts rts.exp speed systype
+ 	rm -f sysdeps
+ 	echo nistp224 0.75 >> sysdeps
+-	gcc --version >> sysdeps
++	${CC} --version >> sysdeps
+ 	cat systype compile load >> sysdeps
+ 	grep sysdep hasgethr.h >> sysdeps
+ 	grep sysdep hasrdtsc.h >> sysdeps
+--- find-systype.sh.orig	2008-11-04 22:35:18.000000000 +0100
++++ find-systype.sh	2008-11-04 22:36:51.000000000 +0100
+@@ -79,8 +79,8 @@
+     ;;
+   esac
+ else
+-  gcc -c trycpp.c
+-  gcc -o trycpp trycpp.o
++  ${CC} -c trycpp.c
++  ${CC} -o trycpp trycpp.o
+   case `./trycpp` in
+   nextstep)
+     oper="nextstep-`hostinfo | sed -n 's/^[ 	]*NeXT Mach \([^:]*\):.*$/\1/p'`"
+--- print-cc.sh.orig	2008-11-04 22:34:51.000000000 +0100
++++ print-cc.sh	2008-11-04 22:35:04.000000000 +0100
+@@ -1,46 +1,5 @@
+ cc="`head -n 1 conf-cc`"
+ systype="`cat systype`"
+ 
+-
+-gcc -c trycpp.c -malign-double >/dev/null 2>&1 \
+-&& gccad="-malign-double"
+-
+-gcc -c trycpp.c -mcpu=ultrasparc >/dev/null 2>&1 \
+-&& gccus="-mcpu=ultrasparc"
+-
+-gcc -c trycpp.c -mcpu=powerpc >/dev/null 2>&1 \
+-&& gccpp="-mcpu=powerpc"
+-
+-gcc -c trycpp.c -mcpu=21164 >/dev/null 2>&1 \
+-&& gcc21="-mcpu=21164"
+-
+-rm -f trycpp.o
+-
+-
+-gccbase="gcc -fomit-frame-pointer -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings"
+-
+-
+-case "$cc:$systype" in
+-  auto:*:i386-*:*)
+-    cc="$gccbase -O1 $gccad"
+-    ;;
+-  auto:*:sparc-*:*:*:*)
+-    cc="$gccbase -O1 $gccus"
+-    ;;
+-  auto:*:ppc-*:*:*:*)
+-    cc="$gccbase -O2 $gccpp"
+-    ;;
+-  auto:*:alpha-*:*:*:*)
+-    cc="$gccbase -O2 $gcc21"
+-    ;;
+-  auto:aix-*:-:-:*:-)
+-    cc="$gccbase -O2 $gccpp"
+-    ;;
+-  auto:*)
+-    cc="$gccbase -O2"
+-    ;;
+-esac
+-
+-
+ cat warn-auto.sh
+ echo exec "$cc" '-c ${1+"$@"}'
diff --git a/app-crypt/nistp224/metadata.xml b/app-crypt/nistp224/metadata.xml
new file mode 100644
index 000000000000..a97d5c6c924c
--- /dev/null
+++ b/app-crypt/nistp224/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-needed -->
+<longdescription lang="en">
+nistp224 performs compressed Diffie-Hellman key exchange on the NIST P-224
+elliptic curve at record-setting speeds. It includes an easy-to-use C library
+and a command-line tool. nistp224 also supports uncompressed Diffie-Hellman key
+exchange on the same curve, with 56-byte public keys, at slightly higher speeds. 
+</longdescription>
+</pkgmetadata>
diff --git a/app-crypt/nistp224/nistp224-0.75-r1.ebuild b/app-crypt/nistp224/nistp224-0.75-r1.ebuild
new file mode 100644
index 000000000000..d89daaef2d32
--- /dev/null
+++ b/app-crypt/nistp224/nistp224-0.75-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic fixheadtails
+
+DESCRIPTION="Performs compressed Diffie-Hellman key exchange on the NIST P-224 elliptic curve"
+HOMEPAGE="http://cr.yp.to/nistp224.html"
+SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+RESTRICT="mirror bindist"
+
+DEPEND=""
+RDEPEND=${DEPEND}
+S="${WORKDIR}/math/${P}/src"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asmfix.patch
+	epatch "${FILESDIR}"/${P}-declare-exit.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-honour-CC.patch
+	ht_fix_file Makefile print*.sh
+}
+
+src_configure() {
+	append-flags -fPIC
+	echo -n "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo -n "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	if use ppc; then
+		# untested
+		echo -n "powerpc" > conf-opt
+	elif use sparc; then
+		# untested
+		echo -n "sparc" > conf-opt
+	else
+		# optiminations for ppro and pentium fail
+		echo -n "idea64" > conf-opt
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin nistp224 nistp224-56
+	mv nistp224.a libnistp224.a
+	dolib.a libnistp224.a
+	insinto /usr/include
+	doins nistp224.h
+}
diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
new file mode 100644
index 000000000000..eebe9429b320
--- /dev/null
+++ b/app-crypt/nitrokey-app/Manifest
@@ -0,0 +1,3 @@
+DIST nitrokey-app-0.6.3.tar.gz 769503 SHA256 6ab756ca34e0deedfe5e99eeb5763a68adc9bafad78ee94b3b9aad2d28fed8c8 SHA512 23960b0ca740a4c9520a3d7043f396ffb6fb730ef28ad44b299aadbb0b7d2fa1a182c38a88fd684fe664c2079c5a03c5a6b8e6ceb7f8ca69a37fb64ef64237a6 WHIRLPOOL 07df2f16ef99b62c2c77ada77a51fed1709da3ec2ebfe95b41ca7ea025be0ba2293cfef1665aab777a30908c95c69cd5e265f17e90719386f059f2cddeb7e2a9
+EBUILD nitrokey-app-0.6.3.ebuild 723 SHA256 fbcc8befd4250bd897b6b0350057bb33096b15d2607eb88df175bfa90e2cca53 SHA512 11c36ae01ed31273939bf775b12d29063d9a08c9dd3d26a270f814b75c03e18863c10f702a0f7f6e00ee7b198e027d4fee31aa142b973e5fc08048fab0336c8a WHIRLPOOL 598eb534ad0ef0f58b4b04b5be2b99372eac1f449daff5772d517fd2c7914651704b683b34a5a39a832ea0dc9affc7be68779087211394b97e583b58742be804
+MISC metadata.xml 399 SHA256 f8c4d3ec4247b5404221ab8c81855de68d760f76b82a377c2dc552e9aff9344c SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab WHIRLPOOL 08f5b2c9bc9664319a78d4caecf0566dd1a8d14fdec344c6ac6836818e2da7b2d9c4dd18ba7bf0ed061b6582dc6b5abba61c50eac15e0fba348478ad753a3e95
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-0.6.3.ebuild b/app-crypt/nitrokey-app/nitrokey-app-0.6.3.ebuild
new file mode 100644
index 000000000000..fb7b2f7c6b97
--- /dev/null
+++ b/app-crypt/nitrokey-app/nitrokey-app-0.6.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils udev
+
+DESCRIPTION="Cross platform personalization tool for the Nitrokey"
+HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
+SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+mycmakeargs=( -DHAVE_LIBAPPINDICATOR=NO )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i "s:DESTINATION lib/udev/rules.d:DESTINATION $(get_udevdir)/rules.d:" \
+		CMakeLists.txt || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
new file mode 100644
index 000000000000..0d8e44cccee8
--- /dev/null
+++ b/app-crypt/nwipe/Manifest
@@ -0,0 +1,5 @@
+DIST nwipe-0.21.tar.gz 49298 SHA256 21251065b5a59d81286a2afdc25ef5602c06895113f8d2e5b537c11f2e0c3819 SHA512 0d083ac903889602ea5bd889b97f3dd3f1ac8c3737612394a68e9cc1fe44d387819be2aca563005b13e61d3406f080bfb279adbeffb106d3b489ac4748189aa2 WHIRLPOOL b9afdba68ec9dff33f555859a24b9543a17fb78633e02d17e61a9362395d8ac54a6438f774d1971605383abf515efe48d40e13fd0d522e7f60df0f9610cff826
+EBUILD nwipe-0.21.ebuild 557 SHA256 0aeeb72ec717f3c8336f8fa09c859424d328dec15c8fb78ca586b978714befc1 SHA512 ea721ac83d28fdfdbc1970e7da63f5f29a908e44047322420c6f7a5eb789863a2caa6b02b60d3baeff6686fc614c1b4dfedb94e1cf47dbb6cea815dd64e2dcfa WHIRLPOOL f6c69f4c073f157584829f490b70030d862614dacf427873278951f843d0b5ce6f83f29d491cbb44f68787eeee43c93c52affde40a4b0286f58fe91f23fa682b
+MISC ChangeLog 3023 SHA256 d44d26d3a0d568b2fa59b3b2fbcdba16535f2fe39a3d451b157b97707e97ad32 SHA512 29521c422f341991cf0a9f949021ee2c9af4e9b86ed800f2d20e4c4c88885e03cfa306f56869d54603bb9b7a9b8d260eabdc3f3dfe096ad917882e331a145d1d WHIRLPOOL e266bcdee94cb4ae61fa1d73764db2361451f1c28f0210d5684a5b8eb64e33d75e3ec2c33004307180501e75093008a15e8b85ced95a5a1e7bd95d5416f84863
+MISC ChangeLog-2015 1367 SHA256 111e3ec33f91e7f0d188fc72f8891af24424595800fe2b29f395b2883a130296 SHA512 9f86fc55279a0b264dfe01bf8a992a1b743ebb17287a8db04a0017129247d2cf387132566131e8f1d6e870fddce939292524074de084a1f6a30002564733728c WHIRLPOOL c70ab24a70a708af0c26303a9d017536df09333e1d317db7f2380f1a7eec41292229b584dcb85fa43796daca988878b5523e05e9ca5fe344e63866c87e10e2cf
+MISC metadata.xml 325 SHA256 583bf61dc712a7afe8051f7a644281d556fec909abfba22175b5e9c2593f8cad SHA512 7e34fed2902e5b4c88a73b8976a9d7e903e5149233d1bd8625485dd54a21f012fabf7585c5713bcba837ba15ae03656ad3fb1b51a110bc5c42e4a9ccb0728822 WHIRLPOOL 570378a900da180657d74512f9cffb159916710a5214d248ed5befc5c7278b515785599644e3f44353844d8c5dc8544deffe9bf35f29733672f4a7aa37f67bd6
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/Manifest b/app-crypt/onak/Manifest
new file mode 100644
index 000000000000..73a9766fe7b3
--- /dev/null
+++ b/app-crypt/onak/Manifest
@@ -0,0 +1,5 @@
+DIST onak-0.5.0.tar.xz 240764 SHA256 24cc12b41dec9f8a53baeeaf9ab6f9f82e7d6ea795c48c37421e8d7184a8b1fa SHA512 db38793acc82089089ac0b9fb6db9989b6bb8e94c35c14112d028d12f7bb7553b7409121378346625528c4916506d007bf40963f4a346483f51a23b670680a7d WHIRLPOOL 85cebf7807922d3c1d8c85cce23c960078971c8c74ac29ecfa9379b55fb1f8a9a8333f775935566aa2dfa27636a02d09700642e10d6605f204ab1c984ef47ccf
+EBUILD onak-0.5.0.ebuild 1012 SHA256 82f65783b1a67af2d1dc3b67674ffa05ad4cda98702d37d6b854cb14e8f0816e SHA512 8eb3c1c777fb6d06c13ed3631095b7feebd40be33e176e822464a8b5ab61ee9186a3100d3946a0064c2eb967e70eb7b9a9c5476265a3f977e1cacc10247c1586 WHIRLPOOL 8bcda69a267e26138453b0f6d34e0635c2da8cc17cda36c2c60cc28405af147a57ef9f30dfc0ffc7261208c66c30b26ed06ec53e52cd2e0e1b639dc3998cc3b9
+MISC ChangeLog 2681 SHA256 ea866dc6f74eaa59dd8b09aa0cfba9b86f29258cf3593d6ec2b937916c44da06 SHA512 797a5bbb7bf051e8ea7af48d268218a5470e712c162314f6528d7c38d62772f087dcf0368a75f8c8dc73ec1b579d6e9d0b9f2c9b88440d5f65d9df2e0da07ddf WHIRLPOOL 0e7210957055c9aff01f597e6fca75db2f5ab274cc877a41307a4d83dfc9ef8cafe6f9ad5bd7c91f4d42671532c802aa251516e6e354062ba34ba46fdbaa0901
+MISC ChangeLog-2015 2172 SHA256 bfb87d0d1e93fa0cda2aba99a9eadf7a6e67a4640e45ce5990305aea7fd32abd SHA512 5f044a073ebbeb733b98b0afb89115c65964921a98eb6b0e113d09c221178439759d4bd9ed093940388ca7d0be4fff844db67ce6f9b52f410e6bc5bdb1ed4a85 WHIRLPOOL eb0e314d53e7676ad1928c60998e0399082c5baa6fb91c5cd179fd367a1528df86e7d6c85bd5a8d4425f0cc8a0de492d00145baba21252137c1dae65ffa56f86
+MISC metadata.xml 246 SHA256 97a4242ddb39ec753b766e7bd7b94f9486e997be8bdcf8b86b24e2ed72417f19 SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015 WHIRLPOOL 1c881073f2000444080ab705b5ea51ddb4e3f62c4e952a69415e259d9fd367192e9687023e96233b3d3686528a4f8b63dd99000d11486e7a80922c93f0b1d7be
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/openssl-blacklist/Manifest b/app-crypt/openssl-blacklist/Manifest
new file mode 100644
index 000000000000..78625ca7d483
--- /dev/null
+++ b/app-crypt/openssl-blacklist/Manifest
@@ -0,0 +1,6 @@
+DIST openssl-blacklist_0.5-3.diff.gz 20228 SHA256 caf34380fce6f4b31d958a176f8f5d0a4d1e9da66ceaed2e5a20c7929d341942 SHA512 5e5b7fdc97248ccc44f3ffa306a23f9d3ed9585cee15f1ad55dffcf4e70a50463c05382b393bc07e4bd18ea530eea7d36a508f40c1e03b0932eb3cde43f886bd WHIRLPOOL 4d7dd96e4c0b8ff780d64848cf15e1be9c0c97651b4aeefb502093a4436ab706f23f0399972e8f3fea28413efd7c76964034d335ca1c0a1b23153bbf1d6d8cd5
+DIST openssl-blacklist_0.5.orig.tar.gz 32908393 SHA256 d194cafbbad9ba10b6dd1721ee241c1a645552d206203f764fe4f059b29175bb SHA512 b0ecab15f4357b56508b048a0648263f118aa8eeda8ad6a15caab8c38b2270a5daf897026daf376a561b292c64c2651269182732e0ae3e4bbac455cc1d3985ab WHIRLPOOL dbbcd44db10dba96390ae7d32ca008ce62a43c2764aa582009b4b8d809be8241553cab5a8cb778401b88ad88da1edd1125775d74ada61b73a2d3b812a1ed8b5f
+EBUILD openssl-blacklist-0.5.3.ebuild 1342 SHA256 05f1c03505dd26cbf4d2fc08deb215bf1593cde9263a025e4a9e61df7f2b1377 SHA512 e869dda8a3c77397990e1ca72e17cb27586c990e14a26098419986eb36bbcf0365767104794ddedc7fdba4c3449d2f4ee6b9d94a556b7719d336d0560645baad WHIRLPOOL 088af20cc8146733d5bbc00e84609527548cafe9dfd4d7b3a02c08163792e91d70499a283d205af738d87449ec0f4396e77bf654da4264fc226dd1121a6b9dbd
+MISC ChangeLog 2207 SHA256 f0b98b42cc21591ba2363db16b3666bb6de86fddd180dffdbaa6ae818a509432 SHA512 b8aa5778ea700493a4e52f95a82c117f2a58d239415389ef79673858a01bdcfa1abfc976754a3d9a8ef040d5c902302008296cc6ee493e615103bfe95f3ad560 WHIRLPOOL 9e14fe85731fb7c5dc96c90e68b074fb63aab5bca74bbad68c1f2c903f4bf774cb1a9513e061308cea15c55938ad07be6a624180a5f13a3d06442345f9c8538d
+MISC ChangeLog-2015 2444 SHA256 afda5265712aa5e48fa93a847aeb54353ff47b3873e0be4caadb6c536b279668 SHA512 9c2eb61ceddb537815ee8218950aae4b0d68d2de6c7c4b82e5cdb733d08919e49411325be7d7ef9d33e307cdd99119d9ef09fa39e0e795f544f08e9b066554aa WHIRLPOOL 6fd03c6a630c07793742b4671a7a1990e3444f54f8e6518e6cc408c493543e66d833ab7d8bd3cee4bade5137c1d120b9e9e2f7f059141892b55e0c6bff1e7a50
+MISC metadata.xml 316 SHA256 bf3b295ff88778449b5b832c36d2c19e8caf99916aa94f84f83e14526433f094 SHA512 7879fcc74e3f52d1d04e273a89707e2f59d38675ddfceb30aaa59226372624f6ed11c08bd68271781a6a70ebca69c848042b95070d3a19dd55738b18af48be99 WHIRLPOOL 8870da4b3413e74063db7ce1c7796fe427eb010dfade7fabf77fc9a48ec039270f1de3e7f9a2752c02a73b6ac884c54c4cdddf87fe6c287b253bac9b981e6035
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/Manifest b/app-crypt/openssl-tpm-engine/Manifest
new file mode 100644
index 000000000000..86ed2e028438
--- /dev/null
+++ b/app-crypt/openssl-tpm-engine/Manifest
@@ -0,0 +1,6 @@
+AUX openssl-tpm-engine-0.4.2-build.patch 317 SHA256 dca3a6b49ca57e7049b345a43ba56019d87a9292b6aaed210eb8f08e6487743d SHA512 ef62d70d83cd3251731686e6132cb287b02c1416f59bd1c4ca678f6702d61f505a8b10af387041ce569ea07e270e97983cbb7e00124b8ad4d7eaa1cf01d800a8 WHIRLPOOL 41178b0c4da63aa5cac91136775ecc8f3c8b347d77441eb602c830840f6af64d6973031e1fade4fc05cd07b5f0aa617216d86bf6323d341de2467e33cbe2e7b2
+DIST openssl_tpm_engine-0.4.2.tar.gz 528196 SHA256 2df697e583053f7047a89daa4585e21fc67cf4397ee34ece94cf2d4b4f7ab49c SHA512 376f2aa87ab10d4a77bcc363865238a19e6dfcd548eb1f0780ee223d57d90ebfe7046308757836b76e7f33f4c30f98c0d82126b5e0e0534ec57087384e584f95 WHIRLPOOL 0b3daeda9ef8c52e472905d3f85dc3dd78220a6e1bbf59b5f7fb4d4231f64d6fca189b75fb00c391d130bff3ae5a7e0adf43059eddaf8a1fe93d80a6510dbee3
+EBUILD openssl-tpm-engine-0.4.2.ebuild 788 SHA256 de5d57835c020c3e0a7ff059fdbc30ff2a3446b2d7ad814a787876ca3aba6648 SHA512 3e52257d57bead79a8b19037780c261e48551d8c079c83898d4f319f7a2be1a5332e8c0ba17320d5c8eaf2d22366bacfdf224dba0a0d86514060d10137130cb6 WHIRLPOOL 87ab775dbd4a19b6cd766ec0dcb69d4a063cda2ede141702937990114307d3508f3294cd5b73dc85786bbaddaae12c4347bcee94a266963ff3d0b28ea11e786c
+MISC ChangeLog 2833 SHA256 5fd415004922e5d3c407d8c1414be0e25051f449bb6ff611220cece27d8e31d1 SHA512 122b1f197b461eb4aca938f7771d326494d77246ee4b2d92db1a003de4b3a8c70ce4dfc26a7e33055e7d1adc86d5bedb26a44db38946abd97e11af6b883c6122 WHIRLPOOL 9eab3847ac6babcf8869c96c9b36e3617c033d34bdbb90f3808a1e87d3aa1773b450100d25aee708b729f865ac8e2a9c4e4ec2d1cd85dac960c0b45f5787400b
+MISC ChangeLog-2015 1557 SHA256 ccdf2f8ba538f09e06c84d940d76907c693bc526ba762a24ab26677f97ad78b0 SHA512 cc949063ba4cff194a8956d65f3ca01f18e01e0cb3a8e843dd9007d1f7e1c8db1b6d3c1c37cbc236ce73c751ff619785ae300964edad961a37dfc5e2d953e084 WHIRLPOOL dbd26304f17a7f570e98ac42c89c16914ecde7c4d4fab0c7d6f5c2481c6bf8f4861f1118a276b5a06524d1f768af47b31f920f2da91342626f1f5b2094cd80d3
+MISC metadata.xml 318 SHA256 1394b5588607e585663ae85aa3e838ea943f0ac9624750b827d47e2ec6517f11 SHA512 628ef47a6ad964f7b3ebd288e3ad423192970a060bfae6e95625056d6b1a49c1d36d3f8001ba066a356a9d63203fd4b40d0ee5c213f8735e0e8d736297e6a721 WHIRLPOOL 9802f6ba993fdc4979186678a9f4d05b3d0d0e8ffee809c40bd8f09a8e0f72ee7b47de18de05d6f5d56055a448fb2a72017bfc41730f4fafce81ebd45b72f63e
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/Manifest b/app-crypt/openvpn-blacklist/Manifest
new file mode 100644
index 000000000000..1668fe3fca72
--- /dev/null
+++ b/app-crypt/openvpn-blacklist/Manifest
@@ -0,0 +1,7 @@
+DIST openvpn-blacklist_0.4.tar.gz 1808103 SHA256 01d0cddab3db957661dc8019c1b672068699f1f7cf8633748b6222601ecb0108 SHA512 3301f7425520eb086306acb30bd718465208b5aa5606e879b65f936161d1955b93254d9c1dd6f5d66ec6480850652afadabb05db2a0df9fd5acb73a5ed5c19e3 WHIRLPOOL 7eba98ff8e1281e5008f01a360aa37aba87a494d187ef1a83599aa57d16cb2980e021af4ee25abc92c83eee1a8c287b4567f671a4bca0753ef1ea68120aa2600
+DIST openvpn-blacklist_0.5.tar.gz 1828347 SHA256 7c26fcffa21f251bf6193324ba9f4faff8d08d4bb999c5415947237ed77ba4d4 SHA512 589216cb2f10b6ea0cf2179f8b47ce2d2ed03916ad5d8a62e22dce71f432101a735d16093855ff43a1d6618fe94e75b9127bbd63408556197e91de6735e713aa WHIRLPOOL 8ade318c144ced52a4635dfcee02d1e583479677d50ec5a2782bd576fc5e7119f4e5f1dd840abc65e1d8fc8f9481cb6cb024bf5f155b0e32a94dad11c324ba52
+EBUILD openvpn-blacklist-0.4-r1.ebuild 877 SHA256 7163e6aa04e057cab38f65a602757331082ff3e69541abc0feb302cc7820910f SHA512 fb8d9d8dcdae7ae94dc8ba354901a824807fb0da1056a524af5860593bc9e2100021bd2737b4fe60d06384502779dfc4a4e06590f09886bfc6276e63e5466596 WHIRLPOOL c8f04b91e0fc5058fe411e585ad7ff456cc47f163603e00dd501ccbb00d3a7fafbcc9306881796986f98a2e87f454c848a63546c729dbd459b2027e14d26de2d
+EBUILD openvpn-blacklist-0.5.ebuild 880 SHA256 c277d02ab384397236963f63c39569187b56f36b4f01371be6c4618402d4ce85 SHA512 58a3b8396caf9c31e30d66ec2bf42fecd190de2a80763b83b17b4bb0889a1f4f40b38812d798dbf941e908e7d4771f3672399b82c3876e383f72b3f1d84bcb15 WHIRLPOOL 11c4ee6cd14215045feb51b65ba8d60fc1bf03d47835b64ce13a60d86bd25f6608bdbdadd7236b89ef56d318c9877b5c7ea1992b5e6d9d67f716035c6052a733
+MISC ChangeLog 2399 SHA256 b20ab023aff2f35a68dbc9af5892ebb0019114e234203f732b5353b26c375cb3 SHA512 9ac9d2119c1fefa39cbbab40c6464c40f111e3abada6185966f13d70a7ad5bce689a65374ed09e744247cbccbc570fc9e91b236c557ac0b45f0f0ebc0a2b612b WHIRLPOOL 13be1dafea96c80ddfd0e1855e2226c44ac7dcb401d769568ebd135642bf7fa336ef36428a0503a70620d535f2ca6d799c0eed5da81bd64087dbd08e9ffc6f92
+MISC ChangeLog-2015 865 SHA256 1efe926ac6b46dcb401dbf93136ff23b2fe776eb3266f0929cc254a62392b181 SHA512 412d3b0ee8ae6afd6d106bf6b0ef73bae9fa329abe28f03d68dac711ec5d28b4daeb8147907278b732f1a083e6cb93109df127c7cadf9b2185c978d34e95665d WHIRLPOOL 77ca06909ebb75cafa9dc3250163722e8aacc828092f6eed4be54a37ee96084ca8f56ede5e50a3c7b0e9babf43927e6c2629230d36b0b7808b65272a7df261b7
+MISC metadata.xml 210 SHA256 261430405ac37ae531b59949774ba64133ecc8593015df002402afe0f0f60d7e SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f WHIRLPOOL daffaf412be04b8235613f91913fd8a88e1650897a3563641f50de943a4cdee417461a6627acdf7a99a3ff9f5ccf080c0676ae37105f6bfcda3a8200718d1ada
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-tables/Manifest b/app-crypt/ophcrack-tables/Manifest
new file mode 100644
index 000000000000..d54dc284a433
--- /dev/null
+++ b/app-crypt/ophcrack-tables/Manifest
@@ -0,0 +1,7 @@
+DIST tables_vista_free.zip 410609902 SHA256 d3559f3c8e79f83c057b168f1c6b0f6127cea1f73da218a8f5219ebb256caf63 SHA512 daadc06411a528d338862294ed5e9c5162c86bb7c784e2ae572af0d441afe4bf81844432bb543a9f711dd632271ed89e14ded515d1ef1befad8c44a1a7eb14db WHIRLPOOL 5f84b158876e2fde0be56af0d2a4ce7fc694d2e94abc374b85118db561de0f9fa755b09e27ee296bf40e214fa8cac05f65d9e4c7ac0d0f4c3b5c80d081697f52
+DIST tables_xp_free_fast.zip 701901509 SHA256 6d72beed100f75a61d331ac3e4a9b3d1a6789017099201aa077d50f7ef33bd05 SHA512 d2849b2a48508bea830ecf1b39893f734e8bf1bcb6f71358ad344c0f584a3a9c9795e5c0d12851e44c332aeecf00e2da0c55b31fe0491d3bbd527058e45797a3 WHIRLPOOL ab491d38d0bed4c9d4e6d8fb3886f4832e59b10adc7df93a99477840b70b72c1d234c3c363a4bd667dec92acc4be6d2b549166bd457a1b143d610134122f4ceb
+DIST tables_xp_free_small.zip 370848194 SHA256 00ab596334339555ece136a9c5852590bfaf9869961f997861b653ceec9e8212 SHA512 50d0761a0d950d6492acb083b05c3e33dab905ab10f24a70fd8e25006ea583e871ae8d7908eabc2fed65b106f3ba994973ee881e40b147a6aa8ba297bf14ba61 WHIRLPOOL 600c5005c9221aeeeaf192477895bf3ae7e811dd64efb7f3bc8989e888a6aea868fd65658066fa6b6ba00a3de2b85e8213ed3b190761b06c1f3e355430293ab0
+EBUILD ophcrack-tables-1.0-r2.ebuild 849 SHA256 1ad5a647fee70375c28245c879f3d2aff59a4aea972bcd1a6fd33b14c3c3a240 SHA512 5906d12162d24230ae3e6b75b46cf347d2d1f2c2fd6f1b4c47fcaf37ede89c2f2f1986c84f50acdd545fdf2f670adb2a2f6ef22c1c47acf90f69c5324c3b4726 WHIRLPOOL 54cd8b08516c11bf23349b41d5ac270c9f9fb11baf6d61379480403d2e97330c5599632aea324d70e6cf730afa74acb0647b1ca1f08f7c9f68f3a66c5a9f69a4
+MISC ChangeLog 2203 SHA256 ad0351ed780442eff05cfa3572ae8de713fa776e124bf26d16afd2444adf8ba4 SHA512 7de99d9a1ae3297f604ab699377912f81410822cebd7da4b3da5d269956f6f1854f06fb541771f0a6c58a2d39d8cae7f15a95c8b797377b2da5b0ac3fff06174 WHIRLPOOL 180090387e2ce979cc035a4306375529029b03ca80036461845b4cfcce223ca91c91f49b5fdd05427a18ed32a7f7193d40daa907fdcbbab754999325237494c6
+MISC ChangeLog-2015 1375 SHA256 668871d6b53ea07a99004f8126dca5a351fa905f4b678356ebd058b06abef407 SHA512 249e1765f4c052536479538f94c79fba0634b63f192c0b55481f1ef3c8a1b2fa53db243e50f8eeaf572d77f06970e9962e364142f9162a0a53805cb42f96a2df WHIRLPOOL ad6292c4156c2f889792a1071707e7307be25e15138811606f1f5a2d408a450666682f627ebacb331d33506c6d633be6fe80bfbd075328d2ecff100c664c5a37
+MISC metadata.xml 546 SHA256 21b3ae8e4aaa16a17b8d6ded8f075cf4e4bcc85afc90e3f109b795e51ab42153 SHA512 9df4dbe573e7c3a35f05c96c00549ae5777eecae46add6a766f71869787e7d1e3f4fc534e22d6babdc1eb2fceae7aeb9a95d38ac606b32ab57156d1824cbd6c6 WHIRLPOOL 4589a4565b4429fb7daf6565475c0112ed47c4a9dc0cd4dcf2ee90c35194b6118349e399086c3384e2f3cd5e2d3885b14df71d2b16c6a4a4fceff21d29e07162
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..0bb831c1f837
--- /dev/null
+++ b/app-crypt/ophcrack/Manifest
@@ -0,0 +1,8 @@
+AUX ophcrack-openssl-des.patch 3253 SHA256 560c29768532629d635479c5ced52ba1a209170fddf143d82fb36194cf749776 SHA512 60f4ec2792f1d697db62bbef16a1f365e368fa4cf99695b1fdda4cdfaa1fdef04bf39dbfea72fe5d97aead6435553051eda0b3b619ae93915f11b87de29cc4bc WHIRLPOOL 3ea16b35e95f55eb0e67caa773e88ac53e756d8cd8a98e980d17e6838867a1d379dc669848c6d7044ca46d4722ae34ea103d656402d8af49efdb4ab40b90323a
+DIST ophcrack-3.4.0.tar.bz2 279806 SHA256 06cb22d95a8ded79eebb99ac19bd21b27321e85fe0f22f32407d0b925b66d3e3 SHA512 38c3b41e76be1b2990cbf6a8ddbe776df3d7821696e42939c759d554a7a52d40555f7e1c8f11e3ab7dc20b553f43d814e271d7519a3b4bb4f84b70468c123df0 WHIRLPOOL 887d9f397c061b06072cd48e15b89596c81c893d0cc1fb8eb960f0561249b0085025cfd88482aba8549414d3d634685503be14b9f97b16edc248859095a3a1dc
+DIST ophcrack-3.6.0.tar.bz2 288830 SHA256 79219baa03afd7e52bc6d365dd5a445bc73dfac2e88216e7b050ad7749191893 SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9 WHIRLPOOL 5e492257aa504883892cc5bf19e123330963257874f2b1ad3ed53895161987012c6bd23f449c72de81e68ac0ebcb7adbff77883f1a0d976c0aa99654c87d342e
+EBUILD ophcrack-3.4.0.ebuild 946 SHA256 a94216ddbb0f20d8cbca295cd07edfe0ca3e58e56c3e0522e61249dc94a93e8a SHA512 ba3e8bea2dd04e2c28c7e7b58065f7af4489b82c1d606b05265d80235ba93f7cc7005e76313c1ec4bc98b531820edff89406df6d782e6f97eb40cac51a994c51 WHIRLPOOL 606fe79d8661399a4a1bd42207825c57eeb8ec7c935c501ce63f0e543ccecc81de2cd24057ead5bb0bdfaf755b66b32d10a9525d1c9d4197d9480d9873940c53
+EBUILD ophcrack-3.6.0.ebuild 996 SHA256 cb18d2d19710275a73e76eb614c0d797c0286739a7e30ecfaa9b718c10f4028c SHA512 e9b038c97137d425fa6a4791ba28f54778b0f6723800ed18ceda9fea40a15991ef2d517234649bb0d426790e3344b714e4657cc256ca62bceca7e9216b2ada4d WHIRLPOOL a478983136d11f21a4793a66880d66b0171d97a1f54b5eac6af4892eeec0b02142d0b5a3d54a144ed0d08cd853c434034795b43aa4590b8d03237e81d501bacd
+MISC ChangeLog 3101 SHA256 dfb8bd5953cc63c6f1cc5a1ce271c3c3f2fb309a32719d7cc0335c3619b409cf SHA512 0ef821d721c44d0df0454635e30a683dfbf058ec6ccac302f0c49ef1eaa01b94b710e0542e25d293548d23cca8866861ac2fea4ed31f7f27799932af549a1786 WHIRLPOOL dca5222a2aabfc673e1a1c7ff94731fc6195f9be6e5c9d2f856ab941faac5ed1848cfda86d66711d15d963ac4ef065db92c326ca434791a10c397ee9fe3cb4b7
+MISC ChangeLog-2015 6610 SHA256 3d727181559f3257cb5793f63662da86fc5e9b376bee9f9aa03260dc448c9b61 SHA512 0d0c751a764d6bd7c49c146f208b549a78f1132c142def197b4e31cd3515b889f66182e0e0d04ddd1635b75c57bfe72074441f86ef6c5c39bcf0ee0967367045 WHIRLPOOL e163bbc8eb269a5c54569fe6b481e54c1533c0033ac4fda26ba4a87307c4e3cf4b0f220213fc1ae6aa35e7d9198a0b4f3aff39afa83ca111e7ed684fc5b2209a
+MISC metadata.xml 474 SHA256 6efc65ea12983f5ce65bcc5197f4d9f74fda4cc0155f890fa97f82ae49be5bae SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3 WHIRLPOOL de7bba334038763b0fa2747888d2d94e4a0b2391d7a8271ad89f8d02fbf9d6302e7c040d13ebcfb061c14a9deb2b03003bde6585c2d5df11547b81faef10ff94
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.4.0.ebuild b/app-crypt/ophcrack/ophcrack-3.4.0.ebuild
new file mode 100644
index 000000000000..a42ac68b77d8
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-3.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+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 qt4 +tables"
+
+CDEPEND="!libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+		 net-libs/netwib
+		 qt4? ( dev-qt/qtgui:4 )"
+DEPEND="app-arch/unzip
+		virtual/pkgconfig
+		${CDEPEND}"
+RDEPEND="tables? ( app-crypt/ophcrack-tables )
+		 ${CDEPEND}"
+
+src_configure() {
+
+	local myconf
+
+	myconf="$(use_enable qt4 gui)"
+	myconf="${myconf} $(use_enable debug)"
+
+	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/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
new file mode 100644
index 000000000000..2d78a14dabf4
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 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 qt4 +tables"
+
+CDEPEND="!libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+		 net-libs/netwib
+		 qt4? ( dev-qt/qtgui:4 )"
+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="$(use_enable qt4 gui)"
+	myconf="${myconf} $(use_enable debug)"
+
+	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/Manifest b/app-crypt/osslsigncode/Manifest
new file mode 100644
index 000000000000..eafccca1db94
--- /dev/null
+++ b/app-crypt/osslsigncode/Manifest
@@ -0,0 +1,5 @@
+DIST osslsigncode-1.4.tar.gz 96512 SHA256 721eddade1571fcde54e7f5c21f961dacb990c19f9bdb05c4a7aaeb269979069 SHA512 89f82b5cbab5952b7bb0b1a3ea230db0c38d171924e5150e9cd157158e52d312cc10093ac719265d03a097f995bd3a438fe874c50263659859c625482ef0239f WHIRLPOOL a3fadd7e9e4e8bb295d33b6e7696fe5e7ba32f252656fef3faa59bcd86ddf6ceec2e5532cc136e078af6eaf74c169edfaa18635151e993061f071b7cdb0807c6
+EBUILD osslsigncode-1.4.ebuild 569 SHA256 29265bd5f9da0e24f8949f1c1c27208ad3e5f0a9351f6731aed90a15ddf69d99 SHA512 633f36d45f39c15a4534a36d7a3ddb946feaa72b5108fa7337473e96f3d8ea3580cb5d93d91fe3fb4c45f4e3db9bb8873c2f5bce152aa0e8ed0df8287f158d58 WHIRLPOOL d9dc1bc5839779435a79d6668c9a605a198f64d4c14e0f1f4073002c6eb2f8d4a59f700e397e618125afc04f74f4d1a308b5c04945499d143df73d7cbbd93dcc
+MISC ChangeLog 2329 SHA256 e27dcf7315d8386e58aaa7320a936e8069649b204afa425fd0a10f0e96f0c21e SHA512 505f32f94d5c5ab4b3f5f57c1107270128ca700679f48e8805446044b859e04184825861049a012c1bdb78f2c91da6e498be0037a869d1f814422b63fcd415e1 WHIRLPOOL 9ef074a77f8a514045c3cfbe5e9edcc523743bde136c20be5721c604835cdae4488b7f9dd4e48ff873594458e79a40cfe16e6de6aea893d693b11984299146a9
+MISC ChangeLog-2015 524 SHA256 e78e42ac34b79598f4714228b085393769b5eae3268a3c10a47532177fcf8ead SHA512 f0b6d6c86eb34295768c04e77d94f134394c9563520613091ab34dee97914f13359cf42b18f8bed2d584a868c55769eccccba76c074897b5cddfa0d749ce4a84 WHIRLPOOL b9c3db3f668ddf12fb5245303e1671df41ddd5d9ff237ad6412111d20fed2bcf4c7cd4e35b8de32883f7088f7f433ba452c76562189f75d77f677594f3397432
+MISC metadata.xml 340 SHA256 478e54979c12e556ef5723c4211f9c49387742ce2a653857e20a9535b4633929 SHA512 6c089e5ce96eca8068ef67cdc328fec4ec3e1391443ffd122c58a17a926b4d245c2b43b5f064daaa61f33ecdf3eb8168ae1c426f09a8c583504d2c9375e3faf5 WHIRLPOOL a62905315aef5b0dc1867cbff9c406a5cf57e730335670b43c1e3b76a0e4c41d8a210052a832f334f5fa62e5bf3ce19e2e8b29cd1c34123023a9660965e6576a
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
new file mode 100644
index 000000000000..060befc39aac
--- /dev/null
+++ b/app-crypt/osslsigncode/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>vapier@gentoo.org</email>
+		<description>do whatever</description>
+	</maintainer>
+	<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/Manifest b/app-crypt/p11-kit/Manifest
new file mode 100644
index 000000000000..2de1bfdbd117
--- /dev/null
+++ b/app-crypt/p11-kit/Manifest
@@ -0,0 +1,10 @@
+DIST p11-kit-0.23.2.tar.gz 1022733 SHA256 ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0 SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f WHIRLPOOL 03ffdce4b96682a7283e9d473f90f2c50be7de5930e1b3cda420bfd09002f3b0bd23351d5edf97f63f6df02545994628d97cf424fc92f66f3ccb04342ddab21c
+DIST p11-kit-0.23.5.tar.gz 1074479 SHA256 0d8fed192563c324bb5ace3c068f06558a5569a6e8eb47eee1cd79ada3b1124f SHA512 5276db3c9bb14d5e0441e7b781033b1684edfc1d4da88a9c9ce501ed1f6121918d3afe6725ceb0e2d65fc253c2f9eebf37c3380741de6c1b09cec06ae86417a7 WHIRLPOOL 6d641b7884915e3ebd93ffc6a4364fe43269af0e1bd55419d87cddc9a2074d9217f666a968d6b5bad92b4c20f52d062b0164524585460d41c78c3c590aa3b0ea
+DIST p11-kit-0.23.7.tar.gz 1087009 SHA256 988e7c86f2641b36702503481292ef0686e6b1c39d80b215699b6dbf1024be41 SHA512 c9f492220a963726cd1883c276a4a3e607c07f77a34253797beb9f11e671cadcc1b1fa85baa746a0c5bc3f439a8c362e0b2f86796500215fa05efb5446f2baf8 WHIRLPOOL bca4968ade1621339fa98c896b8e4a72a6dea47f56ca2d99d343dd569427e05da6f04428601966c4a4c64e3d56c58f2a505b291ba6f6765385b7ba1629605066
+EBUILD p11-kit-0.23.2-r1.ebuild 1334 SHA256 bc8ea0e50f2d6af97c77614867bc2357585933b032a0bf0f3986c028edf1701f SHA512 31ec99aae8be6ed3f4d3c5d2ef260b8b42ea02d053a3e4915c7d0336d4c06fc627b755ce5249bcd6b878a5bcc1e5d944cb2c8a6d53ef545a7ecf0806b54c80ef WHIRLPOOL c38b354b5ee83df1d5cd0a3f637bb1e7f46229ae63c96b6b5e3f537bcf22c6272ee61c124a4eb63b0c25163b15f1c0433e275b5fdd5eaab808902dba36168071
+EBUILD p11-kit-0.23.2.ebuild 1311 SHA256 e918bb48ac4cde60304d5be009fd3dc4771bb16cd85537e485ffa7d8f54cd3c0 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c WHIRLPOOL ed12bd50e1b24cfcb6a8c1623704c2411b42c0f33e2568beed6e6ea1d6891014a36964976c1920eb019b11ca2b858aeca6da33fe7805386e838c51da66a6434d
+EBUILD p11-kit-0.23.5.ebuild 1386 SHA256 cb61793e3c36e78222f9cfb0d3ed424c5f5a19961506a898a7da7f490777525b SHA512 57047574af1b8c61b7c2ab0e6c5dd223290c2882cc75e1edd593f0d167dbfc6eea4c30f236dbe361ce5477603a228b7506c8ffcc8ee5f7b7c47d3781af734115 WHIRLPOOL 0dcf06079163144fc4378e109377d5598b9b11f56d2caf6bc42f8a2100eec0bec4d4b7e239409db7f6ef0b762a6eef22b9e83278114810ab08dbd4b84c404754
+EBUILD p11-kit-0.23.7.ebuild 1386 SHA256 cb61793e3c36e78222f9cfb0d3ed424c5f5a19961506a898a7da7f490777525b SHA512 57047574af1b8c61b7c2ab0e6c5dd223290c2882cc75e1edd593f0d167dbfc6eea4c30f236dbe361ce5477603a228b7506c8ffcc8ee5f7b7c47d3781af734115 WHIRLPOOL 0dcf06079163144fc4378e109377d5598b9b11f56d2caf6bc42f8a2100eec0bec4d4b7e239409db7f6ef0b762a6eef22b9e83278114810ab08dbd4b84c404754
+MISC ChangeLog 4556 SHA256 cde307bc48b70eb00b3f509219511362f24f0d9663287267fc0b902412028613 SHA512 b1edfc6aaea71a3e32cbf0a49737fb8ee2d167acb2468a9e2d8633c5335a3f428c1afe58c64537e84f1e61f148ac92044db2c71b601ab68fa0fb109e39ad94da WHIRLPOOL 6be14155e597edb221898f270965b194e694e0a7097576e75dc9ff7415cb0e124d4f21e22a0f7db79875d08a4fa2ee3e4fff02f9dcde2f5606751bf90bb347b3
+MISC ChangeLog-2015 10716 SHA256 45958a4c48b0f05be46e6c77968f1b7b77c967556dacc6d9d92304747a6beb46 SHA512 d4dd46224a28f9c076c7d29d961f650e7279798ba6d93bac920f9bb03f4da439395deb8cd92414f0aae66676826f9e9505344502e268c15e9c57d1df80682a0a WHIRLPOOL 960b1bacd3c2354ae85a90beaf83a70945362c81b62f75eb5530274ab4a77baf6e3945621642cdd7b14d3f5a3e8314da6ddd98bb169d91b4adf37803f5d38f09
+MISC metadata.xml 454 SHA256 2a82541283af282acf608730840309189787c777c3c4b1b7c5397c474d16af12 SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888 WHIRLPOOL 52bdc923af88314c083c2c62309909292ba6474a2195bd4e9864562a2df7b47a423741befc88b740822f9d380635c9241adfaf0547623213c7284a1d4b99a295
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.2-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.2-r1.ebuild
new file mode 100644
index 000000000000..6ede13712959
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 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"
+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() {
+	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.5.ebuild b/app-crypt/p11-kit/p11-kit-0.23.5.ebuild
new file mode 100644
index 000000000000..2844a9889097
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 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"
+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() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.7.ebuild b/app-crypt/p11-kit/p11-kit-0.23.7.ebuild
new file mode 100644
index 000000000000..2844a9889097
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 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"
+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() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
new file mode 100644
index 000000000000..27e242688959
--- /dev/null
+++ b/app-crypt/paperkey/Manifest
@@ -0,0 +1,5 @@
+DIST paperkey-1.4.tar.gz 259446 SHA256 e12bb0ec835127d12a922a8d60b3dfdb3ca8ee60bb5b4d15ae4cea85bbcf336f SHA512 d0e87760bfd66c39c407f59f94cdd3dfd8f399a51b854a2485f923f4f1faa95a40a68ffd018b9141b923c1db346993600e5e3644314e4f8c94585d47f1367e9c WHIRLPOOL 6a02bc0161e165b6e483ac08904943348ec0a10eba509028d5d092e1cec03d9e906e2d1307c16cb256fe4965a62c5c791becc0cc27200ab0b993de985cf629e5
+EBUILD paperkey-1.4.ebuild 342 SHA256 977f87381d6900efa3200c21b29e934cb5441735f267a30b7557471cf13d46c8 SHA512 841f89c09c1af3c4e7a05a356bb3f90d04037ab17cd176d2b14f0827f7a26db630b66f3e559dbbc23563d04ad30019181651a4837bf9a72d7e9703f8892e9839 WHIRLPOOL 17269d28c8d1f72ac1aed1ec6740128f0f99a2824eeeacd895f7f1c7e46c7e0504565cd61a236a90b6e68d89ab832f90c524302e1cae6fa826ccb2d85ef39c9c
+MISC ChangeLog 2325 SHA256 7a7bba35e17201236f7c243e643c9f144b7043cb9b197fd9ad24be0205a3dbfc SHA512 6b36c95162d9f98a6a3735b45ab36ca5e544a4b1358a2346eb7123d51b6425c206cfb3cfd9d43c6d52ee400ebc7493ae53945b10d30f057d1ed1dcc1287c86e2 WHIRLPOOL 426005e4f69c1ac7a52950154baec75c21eeb7d9d4c8f8214ee29fe4b379dc8e7b6fedab4fc6f2722025648d890f1a550d5441932d277c8ba7263f377972eba2
+MISC ChangeLog-2015 479 SHA256 64093dd473dd377b2686c39ba837560907c7583e25e72cf75089a8fd5b9927da SHA512 7e0f016db4af516f9745a78c0e1540c01d82b385cc15d8119a6c3f588bd08d1765132bf6b10bc3399bf51cdcd08787f8c671f2cc3537b275510c3f064f86c7b8 WHIRLPOOL 57f8a41ca0bf0a1ba61d27bda375c34b721dd6883af5059a446713a03e521615917a087333a49b3cc5d9fa5ab80a5f8b8386d0c86fca695c21d765002859e8b4
+MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/app-crypt/paperkey/metadata.xml b/app-crypt/paperkey/metadata.xml
new file mode 100644
index 000000000000..97df2a00971b
--- /dev/null
+++ b/app-crypt/paperkey/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>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</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/pdfcrack/Manifest b/app-crypt/pdfcrack/Manifest
new file mode 100644
index 000000000000..2aeb8fdc17d1
--- /dev/null
+++ b/app-crypt/pdfcrack/Manifest
@@ -0,0 +1,8 @@
+AUX pdfcrack-0.14-cflags.patch 236 SHA256 9b4fa7a71074485727d057952ddc26be0019fc7266a8aab7573c21b4ea0952ff SHA512 8fd2f9bc024bff34bb1f7e90e7f27b80473ca12f340735f4cbb8d3717354df9907a9f05d57950a4a9f9604c2452a75cb7de341b4b84f2d248a63ca047131388b WHIRLPOOL 11e10391821ebc927529c715ed0880829497b2548809cfb9ba6ee3c8f0c5b6e3183ae8f7134591f373c25a633c33d488a5ccc73c7b1db904b137ce53634c27ed
+DIST pdfcrack-0.15.tar.gz 34269 SHA256 791043693f9fc261fa326dbcb5e4de3801d6ae552dbea39293f9b2674c250d3e SHA512 9eef648fcb8c9cd4fb70af3ad4ce1b8da892edc98919104bbee70947d7f93262f44cb6e8854ff10b0e4680fcf0c3abfc258d0d14428d261744ed4b28c792a966 WHIRLPOOL 69ed8f15a1ed80843a1bfb4108a35464d237d803d24630b047df7a18a027d5d73fe48c52dbfa71174de520701b015abbb550873a724473291a50d226d19cbc6e
+DIST pdfcrack-0.16.tar.gz 34467 SHA256 7865b203074ccfd5c612c8ce00c46ffcb4fabaa26154ce9304dfc668c7cb73ef SHA512 460113f28249d1ea1cefc6dac8ff22b33849ccff50f61830144e41eeec47c4b9113845bb955d26757adb0552d8c0dfa43b3f5666c1419afe4063037a1e1c933d WHIRLPOOL 4ac66029156d59265de2639ab8ffc63bfa66353c6c1efeabe7f1c6213db3e73e243fe5d4b612a6f7d94704b225452aef61d41235cd67bb3e1f8fd0fca45192b0
+EBUILD pdfcrack-0.15.ebuild 521 SHA256 f30b4e32ad8212c846a0ed1e3e2f42074c638797d341ce2cc09c932f2c935651 SHA512 25ca773e64b143680011b193432b29f7a8d629977a1bf2143b2ebb292f375def1ef2eff6e8b79f3e9f94ef8b3fc590ad67245d66dba1030e33e554247e17f5fb WHIRLPOOL e0ddb7b7888ca522d4eb6ca3fb1cdfcbabead2ca0d866f6a832690cfb7cb45876f9c4c5cfcf28c5af66dfdffb162f3e272aea7aca8b2e62dae610fd36c995fdc
+EBUILD pdfcrack-0.16.ebuild 521 SHA256 f30b4e32ad8212c846a0ed1e3e2f42074c638797d341ce2cc09c932f2c935651 SHA512 25ca773e64b143680011b193432b29f7a8d629977a1bf2143b2ebb292f375def1ef2eff6e8b79f3e9f94ef8b3fc590ad67245d66dba1030e33e554247e17f5fb WHIRLPOOL e0ddb7b7888ca522d4eb6ca3fb1cdfcbabead2ca0d866f6a832690cfb7cb45876f9c4c5cfcf28c5af66dfdffb162f3e272aea7aca8b2e62dae610fd36c995fdc
+MISC ChangeLog 3085 SHA256 86cfefa617fbf4400f41987f8453dfa1f2c828a2abfa4a73e9a527206c06dbc5 SHA512 b8df9a43e8bfa255e3bdb2acce0087ba7470799ed0c5dc185aca79db73fc92c355511e2d26c206700cd8bac934280bee43dc01d7caeddff7c1c28d37dc3d872a WHIRLPOOL 8313f16881234291ff0b1b4025b00c8b65b887ad89e81c422fe3419988c72f890a4b0e88823f0d6aaea3540a25caca0531802b1631e8a5a6aa3fc613a9f7e18a
+MISC ChangeLog-2015 1562 SHA256 c81d026d76daa71454d0393620edc5e2bf9fb36a4101be7a45b78dcda4d5c771 SHA512 fe5e8ff90d91b94ae8ebbcf5a6432cfbb914526fd8465940d14f0d62cffd7d49c5c788967bda1d68051511133787a8767146a27bc83e05de72a9bc122e2e38f7 WHIRLPOOL 03381d75c997986f18d3941c5f21db2126ba69036efe43c6dac9351c88221317104e494631982db1378f7d07a326c304cbe610d353bca283c86a5b5117e2fb92
+MISC metadata.xml 318 SHA256 94722bdbf9c7dde8c4351f478362183774ee0dd0e831102b8aab96b251ab8010 SHA512 19b662a277c05c40365c89346bb98a42e1cc8924a0343899be55dcff0d38b919f681fd8b32ed8e0db0ef07b717847caf4df73d862bc73e46f2c6fe7985a94db5 WHIRLPOOL cc4e1e1f360851a4f79057fec109448e2fea1583183a0dd489f9f2467939e6633db441537a77a5227e31991555478fc3d30fbbcaef0f04a01d626a71b912d50c
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.15.ebuild b/app-crypt/pdfcrack/pdfcrack-0.15.ebuild
new file mode 100644
index 000000000000..206b6b4510de
--- /dev/null
+++ b/app-crypt/pdfcrack/pdfcrack-0.15.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/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/Manifest b/app-crypt/pesign/Manifest
new file mode 100644
index 000000000000..48a61cc78654
--- /dev/null
+++ b/app-crypt/pesign/Manifest
@@ -0,0 +1,10 @@
+AUX destdir.patch 249 SHA256 75aae3e3b4c009ab5ac039203cd6cfb382d2c8d0e670df62b6a8c64a34971449 SHA512 dc35c71d6143c164d17723bfbb5f899c863abb4ca46a96356054e46fcedf9d708f9f4ef3345bd5966b9e492cbfa9dd5e3e85545853799859315ed57640c03ee4 WHIRLPOOL bf0fc9403299166fe9dfebe46628417e069697e261c0bd17b74043497b1bc1e5b27662725980b3108da63ddbbf3adaca5a859bd93f728d60f47d76c29ca42404
+AUX pesign-0.112-fix-cli-opts.patch 2228 SHA256 387de650336376a8b5edb2cdc4097114c75231b52c5dc4fe4408d606f51cdbfd SHA512 62d2ec0059ff518b576b6399a217f47b1f361c41292055b8a7326e81cda30190b4a62dad7dd8150855b2025af1ad25458a2cbbfd3ae89ca6c870067224662695 WHIRLPOOL 59d6308b157fc42da606b61b9c27097039c4cab9b15d9ecbe3f6b4db3f44a7cbfc9b75b88122fe3593532674f8556278d352bca4a3977d6a239b6ccddcd5948f
+AUX pesign-0.112-fix-initializer.patch 388 SHA256 417d2a19d929627a0dec093767bbd19f0c7774184e0f5e607ef90a789e9b630b SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84 WHIRLPOOL 05d5c1a34ff01767ca211545922c9e13208f5ec9fab99738da307465838f78111152adc18d952ca3ea7fcd35a4a8077c33b4cce77583bb98c9c9c09c0d52850f
+DIST pesign-0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
+DIST pesign-0.112.tar.gz 107632 SHA256 df4f5459137126e2fdb06484d755a81b6ec9a7b50099dcc3088ea2d41047cd06 SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018 WHIRLPOOL e5f3d3801ff7df7d643e87bc851f2645931e18df140b25a7add4136db1bd89c2a8da75d8f018533d5b16ab80695740d00ac379e166993a1912ba9ad2abee6791
+EBUILD pesign-0.108.ebuild 1180 SHA256 e4160868100683edb31bb37759b251a1413dba87d6e3a68fcc64e5387a5edda8 SHA512 53c6e8b00914f01cdfbfcce7badbf4c888a6d23276e9787e34750a2aa85783018084ff25883a313b5b2b67a1b82a6b6888bf971f48c39f37e26c01e74183a7dd WHIRLPOOL 973c67e3c80c29539bcf90de723d98ccf58c67c5c0d8bb723331fd4526f8739fb02e9aa315124e883d71df03c7c6208f6922b882cba7b96a457a3df154c70950
+EBUILD pesign-0.112.ebuild 1000 SHA256 30ead77c615a8212ac27a62b312f52bf2306d74096b654b3b09f193116a51e1a SHA512 cc54e08354b28e7ee96304543815f9dd29ecd9e30709bd6f3861ab04286c7c6bfc3f0e66a5a936222741209d2b649af1349b632826cc914268162dc35d5ae2cd WHIRLPOOL 1b99b77badcb4a12f8bf51c97923f83b34bc2a80bc8e0eedb8dddd093740abaf6a497aa91e4c2138177034b8f261e8888fde02c61cfef3fdbb8830c54b1132f9
+MISC ChangeLog 2454 SHA256 f5c5d6fa0fad7b3b0c0c691d91f52a97156350b9ab9afb72d8f23c2ef6c6db0c SHA512 c0e8166c72bdd47be814ac780c46f33d2eb7b15666a686aed4c8c568a0c0fda1bd4eabc5f2b2a04d49644e7e16199487668715a783390ee1a1470e5791f33d82 WHIRLPOOL f644d83492550f0293c5b304a2d629f6f8e744d34dece049c2cd3f5603eb87431ab8ec39a88dab0bb7809d7d7603f6cfe4fa165b6e8d5186416e97212c86cc7e
+MISC ChangeLog-2015 1045 SHA256 c4b1ea3c1832dbd4f460aa346974789fb65824cbd69aacb24dc3a8834377e6be SHA512 970be07aec9815faf2ffbf9855c8331c07eabec884c70d7382d980fc1f376f7f77977f6e653c20e820073db5b001539132a38cc0586ae4db43d036c641d4ab3e WHIRLPOOL 1c9b8f75019201c42ebabb79f89313eb144b2fb33a56cf17857973b8284c0078c337c46194a27ff17ff163ba2fbd268f873993f5e0bdfe87fdc8aed3c31460c2
+MISC metadata.xml 466 SHA256 ed83ff7c2420eafe66aed4da117b1869c3dfb4f4a29865b4b18ca5ca6ccc9e28 SHA512 cffb289b804411ba72b52113ac4784e2873c0c0730496eb3b29a35c2d2a8891031f579e70cb7a64f0da685fedbcf3f0787ed2c630664cb6c363ddbd66e0d1364 WHIRLPOOL 22ad17121a5743d51a59b78837933e65de31de9032bf9da4e92d28655d4568dcb2f186f8f196bff9be901ccb4923afdda989dab0646c96ba08910ce58bfa713d
diff --git a/app-crypt/pesign/files/destdir.patch b/app-crypt/pesign/files/destdir.patch
new file mode 100644
index 000000000000..70332410a3c8
--- /dev/null
+++ b/app-crypt/pesign/files/destdir.patch
@@ -0,0 +1,10 @@
+diff --git a/Make.defaults b/Make.defaults
+index 864f98b..e2c967b 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -1,4 +1,4 @@
+-INSTALLROOT:= /
++INSTALLROOT:= $(DESTDIR)
+ PREFIX := /usr
+ 
+ HOSTARCH   = $(shell uname -m | sed s,i[3456789]86,ia32,)
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.108.ebuild b/app-crypt/pesign/pesign-0.108.ebuild
new file mode 100644
index 000000000000..5c3ee729fc91
--- /dev/null
+++ b/app-crypt/pesign/pesign-0.108.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 multilib
+
+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
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/destdir.patch
+}
+
+src_install() {
+	default
+
+	# remove some files that don't make sense for Gentoo installs
+	rm -rf "${ED}/etc/" "${ED}/usr/share/doc/pesign/" || die
+
+	# create .so symlink
+	ln -s libdpe.so "${ED}/usr/$(get_libdir)/libdpe.so.0"
+}
+#
+#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
+#}
diff --git a/app-crypt/pesign/pesign-0.112.ebuild b/app-crypt/pesign/pesign-0.112.ebuild
new file mode 100644
index 000000000000..01a0925a2bd8
--- /dev/null
+++ b/app-crypt/pesign/pesign-0.112.ebuild
@@ -0,0 +1,46 @@
+# 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
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	sys-libs/efivar
+	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/Manifest b/app-crypt/pgpdump/Manifest
new file mode 100644
index 000000000000..05a23d05ca8e
--- /dev/null
+++ b/app-crypt/pgpdump/Manifest
@@ -0,0 +1,11 @@
+AUX pgpdump-0.28-respect-ldflags.patch 977 SHA256 c0bb77f412022832cad79ea8aceab4254896e84d6cf18f66eff762f7116e0d6c SHA512 3b615f8276ad4099c7963a53189af482b90143e1f36f14b596fb471736a7ee9ee13b6b873fa56dc7792605449c00a4e1a273c7aa35dc7de1ffd3fabacab6728e WHIRLPOOL 13a5abb02365ceab050df033cf851d349680394a68a9a71c65e5d9c1ab34ca99cf18fecd4ca55675f21564132f30d86e456a32cba710c95c243a471e487be7d1
+AUX pgpdump-0.32-respect-ldflags.patch 998 SHA256 3b54f3fbba3a1a697ee34ce8adbf56525190253cd2e976a12419913b76397e7c SHA512 ed333769ded8acbec36d34bc86d935705294d96854e84af4673d44ed3d04f5272d2c1bba38b2742afeb02b2a307a983ff61566433ad1546769e6a68f2318e760 WHIRLPOOL 7858cc30385c80738dab2410e01a508c6da844b9f3528cc609067e38043ec10e64891937eef91def89ba62c9610201984677eb53b8ea10666571f2233462d42d
+DIST pgpdump-0.30.tar.gz 63152 SHA256 8c36a005baee8dd6e730e5735c7ac2bbc8826a1bb29f500c0202d00fd62baad4 SHA512 e250dc82bb890a7645a41f6ddbfad9155ddf70f2ea53b09e771e9b6851d05d3fba88e16b106681ab092174e79ad709ed860be25bfded1ca7f369b357e8c72730 WHIRLPOOL 80a054e53d262ad5d349ecb10a5f421c1308de248ad9e2884eb4f37244f79efb3428dedd6d1d2d6b59cdb20b76c95f8ac6674fab3b47635944e0012c8eeaa59c
+DIST pgpdump-0.31.tar.gz 63808 SHA256 206ae52d4a8bbfa095b6ceefcc8b53ccabcdb75696db3bae5e05c15433729813 SHA512 10d138baf0e3c9a47f6c8549a94b14eaa8babf95a09265e3a5b91469598726d6ee94cc7c481688c2d2b63917d6daba1bb368923aaf75adac6b18694d9a2940c4 WHIRLPOOL b706d92da109305b72900e7f31aec70b2a9a286e49ab13a03801623ac8997df5c8dc1f30d829aef35dd8d898786748b37dcdeb8cc178f3cddac0662f014a6b03
+DIST pgpdump-0.32.tar.gz 65444 SHA256 2d49d9fa5c12750abc16e09db7f52950b526475bdb27ad16e489c92b59c2af25 SHA512 3f28a301cce703e934eb8b6124af4db78801d444ce74f43f8511009ea0684f9e9c229ef2a18cc732fe0854f2e02c4bbfdee46ffee64a5f490ff06c060472e49d WHIRLPOOL 2df4bbd29a9cd5dda1718fb498db2bd7b8a24d54d979f519f2323578f1a0177caa871c26e79ae27fc8d9597862456d594eb1084c49ccef13e9c9f621a682295a
+EBUILD pgpdump-0.30.ebuild 552 SHA256 9ea8cceec0e7aadc9c8edac106398491aac0823e722f59dc161fe7d1175999e6 SHA512 4d06ab2adcead278d58d1a9366919e83d57b32b98c89a2eee4bd667c8853f3ff7289be99c225179781cfb4d0e92823d7f2af41f5eb93f9ef1e3183efccfcf279 WHIRLPOOL 52558a00bac59c51c0af828f1deb13eeb954d058509c19c0680c6178791ca238927ee3744709cb09ef894440ced72994475c4926298336e9de9c76cb24a62991
+EBUILD pgpdump-0.31.ebuild 556 SHA256 7e82d5b11e85eee6acf7248409fb5690abab09470789c30c83287b6218be2cb0 SHA512 ec70920127ac19861873f30d3151e6623379d06f4b6a3d5180d6f1729144d3631a08c516cfa32698680c7436b395bbd01df5a0a14e40ff4d05cc580aa4ee3c89 WHIRLPOOL ef37eca06c2ac23563daad61340e4545a36ac51ee63cdb63f711a9247193587f95b5a1ffe72284c9c6b35f63b966092f28e486e721fdbe57f738f4c7f55ebcc1
+EBUILD pgpdump-0.32.ebuild 528 SHA256 a60a6e8b151cc62017c624cbc9abe5b744052d02ce9efb5a03988a1aa31b5ec3 SHA512 f99dfcc371d372dc6cfa9613c4f40336dfaeacd08851f0302bed6d5f91814dc35e31d4a3ce0cf273c3e4a8781cb02aff907d31861f863a0c5f5d9e2dfa5126a9 WHIRLPOOL 703d40a2b6d0ef0aaec7c395f79618c1a7d3fd8cc14c7416ae9b7814ee55fbe097c00aaa7e439798806a9a83bc65c712563381bdad79c7f58ad6e8f88a6e36f8
+MISC ChangeLog 3757 SHA256 45149a4b8cc4575c52ab89981d9a3938330dba37b2a586c445677e21294d0262 SHA512 b532021612cab9e69ea5e00a1ab602651307b4034c7ef00c1f009edbdeae83f1cdbc6f57aaf64ad647aad706d32c1009e9245243de058248f98286326f3e9a69 WHIRLPOOL 40c124139ef4f743000ea9905141d9c343a20a8368a43ef786b071c6ec9619b29e1bebadf5efec99088096aa0489b23d2a7741920d2904259c4be1fd3c296bc9
+MISC ChangeLog-2015 4475 SHA256 329f93fb0f731d58e73641258420b3fd01637e93b9f1ba18fdb9ab8c22113ed1 SHA512 daef1459f956af3005b676641b87651b7ea116f3b6c2b92148cec29d0087fe861c258d4349b2d97ec4d3fe3f90416a1bea4897dfbb7d57ff66d2b66f6dcb2444 WHIRLPOOL 7e635095910fc8a534e4365732626f335441173006806620c5303e67c1f6473c89bd13813a97da1ddc8c8de660e55a4e26527cbc8857a1bad718036d90d9d642
+MISC metadata.xml 168 SHA256 9f5073e4f4682efd1d4fda14feb67df188972340a55fa9e06ee82b66e24f8cc8 SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 WHIRLPOOL 3ec0b2fcfb36e82c8f9dd8877875a38095bc9b11aff96d69a7919ee610efe27f65318c974161f6ba135150ad361a8c108938841c3d48c42f5a92d1762858d898
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.31.ebuild b/app-crypt/pgpdump/pgpdump-0.31.ebuild
new file mode 100644
index 000000000000..d3836f782bb5
--- /dev/null
+++ b/app-crypt/pgpdump/pgpdump-0.31.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/pinentry/Manifest b/app-crypt/pinentry/Manifest
new file mode 100644
index 000000000000..604fd4c2aac4
--- /dev/null
+++ b/app-crypt/pinentry/Manifest
@@ -0,0 +1,10 @@
+AUX pinentry-0.8.2-ncurses.patch 824 SHA256 7d5e485e2c6dcce80ab63055d24761f53ae28e19b5ab2dacc424ebc7677805e8 SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901 WHIRLPOOL 5483ccb6041e769387685ce987a19a2aa50835781a391169abbe7a838325149b81ce186692dbdc588858f74ef912a80f1eca6efb0f3421ace57925ca9c6f9ca5
+AUX pinentry-0.9.7-require-CPP11-for-qt-5-7.patches 1415 SHA256 ee9fc1ccc6d8c96a7097d8cb93a2277b7809dff24314d616615ae3bbe369c5a1 SHA512 1191ec7aa71042e4c770ea2793aac73f5501e83f0f93e9ae5440cbf84e4796c258156af7da9d0aaa7603e690c6bfa97d921c7721b3519d7ba33bd0f0def0baf4 WHIRLPOOL bbd686b0bde31c1a07074720ae611454f8a2f383c4d950c29deac974ac91b44c64c06066a65467589451bf596badbcc56d63a6bbfcb2061329861983b9209915
+AUX pinentry-1.0.0-build.patch 6634 SHA256 ddc05cb4e3760b3c2f92c0dd76f316aed455400f34dd4ff2939a5a59995c5c15 SHA512 cd71552db3c4ab3bd7dd34d5009ad332e5a430ae1e909085cac6a04e63801086cac18916af65a37c110c2b667054c356f38dcc8af43468a23b1b562bf6dbafec WHIRLPOOL d117a3e591b38ed5e5239b5e2fab01c3db0d90fc6b8f52204d9e4cb7a579e703de1615be0bc8d481bc23149731835d6f78b25ffc74a8b361a1400a9d80da0344
+DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a
+DIST pinentry-1.0.0.tar.bz2 436930 SHA256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 WHIRLPOOL 182d75e37afc40c02705ed6611354eb3429924df9062e64d42e511a5bdac5f7094b351aae406ef243e4a9d6f7db0eb897820bd23ed925b8787941342bc67d187
+EBUILD pinentry-0.9.7-r1.ebuild 3246 SHA256 7f098011d46661c2b5fea2b03ec0402d232b7845564d57e1d56d954f70367325 SHA512 78e797ea8a8f806fbac7a161b82ada7941e80b69dc1a3051d20655abca27dcab40888d6a08d913203c8e2d14308d8e6164249f6ec915ed2c991a763d66d0e8af WHIRLPOOL ede02f69437072f1b2251613078a62f592f682793c8c4fa422be6982f071b563b0a85c4207996f8c5752fa0d176b194ef805d960536f9c3a1434023e9f4c3c3d
+EBUILD pinentry-1.0.0-r1.ebuild 2817 SHA256 3d106e89979ed830015951c5f58b5ad4a4ce14fc613d246fca19487920e578eb SHA512 74878447433a3d537c29376c05f47d578deb8bfecb073b84efa4ac390953e683422b9ad38555297b11cb2414eed7a6e10bcb27caa8b2f3675ad1e3da5d61449b WHIRLPOOL fb59532c611c1c30802220e1893daa7e2641af769cc8c762f840976afb17466f7ae6c3d6a5f7888b7a36fb937d6f5f05e255d8770375be8e88cf943819b3c19e
+MISC ChangeLog 9508 SHA256 c9cc05ed15e6ab1341299c3fb985fdd2d8a9539e62d73a16b4dd8f5815bbeefb SHA512 7ff10fc6c2e2621c475ebb0805b63092d8d9fd56b40d69fa4669a4456c5900644aa51b758b92086621035b83e4f728fcfc20d2d8a13e53194d7ef88b3aeb3fa4 WHIRLPOOL 4dac379391947f44aec42b9c3d71b01f46700ede56347dea6b73d9771c7e55cdcbdbdec20cf7781119e1aaf4d3dd822eb423a4810ff3657a8d76dd1768f2a6dc
+MISC ChangeLog-2015 25487 SHA256 599f868331443fbdf95c4b9ef073517aeb355df82a2878199d311310891ebaa1 SHA512 b6cbb7b6abb7ba7e70094d334d18da227aec8b0e7654af58736fd6a5626dd178c23ac7524abddaf2dbf67037f117e98d6bf4a3757f0c2bb9428e55f0154c8f96 WHIRLPOOL 7683a728f4a93c78d60061a1a85785a3a7271e5854a81e7485fae2760190d49edd1d43e68db525ffc785a1ae45cb52b7df7af9a47d77b84c8a5c397ee4a29d56
+MISC metadata.xml 352 SHA256 7fd48348fd50b298029c84f873443f5b826fb46f05437440cef6dc2e1ce3773e SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0 WHIRLPOOL 46aba74d2e5243e320da11ac8193123ec2576b4fa7d6c904a494b8e234716afe4a90fe1c2c6ea211b40b53edef261eb1735200950563ecc1592d213c66d40ad8
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-0.9.7-require-CPP11-for-qt-5-7.patches b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
new file mode 100644
index 000000000000..406571cdd3a0
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
@@ -0,0 +1,48 @@
+From 7384e2a575dde2809784d9f182fd1d247064c8a2 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Thu, 11 Aug 2016 14:44:37 +0200
+Subject: [PATCH] Qt: Append -std=c++11 if building against Qt 5.7
+
+ * m4/qt.m4: Append -std=c++11 to CFLAGS if building against Qt 5.7
+
+--
+Qt 5.7 enables C++11 for Qt modules, and any app relying on it require to be
+compiled with at least this standard.
+
+This patch adds detection for Qt 5.7 and make sure -std=c++11 is passed if
+building against Qt 5.7 or higher.
+---
+ m4/qt.m4 | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/m4/qt.m4 b/m4/qt.m4
+index 093f428..90c4a6e 100644
+--- a/m4/qt.m4
++++ b/m4/qt.m4
+@@ -35,6 +35,7 @@ AC_DEFUN([FIND_QT],
+                 enable_pinentry_qt5="try")
+ 
+   have_qt5_libs="no";
++  require_qt_cpp11="no";
+ 
+   if test "$enable_pinentry_qt5" != "no"; then
+     PKG_CHECK_MODULES(PINENTRY_QT,
+@@ -47,6 +48,15 @@ AC_DEFUN([FIND_QT],
+     fi
+   fi
+   if test "$have_qt5_libs" = "yes"; then
++    PKG_CHECK_MODULES(PINENTRY_QT_REQUIRE_CPP11,
++                      Qt5Core >= 5.7.0,
++                      [require_qt_cpp11="yes"],
++                      [require_qt_cpp11="no"])
++
++    if test "${require_qt_cpp11}" = "yes"; then
++      PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -std=c++11"
++    fi
++
+     AC_CHECK_TOOL(MOC, moc)
+     AC_MSG_CHECKING([moc version])
+     mocversion=`$MOC -v 2>&1`
+-- 
+2.7.3
+
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/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-0.9.7-r1.ebuild b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..82a509210995
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://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 ~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="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
+
+CDEPEND="
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	ncurses? ( sys-libs/ncurses:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	qt4? (
+		>=dev-qt/qtgui-4.4.1:4
+	     )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	     )
+	caps? ( sys-libs/libcap )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+	app-eselect/eselect-pinentry
+	gnome-keyring? ( app-crypt/libsecret )
+"
+
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 qt5 )
+	gtk? ( !static )
+	qt4? ( !static )
+	qt5? ( !static )
+	static? ( ncurses )
+	?? ( qt4 qt5 )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"\
+		   "${FILESDIR}/${P}-require-CPP11-for-qt-5-7.patches"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	QT_MOC=""
+	if use qt4; then
+		myconf+=( --enable-pinentry-qt
+			  --disable-pinentry-qt5
+			)
+		QT_MOC="$(qt4_get_bindir)"/moc
+		# Issues finding qt on multilib systems
+		export QTLIB="$(qt4_get_libdir)"
+	elif use qt5; then
+		myconf+=( --enable-pinentry-qt )
+		QT_MOC="$(qt5_get_bindir)"/moc
+		export QTLIB="$(qt5_get_libdir)"
+	else
+		myconf+=( --disable-pinentry-qt )
+	fi
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_with caps libcap) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		"${myconf[@]}" \
+		MOC="${QT_MOC}"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+
+	if use qt4 || use qt5; then
+		dosym pinentry-qt /usr/bin/pinentry-qt4
+	fi
+}
+
+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-r1.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..23de2e2209d0
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.0.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 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="
+	|| ( ncurses gtk qt5 )
+	gtk? ( !static )
+	qt5? ( !static )
+	static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	"${FILESDIR}/${P}-build.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/pius/Manifest b/app-crypt/pius/Manifest
new file mode 100644
index 000000000000..d15893454eda
--- /dev/null
+++ b/app-crypt/pius/Manifest
@@ -0,0 +1,5 @@
+DIST pius-2.2.1.tar.bz2 39466 SHA256 82b842b13237a40a8c4e767e06aae419e93c0024f1dd9f30e287015cd5e56d00 SHA512 6380ca3edb045ab25669e1dbf29a9e209f8de2b41b930b81c94a45dc5921bedeebbdc8fb17b494845228353598f882aeefee5ee7dc16b7cc86297e8a333de6ae WHIRLPOOL 839490a6e3f37d78435c76557f588032a829f529300c8d800d4082a4f467fba3a4d36f5764a0b7a16b05e99c19fa2057dd2f7366c9cda3b8bb6c8c37d919e610
+EBUILD pius-2.2.1.ebuild 490 SHA256 315de50aab287cadcbc6387a8f2189b8358bf9c3398bee2e78cd520d4b9a88d1 SHA512 828b38f435ba0328352c42740e792f01aa96f5043871a28125f608bb06be2b447b039765017d6ecbc5ced9477c0bf66ed6ac85ea82608d228bbfb89fdc938c25 WHIRLPOOL 33a3e5410370c9b6738cb9187d91a5bce6fa5bdbb40086702887284723d02cd9291a80af1764b39fd7be724cb552e29d348f966779102c61eb3061d435aaf8ff
+MISC ChangeLog 3584 SHA256 81e2185218df226fa727383f2010f85b7833c672fdcc357cb50a559bfabfde8d SHA512 49a078966c61395d5a519eda08ac9ed69f241a081b8504c3bff398c33e6c02d67659a32eddf34981631332ea607a00e9a7b18194375e6e129ed38f51e3e4ae2a WHIRLPOOL c3fa7ae1a3782e684d152e9df22d7710bd9c8804375b736a690d9b3e721ce407457cae657249d2ecebdeb6839f6b70d255e49b062dbf3de359757f23bec8803d
+MISC ChangeLog-2015 1223 SHA256 1b62b7fa9aa19c347ce1f46302e115fccf4388ae81f4c3929e797979f7e63c04 SHA512 b891c3f1885c787b68dcb77ea016d6e2d100c2c0bec7cc110d54af0f66e0588f25ee0579079888d1b3200b49164bf2df666cbb33e1c628269645c0ed99cc05d6 WHIRLPOOL a76e7b6d818ccab36982224e744b7111cae240a5231568df224e013fa80ed843aa29020916bab91d31c5f250e83ea140a997f9c23c0229fb42d095fd1cbb6640
+MISC metadata.xml 689 SHA256 0ade26c346b860439495124bf460a5e52f296947dad07ad29b8edf165623c432 SHA512 77e117dc545213fdc376935a62d22a0b1db1aaa05fc5fc6ae83e0ffba49693411a451485c519c1bf1a17a829833a90d78472754600ed4dd5f779a772cc480218 WHIRLPOOL 91eab6db8510f8e1318c7495b62298dc7f36413111bfa09a6141ede990a377acbd873ea58f80d0778643112b9677e6a05751824ad2f1244e93c36ba43c85547a
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.1.ebuild b/app-crypt/pius/pius-2.2.1.ebuild
new file mode 100644
index 000000000000..f9560268c5a0
--- /dev/null
+++ b/app-crypt/pius/pius-2.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 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="http://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/Manifest b/app-crypt/pkcrack/Manifest
new file mode 100644
index 000000000000..a62846ce5413
--- /dev/null
+++ b/app-crypt/pkcrack/Manifest
@@ -0,0 +1,5 @@
+DIST pkcrack-1.2.2.tar.gz 174208 SHA256 4d2dc193ffa4342ac2ed3a6311fdf770ae6a0771226b3ef453dca8d03e43895a SHA512 5c64fb9ae09dedc70fb20cd689f432059fcd64f689072b529b4045c3241760fee273ee921da081bc08be2e0594d27101c5d89d99cb2b84e16f80c011419b7200 WHIRLPOOL 40ba854bdb81e3c04b91fa2b9c05a7b6a500a7a697c4384852b1fd5c153a4834ffabe942a249db52cdd32bd39989c97ecb206a866a3b577b7eb9f540cbfd59aa
+EBUILD pkcrack-1.2.2-r1.ebuild 1106 SHA256 8a3fd86b96b3ceae0beda3c502d6bb33434f95ae64f6387c1edcb0cf56972ddf SHA512 942eb9364bf578ee31383efbd7a353514acb98d67cd2afaeb6ef9bb8c120f07506dfd3bfa632b807efa6379d3f99aa2be6661b35c61dcaa6d5d70578a435afa1 WHIRLPOOL 933137ec5ac003a4dff0404d0bd4fddb073857d996c76528215803437808f0afb54d4a4ad107ab65ade2b9f0f6809215a38b8ec0c48d5ab1b4b486a9fc8a86ba
+MISC ChangeLog 2603 SHA256 b104df5adcb58f6f8538fbbcf0b9ca74b51f9982281ba933974721f851a75cae SHA512 25f58c662d61038db0b5fc399eaffba101b43f0dae88efaf61e057b999d0e733bba1a9b7b627b698cf6456f8793a4562f72a200dce0af4efdc150b60c83ac900 WHIRLPOOL b530579e47189ad4e7c11d2e04455fcda19f3b0edbe7494f9b698ac9e2305eca8de6d59e554c877b8d398fca611bfda756f207e21e16c220012e829ecda40439
+MISC ChangeLog-2015 1307 SHA256 e88047d1ad155c8a8520830badca6ca455f60b922de6e04ac28d8b301b088596 SHA512 48bb361ff49b6e32ff111b509d26e2764a82522514da8dabb2e795198db16adf0cacd9e7a4cd62cb13bafc15cda4b6c663783bff139eb66f24064b54a57d5cdf WHIRLPOOL bd0d4cfea2dc1459e2957803a7d5d4faad77c1647d0c116c6b3c30cea603f2ba66851cab7c02e7b2a5c9e5c974fc3246898b205c94b182e759d5356e5758e109
+MISC metadata.xml 370 SHA256 facef2a7547ea497dce4bdc373309a5b4bb46270226d320e9f2d3566ae2a079d SHA512 39a268538a1a2d5932b5295c4727c8769e4648cb94905ccead6b3941a7e8752b3992403f7623497267334f697478dc0db355e42bf2857b415f8ae06baa99d492 WHIRLPOOL 081bdd23a0565811794f8966b1dc22db3eb18bef9d885a3a9a161dd4ff5adaa51eb01528f994a225c8c52fbe606f08859c0e03938a6ce2146a2cd494ebadedf9
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..8fdb5148d939
--- /dev/null
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit toolchain-funcs
+
+DESCRIPTION="PkZip cipher breaker"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html"
+SRC_URI="http://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/Manifest b/app-crypt/pkcs11-data/Manifest
new file mode 100644
index 000000000000..344adae29c80
--- /dev/null
+++ b/app-crypt/pkcs11-data/Manifest
@@ -0,0 +1,5 @@
+DIST pkcs11-data-0.7.4.tar.bz2 226267 SHA256 8e4312f41631c6a92c17c3149cd7d2f92315b30ca1e73526bf83ccf375a4ba85 SHA512 79b13cbb7dbcb8a35c46e8de79d31e51e53a4e75783c3bef28a0d1aa8176db869a0bf984e516d21567619a7f8ea9206ac9ab5ee81672d9ae2a89efe713cfc46c WHIRLPOOL 27adc1aff01846ae016f79753b2231274dd73a79c777790bd34958110b24596a499fce11472c8d04966633457d52ad42e09d916a15a0c14deba3de496185fc50
+EBUILD pkcs11-data-0.7.4.ebuild 441 SHA256 c5002e9a815679c353139a884c1141a569287cf9050184c9b5f35775caf4d653 SHA512 d6a93b46ffcec8583238e9abfbe830711381217fc7aebd1405b2f33444a361f7106c2e935c452c1b4ba3b24131cbe960ab4585442848b3461dc55ed334cca1f7 WHIRLPOOL dd7e0d89f470102aac96717ae7b874765c57516db44756e4574b4fd035b034b10c18b3f7f983f487e00dbb848f0a77997676ed51e143d936e5d9b8d4f2f67c24
+MISC ChangeLog 2885 SHA256 febf8b53fd783fd90b9e0b6a5ac759636a197b00cc14aa6efc0b6375ec969024 SHA512 74fb1ae5a0a560e69fba01010370ebda54e53e7c6bfa88e9aff7f09cf0347229a25277a14b1ad25bfe2f127d2c4eab54ceea59e484e79ede6a69864da7329736 WHIRLPOOL c8090739a085c2763afa51ffdef3e4cbf5ea34e1448d336177f72d240790f499961110d675ee35f39ff39c22d5f2676cfa3a15e0cb0751d85c1023d1544efbb5
+MISC ChangeLog-2015 824 SHA256 613564a5ef620b05ae51a48ec5b4f1662404f2e80b8c47483ce3f6006f1385e1 SHA512 b855ba82764293e9f304b5307713efd2803da0f997ec070009e0ef94dfbbb71a52c9ee854f881a01093e7dab3a93bcc280217f9453941ebf2511eeab18192bd9 WHIRLPOOL 7f96eb21086b7eaa36c055ba5f22c67746297694c0130943d4585791611889118a0ce4baaf26ea4b7907b59b4bc00a21303f583574ff8cf2d3e85edccb675f80
+MISC metadata.xml 380 SHA256 f8d74eb3bd60d1dbd27a33d4c8bd96efe9989415e9cac5738ade648000a2a062 SHA512 a449e49c644a6b4dd3758dd3f495a4fe4e7b0fba7c4e21250f13868b758a9642e8062adf1a29ac54fcf8211d38071724c489e25ac7078f4100f31e9adb0d98d1 WHIRLPOOL f410310be22c1e84a80fedfe5361010293753fdaa0a41967b1e8f541dbd878c5121873a1f858f7b84af34e97954f98909ddce08149667f59398a5146f74e4a42
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/Manifest b/app-crypt/pkcs11-dump/Manifest
new file mode 100644
index 000000000000..6c95f6d00155
--- /dev/null
+++ b/app-crypt/pkcs11-dump/Manifest
@@ -0,0 +1,5 @@
+DIST pkcs11-dump-0.3.4.tar.bz2 255715 SHA256 3c19d412350109423b12bfde196b5bd51e9b23552406bc82735c5ca5e7bcdda8 SHA512 b38dbe8d7b04d7227592c90f6de815da7a030014df2f5f18d8c81587a742c587424a0eea3a1c8ec6e5c8c8f6dccc144130b91c57bef3d5882ee161629a97781b WHIRLPOOL 17f242119b9fba53a96f7e8a610175c4c22a999eebc9750a6160665f684a0ac0a4c8bd917dcfc4d03efc1ba43d08a6fe11eb8b7de611f0df4c64235754b0828b
+EBUILD pkcs11-dump-0.3.4.ebuild 483 SHA256 fd4fac62ff2ec1751538e97ce4bfd17757dd784ff3af1ffb8363b08e86c64bd1 SHA512 e424bdb77f9353b62bd58a3e6271f6945c34ebca82d3ffe9c9c3b3bc5242daa54f1b7d2acfeea55d760b71f374a4fa16d008250e030066ad7acc0978818f1054 WHIRLPOOL c11f36a72c9802d03db70b40cee856a0a1b159dc4168b661d175af311951e28e7a031f1dc36b5035a3eb52c3852337c9487be7465e39057aeebfcca87cff34ca
+MISC ChangeLog 3027 SHA256 1042dd2bb53bf54d06846557a06a839c1df423d15d6052b8ce4f6c99c7fee1f2 SHA512 e297319c739c7e6e1eaae9686e3d724e325f71242016bee4b143cac1ae8b7cfe356daa66dbb4175c5b6a1e4a6da9f16b586b434fddfd3ed8d3f933d59181ee02 WHIRLPOOL 24ad7ca35793e2604c3d108acb2f018ca084ef5b7008b193d15ef53100dbac6d2794ddfaeb3f349d6d550d84ea0951923ddeebe0839e43192440621979d40ae6
+MISC ChangeLog-2015 522 SHA256 f7752d3758f3ed9a59934831b51617f7d18899d665acc78fce510e29f4faa479 SHA512 bd46f17bc32af0b17a01f6f2a9d150c8480fbc38fe98b11027508c98f411cdc92df9d0e90972d2f4f0f978e239af7f0f841a5ce22950b1e477e436d9682e5c0d WHIRLPOOL 7697fdd059286531b505b8c784a565bbd1ce38af107681a290c48063e2f81c641dc58ca1a9a545bd439af542def06096a19792416b6f0924f4b8a9761718cb38
+MISC metadata.xml 380 SHA256 6e5d86b6e0df1b2ba2d67cdfb58a0ad50b9844caadd66c09d12e98630ac418a6 SHA512 158f5682664a88638cef415bb42b780b27142b9ef9f3ce182b83330bfa922dda8935d137e6f50f8150905b6ecf66103cfde7be3cfff0f111766e55e8ad5830c6 WHIRLPOOL 6fd5d045033fdbb74ea08e78b736a48a080e5a99ee54982a401e43acee68efe11a3fbd1c60aa08decbf731c4ae5b0ca320b39e803f9c1b87feec4cddba9de562
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/Manifest b/app-crypt/qca/Manifest
new file mode 100644
index 000000000000..37222cfd8065
--- /dev/null
+++ b/app-crypt/qca/Manifest
@@ -0,0 +1,7 @@
+AUX qca-2.1.3-c++11.patch 3555 SHA256 7c0b358d3617a1c78f406efbd1eb21ab617d3a73af733acd33dcee8368f0e9d2 SHA512 605a602d184c86426d6d875954ad2cb3bee19252ce56e6581df7574a3e324f97ccfcb919fef32f6ff8a393683b8375d97586ed886ae01d87fbe015f2f83f0e3b WHIRLPOOL be6dd35df3fc651da7670a7d34b005f001df08d5c1516b8a41a95ab95b848112fb72e67b95ae6c47d6386303a428a94cbba210bc6a1ad8d99f2d8e8ba19c5011
+AUX qca-disable-pgp-test.patch 446 SHA256 e8714b0f12a39bbc17c706b098e4d33a5cbfb6a84b9c25d7dc8bf7ac7cfdff92 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104 WHIRLPOOL 5c31bbfe3f7e680be7314edc7c9d153d27fd2bbbaa0ddc97c9206a9c49e0d5b0738e78a4d8dc424c3910ce1b02e4657aa08643fc1a56836b33e9b475b85f3501
+DIST qca-2.1.3.tar.xz 686340 SHA256 003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a WHIRLPOOL bd004ad0e754850e4349aef72a7bc2449a95850b86bb383d9a60fb7d7c69c7e5e2dcc8e1cc945b647623678484f0bd15c5e125e7e278c2a0964b28b48ee8c8f3
+EBUILD qca-2.1.3-r1.ebuild 2718 SHA256 d708b621bc174ac68b032b15edd626f6919175a1d9f4520fbed7159e3fae6f91 SHA512 208aedcd1a70d93f203be5d587777d5ea3ca3931122a2e8e9010f741d942ab99522bb0e0c247977ae983384cc5d964e5fe7d173669e39cb865190661808dc54b WHIRLPOOL d7988dcddc4abf095a31926ebc36b1dbf7f5b015c04e16e962356bbccc4f00e29545ebc1a59adb30c9afdc12233633113db46d8cc83dbb5aa57f61ea9dd39131
+MISC ChangeLog 5471 SHA256 9e5237e4508353cab9326e2da9fd2ea117038edf569b1ff2fd6a4a65ace87ff0 SHA512 9a5f41e719633f600dd29396777f7f688477980515d36e9e6afbeb41cfa9248b771f180ad593bf0372e2a62e762b4072852252986417d40c0001c454ab847839 WHIRLPOOL a96eb863b2a52bdbabd609ef646af7f3961a37594c09ce3c4f585c585b6c3da60a9f39c04cd02937f7831e3e663211b0c6e4b52caf142d12533f6553158d7150
+MISC ChangeLog-2015 14599 SHA256 0e8754a20b2d9e43aad04fc4af6c19fa6675a59f9c010fb41097a96e9df022b0 SHA512 294f3bf5f9f281074bca75eed0f8007c743d50e189259726eaee465745826225a1a480db83be04a21432c7aa25e05f274833ba37ee75e0a14e506abacb4a6958 WHIRLPOOL 0ed91f436e405693395ed82b1b09bcd472813feebfe7859ccd2c06d8d5b15299d18913595b5922fa221c0c89cbd676708ae0d7a5554aa49add3ee274b246b56e
+MISC metadata.xml 842 SHA256 29f18e8c6620f0bd47dc5e9039fd65c1d3022f428de7320fe786027370fd7d1c SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622 WHIRLPOOL 1491dfc24250dfac1f1d92bf89cd4e60774dd21731eee0e43dc6232a6562af36d897e6282cdd3b4abd68b3b595cf5458cdac7dc8bf809d12bfa0ec1a63a0edd5
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-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-r1.ebuild b/app-crypt/qca/qca-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..1bdc07abea39
--- /dev/null
+++ b/app-crypt/qca/qca-2.1.3-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multibuild 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="alpha amd64 ~arm ~arm64 hppa ~ia64 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 +qt4 qt5 sasl softstore +ssl test"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+	!app-crypt/qca-cyrus-sasl
+	!app-crypt/qca-gnupg
+	!app-crypt/qca-logger
+	!app-crypt/qca-ossl
+	!app-crypt/qca-pkcs11
+	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
+	)
+	qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtnetwork:5
+	)
+	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? (
+		qt4? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+
+DOCS=( README TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-pgp-test.patch"
+	"${FILESDIR}/${P}-c++11.patch"
+)
+
+qca_plugin_use() {
+	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
+			-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_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)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+			mycmakeargs+=(-DQT4_BUILD=ON)
+		fi
+
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+	mytest() {
+		local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+		cmake-utils_src_test
+	}
+
+	multibuild_foreach_variant mytest
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+
+	if use doc; then
+		pushd "${BUILD_DIR}" >/dev/null || die
+		doxygen Doxyfile.in || die
+		dodoc -r apidocs/html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-crypt/quickcrypt/Manifest b/app-crypt/quickcrypt/Manifest
new file mode 100644
index 000000000000..1d14054ff26e
--- /dev/null
+++ b/app-crypt/quickcrypt/Manifest
@@ -0,0 +1,5 @@
+DIST quickcrypt_0.9.2b.tar.gz 2927 SHA256 c1078bab6f6f3e6258eb01858e2623b244a3b8a87adb3d159e17c908f3d1bca0 SHA512 7b0efbe5aaf9f878233885470ed053124dd3c14fe2630902517388f3ecefda1bc89f3ec9a7edd6d7582f4108bfebf421d593f4b37ed66a7692e955c65003523e WHIRLPOOL 13f6b899b84a74c3a1c83014fdff5026bd5066da0fdeaf4604438f3eb9ef1a39c1c3870c1c5b7bcea7183c08ead2ec52f2b1d2affa6a64894c8b8d47c1f33de2
+EBUILD quickcrypt-0.9.2b-r1.ebuild 570 SHA256 fc2a64c564c9b0a9caf7adc992f00e46f2edcd89fec940218648ac9b5c2b58c0 SHA512 7b715127b94b8c21823e820dd06a2e917b7efa67802bf8217bda2cfa493c6a4303e8fc0ffe98a854e628f7ea2f28a3ba5f2c6ef09807cacfc0a8a23595d1730d WHIRLPOOL f90318668a0fb447b47b7ddd182ab33dcf8bd2655e0986a5b9a2e344c38f6e27c34360e18aaa6ece1be7803e4a820153c8201f01127555bce599f57daa69f662
+MISC ChangeLog 2439 SHA256 e09050321fb90ae630939b53fa73ae2872ae6e11a41a67435a8ab5d76ba00d08 SHA512 d67dccd9219a5c9497d3ce4d2a393dd94939404d761b7f27337a4962dffa6eebfb8776abbd566a33d6e286ffe7bb2013402e8490c8a90dd0ef7182f5a9f1d563 WHIRLPOOL a385f8b90f1ba7da1aa48f9d68eb6dd8164edf2e1d474c05cfa61479b5d9a1a58b31bcd56772586346f24d9212009cbd81acec41d54793f8df72dc46ecee7b20
+MISC ChangeLog-2015 1654 SHA256 b58486b5041161affb2448e8986c4525862fe9a0c9cd236915622545737c8a5d SHA512 33761da33ecf0985cd53c830b382d29602114b9657b71a70293823815f0dd546499b9fc48489879915f9151847ed5d7c2bf1398869ef9019ed45b52acd8edc30 WHIRLPOOL fce1a55347ee15d751165f2d5ccfb96416e9ceb307fc8259ea9e72c2cc917af95dd5b396be237cc780fde47cd2a5a3af382ead331f8785405d4dca522e2b92b0
+MISC metadata.xml 246 SHA256 97a4242ddb39ec753b766e7bd7b94f9486e997be8bdcf8b86b24e2ed72417f19 SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015 WHIRLPOOL 1c881073f2000444080ab705b5ea51ddb4e3f62c4e952a69415e259d9fd367192e9687023e96233b3d3686528a4f8b63dd99000d11486e7a80922c93f0b1d7be
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/Manifest b/app-crypt/rainbowcrack/Manifest
new file mode 100644
index 000000000000..ecf768d62422
--- /dev/null
+++ b/app-crypt/rainbowcrack/Manifest
@@ -0,0 +1,6 @@
+DIST rainbowcrack-1.6.1-linux32.zip 138833 SHA256 82783f99a551209f869737369e5067a4e7a01681cec5822d3f7896cea11cb41f SHA512 0fc163c4a8a875149b479d74fbabbfbb5247b9e621e5362a27a8fb6d5dd64263ce89213b5f5a578ce09018cb2c93f2af51eae954e19fd448c490bcd0524612dd WHIRLPOOL d892cbe140f7d9fb8d9957d0f92748b6c8d7df75a8204396f17adc32922bd4bdcbf075444fefde27cac8e34a8ec5e55a1afe942fd3925032d1289bb63d5d2723
+DIST rainbowcrack-1.6.1-linux64.zip 134268 SHA256 df55af9e48cc72bf4214546a6645ce79c850ee3c149161cfe2141de4edc56cd3 SHA512 6fd5a0356b76ed5e8062888aeb26755588d11aa5dab7fbb54ea92dbeac02e606b082e00b93a44203c158ee620d61c0f9051ecf62b60d8a83c4fca852af22144d WHIRLPOOL 4dd3bd42ab438f01fd92bf2e7b6f81d48e97ec13c1c2e4066838f94312d6f57aec94b2961eceaeda399a71519dcfa7c3984562f3efb3dfcad99a79d560814939
+EBUILD rainbowcrack-1.6.1.ebuild 992 SHA256 e245860ee45ce65a321280002f392e6e0e55196c691978e1ff25f9641a9740ca SHA512 0844ee7770d748e82d8addae6fa0129f4f56c0ca9d815f442c91db4299161246d284682c966b756c781558a6ce3f29a32c400365021a362c62daf54a066ee08c WHIRLPOOL 85878703259a4e38cc60d2823b6e9067b6944eab8226273612e9e66153ee6a1391adb97fbc429f2e9f444cb78ad0ccaae29bccf6a0960d3593e6794be41d4d23
+MISC ChangeLog 2867 SHA256 fc4609b4235462be9cdb43e8f7caff8e67f5fafeff058095c3dcfed0c09cf924 SHA512 5cd1cad84b8362cfd1e8f089461e67f1046fd80d32f3c6863ea2799b5815dfda527978d8f68ef9f5114e5259c42592c53c8f83a3f47798b6ad54b8a7d550c298 WHIRLPOOL 1c7a4d7791d9c7066a8351832bd4c4a818854c540b2d2df72355ef7c26ce37d43959de1a8b5395897f5efa5cc88506f2bdd7e18c8d8fc722f7fa3288ce8d1199
+MISC ChangeLog-2015 4128 SHA256 f5cd8adee56a20a11d5d700f0b617421b4684accce39a99fd1996263e95db889 SHA512 e0ce592b0dfd5a71bc4c737721e2be3352eae043dc63f82aa99111eea764c16d003b9ed7ed7fb8ee9e7499958acd4b542fc142035557c775af07374520481a8b WHIRLPOOL 46400dd75938ace42fddc17dfbe6c6c877af6a855f844e97faeb65653eb09657f7af63ae2def9922e823c06ed87928860fc7920ebdaad674b07a52ef949dc149
+MISC metadata.xml 968 SHA256 6da687877822fdb4ccf1c78e6a4da889cafe7f1e2ef89c86e0870ca87105caf4 SHA512 14c3802b0b297cf6036c616b4bf83f449c5301868b4ca306d7d3579aeb87d3e94656c5ff4588742afee981c334618b1d11464a87041e2db6315deddccf2fa174 WHIRLPOOL 75c16df7c0646379715019f6c30e8afb15765b37d5eb7f39ac1a277f5bb0b3e76277208300ba821e5cf68eb28fb4d7df9e828e020798faaa6ab605ca3a199547
diff --git a/app-crypt/rainbowcrack/metadata.xml b/app-crypt/rainbowcrack/metadata.xml
new file mode 100644
index 000000000000..861e967436b6
--- /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/Manifest b/app-crypt/rhash/Manifest
new file mode 100644
index 000000000000..c93831059f6b
--- /dev/null
+++ b/app-crypt/rhash/Manifest
@@ -0,0 +1,6 @@
+DIST rhash-1.3.4-src.tar.gz 249357 SHA256 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 SHA512 a78be309011798d5e55023eb93f898c10254a42270288fa5ec68ad446b5f3d001e8c6f893683e5171e3858c86d45ce2ce16eefde1173209e1925420c27a7ff7a WHIRLPOOL 5883dcbf0c2bf51036434d1906b85b615eae65ef2729a68d7ac637e2bea3c494cd3ee7fa9a60d3c4f3241bc4fd5c62c8f7e058c0e53649d50dade241e06dda2e
+DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
+EBUILD rhash-1.3.4.ebuild 2642 SHA256 e9823e366370edf45b8270b31aec98ad33c175bc25e2d52057eb4a1b9c71fdeb SHA512 a869ce272ad55fc586fcd7ec563e9856ff0a87757914756e1ba46fd3da34ba3a467d5e0454e8d530c9c72975bd5e06f5b42f072ba8301546d01226753dd1d52a WHIRLPOOL 4bde3bb3e0a8a2f815e166ff91dd606434d2026024c9d889479df2982cadd17b45196f05906570926123e65be153a8f1cfd74ab8243df1e0294c49c8c814b66f
+EBUILD rhash-1.3.5.ebuild 2599 SHA256 157893cff14c5913aed556d61c0942da98ec907cd7ecac72ec75f70df740a5d7 SHA512 7058828c5fccf3a59fd708b1513be35332bed94e93326a7a20961a8ba71dda32265a172a43494ac9326b14096edcd6c77c9ada8320bbabef952cd94a99a4594a WHIRLPOOL 92e1922aaf31641c8bb0c17a05f3b3ef1ad3b7d9b40d096b4126f18d00a0b8eb0c7e4f628c0b2a41625c85df11eed14f698c954c25d382e3aafc113beca4801f
+MISC ChangeLog 1898 SHA256 42a9aa251be9c53c86632be46f1a40bb42fccdc94077e44e67f137f16898c43c SHA512 3c7c8dc6b1497db03e2e09c856cd0cde5947e94bbaa1116d088148d01901459d61b4ec50579dd165fd6a22edb2e28f5ca05b62413a0baeea5b47580b89d2e8f6 WHIRLPOOL fc96a4e7ad467ac1a07d19736becfe148f718979e14ba6fee1d037d6901c0601a60444de8c5f232d4870c91c91e54e9cd8c4fd34c6768209977896a34599f2a9
+MISC metadata.xml 843 SHA256 89065f6503470d30fefb7f8c0edb4d8acc8fb486e2f9c4f0e68756ae073bbf7e SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f WHIRLPOOL b56ecfad838655183ee34037e82528f2a839309a03a26726fbfb6b4868813b9785db132b5f54acca7e400692dd27afff7733518353ada932cb3efd27322cd1a5
diff --git a/app-crypt/rhash/metadata.xml b/app-crypt/rhash/metadata.xml
new file mode 100644
index 000000000000..7852b7af67d7
--- /dev/null
+++ b/app-crypt/rhash/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>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>
+	<use>
+		<flag name='openssl'>Add support for hashes from dev-libs/openssl</flag>
+	</use>
+	<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.4.ebuild b/app-crypt/rhash/rhash-1.3.4.ebuild
new file mode 100644
index 000000000000..4a7b49a21d52
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.3.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 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-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls openssl static-libs"
+
+RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# Exit on test failure or src_test will always succeed.
+	sed -i "s/return 1/exit 1/g" tests/test_rhash.sh || die
+
+	# Install /etc stuff inside the Prefix
+	sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die
+
+	if [[ ${CHOST} == *-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 [[ ${CHOST} == *-solaris* ]] ; 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 openssl && echo -DOPENSSL_RUNTIME -rdynamic)
+	)
+
+	local ADDLDFLAGS=(
+		$(use openssl && echo -ldl)
+	)
+
+	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \
+		&& 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.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
new file mode 100644
index 000000000000..5e3f45f60289
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 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-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls openssl static-libs"
+
+RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/RHash-${PV}"
+
+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 openssl && echo -DOPENSSL_RUNTIME -rdynamic)
+	)
+
+	local ADDLDFLAGS=(
+		$(use openssl && 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/rotix/Manifest b/app-crypt/rotix/Manifest
new file mode 100644
index 000000000000..8ae8c4a840fc
--- /dev/null
+++ b/app-crypt/rotix/Manifest
@@ -0,0 +1,8 @@
+AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 SHA256 f0412f5e697571bfd6a6a42f3415018c41175ae03b73ae1ab6cd93fb9b7b793f SHA512 1b1fab8bdcfac682d0927075a0614ae888a1b23382ce8484b2ab9eac316f46a907bbd872615553201c5ccbf1d8f677491612956075bffacced0d408defad9e07 WHIRLPOOL 77342c3343918897739756a460b527d6aa3260d8c218dc80c8ee1da6262f49360c66e4ad76193851bab6bb5e0c611e86ba32ba0b5642cb7d954f6736d8c33add
+AUX rotix-0.83-interix.patch 252 SHA256 4f9589c0816417a1f1389a3b70e5dc04dc8a4348ba131b3dbdf640c4c2733089 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c WHIRLPOOL 99db579f6c5835f917f5b94b50b9bfbaeedb550e5f3e147629a1e44174e2a722a23b814e60b42a02f46a9ce7d0e95c3c6b361173597f0bb1dc1ca068fc43eefa
+AUX rotix-0.83-locale.diff 256 SHA256 230fbef9431fa6019e6a465540dcd5447a0e8746db333ed80140ebf0577db695 SHA512 7b8c82bac78c48f5d43c0246c41e7a7910f0119cc7b56500789d722d87f00e9d2356150063e07ae281435d5af60f9e15956c5bc0b236ea5f225435886117c4b0 WHIRLPOOL e42edd4c0d5569fa324c740ddd802a0d30b02ad4359c7efce588241c914344497d4a813e520038578b175a4a73eb3f3f696c35241fdbc04267ccc1fd320d3cb2
+DIST rotix-0.83.tar.bz2 14685 SHA256 f25eae09e1c6eb95f44aec7a2aeaf9b4822da0304909e70149fda4603f1368bd SHA512 1f318e15bd51cc197d9d9fc36e37b29c18fe7a8e8c40654c69ccf97d32b896afa7cc517c562750f6c1262baddbb451bd8a29ada994176e442630d8ed56ccf572 WHIRLPOOL f376af910e0537e3101dcef1b8e224dd7064ab6aaeb788aa4fd76e1f715a3f5ed00a310605aff8021918fb99b5033af3a39a20b6c291b6d59d7f094d43a60ee8
+EBUILD rotix-0.83.ebuild 796 SHA256 d5afcb0e18ffdae1a287f7d54579337a4fd6bf4854859a3c75c65dd8590ee0fe SHA512 e0aed70e10de163f8659e8fede3da520621dd355fbe7efcf1fb50f4b294926a498e58b6bde604106cbafaaa352c5d011227e128d29fedd2f6452b9541fd4db1d WHIRLPOOL 984335e61c20fdd357f07d2ba8b0c3b993b17fa0d4d08aab194af68d949d2780efb885761bc01e05e4977ad71c112d54c10ce595e078473cd1ca5ac5ee88dea2
+MISC ChangeLog 2772 SHA256 488228d62de52cebb7ecf50660b900aa162c0b171d2e50b810b0ff4a26735965 SHA512 ad018dbb56d4acb5efa77f52fda5d588cb56ad315a4dd57d4449159e5ceca8e6a7c6920c4ac6828c6e4c6a018d84109d541440c7bed348dabe13c83ced179b6e WHIRLPOOL 095bc344f4905e6ee13e100e84d3c717eea595fb1ffca8c04c404b892f016a49142dd3b99f8d6125dffae5d3df607bace3f24ceec677276389b63b0fb0ec2374
+MISC ChangeLog-2015 2016 SHA256 ef1685adb9becb88eef2e863964c94480c049827b0dec1bb9ffdcf592105ab57 SHA512 56026e1d090c8629c2ee7538270ec4485f88b8d14546f07522b98844f88b7d8382e31b94b1625b2e3a2602a62aafd3e437bf73539dc59699304f9cdfafd50cde WHIRLPOOL 4b2020c33340e62e99e1e51e6bf96620f7a9e5669b5caa8bd36afeaf9f3c5bd7e93a2ecd7c1e9bf37e4252408fe3cabe1aafdafd1dc9b0b8b3043abf65be51d1
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/sbsigntool/Manifest b/app-crypt/sbsigntool/Manifest
new file mode 100644
index 000000000000..18bf04355f26
--- /dev/null
+++ b/app-crypt/sbsigntool/Manifest
@@ -0,0 +1,10 @@
+AUX 0002-image.c-clear-image-variable.patch 822 SHA256 7877d69c0a6d014f43e1dc922db3fb503c1c3176dd2665a96f85ddfd73ed7e12 SHA512 004ba118cbe8fe5cc291888966e5994373c0b9d8149bc5c652a72971138fab5e64d721061c69e8b864d6ca5cdb4ffa193520156941b6bd9c998b256f8d72697b WHIRLPOOL 3872d97cde83e9423622f348dc50eb414f8512f95673cbf7e4b908f699455003d57711bda6bd0893f3a21b876a66ec480416bed5df52e5ecb33c00b21cbbb6c9
+AUX 0003-Fix-for-multi-sign.patch 1452 SHA256 803f97f6c01a573367371f9ffd4c53aab5916ea3218fdc515429ca559f5dad31 SHA512 2aba55a116536e7f41e4aac2fd33eeb92cf89b14bcdd8b93b6e9dc9bdaf2f0162134e56f7d365640445bf801ad8590f6d49f14cdf80b791324647067d52ae435 WHIRLPOOL a83c8dde50cf82559408be58482f73aa1c3460a63424578decfc36033b5c368f8ad219b1412a7eb0a478e91b8654e7a7392dc886a496f9efea6f12dcd2f0e379
+DIST sbsigntool-0.8-ccan.tar.gz 113537 SHA256 8693929fff1138ed39d5387774da05355162f7275f5495638b55bfd258200e0b SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09 WHIRLPOOL 4b577b5d959af7bc6a4bd29d877a293007286de56cd7a88ad144b23eb7d91dafe32ab095f4eede82fdbfd689f5df07d15232bdec186e0b38c580a496b76a27ae
+DIST sbsigntool-0.8.tar.gz 55537 SHA256 67a5df2818a424d0f76e8701562d9239fad88769421d8d2df733e5a98f119812 SHA512 ffc2661135dcdbdd218640f0a0657127c5519ade7ddaaa894898e382b4898829e5b877be51fce48bddd186667bf533f779cd5a323c79aad8b0e63b74f7a2c128 WHIRLPOOL 72693ff682cc2bcde9c166edc2532755da78c626504a1f830d1e1b04d855ee8c571e43110d6a30a763c4342de7f86603724636d1f38b2b91ea74e64555203872
+DIST sbsigntool_0.6.orig.tar.gz 212375 SHA256 84fb0c8f6fb1e79aa418a4f70a3139b38d5630043b28291c875f383e9b4294b8 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c WHIRLPOOL 3b86b9861f5e26586e8a9eb9bbf48adf1a12714b294f0acd605d53e37c27192006c6ecc81d31bf4f200f8e88508f38a52ef93e9e01e301c4245a11894227cecc
+EBUILD sbsigntool-0.6-r1.ebuild 1122 SHA256 828ba46bc8135784118229d194bc2dcbee47f552890f3d96443452187ea2064d SHA512 3805523425a7a4b85094c7cc1a2db43b7a8a8b15ed63f587cb5d512d76774eb77a683500f33ccb69ee2c1e55a71587b2111c6fa1cd54820137da442158a9a28d WHIRLPOOL 64a4a4d9ed24350d450154fab8a8cf024d51075f70081bc54e11fcbce3fe82ecbffa2cbf03e985cb29fa84693dfc6bd35ecb93f7a8933326bba307a0478e6c0e
+EBUILD sbsigntool-0.8.ebuild 1242 SHA256 451b8542b232db7eedbe1b90d2b954a7bf77db4cf127a3f43daf535e2d206553 SHA512 bfa6d73bcf491ae0acc533d27721a18ad30b022afc26cd6f0e8cd4ade4828617ee7ef031e4782bb867b50d7652c3ccb9609b43cf4d871ffa69eb29b77bb9df34 WHIRLPOOL ffed1da8b74486ee1180915d5f92b722f865bd1b091dbf5ddc548dd8d3fa14d8b5e2ed729ebab80e27cc7e795ffd7b000e3679c4aab9b97f1d7e06d9b76d68f8
+MISC ChangeLog 3103 SHA256 4afbf378d12a8bb7ac37eef0c7ec1e7eedbc53da4c83716b362b3a059ff042d3 SHA512 f68c0f847f14bfbb5f26ee467eb9f3a461ecebd96f6bb8b38703b511938c598ee74dfc9214f9a426a41d7f477083c421cc42e1c758633146f6130df29b36c127 WHIRLPOOL c3b24c5cfa5477fe5663e659b13b80672121c402d8f42e91c22372f16e04a669f16068ef75bf6182e14cda6944841a640380f18677bc84cd06ecef3b97ed6b23
+MISC ChangeLog-2015 1396 SHA256 66a4ce4ab77613664c5ba27eb3d38bf068b5dc27d87bb9f79df6db6749ddf950 SHA512 fe0e3814d2272263f40ea3b78739000a7a7b6d16cfcb34d432d7580798496e84fe3d053c79d014f659df28de2772fcc414d4f519500b0b23031ad636212d6352 WHIRLPOOL add9bd9fa4567ee6677bba710567b9cec6caa23f875bdab0ae8828dbeaf8b490b3c4a8ddcf94723776e9163a5ed80b6d9b4e2007fc2cbd0b881295d64f39abf2
+MISC metadata.xml 463 SHA256 f0fbd55749d24666f4dbf0a6b01525a83369d032bd31734ffaf797fe8259418d SHA512 062380e68865333256499a2fde22991f632197900bc278f34ebd3b13b050f9f21143965257cd2013d6e811667178c6937e9567c2be287a755d88921714a08547 WHIRLPOOL ac7bc56f91ab4f8106fc9aa1de9df5889e19f88e75586f83b69b26783094989a7667bcee6da6f0ead175bee079389f4ca9e5cc9c10fa27c38e59e8b947f522a0
diff --git a/app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch b/app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch
new file mode 100644
index 000000000000..dfe183e66cd2
--- /dev/null
+++ b/app-crypt/sbsigntool/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/sbsigntool/files/0003-Fix-for-multi-sign.patch b/app-crypt/sbsigntool/files/0003-Fix-for-multi-sign.patch
new file mode 100644
index 000000000000..f42c69616d13
--- /dev/null
+++ b/app-crypt/sbsigntool/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/sbsigntool/metadata.xml b/app-crypt/sbsigntool/metadata.xml
new file mode 100644
index 000000000000..6234418898f3
--- /dev/null
+++ b/app-crypt/sbsigntool/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>vapier@gentoo.org</email>
+		<description>do whatever</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<description>yell at me if it breaks</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">ubuntu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild b/app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild
new file mode 100644
index 000000000000..60b0606bfcd4
--- /dev/null
+++ b/app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 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
+	sys-libs/binutils-libs
+	virtual/pkgconfig"
+
+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/sbsigntool/sbsigntool-0.8.ebuild b/app-crypt/sbsigntool/sbsigntool-0.8.ebuild
new file mode 100644
index 000000000000..853bb5244541
--- /dev/null
+++ b/app-crypt/sbsigntool/sbsigntool-0.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs autotools-utils
+
+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://dev.gentoo.org/~tamiko/distfiles/${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-ccan.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
+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
+	sys-libs/binutils-libs
+	virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	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
+
+	AUTOTOOLS_IN_SOURCE_BUILD=1
+	AUTOTOOLS_AUTORECONF=true
+	autotools-utils_src_prepare
+}
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
new file mode 100644
index 000000000000..20794e6915cb
--- /dev/null
+++ b/app-crypt/scrypt/Manifest
@@ -0,0 +1,5 @@
+DIST scrypt-1.2.0.tgz 107796 SHA256 1754bc89405277c8ac14220377a4c240ddc34b1ce70882aa92cd01bfdc8569d4 SHA512 81ac8d82c38dc73981fa5bd4c011142c7ccef962a650ed849317a49e8aa66c26f4557dde326202792500a996178784d5eb0d28f909ab630cb05c86fdebfaae0d WHIRLPOOL ae07467b47f7a39dd2a28ae41de4dfc86d7c767a71e29c1ec0db5af60e1bd5897126abd97b8de38f7376c75338564273f98718f167aa0458508ac496b29f2776
+EBUILD scrypt-1.2.0.ebuild 370 SHA256 16b59519db49cad6e2db2f0a74aa1224bd49b79127d5c7ddb5fac141c3854734 SHA512 c58d42b7f9351f8044849aa5af60f8f09e0bb43caf48f69b2850180470d88bf1301a6c22d2f5ce1e0787046a295ad3be5d15deea6fc67c7e9b4f802eab4a4cd2 WHIRLPOOL aaaa448b43289a21e76246519e348c1f1166244ce747030033cb25b652a6ea13f763e31eaba8c19c2674afcc66d401f877237a9e28f546188addccaa1bd3e16d
+MISC ChangeLog 2657 SHA256 ff6c6c7436d47eeb52991ba38c1693a36ed17b811e6b15c1c48337155eabe933 SHA512 78895d23ac192adad82f4cfc7673ae98267b8d5d29d1f4f7c7fb5770e97cd1720bad09fa62a9f97ec93f451a4cf0ab15b844de39fbcfee52aed4163cb417b8e3 WHIRLPOOL 27a9bab500154f518127e3824e376bdeb6a41d5d9786bc1fd7768a034c2578a29a66e05dfba37dbbaba77f28f1af58911714f7c8045005f056ef5fc761911650
+MISC ChangeLog-2015 650 SHA256 eaf8906fd9448147f9da7397ff3b61ae362fbcfba01399f4b27db1a72dcf23c2 SHA512 f11880a552afccf29e17c1bff43b91707e800c89542697f8c866c004551307dfb7afc38594b0ce548ec7fb2d57090dd4f35ad7ff6a24b6a430daf66c3c03bbfb WHIRLPOOL 5a4bb1eafc5490f0d75ab71d1cbc77c60fb9090ce8cb9a44e29e0993df33d85caeef80c6ee85775f682cd3ebb834cfab20e953b40764af7967e21f492414579e
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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/Manifest b/app-crypt/scute/Manifest
new file mode 100644
index 000000000000..dbb19e1b7f08
--- /dev/null
+++ b/app-crypt/scute/Manifest
@@ -0,0 +1,9 @@
+AUX scute-1.2.0-noversion.patch 597 SHA256 3a0047c7b5fab182bb1eca460671e4209c89dd84418f1252a9ece7db9b245f3c SHA512 22c167ffe951c58bf53a7d7badc71bbb1daa6995fda60efd35f1d6f85d0be79970f062c2d467a5997a97c957df5fc57f6d5beb827b8e4c5c30edaaddd9299ebe WHIRLPOOL c51ab0a355bda1c37cf100767559120bb7de56cb61e6505a9578f7f060b5a827c5f67b6fe110dc1cb35a6c649f60bf24716d58ad9e56fc986f76173f1ce0445e
+AUX scute-1.4.0-tests.patch 472 SHA256 82e01d265fae09d8693b78bca7dc66540e6c0b6e67b6f45b4789d2a342bd29ad SHA512 8b2a161a3067bd6da284df3372aa0a0d0f92689bfc1ad136985e0b5150f6441e2458e5f5579495e64cc1e54ca1c34459358195add7fd66aaabb0a3787aeb7818 WHIRLPOOL dae6bb4a8650c19007d41216239da910b81cd6cd580736dc0b88c244712ea3549ed9abca8d6728363e7fc013d759bc88657da35890afb576f6c327ccbaea735a
+DIST scute-1.4.0.tar.bz2 772986 SHA256 bd698a853375324c4ff590899c1994be83d8d0a1400fcaf489529646965fb745 SHA512 7961679ce3195aeb3ed1508557c767b59970cd221b569c0fa00cd419e4017b84a851f1fbe46323a4ffb6256c6b91bb037f93edb4f4f7f9f6e0add672b9cc2015 WHIRLPOOL 6e4bc0852d389ac2103edb5bb0c0c260642dcc596862fec55db3ffd51a5fc6cd0752a81d864b36db4544c5b1efbf944f76672806bcaa8305ccf07bb9f817459e
+DIST scute-1.5.0.tar.bz2 991598 SHA256 6199d28d8ce17f979f67059b461ab55a2276fc390eaa45e5ce6ff615bf81ab96 SHA512 ad1dbdba5681a92696c851eca7e2bfb61f7bf84f5e02728efc1f72cd25c4ee2dc18fe975e2903d1a85c635d16be1e2085ff2305827b48d80e18c9354e555b39a WHIRLPOOL 008d0f6d306898fe64ae7c9a689178f246b3380f07f6d1e1b2f423552eff74d6133cbe71a5337ec90cacd0c91525219d1ba1d2fb20c80891b921b1de5b06fe3e
+EBUILD scute-1.4.0.ebuild 1217 SHA256 c84ef3ef44757be116cb8e6cf702d5b236303f307a82d94c3a656a1201e385a3 SHA512 428315b9f117a07e058662c286aa3a5f95a142ffc3973b43567910af6bbf8b89bc4bf211e7adc72f900bd9ce5d730c0676ae45f947be726a967b695c1c78a5fd WHIRLPOOL 4b53bac41b775f54f771d16b4c94c2801a88ac5774d9f9ad7f7af7fb930a0195403d40c6d4672425dd1141bf4619252bc581bf773bb7f79e8bcdb198d4f47bb2
+EBUILD scute-1.5.0.ebuild 919 SHA256 a3e6486b34ec7857afd1d46849a71732588cc1f5bd4326f0d92d7f625adecfff SHA512 2a3ada5f2e21995fcd4920b460c578d37421c3916193b4a499c95c51aec5984fd57579300ea5dddac299e6c740501ab26a00aa3969abdf7b4149443100c86940 WHIRLPOOL a7efcf3e560b0d4b38f84a69d16b89fb5c8acd0d131ae176da46bb0c904484debf4b450b31d2d1d2e485f989b9d190a2ec9fb4f4c33fec3d9953ec146fdaff72
+MISC ChangeLog 2612 SHA256 9b1d236052a97b7acee6bb680e1bb696427ea9ff1b6a6a5e9118b52136408b4c SHA512 0b22bacbeff0ba34586edbe2dc2f05e47a669976ac6fb8127cedb47ecfbc589bf0f8b98fe4384b55ecec629fd9306c2944579067efbfb1adfd1027863ae3be36 WHIRLPOOL 33138d71aa2b5e8ce1b0701755b3d4a575b109c17dd47a88523cbd6e66c8d9d007fcb4e052396a24d2d7e021b6544b401b29cc376dd87ac438bedbcc1cc9c394
+MISC ChangeLog-2015 807 SHA256 019f4161d0fbdb6c11b24db5c0e07a1f4e07d823b7a5e1f6b4e767cca41e7105 SHA512 1a1c95077b8dbb9adbf66037cb5fd1392f9a8b9daa62ea602680ad239d8f34eb671a1e5320808e3ca4dbdc1ea2e39e6c3196ee3a3dea45379d0cdbe41d8bedc3 WHIRLPOOL 6393a2151aebd652c448ae0f4d6609f5632d6ab8938cb400fc8fb1a908e57e5b8064bdbbae6a77612e08ebc228869bebdf81799b564507ddcea045ab37a6d092
+MISC metadata.xml 1080 SHA256 015619dd5b105724cdec28cf247603b961080fab35a094319064248c622e7d13 SHA512 067f8352727d945e9b6b748f297aa91e07e3f52573f5315346f7369829cd45fef9819288fae86f60a475cd470bf423c89d52869b503b1dc434bd2decccf1dd35 WHIRLPOOL a963b3b3add27b79014d0bdfd4b4c652f4477f0ffb5bf9dfff61a5c441913b105ebc564da498640fa98c633ccfa9810d591378b3a6fe9df5c2a95f9cba777895
diff --git a/app-crypt/scute/files/scute-1.2.0-noversion.patch b/app-crypt/scute/files/scute-1.2.0-noversion.patch
new file mode 100644
index 000000000000..41d188b5926a
--- /dev/null
+++ b/app-crypt/scute/files/scute-1.2.0-noversion.patch
@@ -0,0 +1,14 @@
+Index: scute-1.2.0/src/Makefile.am
+===================================================================
+--- scute-1.2.0.orig/src/Makefile.am
++++ scute-1.2.0/src/Makefile.am
+@@ -109,8 +109,7 @@ scute_deps =
+ endif
+ 
+ libscute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) $(export_symbols) \
+-	$(scute_version_script_cmd) -version-info \
+-	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
++	$(scute_version_script_cmd) -avoid-version
+ libscute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
+ libscute_la_LIBADD = @LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
+ 
diff --git a/app-crypt/scute/files/scute-1.4.0-tests.patch b/app-crypt/scute/files/scute-1.4.0-tests.patch
new file mode 100644
index 000000000000..f06591f77e4a
--- /dev/null
+++ b/app-crypt/scute/files/scute-1.4.0-tests.patch
@@ -0,0 +1,13 @@
+Index: scute-1.4.0/tests/Makefile.am
+===================================================================
+--- scute-1.4.0.orig/tests/Makefile.am
++++ scute-1.4.0/tests/Makefile.am
+@@ -35,7 +35,7 @@ TESTS = t-link t-getfunctionlist t-initi
+ 	t-opensession t-closeallsessions t-getsessioninfo \
+ 	t-findobjects t-getattribute t-auth
+ 
+-noinst_PROGRAMS = $(TESTS)
++check_PROGRAMS = $(TESTS)
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
+ LDADD = ../src/libscute.la
diff --git a/app-crypt/scute/metadata.xml b/app-crypt/scute/metadata.xml
new file mode 100644
index 000000000000..e64af5b8aed2
--- /dev/null
+++ b/app-crypt/scute/metadata.xml
@@ -0,0 +1,30 @@
+<?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>
+    <description>Proxy maintainer.</description>
+  </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.4.0.ebuild b/app-crypt/scute/scute-1.4.0.ebuild
new file mode 100644
index 000000000000..3f47609ca571
--- /dev/null
+++ b/app-crypt/scute/scute-1.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 autotools 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}"
+
+PATCHES=(
+	# We need no ABI versioning, reduce the number of symlinks installed
+	"${FILESDIR}/scute-1.2.0-noversion.patch"
+
+	# Don't build tests during src_compile.
+	"${FILESDIR}/scute-1.4.0-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/pkcs11 \
+		--with-gpgsm=/usr/bin/gpgsm \
+		--with-gpg-agent=/usr/bin/gpg-agent
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
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-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
new file mode 100644
index 000000000000..f3ecb7bd3d37
--- /dev/null
+++ b/app-crypt/seahorse-sharing/Manifest
@@ -0,0 +1,5 @@
+DIST seahorse-sharing-3.8.0_p20151117.tar.gz 496497 SHA256 6a1594e2b5aa509c97a35e22a7a68dae50a94b011e266d60f17352eca3f919ff SHA512 aa43240040f637e3c79c08f07620a92e5e76e81b758c939a8eee5bf43cdd32657f85d4b9d7440401e092ef4d556849ba0a64dc9d5a83e708bc84d9a2d7baf01c WHIRLPOOL 82b782baa19cb6befd7650a0a08772d47dc2acfffa7bd15df360af05c02f080291d2fedb832b1b3bb7b7aa47fbb1db4911fb83a94de2ea75360b188c86bcca61
+EBUILD seahorse-sharing-3.8.0_p20151117.ebuild 1571 SHA256 4079c968690080282c181d3575ddbbca364bbcf232d46f65644fe7bfdae41369 SHA512 879cf863ebd9caf5a4df342d58e50e5ad03760330e3d24a7c756d07ec2c6f5cf4918d846879d1b7100b202fcba8aa76388314ad33b7e26b82777464786479f5a WHIRLPOOL e5b1ee9ba8c9847a851c91129e1adfb581c16c02c67f659c5d81d2996315828dc1e9a2d3af78a115257759dd2e7b932533b66d5e639add48cb86a05319fda6e7
+MISC ChangeLog 3257 SHA256 3687bd1fc0b99e11fc3ceea98a9a96010528ce0f728a6d07e76111efae648d45 SHA512 f0c2dcb252fcd75aade6b34c6fbb0d7cf0d90bad011f7f0917b9bfc2154e496218ea73266b7b9876835f77dbf3ce90d690bc801f6dc4ef4bfe257de2a8a075bf WHIRLPOOL a8f8f46cb895c940af170310399ac0ea57bf41fc1afcf97a933ebbd798d5880e608d469359bbdb3a6dd2e3a49e3c0a802f35a3ad5731f7ea2b9bf5506c63dcd4
+MISC ChangeLog-2015 1491 SHA256 cbacffad88840f41f550bea834dcd90f748ba354b6bc9c82dbf2902811165f19 SHA512 ae594d668548a30573bf077733955b37d4ceaa36b65f79d182ae0dc79f7d1f8c6aad153a6355e49f22394726ed2f4a3c6250c29eaae66b757d996f8d5fec475a WHIRLPOOL 6e3155a753b20fcc4b6db553d01ac0fa3fe810123ebce504fe4b110c3e29f3c2a90dca82338398247af0a1d70042444e83e629a1d1d48aa27c5edc6c4c1146ce
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
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..41c5823029bf
--- /dev/null
+++ b/app-crypt/seahorse/Manifest
@@ -0,0 +1,7 @@
+AUX seahorse-3.20.0-gnupg-configure.patch 896 SHA256 c0632a5d53d5c98e4eef56a90f2be1c3ad5e6aa1579da172513dc62a290e0f51 SHA512 3708d606e3ce468ca202d7ff35f65b934385816243e009fb16ff81e4ded6cb990d1c896b70457edcde39e690b79b744e9042c3cf728734597bfd229df612f1f5 WHIRLPOOL 33c57e18803ae309290f2f56420697cd0083bb5435a534dbba23785bb9183f50d51a628d14ba15d2bfdc363037e0a13cdef5e904e4c75141b696fd1967921166
+DIST seahorse-3.20.0.tar.xz 1556556 SHA256 e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df SHA512 a02d3da7af95256941ef065ac024bd5bfb53a026767b951fa2e26446fb0eed23707e69f72f6e8ebfa7d538823fa41411709fa2bebad4fbd662af1e81bc15ab82 WHIRLPOOL 79691f59771387af8f18fb2bbfb96a5830f41d1f538be0216d218f53ebc273fd00b1d455f595e4a70a3c5104d024d85b6ee279d416e94d93d800133179bfd47d
+EBUILD seahorse-3.20.0-r1.ebuild 1571 SHA256 918f718bf29d0cb21313ef1439da8c260af7b6373f48a08c264df43611efff50 SHA512 aaf9bf8f78be64a138dc281d7e7215ec6a21492fc0360db392735ceb5c5375d2b9af14ea70fca7a637c9deaa4591c29079138b26455f6df49eed806195fa67be WHIRLPOOL 120d234cd9a40b3cd96bdbc953eb18967726868ba36535e632d798489678bb19b24c1fb5f72b165b07dedb5b4945b01e089b53dfeaa3980dd41e7a6640553145
+EBUILD seahorse-3.20.0.ebuild 1628 SHA256 839c986f98627b39b4210a537dd0919122a27ca70dd13bca5e9fcfde23c72db5 SHA512 d53d488ab47a2681e075df1894288e81e7c32d05c28b027a091fb91d903da3275e235774e3d0f0caf18dca51d077afce63c2ed40ad5af9a319682956521b593e WHIRLPOOL a115ba5c584c8b4e833b2c84e949caabae5eaeac2e9d6bbffa865a096adee728fc446283ec32366910fdca337c5e639d01947fb3b75b67d64394f39b5eb90b41
+MISC ChangeLog 4139 SHA256 d6a799df38e82d3177f0ca49f902ea3d2cc316099b72d55ad6547ffc23f6de0a SHA512 ba14b5b7d85055367f9527c2e1ef94cfc8b534fe7d66220b1761a100a784dd23a02be1b66f442fcbdc745bf7a18983a11a161735e14ff5763b5b9f58a3f7ca48 WHIRLPOOL 4f5cedb88fc42109e2b9f373e9da96e8c99cd9be122f51a071da844fabdb25f2509a6daa11cae77708272681215144ac85d1a199dcb7cabbaee4783ee6119dfd
+MISC ChangeLog-2015 28438 SHA256 05f4561b4b67e40aafc2de52eb0ce4d039bd0b69eb828efec6e39a206ac743f5 SHA512 c7134126db504efafcc5533098f5495881ff42c23178feca8f7fe8b8a545916961ac890e7075568265a78b544f1449be8cc9cb69a93215c9f7500983fffa7d10 WHIRLPOOL 256242ee451262a3c38dceb67fbfadf2f78e33eb2d59ed8a31bffaa5353e3b14074513ca5381e2a0f68af6de20d9b7f3ad14a92fb454a16df69886a378b1094c
+MISC metadata.xml 871 SHA256 7c94194cfccfda3a6ea088d9c055e1165d633076a8870bdb032f83ef60b2da06 SHA512 3e4844cf29c6343c93ee51a9d5643464256f7ad884e6af946166c251004d3cbbf6d1aaa6771faf27b1a531939a8401413b52aa84a6bee8a2a4365775b09e8514 WHIRLPOOL e5f844d1a5c12cd3d5eae3734302c7020d7348110afd82b88ac6d987f7fe36c0854d5424e3b458da27455f66a6a48cde5a11806c1c11f088d8e7753d2222fd8b
diff --git a/app-crypt/seahorse/files/seahorse-3.20.0-gnupg-configure.patch b/app-crypt/seahorse/files/seahorse-3.20.0-gnupg-configure.patch
new file mode 100644
index 000000000000..6c81974c4fd3
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-3.20.0-gnupg-configure.patch
@@ -0,0 +1,32 @@
+From 31a9a6ffc10f9737e70d7f0051ff590ff284ad07 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 5 Sep 2017 00:01:16 +0200
+Subject: Accept GnuPG 2.2.x as supported version
+
+https://git.gnome.org/browse/seahorse/commit/?id=31a9a6ffc10f9737e70d7f0051ff590ff284ad07
+https://git.gnome.org/browse/seahorse/patch/?id=31a9a6ffc10f9737e70d7f0051ff590ff284ad07
+
+Note: had to change GPGME_REQUIRED=1.7.0 to GPGME_REQUIRED=1.0.0 for
+3.20.0 for patch to apply
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fc4493c..723b46f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@ GCR_REQUIRED=3.11.91
+ GTK_REQ=3.4.0
+ GTK_MAX=GTK_VERSION_3_4
+ 
+-GNUPG_ACCEPTED="2.0.12 2.1.4"
++GNUPG_ACCEPTED="2.0.12 2.1.4 2.2.0"
+ GPGME_REQUIRED=1.0.0
+ LIBSECRET_REQUIRED=0.16
+ AVAHI_GLIB_REQUIRED=0.6
+-- 
+cgit v0.12
+
+
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-r1.ebuild b/app-crypt/seahorse/seahorse-3.20.0-r1.ebuild
new file mode 100644
index 000000000000..3b0fd9101ded
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-3.20.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+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:=
+	>=app-crypt/gnupg-2.0.12
+	>=app-crypt/gpgme-1
+	>=app-crypt/libsecret-0.16
+	>=dev-libs/glib-2.10:2
+	>=net-libs/libsoup-2.33.92:2.4
+	net-misc/openssh
+	>=x11-libs/gtk+-3.4:3
+	x11-misc/shared-mime-info
+
+	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() {
+	# Bug #629864
+	eapply "${FILESDIR}/seahorse-3.20.0-gnupg-configure.patch"
+
+	# Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
+		-i.bak configure.ac || die "sed 1 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/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/Manifest b/app-crypt/sgeps/Manifest
new file mode 100644
index 000000000000..25d5348b6f98
--- /dev/null
+++ b/app-crypt/sgeps/Manifest
@@ -0,0 +1,5 @@
+DIST sgeps-0_pre15.tar.xz 3284 SHA256 cc178d541e60d45ead8ca1183a31d68c425ad518de0bd7115bdb5b02e0bfb395 SHA512 8ebf5f492baaf6ee7f93054a9afcc6c4318f755d85190ce2576c89a88908ee132283af873a37f60f611683689bc7e2e77903c95c6020c80ad916ebabf4583702 WHIRLPOOL cd972af6008f8a90dc2a33bc5e924471d49b980596eaad3b5db65f233cbbabe2d9b8e3fb98a5e893e90ea2b2ddc9f90dc08efb9fd6f9ec09be9e6d163e266b91
+EBUILD sgeps-0_pre15.ebuild 1061 SHA256 32cf7730223e4e473c82d69cd2a5621709b3c7df7f9507db5047424790707da9 SHA512 abb2a1b87a76543dcfcfbab1c2cc7e06ade77dfd8f6d98fe3c66d597e1b2077cb266a86f3ad43a8d235ff953c0729ca62b2018f6b38e9e7af1ad24a32e4ea868 WHIRLPOOL 0409b2e9dccc495c5ac3f2b466c879d7981a2873e939847944d1dd76bc76ff4cdaaa912a2733a90fa37d6afeae38bf5e02c1b994408790707e5dbe9c6cc4a5df
+MISC ChangeLog 2570 SHA256 2cc8fcef7f061ecc10ae2911900caf63c31249b59dd69e20c4bebf9cf661276a SHA512 4e1436ea20d51debddcfe33c74ac45c1e84518a48ad1558d55de1f4a5cffdd68e7e2842dddd7725a5d7a0a95a91ace53d56838dba91d5bdf9e230bc7af87d7a4 WHIRLPOOL ce565e88a510ea89dd65cf32dba5f3c406da880946238f4089f0b555730dcc9e390331ba729b16bb018c4bc273a9d40cba8318df742f004ff29b17353e301231
+MISC ChangeLog-2015 937 SHA256 4c40eba0bf71d9a89f47d546fae78bb08ce2888cfd82acc39580bbec70bbe9af SHA512 7134c1cb24a9154f7d9a8fa3f0f6c43597a8264656fc38e779cfc635a015a713b923f9766b4e87e0437676c9b4d4a8b0429f43c8e4472b0b8dfcef7cd19bd09d WHIRLPOOL ceb43c3ea4ef8ae8d5bf1ace66bfd01173c2fa60c1d8e47bdf1cdf323a98cd6df08fa87311384cefe6fb467cbe91738683070e957c4b7203e5af5ff5c0119c3c
+MISC metadata.xml 440 SHA256 99fae172a2d39ea4e186f4d0dce82986f3d8d6a1edddeffdbe0be6f8fa117e1a SHA512 32e01741da219cffd93e0c4a0c7c48585b75dc6f442fdb425a09c134b3de515f1d5691c5319201daabee7d38c1fd1d7c0c5fb7750a2e635406a01cc4a48f77f3 WHIRLPOOL 1b5ec05459c2be68ac73086fae55829a50b5024da5a5aad96c09aae10d9a18b1cb052c33251337ebb118c45fb240c91cf5719d85427504e881233d88f691e5c8
diff --git a/app-crypt/sgeps/metadata.xml b/app-crypt/sgeps/metadata.xml
new file mode 100644
index 000000000000..b269cc3b4689
--- /dev/null
+++ b/app-crypt/sgeps/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>enrico.tagliavini@gmail.com</email>
+    <name>Enrico Tagliavini</name>
+    <description>Proxied co-maintainer</description>
+  </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/Manifest b/app-crypt/shash/Manifest
new file mode 100644
index 000000000000..5ac0b5f87136
--- /dev/null
+++ b/app-crypt/shash/Manifest
@@ -0,0 +1,10 @@
+AUX 0.2.6-manpage-fixes.patch 1451 SHA256 12619eaba8cfd99917658139306fb8c0ff087f10ce05bd285aa3c8e66f88e317 SHA512 10dbcfa52a7df57ef68dc58f21e1b2931adf0479697e13f99c56ccfbbd1c79188751d1ce7e2b160261170a678a4130a71a6b531820aa59e4ddbd131d5d9cb551 WHIRLPOOL 11b4d1aaf6feae4dd00d7abfbe704fcb8ba665d0de46de724098fa57b60960060c6df7661c9e3735c9ccd5865ab6c66cad3527395fec4279822e114dc59ab92d
+AUX shash-0.2.6-binary-files.patch 898 SHA256 e06660afe1afb338bf4f209d39ac33c412ecc6fb22feec684c0a7b5fd80f46a6 SHA512 47f299097b8a9907ccfe2f877c42ab8f76f02546211643573796b378d67dd7941518341f8fd07e646c1aa11a665ddbca6ae113a4d58f6995007d9b5aec171d8b WHIRLPOOL 0bbe198601dd7b1ce55719936d8670975505b9b31baa68f0663d25c9988026587b8bc1dcfb18d188b598298715f57716c334b875ac6ff5075ff3a79dc121e7f9
+AUX shash-0.2.6-format-security.patch 413 SHA256 9680eea1b2f6559d3e7709e228ebea79a24ecb4c0729b7c827c7435867cf0446 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04 WHIRLPOOL 9a3786c844fe4c69e600e338273463a19819dc6708f4641b297aef1bf85ccab88988c3cc6b3c6d28c4be3ecec2e3b20749e44802d3f30fdc9a55f85998c956e4
+AUX shash.bash-completion 856 SHA256 974b399c45eb346b07ccf7810ced2bd64543e200c6fa8f7f066a07212515bd02 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8 WHIRLPOOL 5e7a62396a4c2e60d64d64526f6765ef71e2a6fd6fb046c193bac2330df27d5d9d92593c58c525215941d62db4f6469df7bab9a2697346cc0fc5fd2175a16780
+DIST shash-0.2.6.tar.gz 105641 SHA256 6abf13eb1c3b4b6ef0f07e5425d10ed2abaad1d08c327647feb3506e76ced9dc SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b WHIRLPOOL 8b809f5fddc98def54907fee8af424937c747f341dd0eaa6fd0c1057858c4dce7d117dfbc729cdd951c53e68a363d3339e9db4e2de1677620bbb9a94a810e8a5
+EBUILD shash-0.2.6-r2.ebuild 910 SHA256 117585ccd75b6c5bbb14c186c30b988573dca1fc41b144b2f264b06eb32b75dc SHA512 6857f630ff743ea28e65675aacc8d3cc72cac84d9c3c2ab0695c4b151c469fbac19e0d1e287517dd2075d8f7b79cb275d214c6ff80ff68d52bbe749791fc9ae1 WHIRLPOOL 44ba3bca95fa8cf843aba2f537bf70bbd2a807293e1f82791ab9567517e4fed33201f46dd5bbfd43370cdacd85a6d6ed100572632cc4794f57e67e4cd36f097f
+EBUILD shash-0.2.6-r3.ebuild 935 SHA256 45e5f7481fc25ae3ed09512de1fd1cf9814bcf3aa57e2c03531c014985066931 SHA512 631a3f5eeb582c67b32568a9628bc2f7c2379d1ca91ec3f42719dc286ab2fa949a22a8cd6953655b55d852f90c56f0e7fa7e4a262553d80e7e7b417215e6746a WHIRLPOOL 7102a1658d87d0ccce95775534a1a281bc58f038f9a309edcaca5ea1b53109b6987b87bc3895a5efbbe5a28dfc90055ce256b95a6a76972f5a265a8e4a51b775
+MISC ChangeLog 2617 SHA256 996dfc1f6c614e4ef96b970740e4ff72e0f94af8675ebfb5d0427e76bd535422 SHA512 98c94191338fe2c0e1b551f39cebbf81469b68281f8de46f3cd98e658c5a4e31c8fb68982d3d1bb542403b03f403c223fba2ca2f38e8c4578b67ec12ac4a6622 WHIRLPOOL 6728745a04fa1f8f55bf5a4edf3b546c2dec8f14dc30930676181cc574af621a20235e8174bda1776a42381e68835721351582427470dae006ebbd035062be30
+MISC ChangeLog-2015 4546 SHA256 56731500ee859978dcb7c11ebbb9b7104beeefdbe3875ad60310bc73542ede1e SHA512 29806eca1add20c6d4fe6e8592c8256c73e08602e8c00a0515a1b2c692b49bc357c827ed439b62494730d6d584445cf60ff35c90aa19986f320cfc9afc3eb70e WHIRLPOOL 4f0e4853585d9ba5c915d9b75bae7b0647cfc75ce01c714956fe1947496c5aae436b6c0860b6f0fe09116cbed7c4aa216a47890ea7fdb55e1fb8c70d7209bc0c
+MISC metadata.xml 437 SHA256 7c03f43673bb700e0bc1063720dc80df195304f74a397d8175192ec6e705bb88 SHA512 5402bd757c9295e1e6ac0239552344a3e117da528d11db153e6a1a805e8aa5627493d22af1f7a87a7ef7a33170b5d08c9f344751deb9e1e8303e66eac096f13d WHIRLPOOL e086a413a8a5bc1d1fba9a2a4717d83af4137a40f17ff969a5536a26fbd342c8a58b3418933fc42770ffae3c60812ab2bd044951de17a52566441a9210b26282
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..3b9877fc08c3
--- /dev/null
+++ b/app-crypt/shash/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>swegener@gentoo.org</email>
+		<name>Sven Wegener</name>
+		<description>primary maintainer</description>
+	</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..a94cb91d0add
--- /dev/null
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 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 ~sparc-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..139c18088373
--- /dev/null
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 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 ~sparc-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/Manifest b/app-crypt/sign/Manifest
new file mode 100644
index 000000000000..2b3c8a87cf20
--- /dev/null
+++ b/app-crypt/sign/Manifest
@@ -0,0 +1,7 @@
+AUX 1.0.7-as-needed.patch 383 SHA256 ed9a3234ef12aac2c4b5cb546784946eff5d357fb2b274bfb2715ad2c997bf3d SHA512 03ee8c34030077030e2a24f58bf7eb180b3bfb22fe92991b8231e3348ae522a34ca8ce9851a1654bbf562214dfb6f569297917ee0ae309c49ded23f6c0b97ec9 WHIRLPOOL d8817f6b02346bc8eb6aaa640f083f7d3f96aeff30dc6203faca94b934f130df2a1bc9fc47273b7fc3df1023f7b55eb11ad116c43b87a0af300c16732cc90247
+AUX 1.0.7-openssl-0.9.8.patch 503 SHA256 6acaabb6086e836d4a53121f6caeedd426fded7e25284cf0e536fbacd463b692 SHA512 ffb9d1390f3fa7cb9189ccb8ebe94a8fb5fc14de3cb487758363c405d44d07e4dfdb8b78b71b4b6e26c459ac8972e2b526316a8a1360db72879997683f592b6c WHIRLPOOL 21e208169843548cffc723dd5a3706daac8d727f2c9621a774fc35f1c611ff92412bb9db21f9fc5ce8f4625c3dbb0ce4de9123d950f906e4585ef72ac3507246
+DIST sign-1.0.7.tar.gz 28535 SHA256 c5f005eff29880807af37a128724f064cccb166fc9f49acab5f1403c9b72d4b9 SHA512 9adb9e520da654e7196451e20501be8e1b84ee750a26344cb7e1816e56e4e8b88773a76a2707a6428faa7828658807eaaef2073b6940e212435ed915881885c0 WHIRLPOOL fdbd9530110ebe589f02818e62f455a56ff8a5473bf3dcf0ab78ec7341ab42e0e74701f65105cf3a38db094d637460de46971ff7096f9f5aa3084d922a7392bc
+EBUILD sign-1.0.7.ebuild 861 SHA256 ec46bfcda3c436271cefcf212aa32ce8efaacb734214369fee992914cb172022 SHA512 2e874d30078cffab6dbe3a67941e5a1488b45494c67d11da43d0cd07c4db1c05f9581146574ea60d247cb2e3672721212b1a4299b85623c99b864fc8b0f6a45b WHIRLPOOL 536a2e486cdfe21678edc0c6122d7045647f1467e6b294eeec2eb13aadd21f69044e336847e6a1ea941a8f5558db52eda9960f826417b7337bd20847eec819e6
+MISC ChangeLog 2495 SHA256 e586d3c1818fbba944cf08cb6f452ec8cdf3da9824cac1e3204db3e4ba3891e4 SHA512 875cae6765c9e1651b8ac0f2d0ea83ed27d72adfeab8767db2e42c7d4b6259c2f3f9111bc2b9c761a8a1e34e84d88b031780296936382ee4e19238a748ad9796 WHIRLPOOL ce553220da906178e6042d07c102f4262f30fe625962d79e50f354d6b7cb88dbde46a6ce7c672f5256a396a906887a4128fde4cebbb86994e88f008b0ccf6d01
+MISC ChangeLog-2015 2675 SHA256 bf7ba92ff0ba2662e9bc990c192e12c471070880caa37a7debb6d18459a9decf SHA512 41d1d34fbcde9c3cfefe01c84e90fbf5a381090d3ad67c322df009103c22f56073222d59fb8efdafca34db12f4f38785056f8d2f66b41c6ad1d3e1c777159e2e WHIRLPOOL 24a46249810f839896c106400600f34cf53163d619e8abf294c0f9e5c22b3c0f096252f9a3766a16ea1fc62ff173a08d669b945059b54d56c4c959d565fd312b
+MISC metadata.xml 595 SHA256 b632a7e7074b47e33c3be06a68299423d2ef8bcd195d389dd1cd49e6a840a6a9 SHA512 805b6bb906d2236985d276a641bc71de0b3d8f4574ead6944775f03c3e45100db1775a8499b2527866592b89d81b1cab12b1d07e5a110073fa545047100c395e WHIRLPOOL 23de077bf6393f5565b607c6f5f9eb7bf9fea0acfde5092fae3cd927dc7bd9653623e3408ababf0e855a622daec6078df37ae156b3a19c245a166acbeda4effa
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..eac2478a0ac2
--- /dev/null
+++ b/app-crypt/sign/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>alicef@gentoo.org</email>
+	<name>Alice Ferrazzi</name>
+	<description>Assign bugs to me.</description>
+</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/Manifest b/app-crypt/signify/Manifest
new file mode 100644
index 000000000000..0b83240da41d
--- /dev/null
+++ b/app-crypt/signify/Manifest
@@ -0,0 +1,6 @@
+DIST signify-17.tar.gz 92347 SHA256 275fccb9197d8a8efe47f2b49f9aa2319002c1da8a454bf90e6332ecc214db4d SHA512 2b20e2c2d073c1ff695b6ec0b9b90e0870c6bd60dc107b428090f3c66f8e215473779d824fcd5c3b0ade429071b99336ce066c3254e286be2aa4e4a312742404 WHIRLPOOL 3124c499cc1bb234272b8f4dba206729cf89a1b821615dce8039bd1d225d87c0d9e8dc1902e305d7d47cfdad12286a9562007446205a15672721ad67477a57fd
+DIST signify-20.tar.gz 97765 SHA256 99dc0f4a3c2a80c854f45410ee4832b0c7fb537ed3bbc0cc4f5435b9d614be22 SHA512 993f02b10ef9c74a98455e2c93e094de40a40710c38ff35752decb87430895bd276cb5e6a46b5f7cf3f098d66562f1f0e134158d221a87fb33cfff09199a8773 WHIRLPOOL 0fed9dca3e6def9d2a45526882ef1429e58d8ebead5532e8343831d0fd5d452b11ef7d56b2d01f923cdd672b949d0a71cb5fd84b15c7d083434cfef2ee4e601f
+EBUILD signify-17-r1.ebuild 461 SHA256 b5a5eb511628fe83c09ca13fe87957e5c3a965a44563bbd30dd9733fffe183e3 SHA512 48b65a349677c41f1c1f075de2f1d0b7ceb67b22a5b67a62356a732f603aa319908b835da3aba7498fd1bfa4ab8aa0330602a6892d02672a81a9198659090d9a WHIRLPOOL 7b77256001d4beeb3153b8143711857098edb555eb00ea026f7e05d430bf5bf18a660052ab89f2418e1d85c6d9fed72405f747a4fa50db6df23f41c7e6932945
+EBUILD signify-20.ebuild 482 SHA256 880fb53955f1430cc2202663c6378089c5d45d59299c0fe52a903ccacbb76f65 SHA512 6972914c088bbf669a89c9f292ec3d3f84624c3c18b347c24147a2630e77c21713300d0a8cffb2a26106a6c480052aa1e651f0ec73f2e53635d623de5e59d223 WHIRLPOOL bd4c6aac611bdcdbd9509e1a0eac1c631b0bffe59f6e25d9bb324394639c2ba161729670aff24815a7865feb128575e05b600781059eff3a721a185300b631be
+MISC ChangeLog 670 SHA256 e073b8e6f0bc89acf0c018000031ea481989bc50970c7e59e569326672195664 SHA512 0b3664e5ddf687655b629e78651536865ed5e60bf21107d697b78d2c57700cac5d0a49f65e499c3d24eea15a5b6be18e422368450045c397a1705310ccb90701 WHIRLPOOL 6ec4c78e1d39156834a71924958d41d74e2373a0c94f9035f2803ae035354290625e7dc25618d200e5b332729f79935351f24776c8d8bfd750187ed1e5ce4d09
+MISC metadata.xml 328 SHA256 79db9c37d0f4c071202464eb19bc46018418685d0abb2f20c8d98102db7288af SHA512 4958752eab2ed703ddab429c46274a605a4954a4da92131979fd988ece5a5a68d944feb60cd4a21e2b6cfdd320fcc00ea631c8befe4cf620cb6b4794e6107560 WHIRLPOOL 364cc3fc1499737674d6ddfff69b596d7acbd97258403ef129f3824170ba955c714a5d99c3e901668d5368d12b347e0226e8dc9d76800531f34acfa40b372d76
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-17-r1.ebuild b/app-crypt/signify/signify-17-r1.ebuild
new file mode 100644
index 000000000000..d71157bbddda
--- /dev/null
+++ b/app-crypt/signify/signify-17-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 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=""
+DEPEND=""
+
+src_install() {
+	DESTDIR="${D}" PREFIX="/usr" emake install
+}
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/signing-party/Manifest b/app-crypt/signing-party/Manifest
new file mode 100644
index 000000000000..eb47c1e26405
--- /dev/null
+++ b/app-crypt/signing-party/Manifest
@@ -0,0 +1,7 @@
+DIST signing-party_2.5.orig.tar.gz 198105 SHA256 62db91ccbde650ffbb332beab9cba0676b0d42fc46034fa3c28a471cc0ec4bf8 SHA512 a04875bfaef791a6505134dd2530148d5e6baaa8aa5610e75d42fbf59e884fafffb5de2486425bb53e6464ff3fd35b974684d8bc85291750e4a7bd8bb82b0da3 WHIRLPOOL 7c070f194a67de7fe4ac2f479c6e15a96bf3f182a9065f293b60f5fb979f035c160860ec25ffe0fcc64b30561af94db40b3d8cb113dc8e8cf17cfe2f9bec5248
+DIST signing-party_2.6.orig.tar.gz 201210 SHA256 d9458db6c5a01298838af99655c0edbebd0c955f50866c6e0f6f277a1dbbabd8 SHA512 094af9b354d958d382bf99a1f10a9f12585f85769686e3bc9b9b813016f68232775e4002c0a7accbc894c946f7532b32ee7f9b3e23d467b973041c092ba4efb9 WHIRLPOOL 4e8c873d0b7aa36442e82cfa204aa900bddd037b00d6bfdf12b18fe6a47acaff6c621956576d0371ed00b0b3985e0a40d6cc2e124f2649367d407ffe8433e0fe
+EBUILD signing-party-2.5.ebuild 2998 SHA256 4693cc57274b951e130c3c56a5cfeb7be8fa013d2ff41227d376977645a97aeb SHA512 12f7429286f57c949a404ac689d1c6374af4161fa5da9e220b53b84bc6d6fe9768e3089c7b0a1b07892cca85903649237854b8fd2f4314ddccf30c54213f0a10 WHIRLPOOL 171375aec57760c299c6fcaeb8be5f5e66e76d1a86d851ae8324ff5f71fdc47d72b4e3a9309f60d23b6a7fafa4e4b6ceec923322d94e57397292e64b9af46a57
+EBUILD signing-party-2.6.ebuild 3001 SHA256 56a5cabdc8b8df1e35b203875697886ac7abae1f4361804f0bd72075ff06b439 SHA512 9dcb583ca1af94ce4a22b23498db8525ac00d279a51af9912033c2afa3e882d230482529a74731b76d089f84dbd0a9d02e6375249c6f76d9a5164c29100014aa WHIRLPOOL 10e9e4204b2c3d115367faa9edc94dcac3f53b6da0f37893605b78df5947b9c44945dceeaf72886542e78e0c1c99db89560d681d7b7308f2ad6eae369579999f
+MISC ChangeLog 4150 SHA256 4cdc9c32e23e9eac4f4b1a24302731e20080df446ba31d4aa543200d1aff76ca SHA512 9f5217f623dbdf33c0dccabc4f3369418699ad8fdcd6be21f28944519035fcf91392d7c17e716249183a417ff379eefac80b2b8929cb76fc21b02ee02d862a45 WHIRLPOOL cb418cc3b5673f66bc678e97b00e3b4a7fc7195e4110d3d6be44763f7befcd7c9bae05e3b7b5cb5719d00566eaccb6cf85007af1f3c9c406fcad67be03de4b13
+MISC ChangeLog-2015 7223 SHA256 b16c9754f3004f13b2c22593ca483e969c57387faa2d104031d55336749cbfcc SHA512 894db23caf599c99be320c8485056aa6dc11f7830ce92e97d8b51bf5f9f122c042fa7227cedcc0bcbe8ff9806fc05099b1ff69a3351bbe588bb20b3557f6f9df WHIRLPOOL 58929b500277fb055701f900bdf07e3eb912f4d6663d9691faa4baf07d9c4e36705f0ced0be0ab7319c6869914eea90aed07b88c13098d44df37d8120a307e94
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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.5.ebuild b/app-crypt/signing-party/signing-party-2.5.ebuild
new file mode 100644
index 000000000000..a279544c0304
--- /dev/null
+++ b/app-crypt/signing-party/signing-party-2.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 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
+	app-crypt/libmd
+	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/signing-party/signing-party-2.6.ebuild b/app-crypt/signing-party/signing-party-2.6.ebuild
new file mode 100644
index 000000000000..675acb0adac9
--- /dev/null
+++ b/app-crypt/signing-party/signing-party-2.6.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 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
+	app-crypt/libmd
+	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/Manifest b/app-crypt/simp_le/Manifest
new file mode 100644
index 000000000000..a30828e0d048
--- /dev/null
+++ b/app-crypt/simp_le/Manifest
@@ -0,0 +1,3 @@
+EBUILD simp_le-9999.ebuild 970 SHA256 aad0f93599ca108b47ce9d2be1e074025efd1ff4137050832af447a5a3330457 SHA512 8b052fe13b046cb3b5d9c41a05435aef33342123ca6d81d644b258e521bffede242b2ced3724d673c8cdabc6a2e136d0de1fedeba15f3cf4cf39d4521ec3ecab WHIRLPOOL 1a64581d060e3d8c98887ac6fdc4ae9480723f1fe6375b382f561e2e6333a4811a86b4ac5d7109f4283736ca1501879f7eb180a92f2359c2648d60e352dc7a25
+MISC ChangeLog 419 SHA256 3af2ac0c53cc30fb0ce881f1d8ef1f01fbfdeff774034a5503f3f5c8fa48295e SHA512 fe090b03e1d30277519b51bb96f0b2a3b71781a7aa3aba395e02e25c2029a35330ebaed53fe84b1300620f9b470de48e5a7bfca6f4b0cec96e80f2a73b4cbcc9 WHIRLPOOL fe739e5a692ae7bd1a823be5fd9ca6b2a90ed36a0b2148c774c705ed5adfd63dcc738bdecf5e749090e9b540d19b5e88ed66d71b40472103fd20d4207b43d8d3
+MISC metadata.xml 216 SHA256 292c340724672fa2fecc872c492dc96a18f57cb8109889bcc0ae6b5f24508933 SHA512 8bef1d32cbf417341184ed22b8cdae39c12ece60164324cb7a3e75bf6e1af0249225b79fd6d57a1e9a4edd265162b2030f9fa547c4f661d7fe577bc89d267026 WHIRLPOOL e432b1dbdb54734237762c2cd9c2110b37cd53d18469559e888d7fc4c1a90a94e1c1d203fbb2e85fc017917ed14c55aac2de2ed5eff48b0b64b352aec5be8485
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..8680a1170bcd
--- /dev/null
+++ b/app-crypt/simp_le/simp_le-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+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/Manifest b/app-crypt/simple-tpm-pk11/Manifest
new file mode 100644
index 000000000000..83a131adf199
--- /dev/null
+++ b/app-crypt/simple-tpm-pk11/Manifest
@@ -0,0 +1,5 @@
+DIST simple-tpm-pk11-0.06.tar.gz 28993 SHA256 8ecdb2a64e046e04bb18d464fd15332c99be82084eb2bd3d340a5ff0e738dcea SHA512 72df0637cefdb0d81f741480cdfe24ac0d6a05a93d729f5e2180adf49b5d7ddb0b60d8c6f7d5e79a67bf4cea202067390c8d4532c906273408f7de4fcc5e66e8 WHIRLPOOL a98c2bf72f3b7f454b47e3ef0a72c069a9c35af8a02fa1b3963f017b3ea483f3fd62f3c4360d094620d723e7e1c5da2fc68430c7229d10fc3513af238c5c3f10
+EBUILD simple-tpm-pk11-0.06.ebuild 848 SHA256 c929c1d79506c8cc55e90a0df77490e73c2eaf6bbdd7a618d80261da780eef9b SHA512 4dbdb971fbb5932ec8d13ef67323174dce7b637d00277d680cfb1901e10b24c4b94b6bd1fcafb56e228b7ebd0752eeb8244951d7aae7c11db2689d430c89ea30 WHIRLPOOL bb926db7200706e49740a730e1b3f13f54a6c684dc6e04ab6a981373c1cb22606bce7065fd46495f1c44a6c96ad5ef91294ee79f0c10bc6e1847fc0360cca67d
+MISC ChangeLog 3059 SHA256 6c4e5d048119b17c950e9399f92a55bd2aff33e45a12df432ce1607809753c56 SHA512 8a8d68db9901cf071916917ff5008c4ff2df27c2f84ebef10e5d2be6f8bfddef3a707286bc2edb05b41c5efc2948d157682424bf39ba54900bf859c8a8e994f1 WHIRLPOOL 9f46b636cf87182c30cef2e51d60e9162077e2fd18322358c9da3ebc405d649820bf1f3d25e6a483c13b7800ddd5bc22bba7e6038de5f2215f122575e135733c
+MISC ChangeLog-2015 493 SHA256 00fb2a34958e4733f93a601d9befc2e436dcd517a913e0b45fe835a59a55ec70 SHA512 ec0434cb40ccdf7a161838142ee0dd4871d32a59aa0a4b29d741749ae025b87ce1992f1a905f658a84c1d83b9bd8ecc633ce8b9046b50ac540733cf7e290341e WHIRLPOOL 53c9774cfa1f540c59a426bb4d41484b24fb6f2381710ba17b09901a79d8b90dcf0b77c02f62d6114181f07868d4b068ab054dad6d7cea20465492c452d238ef
+MISC metadata.xml 417 SHA256 de1874f50b4ab99e1d7e1ee6dc6f32b5fc6103ea3205bba6c6ed0deea0aa4bd8 SHA512 f62211877cd878f6a1a05456dcafd7564e687308f40a9512c9dafb7a9175a4a31fa709db15441846b0495da65939c4e9fe7c86417ff047c08e7bf31699e04fd5 WHIRLPOOL b4d6cba3eb85fdf9df6e0211f8beb47ceb320b3b88b2692dcc007d78fc6c284f9cb7fe04af281cf35e5c9e450118bf4679174ccf059e30b9ef48e8fd14f74dd0
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/Manifest b/app-crypt/ssdeep/Manifest
new file mode 100644
index 000000000000..301a5e1296f0
--- /dev/null
+++ b/app-crypt/ssdeep/Manifest
@@ -0,0 +1,6 @@
+AUX ssdeep-2.10-shared.patch 174 SHA256 fdb1b67f0e9058d5427ae6fd66c84c86743bee84cbed6ed8a53c39448ad172d8 SHA512 9429c38e22cf100809062818c286419d141089e0dd081c11034d7f62143ef9fe2d2bac0ad67104d448c387b7bd4b84ff364933f363faae3dda527e5e8390ad1f WHIRLPOOL 2bdde0eb5a2335cad4cacaf51fc21e0737a74eac3a7f1dbe3a7f2f14e397dcba81420791679fd0f4ebcf4492d014d4ab9b730ef14c06a110379462af9c1b0cd6
+DIST ssdeep-2.13.tar.gz 380712 SHA256 6e4ca94457cb50ff3343d4dd585473817a461a55a666da1c5a74667924f0f8c5 SHA512 26473f1b8801398534c674d7fdd6e87cf4d7862ed91454bb22865f8b6cf885c777250d0d1cdf2c20a28fdf4961c3b21e505e82f37fb75486a9442902d96f5186 WHIRLPOOL 14d5665835f614aa01cfb4607bab5586b5d3469482aff47f88957b4308cff65de7beb01fb423caf071b98593ee72e19cb41f73222ba0ce43d6360865de055a02
+EBUILD ssdeep-2.13.ebuild 593 SHA256 9b4c0abc96483b00b3b31ac8ad102815b619ecd34ca65f6265e43887a2c83256 SHA512 e50c4a3d4764a7bf3076124231819f64770ef8f7d0080703235b63693cf032e08cedbf8b50de21131259c4a3189cebc73d46a62b0c5f163263114b853809eb07 WHIRLPOOL 476de47233d12921424f8c326010899b4e63d283277c1cfc1c63e14fd5cbb217a83650ab9bfc0e9737b91d4eb17f3714858677562b459292cde5b8a7198b2912
+MISC ChangeLog 2767 SHA256 0099ca1cf0bec968b44e282e2b46930f389e7ffca01115caf4ecad46ede40f9a SHA512 6062f5122f9a759226901ab112451ccc9dcdaf166877c310efa64d08d0141e623ed964d6af9662224afbeb1deb523e885286d6e09da65c7b19f05400d4ecbd39 WHIRLPOOL 9afa2b54a8aebcb985fc16bd59897e64f68dd261e889a87a1880aeef57a19e141567fa7c62199b136ca440530bc66a7859ed89bc3c111fdd0dfa55aee95f81dc
+MISC ChangeLog-2015 953 SHA256 3d086d731ea504553de1985eb8c3886abd84a80350b967cc037134a0b6b25e38 SHA512 975d27bad23c96cce3aaebe394917108288574b9f09ace3328bd5a6f487275a5925e9940b3d63e132d593a0ae8b113a56d61ce441e7ff45f414d46323e889b80 WHIRLPOOL da12108453042d2185cac51cfb9c8b093f054646bfbc6dd0b61a8dda235a3e74a2c0ebf44d89d9ea4b830c7ab029ad1abed1d2110a21e475303ae89e2a73a676
+MISC metadata.xml 316 SHA256 9a8b50099357d1f8b78f920aa213d2fbe6f220fb82f52b909434f732a0c20e75 SHA512 3fd64f3472e5d036fb4617b2f44d074eff34eeb940cc90c55334712f745b5f4abe02939f423fbf5e28ab6b4eddea2655016711efeffd4707932fe136b0562707 WHIRLPOOL ae0fc0f44b727ff8a99db65501533aa5cedee461e8a4f92205479aa72b5e1d19b4edb97a5b2f64bdd6a99015516fb53c1b9d5be19361922b467b64fd5455c976
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/Manifest b/app-crypt/ssh-multiadd/Manifest
new file mode 100644
index 000000000000..6a75428c60cf
--- /dev/null
+++ b/app-crypt/ssh-multiadd/Manifest
@@ -0,0 +1,5 @@
+DIST ssh-multiadd-1.3.2.tar.gz 14035 SHA256 5526a9682b5d5e5051f91cd64a3e472bc6311939ee412725bf94eabb8f2f94c8 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3 WHIRLPOOL 871af4cb49282fbf22c547b99a9c14d035fd8766ba29899add5e2522d1a648df3e9705837b99a5cbfbe87ad0f363fab262905fe104353123171bfcccbb5be52f
+EBUILD ssh-multiadd-1.3.2-r1.ebuild 682 SHA256 d92b6792d71023520b47265598adce31b2ecf1effae57a57dfeb7a52fd908fcc SHA512 5744aadd5c4ae1070299465beecde93886f481d763576a6bcf09c03e13f9849dc4516bd5c435cd1b7ca1664dae2167c1a46650442b4571c4a7bac5e1a76646ea WHIRLPOOL c79ae3c0897158263fdb82f1a18e8e1ead17afad95a5b3d46e0ead0f33dd97ce46d1b78bd562a19518a0ef01ee6ce071efa019da97f2dad04677eaa7a0ee4d80
+MISC ChangeLog 2662 SHA256 f94763c6bb4bc2cf86a5d2771e44bd9fad46745e09ca6aa24f26c8d049cab24e SHA512 c859a2c4ae1bcd7d5b5f8e192acc2a72ecb8a3fea00969722366d3542759a6a6e0411904afb6eb15cb447974c7027674b7e1eba28113d980b535f7af068be95c WHIRLPOOL 35b8cf76cef26e41d81ee9aeb81ce188ae44d8f2297c25d15ffbcbcf1667073b7a11a6fdd11ca4f4b02d5b2c60eda8cac0c98c0a6aca2e69f2754e5874a09e26
+MISC ChangeLog-2015 3364 SHA256 7d7e3153b2ddb72bfac443963ebaff0a26dab8f9d2e560ef04e4e893b396be1a SHA512 f64d261e785fd54d078d13fa1303a3322f68f6f184c4be857ad3caf4c4e45a6347bd91d75ce4c0ff10d3e5e11503918e8f888866d18ad2a9248da2a4eaf783ac WHIRLPOOL ae81c203052d57d49668374007c5b6edada3f16ce120722e3f842d9683d80d1e550063d9fc75adfd0965d2f8f9f55e2da0b179384fb5a1c95bfd6f18abd64059
+MISC metadata.xml 615 SHA256 7b9e9fceb8896b2c838d5b3318a644d107ce8ebf4069e7b2d4d081938521cd7c SHA512 865642e6651b5a897892e5b2fe48bdf0fcd1f173cbe1eccc7e101eea2b4779abf6ad2908ae9e51cb51c1a7386fa14ae759cbef0b09ce236a7e0b1e55f55c0193 WHIRLPOOL f1fe4c2de98eb3a90c597cef26647bfc6e65b5f5bd2476ef074ec305026a7b1256450faf32f0ec578ccaf61fe8912de1b8c619c0bc35fa6c315c695c9304b29f
diff --git a/app-crypt/ssh-multiadd/metadata.xml b/app-crypt/ssh-multiadd/metadata.xml
new file mode 100644
index 000000000000..142211018917
--- /dev/null
+++ b/app-crypt/ssh-multiadd/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>ashmew2@gmail.com</email>
+		<name>Ashish Gupta</name>
+		<description>Proxied Maintainer, assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+		<description>Proxy Maintainer, CC on bugs</description>
+	</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/Manifest b/app-crypt/stan/Manifest
new file mode 100644
index 000000000000..b4e3f4c51782
--- /dev/null
+++ b/app-crypt/stan/Manifest
@@ -0,0 +1,6 @@
+AUX stan-0.4.1-errno.patch 643 SHA256 951baf82c7fbe60e72d766fb76641441ae659f2a81b39b6cb5dbd50e714d7afc SHA512 3b1aaa533559252136d99aad482e26b41dc1a8516dbaf56ca3e7c152378f622b44634d0e54cc5803f3fb1f7aa30a2305ab16535cf1c1d1d3de60c6ec5b75491c WHIRLPOOL 2ac287941467a737361e807ac7fb98741a0fbd1288452901786af0093d98cf618fee7fd7e313d2b3766c73d28b36f5897b1f3d71a13fc70f58fb524ee8d39ccb
+DIST stan-0.4.1.tar.gz 37471 SHA256 b010ffa03d9ad8e8d7cf2cfc2692faec67f6e177ac54b432b2e2bff50b258f5b SHA512 f7c123c9887a6cf994d66d950fc50c42340b35ae6353b69918be95cc7886b59ed2042a85c40596dcf25724043810c50f81c977c54af26af0e7131c12bda0e00b WHIRLPOOL ab529e5bf9f761f99095d9442d03ff558002db6be85398f6c4925c8b8ea8314f70f461275307e6e7782f3134854bcade2a85cea69efe406c838aaec52065e900
+EBUILD stan-0.4.1-r1.ebuild 579 SHA256 fce4bd966cb9f43ae2d4644e5cb608b78bdb92e15ab1836d81a9218f40618354 SHA512 5984d5b4065af8dfd00b76487f00f7357b16de1e797c50366f4802969bf50fa7aa336ad07a84aa9dbe05867b1a3f4ece03938c7766bafbb93a0ca16ad9c1e35e WHIRLPOOL b7386ed758d163725e896b25b676d20d8138ba9f2057406387009ef02d0ed6dcfe36970996914d4790786a51ff46eb2708b9956fad4365ebb901cb60e03495e0
+MISC ChangeLog 3374 SHA256 90e9ba90acc1322e52c9e7b50318bbc0cca2b1f99996ae732ededff29bb80908 SHA512 dc95eae92f807289bfe9cafacc998acd1a7f9d7279f02939ce6114d89759747f09c869566908fa53d950dedbbb867c469a516598663d261a4040a6ccbb157058 WHIRLPOOL c45a26292c8cd719367bb09d2fd424d933ade1fe2b7fac93a006a31b45528624071ebb976ec6d837587820e16aac805315dd8f9bf3057a5b9d527992b37651b2
+MISC ChangeLog-2015 1379 SHA256 0b9ed3ab6881a4f28199b3afc8f8ebd49def8e464fca89d121e2c2a29946d75e SHA512 2628018201b8405e249b511a83ff50e1354ff59107fa3eb78ca97bf3f214d194895db78ff1b0d2c77101b3327c0107217eda3bc4fc461d7a64820fc6c8fa0473 WHIRLPOOL 9c06d1df4dac39251449ac484b4d355f5d169013fccdb3e861050be09880448c2683986d91dea50c21b03341dfd2bd42fd71aeee9feb24b31d8a4246636af9eb
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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/Manifest b/app-crypt/stoken/Manifest
new file mode 100644
index 000000000000..8beee4b5e083
--- /dev/null
+++ b/app-crypt/stoken/Manifest
@@ -0,0 +1,6 @@
+DIST stoken-0.90.tar.gz 116642 SHA256 45912c200e2bcf0d605ba4b1177fbc9191cfd0ca509dd33075fd7ba17ebd6dda SHA512 7c75a04ea6542a13d639bbb74523443e030559dcf65d181d07fc64277442500a8a18daf2351248a552e42daf815fe5d0079b5b559402522d45ac10ed7762c818 WHIRLPOOL cfeb2bf9ac173a5416a08c99405bdc2ea0feff10cb040ffe5e89fc95c570da369d85fc5679fdedcdb017fdfcc89374dfd8544f519b6df587cad7b4e7bc113f8e
+DIST stoken-0.91.tar.gz 116846 SHA256 5e5cce38e958de07b2d447d24e9564edaf566571b6fe04ce9099b5dc2dd3c0ac SHA512 7d34c3ec3022aabd909fcb89fabd03003fdc4d635a064401407ce78068c0965012b9b61b53ce2d6e018973fe2e23a7e4d35913fca564e0af65fd0f0fb7fb30b4 WHIRLPOOL 89cdea90c95f4ad3d5c1572fb42fac6630654ad6d92511e107d41540880920cb27402fbc7c9af2b8347200264dd79ff15c96d43aea0be148ed94bb056cc0d312
+EBUILD stoken-0.90.ebuild 586 SHA256 68bb85c12b974e28996d5de5ea167d30d96c79deff0adc388fa5609bec45c4da SHA512 b7b7738206f880024f284311432f8c5bc3afebc33350b3265523d2e07afb06c684ec96cd8b48db596f80074a6d1e23c0c223ea5b03a99564e8cdc27bced687e2 WHIRLPOOL 3d0a95ecf66e37c6067522580e6e80314a451917aea51f51f230719071ea24b4a3897e76e669522a0f4fb45b18551ac60b4a4754047a52a41c50baa9c2f7f562
+EBUILD stoken-0.91.ebuild 590 SHA256 8472967b9ce5c00aee2c5226879334e44ee9362e1bd88d0ecada824295478011 SHA512 fd091526f53d70e40fa927d7b6fc0f78594d728240a9083ee6b0ca57d63d03b113306b4681a6113b7731d643a0593bb06a55b376bf2d1c72119916d29c9dd036 WHIRLPOOL afbfcbc2385e38fdfdaaba904e3208ef1903394cfe57a007e8f411b5dbd0c22f508ccfad780295b6a17c5fbc4363db4661fd49be8be4d300b1a7d085777a63f2
+MISC ChangeLog 1768 SHA256 055be7e171d407e515390db2baceca5e569472228186ad71f9a0b715e5337601 SHA512 6a1214b9246886f2193a1e684ab93bbfc8b5cd16bd456508b0ebf1108a08c6d74bf73c3a52b9f32a2ea4961ff0ca9357cbad46287ffe6c29c809061fc3033a2c WHIRLPOOL 813e19f637dc3ba23f8d3aeb7ddfd71eec458d794f8d26f02b422dc5bf18a1ead33faf6c1d40235376dcf4d9322a330055fc98ea9920b590dbdd3123c59c9a71
+MISC metadata.xml 620 SHA256 19dc163e866490f1baf902ec20c52a6d794ec00d0aa26285b213460506890042 SHA512 bda231308c073a40db47dfaca96c6af8bf194d5ef4727e8c8c99ad1492150f79a9978daeb3ffe503db03501a0a6c6c465d036bec7ad58398319f8d01d27f7931 WHIRLPOOL 721d1b4712f13485be130ef614b021dea2b51f6351990ec628c3d7ca13e2b3a5b37e6a24991292a2f9d5b45014b71a7a72ded513abc92f34a891444ed07e3fcf
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.90.ebuild b/app-crypt/stoken/stoken-0.90.ebuild
new file mode 100644
index 000000000000..cfbe027df35b
--- /dev/null
+++ b/app-crypt/stoken/stoken-0.90.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 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"
+
+RDEPEND="
+	|| ( dev-libs/nettle dev-libs/libtomcrypt )
+	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/stoken/stoken-0.91.ebuild b/app-crypt/stoken/stoken-0.91.ebuild
new file mode 100644
index 000000000000..886714165d0d
--- /dev/null
+++ b/app-crypt/stoken/stoken-0.91.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 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"
+
+RDEPEND="
+	|| ( dev-libs/nettle dev-libs/libtomcrypt )
+	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/Manifest b/app-crypt/tc-play/Manifest
new file mode 100644
index 000000000000..69dfbcd19d18
--- /dev/null
+++ b/app-crypt/tc-play/Manifest
@@ -0,0 +1,6 @@
+AUX tc-play-2.0-build.patch 677 SHA256 0718b16ce239c4de7f04638a2fe8053e4da03559653a9ae9fe21da61e05d9cc6 SHA512 0f41f59b8fe4376f5d48dcb3e3ca76698b141924b6f0b3768eb46238f6d597f2a8cf3c6aa840bba57ecfd61337182eb48e627fc1a04b348849e8bc5346c82e9b WHIRLPOOL db674260859cb58990b87c94e99597200b9b69704934ebbda9ff64843eba6810bd45ac5c5344890d41f31e7619e696999397678e1f1c17c19fb56834e103d43c
+DIST tc-play-2.0.tar.gz 1015525 SHA256 0e17890f37e862746364b10bad62bbd9f3e2b2811a24b07df12eff266534e42d SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7 WHIRLPOOL 0fc8273debd60f421eecced41ba43bd5fc36c6fd09f48f365755bfe844bf3a425be79ca36ffe3011a01d70b9911da0cfcb0e21571b3af97ec9f8d84af3440806
+EBUILD tc-play-2.0-r1.ebuild 1153 SHA256 ebd58fe4f2e4320bbe054da538974acd86fc47aeaf26da0c088245394b872831 SHA512 30557168783f5b4b002610d424a01410f0cd2e845f4dac399a57bcfa42761823a391a5cfb717d9b4da1af9c5e09f87d114cb571524a6d32cbfc47b0bafd79410 WHIRLPOOL 952b3725015f48c6f6fcff826efde45b1645b7ffbb80b89461e0864805e1d6ae3111230f8bd8352d885906165e3ec8e84a749d21c0701548c136e7265cabb572
+MISC ChangeLog 2750 SHA256 bffed40b3f5d7e1d829609ab206553581eff01cd9f413b978a5987539541a125 SHA512 3e1c89fd6506cb2320c6ca9b61c6e88dcefe79e4f4a8703131ece19e0ec20e14330f7d9b29bd4277a2bef935c31ffba7d0026a5b18a6f756c56c9ccd719b4fdc WHIRLPOOL 4534905aa974ecd4025bf3b5a827ca9f07cfab93b3411a7ddcbd312527d2304e5d5f66b5c4c0f1f28ca4ad7c9ffb24f5a69c8c0e8bcbff1013b45088fd2f3fc0
+MISC ChangeLog-2015 809 SHA256 689ea475f1c76dca6361257d7e60b9552213f192ece11947f1f4850c24af25c9 SHA512 35d666d5d71af0ee33004a50176060eb68f542aa22d07c1ac219a710b318e2b13c8f7617186ec49ec18161b18b4c6b53926ca3d5e691ab91ce517ef8672d2a6c WHIRLPOOL 2d94939439235ec369075fa713d7dcb5cbd57c85ab5ad85f87ab2b75bc776a0034b87f68ef1e4fc9cdda9c994241d34807d308051975abb1c8ef2c2899151dbd
+MISC metadata.xml 329 SHA256 59747aa229b7deaefd100f012bea9448667660f036754f50526a44a0768aa0c4 SHA512 82f9a92ca705a89f30dd5ae33f45c7b233cd39894083572f8a17c60207d9de15d2188ebe6330da1765b5cd37ce656d904689c8862d3301fb1bd0bb001c1cef73 WHIRLPOOL 54a6a9ca3ae229c70d69fa961532ab9cec25e519052ab9b87e0b72539f228373b7b715b0ec986ae30842f36f94bcd989c95d950298aec736e7fe8a2d45c2eb8c
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/Manifest b/app-crypt/tinyca/Manifest
new file mode 100644
index 000000000000..8530aece841f
--- /dev/null
+++ b/app-crypt/tinyca/Manifest
@@ -0,0 +1,8 @@
+AUX tinyca-2.0.7.3-compositefix.patch 317 SHA256 24a42b1b19634216486095aa7fc5b4df76c7f61b4846e2fd4cb36a57b2d255f2 SHA512 c254b7fd39ffcc381c0d7b6787322e289a33d4d5c780d9cca6fad22033ffc7b933bafef464b20d8c01025529a2dc06eb8d9a41f6c01d2e60401792b18a4b743f WHIRLPOOL fcfc3b785ac9fd9ea01f3cf64e52bef5f01bde5738fe236558f1c9c4e104154cfa91909f2ad1d429ba18f13522fa8975179364845b4d876ecd3ebd745ec85a8c
+AUX tinyca-2.0.7.5-openssl-1.patch 1468 SHA256 2007fedf93708737950c9217460b9fa1df88bb535481e2b92db1d99a1242ab87 SHA512 5c5487eef82d30cf2cffc75d1fbd331a7c490dc30befa91ee753f4dd82bb8492089d162c3f15c20722df00adedf7db0bd30cf2b83363922a9402d66fc1abe8c4 WHIRLPOOL 061dc1805abb2cb89b13a1d83ce1a4bd0c1f637f1d1eebffdc97d089195e5c30abebc42d3b96f55834b68976a548074ab8e82b13316691cc36cf9071978d7c08
+AUX tinyca-2.0.7.5-perl-5.18.patch 1738 SHA256 156358824d5e78b1c7ba66abd58c04cb6f763cfe628e11a40254459fe34cccac SHA512 528a34b9ca9ace403949b6d347f91a4a33d94e92f867ea476adbaef745439706014c478be36ac6dd45d15f56f0ba2e1314c633d68285ca7879fa25dd0d3cee33 WHIRLPOOL 782ef65202e0d21cb1b71421625dc7de69b5b662ef637a7a7610ef6a8c32f1fa77fbe9c4ac2dafbd423bc87def64a289c55a7d6f73bb1a7ab87e3e00f7ef03b9
+DIST tinyca2-0.7.5.tar.bz2 172779 SHA256 dc7d8180bf1db572fa4b08e15ecf8a47fc1c5bfdb55109bf2b3a54f86e5e60b7 SHA512 47df0b995715ad973b12da7d2999ae90f8887549437235b287e1d294331adc8d527bf4435ce1c30df278db8e5f8fc7df29a35d3650d41bfd4d0a0a7c193994aa WHIRLPOOL 5f990529ee503f07d8df0132c1b5834b8353d4908650535adb67ba82f04b1472559dca40ee972e4ce6ac22f31706774c981fc8fc905964df4b837ba6bec1a9be
+EBUILD tinyca-2.0.7.5-r3.ebuild 1534 SHA256 6c5e3324b9bf589d4daffd2cc8ebe4dda4b8ef1fc80b75368c08a9849c7d27a7 SHA512 1aedaf75b97cd2931b579babec9ac73cf14ef19efa47fe0f268bb17abe8587599af5b892e4ef7a113128f703380c802561a5319456a45be548ecdc236f4a845b WHIRLPOOL a12205fe21d0d7d7520a862b0a54bfe1ed6a84863bf326656b73e25728a8b6dc9e7edc8d6c6b560285675d063addd7837be362e6855172d8f0e43e0a04542852
+MISC ChangeLog 2738 SHA256 2e6cdab00cfab16a6237ff52c0080e4e67c877ad3582091aba5efa44a47d1895 SHA512 dcdebf840be57ab38f0d657d40476669109c876e4012081aba3ed80b763d5b3d21bb97b92ea45cf57ac321237aa82bbc3433cd3d537431d886a9b5f2e0d73f8f WHIRLPOOL b39053ef334f84f4e3f684b89dfc1a436badce54a2107ef86953dab24140d22ad8524bcca5f5f1d172c8e705d8848b8e06c797f9d7d0b33692ab2a9c5101d78c
+MISC ChangeLog-2015 2385 SHA256 ea50920cfb7f09884f6ebd37c92484045bb1867ff17755138aa56197b920a044 SHA512 225cf18e1cf38123873a0ea19bc1dc9bfe1f80d6393c17e03553c5eeac9bb4fec7a6875aabc330082282ce7e835507fdbe9ab21c63dc47d370dd3ff4d253e79f WHIRLPOOL e1ab096e776c2f1ffdad41769eed78c702168ab5039f5156f32a273f608b8e27f9bb8a69eb7b87b6615b65898a9f1ef4b4ea0f6e2c487064f6f3a98e7430a152
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
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..ebe613387710
--- /dev/null
+++ b/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 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"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+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
+			use linguas_$l && locale_install $l
+		fi
+	done
+}
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
new file mode 100644
index 000000000000..17eedbe3131a
--- /dev/null
+++ b/app-crypt/tpm-emulator/Manifest
@@ -0,0 +1,7 @@
+AUX tpm-emulator.confd-0.7.4 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d55e9da848018c5ea66541ee SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504 WHIRLPOOL e95e8e0326f2c64695b63ba8242bf0ff9cdf256411b05b9aff9553b5bb69266d5a8bc1aef0cca701502ad94852cec254dfa0e74fdf546952f13afdabd9cc3598
+AUX tpm-emulator.initd-0.7.4 1100 SHA256 db1036e23b953ce7568eec3fe0ad0842d102429c06c87655065a51d6924b0cf4 SHA512 5fab6f4c9b7057fa1bf23b179747d125ec77729a1a69b762735c429824ce6dfee3033012b027a44e5c731ec86a4e78b8b64c44d27b207867a26a9663382a84f9 WHIRLPOOL 25b5c8fc5689dc5625149e34fec2b9e8b0b503bbf31d2360f9a033f854b23b86858114dbd0262d687bc538d9878651307c2cf0d2e99eb9878e3eb28c1c4515ba
+DIST tpm_emulator-0.7.4.tar.gz 214145 SHA256 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35 WHIRLPOOL c75d49e834f8df6c810d7cb7ca3553e742fde0fd6050af7f7aeda8bbdf652084dda6600719eb0b816e1d51bbc5d9f0e119ea40ce3e59af05fd8d55971056fd6f
+EBUILD tpm-emulator-0.7.4-r1.ebuild 1622 SHA256 1beca8929b6f101d95f409dfc1771db74a83a073f73abfebb7b98094f4fbf0de SHA512 0da1ea2ce5bb250d5c59b338b37e021095a775efdfda7874896f12bc60111d55e47f579f4459b5c7b893753e87bd6101ebc28e05c874b1340c48448909776292 WHIRLPOOL 4a0ab463e7d4afcb8ac6b5f08020ac19a72127d46ac1ea25c6b3f5aea585802fecb56c49b23695948d3b6f365d0852b864ea790a1ebbc84adfec2979f21aa2ef
+MISC ChangeLog 3387 SHA256 f55e1133580bf004cfe86cdd6497dd73f9e4da8376f4f153f800836595d19e39 SHA512 f5282dd2eae01c78af9221eb8c04e4b66a9b5ca8e2a9f675354a8bfb0aeff852c6c589eb3710bee63ae7ade9601c6273ef1658408e69ff75d0808160e47d318a WHIRLPOOL 5a2ab0aeb39d795129ab9244babe18c93f3c013871110406bc60f1e4f9a078c0c31b53ba46d0c2f0c3ff45a85a7a6625cb7014db484da39bdbb8da74e8863839
+MISC ChangeLog-2015 4068 SHA256 cf829802bcc9ccc92c8962e33f031b5a73ea11e79d4bd4df8088db6bbc1b3101 SHA512 bbf9dd6c4bdbbb0a0dec33a11bbfebd995e8d50b78126d0c9281e856d41316b7593c5b4080319d50e1e923e3c7a01488f4b29cfff81187290870a9bd6ff77e3b WHIRLPOOL b53340261f9e958ff00ebfcdf0f6bd854b8dada9d4d4ff5ce62616fe0b5e15211fc771d7b569154da4d8f4659229cffc5bf6a7f72bb2b3551777ce4375050c63
+MISC metadata.xml 322 SHA256 cf1287a6ed50b56fe582bdf43aa900fc5c4d4cf6c14d5ff97d04c7012ed9370a SHA512 59ca2140630f6c408c51176a30ad8357ecaf8c1a3b37b495176b25cf2b1cb259882dded5072440cfbfe2d16741520a0b30b41384db89c794ec183b318419b578 WHIRLPOOL 7feeeddeadeaa17e666f1a304709b12ea88edbfc603f706eba71776e935b788e3d8462297166ff4bdab7079359be9448f8a4200cb01722845cfea1031d7e0156
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..8b41e36c664b
--- /dev/null
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit 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 modules"
+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() {
+	default
+	# 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() {
+	mycmakeargs=(
+		-DUSE_OPENSSL=$(usex ssl)
+	)
+	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/Manifest b/app-crypt/tpm-tools/Manifest
new file mode 100644
index 000000000000..8496817a49dd
--- /dev/null
+++ b/app-crypt/tpm-tools/Manifest
@@ -0,0 +1,6 @@
+AUX tpm-tools-1.3.9-gold.patch 451 SHA256 6c52d134a917dc80aa50dc6a524ce80c1691663dad39ecfb3bf3ca5ee2abbc2d SHA512 7f9473a456c5901c28ec0394158e43b3d8cc3a9a994e5be5d1a45b20f5360f2f0b7778eb93246964192e19fdd140ee5b50d1852500c9aface2824d83c6907c41 WHIRLPOOL 744c17371dd3a54d78445a04bbcdc0864ba97b12f8ecc4a6eb4cc7afad406a70f745ef48fd098e275f4670d6037f61c023345c2399aafbfe88fc25c5fe9f02c0
+DIST tpm-tools-1.3.9.tar.gz 484023 SHA256 ea126c5cd2ada56beb5118a141a498053f2d85f56263d215784f0ed86fff4213 SHA512 460e56031aa65ede6b7aebf0c594d4093d870fb46f7c453c429e53cca442d4c7797ac29b519bca28d42133bc6d7701cdf938adbdf11f8be841157d4f4a3e17ca WHIRLPOOL 96760809fb5f2029f51a4051621cb4dd3a39af08d2ecb091619f848d541b2bd1d6f5e9cbd2606fcde2fb55c554cb3baf74c8b58ec29660d95c42bfad178bd96c
+EBUILD tpm-tools-1.3.9.ebuild 1063 SHA256 7b4550a5eaed6789fc1729bccb0199cb67b79889fe65e0ef1e25ae465914c38b SHA512 a6b15b03b9d4018932080890b5bf9f156e600e8b89a033b895d0be5a6d304571acbd601775886293db542800f76d2805b613298f01a802a2ecbca4a9ba2c9120 WHIRLPOOL 92f83ce049bb2e7b016f576c6e0cab6c849a58c2c21c98179533e42756466d12d5b7958e04f1bdd481b242702eb460c909b0703a2864b7350077038a47c29859
+MISC ChangeLog 3297 SHA256 988df9d3b3689b8d0b8b31920c7249aa6f64e61bd70683fb95f5cc90133ebfc4 SHA512 a9c4750db4d382397c48bb78c27bcdef1c748b321ade41dbc4a26de2ae4af518c57c068d4bc2d05ad5a4a95d4d0eb84699ccbcabc87f9bc2d1df1062d0e74c62 WHIRLPOOL 2e3f225ef9ca615b3ff79cf5c418f3aa3ae8b6f209d07cece334144f80423a9aaf5389278e1e9597a8f905f45c8ac394eec7feeda6523be0cc4f77e8d85108bc
+MISC ChangeLog-2015 4564 SHA256 55fdf46e5325eb598ec4f6b409e95a4ce8116e1dc217ee16eda6c22a7d606dda SHA512 12b99fc7f70a35f99bd0c5a0a4ffc3d2e6211a610fe87eeb7c44130c771453c99f619b815c539d75a21f64069d5f8a74f8629fd957ca8053be6392bccf448fb2 WHIRLPOOL 435c1dd957b2d83522b1f46673054dfb692363b51ef12cc382617cc899af6349c812aa5b4d0d84a1e05947f6c3470aee451013a6d6510d58ce5de049e2d1d0b8
+MISC metadata.xml 515 SHA256 4123a210fc80587b9aaedbb4efe808966c42c9d8d6791a1a64d523b118a2bd84 SHA512 5aea8cabd5ae0a00b4a49717efaf8ed6d6363131ff8bdc2a9167108297d32dee72c5419bbc84ae9ba1263d515dff2aa092b991c8411771a2b8c361bcf000258a WHIRLPOOL 5baf378031ba20696d9d05df78edd9bb4b92e766b720f60f1cbb920f55ebd025a70dc11753af8b7c67f76817e18f7362b039181c04b6ad52b33ba8b80faeb4c9
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.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/Manifest b/app-crypt/trousers/Manifest
new file mode 100644
index 000000000000..65e6e7fe0ef3
--- /dev/null
+++ b/app-crypt/trousers/Manifest
@@ -0,0 +1,11 @@
+AUX 61-trousers.rules 96 SHA256 8f25b51dca45b75caa85a00ef476fb40c09d6cc82e2351cb7af24ebc805dd949 SHA512 83fa5b8666bcb0111f69456e6b9ea73eca2e1933e44bf7b705ff4d3c7b63a63ae4d0a1c30b0a00ebe6a8b4206ed7df80abca8503ace1c795119213f3546e9307 WHIRLPOOL a6ff89249a9ea7d5a7d308f0446e304b4429992bd51953e4dbe1a87731c7b8c824b1d158fc1f734965c082508b1ed334ff4303bf610228228c858e29cfe71664
+AUX tcsd.confd 372 SHA256 5a1f9150ce0d8cc3e9e80971e073ee0b1db018ec3af6809087a7c626b9ffa327 SHA512 1e33f521156d55ff450907e01a7c60750e2880520700de1e8fb42ed03d5a16a20332f6f437f2cc7ed155f65b9306bf2d670f46c4b7055d4c9248beaeb06f8a75 WHIRLPOOL d94c3719b438c2758d97f00dab463b9b76b0fc2d9329dcc9cd8867150a7f5351379254868165df8e19ef33ae0e9d6ab333706952dcabaf0da18833750c35f42e
+AUX tcsd.initd 843 SHA256 9d3051516dad5ac176455f9d7f1d5414466c1a0859166b2e3c2f23e1c19aedb1 SHA512 7bbf7e7bb8829d8aea8d8cae060bb8cb4bf6d2ca9396970e95d082792597cec0babb26913ff28afb1bdbfc781286f7795161e074c1da97a95a1e33d8814af480 WHIRLPOOL 3e56e305bcb81c90f2008a32e94dc8d9b2f719183794400937d3a6b20e45629f6151b3d7613623823984d70f99e9a4e6a3de82c1b1a5818aa565b7e3996f20d0
+AUX tcsd.service 131 SHA256 704dbb2b06a3e357fe2363d2cc88632ccd18dcdf14dc7640cd67272df5a52ade SHA512 e516bde8ce45fe4ad687aaaabae475da9c20a9fbd8ebee736d09ceb6efa597efb6f3bb99840a4c0d2c9eb77c2824df6ee45985b46dc8cf924b4eed67eeec1468 WHIRLPOOL 851f6ef31d93a7fd119cc4bc70c28410539fb572158e8238b72ea177e5a75e2a48382807ac14203eb48a21e5432c5c0c35cf25619557d9ba741328f3f79ebfc0
+AUX trousers-0.3.13-nouseradd.patch 606 SHA256 af43a38991c10db8a817faaa4ff244f3600c90a10e26a0232e7668f15f84e911 SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783 WHIRLPOOL 2ca8c22aa11aee2f06ce0dfc7c2d035b10724999302818461e72ed9fc29d813112dd52ac80ac7c1027b301f7bdcffe085537dfbf05affebf3ca96992026ae11b
+AUX trousers-0.3.14-libressl.patch 783 SHA256 6e42e93195470626718859b960bbdeebc311dd6ce45b23265307cd25a07f013d SHA512 5d813efbe5cb5568ef084c32d5c049f73943b3c08645fb1b8ba31b188c5c332bc39713bc6895573f472cff94124823c9f545498d7b774027c2724733be910f42 WHIRLPOOL 99a9e0bb4120cc1f65419792079e57cc9f1ff9371cfb931c14167432cb0adb2671c3738346117b2e93316e80410e8328920ac60081490ac221d15cca4a39e856
+DIST trousers-0.3.14.tar.gz 1378438 SHA256 ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21 WHIRLPOOL 1e1c51774fa796c706858d008651182673f7a88532cac35d010f4bd713fe50c1151e0a5a7ffb6975e8a050a1aab6edeb09d1672407025a776625c9b4f2912c88
+EBUILD trousers-0.3.14-r1.ebuild 3010 SHA256 1f98a829c6496e87afccf64a4617e77aea712706edf1b102915295d6688f7b42 SHA512 8eba2e532b2c55f035f8d25cfeec1367db9406c686cad8ccdfb644e065284169471a97dcfce07b6af90817398bc351f4251b176c70ab3d8b0f548b17e1169d37 WHIRLPOOL a9fc9d398b31f1b7e11e7d447c1806424d89741f0b8a8a43a910e5a5933f03e1ab21772e3ef4e875eda4612481f02c5f81f8fbb8ee507408ebef521573f0f967
+MISC ChangeLog 3539 SHA256 a6f2d415bc7d45dc1a599887e542c156a85f34ecf6ee5ebf4b6042ce9e6b52d7 SHA512 9e0a201fda0a70f6d0c0358b96e442175fc92f56e7bc202afb85dd50108b4097d4284d572dfa7a8822bf864169d5f108655413d596603d568ea1d4d271b18e18 WHIRLPOOL 11a1bd41ccb635c915e6def78b4d4952453410a4ed806905399f67a2c4ae2941afb9d8a7df5efd2661cd6be9391f57a4dda5b114810765ad62475a4bbc70df0c
+MISC ChangeLog-2015 9637 SHA256 08e62c19dc835915e45e8fa120f7945bbaa3dbeb464ef8dba9b106cc3a9d2e15 SHA512 415e7e6bb7d24c1da939867b751187f96eec3fe10d47c8003d2160644815dd72f07cc278dba6807f7403c2edff166f8db5e6e3c4b5d23153f060210063fa07d8 WHIRLPOOL c5f9422ed04064397d28ac87fe9eb93cc3f669a6384170d95015492b07614e61222e03f064acc36aae0fa4f63741107743f942277fb9743ed9a4dfcd49d54daf
+MISC metadata.xml 389 SHA256 7dbbd869e69acde7899a058507a0db99147052c68f4e630a1f1cdf3d111044f7 SHA512 82ef49bce01041185282168653e951f7fc2b68e6e00a2e604765640b7a5ab3f3f73244ee6837004415612358d89c7347cc7c19df333539b534d04308d8f1b4dd WHIRLPOOL cecca9475a84039019495b6111dfd91e2ea2eb0e835997d15c4b9e15027e5610bbe72db7751d466c93d3450d043ca93a8ff901b2f1664a08c9a8d3ebe2f4b8b2
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/Manifest b/app-crypt/ubuntu-keyring/Manifest
new file mode 100644
index 000000000000..694bff2d1c3b
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -0,0 +1,10 @@
+DIST ubuntu-keyring_2012.05.19.tar.gz 18495 SHA256 8b3bb00770c7b1e5c0abb215ecf8c383cb3b709292a52aeb1022b5556e768b69 SHA512 3f33099255af9aad1ae8ae845074e714dc846134f49934b221a74c21ef35af5172dc1d845d3819cb28f353abd23df690b15fa0e7f74f8e2a882ddef1ab150f54 WHIRLPOOL 3c0fb09c0295c036fd35d1d53f5aef7ea5d40228563c253dc2e232a059baaa9f443daad34e841fdd9bd216950fcfda81145b85606bc43e9b783cb723d6241c6e
+DIST ubuntu-keyring_2016.09.01.tar.gz 18251 SHA256 d0b49ab9d7e04a863e4194be787194f2de9d2350337ae898612cbb2e8df09b85 SHA512 ae48fb7a57c95140abb38fa3ed0484acf5374ecc562b54ca321a1c33e76178c3f9e5869ceca1f529686135d601f5738d4426589e558f65923271ca5d2f16ebe2 WHIRLPOOL 6358d1f1b8534e8c09b79f4819c3facd29d98c05c9739e81a74e5d3fae20dc5b4075a94af89482e4285ec275ee8aff8e6a6f297fef93db362dcf61607c7646dd
+DIST ubuntu-keyring_2016.09.19.tar.gz 20282 SHA256 e43ddc7e123b3c620778dc0a849b006f3cdff27093e917212d797eff56177492 SHA512 2dec94d99502730f455ca9832a0f20a027fbcbd896124b93f79dbf0b2c15e73641719626c08caaf9d35922d569929097f2e2189bad855d12bf4cddd2e4379d19 WHIRLPOOL 8fc7ffd845c8ac91e633e6f7c667d3198bc4b8b24f8b71b201723eb8638972a6353b321b7bbcc01a5d6a5b2cd5bc0d339577beb06a6fc6fcca0e74ccd443991f
+DIST ubuntu-keyring_2016.10.27.tar.gz 19182 SHA256 dc0b83433b28e5acedf39330bedec2cd102547570d1ae135497b15bd6ac85abe SHA512 ac4b4353a89bd15f8511ba1cecccb6597c407b67b4642c24ae1e461b2be2a5b2989bf5bc033cb2a265217688a366d2c2907b52bc1e484061348cb218ee5cb6a2 WHIRLPOOL d1273d748e686807e582c72edab3b415879839d60f9232cfdaaf5237f877f945cb9be1f7a06d8f39cee7090f204d4840309a6282fc0f08a15f6614e49f2396eb
+EBUILD ubuntu-keyring-2012.05.19.ebuild 455 SHA256 001489ea903ff8890e12010a17fd623554e540761bcb16a862cf7b3da3d0218d SHA512 769b976910747fe0fd14d3f3da674215131323fb4cad95498474abb88136ad64aa7b9792828f09f3b30cc39908b14e9bea4cb7351fe146493d252777740224a9 WHIRLPOOL 3a13f68264244bcfd9771360a083d775f65468b9cc31d74710346132027a3c352fd93d7619694b3fcc402917a36734f39ab15b1139b311cbec072fd81dcd5ff6
+EBUILD ubuntu-keyring-2016.09.01.ebuild 457 SHA256 75286b13271f22df7623f8e67eaeb028088663386cd6df4e1bf9303310aadb4f SHA512 7d7bce997366bde8eec384d1edefe465359e167c925e72ea8f514d667f0eb760ac98b8e9eaa0a7c880bdcfad33ea8337e00efcdf787a76522db5c24f1bd62468 WHIRLPOOL 66b612a0a58a84640f721d465c35b8bd11c5bfa686c25cb9e1d55282941a40e1383e6f596da24f8027e1b27da4e229ac8a5338bcb750a31974635ff6161b1811
+EBUILD ubuntu-keyring-2016.09.19.ebuild 490 SHA256 eae943fb9183d102fded7ca2f73c5df2d0b151dac15e6c831ae0a449c5c8e530 SHA512 6c1dfa4f14c8f06db782307102ad909af3a848b6da3cbb5784500667567bd72cab8db25cb553e5358cfeaa14be9274530d1f2a96a5e9ff6b0ee86c3756209287 WHIRLPOOL fb603c0ef6e492ed9accbaf3a1401101f8417347efed48135f55e41c746b435fd2929affdc8d441c1754969f203244dcf3df4714ad839ef311f0819d01eb666d
+EBUILD ubuntu-keyring-2016.10.27.ebuild 455 SHA256 eeedb8ece069500861df15e67cc51f5576f37de7ea9b76a248a7e478e62e625c SHA512 98a2c935e545783920dfc940df4756141ae39ef2cd9beb5d1a96423671d06fff9d2aa81b308c891d47b5196b46cdc254c2efbac2c72ecac59d7c4c11f5fa8ae7 WHIRLPOOL 9f74174afa728aab0966feb1b210f4910e7fdfcd21e3d7ac5a4c445f8454250c9bb2eb9ec945943d3a19d18d5cd4ef1fc061098fc56b8e9e13b1a3cb95e5b605
+MISC ChangeLog 720 SHA256 07cddbbd8057de590a7d9b52bc5bf3e412bb4bc97374f8501bd1f7dd5aa73106 SHA512 779a6404ab52e1d3b9385ace9595a6585828a182571af134e502bf4d8c820153e16268157147d6f9e0fa9a02b341589889e873e446ba6d53f0494e6117fccfe9 WHIRLPOOL 058b929cc0e93a61d3d3832f1ffc57c1b5223b9e7f6674842fe69c8e426d7a8d68f46c68ea7604b8fd014f2ab9d6da94d36fb45e66a5246fb6eaad1d15262661
+MISC metadata.xml 249 SHA256 abaf8c3d7632caaacd242fc7f4d5b1377778c50c7bfa5c356b35773f377d4f69 SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273 WHIRLPOOL cb6e12eeeb412f25a85ebc6322f4b22a14c7c23fc7d49a46e8168cdbf425e121a276fc4e915c4626ed9b64d7f7aef50ee11c428ed149126999d277adbea1f57f
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-2012.05.19.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild
new file mode 100644
index 000000000000..a42086dffbd1
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="http://packages.ubuntu.com/vivid/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/ubuntu-keyring/ubuntu-keyring-2016.09.01.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.01.ebuild
new file mode 100644
index 000000000000..6444b352747f
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.01.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="http://packages.ubuntu.com/yakkety/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/ubuntu-keyring/ubuntu-keyring-2016.09.19.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.19.ebuild
new file mode 100644
index 000000000000..f6c8e5dc7fb6
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.19.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="http://packages.ubuntu.com/yakkety/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=""
+
+S="${WORKDIR}"/${PN}-2016.09.01
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.10.27.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.10.27.ebuild
new file mode 100644
index 000000000000..fe1e09ffed51
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.10.27.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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/Manifest b/app-crypt/veracrypt/Manifest
new file mode 100644
index 000000000000..56d0a41fe94e
--- /dev/null
+++ b/app-crypt/veracrypt/Manifest
@@ -0,0 +1,9 @@
+AUX veracrypt-1.19-execstack-fix.patch 1682 SHA256 02a3438d64d954d85b473aa1ace89e71363b5875c4bf5c2920eddd173fc7fa61 SHA512 df7e64a7badfdf97447991cba7c7f87c291c89735b1ffc72b2cc882da05b2df2e2c31ee9aef4415c4d0316bc6e0a9c6c10e01406c00bd0f032931e55cd6465bc WHIRLPOOL 1ba489a2b76142b6f643aa55c663bf33e4195abe14500329ef6fb16a2b67bede77f035153c656d530ebc1e00b34942cc0d83d699de163284a28ccd940d0930bc
+AUX veracrypt-1.19-makefile-archdetect.patch 743 SHA256 7fb32b4b87288ab1690a1a03fdd59abef792cd99d190b6481d6db48bf460c039 SHA512 aa805312c5e3782452ac936a3772a0877e866e1116f2da56747b72a6f585538fd1e45a7c7531c426ff0245b5b3ac4964065e1196874aea4c11e91ac59bd6fffd WHIRLPOOL c084b448bcb5fc0cc679feecf05f6b5fde74d69c1ff2fd5c04f9da480410d526bd287ef58f42df19210eb86791de1e794ec756f0c94ff06164f23972b7c73261
+AUX veracrypt-1.19-remove-packaging-from-makefile.patch 2098 SHA256 c5bb5c3f419d092e2b573efff350e0abe4919f9520aacec43fd19fef75480f4a SHA512 e6485ce39ca009cfabe5656b3ed81cd72ca0207d9b1c310738be60705e3c94f2364cacf393b7f1d0d3e79a1ee58794dfda1d01aaa03778597c149a9dfc5634dc WHIRLPOOL f5815101600050a7bc715813783cd5c479bb9776f0b921b376729c07316683ef851ad6b26688c29f2059d8c14bd0a01a33704e9fea63b943ca3187d689d1c0f6
+AUX veracrypt.init 387 SHA256 9f437374393881bc760860492e190957f816bc7d9dab0dd9a84f89479f00e536 SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d WHIRLPOOL ae9753258da5ef5c00f9a94b471d5c83ebd76021465bbc2d87656eb594dad24b4ad4e24ce1c57eb53221ea1e2db0f08239630a346653359ab974edf164b2e962
+DIST VeraCrypt_1.19.tar.gz 23235780 SHA256 7d3fa5007b8e9dc93691c2da78dee497954b0596763a50e21724ec0564eb761b SHA512 ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164 WHIRLPOOL 7a1968e29a6f2757c2d7a1187e9e062872ffd26721b27b3df791cbe8c82c18dc98d42d249725f8bc4fd721fe80eb7dbe4642dde26f89ad0c0f84803c1f06a439
+DIST VeraCrypt_1.21.tar.gz 24106162 SHA256 4071d3d1e87839a7c2bdc9a3837940d49f38bfd92d71f9cbc670b61a48824885 SHA512 5186d339f8fb0d88acfc35b1e7a916f797e30be93e8f252cca542b6d5c1cd916110111ef7b859d66b1790ce05d7d02bc72def26857eb003ea114a911fcec6c41 WHIRLPOOL 80f52ac1917e251e3af9a227c544d606ed303e899d87d74121ae775f09df4be75bbdf8b77b0caa24adba809314bf8661e49c7e313ef0e4cee2f63cdc2bd3a48e
+EBUILD veracrypt-1.19.ebuild 1988 SHA256 45747134c4fb3aa7789eb9d3f0976b5d25be02aec5f3373301dbce735d8f6216 SHA512 b9829bad13c5ba781d9ec2e8353ed72f30a23459d3e9eaa7384a5718be051f1eeff70c3c097225c8f557c57634d7b14b5db83bb189671630c673568667e67da0 WHIRLPOOL 97392e7cbdb02b6e3b2a1585bca22b5812666ca82b36c86ffff57a99b8a4713e79caaf7f2dc3e3f42e34a14dc021e74174dbcbfa0ffd170f3d959ef9fc4c39cf
+EBUILD veracrypt-1.21.ebuild 1921 SHA256 9982530971fc147c8aecf0de8d4dc9cd83b56f8c073c79e6c89d94380157c165 SHA512 1766b6db76015cc6fb6f147a8ba1f75795b7038d402c38129c60cbdb09831dd0aed2241d4ec9d403cffa8dfe38f3481085c64ae653a49362be39c08f462de1dc WHIRLPOOL 54533bde185a75afdf9684dc30d42086e0077fc93a8bf6fcf9f87fc4b9493d13889475936fbbea3cb8d98f1c3e578957c20aa0f28d6ce929f55c53ffcb831713
+MISC metadata.xml 726 SHA256 da26c172060e3e4b43abfb4401698d6fdbc9c68d6d6bcd3399954a8d079870b1 SHA512 7898d7a419ba57600609578ae308d558d2aacf6b7dcc625adb6adfadca9b6f580123650d63ed8a618131459f71fc9a1b2b367745e2f07da75cbdf6ef9c1595bb WHIRLPOOL b35c03a067b6fcdf1ca0f9fa8f7bbf15c8e103f30a3c7c8c649cd7adf5643fe65b6447ff2ce1613313a8c8e06497c80e326e9d589d9e083f55a1d2f94a9b4dee
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.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/xca/Manifest b/app-crypt/xca/Manifest
new file mode 100644
index 000000000000..48162d9d1377
--- /dev/null
+++ b/app-crypt/xca/Manifest
@@ -0,0 +1,7 @@
+AUX xca-1.0.0-desktop.patch 391 SHA256 ade5c2271cc7a613550ac15008a78e66a8b2eea6a8cd632d217a87aafeb2a1fa SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163 WHIRLPOOL 5e099d43305b87be7c6dabc32a6d56447dd16905c25370c8f0271b6e7f1ce370a6d9844a98cd83d71d8e13d3b97f2b890a96973fccf514ef6ffc1f1e15f12f15
+AUX xca-1.3.2-build.patch 5871 SHA256 f080fe286887d88abb4bdff366b09743fc020384603a3d8b4bb7596a92a92ecd SHA512 1007fa6aa54273e1d279965ea41945063288eff72622325bb61086b288234fcba45f962ced77ddc037f1a64838204614b1a15b1b47d8d7a7b7699374bd54938e WHIRLPOOL 5420556304a56c8789f695aace3821652a6a14d417bf62f7434f26a3812be718afacd0542984c0e1d4e1936e597b46b0efd3294fa16c7c2340ea21ee473c5840
+DIST xca-1.3.2.tar.gz 897947 SHA256 04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2 WHIRLPOOL 11a19800447fe939d1684524c4c0da90dc8dde4dfce4ff8f606d384f976b0d6f067e8455e3a90facfbf99a1cc651affdffa9397a9a8191f1fc8d302944ea730a
+EBUILD xca-1.3.2-r2.ebuild 1107 SHA256 1c645ab0059d23a1e157fc3d59685425a0de5186f57253ac7e1460844a562a19 SHA512 9379423c902b218ba5b7d60de2d8074c05e7a65a2223e723429ae47f4ef491b215ab3c68d2204f80b9d88a16207b4b30c993735e73d0ff2f5ed38b4588190de4 WHIRLPOOL f00d4345c50366f85974f3b2337012161aed81c180c8b7c9d3cc37eb1d5f9c6f57b16941bafc108539a89015cfa93fc0c6112615fecc7d7b54f40d3cebb328a5
+MISC ChangeLog 4863 SHA256 542d87d9dad5f4a2a9648cc4f4df52d5f0439ff7aa62a68902a5d6006f6d9890 SHA512 8578dbf02e78f6686663599c4eb2a2b10b4d719240613435801292eb91111c8b0ab9417b976daaa6c14f15a6b3b7cc9819959e9ae166dcc6a96f80d51342812a WHIRLPOOL 06f82b4d247950072198c07a95450c422b0272dea6abfd6a0186ce1036e77a0feac18c6acba2eddfc2f752b20d11f198be1fe3e96d4feb08d94e81f40327b22f
+MISC ChangeLog-2015 8293 SHA256 21d818f511d2db9d702faf69f782c730b0942c32cfa101bc272b244acdd3e4ec SHA512 e11624269a4c9c1b76b50460ec01b6954f6c2604dd7197de1dfd74fd4a9409fb77f11fd7c69885038e9e03f71838392b83ec072958dca9e33ef4de22335edc33 WHIRLPOOL 6dcfb91dd0439f68dd1e5d402ac1ef41004e130b06975b61ad15835f5337db93d221adef26d4d27b9eb1e1aa93a304a160cbea1aab107488b66fd586e042b258
+MISC metadata.xml 313 SHA256 252781b41a7fd12bf0edaa3c61181994d417df5e7be398b1a58fd9e837a0e8a5 SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1 WHIRLPOOL 8fcdac58c7f74d858b6f35fd39f2f0c504fcf79cd59493faebab7f2e3534c727d3e03da833a734c66081ba6425d50e601810bf07edc7c1fdf832e33d25362523
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/files/xca-1.3.2-build.patch b/app-crypt/xca/files/xca-1.3.2-build.patch
new file mode 100644
index 000000000000..9ca8a670da33
--- /dev/null
+++ b/app-crypt/xca/files/xca-1.3.2-build.patch
@@ -0,0 +1,180 @@
+From 476aa73644e6b3d353a1ed1cf3982e7114875088 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 3 Jun 2016 23:15:29 +0300
+Subject: [PATCH 1/2] build: add --with-qt-version to force specific qt linkage
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 43 ++++++++++++++++++++++++++++---------------
+ 1 file changed, 28 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 32ba42b..8490a88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -90,18 +90,28 @@ if test -n "${_QTDIR}" && test -d "${_QTDIR}"; then
+   DYLD_LIBRARY_PATH="${_QTDIR}/lib:${DYLD_LIBRARY_PATH}"
+ fi
+ 
+-PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [
+-  _QT_HOST_BINS="`pkg-config --variable=host_bins Qt5Core`"
+-  QT_MOC="${_QT_HOST_BINS}/moc"
+-  QT_UIC="${_QT_HOST_BINS}/uic"
+-  if test -n "$DARWIN"; then
+-    FRAMEDIR=`pkg-config --variable=libdir Qt5Core`
+-    Qt5_CFLAGS="$Qt5_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers -I${FRAMEDIR}/QtWdgets.framework/Headers"
+-  fi
+-  QT_VERSION=5
+-  QT_CFLAGS="${Qt5_CFLAGS} -fPIC"
+-  QT_LIBS="${Qt5_LIBS}"
+-], [
++AC_ARG_WITH([qt-version],
++  AS_HELP_STRING([--with-qt-version], [Select the Qt version]),
++  [WANT_QT_VERSION="$withval"],
++  [WANT_QT_VERSION=detect])
++
++if test "${WANT_QT_VERSION}" = detect -o "${WANT_QT_VERSION}" = 5; then
++  PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [
++    _QT_HOST_BINS="`pkg-config --variable=host_bins Qt5Core`"
++    QT_MOC="${_QT_HOST_BINS}/moc"
++    QT_UIC="${_QT_HOST_BINS}/uic"
++    if test -n "$DARWIN"; then
++      FRAMEDIR=`pkg-config --variable=libdir Qt5Core`
++      Qt5_CFLAGS="$Qt5_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers -I${FRAMEDIR}/QtWdgets.framework/Headers"
++    fi
++    WANT_QT_VERSION=5
++    QT_VERSION=5
++    QT_CFLAGS="${Qt5_CFLAGS} -fPIC"
++    QT_LIBS="${Qt5_LIBS}"
++])
++fi
++
++if test "${WANT_QT_VERSION}" = detect -o "${WANT_QT_VERSION}" = 4; then
+   PKG_CHECK_MODULES(Qt4, [QtCore >= 4.6, QtCore < 5.0, QtGui >= 4.6, QtGui < 5.0], [
+     QT_MOC="`pkg-config --variable=moc_location QtCore`"
+     QT_UIC="`pkg-config --variable=uic_location QtCore`"
+@@ -112,18 +122,21 @@ PKG_CHECK_MODULES(Qt5, [Qt5Core >= 5.0, Qt5Widgets >= 5.0], [
+       FRAMEDIR=`pkg-config --variable=libdir QtCore`
+       Qt4_CFLAGS="$Qt4_CFLAGS -F${FRAMEDIR} -I${FRAMEDIR}/QtCore.framework/Headers -I${FRAMEDIR}/QtGui.framework/Headers"
+     fi
++    WANT_QT_VERSION=4
+     QT_VERSION=4
+     QT_CFLAGS="${Qt4_CFLAGS}"
+     QT_LIBS="${Qt4_LIBS}"
+-  ], [
++  ])
++fi
++
++if test -z "${QT_VERSION}"; then
+     if test -z "$DARWIN"; then
+       QT_LIBS=" -lQtCore -lQtGui "
+     else
+       QT_LIBS=" -framework QtGui -framework QtCore "
+     fi
+     AC_MSG_WARN([Qt pkg-config failed, using fallback defaults (${QT_LIBS})]);
+-  ])
+-])
++fi
+ 
+ AC_SUBST([QT_CFLAGS])
+ AC_SUBST([QT_LIBS])
+-- 
+2.7.3
+
+From 7112df9532f71cb3a150fef61b2d7e5d9899634c Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 3 Jun 2016 23:58:01 +0300
+Subject: [PATCH 2/2] build: add --disable-doc to disable doc installation
+
+---
+ Local.mak.in |  1 +
+ configure.ac | 37 +++++++++++++++++++++++--------------
+ doc/Makefile | 10 +++++-----
+ 3 files changed, 29 insertions(+), 19 deletions(-)
+
+diff --git a/Local.mak.in b/Local.mak.in
+index cd5ebfc..d993b8b 100644
+--- a/Local.mak.in
++++ b/Local.mak.in
+@@ -19,6 +19,7 @@ STRIP=@STRIP@
+ DOCTOOL=@DOCTOOL@
+ MACDEPLOYQT=@MACDEPLOYQT@
+ DARWIN=@DARWIN@
++ENABLE_DOC=@ENABLE_DOC@
+ 
+ PACKAGE_TARNAME=@PACKAGE_TARNAME@
+ HOST=linux
+diff --git a/configure.ac b/configure.ac
+index 8490a88..03d729e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,20 +202,29 @@ AX_CHECK_GNU_MAKE()
+ 
+ # linuxdoc application detection
+ ##################################
+-AC_CHECK_PROGS([DOCTOOL], [linuxdoc sgml2html], [":"])
+-AC_SUBST([DOCTOOL])
+-
+-case "$DOCTOOL" in
+- linuxdoc) DOCTOOL="linuxdoc -B html";;
+- sgml2html) DOCTOOL="sgml2html -s 1";;
+- :)
+-  if test "${srcdir}" != "."; then
+-    mkdir -p doc
+-    cp ${srcdir}/doc/xca-doc.tgz doc/
+-  fi
+-  AC_MSG_WARN(['linuxdoc' or 'sgml2html' not found, using pre-compiled documentation])
+-  ;;
+-esac
++AC_ARG_ENABLE([doc],
++  AS_HELP_STRING([--disable-doc], [Disable documentation installation]),
++  ,
++  [enable_doc=yes])
++test "${enable_doc}" = "yes" && ENABLE_DOC= || ENABLE_DOC='\#'
++AC_SUBST([ENABLE_DOC])
++
++if test "${enable_doc}"; then
++  AC_CHECK_PROGS([DOCTOOL], [linuxdoc sgml2html], [":"])
++  AC_SUBST([DOCTOOL])
++
++  case "$DOCTOOL" in
++   linuxdoc) DOCTOOL="linuxdoc -B html";;
++   sgml2html) DOCTOOL="sgml2html -s 1";;
++   :)
++    if test "${srcdir}" != "."; then
++      mkdir -p doc
++      cp ${srcdir}/doc/xca-doc.tgz doc/
++    fi
++    AC_MSG_WARN(['linuxdoc' or 'sgml2html' not found, using pre-compiled documentation])
++    ;;
++  esac
++fi
+ 
+ # Setup done. Write local.h and Local.mak
+ ############################################
+diff --git a/doc/Makefile b/doc/Makefile
+index fce4acf..7bf802f 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -17,13 +17,13 @@ xca.html: xca.sgml
+ 	echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' > $@
+ 	test ! -f xca-doc.tgz || tar zxf xca-doc.tgz
+ 	@$(PRINT) "  DOC    [$(BASENAME)] $@"
+-	$(DOCTOOL) $< >/dev/null
++	$(ENABLE_DOC)$(DOCTOOL) $< >/dev/null
+ 
+ install: $(doc)
+-	install -m 755 -d $(destdir)$(htmldir) \
+-		$(destdir)$(mandir)/man1
+-	install -m 644 xca*.html $(destdir)$(htmldir)
+-	install *.1.gz $(destdir)/$(mandir)/man1
++	$(ENABLE_DOC)install -m 755 -d $(destdir)$(htmldir)
++	$(ENABLE_DOC)install -m 644 xca*.html $(destdir)$(htmldir)
++	install -m 755 -d $(destdir)$(mandir)/man1
++	install -m 644 *.1.gz $(destdir)/$(mandir)/man1
+ 
+ app: xca.html
+ 	mkdir -p $(APPDIR)/Resources
+-- 
+2.7.3
+
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.3.2-r2.ebuild b/app-crypt/xca/xca-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..c0ef3a8d4f8c
--- /dev/null
+++ b/app-crypt/xca/xca-1.3.2-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="http://xca.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${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-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"
+	"${FILESDIR}/${P}-build.patch"
+)
+
+src_prepare() {
+	default
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	# bug #595440
+	append-cxxflags -std=c++11
+	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
+}
diff --git a/app-crypt/xor-analyze/Manifest b/app-crypt/xor-analyze/Manifest
new file mode 100644
index 000000000000..83edf0570e3b
--- /dev/null
+++ b/app-crypt/xor-analyze/Manifest
@@ -0,0 +1,6 @@
+DIST xor-analyze-0.5.tar.gz 26635 SHA256 5f66b0f11fd284335780781aa0b18abef4d03fae7808d5e99053ee5f05d41ce9 SHA512 e28aef799dc6f64a57609638f578bbe66c3ced5784599a65be6bf4ee14921600b7d292880f1288b5ad81ed3dd0897b6aeff2d741b96efc30cf0eab453e4b21b1 WHIRLPOOL b81bf3f384fc085a9ee5b0b4ab552efc9fff2d47a2f0b9e6fb2b1842a6e30202a7d7ec104c1beac680c0be6caedb4b770231b2ec6cd9f0b204361f0fc92b7b35
+EBUILD xor-analyze-0.5-r1.ebuild 616 SHA256 803ea165498584a95264d4ef97f673754a2e227b0dee206087a77af63a6df923 SHA512 c70e36656798f14edef3fe17662e8c4d08bcf7e29b61426d36c35a0dedc4e06139cb537023826ccb5c441d02f56d5e7d8dfcd9496b103c86f526cc87a121ceac WHIRLPOOL 2287267d40071ff3cbc696ca9715380aa9ebbe5d3e01a42abb7c950d365dffca9345a2ac05482b28f982a56d4beb3c381cbad864a143d80fdcb07329b5235dbf
+EBUILD xor-analyze-0.5.ebuild 613 SHA256 a6af0441128592729a409d2472cbd8bc8530940378b6be5c566cd5f1ff8d1e7e SHA512 9b891d788cf3c253dd27dc370b9eecd9173b0f0fd56ffd7654e62334914dab7dab7fed69e202448772486838f1f4733009210f52c6f6c7457bacb0f46f1e5a29 WHIRLPOOL 486faf100d6cd4493e0a8c95d7cc7523ee6c4e1e31115b72fe7522ab459e6a907b3daa744fa6fbc45c2a5db101b0ff96ea1601c6646c28f0baaad01d2ac5c5eb
+MISC ChangeLog 2531 SHA256 d42873b4505b06beae52df83c45aa231629056d42fa96c96d6fad998b20ef38a SHA512 b85d4a05f5f572eec5ff79936011146c3b61e6c3b4f9825cf58821fce79b0a67dfae45a2fb77f454ac7e3db5ce22f023454722b138427864d3f4b558023a1c67 WHIRLPOOL 8f9705fbdea77fc3e90f4410f2d3576d5fab1c4180526cabe6adefdb72bc9e1b5f195d55ea5851d5a30201e04482da19f0046804b2f470b539a78923fd620485
+MISC ChangeLog-2015 525 SHA256 61da0053c371e1110ee98f3c49fe47d333ee2f9d84133ca2d16735746793c543 SHA512 950bb8bd8310577905aea9e002bc182f8525109047662f5b490b640c2c0313d5dcaa3bfd1dc3a6a3788ba651b6894759f688b6e0cef4164971f89a6860d0db92 WHIRLPOOL 424bcc03305d640469e9587efcd6e5bdc57958ada1256a13d6b19e8bb5a594db36d0f4dd809526ae532f182ca044d6dd81abf5b691aa99401892b726a9958195
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..379db39defbc
--- /dev/null
+++ b/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 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/xor-analyze/xor-analyze-0.5.ebuild b/app-crypt/xor-analyze/xor-analyze-0.5.ebuild
new file mode 100644
index 000000000000..8c363bfa6357
--- /dev/null
+++ b/app-crypt/xor-analyze/xor-analyze-0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" xor-analyze xor-enc || die
+}
+
+src_install() {
+	dobin xor-analyze xor-enc || die
+	dosym xor-enc /usr/bin/xor-dec
+	dodoc README TODO
+}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
new file mode 100644
index 000000000000..f386c1f24095
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -0,0 +1,3 @@
+DIST yubikey-manager-qt-0.3.1.tar.gz 175215 SHA256 e41bcda5aae5e0f92158f591e8e584d25c9b4872475f8e4253c7a7671e94c859 SHA512 d47a6b75b50c2dca073ab74ea2d7c7c46ff86ec338f52d49afd39796cc1f3de7ddd74664b5f60f9013393b9ca24621da63d218eb3c2cb3017fefed2370b269d1 WHIRLPOOL 1d6de66f0450d72e29b9e9a2a959f4ca8ed7c8614b976115ecfb433e8b5f1795d12e6d907f73152b6bef3de6510cbcf236b2386b18a3cba2094269f78522196a
+EBUILD yubikey-manager-qt-0.3.1.ebuild 1043 SHA256 3244211d12397be8fe7ac51c50de02f9fc43dfdb664eff6f5c6ebf351e397602 SHA512 74a284e243a833f9e8f7eee39f9ec82004f4fbc9059fdc306b6e5b173904931437199cc982221c257fe79567db6002b03c26c3a1eab88bd8deca62c13986e788 WHIRLPOOL 35d74d60c28a240c49fe7ad6775a9d0a4437a48db690f8b5a3509cdbec812c112b79445d2b742cdd3810501ac45cda3a14b2cf99bd99d4c817917b8589bb8c12
+MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/app-crypt/yubikey-manager-qt/metadata.xml b/app-crypt/yubikey-manager-qt/metadata.xml
new file mode 100644
index 000000000000..97df2a00971b
--- /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>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.1.ebuild
new file mode 100644
index 000000000000..660c413e887e
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit 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[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtsingleapplication[qt5]
+	dev-qt/qtdeclarative:5
+	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 -i -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}"
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
new file mode 100644
index 000000000000..498a27dc476f
--- /dev/null
+++ b/app-crypt/yubikey-manager/Manifest
@@ -0,0 +1,5 @@
+DIST yubikey-manager-0.3.3.tar.gz 51223 SHA256 5447c026739d33455ac8ae13ccaef2df231a28dda75ffbd62c91a7c5ce5d30b5 SHA512 ced7acb848747399d4b9f0214044dd40c38b332c2f8557485d61f2f0cb857a9f47d12df59ea6a7bded1076b5d539bc171d1dbc9fd8899699c0cb3cb65b0800d7 WHIRLPOOL f68c896cb10b72271a6f42e34baf3671bfcd9ccd69c688db5fd06fd6672d1cbd12271ccc563f400d922eaf842bd7e5d73af9cac0f725927f7efe4ac520d3790b
+DIST yubikey-manager-0.4.5.tar.gz 55315 SHA256 d91f5b549b23bfc6c04d9446b9ced6c6f80aac702b26a1fa4d1b8df5eb9a36d8 SHA512 232ce7557aaab3c8a27dfa2ceaab0491ac1f97d4332b25e7f77c968da48c9303627defd0246b1e97c7ed766e6a667ac996ac0430cfeb4e7310a0cfc4a633d1b2 WHIRLPOOL 15be6470b114a70d6c960b2518f94799b05e85be5a4c32d23f3e9a8eb20be681f66aed7aee65ea138d2de495e4215730b1ec7dcf99e4328561f205bf71fb69a6
+EBUILD yubikey-manager-0.3.3.ebuild 736 SHA256 177041478e894a931a82bdb0fbbd1f08b1f5f7ed384b48e03901a78b7d26aa54 SHA512 16b96e49659f6a5a4b9b3e90a61896de9d6cbcf991e2d9a44df81c48be8f7936f5de7aec380538cbc8ed034b54617928b456b53a2c322631dda476c6e6fe2d8f WHIRLPOOL d849bca0f1d79d58d1fa7f66d977a4e50625b020c49f87ba8022a40ba63b5b980d14700a2631a41f4d2c879b458a3fbc592e7a2f826a6b9729f1a02ea5bff414
+EBUILD yubikey-manager-0.4.5.ebuild 858 SHA256 0ee32b8f039b3ceaf111bc5e341b95a5da2a32ddbbabacc05000e55370f91a21 SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79 WHIRLPOOL 42d88df2ab156100d10c345b41aab277e60382d685adf8e1362af166c62a55a5688cef33b709589540c9c6f324d68a5ec25c5ba87b368f44c5129060f249cf22
+MISC metadata.xml 466 SHA256 66cba5a1c03e19490dd5cb31c9c66afcf1ba81d808e9f8cd7dd78cde93af2a32 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b WHIRLPOOL 38ddba3bc57a218731b1269a6bec87f4171de5a4c25db52aa3b58f1f03833b1f64382e73cc8bdae61987c40f1c56cc9fe96f19547b6b44528eea67de7ea17d5d
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/zuluCrypt/Manifest b/app-crypt/zuluCrypt/Manifest
new file mode 100644
index 000000000000..a3fd36fec66a
--- /dev/null
+++ b/app-crypt/zuluCrypt/Manifest
@@ -0,0 +1,4 @@
+DIST zuluCrypt-5.1.0.tar.bz2 1610597 SHA256 dd57be9bcee64f7f4427f4a80e31bf8796d3ad7889f6c3bd78597ff14c1ba520 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0 WHIRLPOOL 72e202888b7c6cfc5fcc5720430c92813c7c313d04a1d31d432b942e0553450024c5a1a4e2cbb79359e4fa8276d7874a4d507721744a707745f1cf951d19510a
+EBUILD zuluCrypt-5.1.0.ebuild 997 SHA256 639b42f269a4f700f679385aa3ecb82d1159fe2041a0e39928e1ca5e95ad41c9 SHA512 3e30c15866cd2a106e2a67e12a5864a1b9c17beb0b062d293907b9d5ed978a86cb37d7c85a7f400ab189995a689dae5987530eb0318a8609a6e1d4fa92e85065 WHIRLPOOL d9d34a070cf14b1c7f37d6505a8ec160da6994a9d3e4b00f79b2fb7e93f01892c7675c3c1aa350db547e39ceca51d1b3b4202e4249909999a976229435be90e8
+MISC ChangeLog 1926 SHA256 5070972114a74c5e541d1cae06aa6104bee73578afdcb98c2c0546e4d48581a4 SHA512 e702e47e3b80a20f1c5151ee9e61744db28d7125a74037578d02299bbb4f6ab570039b1f56752da3c9d261d7144e2af6afa66843dcab88e1020fcd401ce429fe WHIRLPOOL d6edfcc0ac970a4786ac8950a4bf414f079dc2e9de6512bdd22894d9b917cd7f2eee31f2dfd262c19e4ec413a5308e437c0a2cb891374b26a77be81045f98f8f
+MISC metadata.xml 619 SHA256 f2a705afb51944d6f179465b20db1ccb3d289815d92541bd7ec756fa049cad61 SHA512 6505a1f4a960053fcec858749ef3a80698a870788aac81789f6cee0982b5c2c8fde2e63fd43f1925de3af0333b73ecf71582cf79711e402be4ecc1a62945ecb7 WHIRLPOOL 1afdf2ae3fd1a790dff853ed1e6430216ec62d5dab7b1ae6d108424f0d91de5308ec0e01f8e9b13ab3fbb080efce632214bd42d3ad58cddea705df04d4d532f2
diff --git a/app-crypt/zuluCrypt/metadata.xml b/app-crypt/zuluCrypt/metadata.xml
new file mode 100644
index 000000000000..25f3de3d1e0c
--- /dev/null
+++ b/app-crypt/zuluCrypt/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-needed -->
+	<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..da866ba45894
--- /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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome kwallet +qt5 udev"
+
+REQUIRED_USE="kwallet? ( qt5 )"
+
+CDEPEND="
+	dev-libs/libgcrypt:0=
+	sys-apps/util-linux
+	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
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_SUFFIX="$(get_libdir)"
+		-DNOGNOME=$(usex !gnome)
+		-DNOKDE=$(usex !kwallet)
+		-DNOGUI=$(usex !qt5)
+		-DUDEVSUPPORT=$(usex udev)
+	)
+
+	cmake-utils_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-crypt