gentoo resync : 01.12.2017

18 files changed, 162 insertions, 92 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index cc7a32349bbd..aebfff397683 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 2ef1f75e315e..ded429cd81ee 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,9 +1,10 @@
 AUX gpgme-1.1.8-et_EE.patch 347 BLAKE2B 88afa9629af3249337361e69496c3662ba7320229b50db697045174c58bee15e7cd0841125b646aa4a934d01a7a4ed309b902f70c67146c66100e2a66a24b5aa SHA512 69577d0a1ae9061277cd502d72c2add13b61def4990c09c6181a14b4792745a4e2e467090019ab1ed8d3dc6df6f09b63230d2d21974e0a802a1e976fe5de18d5
+AUX gpgme-1.10.0_beta81-build.patch 817 BLAKE2B de479a5592a470fa308e9e640bf7c88815eec8caa202e6f02cdda34b750081ef73bd1c7bc1764451ad91d48d73f1fbd5a9c7d40db11ae90093b49ad282f23d71 SHA512 633d18fda3a81a3b7592887455bac5ced37cdcb7951e7ad43dde7e4b809395fefc1eae168b49ade53862a92c07c198046602b6a56bbcacaf762b3f3e8d779983
 AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450060dca31ffa10b00c53da0ce55405fc1eeb51ee6686f30f050337aaa3e978f1979cfe7151c5195d570f0a9432 SHA512 be2788db4a796fdd21524d20a8bc7ad52f7928fbd6e9945e5a2be048cc6251bf593a3d46623c589cbcd4491a3e5abdfc14b618098113c0e1ddcabdb4e7701f57
 AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7
-DIST gpgme-1.10.0-beta81.tar.bz2 1293818 SHA256 91bc25aac8bb953da2f216ca3a41b9c7be34bb8adae5d2b7ad51975cc221ef2a SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b WHIRLPOOL 37b83ed311927ecc17c211157ac6a35a213d1a3549948752c1aa05fe547e035de3ae47a0c3e5ab5c5aea2567d612fab2cb4864b5db2f9ca351c2c061d5aebcf5
-DIST gpgme-1.8.0.tar.bz2 1298407 SHA256 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de WHIRLPOOL 79ed725e24302d4d738e90739cf3c5e6e9fa89c3e4fef87a4fca569abb7f7b7f0140e62e76161f747b555f49166fd0ccda277dbd6cc46c00ce2797c32d442f7b
-EBUILD gpgme-1.10.0_beta81.ebuild 3108 BLAKE2B 31925558bd8e623b8a5af82e1d31d8d41f8688bd774623ef1124283e8a1be446df8aafd8708fba9fa7f2d5952bbb7a2c722e1242fd78f5e5be32505d1857a4a6 SHA512 5f8eab70fce530ac319a3fd55baf52fc234ec89479dd736bffed4443194f1f1888b61be180ea9b4d53605ac548850edc72c89a6bbc2ae80098179371dfba5ea8
+DIST gpgme-1.10.0-beta81.tar.bz2 1293818 BLAKE2B 12dbc9120986943ace281c0f0f7020c71e5ed2760bcc85f7d427f731190df8b24779932b8fb8476372669960be28a9ce8af9622b534b4e3e7a9cd5180663f147 SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b
+DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
+EBUILD gpgme-1.10.0_beta81.ebuild 3176 BLAKE2B d67d0cab23284582395df73d37011ca452a2e90fe199706e0711ea4f50a54ce149908b794c4f3aa6308f148d820642f63feb15d6ac21dc6f8d1213f6dfdc953c SHA512 85275578dd563f69d2353652a5d4767b26cefbc8b39109c0e1e4d6f9a4413c36dea4e5ab73a377d1018e4685f2edb178ec891035a2e70495d6d4efa18ef04bb6
 EBUILD gpgme-1.8.0-r2.ebuild 2526 BLAKE2B b703d96c5cb1b55cffa7c72ba158c0e695c1e6a9d63e8801e1a5a2a5266c704c9f9441d8fa996402539ed855e755c1a1f4bab9ba23e5b652893c5ff80b39d3f9 SHA512 bb3849e3f0e2de7326c9f9c49114c0ad98827e8d72c3aad7d22e8ced2e65bb505ce79c437808e1b38e0c2d02bb2b26363557be6eb5898d062afedc87e1770a46
 EBUILD gpgme-1.8.0-r3.ebuild 2678 BLAKE2B b1eb1e842c13b4d45f641ba275bd6b129ce33d1d56cf8c9b5ad15fca1789e0c9b540ff797e5dfc6c158a9c1a4fd1db41debcdfed740be957a7f438a91d5e5c64 SHA512 3b201fbf0d78b94091bee410d12b599c1fc51ff9ca674437bb7dfbcc1bf97084002a02e05b26dd6e48b53483f78b8e2009a01fdaabea4312a4eb1062b8999d72
 EBUILD gpgme-9999.ebuild 2783 BLAKE2B aa4bcaf208df25e4a3dc4256804b02d2aa3dd1180fd4749bf79a5a16c699f3b80b11f662b61a9db76a58f3bd64696a0f6a5f51847d18bb5584f3b73b8a50ac57 SHA512 8a100c6a5760d652fca76f58725599dbdeca8202701435f519c44ab88cd4e2b97685aa9798f21e6449b8bc3a3986df9c113645c5d86d3c382bbb9a7585afaa86
diff --git a/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch b/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch
new file mode 100644
index 000000000000..8f6dc01617ce
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.10.0_beta81-build.patch
@@ -0,0 +1,28 @@
+From 8ffc2c7809b47a87131cde38e14dc3941d13fa21 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 29 Nov 2017 21:35:33 +0200
+Subject: [PATCH GPGME] tests: gpgsm: fix gpg-agent detection
+To: gnupg-devel@gnupg.org
+
+* tests/gpgsm/Makefile.am: set the GPG_AGENT var.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ tests/gpgsm/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
+index 3774c5ff..4ab22833 100644
+--- a/tests/gpgsm/Makefile.am
++++ b/tests/gpgsm/Makefile.am
+@@ -20,6 +20,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ GPGSM = gpgsm
++GPG_AGENT = gpg-agent
+ 
+ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
+                     top_srcdir=$(top_srcdir)
+-- 
+2.13.6
+
diff --git a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild b/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild
index 562eb510e9a3..a17a8fa16028 100644
--- a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild
@@ -6,7 +6,7 @@ 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 autotools distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs
 
 MY_PV="${PV//_/-}"
 MY_P="${PN}-${MY_PV}"
@@ -39,6 +39,10 @@ RDEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
 
 do_python() {
@@ -55,6 +59,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# Socket name is too long if we use full beta name
 	# tests are failing
diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
deleted file mode 100644
index 6edc11611f0d..000000000000
--- a/app-crypt/kencfs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kencfs-1.4.0-encfs5.patch 413 BLAKE2B bffb22bbd9e8e45ce18855ca354d97ac8dfd18895aa01811d50d7d82be3f606124bef26583498f35047455f200636130bc62905b0401aa0031a91b52da0ebbf1 SHA512 47cb411f80bb4270d3c7e0b132949e2b0185b5170228120ee336fc1bb8ee83c9c0a960746407e8934097381a558be941d08d6e28b774423e58102a3f82a66ae0
-AUX kencfs-1.6.2-desktop.patch 228 BLAKE2B c35bd557f1b71b8a276d0c269dc818c68d90a360f339ecdad25268c13f328e1f00127d3ca13b9b23befbf7667122dac304009be33a8a0cd4b0ef1cc9509c51fc SHA512 0f96b65f43fd08cfa116381e5db1ceec81eebb076dca9349d7d3781651bdc7d04e8f4d0cc611f793e581416304174286db98c6aee814059520a47f26bf885d92
-DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
-EBUILD kencfs-1.6.4.ebuild 805 BLAKE2B e3cf9a51edfcbb807d3c3fc5dc011d8f0b4e76f8a2ed08a76d2625859b2405b78c55e0cdb542d862331cea89e9f6e655abf3131c13fc915200b8720c8cacaf24 SHA512 05d4af92d22c41b323c03f2c38fb0793a5af86cd4f31b93a10cb22a4af5b103c8dc5738343813a484bb7a95630a86c3208bd9b036dc0aeda8fa39dc047b3c447
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch b/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
deleted file mode 100644
index 6687ac0f1f9b..000000000000
--- a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 2d8683f11e46..000000000000
--- a/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 8f8da5d243d3..000000000000
--- a/app-crypt/kencfs/kencfs-1.6.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
-	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
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/app-crypt/kencfs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="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
index 695587e0fb02..0e4947e7a3ee 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,6 +1,8 @@
-DIST keybase-1.0.21.tar.gz 21127410 SHA256 a9bbaf16cb7b7cc3614ca5e76e0fb1b3bd164f38e14b9d49d4ca351941c8c0a3 SHA512 60801ece5dc0df9f0da58143baf00729e1a79183d2b8209c405749f422dd8cecf7f4059e0799c88ca6e3f1e5a7ad8bd6805dd2401b0945954c6b1465c04974b5 WHIRLPOOL 796d5e89f87575cfc621c714c304b0a502773511f5d43d178c0f4484e3386df6975f665b723ceb0f834fc5d4be0c5c288324a15e5d0d9b2633fb984e3f8cf183
-DIST keybase-1.0.33.tar.gz 29170354 SHA256 c8135d572899b0bf0205f7ddbe30d4bfa89f358f64678eb25dadfc0e0fa0dbe0 SHA512 d02933e88613102e27a4aa5f2494ae2b55456cab8c5cadad9c412069b24c574a20609fc83b88bc8f9aa00bfd300822bc4c882392f65fec3e7a8056cebc6fb9d4 WHIRLPOOL d11b7fa29f73e85df51dbc45c7be2441783ada43ddbe56ed684f8030663d640d930b2a9fc0663208664ae567ae8629d04ac786da5dd6b31b8d3517889479da1c
+DIST keybase-1.0.21.tar.gz 21127410 BLAKE2B 9f48b637aefa847ae5737937ed6bc3d9b7d222cda3ce5a388784104655092c1ad5fe0468680a1e0a02f5a7ea4fac1fb8e19430c9e4c3d542057953219976cd02 SHA512 60801ece5dc0df9f0da58143baf00729e1a79183d2b8209c405749f422dd8cecf7f4059e0799c88ca6e3f1e5a7ad8bd6805dd2401b0945954c6b1465c04974b5
+DIST keybase-1.0.33.tar.gz 29170354 BLAKE2B 78799ea49cde32e3c1be781e281b5ca188f7a5d846fcb7e41605d6e2526bc4e36f6ef991567631e9c72eeb6b194ebec740516e886f4af419b01e47622f030c42 SHA512 d02933e88613102e27a4aa5f2494ae2b55456cab8c5cadad9c412069b24c574a20609fc83b88bc8f9aa00bfd300822bc4c882392f65fec3e7a8056cebc6fb9d4
+DIST keybase-1.0.36.tar.gz 30043919 BLAKE2B 0053088754b0a4a47314032e87a7c5165aff59ded585ae20fb12c3dbf0c7437f7f0370f236fec0db501cacb3a75e87ed494df8f688d360c58904e851eb119f60 SHA512 c6bd4805240bdafd27eac382a30fac6e5ac3e6eb313dda027533c3a8f366077c894b38c1b972ff5688104e1ca4231cbf4242eeb168de9782bbac732da5639ed0
 EBUILD keybase-1.0.21.ebuild 917 BLAKE2B 2b07280d94ecfbd1e1320b2822ef82c00956cfc2d739ea32a372cb0923363578210dd2af4da73bd1608c7eb712dbb9126cd22d352579abf9c9db9fe567ebfb8f SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38
 EBUILD keybase-1.0.33.ebuild 917 BLAKE2B 2b07280d94ecfbd1e1320b2822ef82c00956cfc2d739ea32a372cb0923363578210dd2af4da73bd1608c7eb712dbb9126cd22d352579abf9c9db9fe567ebfb8f SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38
+EBUILD keybase-1.0.36.ebuild 959 BLAKE2B 36385869dc6a89104de7df5986b086c1531819a46351c62578e8d672ea4e5271b137a1cb84221de497a7b560937ce14a60ae3c60ea3634d77aad175cc5033f6a SHA512 c81f68541117d81ea1b5f68877e8ecb07962b4677d4039f74d815b15468bc6a72c68991dd76f12ce14cb43f5b81b9e897d136a9cfa69d02f77e7797aed0e3076
 EBUILD keybase-9999.ebuild 893 BLAKE2B dd27632b3d771ba1e50bf4ba115f4e7a4b096d2245b7e8ed2f0bee425ebcef5ff01f430d7880466705a5b217415b5057ba0a9360d7efcfaa766528fc24799494 SHA512 763f66c3a48a668a5382cad7ddef2d1bc2c4874a6bf226f2930401f1e932104631a68ee89b9cd37bf794959447b64381c04ea60567c38ecb625b64d9267ed5a5
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-1.0.36.ebuild b/app-crypt/keybase/keybase-1.0.36.ebuild
new file mode 100644
index 000000000000..9a1ab8b086c0
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.36.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
new file mode 100644
index 000000000000..42b1886fcf1c
--- /dev/null
+++ b/app-crypt/libb2/Manifest
@@ -0,0 +1,3 @@
+DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
+EBUILD libb2-0.98.ebuild 944 BLAKE2B 4f1b7db4d8acc9cf6ae5b0c21d49bdf5b089e46dc9bb57466efcce895dbc309a74342844f108588f28a85c8164529843444dbf1fec3512f6130f4747ebad0220 SHA512 5c8cb72ea9f10059fdef2465d8ec4b14b63fb0e1b82f9c9069eef91c7fb3eebbe2a88226013b2486ac543ac5a315087cafc7cd927131dae3dce83c22c794fbf2
+MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.ebuild b/app-crypt/libb2/libb2-0.98.ebuild
new file mode 100644
index 000000000000..b42921bc69d2
--- /dev/null
+++ b/app-crypt/libb2/libb2-0.98.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
+HOMEPAGE="https://github.com/BLAKE2/libb2"
+GITHASH="0d7015f6a640a63bc6c68562328e112445ea9d5c"
+SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="static native-cflags"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${GITHASH}
+
+src_prepare() {
+	default
+	# fix bashism
+	sed -i -e 's/ == / = /' configure.ac || die
+	eautoreconf  # upstream doesn't make releases
+}
+
+src_configure() {
+	econf \
+		$(use_enable static) \
+		$(use_enable native-cflags native)
+}
+
+src_compile() {
+	# respect our CFLAGS when native-cflags is not in effect
+	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/libb2/metadata.xml b/app-crypt/libb2/metadata.xml
new file mode 100644
index 000000000000..76fd7590acbb
--- /dev/null
+++ b/app-crypt/libb2/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<longdescription lang="en">
+		C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
+
+		Official implementations from BLAKE2 project.
+	</longdescription>
+	<use>
+		<flag name="native-cflags">
+		Use CFLAGS as determined by configure script.  These flags will
+		enable all CPU specific features it find available, to further
+		optimise the implementation.  This discards any existing CFLAGS
+		set in make.conf or similar.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index b6ef5cd3f5ce..a9785ab60389 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,5 +1,5 @@
 AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb425d83bebf78bc0141411bd447223562c920aea80765811084360fbc964afb7841291081f80cc94060070b2 SHA512 605a602d184c86426d6d875954ad2cb3bee19252ce56e6581df7574a3e324f97ccfcb919fef32f6ff8a393683b8375d97586ed886ae01d87fbe015f2f83f0e3b
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.1.3.tar.xz 686340 SHA256 003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a WHIRLPOOL bd004ad0e754850e4349aef72a7bc2449a95850b86bb383d9a60fb7d7c69c7e5e2dcc8e1cc945b647623678484f0bd15c5e125e7e278c2a0964b28b48ee8c8f3
-EBUILD qca-2.1.3-r1.ebuild 2719 BLAKE2B 963d0f9804aae6a4a36616d92c657d99fc1f28afaae2ede2d52f2df663d4a2eff88207ed8432a2589770461df2095616ee21179cd1e3a6fbe3259478835e514f SHA512 bcacc3b007ca83baaa9e54d236669f78df272484d3c2041f61638a33733c684b2fee15961dd1c9e4f16a9c92a612f6a8f91234ddb3b7b0ddc15d3ad88f4b30b0
+EBUILD qca-2.1.3-r1.ebuild 2719 BLAKE2B cc8c3ed0071caf9c474c2ecaab4cdca0d1db9a53f0324ff2bf2741e26363a90f685a088cc7159853347387928ca466d6723f74513b486a4c543d92a0a85a6bd0 SHA512 395f82a689752d6248e64c94e535e60fe0ed78c1e5592fa78ff9ee2e52c6410520a7f37fef61fe7bcdf3a3d50797ab3edbd797923278d9c7761541c972e03f07
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/qca-2.1.3-r1.ebuild b/app-crypt/qca/qca-2.1.3-r1.ebuild
index ffa5750e9bec..f70ee907f5f6 100644
--- a/app-crypt/qca/qca-2.1.3-r1.ebuild
+++ b/app-crypt/qca/qca-2.1.3-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 qt4 +qt5 sasl softstore +ssl test"
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 295a1d8724cd..21322188a93b 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,3 +1,3 @@
 DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
-EBUILD rhash-1.3.5.ebuild 2591 BLAKE2B 38e00ab8afbf65472a6decfa0a4078574b0d803a39d205fb4f4fefb4ee51cdd8da223392fedf783b0c78f5931189f0289015173965061ab477ff8558dc01447f SHA512 a3a0465fb6453b98974defebc4d8e3140a57a5ea978a19d84ea8b3bdcc5d89ee73e20335bb4549c98239d99c2ead559dde398d1f0f2da2e19a064cc291792747
+EBUILD rhash-1.3.5.ebuild 2613 BLAKE2B 765f0aebcaa119fe15151c3b74426d5009eeea28e7a518ce78e67509ed927d17e5d8b225a11cbb2261c07ab7ae89730d95fc0befc4a0196414f23808e1f9b000 SHA512 6c18e8c0813dced4b245f9ef998d4af58246cbc2c922baa947be886342554dd24b44fd6b1e73be1bd0a6e9ab8b8d12b3668daaa0a562b048870f427a0e95bbf3
 MISC metadata.xml 843 BLAKE2B 9380d16da7ed26bc2cb455ad4e01806d54233df9ec229e67a8ed1a3944e91569cc4a478c375e75a87ea758eab6a886b89fae27dea32434e8c7f4a068d0371369 SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index ae45a3261d4f..652f90180707 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls openssl static-libs"
 
 RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"