gentoo resync : 24.12.2018

4 files changed, 4 insertions, 36 deletions

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 20181b56dd6c..23ca23adc93f 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
-DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qthelp-5.11.1.ebuild 654 BLAKE2B 496b878927c0a937697f28032d1712245da47e3f5419fded75c922210b637fcbed68dc4c38a1ab9fef0b754218b13ba01d57a36063bcb4e027d6f33b5f6d8ab2 SHA512 d843c0ec1707a613217a0b2127b279c6df7d14cf699e91e54e59dd805ccaba875e37df5d9ae6684520f5cb513eb7119b5c0d722da1334828cded02544040647b
-EBUILD qthelp-5.11.2.ebuild 656 BLAKE2B a4a0f91c8abf515a84c1898167a66fe7b99da75545244cbbee727860b893d3c2335dc5e3c51f5fabfcef354bddd8ee7c1fc4778533d2fbf28276b3a70f2ec9e1 SHA512 e99c4a76a774d8c487359a5f0946eea232c73609cd88620b45ea98fca7948b592f745c8d8ef73cea294ddac0c3f1ed8459e94e2c6fdd0a9788993434f34d0869
-EBUILD qthelp-5.9.6.ebuild 655 BLAKE2B 6c4f16a9090887fa0be0ff0db0f6fe75864368167340b7e4b995f931293b4ebb3334b20b7d8d9628e3aaa8cda3916b6d1910a9302aa1967393e3919cfe7ee82d SHA512 664c1eb25153d8d52b75675846e195cded8775776ddf4554e6587f97352d99bd354cdd7c4347d07eea133ba237db68fd80dbc9314c62ead80149927be8278b9d
+DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
+EBUILD qthelp-5.11.1.ebuild 652 BLAKE2B 07c0b114cb4a842a2db8b2a977b6f7c5ea7bbb23eee9362fe685eb8963c8737a3620cf305eb53e16f04b362505d9d3642cc6c6147d197f7b586969a150f0295d SHA512 82637bf23d27cf1f3f34e4518de3f30668cb6653ec7be9e9ba724609ce98814680de9a2f6092d34ffdd70a7669ca2b3351b15dc0ba2c4607308111bb49c5cfcb
+EBUILD qthelp-5.11.3.ebuild 656 BLAKE2B a4a0f91c8abf515a84c1898167a66fe7b99da75545244cbbee727860b893d3c2335dc5e3c51f5fabfcef354bddd8ee7c1fc4778533d2fbf28276b3a70f2ec9e1 SHA512 e99c4a76a774d8c487359a5f0946eea232c73609cd88620b45ea98fca7948b592f745c8d8ef73cea294ddac0c3f1ed8459e94e2c6fdd0a9788993434f34d0869
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.11.1.ebuild b/dev-qt/qthelp/qthelp-5.11.1.ebuild
index beff0018309c..ec05d1634ad5 100644
--- a/dev-qt/qthelp/qthelp-5.11.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.1.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 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qthelp/qthelp-5.11.2.ebuild b/dev-qt/qthelp/qthelp-5.11.3.ebuild
index f010bb274dfa..f010bb274dfa 100644
--- a/dev-qt/qthelp/qthelp-5.11.2.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.3.ebuild
diff --git a/dev-qt/qthelp/qthelp-5.9.6.ebuild b/dev-qt/qthelp/qthelp-5.9.6.ebuild
deleted file mode 100644
index 9790203036fa..000000000000
--- a/dev-qt/qthelp/qthelp-5.9.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 ~amd64-fbsd"
-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/qhelpconverter
-	src/assistant/qhelpgenerator
-)