gentoo resync : 05.02.2020

5 files changed, 8 insertions, 39 deletions

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index c8206424e592..6583eb3f146e 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/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 qthelp-5.12.3.ebuild 608 BLAKE2B 8b99bf2609495c41f290d9d92a3ba0a61345b0838eb0a752a4e0ce5479def218b0952fd37a68b8b5bb21be9925f624d5618b6cf90838f00b4b79f2d2c303d054 SHA512 1f9cdc85a5601719722871db21f03e293fbfbb0bb0444ca282c6469816c03e9962150e5025450f73969e196347fe62d6760a5b6da5103226d24f4de16457cf46
-EBUILD qthelp-5.12.5.ebuild 611 BLAKE2B 58795971fab7b8a2e68003e7064276fc2176c855638baa337e26afed24ef02bca6a100cb599b0b25b5b6cea90bf3012b56e0c690db480f9d51daf1f176148289 SHA512 6c43a27f66602554d2fe9b5e7d14490530808f193e7ff5fcdaa6db31cb90fb576f821549fe1fdf02c8b0590dd085b9c39f979370be6caf32e96ec13cfb1553ff
-EBUILD qthelp-5.13.2.ebuild 610 BLAKE2B 97ab6486789f93d73f721203a9f07e3e61b035c1697763568e5fafc6cfbb05d21f4195e0a7e73915faa4c51953c8a2cd9ca8faa3dbaeb907e843833c3f7149c5 SHA512 04782f8cea1831c8cdccaaf312f9e480fd4fddfe1f09af20f9a1d33b563b731b9301220d422a8d33d61156b6ea6bca40f9c2d5760140fe24d86b127fb09c9bfd
-EBUILD qthelp-5.14.0.ebuild 614 BLAKE2B aea17664287d1c9b125aec86d076096f038323e64cd817be32a2ce78505583a90514aca232533805ffa9e1aed7ed037c332e35c82bb99b242d4591b0f7e8f843 SHA512 5d3401d58162daca9665232e5ceb16b473d119e464acc2367afb35c019ea9bf253a73f90bd32a8083f1faac61245823e314cf7d7a02ccc270c47cbb702f74223
+DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
+EBUILD qthelp-5.12.3.ebuild 573 BLAKE2B 898dc9c1c3cdd8a2e121c12417c384facf1597d678d47cb47d3f6062533012f85945f03a373179cc9b3a0b31b67d78ff2c2fe30c888224bfc1e965ab78ffdffd SHA512 01eb13f7a8803c4d45fe888896e62020b76fe90eba4e68aa93e3f308e7ba603aad19441ba59125de46a30aadfe033ab51d80d056e93a642b84e2d3d986a94cb1
+EBUILD qthelp-5.13.2.ebuild 609 BLAKE2B c83aad67ecd7fb08a3523f95340684347c25d280058a79c789bad5099b5f6312f4596d51035558b9c43e320b0a8a809c810b96fcaedcaf8db7b2150dbb754aa6 SHA512 6951d1a47587b3673b96944a8b38686f99eda0474d86a3283abcd5c207020d4f3878b12890905ebab1f69c1adc08f0bf725f0b91045b7c3c57530dd6602284c9
+EBUILD qthelp-5.14.1.ebuild 614 BLAKE2B f119042f99f62f8bc490777c1d05051888c2d7394c1e531c4a79faeb94c33e4c58cc90b92c9e53c241fc44531449cb82d0bb68a08477f38e8cb197a45858ffe7 SHA512 97a34d4f31ef00eac784a4881616009ed5087c345f7d2df1ae3f2254f77baded3c73afe2cb2edff68fded0bb3f26afca773b2ea883f0ef4a89f2db1db50a8142
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.12.3.ebuild b/dev-qt/qthelp/qthelp-5.12.3.ebuild
index ed91e5a42252..0e5276c016f6 100644
--- a/dev-qt/qthelp/qthelp-5.12.3.ebuild
+++ b/dev-qt/qthelp/qthelp-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 qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="arm x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qthelp/qthelp-5.12.5.ebuild b/dev-qt/qthelp/qthelp-5.12.5.ebuild
deleted file mode 100644
index a27890b67530..000000000000
--- a/dev-qt/qthelp/qthelp-5.12.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qthelp/qthelp-5.13.2.ebuild b/dev-qt/qthelp/qthelp-5.13.2.ebuild
index 2033f0faba7d..fab7e1f2d25d 100644
--- a/dev-qt/qthelp/qthelp-5.13.2.ebuild
+++ b/dev-qt/qthelp/qthelp-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qthelp/qthelp-5.14.0.ebuild b/dev-qt/qthelp/qthelp-5.14.1.ebuild
index 78ca7e84a51e..139a71c459b2 100644
--- a/dev-qt/qthelp/qthelp-5.14.0.ebuild
+++ b/dev-qt/qthelp/qthelp-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