18 files changed, 150 insertions, 282 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0a6fdeac1125..13c8d11691cd 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index cad4d6854a6e..f5cd2c07c058 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.29.tar.bz2 635761 BLAKE2B ff14bc6e181a6d44b8ef463a2255d0362842f6e1e7c79e0a01caaba0a88892f7b0f2bd9d2dadae7be8b0655d2502e5471cff29e582928d62235fa070f2eb1ba8 SHA512 9ff37acad086e959f660069b245fe06ecada140623025a19dfbff55edec71e1e72bce09ac4fc506ad985dd0831dafc6b12f5a5b109b38bf9ba7583856eb19418
 DIST ccid-1.4.30.tar.bz2 642342 BLAKE2B fd43aa2a4c8840abb0545760f6ceb31bb9d7dc22d7283888c9a142e0c3b34310ec4530d18986451b21c6b1a3975b1212ab653a4c8d58466b28713f0f72ce1cdb SHA512 1761a4053a99eb28184d0ffece951aec5d4b646080597b4ae36b18a31fb7a76c55fabfa57ee8e5d7f2db1a6e13d209f7fa995fe6ed067f44558bea34a26d46da
 EBUILD ccid-1.4.29.ebuild 1501 BLAKE2B 511ebcb55b36429cf1c30dda2aa00a936d3b5de284db08dac9df9f0436c8704e4a2e0a5410e356c4f0187047cbfdbe954b5fdafc15220b72b2e36e2c82bff28e SHA512 c77f20dc8ec1c2ac518237605de88318cb36f9dd09bb2fcfdafe827c47da7e8e7f6b33cf1fb19cfae83c57485ec7fda9c6b981ee4371a723335b24a829cd57a9
-EBUILD ccid-1.4.30.ebuild 1503 BLAKE2B 870a9f53f8c3d4ca1610b62167e1c6a2374bf8585fae78312f14fb278e0cbdb17ab10ef39ada95f3c246d1c81879faf289e7f4fc097901461e068bd71eb7b4ad SHA512 63cec050390e57f62d29afc20c0590bb55ffcaacd049464e2476283f6785fd6110f089c1e3d7aa1cb7dfe47a7dcab64f07cec4b18d49c62b1589ea192deb7136
+EBUILD ccid-1.4.30.ebuild 1502 BLAKE2B 1e91e11ccae65ad9bfc9219e7a0716a1569b0cb331956a69ba07efd7f4f84ad9ea4dc2ddb84b47613a6548bb062e7ceea80a2d506ca582a012d857b7cca0b178 SHA512 ccf95e8a9c137b50d7a8a8aa88db9af5c505156a302df3668f5e2bcdc36cbf868a99d5c5c8cbaa8f2dd92b20eb9e5cb3c9e019c2c5c0db487dc1a25fa7721574
 MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
diff --git a/app-crypt/ccid/ccid-1.4.30.ebuild b/app-crypt/ccid/ccid-1.4.30.ebuild
index 7b28b5b26312..cfa0dedd0875 100644
--- a/app-crypt/ccid/ccid-1.4.30.ebuild
+++ b/app-crypt/ccid/ccid-1.4.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 bc05613dd1c2..f4583a8e2212 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,7 +2,9 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
 DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
 DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370beec77ffba0abb7862defdab2d5a82b1508284961e30e7d0aab82bffdf09fe796741603e843a062073f179f0bfc2 SHA512 a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd
 DIST gnupg-2.2.12.tar.bz2 6682303 BLAKE2B 8470ab8bf386d3524ce57ef1a1f6ac74d8cf2d7c35062b95c668b37586603c8e0817e410f4a0a807256e42896c11116897b7118b29e471184b2fa871ad4ba048 SHA512 30de9757bb60a5cb6bf0dc2c8da5f4742c54affec3fcd0bcbf66f28f2812149afec5db70dcb6ba592101de4bdc479d1ba0b47c53c8b8d4765ddff32fa51c26c8
+DIST gnupg-2.2.14.tar.bz2 6707735 BLAKE2B feedb1c776e8d43e43905e8a8c1487bd88e8effc59e94baf308cb29a5feea5d9c666c78b50147d65a259dc89af241c2a2bf07a72c417617e5238e0fdbbc2b17f SHA512 9d5216dee085efe6de300579d8fb773a5a55df639d5a435708611a974df522dd60dc995fbfcaad98065475dbeb731bbba19ecc3273e78b9b45fccff640dde69b
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
 EBUILD gnupg-2.2.10.ebuild 3320 BLAKE2B 1309b03e28bd2d5af1f2caeedb145a0f3c0c87db1b78ee014d3938d1bafdf3d469885df8d3bd622f9cebc81ef706925d0a77e68a265bbaee93902cb0ea094f51 SHA512 26211aacc1393429fe7459b58e1aa735e4cc1c278d7fcc774547fd9ada7adeaf35d297c65ca51ca927f6d304ffe8c78d874762c8649fc01e9dd259b2b2f52cda
 EBUILD gnupg-2.2.12.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
+EBUILD gnupg-2.2.14.ebuild 3663 BLAKE2B 58a51005ce97906d7a8c051d88ecd0ec3ecdc627e146c424c446bba93a7b37ad93b6248be631d97c750c5b4e03f675d8f2c7355d306fcf219a03d19b71886bb5 SHA512 73ffb70a72e2936233596ef8dee2429abff9d97fb128b3c5e94fef862948ca65e964a95538e0722b7773fb0f08c7f27ad9eaabbc6ad7c140c826e9d16ba657ac
 MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
diff --git a/app-crypt/gnupg/gnupg-2.2.14.ebuild b/app-crypt/gnupg/gnupg-2.2.14.ebuild
new file mode 100644
index 000000000000..fa2bd5fd28ae
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.14.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND="!app-crypt/dirmngr
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.28
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )
+	virtual/mta"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+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 prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	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 nls) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable ssl gnutls) \
+		$(use_enable tofu) \
+		$(use_enable usb ccid-driver) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--disable-ntbtls \
+		--enable-all-tests \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
+		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
index 89e5772a6a4c..110c7c572105 100644
--- a/app-crypt/paperkey/Manifest
+++ b/app-crypt/paperkey/Manifest
@@ -1,5 +1,5 @@
 DIST paperkey-1.5.tar.gz 266722 BLAKE2B 8b838b70690a080ca3e579780af890021f218e86dc73099e2adc457c169d2268795e34779d839b63cfe4fec549f44df058d49a853f9c02a878c2163a5e03b393 SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6
 DIST paperkey-1.6.tar.gz 271424 BLAKE2B 625a26bbae93122acf553036e902421ec630f6f92507b1f6dd231e970fc8d94a9d7017018bb783f934a37577de3e0c4f1fa68ca359c3de06f1a87590c188d266 SHA512 a07fc22bf56cd9524ecba61d1bf00102e6e97842e219682771187a2a2327c9daa885d457417bb2ea960f5ebd66bd711fa1d86687fda159647ff47980dee21b01
 EBUILD paperkey-1.5.ebuild 350 BLAKE2B 8476d7e01275eb1beb1ff2833c9d497ab229256e62e6778df478ad29eba3a54110257d22aac315b0f4bdbc3bfb4fa20f5384ef00a4898a7705775c1d110a4809 SHA512 215a9f17c548b6254d37a6f9d9faaa335916d37bd13ec262dcac2d663e66b4de8730b34c70bd1eb6108149afde67ded43571fe2e8e9c5b8950b4ba2c342b03a8
-EBUILD paperkey-1.6.ebuild 335 BLAKE2B 55e7cae78820a5f9f1024b0edf769f0576df6652c89307a945b6878532d487ecd0ea519f1750b63d0687a1c6b9ca07a4b544d208fde60379b63886b23e804361 SHA512 57dc7335f4241c0ffeb79195470773abb513427f26f849baca581ef5f2f7b65ecaa85a5183c04d6b03efeb49b7ec974a6975b0837f622c02c6c44abfb3fb3b49
+EBUILD paperkey-1.6.ebuild 342 BLAKE2B 433d27fadc9ab867e10304cd5249b9bc754212a9182d521b9cbc98dc877c6201a687194e98f11d0a027a858adf7fbd7e5fe76a4362e537c8e6fe885f3a7c00f3 SHA512 8f4a95c230e961ed56e2bda6e2d61edf4f05c59fdc3f2f05d30926e18f43588f0882df4113aaf938bd466192857cef8272fd5d077e9469c91b48bed4624d8701
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-crypt/paperkey/paperkey-1.6.ebuild b/app-crypt/paperkey/paperkey-1.6.ebuild
index 1c81dd96bc4e..c5eb3c6a14da 100644
--- a/app-crypt/paperkey/paperkey-1.6.ebuild
+++ b/app-crypt/paperkey/paperkey-1.6.ebuild
@@ -9,5 +9,5 @@ SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm64 x86 ~x64-macos"
 IUSE=""
diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest
index 490a376a58e3..b5edac91f6cc 100644
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@@ -1,6 +1,3 @@
-DIST rainbowcrack-1.6.1-linux32.zip 138833 BLAKE2B 1c4143aa4dcbe644c4d6f436d6624cd9b4b714c2efd95387fe3657251d05c214f2126a7f6f396ddd83eeb8ea83fdf8e758513609b082abee308d94aea5bfbf82 SHA512 0fc163c4a8a875149b479d74fbabbfbb5247b9e621e5362a27a8fb6d5dd64263ce89213b5f5a578ce09018cb2c93f2af51eae954e19fd448c490bcd0524612dd
-DIST rainbowcrack-1.6.1-linux64.zip 134268 BLAKE2B 3c3e8d1a385a3c973839d19a19ce8f16a12540ba2d461197e8363b2feb3380d931728761b3404de9e80b5c6a9df9e51d5463476088cffdc1fbccd5888bb85231 SHA512 6fd5a0356b76ed5e8062888aeb26755588d11aa5dab7fbb54ea92dbeac02e606b082e00b93a44203c158ee620d61c0f9051ecf62b60d8a83c4fca852af22144d
 DIST rainbowcrack-1.7-linux64.zip 208726 BLAKE2B 842e0a3ee74a8576a5331cc86259178b382e82f465f3093e7d1fa1b44907c1c30a73f53c2f7f527e052bc6266ceffd350c42b9b80b1298072a02c0cbd25e660d SHA512 068fe9d31004e08c0fcbe5a11500bd6248eca2f204a8d99a7343824ebc1dd847a01eb459f28d77fdd84eae98b05169a69e10b8893b9b5dd027381965c19b7bdb
-EBUILD rainbowcrack-1.6.1.ebuild 992 BLAKE2B 9c9c096bc1dfc0a35ba1d952598ebfc557601006aa6c88c947ede17841bb1e890649bb97452ea561c0be7c2b262a95bd8bfbc11003efbc69cf9c2bde465f5105 SHA512 610aeb389d8ae04c09e3f1b4d27bd8ed508d4c3a262fc3e404a23b15cda112fabc9a84fa441212eaee7f0d4d72e6b01874d1e5ecea22f65f0bce576548917816
 EBUILD rainbowcrack-1.7.ebuild 955 BLAKE2B ec3864d6ea73fbc86459d16d93ab254c71a26dddd9aef2696eeda0f609fc0968eb7e07d7e93970d730abd8525d73604f55efc2e22a0d57023afb3e0afc6e2a4f SHA512 f269c621d2b06d0c967364a410459be648a997f3d5be4cd572fe5b4452901104ca2cf3aed0b4e4d7de04991b8e7d5717446053c44384da971e2dfa7d4801e92e
 MISC metadata.xml 982 BLAKE2B fbc05af924e12a9682024c9e24cb1c35f84874ad36b11c705a5810cab63f83e3c2abd89e828f231fb82fcf7e672ebaa9511b80fe749274d2b5e4e2ee1add26b8 SHA512 c76947d085f4c322baa8f15112f2e7a64887a025c5871f95f934f52778d0d714061fddbd2a8ed66b31e5cde92045cba77817c708533ba83fab89c9e46d6c8a0c
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
deleted file mode 100644
index ec95cda05ca4..000000000000
--- a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index ca6abaec814a..2f903578c00c 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -3,5 +3,4 @@ AUX tpm-emulator.confd 20 BLAKE2B 13dd9f09a0a4efb9a039bfeababb5f00b8b2c3c1777e60
 AUX tpm-emulator.initd 776 BLAKE2B 0daa0247396d1b5f1c9542b28f825899a5cc45bd748b6b7e2328440fd466fd6b461e32487a955816a79827bf350cfb33bd71a6b197a8e67dbf5509750098cb59 SHA512 22d7b163dc6f567c1900a275ae545c4421b2d459ba535a24f48d7ad2609f5df36533849aa781d4dd704961db102eea08c99b79c01d0e3981fb46d2eb4e39d6fe
 DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
 EBUILD tpm-emulator-0.7.5-r1.ebuild 1714 BLAKE2B 9859186e9745a64ccb8cc65d4a3aec3c6cc16a4481e453cfa2e6611687892734be5d878a62039c3f99d00b515c7391e40bb86c5ed285d6063bb9c1d360cb19f7 SHA512 79d8f027b36b54433aad52c3fe8dbd8bfa3c2a2e16b811b9d3f78571c13e51a769816dcab6f44e75254da5f964e81ede9bc04f3915bfbc7bc72e6ba4402f0561
-EBUILD tpm-emulator-0.7.5.ebuild 1858 BLAKE2B 9f11f93bc01efaaeeca6f200b0705b9093c3b109e4af46502f187f079993ce735a1653d101561ca66b12444a63f67363198a9f890e7af954d2d6fdc47725f64e SHA512 2150882b2cfcd440ba40688683c045c25337c570059d11cc37be4fc88723ae5f617cf2de452355f79fb964e1cc66445271e8cc0bd9e10df8c25a212a5352854a
 MISC metadata.xml 395 BLAKE2B 053fec93e12819e95abadca4f2e9f871589c21ce8a7369092cfb04cb593a4fa687956458dfc2c7249b6951bb3b7c45f6c38fac1448d9e5d250ed8256f92df327 SHA512 dd69f6a31ebaa3971c316d967bd643654d11465bb0de20059ea82a4851691b605c42deb4846614627ae9c8b2b30075e6c44e53f9810999839ceaf2e9ee9aada8
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
deleted file mode 100644
index 97b70a4785f0..000000000000
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MODULES_OPTIONAL_USE="modules"
-inherit user linux-mod cmake-utils udev
-
-MY_P=${P/-/_}
-DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://github.com/PeterHuewe/tpm-emulator"
-SRC_URI="https://github.com/PeterHuewe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl mtm-emulator ssl"
-RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	!ssl? ( dev-libs/gmp )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	enewgroup tss
-	enewuser tss -1 -1 /var/lib/tpm tss
-	if use modules; then
-		CONFIG_CHECK="MODULES"
-		MODULE_NAMES="tpmd_dev(extra:tpmd_dev/linux:)"
-		BUILD_TARGETS="all tpmd_dev.rules"
-		BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
-		linux-mod_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENSSL=$(usex ssl ON OFF)
-		-DMTM_EMULATOR=$(usex mtm-emulator ON OFF)
-		-DBUILD_DEV=OFF
-	)
-	cmake-utils_src_configure
-
-	use modules && ln -s "${BUILD_DIR}/config.h" tpmd_dev/linux
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use modules; then
-		linux-mod_src_install
-		udev_newrules "tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir /var/log/tpm
-	fowners tss:tss /var/log/tpm
-}
-
-pkg_postinst() {
-	if use modules; then
-		linux-mod_pkg_postinst
-
-		ewarn ""
-		ewarn "The new init.d script does not load the tpmd_dev any more as it is optional."
-		ewarn "If you use the tpmd_dev, please load it explicitly in /etc/conf.d/modules"
-		ewarn ""
-	fi
-
-	einfo "tpmd socket is located at /var/run/tpm/tpmd_socket:0"
-}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index d4cf171dd774..b8572e87e24a 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,10 +1,6 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
 DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
-DIST xca-2.1.0.tar.gz 1055745 BLAKE2B c3ea2953be7cacb8c4c6fb6911f2e51806d40f294d8c9daef1d47da4f3e6ffa4933d199b8b92cab828286ececab2ea7195d5a46455e4d4703f0a67d0d7861db9 SHA512 ad46b290067b0a22bb6baeb0d065879bea74cd2c853f67c2be3d0c2bdaa5ca4ebef606c0f08bd0b130df4ec13418d470062b708ab479800eab7c18dffa46af03
-DIST xca-2.1.1.tar.gz 1055613 BLAKE2B bb6d6b4742c7a799bf1a65e1ed2f8ab8b4d695e717e630600bc22f0e0d4a9ae95d5d98d3e85ccfbdd07eb08cf7dba6b94c702790e21fe4899fce8fc33e4f7154 SHA512 e7c3fdb515bb7a719a775b97efcabe71dc1ccc31a7ddd7cb1a9543fb16d131bce180917418091927334a4dd169daef919a4d9476a29ab4355688c961e3340dd3
 DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07
 EBUILD xca-1.4.1.ebuild 1206 BLAKE2B efe75fe96b26d9179bcb51365e5dd67be4e952629c9961e93522a576d4c233dfba2d1aafb6bc86eb5832efa16e7c869e1bda274847028756bf0ea939caa88b49 SHA512 692b76cd35fe8928890017bedfbebcb99d692bf1efc07f39230561240cf2e70acf021418c634f13f985e35a17b54727a58e537f309a3ddf0fd885267cbd80d74
-EBUILD xca-2.1.0.ebuild 1453 BLAKE2B b892c63cf6df72362d5a0fcef1a6b4f3679116ea3cfdcbffdf6a9b738fc9a0c3fee77f0095754d6bc2662949bf988b9a34506e44788c898909602fd0295a8bef SHA512 0f082f78fa1defafe7b3125226908115c9672b170d26cd2b6d91e98d0e2e0a8c7b4212a6344978a53f5ad7db77fef9ac10b023152a91d10142237c886daea712
-EBUILD xca-2.1.1.ebuild 1453 BLAKE2B 0dc3fe49d50d9a668918e5fc02517f41323dd3c63afea9581dc7807d4f5d535ce2b35158e3bd33561eeb8d481f9454a669c44a5816f59f91e9d8bbe7d856e653 SHA512 e66d97e9b0280d00f88ab9d7afadd6d322e1b6027763c5942d1eaba8b6bd964e959bd8b748bd8e78500374bd3cea9e9641c01744bbe29508bd21ad88d7c7c6b6
-EBUILD xca-2.1.2.ebuild 1458 BLAKE2B ba654a2cb98212ff30064a2805e18710276decf9b4701a4fe101478e20d0716eb9bda52d034daa3e879e976d3d1cb5c9c7019c51e918ffd42aeebe569aa134da SHA512 cfd31b71ae28fc923a0eb37c4bc482acdad766b0efdc0587fcebfc096583bf1e8e2647effc70fa82c16fa9b0bf3c0a55123dfb2cbb73a875495c23cd186324e9
+EBUILD xca-2.1.2.ebuild 1457 BLAKE2B 098b0315a427a9e24dc8176ecc71a920211373bf5795f3fc585010e06c9f137e4986a71d20e1356b485e74e43e0d7218be0ced5fe31c274769cbeb4b9eb7b5ef SHA512 12ccd1173da3eac30ab2d9ea4684719b07c80bc3cbb5a9b8bf9d49af2ef34ba3766cefc24af4206299f4d6d4c2fd3be365fc9fabdd5e73d601e66a87fb1ffa0d
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-2.1.0.ebuild b/app-crypt/xca/xca-2.1.0.ebuild
deleted file mode 100644
index 083396d5b9ed..000000000000
--- a/app-crypt/xca/xca-2.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="bindist doc libressl"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	# non standard destdir
-	emake install destdir="${ED}"
-	einstalldocs
-
-	insinto /etc/xca
-	doins misc/*.txt
-
-	ewarn "Make a backup copy of your database!"
-	ewarn "This version completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/xca/xca-2.1.1.ebuild b/app-crypt/xca/xca-2.1.1.ebuild
deleted file mode 100644
index 34566357ce3d..000000000000
--- a/app-crypt/xca/xca-2.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="bindist doc libressl"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	# non standard destdir
-	emake install destdir="${ED}"
-	einstalldocs
-
-	insinto /etc/xca
-	doins misc/*.txt
-
-	ewarn "Make a backup copy of your database!"
-	ewarn "This version completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/xca/xca-2.1.2.ebuild b/app-crypt/xca/xca-2.1.2.ebuild
index 9e097029604e..6b7c827e6513 100644
--- a/app-crypt/xca/xca-2.1.2.ebuild
+++ b/app-crypt/xca/xca-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bindist doc libressl"
 
 RDEPEND="
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index b07420faa158..eeea081a5e6b 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -6,6 +6,6 @@ DIST yubikey-manager-2.0.0.tar.gz 102078 BLAKE2B a2b8f90dabefb1014881cbe709222bf
 DIST yubikey-manager-2.1.0.tar.gz 132797 BLAKE2B 39a170901dd10443f7cd639d1f525b12074ed042f606c083fe5b1bf04f463f608c4968c1e7f06dd057ff519a2a4bf712d36643e7db164ef92a3152ea5fb7ae15 SHA512 05cc1a106ffd2b40bc0a1286fa2f9c19f022bc7db04b85c9aaab3c67cad92a0c8ee4ba70f9b62ffa7f02ce67525a7d5f03bf9160b9bbe38909232cf75eb39373
 EBUILD yubikey-manager-0.7.1.ebuild 1579 BLAKE2B 65991c1ec1c6acc26baac225043924eb7dd5fdcad0e99d8ba26931ef9da0318dd47ca9a5f602c75c3fb35eedfc0a275695231b5a03e191c9c30a323ef89bf95a SHA512 d24bd03dc385339b96e36fc8056e4044233b784ad73a9464ae2eb797d5ac48bef907e3c27a63125c34c41b8578f8a98c03f9b3cc18db263c3ad656724f532ba3
 EBUILD yubikey-manager-1.0.0-r1.ebuild 1529 BLAKE2B c6e82a3279aa4ea3a179df00c95f53d41626ff825b9c0e43da9670fd724ac8e3156ef54056b2b70c951dd73e0d8b4bc5594cedea16270e034a6cbd92233cfc8c SHA512 ccae1748ac051677ff46517a88e18affaadda2508dd05c261a0a0377d7f75cbdaaa5b114c70a74e5195ce8c9624cdb820c3f883dcd1be74f8046472614ba453c
-EBUILD yubikey-manager-2.0.0.ebuild 1676 BLAKE2B 3737a80f7f6bfe9f712dc4abce6d6ca3ee196ddeeb4e60b0080226958580455f1d57cdf2a3d1d0f8de5456ffd2f2361ff27017ad64c820a0a913149547a2383c SHA512 70e17d694ae9a2ef45f09d28988daa91ccd4afabb5cd3bd4f7d21fe7e85a013507668bebd5242ae23a0153945a21db30abfce6abd34e9fea3c7f4a654ac35e3e
-EBUILD yubikey-manager-2.1.0.ebuild 1530 BLAKE2B 299579dc9d3e3e56a502ae3140226bb80b8cfc7cd0d7a41b82877fd86ced9c382c419e276615e07f84552504b83f93a4d1cd266244930bc74ce177f916794324 SHA512 d5da375e7eb7166db9de436eb1978d6b2b89e882fdea62d1872be22495ed09f6f2cb150753087423c57da71fad4c49ac85ecbd650d838e6bd92ce0b1401b40a8
+EBUILD yubikey-manager-2.0.0.ebuild 1680 BLAKE2B b5611488508853e8e52055270968136d6ec06e533cb9999da0648d0c65fe78a82ea26bf3705ac24b0d1d57d700d0d28794b1538fed0ebbf4436be4c2da9038ba SHA512 582b5c234bb9e801ec1f10d819c2897b3edb11b708d211d367ad1218e76e882c7170bfec9e6099bf1401bebcc6c8cc86e3b3e15135790dee9e89071707b89038
+EBUILD yubikey-manager-2.1.0.ebuild 1535 BLAKE2B 40f154c5ce3e87b7c21febf1f2bd12842695b97466f027cb53468cada65b3160db48e6f9760d920d07024ce3fab86b5088f113fd78754b02537b4040670fbec7 SHA512 9405cd372bb47d080bc152532ef6e7b5f9acd5e87287c1cfdb201a292920b648691acf1ddf712d1e948df7a2a138f09f263484d573574ab3a4e083d05914c034
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
index 0172b68ddf9d..48998431ea98 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}" # <- need this only for github-based SRC_URI
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
index 30b06435964d..30b5eadeab70 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="