gentoo Easter resync : 12.04.2020

4 files changed, 13 insertions, 13 deletions

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index bf5393626517..2483aa935fe5 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,7 +1,7 @@
-DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD assistant-5.12.3.ebuild 1169 BLAKE2B 4750147165fbc211930cdadd7a54e3dfc6998979183e247ca6488b26fa6ae82210938938d85bfaba417bce6ab021679cc7bac4f8ca36e2dcd34c8ba111ace265 SHA512 51e78902c8edad21d6ae5cf20c9584bea9909ed2902215e19e75618ad72e5ca41688069fb76f453bdfc7ef3eb5b7e7ee2fde6f21119aaf7f7a027290dd061fd6
-EBUILD assistant-5.13.2.ebuild 1197 BLAKE2B 426575eaf982a93c0aa9db924ff58a67e566d51910c34f1fcc9001bd00af2a1cb27f8e3bb6d852a39f5cf10aabc8f85c19bc4aa02ad153c8a046973c84ca8683 SHA512 ee0b54cedf808c0be0d0dfd331bf2cd38f1581fb07b23f0503d45477fb9f67c8d85681d425fbcb22837c9f94aa477777f5dcd0381222f3e6142b35fff5d64bf5
-EBUILD assistant-5.14.1.ebuild 1200 BLAKE2B 11f1f353d22572a76a4b1c5aa0018ebbaa6907d2df22c1f3910126e00cd56ef0efde80f7edaad140275eb1e19f38c1202537a0349281db320f9eaf6cfcfef174 SHA512 1d2ef963036eeaa79d1506aabad5c8a0063569c6a931cef5ecb9ab5b4893e2e718424307cb08b54ad511ed8f57c610ecbbd08aeaa1cef59500900d7900675878
+DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
+EBUILD assistant-5.13.2.ebuild 1161 BLAKE2B 370c9a1a998f7fc52f79edf27f884670a587b501adbece08533341dbd44c58f14c86ecdf96137c228460d767d21438bb29d1374f25cc3a71a49b7f57e9f12361 SHA512 67f85b4f1ebc8baf37feca2f1462ae59268ff7eafd3c678d23916116d5035a92f912d195271672d59962ba5ece6872641f9de441ad7935bed35ea0877839b699
+EBUILD assistant-5.14.1.ebuild 1196 BLAKE2B 6b6f0250b9dcf689ae3ec478f792d62cd12adea9a2a684156e7e748d37b1c5c49d11356ed6c5b2c68a2666255b57a9b92c05f64d71c170fe86cc79ae731f0e6b SHA512 45f743516b6d2ee0698a9e072fbcf9889f550eeadef35f4947944f53e79aa44a418cdd40c34254398273b1272bafdf1d82c975ba187aafdb58313e6b1dac09a8
+EBUILD assistant-5.14.2.ebuild 1203 BLAKE2B 8c84ebd6164443a25ff706c24e36e609262a7778b01c1dc5be93b9f6c8dbb8e8193993db80121ab532bf551c129862c616fe986864511700f1d03ca632bce9ef SHA512 00d14550fe6431976d698245ba46e9beedaf72bf54dc876c13a90a750d508f52a375e312c024fa2a062b1aa0eebd9a55cd10fa776dc33ce667acff3bdec3fada
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.13.2.ebuild b/dev-qt/assistant/assistant-5.13.2.ebuild
index 101ef370f0aa..5faa15820d4f 100644
--- a/dev-qt/assistant/assistant-5.13.2.ebuild
+++ b/dev-qt/assistant/assistant-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc ~x86"
+	KEYWORDS="~arm"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/assistant/assistant-5.14.1.ebuild b/dev-qt/assistant/assistant-5.14.1.ebuild
index edfb372bac76..54fd3cf7f00a 100644
--- a/dev-qt/assistant/assistant-5.14.1.ebuild
+++ b/dev-qt/assistant/assistant-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/assistant/assistant-5.12.3.ebuild b/dev-qt/assistant/assistant-5.14.2.ebuild
index e993110952ea..7f0b3ec1e822 100644
--- a/dev-qt/assistant/assistant-5.12.3.ebuild
+++ b/dev-qt/assistant/assistant-5.14.2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
+inherit desktop qt5-build xdg-utils
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="webkit"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
+	~dev-qt/qtcore-${PV}:5=
 	~dev-qt/qtgui-${PV}
 	~dev-qt/qthelp-${PV}
 	~dev-qt/qtnetwork-${PV}
@@ -46,10 +46,10 @@ src_install() {
 
 pkg_postinst() {
 	qt5-build_pkg_postinst
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }