gentoo resync : 25.08.2018

30 files changed, 24 insertions, 856 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4974091ad2f8..f25a5f7bae63 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index a9603bd12b03..0e1941f1531d 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -2,5 +2,5 @@ AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa2242
 DIST ccid-1.4.27.tar.bz2 632817 BLAKE2B a18de0594c9535c4564bc27886fc69a0edc54343941d77b9558f331a932d12d2b58303ae3994337e380f16648f7bb2a8aa90c00aae4c7cffe242e000003c5dcd SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522
 DIST ccid-1.4.29.tar.bz2 635761 BLAKE2B ff14bc6e181a6d44b8ef463a2255d0362842f6e1e7c79e0a01caaba0a88892f7b0f2bd9d2dadae7be8b0655d2502e5471cff29e582928d62235fa070f2eb1ba8 SHA512 9ff37acad086e959f660069b245fe06ecada140623025a19dfbff55edec71e1e72bce09ac4fc506ad985dd0831dafc6b12f5a5b109b38bf9ba7583856eb19418
 EBUILD ccid-1.4.27.ebuild 1492 BLAKE2B 23f38ec767ff61b9da25eb292439956069b64ad2d162ada3454eeb2fe4db4d2436458a85e7f1858719d268a64e0d9db4bfc4c4062a5dea853e6075876dd4c16d SHA512 37a42df7ba9eeb766ad42f3e79d1bd85b80a753f11f7a4ebb0b088a95498212ea0d6fd98d541e28da0a39698d3446c6429416cc9fabedd9bf176bb0f9ea5add3
-EBUILD ccid-1.4.29.ebuild 1497 BLAKE2B e01d89f17e0f2d4932d92aa80f23143a5bc6bfd02566dfbbdc7730f8a2fd96f39064f898d6732c0f071be65ad9bf588e52bc01e0e2f447c5fce68940ee6eb74f SHA512 946b90228ee7f78abc5a825bb89df3c1d626bbff046e7833bd89eefc6b80b17b881606984b66dbb1fdeeeadb27cc19a5535102253fd5122bfa2e4b2928ca0c3b
+EBUILD ccid-1.4.29.ebuild 1493 BLAKE2B 1897866798c0af0cd693b6f0db6619689af0d36fac327610be9657f85bb1c6a34c49a25e66e01c87648ae5b79516170688d819f5395d2b304aa5fc08a99e1625 SHA512 3d3fea1e85b7d9deba4dd86883c9e1c2a5a221612b879dfb71508975a3aaa47a449d0a9833be5991c94619d425f0fb567522461c8dca4d46270a504a7e99f4ca
 MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
diff --git a/app-crypt/ccid/ccid-1.4.29.ebuild b/app-crypt/ccid/ccid-1.4.29.ebuild
index 96196218e361..6611197d5b0f 100644
--- a/app-crypt/ccid/ccid-1.4.29.ebuild
+++ b/app-crypt/ccid/ccid-1.4.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 6981e045b380..efb1cd48de2a 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,5 +4,5 @@ DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26
 DIST gnupg-2.2.9.tar.bz2 6659547 BLAKE2B 3715fa0fcfbed24b0c985811c14e5a8c84caef0e66937ec7eb2ebefb4603a2c9a994d3c73224941254c685ca32cd83d7bb924fb7171ee569b346f2092ed7ae5d SHA512 96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
 EBUILD gnupg-2.2.8.ebuild 3208 BLAKE2B 609025449f857d4d72346cdfd77704735dec6ced0c6dca813d84206ffd7aec48e2d6d057e3180ecb24b9835beaa39e9f6490528c993d36e05b6b316d3df1c7cc SHA512 3f9d67cb2630b46c68f53b2085e3075203b6cc792d58d6c5e91b26debf4c10cfe6723b40501df3c26069b08823e1b304e228f97ad21273ec94a03c82e3a1833c
-EBUILD gnupg-2.2.9.ebuild 3219 BLAKE2B 2dd09e94733c03b6ee8e1bd2fcb949bc1a5b861698dff5f2176628fb360a14d40318fc678b16d8ace0fd403f6c96b334bb3ad1c4399a4c5d8a7b89855dcbd7cf SHA512 01f76f52f46977ded9ef667d372b30ae53d51e53c5572ab126c84db0e074acd8174538eb68e17c43238d898e8d7f7fb36d677147b3dbe0de3cf04f59375353ae
+EBUILD gnupg-2.2.9.ebuild 3345 BLAKE2B 86b0aca7f45391bcbc6599174f8160b9178a030142b9f71b85864d1546fb0276af25096c0fe187316dbb756b5b0d77d2dd01e1bd266945837ab4046b0b018263 SHA512 79a2d680f483ca37386f96853a98048aee3dfc972ac65ff005b5ab25e54795c376ec0ffa544e82f81595bd13a9488f3ae3377e9c931f2b02df8b7b939eb026c6
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/gnupg-2.2.9.ebuild b/app-crypt/gnupg/gnupg-2.2.9.ebuild
index d53de1b71258..2345009acbcb 100644
--- a/app-crypt/gnupg/gnupg-2.2.9.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 MY_P="${P/_/-}"
 
@@ -65,6 +65,10 @@ src_configure() {
 			--enable-scdaemon
 			$(use_enable usb ccid-driver)
 		)
+		if use prefix && use usb ; then
+			# bug #649598
+			append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+		fi
 	else
 		myconf+=( --disable-scdaemon )
 	fi
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index ae5534153879..d906ca29896b 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,3 @@
-DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
-EBUILD gpgme-1.10.0.ebuild 2856 BLAKE2B 91de73844ba2c16d354d10aa6e1172365dbbbeddec97efabbcaa66bba316c86d357d24b3f0db8f34bd423f4976f5be25fe0dffe08eb8f881e7aa4395fd4c101c SHA512 a77cd079ba24dc9967a90ccf5278bd4d5991b10df9823d4c6bc6e7eea6b40fbed1fb067d69576ac6fdd7b6d26b02f4f0311c07c4d5c736ad3a431166d3344ee9
 EBUILD gpgme-1.11.1.ebuild 2857 BLAKE2B fafc243807672d08f09f3a9be6f1390028a90f43523c867430ff4c2f86850a3e80b515ed9c471973a80ed2c0e2b36842166dc8ae6de1ee14f64e58e8ff3615f4 SHA512 4643013dfd31c558900a37faf39737da1cac1f160213cee99e765fa94b32c4b6fd2242eb28e6319b6cd0fbb9ab1f47cf588280b126b2bc25bfadb582cd2048e4
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild
deleted file mode 100644
index c79592443168..000000000000
--- a/app-crypt/gpgme/gpgme-1.10.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic libtool ltprune qmake-utils toolchain-funcs
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs cxx python qt5"
-
-COMMON_DEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.0.2:=
-	>=dev-libs/libgpg-error-1.17:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
-	python? ( dev-lang/swig )
-	qt5? ( dev-qt/qttest:5 )"
-RDEPEND="${COMMON_DEPEND}
-	cxx? (
-		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
-		!kde-apps/gpgmepp:5
-		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
-		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
-	)"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-do_python() {
-	if use python; then
-		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null
-	fi
-}
-
-pkg_setup() {
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
-		SKIP_TESTS=1
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b"
-	S="${WORKDIR}/b"
-}
-
-src_configure() {
-	local languages=()
-	use common-lisp && languages+=( "cl" )
-	use cxx && languages+=( "cpp" )
-	if use qt5; then
-		languages+=( "qt" )
-		#use doc ||
-		export DOXYGEN=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && make -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	[[ -z "${SKIP_TESTS}" ]] || return
-
-	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
-}
-
-src_install() {
-	default
-	do_python
-	prune_libtool_files
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index f0a6957a9d04..c7709f4eba48 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -1,18 +1,8 @@
-DIST kbfs-1.0.36.tar.gz 5135197 BLAKE2B a0d40048d11347a72ac9fedb358be7bd8d425e9eafc32fce44e75583aa75fde00bee62d81e7d4bc1553aec3f72ca3af1dffd1ef710d897ce28cb26d152eab4aa SHA512 eb50c4fdd07e0d0e0bd62c48a60520fe48a6b64d97e6ac561d0c567e50c4863f9969697f78553360e6b42776af4974b086bd0be75db6de4c28a5c4a840725919
-DIST kbfs-1.0.40.tar.gz 5432507 BLAKE2B 4d3c55d3c081cb7fea44d302a1a5598df515f98f4f75bf3e0eee84c3151114247eb1a80ea2ff9bb6d10cc3612af25e283b114b26b24043fbfdd16f05d2fb0210 SHA512 c5391e710fc55130437ff5f42e00229ea06fd1bd5e535c814158a501f2b23ef43d65d27ebf57ec3c3b5d3c7cbbed43cd2baf8888af001a3b23a40cbc94d22883
-DIST kbfs-1.0.44.tar.gz 5440024 BLAKE2B b8ab744b1bb9fa2e33bd382df92f1e50ed294446106d5723306465cbbadc0e960ad0da834671fa7f01e7ea8ff3486477972f44e927feefd1123d8a8ad4e376f5 SHA512 03e92303f140dbff059f8c954142d6180f388c1e50c2f8af02a30a740d440d5f79be47ad851d021a2b90525bf7b775e471780438b94d1d6403eddbdc0bd41e8e
 DIST kbfs-1.0.48.tar.gz 5639704 BLAKE2B 4d8152c8bf1a72b0493840c6ffa0da35ba6abcb677a9a15ee88745b7b870c9f2923061751e66b6d54ff12c92bcd74d7c6ce8320cb7c7cd6f75e1cd62ccf13803 SHA512 89b391223e2c7014e64c09e5303c7b89bea2508331b5d53facf8802de2442c4e53a4d79f65c085a2b3234762b334d3d36e903867ef841140d44207926d82991c
-DIST kbfs-2.0.0.tar.gz 5674786 BLAKE2B 65924644babbaf95867792da6a9c1f5c9c517bbe36292c3b5e40afaeb2879b1145d0b6017f3b66e6bc2ec4b858a312ab1d86ff1d8515f99c9004eeb1acaf8caa SHA512 6e51490b52cc5484d940ee057dc9b453a88d44622b1c533dd29e75eed5fa075f33d9cb6ac438401d80aa148d7561c1bc63deece5e75cdc30bb54102f2d00215b
 DIST kbfs-2.1.0.tar.gz 5703221 BLAKE2B 55daa1d8f1efe4a0264477b54c1ea8db74e972b1ecdd536f4ab8042e66117c6854889aeb203fa6fea6f757e928af514520be3732ee07ccc1289ccc9f5d3f27a8 SHA512 04dd058e97c85d5188cc61a56cc4a4468ec1d4d6b2f65cbe0edb88cec2864cef3525e6f48729761a2cc6fa79559794e5a3fd9663cb31dcaaaeff90a32f2a211a
 DIST kbfs-2.3.0.tar.gz 5718571 BLAKE2B 300106465081e91bdd1a74631eff12bdf82a3042ce6c3f532c0b61016291769a8e0f87af0cbc0b34b3d3c95ec054580654e8152bf97a56c0dfe3641b88483d79 SHA512 c7521f9664ec78fc8fd1a6d9f3e86f4680260ed507223c2a6a2694ff686984bfc615ac454da10ff7b01247866ad65a5e719e3fb8db5f0c3044e019ab7a82356f
 DIST kbfs-2.5.0.tar.gz 5788528 BLAKE2B 986d0411bb33dbef781c101beca3b90827f06e4c714795424b6f4fbe2abf628a4cce67699f434e872f7886816213e1cb2467d45ea4e06157ca1f23b433284457 SHA512 a12f3491c3d7dd42b78d24957f3b469837a8e6d682e91dfe6020e74e24374ce95f9de31578579680ee35513637512e84849d598d34b3e8e78f96cf99ac9cd701
-EBUILD kbfs-1.0.36.ebuild 984 BLAKE2B 84ea9e3a3db5917cf000e56f7c4826c9d5210bbb22e157310028421383e308e0e164be7d57e0838694730e1dff645ba89ad991d9beef17eb1bf0c0823ef55e13 SHA512 79cfb2c88f09d7cf0050f25e5c4e8fe9ffdbdafa5e62b6943b8d690eb766cb51d2b657774f0eab9ba561478fd3e22d416b409485f9ba38512247e66b6acf0d00
-EBUILD kbfs-1.0.40.ebuild 952 BLAKE2B 0ad195fc7cfba58e764692d2eff0de4e365ef86e11606552961484e54ffc93f54d522c8a3b0e5900ae5a25ec72cd3ea24d346f7578055d7ac9b82326a2cfc41a SHA512 36c347cfbe3ee81a11916193c7757f5ed71e8253449595c07a73db6b34d576f989a9a1f8605f695b30c27ef9fe89e47e81cd45f2405e65b92eae736a74d44f7b
-EBUILD kbfs-1.0.44-r1.ebuild 1033 BLAKE2B 46055ea689aad784f6f93704f0cb99abde81c367fb4c10a9825da8e83b86422f8cd78f099a1c8ad3da6f44ca4c91090502de7d90e0a6c5cdbe42e99c1a710597 SHA512 6813ae23ea413bd3a1ef5d84b3f0fa642510e98bf08f64ee95d7f7dcc8cf2008f470d7b7af1b1a3d51327949a01824f5e0e44c6e16fb7a91dc526379a8ebe391
-EBUILD kbfs-1.0.44.ebuild 952 BLAKE2B 0ad195fc7cfba58e764692d2eff0de4e365ef86e11606552961484e54ffc93f54d522c8a3b0e5900ae5a25ec72cd3ea24d346f7578055d7ac9b82326a2cfc41a SHA512 36c347cfbe3ee81a11916193c7757f5ed71e8253449595c07a73db6b34d576f989a9a1f8605f695b30c27ef9fe89e47e81cd45f2405e65b92eae736a74d44f7b
 EBUILD kbfs-1.0.48.ebuild 1001 BLAKE2B 83bb03c8b7d135e60d353c259effcd1ad6e2d5c8efd305b740961ad7b1921c8e30b37db8306644003df0a8a9d2b2f8f0cb4bbf63f3772f98d8c323681ef8043f SHA512 648be76efdd357dbfe3ed611c58cadd3b9fa30469392f6d3b3352bac961a421960a7d4919c5ea373c0418dd48a71fbe4e92044fb608f9b463b92fbc87a3e17a2
-EBUILD kbfs-2.0.0-r1.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
-EBUILD kbfs-2.0.0.ebuild 1001 BLAKE2B 83bb03c8b7d135e60d353c259effcd1ad6e2d5c8efd305b740961ad7b1921c8e30b37db8306644003df0a8a9d2b2f8f0cb4bbf63f3772f98d8c323681ef8043f SHA512 648be76efdd357dbfe3ed611c58cadd3b9fa30469392f6d3b3352bac961a421960a7d4919c5ea373c0418dd48a71fbe4e92044fb608f9b463b92fbc87a3e17a2
 EBUILD kbfs-2.1.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
 EBUILD kbfs-2.3.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
 EBUILD kbfs-2.5.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
diff --git a/app-crypt/kbfs/kbfs-1.0.36.ebuild b/app-crypt/kbfs/kbfs-1.0.36.ebuild
deleted file mode 100644
index 96432ebc4277..000000000000
--- a/app-crypt/kbfs/kbfs-1.0.36.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Keybase Filesystem (KBFS)"
-HOMEPAGE="https://keybase.io/docs/kbfs"
-SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="git"
-
-DEPEND="
-	>=dev-lang/go-1.6:0
-	>=app-crypt/keybase-1.0.36
-	"
-RDEPEND="
-	app-crypt/gnupg
-	sys-fs/fuse
-	"
-
-S="${WORKDIR}/src/github.com/keybase/kbfs"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "kbfs-${PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/kbfsfuse" \
-		github.com/keybase/kbfs/kbfsfuse
-	use git && \
-		GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/git-remote-keybase" \
-		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
-}
-
-src_install() {
-	dobin "${T}/kbfsfuse"
-	use git && \
-		dobin "${T}/git-remote-keybase"
-}
diff --git a/app-crypt/kbfs/kbfs-1.0.40.ebuild b/app-crypt/kbfs/kbfs-1.0.40.ebuild
deleted file mode 100644
index df627e677239..000000000000
--- a/app-crypt/kbfs/kbfs-1.0.40.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Keybase Filesystem (KBFS)"
-HOMEPAGE="https://keybase.io/docs/kbfs"
-SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="git"
-
-DEPEND=">=dev-lang/go-1.6:0"
-RDEPEND="
-	app-crypt/gnupg
-	sys-fs/fuse
-	"
-
-S="${WORKDIR}/src/github.com/keybase/kbfs"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "kbfs-${PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/kbfsfuse" \
-		github.com/keybase/kbfs/kbfsfuse
-	use git && \
-		GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/git-remote-keybase" \
-		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
-}
-
-src_install() {
-	dobin "${T}/kbfsfuse"
-	use git && \
-		dobin "${T}/git-remote-keybase"
-}
diff --git a/app-crypt/kbfs/kbfs-1.0.44-r1.ebuild b/app-crypt/kbfs/kbfs-1.0.44-r1.ebuild
deleted file mode 100644
index 7d419c6fd750..000000000000
--- a/app-crypt/kbfs/kbfs-1.0.44-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Keybase Filesystem (KBFS)"
-HOMEPAGE="https://keybase.io/docs/kbfs"
-SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="git"
-
-DEPEND=">=dev-lang/go-1.6:0"
-RDEPEND="
-	app-crypt/gnupg
-	sys-fs/fuse
-	"
-
-S="${WORKDIR}/src/github.com/keybase/kbfs"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "kbfs-${PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/kbfsfuse" \
-		github.com/keybase/kbfs/kbfsfuse
-	use git && \
-		GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/git-remote-keybase" \
-		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
-}
-
-src_install() {
-	dobin "${T}/kbfsfuse"
-	use git && \
-		dobin "${T}/git-remote-keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
-}
diff --git a/app-crypt/kbfs/kbfs-1.0.44.ebuild b/app-crypt/kbfs/kbfs-1.0.44.ebuild
deleted file mode 100644
index df627e677239..000000000000
--- a/app-crypt/kbfs/kbfs-1.0.44.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Keybase Filesystem (KBFS)"
-HOMEPAGE="https://keybase.io/docs/kbfs"
-SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="git"
-
-DEPEND=">=dev-lang/go-1.6:0"
-RDEPEND="
-	app-crypt/gnupg
-	sys-fs/fuse
-	"
-
-S="${WORKDIR}/src/github.com/keybase/kbfs"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "kbfs-${PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/kbfsfuse" \
-		github.com/keybase/kbfs/kbfsfuse
-	use git && \
-		GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/git-remote-keybase" \
-		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
-}
-
-src_install() {
-	dobin "${T}/kbfsfuse"
-	use git && \
-		dobin "${T}/git-remote-keybase"
-}
diff --git a/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild b/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
deleted file mode 100644
index 41a15fe68057..000000000000
--- a/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build systemd
-
-DESCRIPTION="Keybase Filesystem (KBFS)"
-HOMEPAGE="https://keybase.io/docs/kbfs"
-SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-crypt/gnupg
-	sys-fs/fuse
-	"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -vp "${S}/src/github.com/keybase" || die
-	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
-}
-
-src_compile() {
-	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
-		golang-build_src_compile
-	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
-		golang-build_src_compile
-	EGO_PN="github.com/keybase/kbfs/redirector" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \
-		golang-build_src_compile
-}
-
-src_test() {
-	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
-		golang-build_src_test
-}
-
-src_install() {
-	dobin "${T}/kbfsfuse"
-	dobin "${T}/git-remote-keybase"
-	dobin "${T}/keybase-redirector"
-	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
-}
diff --git a/app-crypt/kbfs/kbfs-2.0.0.ebuild b/app-crypt/kbfs/kbfs-2.0.0.ebuild
deleted file mode 100644
index e92f7b9c3cf4..000000000000
--- a/app-crypt/kbfs/kbfs-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build systemd
-
-DESCRIPTION="Keybase Filesystem (KBFS)"
-HOMEPAGE="https://keybase.io/docs/kbfs"
-SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-crypt/gnupg
-	sys-fs/fuse
-	"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -vp "${S}/src/github.com/keybase" || die
-	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
-}
-
-src_compile() {
-	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
-		golang-build_src_compile
-	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
-		golang-build_src_compile
-}
-
-src_install() {
-	dobin "${T}/kbfsfuse"
-	dobin "${T}/git-remote-keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
-}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index f9a571febab4..e4b1b4b71161 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,17 +1,8 @@
-DIST keybase-1.0.41.tar.gz 31643095 BLAKE2B 72fe94c8996b0dfad3d75f487545d5cb96ffa09c46276104171f103f2fcbb29199013ad8075fdddf3655f63f55cbd2f0d0768b5f0e697b7339262736d9c29ca5 SHA512 1382f008089d8704167842960aec9e4007ac32db589bad45944428ad92ac90b1802338ff6ccc0c570d40b9c9115170a2e15c590f875cdc8261d203c01402385c
-DIST keybase-1.0.44.tar.gz 31729876 BLAKE2B 945700824e630591f7b79dd5e8253156ee8e3ab1349f9ad584311d781cd9c98a5176884aa2fa34ac164af2194941822e56e96d7783843f649a97058edf015670 SHA512 a50c33548745e3c946099105c6926e4b4cd37a96c57d86ca7259b7b864f92a9e2b8823b992d7e367ee93a5832481360d66e170ba59a5cf99296dde20c1538c41
 DIST keybase-1.0.48.tar.gz 34026876 BLAKE2B c620a664b47f66932d1b49c22509aac73a6c82d77399019284f2887cdbf5166477ca824fcb2c2099d175fe4a38436c84c15b96a1c4faa4cdda62a9044b95e1c4 SHA512 fac72b7827dff350589e28e0d602b024130bc6bee8dd282dc141db773e493fcd4043aef6ce5382f92e1841619245c5819adf23d6dcf32b409939c275f40a03f1
-DIST keybase-2.0.0.tar.gz 34340958 BLAKE2B fa9bcf2285a987131e00a5bc8b06ad09fa86f3bf3de87cc4e48669131fcf93e2c515435fc1e9d6663455d16744889131d09b5957fa5f78f9d3ecc91d10667bc1 SHA512 d7b91c9a0ef69442501956ba3a09f40490adf76ef38bf945617793a8238daee68f3fc2be7a5d2118531c2364f5604016ec241226a22bd217dbab3dafbf77fd25
 DIST keybase-2.1.0.tar.gz 34444571 BLAKE2B 834f1001b136461c5665f12530d660e619d93c8b4e4b5f0c96da94af23f0667c778d7ddabc65d0585ac472cd91f89240bc4260b2034bf20c26b4047839570299 SHA512 0d71a22b5f56442fdc03848f831487da097dc817bfcacfb5a8eea1a9a13e87d231619216b6bab61862de71289373977c4c8d345518152137c8804005bf20e3e4
 DIST keybase-2.3.0.tar.gz 34524576 BLAKE2B 5793892b6bcfeafbaebb4a38d35e77d9267a74243da61ecbb7472026b3c500cc6f6cc49dbbec2add65cecae2ce209bb24bc03f2eb393307b82958afeb8824537 SHA512 f2b92ec21fd8cfa182aac7655b836415b902c599f9e3a08a3f84d35c3f3728027a8eef8a06fb8ed4ba77b9a66888f49fd89013304f948c0f0276705f16ca4396
 DIST keybase-2.5.0.tar.gz 35012800 BLAKE2B 46cba22bafbfcf519e658a05db349f047a622f30d6ec03d5e8b3c637e7d3351188c65b0725853c4c62da30ea1d4388d19c9a430a9c4d06b14712daca05c468d2 SHA512 05313c4373ffc8fc41097fabfd13fdbf4d0af789257bbbc4a9ff0500ab3ca9c9d5d50ab62bc38b7328aad3cbf631aa55fcd1a74b5dc73f3d31e76851733d7d5f
-EBUILD keybase-1.0.41-r1.ebuild 1406 BLAKE2B 98696edcda23f847bbae3bafba3746cab2ca20b63b097b9609fbe89f563d23273039cc0851314d28df3367f002392cfd27dbb0a47a6fb2770e6f3618f1761924 SHA512 8b2c29ff8ebc3c942c1d9bcf0a14b45381853ad72593a18f0c92123e2d915c62ab4b92ed61f121c9c23f0397d966423eb2b2fa2636f591f6cf73a5b490b2c1ce
-EBUILD keybase-1.0.41-r2.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
-EBUILD keybase-1.0.41.ebuild 959 BLAKE2B f94747768552a47f9ca7f9d786d6933caa3fb8df52e183cea08f953cc5e611e94e16bcf107d086a0c625ae888e907d583cd43af1147da5ab0d46eaafd148fb75 SHA512 6c8f0f09c879583bda20b6a693fee84d7ac8434d01c2e60131bf85ceec27eea91874870543b5c1b26e133ef7afd0e7f185ed582b4d49ff669cfa2cc1e0f76db7
-EBUILD keybase-1.0.44-r1.ebuild 1601 BLAKE2B 37f326eb08651557328e0bc111255228abfa1d53d8fe326372e145f56248c6afc5470524eefba84892d4b72ec94ddd05f12e3ad25c6635ed7ad9a53475b3237d SHA512 be291b6b942d0b0468a93df396ca51d46ca9406b6c84e3f23bf0368f5f66a4e7459b86718c55eb8ada1e1fafdd47aa9d0e8329d77a853c5869573d6469462ffd
-EBUILD keybase-1.0.44.ebuild 1594 BLAKE2B 45c65cd0f7b749d8d07a06426b6ab9d7fe16acadeb7b0616b87edc4ebc490f66c6cfe0155ac4d409dc782273a063d144de19fdece9498f9723e03873cc2b95f3 SHA512 b6d0c8ea90998229f934b02b3822565f2368b72f828b6428528fb41649bbd62256e5396171568eadbf2ff9e2887e9322424afa6767889bde316850144b0eaaa3
 EBUILD keybase-1.0.48.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
-EBUILD keybase-2.0.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.1.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.3.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.5.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
diff --git a/app-crypt/keybase/keybase-1.0.41-r1.ebuild b/app-crypt/keybase/keybase-1.0.41-r1.ebuild
deleted file mode 100644
index bd5957be4c0c..000000000000
--- a/app-crypt/keybase/keybase-1.0.41-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils systemd user versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.6:0
-	app-crypt/kbfs"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-pkg_setup() {
-	enewuser keybasehelper
-}
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-	GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase-mount-helper" \
-		github.com/keybase/client/go/mounter/keybase-mount-helper || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${T}/keybase-mount-helper"
-	fowners keybasehelper:keybasehelper "${EROOT}/usr/bin/keybase-mount-helper"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_dounit "${S}/packaging/linux/systemd/keybase.service"
-}
-
-pkg_postinst() {
-	elog "Run the service: keybase service"
-	elog "Run the client:  keybase login"
-	elog "Restart keybase: run_keybase"
-}
diff --git a/app-crypt/keybase/keybase-1.0.41-r2.ebuild b/app-crypt/keybase/keybase-1.0.41-r2.ebuild
deleted file mode 100644
index afb357189ce5..000000000000
--- a/app-crypt/keybase/keybase-1.0.41-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils systemd user versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.6:0
-	app-crypt/kbfs"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-pkg_setup() {
-	enewuser keybasehelper
-}
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-	GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase-mount-helper" \
-		github.com/keybase/client/go/mounter/keybase-mount-helper || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${T}/keybase-mount-helper"
-	fowners keybasehelper:keybasehelper "${EROOT}/usr/bin/keybase-mount-helper"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-}
-
-pkg_postinst() {
-	elog "Run the service: keybase service"
-	elog "Run the client:  keybase login"
-	elog "Restart keybase: run_keybase"
-}
diff --git a/app-crypt/keybase/keybase-1.0.41.ebuild b/app-crypt/keybase/keybase-1.0.41.ebuild
deleted file mode 100644
index 581d0d13e243..000000000000
--- a/app-crypt/keybase/keybase-1.0.41.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.6:0"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${S}/packaging/linux/run_keybase"
-}
-
-pkg_postinst() {
-	elog "Run the service: keybase service"
-	elog "Run the client:  keybase login"
-}
diff --git a/app-crypt/keybase/keybase-1.0.44-r1.ebuild b/app-crypt/keybase/keybase-1.0.44-r1.ebuild
deleted file mode 100644
index 232903d0c5f9..000000000000
--- a/app-crypt/keybase/keybase-1.0.44-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils systemd user versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+suid"
-
-DEPEND="
-	>=dev-lang/go-1.6:0
-	~app-crypt/kbfs-${PV}"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-pkg_setup() {
-	enewuser keybasehelper
-}
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-	GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase-mount-helper" \
-		github.com/keybase/client/go/mounter/keybase-mount-helper || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dodir "/var/lib/keybase"
-	fowners keybasehelper:keybasehelper "/var/lib/keybase"
-	dosym "/tmp/keybase" "/var/lib/keybase/mount1"
-	dobin "${T}/keybase-mount-helper"
-	fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper"
-	use suid && fperms 4755 "/usr/bin/keybase-mount-helper"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-}
-
-pkg_postinst() {
-	elog "Run the service: keybase service"
-	elog "Run the client:  keybase login"
-	elog "Restart keybase: run_keybase"
-}
diff --git a/app-crypt/keybase/keybase-1.0.44.ebuild b/app-crypt/keybase/keybase-1.0.44.ebuild
deleted file mode 100644
index 505b2ca3eb20..000000000000
--- a/app-crypt/keybase/keybase-1.0.44.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils systemd user versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+suid"
-
-DEPEND="
-	>=dev-lang/go-1.6:0
-	app-crypt/kbfs"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-pkg_setup() {
-	enewuser keybasehelper
-}
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-	GOPATH="${WORKDIR}" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase-mount-helper" \
-		github.com/keybase/client/go/mounter/keybase-mount-helper || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dodir "/var/lib/keybase"
-	fowners keybasehelper:keybasehelper "/var/lib/keybase"
-	dosym "/tmp/keybase" "/var/lib/keybase/mount1"
-	dobin "${T}/keybase-mount-helper"
-	fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper"
-	use suid && fperms 4755 "/usr/bin/keybase-mount-helper"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-}
-
-pkg_postinst() {
-	elog "Run the service: keybase service"
-	elog "Run the client:  keybase login"
-	elog "Restart keybase: run_keybase"
-}
diff --git a/app-crypt/keybase/keybase-2.0.0.ebuild b/app-crypt/keybase/keybase-2.0.0.ebuild
deleted file mode 100644
index af077ef41e52..000000000000
--- a/app-crypt/keybase/keybase-2.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build systemd
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	~app-crypt/kbfs-${PV}"
-RDEPEND="
-	app-crypt/gnupg"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	ln -vs "client-${PV}" "${P}" || die
-	mkdir -vp "${S}/src/github.com/keybase" || die
-	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
-}
-
-src_compile() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
-		golang-build_src_compile
-}
-
-src_test() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		golang-build_src_test
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-	dodir "/opt/keybase"
-	insinto "/opt/keybase"
-	doins "${S}/packaging/linux/crypto_squirrel.txt"
-}
-
-pkg_postinst() {
-	elog "Start/Restart keybase: run_keybase"
-	elog "Run the service:       keybase service"
-	elog "Run the client:        keybase login"
-	ewarn "Note that the user keybasehelper is obsolete and can be removed"
-}
diff --git a/app-crypt/md5deep/Manifest b/app-crypt/md5deep/Manifest
index 0e54c2e32093..aa60bd5af8b0 100644
--- a/app-crypt/md5deep/Manifest
+++ b/app-crypt/md5deep/Manifest
@@ -1,5 +1,5 @@
 DIST md5deep-4.3.tar.gz 1416180 BLAKE2B 0b0d4814b8a9734555a8b68b363f8a3423c5a97cc21409c166c9f611168e97d41005f981c9493a8bf573661869bef0300028616a414cd130d0ccc5a5dc8ea923 SHA512 fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14
 DIST md5deep-4.4.tar.gz 4534687 BLAKE2B a2fc72e6e032945b6e3820d23a9d19b40438c00b7af870d00bed08f753decc5ac4e18c00dea447aa227f8706949f75712aa05d14f87ee76f62223b1fad0f7f1a SHA512 c37ec85ed04d4452f9038f43434c02e064cf9e17c4eaa233867dba0236443922a14ccb8ec76c68820087751c2ca3db014d3f17dd8fcd2c2bde84d620aae50de1
 EBUILD md5deep-4.3.ebuild 480 BLAKE2B 39183d9b63c81e0bd5d8084272579da2a9710c1457c978a0dfba06a05fc5c29b4dae4bc064436b53d92c58ac887278d195b322c6418bed30762f106e8a1e9b22 SHA512 0200309a8e3acf89df5ae5ff5cccea3cf379d17341a4ff46b4df95d0111ef4e6a4e025d6162c31283a3a9ed1e3ad09ef9e7b5c3e0093bbff136f213972d9f238
-EBUILD md5deep-4.4.ebuild 598 BLAKE2B 48b41879a455b297bf34ad352621fcc4dfda07d7f48c885aec0ee8656991c77692887cb7a27190409b468eec16502fa0c83e76319c63dcce18bf2b0d38f47825 SHA512 63a6002ca2a95b67a2b8f4bddb66130d1a02e4cfef7e5a66145402102cda56e64f0ff87708b8560c66703279866d65e47b7f834e3e3c4ab993152d3002737a66
+EBUILD md5deep-4.4.ebuild 612 BLAKE2B dd44ee2e7fa6f1d3a50165d410d2f7b86fbd5c6db65622abafbe3c9112a34ed0c7c25fec6fb4ac4203c5a5c69aae4c36a5848099897a7a468a3c03e4460f6bee SHA512 5363cd5cb2f36ae17439c102e7a3e135542b6d4c4af7c463667602b6ce815b05e6c089fbacf482a1c49880bdf31eb0d030a3a917841191396dc25c38059487d1
 MISC metadata.xml 396 BLAKE2B a1a6c4916e6e59e84cb6b095d8c0eda9584ad727014e934ad792bab88a3f6323fd1c31b6dbf84a10440daa9ec8afc494e31045bb20ec6a92d5705cf739fc61fa SHA512 2d4907761039f21088a1644f5da3b764ab55d37513195f0b04c8110a80f638f62f1322ecaf58bb3c506f69449b56e8f430130dcb3906738f0893a5cf83ae4e30
diff --git a/app-crypt/md5deep/md5deep-4.4.ebuild b/app-crypt/md5deep/md5deep-4.4.ebuild
index b2488ffb059b..48242e1000c5 100644
--- a/app-crypt/md5deep/md5deep-4.4.ebuild
+++ b/app-crypt/md5deep/md5deep-4.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Expanded md5sum program with recursive and comparison options"
 HOMEPAGE="http://md5deep.sourceforge.net/"
@@ -13,9 +12,14 @@ SRC_URI="https://github.com/jessek/hashdeep/archive/release-${PV}.tar.gz
 
 LICENSE="public-domain GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+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 )
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 1440f39d9c14..841f7baa49d4 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,7 +1,7 @@
 DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
 DIST p11-kit-0.23.2.tar.gz 1022733 BLAKE2B 09d1e1c9c9cc9bd330923f6aa37026b6f3b67fd728e4fdf2c692f0eaa1a27b1a045c263ba66d57063b8a03f8dc1ccd4d20bf5f255fc6e21d8ea600696f45d9ea SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f
 DIST p11-kit-0.23.9.tar.gz 1091561 BLAKE2B 9ad061e703f8a7bcf677d974316adc3c96c34765bcee9834e65850b16fd7afa6ab2ffade18a65b99b85ec1af877d74938cf9369797f914d622c15e218801351a SHA512 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed
-EBUILD p11-kit-0.23.12.ebuild 1990 BLAKE2B 6b92e6fc4f04fe9459c89b9451da33f2d4cce5f1b8e679c0004d4c92ebc97a3e4caaa015a795cd04a62eee4716be3e1774d9b0e22e81f15c478d24f1f56998f5 SHA512 8a06d412f57e3b7121e20fccfb6c324c334856813cba60ba2edd27fa942d2e995874e5abb31bb259b313535f7a1b9b71fd7f7e489135954e8f99e67d64d7cb63
+EBUILD p11-kit-0.23.12.ebuild 1985 BLAKE2B df7e9ea182f7c897d681e7171d057c6e54bac6e10edca6d5797d4659be8488a3eef17e7407a2e356576fa9845edfc51de4b3b4acbfde654ba8965084b50b62a8 SHA512 b018a44a7c03796e4fe5cf85872b38be0815ccb4bb11c2b97fdbe3a8cce1a36c8a0fa01f974779a1a8da52d105370ed477f136b08ea074678ffd347797f043dd
 EBUILD p11-kit-0.23.2.ebuild 1311 BLAKE2B 6f255091c7997b46f069719d8b9c20258ea36cd44bd06907d2620686714c6b8a5e4f68d9bfd5487ea5f6b0a5166af1bcdd3c9b4d3cbbb23641954cc882208491 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c
 EBUILD p11-kit-0.23.9.ebuild 1981 BLAKE2B ea17f5981f26ee2d34d5bfa1737a7cc4e9ff182dd56997bf7e1af26500a09ac325379dfb17c00ecdb5085346a58ce8d52ac7c05cb4185b97fefb67d3fb94e1ae SHA512 2265c63bf95e9899303bc8b12ca7a511cfa99e20ffcc214014d4c7cce2d6ec55cdf2afb69c7790eb074546c50768f085c0a02ad43ebcfa2798db43693f4e7b57
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
index cb5f5dc036bc..8c36bbf47e96 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index bf5ab5c40743..bbda4da7497f 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -5,5 +5,5 @@ AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836
 DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 EBUILD rhash-1.3.5.ebuild 2696 BLAKE2B bcaedcbbf9641101617be2014b44a0ab0155f856f6382090e7195154e5a15a0709478eaf14ab1e79962da2ae2d9b5fbad7e9ceeee3f344293b678c6a032d7a05 SHA512 2c0553f10b23946c4edc61ef9db1b1f9fc99eed8dff2bbfaca85cf85929aec4c31df308cbafa94dd2c91f86a380933d79ffb5a4b46901dcdc4399272639f759f
-EBUILD rhash-1.3.6-r1.ebuild 1910 BLAKE2B fa232839a86fab8962048ccfced5d9a934ef2161a2e692f8ec2862d63c3cac149c05ab113cc17888da92c26be58f543c2d85dd5830f0fc4f59faa5f4011c7a31 SHA512 94f19b264f0e43117a5386c102721075b4e77678647d1a69511d459536492afa41bd6f9f4768d2642542ebc5bb200c8ef29b520de863bc85d20132ac011c6f3d
+EBUILD rhash-1.3.6-r1.ebuild 1912 BLAKE2B c7e48f20c2d057a6988e74b8ecbe855371a0efe1424c8220a6e4fad185a36af4bcd5671c9dfb67a5f37ab9d54efe06296a4a6f169c3ec088df496a2a6f230060 SHA512 5a34204f9d95417c2ddd3769d6f893e051cbe3f651f93307c856044ea7ae82e39a08beb09a7fc148f33c25a41c60e062e4cdb173763fde64febe7bd47d4b0323
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index f87064529335..c3e0ea290ebb 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.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-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index d6f97db1ffaf..9f61e7a02a03 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,6 +1,4 @@
 AUX tpm-tools-1.3.9-gold.patch 451 BLAKE2B a322007af718189bd2a05da19c1b67ee0f630515233515569661e16b1a9f36c82c2b97a998ec526e0c9c617da3a4e5bf08b6c0eeb3642b16e65a47757ae59f36 SHA512 7f9473a456c5901c28ec0394158e43b3d8cc3a9a994e5be5d1a45b20f5360f2f0b7778eb93246964192e19fdd140ee5b50d1852500c9aface2824d83c6907c41
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
-DIST tpm-tools-1.3.9.tar.gz 484023 BLAKE2B 5f9809a8dd4c565c647ceb394e6a6086cd42d256feb39599331b979f73150f60881ba9f25a3b0171173d66da8718f1475c6945b243b86c2261c4e8c489802803 SHA512 460e56031aa65ede6b7aebf0c594d4093d870fb46f7c453c429e53cca442d4c7797ac29b519bca28d42133bc6d7701cdf938adbdf11f8be841157d4f4a3e17ca
-EBUILD tpm-tools-1.3.9.1.ebuild 1022 BLAKE2B 4cdff4f76c73f77207e4a8e368cbdadf206648b095c07b496fb334edadbbd462663d73598c10400b8a0f58b7c5bd7fe2e85a29d497a167c9622b3b046fc6715e SHA512 d230f6b7379fa975d0ea284e661f6b169b2bd559f959ef57db54b05edcb81eeb104081794ed625334c3797aeccc0c40a21d75370c4dfba13e38ac0daed150e07
-EBUILD tpm-tools-1.3.9.ebuild 1063 BLAKE2B 942d5fa06f92c84fed92068b3b9fd266081cc6822e5589725dc10ec6f48a5ccbdd0a2b27ebc7c50eee09f2139ce3d5a29e0834e4a56e2369c98697e322fc5a5f SHA512 a6b15b03b9d4018932080890b5bf9f156e600e8b89a033b895d0be5a6d304571acbd601775886293db542800f76d2805b613298f01a802a2ecbca4a9ba2c9120
+EBUILD tpm-tools-1.3.9.1.ebuild 1019 BLAKE2B b349561812cc566a4a284bd31779576ad0cb4d15319576922bf413216084ba9082e8eb529596dca52a812c22cdfd5e530b7e6e7ee3dd685378c62297708f554f SHA512 c02b1c1973f03e7eeac2e7489fa7200fd97fb80ad544766bb03d18bdbf75bf6da4f6906966955c313be2414a2fea552c1d36c7c9a3bb4d5e16bc8eb62f2389ab
 MISC metadata.xml 515 BLAKE2B 06991185c31f6e40b7cda3c9842339911e9806d024e1493ef674751b4d253f5f701a8386a8969f7124b29b2c984f109ec98cb767380b48781fb22bd266d7863a SHA512 5aea8cabd5ae0a00b4a49717efaf8ed6d6363131ff8bdc2a9167108297d32dee72c5419bbc84ae9ba1263d515dff2aa092b991c8411771a2b8c361bcf000258a
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
index 4b922742df44..eac3a3944abd 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
 COMMON_DEPEND="
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
deleted file mode 100644
index ff712c720ce9..000000000000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
-}