gentoo resync : 24.02.2018

19 files changed, 404 insertions, 41 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 1cadabbe947c..0d5721ac41c8 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index bc118c8a31e8..fb49dae35cb9 100644
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-keys-201607021514.tar.xz 32324 BLAKE2B 8e0f010f694cd6e828ab20f5f1eccc1164ca72075f303f7fad827f5632e31f686554e93133f03c896170d495566092a9c56fde35a91cb3737fd2be609182515b SHA512 0d41270ce04a5ecccc059112bbf16aeaa083fa18c921e1fd0412fee1189863cb2fe416105fd0952d30151935651c1cfa24c650b9201a0e231563efb0a0c55f89
-EBUILD gentoo-keys-201607021514-r2.ebuild 563 BLAKE2B 0bc44b50bd311fe3db4d15e57f02e42578f40d019682d822a605014bc4d0b6fd214164ac0a6d3bed78343cf967269a4f2fd943d91d952f290b5465815df94217 SHA512 bb288c9af52562212e45ac922b6ed67ae4c994d616d0570a125a59b9cb9f86357cae54fe94707c6c5a12d308e00e2460c58d12a111955ecffe7b61e9f92a9547
+EBUILD gentoo-keys-201607021514-r2.ebuild 575 BLAKE2B 164315bb7f8aaf7e9e9be5a17cde523395c889b09f7ec03997794d345ec745f4c34f7fa0163f7b96b039f97687a02aa3cb1301ed1e6d567b7df838f206d61133 SHA512 d5d742618b419f79b5bf9363313ffeba0225dc5e6a4ccaf183ebf5de4eca55a181c352465cd3147fff3cde41bab0c59533cc7ee57af478aa4eccb5e22e6d08a8
 EBUILD gentoo-keys-201607021514.ebuild 607 BLAKE2B 1f900c4943f3ee02fa7a64c97e03c9ab4276f6e2e322f141fa00fe06a0675c3b79e2c1f74433738b08998a8d254969e74f78d74821a066a0ce282291cf4a29bd SHA512 18e5b969c4859d36b1deb694486c400d09433739d95d43595e625ced45c12ab3005621b70425c06a92fb5a691f8686aa7faaaedcbb9da647d21db7053228713c
 MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild
index faacb71d079b..50b441af5487 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2017 Gentoo Foundation
+# Copyright 2014-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~ppc ~sparc ~x86 ~arm64 ~x86-fbsd ~amd64-fbsd ~m68k ~mips ~s390 ~sh"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd"
 
 S="${WORKDIR}"
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 73cd0074419e..5845fa98892e 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -10,6 +10,7 @@ DIST gnupg-2.2.0.tar.bz2 6532475 BLAKE2B 284ef4ce5ebb7e3d49ca3e73461b3f017eb07d2
 DIST gnupg-2.2.1.tar.bz2 6537959 BLAKE2B 4ec500110358a9e5c7d01157e3e9b29a6c7084266b59a9b412d76a793245e0dc5ab94c5cff34eec5169f6fa226ffe2005ccafc4ba3fedb6761e2c4a2d9fd3234 SHA512 fcda7ea360d9928bf9e410afe3806ee0692dd533443b0c0e050605a9e2e37ec16f3c60a30b30ab137155327bc1f5d2107f1e792582e3ad245b47bf39a1a61a8f
 DIST gnupg-2.2.3.tar.bz2 6547069 BLAKE2B a5ac44f696cce2ffbac72b80f0efcd19fe09934fe00d3fe90c0a5be5618b40b686fa9fe3e78a451e72835342afa75f4316b7ea34d3ff9fe602e621111876cc4b SHA512 c73df3c6f7ce65bd9867a39d10f93548496bf596ba0901737fc0063b370fd2d834c0b912e5aa07ff31067bc9c1263acc9d314c6bfaf7c889b72c8d46087810cb
 DIST gnupg-2.2.4.tar.bz2 6571487 BLAKE2B ec678470e574fdc9f057cc727cbb902ce525f76adae740722731e318032707d0f72873628024c2070a72c21321f2b8da16153edeafcb4ddeba72de59ff5c73bd SHA512 3d5c93b7662433103e9549d066a6b1a0c09d595851fab712d2ee844a55157e952a8a2dd5deff70fa8dd6817481f81c3fe5135603bca03206857310d04c1067a8
+DIST gnupg-2.2.5.tar.bz2 6584756 BLAKE2B d19358caf65627243c37afbf348acb2ea91f785272f318aed9e95e097c34cf3b3b1a223919a86e3ff09c045cb0b56d8aed7c746ed1223dd6a6aa072d24c44bce SHA512 675d2acc2ba95d14b14f4c83364663d88c982332fb4c35a4cf32af19a6bd4453ad89905c80d45007adb50c01816247df84d1f525e94bb668b962a84815e49bf1
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
 EBUILD gnupg-2.1.15.ebuild 4570 BLAKE2B c88be887786ba1823e7950828039432d08c51053886ac187b3e0d86470e67fd9731b940ae54f25f46c7484d0fcf52db485f1368b56ccc9aa66baa99f0510a3f0 SHA512 385f5c40a42559e3b686d16dedc2ca442dd0a075514184e67eef97624cc419bd0bfc7f7ca6fdd3dc549cb4e3beafce656b725adcf201d27b151dab6456346875
 EBUILD gnupg-2.1.20-r1.ebuild 3102 BLAKE2B 7e63763d5989d876aec29eec09fe9bda9a83a26a0bdda97bb1c2a2bf95b7e7c2d6a727b068b8e6dedc7b07c747486c1f00badf603c03a5ec97cee6747b4138ec SHA512 68eafca6339bab0f118c5ff9119a984ee2b7432942929d429a430c053da568ed7729d13a507d073bebc8a273e74eb40f66585ef84cc9b83181f2ea5d6990d615
@@ -19,4 +20,5 @@ EBUILD gnupg-2.2.3.ebuild 3209 BLAKE2B 44f319cfee71a4c4c38deb496f361e022e2b729b2
 EBUILD gnupg-2.2.4-r1.ebuild 3206 BLAKE2B 084fd1814201be6c963a2adc262e4a8c137950cd07a15d9e021d149de752894b3db1096ccf59f04f97fe7ab1764471b6063e103e8f28bb0fc68a2d3ea04f1612 SHA512 b3112ebc907b92caa56f7786a15589701fcbcceb1de8f8ea78d22921a293d84454902f8ca11250c63b5f833936cc46d3d31d5878df712586c032b1297980c603
 EBUILD gnupg-2.2.4-r2.ebuild 3276 BLAKE2B 47dd4f570c540813b35d125bbcdd6dbfe40b7d5945bfe6465b070680261a44ada458f14dcf7b15798b999bb19e7b4f5a5c0a55b022e544b680998fdd2d8572ae SHA512 d90c3acdcd170127da8db75e846a062831b5ba517b95b226f046f7a33f436e4a64208e5c44f79c9bed1825dcef44694334625c6e65aa6faec1471ac557d35547
 EBUILD gnupg-2.2.4.ebuild 3203 BLAKE2B 42bf0180668dc428b4d6529d23f38c82ff31bf9ad41c8be1f157718f25e96203d16a9e6e6f2764bc8865fa78001ca862a3ca81b1bffd1cc569a6e706e45f6487 SHA512 13fbcc6aff14cde19508f631c9912e5b5648cda50c8a8ddf4b9fe3a84495344470747f8d57a238f3323c651290eaed6935b958f7fadf408a257fea4b4a011ffc
+EBUILD gnupg-2.2.5.ebuild 3287 BLAKE2B 8d9ff8097bc965ab2709e7bb656d02f0b7d73fc8a7a10043b62b7c34324ba5d29552fa3648ea724733b4eaf8d67f7d739442044b506279dee7603d46c1d54f60 SHA512 4226eb21d5b3dfc10b1c703d5f17026457fc04a2c63dac9a146d48cf75bedba071e4e3e8c6363af98965b9e8e3098c8f3618eeaa8858982a2a8d237b6c40bbfe
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/gnupg-2.2.5.ebuild b/app-crypt/gnupg/gnupg-2.2.5.ebuild
new file mode 100644
index 000000000000..172d9ac8f2c2
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.24
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${PN}-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable ssl gnutls) \
+		$(use_enable nls) \
+		$(use_enable tofu) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--enable-all-tests \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#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/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 30e272f5560b..eb2411974397 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,5 +1,5 @@
-DIST hashcat-3.5.0.tar.gz 4103461 BLAKE2B 821280182641ceadab7d712395a0a33cd7bfde8fcc8c133a2c12d089dc76b43edbee632f724083f29e9ec924991cda94e6f17b53f1b3155537d41286d3886832 SHA512 7efc860461894a550fbacc406a40fec400232a120818180abba3d53f26bd3a503f58e7d189e4afad0f871c2244ff68371b145af58ab097478fe2d73f39c9a6b3
 DIST hashcat-4.0.1.tar.gz 3905127 BLAKE2B 534270c7409f5a3dc4995a81fab63e6bfcd6b2bd4bb549f96b44e9c6bf24ce67505eb82803ace29fba69526c7c0703c66de9cc68cefcca79ef58040165041756 SHA512 7300b16ebd601fdbdbfd66adeba072c6f4f4dd5898dd85824513b97cc7848f4c2ae0fe523cfe7803fdba7954966ea289275fa5d49ff792706f73394e2bd95e77
-EBUILD hashcat-3.5.0.ebuild 1209 BLAKE2B 8c822ec80247cba0fc5ea283c2b57caad5ee19ec364511295124976c5b783f3fb85863c17acf1fa4a21ad69e9c875e60acba60251c98fff7fd82111c0331210d SHA512 b501f94b5c180e06d219d614edd79dac83a601358203488b85a12fec19894509443d69cbd03e4f82a53f779991da68f471ff4f2e9566e3067138c3fdb7fad7ad
+DIST hashcat-4.1.0.tar.gz 3956136 BLAKE2B f9d6f9322e4c50ee1e156c283da1257a24f0e2cb22618cf93b8b11dd1964f6741f409429ee904412f70301e4b2381b388bcab0296a30ea3a94569efe7aaaeec6 SHA512 c9e01847c89dd8521da8734ea324c69f1e9bfef50c059e9dc29d4b947fe090405774a57ae688f907698c7d9a2d1f087b730e0a994dc5ed0d5d937a9ef950dd73
 EBUILD hashcat-4.0.1.ebuild 1286 BLAKE2B b0b59548ed67a9b36d1459088722bc7c7be89b0a77fb82d92fa9d3871630184fbdbaffa0143d42e9b764a456317c02b4d9da3189bfc5226967cf33e9a3114d6b SHA512 d8700a5c15502370e29555cbf39209db75e46936ff5cf522c6a67a7839399cfa9000f667d49b6b04b6a88e6b9ec68e31fe56a930e809602eaf475e0fb7013b13
+EBUILD hashcat-4.1.0.ebuild 1286 BLAKE2B 97238cdc5fd31bc6dbc6c1d1d350effcc2e6a309524215cea15650d69f7abbd11a91d0c30c4ae50db94970349a3528753147d511b1088df8733149c7f2636ee4 SHA512 da135ef8fdda9ca5f4785e0d4151c9e60f77a086db9510b90412d396f80d232b2f1d7b828c1fbb48e619ea3f1d927e422eca62bff2350f37fd447a4456131bfb
 MISC metadata.xml 327 BLAKE2B 2f5c4cb3a51fe231059a9cf3b11875b9acc86dc51ccbd98e6f62fa85a3b546db1f5b6460e3be1ed26b239d5806c4dc787afb0cdf07b31b4a9330ab19339d3186 SHA512 024401252f35e93caa0ec7a48a7df7b71c18e4c7e71eb495f3ee5598fec5f3332c44fd3cf5d6b86d3d885649e6da15a8e7b5bac4e9205f552f8c8ec3f0fcd496
diff --git a/app-crypt/hashcat/hashcat-3.5.0.ebuild b/app-crypt/hashcat/hashcat-4.1.0.ebuild
index f3ffb50a9be6..cd473accdb50 100644
--- a/app-crypt/hashcat/hashcat-3.5.0.ebuild
+++ b/app-crypt/hashcat/hashcat-4.1.0.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
@@ -40,8 +40,10 @@ src_test() {
 			einfo "To run these tests, portage likely must be in the video group."
 			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
 		fi
+	#elif use vidia_cards_fglrx; then
+	#	addwrite /dev/ati
 	fi
 	#this always exits with 255 despite success
 	#./hashcat -b -m 2500 || die "Test failed"
-	./hashcat -a 3 -m 1500 nQCk49SiErOgk
+	./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
 }
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index 1b242a3ee63c..f6c73b918ccc 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -1,4 +1,6 @@
 DIST kbfs-1.0.36.tar.gz 5135197 BLAKE2B a0d40048d11347a72ac9fedb358be7bd8d425e9eafc32fce44e75583aa75fde00bee62d81e7d4bc1553aec3f72ca3af1dffd1ef710d897ce28cb26d152eab4aa SHA512 eb50c4fdd07e0d0e0bd62c48a60520fe48a6b64d97e6ac561d0c567e50c4863f9969697f78553360e6b42776af4974b086bd0be75db6de4c28a5c4a840725919
+DIST kbfs-1.0.40.tar.gz 5432507 BLAKE2B 4d3c55d3c081cb7fea44d302a1a5598df515f98f4f75bf3e0eee84c3151114247eb1a80ea2ff9bb6d10cc3612af25e283b114b26b24043fbfdd16f05d2fb0210 SHA512 c5391e710fc55130437ff5f42e00229ea06fd1bd5e535c814158a501f2b23ef43d65d27ebf57ec3c3b5d3c7cbbed43cd2baf8888af001a3b23a40cbc94d22883
 EBUILD kbfs-1.0.36.ebuild 984 BLAKE2B 84ea9e3a3db5917cf000e56f7c4826c9d5210bbb22e157310028421383e308e0e164be7d57e0838694730e1dff645ba89ad991d9beef17eb1bf0c0823ef55e13 SHA512 79cfb2c88f09d7cf0050f25e5c4e8fe9ffdbdafa5e62b6943b8d690eb766cb51d2b657774f0eab9ba561478fd3e22d416b409485f9ba38512247e66b6acf0d00
+EBUILD kbfs-1.0.40.ebuild 952 BLAKE2B 0ad195fc7cfba58e764692d2eff0de4e365ef86e11606552961484e54ffc93f54d522c8a3b0e5900ae5a25ec72cd3ea24d346f7578055d7ac9b82326a2cfc41a SHA512 36c347cfbe3ee81a11916193c7757f5ed71e8253449595c07a73db6b34d576f989a9a1f8605f695b30c27ef9fe89e47e81cd45f2405e65b92eae736a74d44f7b
 EBUILD kbfs-9999.ebuild 967 BLAKE2B 9e1527b134c7b6bc4343852c5f132b44827b0097b8b5c0e46ee46136b9d2b19db69f9a07a1b7cfdd3f57fa73d94a73fbf00baae36cb63a1743e625db168681f5 SHA512 99e2c177cfa9f4b9074600425f5587efe19c0341d49e62dd0ef02950c47f298c007ed027bd37ceb21719309241fe3ec1ecf40fa8b3c740c3cb8f1243145955f0
 MISC metadata.xml 482 BLAKE2B ea0f5fe2ae3d3c5cd10020f178e0233fe55a38174c10ccd54c50fcd2104c4a0dbe737b371cc49624fefbc2107b5697ee4c826466a5f14d7c952542edd1134414 SHA512 74eb8d2fb7b19f269dcf5dbc67a5f63cac1589343a069011dfe8492a0bc1d82b526a175b2fad91a00f7fd60e4a77bbf2b7f7dea4537d6ae9221a9e93ca2bdd60
diff --git a/app-crypt/kbfs/kbfs-1.0.40.ebuild b/app-crypt/kbfs/kbfs-1.0.40.ebuild
new file mode 100644
index 000000000000..df627e677239
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-1.0.40.ebuild
@@ -0,0 +1,47 @@
+# 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/keybase/Manifest b/app-crypt/keybase/Manifest
index dce6c60f569f..c28dca85f379 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -2,9 +2,13 @@ DIST keybase-1.0.33.tar.gz 29170354 BLAKE2B 78799ea49cde32e3c1be781e281b5ca188f7
 DIST keybase-1.0.36.tar.gz 30043919 BLAKE2B 0053088754b0a4a47314032e87a7c5165aff59ded585ae20fb12c3dbf0c7437f7f0370f236fec0db501cacb3a75e87ed494df8f688d360c58904e851eb119f60 SHA512 c6bd4805240bdafd27eac382a30fac6e5ac3e6eb313dda027533c3a8f366077c894b38c1b972ff5688104e1ca4231cbf4242eeb168de9782bbac732da5639ed0
 DIST keybase-1.0.39.tar.gz 30226025 BLAKE2B 5d10e4afe3f0f1691221cbf69ff3e427fe318768e74f5891d32416e92ad5c1c45ad3ff0c83ea2d2405f4492a2d2af989ff587c60c9a5677ae580c9502e9a5726 SHA512 def416bad6fc3513a3341aecaf03bce356a890667e4c64f9edc1c469b3a1f167c3022f6c1aabaa48257983aaa9826b45117ada6cc26bf862c97092c904cd32f1
 DIST keybase-1.0.41.tar.gz 31643095 BLAKE2B 72fe94c8996b0dfad3d75f487545d5cb96ffa09c46276104171f103f2fcbb29199013ad8075fdddf3655f63f55cbd2f0d0768b5f0e697b7339262736d9c29ca5 SHA512 1382f008089d8704167842960aec9e4007ac32db589bad45944428ad92ac90b1802338ff6ccc0c570d40b9c9115170a2e15c590f875cdc8261d203c01402385c
+DIST keybase-1.0.44.tar.gz 31729876 BLAKE2B 945700824e630591f7b79dd5e8253156ee8e3ab1349f9ad584311d781cd9c98a5176884aa2fa34ac164af2194941822e56e96d7783843f649a97058edf015670 SHA512 a50c33548745e3c946099105c6926e4b4cd37a96c57d86ca7259b7b864f92a9e2b8823b992d7e367ee93a5832481360d66e170ba59a5cf99296dde20c1538c41
 EBUILD keybase-1.0.33.ebuild 917 BLAKE2B 2b07280d94ecfbd1e1320b2822ef82c00956cfc2d739ea32a372cb0923363578210dd2af4da73bd1608c7eb712dbb9126cd22d352579abf9c9db9fe567ebfb8f SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38
 EBUILD keybase-1.0.36.ebuild 959 BLAKE2B 36385869dc6a89104de7df5986b086c1531819a46351c62578e8d672ea4e5271b137a1cb84221de497a7b560937ce14a60ae3c60ea3634d77aad175cc5033f6a SHA512 c81f68541117d81ea1b5f68877e8ecb07962b4677d4039f74d815b15468bc6a72c68991dd76f12ce14cb43f5b81b9e897d136a9cfa69d02f77e7797aed0e3076
 EBUILD keybase-1.0.39.ebuild 959 BLAKE2B 36385869dc6a89104de7df5986b086c1531819a46351c62578e8d672ea4e5271b137a1cb84221de497a7b560937ce14a60ae3c60ea3634d77aad175cc5033f6a SHA512 c81f68541117d81ea1b5f68877e8ecb07962b4677d4039f74d815b15468bc6a72c68991dd76f12ce14cb43f5b81b9e897d136a9cfa69d02f77e7797aed0e3076
+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-9999.ebuild 893 BLAKE2B dd27632b3d771ba1e50bf4ba115f4e7a4b096d2245b7e8ed2f0bee425ebcef5ff01f430d7880466705a5b217415b5057ba0a9360d7efcfaa766528fc24799494 SHA512 763f66c3a48a668a5382cad7ddef2d1bc2c4874a6bf226f2930401f1e932104631a68ee89b9cd37bf794959447b64381c04ea60567c38ecb625b64d9267ed5a5
+EBUILD keybase-1.0.44.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
+EBUILD keybase-9999.ebuild 1386 BLAKE2B 4809768de299ee735c36c3f0dee89b7f76d9a9492b767793561b98bd92b54f834dfc8c9cec2cb35c99d3aa75772bea47b274db08ba7f88053b0518e1869979cd SHA512 d809d8020947746f1a48f37cf6b3f96a4e3dce60c8f21eba4daaea992ee468eda019bfebfa75fec06be914c78337036317cd852051a6c9ae3edfaa6ae23d8bbf
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-1.0.41-r1.ebuild b/app-crypt/keybase/keybase-1.0.41-r1.ebuild
new file mode 100644
index 000000000000..bd5957be4c0c
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.41-r1.ebuild
@@ -0,0 +1,62 @@
+# 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
new file mode 100644
index 000000000000..afb357189ce5
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.41-r2.ebuild
@@ -0,0 +1,62 @@
+# 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.44.ebuild b/app-crypt/keybase/keybase-1.0.44.ebuild
new file mode 100644
index 000000000000..afb357189ce5
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.44.ebuild
@@ -0,0 +1,62 @@
+# 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-9999.ebuild b/app-crypt/keybase/keybase-9999.ebuild
index 09718d4794cd..05206f40c35b 100644
--- a/app-crypt/keybase/keybase-9999.ebuild
+++ b/app-crypt/keybase/keybase-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils versionator git-r3
+inherit eutils systemd user versionator git-r3
 
 MY_PV=$(replace_version_separator 3 '-')
 
@@ -17,12 +17,17 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	>=dev-lang/go-1.6:0"
+	>=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() {
 	git-r3_src_unpack
 	mkdir -p "$(dirname "${S}")" || die
@@ -35,13 +40,23 @@ src_compile() {
 		-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/xor-analyze/Manifest b/app-crypt/xor-analyze/Manifest
index 7a537e489aef..e1c3420f870d 100644
--- a/app-crypt/xor-analyze/Manifest
+++ b/app-crypt/xor-analyze/Manifest
@@ -1,4 +1,3 @@
 DIST xor-analyze-0.5.tar.gz 26635 BLAKE2B ad5134b50366cdfb4af31d1944cc4c02c43b2bac171b20054fd7960e62a96b3b959f5b973ab82076ca8cdb0ae7068c0917f89c581936e16723c0223ac64d78a0 SHA512 e28aef799dc6f64a57609638f578bbe66c3ced5784599a65be6bf4ee14921600b7d292880f1288b5ad81ed3dd0897b6aeff2d741b96efc30cf0eab453e4b21b1
-EBUILD xor-analyze-0.5-r1.ebuild 615 BLAKE2B 8afc6771bf841c83fb17e14273f2f87b3771a7137e40b834e29e7f9ba03892d1b1a183fdc90a285809496329af61912d28753d7533ac48cd3da20b156c8aac87 SHA512 3cc206f8571c2210941f93b6ed76fbbb24c3d7a6227a3b45a84c6cbdee8fcc05cf461627713c5e89e2eacb4f21dd14397ddfa2e53765f38e21511ae8abdd99fe
-EBUILD xor-analyze-0.5.ebuild 613 BLAKE2B a973b51620d9b5e6dbbab9bc7e260a10ec61e55363e0a117d1982ef2dc34cf11b2072e00a15d3123f35d66eefb1b89512195a0b0a84d98d67267ba689f226f74 SHA512 9b891d788cf3c253dd27dc370b9eecd9173b0f0fd56ffd7654e62334914dab7dab7fed69e202448772486838f1f4733009210f52c6f6c7457bacb0f46f1e5a29
+EBUILD xor-analyze-0.5-r1.ebuild 614 BLAKE2B 7122073e7238af80bd7469a9df8e9d0ee7ebb896688b7f1d5ec5cdc94c6886b2611cd1eefef0be7ca04379b89cfb0e4948cb1e143f81e477400d81c0e3017a4c SHA512 2077ae200122f2c1e2d3ecadaaa9053e2fcf43efba003d3ad48e7b6612d98bfbcec2980c86098f12878bf93e11a156b8be482b78f92fd6310defb8e6a90aba76
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild b/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
index 1b00a0add70b..07b15f1f1e7e 100644
--- a/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
+++ b/app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_compile() {
diff --git a/app-crypt/xor-analyze/xor-analyze-0.5.ebuild b/app-crypt/xor-analyze/xor-analyze-0.5.ebuild
deleted file mode 100644
index 8c363bfa6357..000000000000
--- a/app-crypt/xor-analyze/xor-analyze-0.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="program for cryptanalyzing xor 'encryption' with variable key length"
-HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=xor-analyze"
-SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_compile() {
-	rm -f Makefile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" xor-analyze xor-enc || die
-}
-
-src_install() {
-	dobin xor-analyze xor-enc || die
-	dosym xor-enc /usr/bin/xor-dec
-	dodoc README TODO
-}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index a5efed6fe049..3b0cd69fc080 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,5 +1,5 @@
 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-r1.ebuild 1208 BLAKE2B eb9c559605f0880014ffa5a0d0b53d13f7f79df54a267f1a184a3dea19c88748c81fa563808f79d31dd1c655857181254484ea8229492e14d29af06d11c4b3ef SHA512 9dfebdf1a219f9dfc129de50ecae8876423cd386ad52fe947bf373b36c2f2895484b03078ed22af2e2ab23cd5eccfdd3b6d7cb5088f922654818aff633c477b5
+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.4.0-r1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild
index 159e51cf5b55..dbd42b543c6d 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r1.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.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
@@ -18,7 +18,7 @@ IUSE=""
 
 DEPEND=">=app-crypt/yubikey-manager-0.5.0[${PYTHON_USEDEP}]
 	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtdeclarative:5
 	dev-qt/qtquickcontrols:5[widgets]
 	dev-qt/qtwidgets:5"