gentoo resync : 23.03.2018

11 files changed, 22 insertions, 139 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index e35ef8a83651..8388378ed6c6 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index dc388ee864d9..54a65253b6a5 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,3 +1,3 @@
 DIST choqok-1.6.0.tar.xz 1170748 BLAKE2B 11d1546d9bdad12012860ad4b21ea988d21ce822e7afb246d65b27b7fe28620f390ee97e00e594102b173ade304adcce208a9092909ab0d3801fecfdcc309e61 SHA512 78c03689e40978213f2f9462780fe47507a2778985d4d5b940cab004f0ac52becfa76d7dbaa886df958134c65b27255e49ac68ddbb2a434131fffe9ca9280cbc
-EBUILD choqok-1.6.0.ebuild 1736 BLAKE2B 85c2fe121bb766a7af2dcd7e17a96a02a44d7b457171d242e90c9f95d1fde9ffffe28385af86dd22a2cfe24404b1d1ee421c77af5188235ab09774b0f508208f SHA512 8cd5381e43ef077bb815af805d5514621b749bdb153bafdd7d9e89065a8124abc05152c77cb67fc0e56065520e98a6230b2b4804491f47479ceb90edc5b3d4eb
+EBUILD choqok-1.6.0-r1.ebuild 1739 BLAKE2B a7b4a55f0b707994f85337c75bdf8f0a121c011992133efc79c6fb0e7d6b3f130d21e4f1cea46ea8fe7d12c09517d6ab75b870b682b1b5394b601c4e88b5a2c7 SHA512 c07cf3ad2d5b413d4552092f35b94d1ba804cca9f4ef91fa765b1da50ff800a03ead61a320d377d1a3142642ede5096c963257de5ed0b51e8dfb7c022c5f6bea
 MISC metadata.xml 531 BLAKE2B 45e338e5ae44bc43cc8b98da8c30201e50bbd2822515c4d86e5c4e57336fee4ca0fdc5ca0da7b604626673b1a711b5ae786890d4b08f95d94a504cad0f2f84d9 SHA512 2704f0f73217dd2a111a043e4a84f8a124cf9907042a38a294f2901a5a2f689d0aba7a8a74f1e70e4dc8c2685616fd3fc3cf7c3c90aecbdbaeffe7ef552152b6
diff --git a/net-im/choqok/choqok-1.6.0.ebuild b/net-im/choqok/choqok-1.6.0-r1.ebuild
index a0d056a482df..bb92f8d2340f 100644
--- a/net-im/choqok/choqok-1.6.0.ebuild
+++ b/net-im/choqok/choqok-1.6.0-r1.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
@@ -37,7 +37,7 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	app-crypt/qca[qt5]
+	app-crypt/qca[qt5(+)]
 	dev-libs/qoauth:5
 	attica? ( $(add_frameworks_dep attica) )
 	konqueror? (
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 7873bb78095c..f7bfd59fd2e1 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -2,8 +2,9 @@ AUX kadu-2.1-port-to-QtQuick-2.3.patch 5640 BLAKE2B 92a012f5d6a731c171de3de6018f
 AUX kadu-2.1-qt5-compilation.patch 542 BLAKE2B 34391497abfcd2ca96180d938b52e6ba7ce594d80c2b833db1ab615bad92ba9c88190d5c0344577aca466ed54e73e7e18e3ec5e4fccba851cf2ade6b60fc00bf SHA512 294a2d90145d8765e0ae25482607f326f5fc8a86c589ed686ad37e02a13a5d487c28c5b0fbc3495de690864cc5b120cc5a75297dfc5ff28a4b6e4eaf7eade5d8
 AUX kadu-4.3-do-not-force-ccache.patch 635 BLAKE2B c1b29e41186a05ee7c34b7f2c349095c9e1a12584defd393a0952a6b6c5015ae401cd0a7b8d4579eabe05e4d771aabaa51fba3ccef49d05cf7c0ff702739f893 SHA512 d17b7a20d78c8446d845bdb80c4a110adb164d0dfaff52f5a67730a3e1d861f65ccb84d67d04cc7088169b6d3d56376c8c43b3c432795a273a0da5517eabd86b
 AUX kadu-4.3-fix-plugins-rpath.patch 473 BLAKE2B 8b7c16e7acecb59798a52c514e9f472c13eeda3c005ae84026d13737362435d7381f302a48d87ec15853067bb1e46699803cdc3ba4de54aa1f67f0f4d3d84023 SHA512 af94cb0127abd7ffe6ebd9fea20d17efb835773a6e8194caddd07b736e84e2ee40da51b820ec38e8eb07de6755941b53ded07f9b8aa9a7acd28b612c3259f952
+AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8119b80f03d21f8d25def87a32380cb5291d31c3695d706e431fc3fc95c4a35bb8fda9c2c5a0324d257df SHA512 04911ccf7d414a4449634e164ab1c093baa8b05b189a252b8a61bf0f4ad9857e08780620c946524a2d0d4696a6785c0789cbe2ad6f87b2330a093d351df4f982
 DIST kadu-2.1.tar.bz2 6013519 BLAKE2B 31df1b245ec402a44c60581084d4ec9216636e14a1c11d8609862d982ad08ff3717c16bc9431c21366ef9852eb0035828a11d8010178736ec6b6ebfbadfd971c SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a
 DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
 EBUILD kadu-2.1-r1.ebuild 2753 BLAKE2B e113a680d09511ed47661fff15025fd5f018b2f260b5f2a139efb4852fc7dd8732effee8c75518229ab40d86c5e164eea8f79c62af2cc8e1de6198cd03fa2396 SHA512 c419340e5107b22b678d3b61abe921b29a4155df0773a21edcab6e513100e6cbec823d5effa1975066b04df815f3bfffba308df649c555148e3c3ca18390d56e
-EBUILD kadu-4.3-r1.ebuild 2548 BLAKE2B 859bb2c346288947f879af67b852db6c9525bdf0a053eb58d1abb28fe6ff78542c7d22dee02dfa53ecbf70a44cea742fe1379b4a3ba20b1a4e9dc9a5305b29bf SHA512 1fe2a5ae3ac58d8ddc54e069107c91c0d4cb56a59dd9517fbe330d83c00b5cfb2ac70939fb4bfe5af8d857cf2ed14191091f9d1b5c6a01fae14349673d632e2c
+EBUILD kadu-4.3-r1.ebuild 2584 BLAKE2B ea46c13e91f18e2ccdc38a592c426516be228271920d44eb8d1403a35da099850712e01836457a7c4841f2ab5837c50e0bccdd7b6df3d511870e34439c866b2b SHA512 9d370bab08b3316c280c0bc3da1da9334bebced5ff6466981d5e4bcb56c434e99f929b343b5b4be7befa7e274e91c84f881b721f066d6a10c9eefd06d238650d
 MISC metadata.xml 635 BLAKE2B 024363b73640cde3ad95f4c1a0a953cc87ea0786da585cdf7b69c75ed2c472120af558d099cced80eaeea6ff293f6502e1cc8e7b2a60621682947b28a95818d3 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571
diff --git a/net-im/kadu/files/kadu-4.3-gcc7.patch b/net-im/kadu/files/kadu-4.3-gcc7.patch
new file mode 100644
index 000000000000..097157f98c77
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-gcc7.patch
@@ -0,0 +1,10 @@
+--- a/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
++++ b/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
+@@ -20,6 +20,7 @@
+ #pragma once
+ 
+ #include <QtCore/QObject>
++#include <functional>
+ #include <map>
+ #include <set>
+ 
diff --git a/net-im/kadu/kadu-4.3-r1.ebuild b/net-im/kadu/kadu-4.3-r1.ebuild
index 64b44fa43c1a..5e1f571bbf74 100644
--- a/net-im/kadu/kadu-4.3-r1.ebuild
+++ b/net-im/kadu/kadu-4.3-r1.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"
@@ -103,6 +103,7 @@ word_fix
 PATCHES=(
 	"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
 	"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
+	"${FILESDIR}/${PN}-4.3-gcc7.patch"
 )
 
 src_configure() {
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index a132eaaf9b29..5c33b9806cbe 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,8 +1,5 @@
-DIST psi-1.2.tar.xz 2138940 BLAKE2B 6b562f1674b01976700e60384e5f7dceffacc825b4ccfebc8015594c82ff3ade583c6520a914b7d4ae02b5771432bc990f94cd6ebe121c749aae7995053cf150 SHA512 a486f6ee910cc17157849a68aa724608ddbeed319511646f6973a0789da192ec0fed7899024ad169c5b0e604372025dad7a58bacd223723d35ea490ec7f00b20
 DIST psi-1.3.tar.xz 2143076 BLAKE2B 88b930d06c3a42519d9500148bd8a4300917d3db8b11cd45eb36e3a340f46c0776f3d8d5d5ddbf15f7ff78e3da89f011b19e2b7e8ccf973bb20fa6407cdfcd24 SHA512 b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe
-DIST psi-l10n-1.2.tar.gz 2992381 BLAKE2B abe25db86780ef436241bf71597e13e1223bc72c3de8a57b75697140933c27248e446ae870887f186a44b891c780daa868f05975a7c66a2c9f8ac1b67927965c SHA512 946b86d12e76fe9a44f1adc154140a02f3d575e57b5f67c8d95472241c6d4510d1b4be81d8914d5670b15ea8ad1b836aa63fc62c3de94e0091b39e2fb234a130
 DIST psi-l10n-1.3.tar.gz 2991441 BLAKE2B 78fac27c069c097189b01594320aa139af5e66baf57de7e9fe58bd216281ba201d14737fcf5b3fe669ad706ae32dfb1d3d2d15801d212bcc02b4aefe41116d52 SHA512 22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090
-EBUILD psi-1.2.ebuild 2975 BLAKE2B fe293d11aa6ab9068aede5a9eccf40c2ba2f120e5b4f65cbd8734221508b0257519c9f168e595e8782b10f74a98122a9fe0b0ce1218bae2a388b3772afb4e7a8 SHA512 910c5eff50e0dd3150f4c61342586bb38cfe5936b497ec8349694eae469d9d28364af78c5d1c7624ae615c1fb5db09c2f6f6dab4662372545c47e9c5700767aa
-EBUILD psi-1.3.ebuild 2977 BLAKE2B 58d14bc4f5cb2899503c30ab335521e88f006e538c0173d09c56eb62cc5429dd4dc1d25d30c87badf95b0d348f7deefc79bf62fcb62ffb9112e10e578316885f SHA512 c31f84f1172757b8ef18b23665c449c544239bf2a8134bd69d8bf05b7cee49c74ba96564ed0ef070a7772ba5e9fe11fe6ccf7c98e3cc90e5d54a9ebf6dfbf228
+EBUILD psi-1.3-r1.ebuild 2980 BLAKE2B 02adbb3d013feb7ac3898d95acc1e96b96d4028fcb61308e7f359ecad0c646e9e49688690bc14a4f096e05435e603b28032a7db68fcb339379fcac687d24deb4 SHA512 1a5c67c797b64d0d8d3f4d2024e8db8592c16dba14392f2b80b9fa48249dec7a089f163724aee91744d05fd2d0c80ad67ba79917392b9ec9d5a5cd4d76e6bb56
 EBUILD psi-9999.ebuild 5281 BLAKE2B 7c3245c293b96bdcc262040e242db34a24a62add923022e8058a2a7f8908b0c600c037dcb73a17cc4b453ed86f4dbf2f29b5388d40f4f0cb5df22e376cac1239 SHA512 c7f24708c70c90e06e6004e147448d27fde78cc31b78c063e6ef691475c833c6f8d8e2abd4a43ec42c1693f38e1d72901f0ad8d056d607cdf7c52ab129ffbe26
 MISC metadata.xml 1295 BLAKE2B ea05ae35834f7b2dc0660e725671303d1494342dbe68ee7be23a689f60974f4f750cb3569827e5fd86c2f4c4aa809555c90567a32fd6a6e0398b90fc139f35eb SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820
diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
deleted file mode 100644
index 92f7233fa5a6..000000000000
--- a/net-im/psi/psi-1.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit l10n qmake-utils xdg-utils
-
-DESCRIPTION="Qt XMPP client"
-HOMEPAGE="http://psi-im.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	https://github.com/psi-im/psi-l10n/archive/1.2.tar.gz -> psi-l10n-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aspell crypt dbus debug doc enchant +hunspell ssl webengine webkit whiteboarding xscreensaver"
-
-# qconf generates not quite compatible configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-REQUIRED_USE="
-	?? ( aspell enchant hunspell )
-	webengine? ( !webkit )
-"
-
-RDEPEND="
-	app-crypt/qca:2[qt5]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	net-dns/libidn
-	sys-libs/zlib[minizip]
-	x11-libs/libX11
-	x11-libs/libxcb
-	aspell? ( app-text/aspell )
-	dbus? ( dev-qt/qtdbus:5 )
-	enchant? ( >=app-text/enchant-1.3.0 )
-	hunspell? ( app-text/hunspell:= )
-	webengine? (
-		>=dev-qt/qtwebchannel-5.7:5
-		>=dev-qt/qtwebengine-5.7:5[widgets]
-	)
-	webkit? ( dev-qt/qtwebkit:5 )
-	whiteboarding? ( dev-qt/qtsvg:5 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-PDEPEND="
-	crypt? ( app-crypt/qca[gpg] )
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-
-RESTRICT="test"
-
-src_configure() {
-	CONF=(
-		--no-separate-debug-info
-		--qtdir="$(qt5_get_bindir)/.."
-		$(use_enable aspell)
-		$(use_enable dbus qdbus)
-		$(use_enable enchant)
-		$(use_enable hunspell)
-		$(use_enable xscreensaver xss)
-		$(use_enable whiteboarding)
-	)
-
-	use debug && CONF+=("--debug")
-	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
-	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
-
-	econf "${CONF[@]}"
-
-	eqmake5 psi.pro
-}
-
-src_compile() {
-	emake
-	use doc && emake -C doc api_public
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	# this way the docs will be installed in the standard gentoo dir
-	rm "${ED}"/usr/share/psi/{COPYING,README} || die "Installed file set seems to be changed by upstream"
-	newdoc iconsets/roster/README README.roster
-	newdoc iconsets/system/README README.system
-	newdoc certs/README README.certs
-	dodoc README
-
-	use doc && HTML_DOCS=( doc/api/. )
-	einstalldocs
-
-	# install translations
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-	cd "${WORKDIR}/psi-l10n-${PV}" || die
-	insinto /usr/share/psi
-	install_locale() {
-		"${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed"
-		doins "translations/${PN}_${1}.qm"
-	}
-	l10n_for_each_locale_do install_locale
-}
-
-pkg_postinst()
-{
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/psi/psi-1.3.ebuild b/net-im/psi/psi-1.3-r1.ebuild
index 3d47e6fece4d..83b513540792 100644
--- a/net-im/psi/psi-1.3.ebuild
+++ b/net-im/psi/psi-1.3-r1.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
@@ -27,7 +27,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	app-crypt/qca:2[qt5]
+	app-crypt/qca:2[qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index b235584afc11..5fd5296d5de4 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.6.0_amd64.deb 65844236 BLAKE2B 23d9b73b64cc3f6642786f1ba6677ce56439e42e08deb1c9086b8e317489be5e6bad39778f07daff9a533defb1b172ad800cc84c8391b442c755fc65b5ec81aa SHA512 3da2b5a0761cb0a17f390dc1b6ba5d096a02ed43dd3b2486ffca207ee7c99d02b12920518c458acc700e7ae0d6a30065075462782c21bc2db84514fcd94acd23
-EBUILD signal-desktop-bin-1.6.0.ebuild 1207 BLAKE2B ad0c425668bd9ca11cb3abf20f6d0bda8ca2af620fe61da1650f48576a9dd74ab9a9d9355a3051d19eff75133fa5230f94dc525d89f810a5db7d176684ef2cb3 SHA512 ccba5daaed772250c074a3e17df06a3e0245137adaf651ff644d2e25d2c3902309e5827fb4d5ba3d07606a6bb17d97155281c91b5da32c59a84c561d91fc5937
+DIST signal-desktop_1.6.1_amd64.deb 65897816 BLAKE2B b297884e5586c0af0ffba29440733d66f139c08f5c12b7601d61a56528862f8b39652f946bfe6d4f32ca254fd89bd61eaeddc36f3425fd5686750fa9304c8673 SHA512 c7289f3c716a62d6c166a6cc4e314c49bc3c042d949354cbcc527356f28b1943abfe71e7ee4e6ac755dd4ee9a0027d9aaf6c0310e21dab8755a58c0beeec494b
+EBUILD signal-desktop-bin-1.6.1.ebuild 1207 BLAKE2B ad0c425668bd9ca11cb3abf20f6d0bda8ca2af620fe61da1650f48576a9dd74ab9a9d9355a3051d19eff75133fa5230f94dc525d89f810a5db7d176684ef2cb3 SHA512 ccba5daaed772250c074a3e17df06a3e0245137adaf651ff644d2e25d2c3902309e5827fb4d5ba3d07606a6bb17d97155281c91b5da32c59a84c561d91fc5937
 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.6.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.6.1.ebuild
index 92008eb4f0ec..92008eb4f0ec 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.6.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.6.1.ebuild