gentoo resync : 28.04.2018

27 files changed, 176 insertions, 242 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 311dcc6e766b..0dc4a5d99c47 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 06e54df0080b..1ec70041d790 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,6 +1,7 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
+AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 EBUILD efitools-1.7.0.ebuild 786 BLAKE2B 8a842f23c5e7ec1afa535dfd7448503a1313cd026eaab72961a517ca223d04ac521cd6ce7c98c920de079c33549b164aa544b44fdfe73c76bd46e7444da2fb28 SHA512 40132fc48114b2baebb590e1b6ac4a32961c1ab6d7393ecf80223fab6bffb6cccc8da1123c67f967602982a23ecc82a1f106856d39ba73862ce5ddf2162d3e18
-EBUILD efitools-1.8.1.ebuild 977 BLAKE2B 8dd613c9eee261644ced732913ddb18dc36b08efc1f2fea24e5ae70405fd655acbb4c89b79f0ede1fe96011194d17f50a989cb31d6576e080766d2cb9b3624dc SHA512 69a1034fe522bb43914fe52320547a3f1aa70e3739deeb628f16cc7d395f803dd47e72efe2409a060bd790c7e7cd1e2a532dba9fc971be338382c455964e9055
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+EBUILD efitools-1.8.1.ebuild 1030 BLAKE2B 869a7a8a299dac60eeedd0ccb990f96cb151cab36ca68cec602f5f5424609be59fc5c4bfb4b90e42a045bc552ae47f0a0ac8cab326ba5d15fed0460ebe1fb2a5 SHA512 0df50584ba254e4f8f18f852b7c43c461ea10f0dc4be8d597979a657011c3485a0410e2bc746ec46dc9449578adccd692d8530c76d66267e3f3c55d7ed213a45
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index 093ce11c7611..f18e8b8ea271 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -20,11 +20,13 @@ RDEPEND="!libressl? ( dev-libs/openssl:0= )
 
 DEPEND="${RDEPEND}
 	app-crypt/sbsigntool
-	dev-perl/File-Slurp-Unicode
+	dev-perl/File-Slurp
 	sys-apps/help2man
 	sys-boot/gnu-efi
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
+
 src_prepare() {
 	# Respect users CFLAGS
 	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
diff --git a/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
new file mode 100644
index 000000000000..876baae16f81
--- /dev/null
+++ b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/cert-to-efi-hash-list.c	2018-04-21 20:59:24.814748503 +0200
++++ b/cert-to-efi-hash-list.c	2018-04-21 20:59:51.868581307 +0200
+@@ -135,7 +135,7 @@
+         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
+ 	unsigned char *cert_buf = NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
+ #else
+ 	int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
index 097975e3adc2..7a38bb900964 100644
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 5b2e084dd22e..2c25e91b695d 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -9,8 +9,6 @@ AUX heimdal-kpasswdd.initd-r2 448 BLAKE2B e9280b18c06ad50579eceec52fe7bb83630b86
 AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0948437f20228aec0508788de30fe657765dfe3be3955680a8e006d4afdc1396c7810d26775bae936d72f927e14e8dbd46f SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
-DIST heimdal-7.4.0.tar.gz 9928553 BLAKE2B e43215a82d603bf69d3ac22ffbf0b0b7995fdaa9c2d0c1a5ac2d145a5fbed653b9b021caae5af1955323760afcd0ec2083b94d1c32f07486c7368ab03172a9bd SHA512 3bb83974180e0f6fe2e1b2a11c51cf136c9a64f13f9ed7592f0039ccccd03c1a22081b7d88ae631f94cf46589ed399b79666eb814104f915faa70b53749863a7
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
-EBUILD heimdal-7.4.0.ebuild 4263 BLAKE2B 42fd2b71e36120fa3892c1ee44678f4a7675bc50aa860232cff6e45e7ac2a786dd7a75feefcf2547d8a65e29d3918f04d7f20add4b23af6b9d199e4070fabc2b SHA512 cfea42b8a74858e6f411b783dbaa916efc50b235e5ab0d9a6dc92db6758a7395450b7fd985e22f4c32f6cb6f5c5fee7b27fda9e4b64e29f49433a261d13061df
-EBUILD heimdal-7.5.0.ebuild 4264 BLAKE2B f9357b6f39ed641812234c76a01e6373f4244a2d3d1a7067f9bc91543eb9ea8d56b6b6f7a2df44fade0eec19c56628488c931ca25b80a6049156c5f8be722f87 SHA512 00f38630e324942b1aa6c8fc798dae821644e32e27a17d9f674b645e5c1bd425279b3929df8558fea07d4b17c669baa177077db6481962cfffc1415429e3cbdc
+EBUILD heimdal-7.5.0.ebuild 4263 BLAKE2B 42fd2b71e36120fa3892c1ee44678f4a7675bc50aa860232cff6e45e7ac2a786dd7a75feefcf2547d8a65e29d3918f04d7f20add4b23af6b9d199e4070fabc2b SHA512 cfea42b8a74858e6f411b783dbaa916efc50b235e5ab0d9a6dc92db6758a7395450b7fd985e22f4c32f6cb6f5c5fee7b27fda9e4b64e29f49433a261d13061df
 MISC metadata.xml 638 BLAKE2B f886a9862a4143b2c9f2a2e5af79c6ce72d23e883a2285f16ad22e61c8acc301f8a838b2fea65f42168edfda9a8652a420c01dc34482123d0ec6ccc6ef0a5ce9 SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f
diff --git a/app-crypt/heimdal/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild
deleted file mode 100644
index 55723b4747fc..000000000000
--- a/app-crypt/heimdal/heimdal-7.4.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	eapply "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use berkdb; then
-		myconf+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myconf+=(
-			--without-berkeley-db
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		--enable-pthread-support \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with caps capng) \
-		$(multilib_native_use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake -j1
-	else
-		emake -C include -j1
-		emake -C lib -j1
-		emake -C kdc -j1
-		emake -C tools -j1
-		emake -C tests/plugin -j1
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog* README NEWS TODO
-
-	# client rename
-	mv "${D}"/usr/share/man/man1/{,k}su.1
-	mv "${D}"/usr/bin/{,k}su
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${S}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	prune_libtool_files
-
-	# default database dir
-	keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index 180e7c5e0ad8..55723b4747fc 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 
 CDEPEND="
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index fc563d1b5ede..99a061962ee4 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,5 +1,5 @@
 DIST libmd-0.0.0.tar.xz 252384 BLAKE2B 00db5db91c35fc27a681977155eb18fee44f553911938abd4b57656a4b71c0de7014df0d8303d48b40b5fe688fb150e06a03ea44d089e4ea1f52ac4060ea7c84 SHA512 6677959b7725114d7ebb747e0746d2712fc9b65f688eb28fa931c9042cee10cda3de33a1496b0220141800e98cf923d95dd5a5f3c2b8a68c3e169ef9fdaa39ef
 DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af8055885b08084fafd7299e9aaea95efb8437ffa756e43c5bb75fac99af067c6a560f3bb2b8b93ee889d5e664b SHA512 54c3cae1308f7686a1f642d25ae5d8cfb0fce2b98b33cf5e2891682893715c7de7e9700c70a6bd7e4ab4cf7f54c87643b259319e09e03f529b70d273477fc8be
 EBUILD libmd-0.0.0.ebuild 386 BLAKE2B c70801d1e4958802b33f8a6aa64b4ef8bb477f96bd19155f964d1c3c17cd52dfc18d47d864bf006550833d1aa9f7134c919428b78a9e09dbc956e8f95f73753d SHA512 b60e55904bc356ec87b60ace12914bc5d301a07939092615c3fe38f2eef4258b30d04e2b2cd3f5a39b28326a08f28bd0949363c172d29f9c6c021aceaba0193f
-EBUILD libmd-1.0.0.ebuild 388 BLAKE2B 485f36d9e1f834741a54cca91dc3d9b3e67ff49a1889f42ce686def8cfb21bee93949c35aa1ff6654e1c7a61d7c2dae4a8c6da751b3d1a69f8a6c9b7e9604821 SHA512 55bcdf3737e33e5d421df825fd3e030221b8054b566d3cd7a5a7bba5cd6b984db2903330d5ce440bcfb2fbf23f6d4e2900d4f79290fea40d5e96c96ac0d70ce0
+EBUILD libmd-1.0.0.ebuild 387 BLAKE2B e2a5a39fdd3782cb81652698fbac164f42752ec837ba1be85e45e1b7d9180242c6390c04ba741b54fb6c9ece7b467a1b28b73e83f888ea97ffe25e473d564033 SHA512 8bc02adb53695831458b9ee6b720338aa7f7573a556b3e919aa7be17e0b9c60a7815432e3e72ccc83202d5193a283065d6ea9f4f71537714d71e2c04adfc4bc6
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/libmd/libmd-1.0.0.ebuild b/app-crypt/libmd/libmd-1.0.0.ebuild
index 2032ae0f388f..16f830c5f4be 100644
--- a/app-crypt/libmd/libmd-1.0.0.ebuild
+++ b/app-crypt/libmd/libmd-1.0.0.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 2b5e14e283e4..67116ed99b6f 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,3 +1,5 @@
 DIST libsecret-0.18.5.tar.xz 508556 BLAKE2B e3410dd113dfa1f4ebb78a47f90e23455eb8f82466d4607aa469c04adc84aa3181bfdb7dcb4ff459fd2aa49c315ffd52fd2d3a4929694909fe65af637b65482b SHA512 4ee297b556d3b555b6ca9f5eb5cc87425b782491d0550a75873aac0f7019b123f437f0731c85bb058fc65b50a589d54d0697657a50bef4ac2952e9e40a916b5c
+DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 EBUILD libsecret-0.18.5.ebuild 1587 BLAKE2B 5bc76ca976d6fb5747df1fc877a66789b2260322b40e4a0c01e125d35423f813d84964f0cd7e8ce24eca3a009d3071660037a5c40de1364f343bcb06272761fb SHA512 2b8a057d68fae082f3485e20f1e2c868842d23d2ea49b4e42f3e67d2a684581e517b6d9b4d9daa0a25799f560ce276feff6cdec064082ce38f3d364f7c32ec74
+EBUILD libsecret-0.18.6.ebuild 2026 BLAKE2B 078a438154dbb27494a959c562198b56d990944694b25d15a19c5453160dc6564cd1ebaa16aab760669580fa856b7c91dc1f4e45f3d384519e9617eb1f050d27 SHA512 9d6b4ade6d2229161ab05c5671bcd5fc1ed78f19ab7d4aa513fd41fae4dfff740de2b6cc9111fe00457795b79e76ed07612af18ae3870208be130ef587296182
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6.ebuild b/app-crypt/libsecret/libsecret-0.18.6.ebuild
new file mode 100644
index 000000000000..2b88d22bb20a
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+PDEPEND=">=gnome-base/gnome-keyring-3
+"
+# PDEPEND to avoid circular dep (bug #547456)
+# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		introspection? ( >=dev-libs/gjs-1.32 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-manpages \
+		--disable-strict \
+		--disable-coverage \
+		--disable-static \
+		$(use_enable crypt gcrypt) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 2f8f3a5f7ff7..fe10178757db 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -22,6 +22,6 @@ DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3
 EBUILD mit-krb5-1.15.2-r1.ebuild 3783 BLAKE2B 159b71b8d361cdd970ead9c9aab178d0f2b8c892d0fc03c8ead5fabeac0a4b9b672033654af6bd42cb9aac42109cf6ebaf2d1bf7c78e194e0e6b2bb94a998a2b SHA512 6f47bb8fffdfcc356de32b7f7b80d14b2643492a6b72da63b8ddb4dd357ba7fc2362d1943b98ff2e353fc6a922c45489007799e397f88d393b7377a2a0ace8ab
 EBUILD mit-krb5-1.15.2.ebuild 3726 BLAKE2B 866f73ca347e333ba75383ed43552621adb018d2352f2b22b8ac343375b45365a0374fdfb8339376c2ba6826e8399dd46e7c7dc548bbb06d41c5c9a5197ddaed SHA512 6dbd81a886c77afaf389a151e2d681897581a521a7d0141af402c6149a03c5be149bc304ade71f2f30d94a37a90a9171432d3d902b92be3ba5297232bb03f166
 EBUILD mit-krb5-1.16-r1.ebuild 4125 BLAKE2B 59e0014116ffdb9eb53ea720f3cbd7f71e994122ded056db738c1048d5c341ed3d67215417de38be6ab63cf1f5e186c616083cf361bbae08a77e808a0e70cfa6 SHA512 33fbd340575089a810e4fd361fa1680da97d296d8aa27450c237ca0aaade3cde530720910394fef5a35539ac77b9143dc0ee0898173d54c38c1d1ef7d30f8bbb
-EBUILD mit-krb5-1.16-r2.ebuild 4218 BLAKE2B e84eb5fdbb298d97c72715bbbbbe2e7be9b2f347391339baa5375b0a26fc1a7214599769389c413487592e7e85aee5e121d1b6ce28de2ce8b310bb7863989f03 SHA512 f7a695a34a09197775fe56de13adccbf41bdcf481ae326201ab833d05e3f10c3b53265c2a8bfda37fc3cf12be0db456557e57922646a7fba9c57bcc307e51448
+EBUILD mit-krb5-1.16-r2.ebuild 4216 BLAKE2B 549275049118fa581d9ed872b7b2d8ed48f959771bfbe745e20c5c80c6678a4c7c3209d0316464816f80ca81ea51d3b9da5c380debccc03e797c975070233a9b SHA512 2cd3e5edf102c2a46af87d9ce4f26714b8fc9e765b24126c35440a8724863fb661e243910f05c7aee83d7d32e91cc2c1ebad8ed73167147ecbe49b47a6a0e6ae
 EBUILD mit-krb5-1.16.ebuild 4060 BLAKE2B c271a048c52a7e940737827bf6c6639b333520be6f631edab5a6a7c901ed4a7378a994f247418c5bb131141b75de71c8d42dc9ab0135cbdab5ad68c6e51006fe SHA512 95d2149d2861b5c7ef3f6e9d026100c37814c7b87bb9e2879985c5ee50847bc894b4f73ec0ee9de8d3b2cd717b30541c382d011aa7408618ccd23a3d7556719f
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
index fefb27d71001..4e8badb0a94f 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
 
 # Test suite require network access
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index e6029653f6fc..4cf97ba8fd72 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,6 +1,6 @@
 AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
 AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
-DIST moolticute-0.12.7.tar.gz 5364075 BLAKE2B a85a18264e5658a96454d4b934cca1b62b63b2d1b90352fe750f973e28dd2da78d0a95d3103d4e213d9bb96b76d28c79d6d77127a6c85078036b63e61889afe0 SHA512 f7db56c9bdf6d3f8d1ad573f37f0c394b53fd2acc1f257f2f8b113af1c1a050f40a3cdbf7d559cb45eb5e61533bae084f0b574db43da1598bfd056131df8edd9
-EBUILD moolticute-0.12.7.ebuild 1221 BLAKE2B 1543d9255677160ebb05eb0b169c8fce07e3de2e636c74989528011d01d003e6c2bb6c175311968e2e984cb27d17c49916380225a40ecbebcbc734d157f3271d SHA512 cf7759c9cb9e12daadc144cd1c75bc4cdbedc05ef5d751770e2f6f2fa4febc8f24162159fc46d19c295d4c32d1f0a144f8a340267bb6c8b0ce985abd2f175ad2
-EBUILD moolticute-9999.ebuild 1221 BLAKE2B d7846f6ffdf9461819bd57cdf6d800c2d3cbee5f62f8bfc4f8cf38b4001c79c9637d329a1ad0efb27d006cfb27b29ce838ac88065619b60ebe06f27203da2558 SHA512 8c60b98f38e898ba74aacc00bf0bc58bb9cebb701e3beaca6f4ec934c2041ce5132ae96c73e644348582a00e44012d9a1a5e05b3f0741e378edcdb67f04ca1c7
+DIST moolticute-0.12.9.tar.gz 5364306 BLAKE2B adf101a779d4a7dc801f9d7705e6d6b624fb380a502a0fadf38463045af38d7d3a0a2005d1617f9d5874349b347b39632ccbb89f9edb97f7f74f62a7fd129220 SHA512 c02542f3bc3db4740e981cdec8ffb753189b15a341e55812de0f0592e23a678a1be73167d6fa5ca32e943d9cdf5f4937abe8132332b490104beed82d5b8d24a7
+EBUILD moolticute-0.12.9.ebuild 1241 BLAKE2B d12fb1de10aead21f1c5a6fc7faf3719b05d3bac598d681bf8529c2bea92a904c10cca4b46314ddc01f3cbc531cd2dd288d242425106c84229e12daef03fa084 SHA512 02e813bc70f79954b3b54aa6aae08d6a4158db83ae03aa6c9926248da80ed4aae9b497d26bbb70d9061e886f4d3b7d64cefe49524a8cd1612af7313b7aa6b4bd
+EBUILD moolticute-9999.ebuild 1241 BLAKE2B d12fb1de10aead21f1c5a6fc7faf3719b05d3bac598d681bf8529c2bea92a904c10cca4b46314ddc01f3cbc531cd2dd288d242425106c84229e12daef03fa084 SHA512 02e813bc70f79954b3b54aa6aae08d6a4158db83ae03aa6c9926248da80ed4aae9b497d26bbb70d9061e886f4d3b7d64cefe49524a8cd1612af7313b7aa6b4bd
 MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
diff --git a/app-crypt/moolticute/moolticute-0.12.7.ebuild b/app-crypt/moolticute/moolticute-0.12.9.ebuild
index b5153ad45a3e..da3da6c6597f 100644
--- a/app-crypt/moolticute/moolticute-0.12.7.ebuild
+++ b/app-crypt/moolticute/moolticute-0.12.9.ebuild
@@ -23,14 +23,16 @@ IUSE=""
 
 RDEPEND="
 	>=dev-libs/libusb-1.0.20
-	>=dev-qt/qtcore-5.6:5
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qttest:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
 
 S="${WORKDIR}/${P/_/-}"
 
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index 6176b1bb8674..da3da6c6597f 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,14 +23,16 @@ IUSE=""
 
 RDEPEND="
 	>=dev-libs/libusb-1.0.20
-	>=dev-qt/qtcore-5.6:5
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qttest:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
 
 S="${WORKDIR}/${P/_/-}"
 
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index cadaddf5925f..ca807d81c40a 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,5 +1,5 @@
 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.2.ebuild 1311 BLAKE2B 6f255091c7997b46f069719d8b9c20258ea36cd44bd06907d2620686714c6b8a5e4f68d9bfd5487ea5f6b0a5166af1bcdd3c9b4d3cbbb23641954cc882208491 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c
-EBUILD p11-kit-0.23.9.ebuild 1987 BLAKE2B ad67b94bf8e8f9e46d04cfcc7a71b2a3410b8054dd2d475f554b9a9caea41553151b37aa443d6ab69c8e3a14b03eec1608fca0992119f4998929aed24cc717cb SHA512 63f0acc46c26f662d76e792abba9b01aab687251139d52960b3f3cb6e10413172b26252ad5b2ded5c725832fb476d5126b8d3390e701c622cb58ee7b0136ddc5
+EBUILD p11-kit-0.23.9.ebuild 1983 BLAKE2B d1bf500c58a8e9b9155507505e42351f406e5e4d6299b7342593b4d00b1f68cc3f377479d24b3e6da4210930c3d0d2e53fd618636073703c1399228f9df00566 SHA512 96d8fa649ee50d939f815cf766a0046432c0dda75d4ef5b827b953fbd9d88d8360b1286a24459b6e8c4bfef5e2c8902aca7c9ba26638ffd21937c7c73b3191f9
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
index 6f8df6f49780..501ce2928350 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.9.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/signing-party/Manifest b/app-crypt/signing-party/Manifest
index b6f37db12abc..7071218e030e 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,5 +1,5 @@
 DIST signing-party_2.6.orig.tar.gz 201210 BLAKE2B 9be19ffafbb42aca36c7fa8a42e9cb2f804cb226f9b0bdcd97d02751b23a6adf055f4667d0e8192c51d96a96978a5807a9ec6bfb21151cedfef1cb32db1d87a0 SHA512 094af9b354d958d382bf99a1f10a9f12585f85769686e3bc9b9b813016f68232775e4002c0a7accbc894c946f7532b32ee7f9b3e23d467b973041c092ba4efb9
 DIST signing-party_2.7.orig.tar.gz 201320 BLAKE2B 4fe5781b610dc8acd5166fc7ce7daa1b856f6617952d5eb226cae0c8c6fcaa196b88ffe313b2d71b8f11423a81e84f2124d9adea86edbfb0d22808473d1c36fe SHA512 d1599ca0cb2dd554b4688bc8c77f4a1dd907d00539bb11abe147300dd2184f8548ebe9fdf793e83e2956a220b1c4bf9e19bd543b77f724b0c8ea4794ac945985
 EBUILD signing-party-2.6.ebuild 2998 BLAKE2B 814fe8aa0e723d0dafa3adb18a909c92b326aca8d07bef61bc4a72531ab3cac38164b29b5bf143ac6a37fda368f9561f7e286e3a154da227abd530a00ceebdd7 SHA512 12f7429286f57c949a404ac689d1c6374af4161fa5da9e220b53b84bc6d6fe9768e3089c7b0a1b07892cca85903649237854b8fd2f4314ddccf30c54213f0a10
-EBUILD signing-party-2.7.ebuild 2983 BLAKE2B 845df2f93737e1be44d3c384e251082ad9d6e3fc32a2d6fafb4a5811e572d0dae718cfae6cd021000642fd9fca185336f6a999ea7d14d333cc3a397ffd1928af SHA512 d36a98a72f0b063edeb170f46248407733e0d8254a2ae87e02fc20a6611b92af8352cabb0bb83a65ff36bb16b7d4b1776892dd93fc8a39d7b44d4342691e11d1
+EBUILD signing-party-2.7.ebuild 2982 BLAKE2B bcb61cdbdf3e85d95ad263ba01b3aeeb134be6f4d52bc4791156e308358773c8fc71c188e20da4c77715602e0010adf982c1bc38867bb5f4d0366aa4f5415694 SHA512 dd5e2ffea9894ce95fe492170f7a07d39fcdf66ae2a9c3d42d59ecdfdaded4e60a52fd5ced6dbecd0ccd4d31b7fa51b474ebdd519d977d5bf9da10251361398a
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/signing-party/signing-party-2.7.ebuild b/app-crypt/signing-party/signing-party-2.7.ebuild
index 49020ae5f4d7..ef4947da5f7a 100644
--- a/app-crypt/signing-party/signing-party-2.7.ebuild
+++ b/app-crypt/signing-party/signing-party-2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 5889f0fd0c5b..d6f97db1ffaf 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,4 +1,6 @@
 AUX tpm-tools-1.3.9-gold.patch 451 BLAKE2B a322007af718189bd2a05da19c1b67ee0f630515233515569661e16b1a9f36c82c2b97a998ec526e0c9c617da3a4e5bf08b6c0eeb3642b16e65a47757ae59f36 SHA512 7f9473a456c5901c28ec0394158e43b3d8cc3a9a994e5be5d1a45b20f5360f2f0b7778eb93246964192e19fdd140ee5b50d1852500c9aface2824d83c6907c41
+DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 DIST tpm-tools-1.3.9.tar.gz 484023 BLAKE2B 5f9809a8dd4c565c647ceb394e6a6086cd42d256feb39599331b979f73150f60881ba9f25a3b0171173d66da8718f1475c6945b243b86c2261c4e8c489802803 SHA512 460e56031aa65ede6b7aebf0c594d4093d870fb46f7c453c429e53cca442d4c7797ac29b519bca28d42133bc6d7701cdf938adbdf11f8be841157d4f4a3e17ca
+EBUILD tpm-tools-1.3.9.1.ebuild 1022 BLAKE2B 4cdff4f76c73f77207e4a8e368cbdadf206648b095c07b496fb334edadbbd462663d73598c10400b8a0f58b7c5bd7fe2e85a29d497a167c9622b3b046fc6715e SHA512 d230f6b7379fa975d0ea284e661f6b169b2bd559f959ef57db54b05edcb81eeb104081794ed625334c3797aeccc0c40a21d75370c4dfba13e38ac0daed150e07
 EBUILD tpm-tools-1.3.9.ebuild 1063 BLAKE2B 942d5fa06f92c84fed92068b3b9fd266081cc6822e5589725dc10ec6f48a5ccbdd0a2b27ebc7c50eee09f2139ce3d5a29e0834e4a56e2369c98697e322fc5a5f SHA512 a6b15b03b9d4018932080890b5bf9f156e600e8b89a033b895d0be5a6d304571acbd601775886293db542800f76d2805b613298f01a802a2ecbca4a9ba2c9120
 MISC metadata.xml 515 BLAKE2B 06991185c31f6e40b7cda3c9842339911e9806d024e1493ef674751b4d253f5f701a8386a8969f7124b29b2c984f109ec98cb767380b48781fb22bd266d7863a SHA512 5aea8cabd5ae0a00b4a49717efaf8ed6d6363131ff8bdc2a9167108297d32dee72c5419bbc84ae9ba1263d515dff2aa092b991c8411771a2b8c361bcf000258a
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
new file mode 100644
index 000000000000..4b922742df44
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sourceforge.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
+IUSE="libressl nls pkcs11 debug"
+
+COMMON_DEPEND="
+	>=app-crypt/trousers-0.3.0
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pkcs11? ( dev-libs/opencryptoki )
+	"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	sed -i -r \
+		-e '/CFLAGS/s/ -m64//' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
+
+	econf \
+		$(use_enable nls) \
+		$(use pkcs11 || echo --disable-pkcs11-support)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index e58741497e06..c2b2e8cdca38 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -5,5 +5,5 @@ DIST xca-1.4.0.tar.gz 940245 BLAKE2B 1f0c9d72b647fa803c2b6b6019b0b9828f37b1d38d8
 DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
 EBUILD xca-1.3.2-r2.ebuild 1107 BLAKE2B 40eaa44f511936f3be91eda8632bafba91511e9596e0fffdca6f53acf75e2fe11d6725e136cdc8c5d1fcd1bc4ec467dbb26f5c29ed9763185447c5ebbf59a6d5 SHA512 9379423c902b218ba5b7d60de2d8074c05e7a65a2223e723429ae47f4ef491b215ab3c68d2204f80b9d88a16207b4b30c993735e73d0ff2f5ed38b4588190de4
 EBUILD xca-1.4.0.ebuild 948 BLAKE2B d1cb112f8b1214c346f612d4c63bbc1a456a29f2a5bb57d8f86148fcad51ee4e74ad8871263f45618ee4bc1b894926d4a0576abe4d3c7b20269fc3d1e761e6b1 SHA512 31929fba97fa0a3c4c74849ecd23cfa56786cbd64af748cf4e521f534fb4a613013016dd271e81d6f2632464987359ed6f026be2d1f01f53ddc531cf225968e1
-EBUILD xca-1.4.1.ebuild 1161 BLAKE2B 9022f7feec3fa1d447e7e408848305768cfe3e592880b70316674ec135fce431ee766846def03f54d3f72596a2e57b46af3b7c4971d017ba66fdae56f126aaa0 SHA512 b33bf8c24759d3ce57cb87873a3e1d689518de3ec5f24c5d58b6e504395898e8db28d0a61a972b6c4dfc948885e1acc4fc0ef98b45b0f986e68a54895df6b2d1
+EBUILD xca-1.4.1.ebuild 1160 BLAKE2B 54567a0e83187eb027f962096843616430e0c97f2a04c31c863324b40f25a0c095da5de4332c467c6ec8062810a74b8a041793dcd0867833340324ae0f21b5da SHA512 032795c1108e59f53f9cb7a37530cbccfa42bc7b0c5dff3789103aedf75b33e44a218e96e3c9d7bdeebacb00c4b2b1ac6cd8150e425bb57449941bd98126773e
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-1.4.1.ebuild b/app-crypt/xca/xca-1.4.1.ebuild
index 007269ae45ed..fe1dd14b6919 100644
--- a/app-crypt/xca/xca-1.4.1.ebuild
+++ b/app-crypt/xca/xca-1.4.1.ebuild
@@ -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-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 3b0cd69fc080..a0f1fadcfe90 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,5 +1,3 @@
-DIST yubikey-manager-qt-0.3.2.tar.gz 175662 BLAKE2B 149ff32d35ec642cbbebf1352ef8ec18c6e105658daf4831c251e01843c1fc852851eb3f40eb7fd7c85fe58c7243f9fa7a2eb0640189628d67898b1f1e987ae7 SHA512 5ae0b802f041a37a67bef6f7c8b5224fe47d145bcb3bef8c42e300048e849bbcf333de6d15a9a671ced21741d412af9419c08fd3b018276ce997b3cdd5ba55f5
 DIST yubikey-manager-qt-0.4.0.tar.gz 183566 BLAKE2B 2364d0d257ab5c05d0555aba4bb01ee1639a2c3a42b47173ae905945a6265b123985ad7d8fe50b0cfd38a1a0a588f3e1424aa46585ddbf50337ce2456899067e SHA512 12cef9636f06a92fdb3fce7cea5b97af3255b9cdd1b4feb4e184999eb77c17e465db927f56cd0e443a8ce8afc27b7e4be19ed07da7c41259f909ac4e98971de2
-EBUILD yubikey-manager-qt-0.3.2-r1.ebuild 1170 BLAKE2B 56b4d4d840da10c8adc062c471eae18fe589875262485ae2ab00d088d0b8e5686f3206638628a9d4793cdd34c0dbb68a6cfa86df512ffacbdd82756a9b0a6af3 SHA512 8501e3b11250d70b8cc3d92a14d49b9bf28ac5d47e2717e804fd426b978c69376b680f5760d9cf22ebd52b8d17e5205fdad82b651220c462bb94bb0c12e8d515
 EBUILD yubikey-manager-qt-0.4.0-r2.ebuild 1211 BLAKE2B 50e1f5f13343fd19b9b871f3c15a62bdbdeebddc9721d9aa7ac81de7c3312811d7cec0985e1063fdfa9d13b542cb03e0eace12c01d40c248df04c940fb2cb2d0 SHA512 d0511a033597c2e901736aa73b6b840fec03adabdda384a026ad4047be0d5ad0a3373ea2519b62e91efb0d864129d5d14a571a351ffc03477b899349985da64c
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2-r1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2-r1.ebuild
deleted file mode 100644
index 63672a9f5139..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit eutils qmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://github.com/Yubico/yubikey-manager-qt/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=app-crypt/yubikey-manager-0.4[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtsingleapplication[qt5,X]
-	dev-qt/qtdeclarative:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	rm -rf vendor ykman-gui/vendor || die
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -i -e "/qtsingleapplication.pri/d" -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" -i ykman-gui/ykman-gui.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-}