gentoo resync : 14.05.2020

3 files changed, 2 insertions, 33 deletions

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 0e4f5075a7f2..c3011b18ba49 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,7 +1,5 @@
-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
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD qthelp-5.13.2.ebuild 569 BLAKE2B 9627fa7b84808e96ffae953c8d8e8aec6d4b9092f9321d0f9370b058133cf5fabf2d169e9af9341c18fb8d88ea840aeaeb81b8378db4688e5ed4818631ca84b3 SHA512 3abf0e512f3d5afe67d54ee313456f6fae148cbd4311977f48d73656622290aa09b595dc5bdcaf35c336010487c9374c7a37ef3cd5e186aafec8a5e51312d762
 EBUILD qthelp-5.14.1.ebuild 609 BLAKE2B 71b695cbd77d760df1b9bf26eb1bd390de4a82cff57a94bfd0a30c2b84d948087fca6efd6734a747483ecc0923d6fb05a1bb8a14a660f2def5965c5edd1fd216 SHA512 1b9a3bd00ecd30ec9d251b82cc72c6c20a1d7a1d4d6fd7bb5437a79e8307c4458a8d518dc837a3eef2d08ac81170058d02831d9c6a955f5c78e135f5cf0522c9
-EBUILD qthelp-5.14.2.ebuild 617 BLAKE2B 2ccc37e9d104c03319a35a8ed17ea05a66b1793ecaa64dcef00044f475c31518f65bb422ee2aa2d7428dbc1eefb0def31f18af7aacc6d42615fb7a5128970115 SHA512 84842b51058d20a57043a64bde92f69d38016670168bba14b8925b318a2f0087fa8d2799a24caed2fffe4c386a9cc8e53a4cfcc70e29fc8c4a1a58da8afef91d
+EBUILD qthelp-5.14.2.ebuild 615 BLAKE2B ed198188a99808391cc79af1365b0d68a6b663b66d9dbaa5ab545facc2c0e40403d28623a4e16f80ad0e723237f2e48e5fc856615fef5f8ae7a5300344e222a5 SHA512 4f586c89fad089061a197b9aaacd6da309bd75e6a811dad3559c7b34975872bcfefbfa046cec41b41e997efaf7994cd069a3619f3e5cc3711ac0a4bc08510f4a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.13.2.ebuild b/dev-qt/qthelp/qthelp-5.13.2.ebuild
deleted file mode 100644
index e859fdce9a22..000000000000
--- a/dev-qt/qthelp/qthelp-5.13.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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="arm"
-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.14.2.ebuild b/dev-qt/qthelp/qthelp-5.14.2.ebuild
index 1590efa1a496..ffc07f3b1a70 100644
--- a/dev-qt/qthelp/qthelp-5.14.2.ebuild
+++ b/dev-qt/qthelp/qthelp-5.14.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=""