gentoo resync : 22.10.2018

3 files changed, 60 insertions, 3 deletions

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 103a6bc21ee9..474d95902912 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,7 @@
 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 assistant-5.11.1.ebuild 1205 BLAKE2B f9516972ac2c473ccb5905fc5b87bc7cc4dafd49e200da6c21a340f3b14534371a3dfc1f9edd917846cce07716e5f7efde64cb8a63213859879ebaa1575c48a0 SHA512 c2419c99e7f15b7696d53e5e542c38a32223ff74ff6dea6c3957532a0079fa31e95623a280a6c9788d3d061b00fbffa89e60c9dab6e7624d290c30fbcb7d4a89
+EBUILD assistant-5.11.1.ebuild 1200 BLAKE2B c62aa0e5f3f66f8cb7d29ecc1dc6d778053e95aebe3c887fe6a50d7a222b91fd64250eb2bf78a2933508f799326c37e4bbec60593eab7ee936d2543ea51d466d SHA512 d59f6592d9bb3933520a076f9273593a89ad60a3afcec3a352f079dff628786a7e2a378949f86dc8a6609b8242ea9ec73f687e35764b28bf6507bf255f969d25
+EBUILD assistant-5.11.2.ebuild 1202 BLAKE2B cc09614074320f1227ac9293a25ef81af2996e6335e92c0ca850541b5892cfb391dd0ddc8c3ba800fe64f88fcb8590800457c1dda9faf58084356ce3fada5e50 SHA512 ca60d6235038386dd13708b38915081314f4c7e03de290690ce2870a57da9fd75fa8c9f63b0b88b9a3244378e8cc2d0f19d15d6afcd934d81599ee2fc6fc8661
 EBUILD assistant-5.9.6.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.11.1.ebuild b/dev-qt/assistant/assistant-5.11.1.ebuild
index 5cb6d4e5d07f..d9be38464014 100644
--- a/dev-qt/assistant/assistant-5.11.1.ebuild
+++ b/dev-qt/assistant/assistant-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/assistant/assistant-5.11.2.ebuild b/dev-qt/assistant/assistant-5.11.2.ebuild
new file mode 100644
index 000000000000..dc410213c523
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.11.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+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 ~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
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	gnome2_icon_cache_update
+}