gentoo resync : 16.06.2019

4 files changed, 12 insertions, 9 deletions

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 9dc7e86a19d0..8184528e4909 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,10 +1,10 @@
 AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
 AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4
 DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
-DIST keepassxc-2.4.1-src.tar.xz 3277856 BLAKE2B 64ed15987f26fd884db8fec9dc8e5d9ecd1ab9c298c2c35ee41f5aacd51bf3cd512c8ca0370ccc294d4f1ac6214678d2a3a4d8c47441c01ae8e858252018ec97 SHA512 4369043700d3de4fece0a1dd0f8aab3f621df379bc9d0214b4c70ab72d081f978104aa09fd39c4b4bf8b8df8f78266835dc206c31e7174bdf872a977c0d79502
 DIST keepassxc-2.4.2-src.tar.xz 3290468 BLAKE2B bcb4974729c771073b6ccf4f5af5ac94a237c349dacc10be5db698630e4fc8fc226a6911957c1ea4723dfce9aa348c11588aa1e5927487cdd36d9c8bae0d7758 SHA512 4ad7e559a36831ad715672d3cddcd3becd4f39847b7ad4451d920c76671e607f8ec9d65ed6f5450dd95e037d129cafe8faff8c1ecd9d20a22fed2c72b2dde9f2
+DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
 EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
-EBUILD keepassxc-2.4.1.ebuild 2024 BLAKE2B f7289b70d43a0ad73f7b63ceed0a9d8317f377ec5a66122150ca8b63dec566d2763454673ed7b76621f18d160096724658b5da55c3296397d51a78cb55d96e97 SHA512 9893aad20535bfd881d0e0fad6b8898edd7f64e0e74ae14388c272a72e27bcfc70c539e4bf0c3938e659c81840e082a3f8dd55efff18a564564e1366af0b5433
-EBUILD keepassxc-2.4.2.ebuild 2144 BLAKE2B 74421a42259ffe1e2cab0c07d3e7374cc0629d8c2c3a47f09acfae720ed33fe356afd259df6e5ebace728f1f6359d4c88f9cca2c63cebdbadaad40c082c71dbd SHA512 9fd2a05423d9c49f381efef4af59e92df5403149bf9d742ad4905494a22027f33d42981dd071bd18039c6945f9d051c8a049db09955a4e02fc97616ac934dd61
-EBUILD keepassxc-9999.ebuild 2144 BLAKE2B 74421a42259ffe1e2cab0c07d3e7374cc0629d8c2c3a47f09acfae720ed33fe356afd259df6e5ebace728f1f6359d4c88f9cca2c63cebdbadaad40c082c71dbd SHA512 9fd2a05423d9c49f381efef4af59e92df5403149bf9d742ad4905494a22027f33d42981dd071bd18039c6945f9d051c8a049db09955a4e02fc97616ac934dd61
+EBUILD keepassxc-2.4.2.ebuild 2144 BLAKE2B 1669822ef162de7ff649979e8880fa8f3a47cf0f5a57d74b707b3fb22e1fe913e4fc738f60a651dd7c0bf9e6cb58c90a59b13489d98cc42b1bc0162b01659470 SHA512 689c7670923dd4c0257ddac1670b49afeb44fedfe8f2bd806cca0cb53bfc6a88dbb0f1e8e8c58fde800fc7a5063c89216eb18b24134b4d5021b4e52921727518
+EBUILD keepassxc-2.4.3.ebuild 2144 BLAKE2B 1669822ef162de7ff649979e8880fa8f3a47cf0f5a57d74b707b3fb22e1fe913e4fc738f60a651dd7c0bf9e6cb58c90a59b13489d98cc42b1bc0162b01659470 SHA512 689c7670923dd4c0257ddac1670b49afeb44fedfe8f2bd806cca0cb53bfc6a88dbb0f1e8e8c58fde800fc7a5063c89216eb18b24134b4d5021b4e52921727518
+EBUILD keepassxc-9999.ebuild 2144 BLAKE2B 1669822ef162de7ff649979e8880fa8f3a47cf0f5a57d74b707b3fb22e1fe913e4fc738f60a651dd7c0bf9e6cb58c90a59b13489d98cc42b1bc0162b01659470 SHA512 689c7670923dd4c0257ddac1670b49afeb44fedfe8f2bd806cca0cb53bfc6a88dbb0f1e8e8c58fde800fc7a5063c89216eb18b24134b4d5021b4e52921727518
 MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
diff --git a/app-admin/keepassxc/keepassxc-2.4.2.ebuild b/app-admin/keepassxc/keepassxc-2.4.2.ebuild
index 25ad8b2b55b0..fa1b4e6b2168 100644
--- a/app-admin/keepassxc/keepassxc-2.4.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.2.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
 	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -53,7 +54,6 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
 "
 
 # Not a runtime dependency but still needed (see bug #667092)
diff --git a/app-admin/keepassxc/keepassxc-2.4.1.ebuild b/app-admin/keepassxc/keepassxc-2.4.3.ebuild
index 5b33ef6ebd16..fa1b4e6b2168 100644
--- a/app-admin/keepassxc/keepassxc-2.4.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.3.ebuild
@@ -24,11 +24,13 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser debug +network test yubikey"
+IUSE="autotype browser debug keeshare +network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
+	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -36,7 +38,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	media-gfx/qrencode:=
-	sys-libs/zlib
+	sys-libs/zlib:=
 	autotype? (
 		dev-qt/qtx11extras:5
 		x11-libs/libX11
@@ -44,6 +46,7 @@ RDEPEND="
 		x11-libs/libXtst
 	)
 	browser? ( >=dev-libs/libsodium-1.0.12 )
+	keeshare? ( dev-libs/quazip )
 	yubikey? ( sys-auth/ykpers )
 "
 
@@ -51,7 +54,6 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
 "
 
 # Not a runtime dependency but still needed (see bug #667092)
@@ -72,6 +74,7 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_UPDATECHECK=OFF
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 25ad8b2b55b0..fa1b4e6b2168 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
 	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -53,7 +54,6 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
 "
 
 # Not a runtime dependency but still needed (see bug #667092)