gentoo resync : 05.02.2020

4 files changed, 6 insertions, 63 deletions

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index b83df08426e3..dce7e6ff60c6 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,9 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
-DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
-DIST qttools-everywhere-src-5.14.0.tar.xz 9143808 BLAKE2B 261d5d6004f0653f2c7c32839c8c3a916ac747406db9689501357e2709bc23569919f278e29784f1f844f2df7fa8c4a55e3d6395129ba9fdb592eeac85bbf07c SHA512 1c77d6b6027d301b7afae92834ba2296b903495cd0546d53e9d82cd24289089d02a4a7b0e802061ead4f9f8272f8389fb5f06f3788aac3624f52593324ce78dc
-EBUILD assistant-5.12.3.ebuild 1205 BLAKE2B dd1a5d11b0013c8ba346773c86ab070d40df799e6aed7172e6a10a2cec777f4e3bb79fbcc3b2ee20ce6420c78a556f9203eb700114ffd6742476ece9c2b3d115 SHA512 7314e6ba565a1e7de39baf16f9e0e09ad999a6d83dc5a7c9bb9c06958f01d8de138b730b6c6f040c5de370f3e35311c399750834ef1bacf013b0109f5ab87d4b
-EBUILD assistant-5.12.5.ebuild 1197 BLAKE2B 426575eaf982a93c0aa9db924ff58a67e566d51910c34f1fcc9001bd00af2a1cb27f8e3bb6d852a39f5cf10aabc8f85c19bc4aa02ad153c8a046973c84ca8683 SHA512 ee0b54cedf808c0be0d0dfd331bf2cd38f1581fb07b23f0503d45477fb9f67c8d85681d425fbcb22837c9f94aa477777f5dcd0381222f3e6142b35fff5d64bf5
+DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
+EBUILD assistant-5.12.3.ebuild 1174 BLAKE2B e7d9543a813dd923da65f35766b922c8963230e043671344d47eea80e912d22165d629a4db5f602949d8641f04c197ded487a1fc16a78e9d17f696e6df5759a1 SHA512 18ed2c34062cf8913355ac49f6d99ef82bdeb97e84d81cc481bf782d2597de4a41f162066b593c02b4b7b8ffb5b0ca052a602239c39c9c7757d7a9d08092d06e
 EBUILD assistant-5.13.2.ebuild 1197 BLAKE2B 426575eaf982a93c0aa9db924ff58a67e566d51910c34f1fcc9001bd00af2a1cb27f8e3bb6d852a39f5cf10aabc8f85c19bc4aa02ad153c8a046973c84ca8683 SHA512 ee0b54cedf808c0be0d0dfd331bf2cd38f1581fb07b23f0503d45477fb9f67c8d85681d425fbcb22837c9f94aa477777f5dcd0381222f3e6142b35fff5d64bf5
-EBUILD assistant-5.14.0.ebuild 1200 BLAKE2B 85f6b78d456477b63a81a19fec3739022f84577e416a3d0a38754cef69307c2b5a52ec42e877ff04dcb60f5db0e010d4406df1c63ac641a9976f638a30fcb739 SHA512 a53017fbfa50f5c0e3e02b7a6b396ec8ab56f8d2f28a0bcebdb00167150003dfe781492ebda5600715d8d8dc9877089119ace7cb8e7bc69b411861cc520e89f8
+EBUILD assistant-5.14.1.ebuild 1200 BLAKE2B 11f1f353d22572a76a4b1c5aa0018ebbaa6907d2df22c1f3910126e00cd56ef0efde80f7edaad140275eb1e19f38c1202537a0349281db320f9eaf6cfcfef174 SHA512 1d2ef963036eeaa79d1506aabad5c8a0063569c6a931cef5ecb9ab5b4893e2e718424307cb08b54ad511ed8f57c610ecbbd08aeaa1cef59500900d7900675878
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.12.3.ebuild b/dev-qt/assistant/assistant-5.12.3.ebuild
index 88f985ea3db6..5a9d7abbba90 100644
--- a/dev-qt/assistant/assistant-5.12.3.ebuild
+++ b/dev-qt/assistant/assistant-5.12.3.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=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 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 x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/assistant/assistant-5.12.5.ebuild b/dev-qt/assistant/assistant-5.12.5.ebuild
deleted file mode 100644
index 101ef370f0aa..000000000000
--- a/dev-qt/assistant/assistant-5.12.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-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"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qthelp-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	qt_use_disable_mod webkit webkitwidgets \
-		src/assistant/assistant/assistant.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/assistant/assistant/images/assistant.png
-	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
-	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/assistant/assistant-5.14.0.ebuild b/dev-qt/assistant/assistant-5.14.1.ebuild
index ad1fb3981efb..edfb372bac76 100644
--- a/dev-qt/assistant/assistant-5.14.0.ebuild
+++ b/dev-qt/assistant/assistant-5.14.1.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