[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2022-03-21 Thread Andreas Sturmlechner 
commit: 626b5041b583a5b90aeedc571a0619ec59a42d26
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 27 21:01:51 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 21 10:04:46 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=626b5041

dev-qt/assistant: Symlink assistant to /usr/bin/assistant

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/assistant/assistant-5.15.3..ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.15.3..ebuild 
b/dev-qt/assistant/assistant-5.15.3..ebuild
index f9f9de34..52bf83ac 100644
--- a/dev-qt/assistant/assistant-5.15.3..ebuild
+++ b/dev-qt/assistant/assistant-5.15.3..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,10 @@ DEPEND="
=dev-qt/qtsql-${QT5_PV}*[sqlite]
=dev-qt/qtwidgets-${QT5_PV}*
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !dev-qt/${PN}:5
+   !

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2021-09-15 Thread Davide Pesavento 
commit: 068106352defed14782534201d45c009745a19a9
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 20:24:38 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 20:24:38 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=06810635

dev-qt/assistant: png support in qtgui is required

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/assistant/assistant-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/assistant/assistant-5.15.2..ebuild 
b/dev-qt/assistant/assistant-5.15.2..ebuild
index 54070de8..f9f9de34 100644
--- a/dev-qt/assistant/assistant-5.15.2..ebuild
+++ b/dev-qt/assistant/assistant-5.15.2..ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
-   =dev-qt/qtgui-${QT5_PV}*
+   =dev-qt/qtgui-${QT5_PV}*[png]
=dev-qt/qthelp-${QT5_PV}*
=dev-qt/qtnetwork-${QT5_PV}*
=dev-qt/qtprintsupport-${QT5_PV}*

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2020-11-22 Thread Andreas Sturmlechner 
commit: e7498cf21ad79110e81d43a1fac60f645d994603
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 22 21:02:17 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 22 21:02:17 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e7498cf2

dev-qt/assistant: Drop IUSE=webkit

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/assistant/assistant-5.15..ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.15..ebuild 
b/dev-qt/assistant/assistant-5.15..ebuild
index 7f0b3ec1..cb232618 100644
--- a/dev-qt/assistant/assistant-5.15..ebuild
+++ b/dev-qt/assistant/assistant-5.15..ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qttools"
 inherit desktop qt5-build xdg-utils
 
@@ -11,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="webkit"
+IUSE=""
 
 DEPEND="
~dev-qt/qtcore-${PV}:5=
@@ -21,7 +22,6 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -30,8 +30,8 @@ QT5_TARGET_SUBDIRS=(
 )
 
 src_prepare() {
-   qt_use_disable_mod webkit webkitwidgets \
-   src/assistant/assistant/assistant.pro
+   sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
+   -i src/assistant/assistant/assistant.pro || die
 
qt5-build_src_prepare
 }

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/, dev-qt/linguist/, dev-qt/qdoc/, dev-qt/qdbusviewer/, ...

2019-07-06 Thread Andreas Sturmlechner 
commit: a96295e0f0a722c2a8346e53d7d8434f0322380a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul  6 10:19:15 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul  6 10:19:38 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a96295e0

dev-qt: Rollover ~arm64 keywords from 5.12.3

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/assistant/assistant-5.12..ebuild | 2 +-
 dev-qt/assistant/assistant-5.13..ebuild | 2 +-
 dev-qt/assistant/assistant-5..ebuild| 2 +-
 dev-qt/linguist/linguist-5.12..ebuild   | 2 +-
 dev-qt/linguist/linguist-5.13..ebuild   | 2 +-
 dev-qt/linguist/linguist-5..ebuild  | 2 +-
 dev-qt/pixeltool/pixeltool-5.12..ebuild | 2 +-
 dev-qt/pixeltool/pixeltool-5.13..ebuild | 2 +-
 dev-qt/pixeltool/pixeltool-5..ebuild| 2 +-
 dev-qt/qdbusviewer/qdbusviewer-5.12..ebuild | 2 +-
 dev-qt/qdbusviewer/qdbusviewer-5.13..ebuild | 2 +-
 dev-qt/qdbusviewer/qdbusviewer-5..ebuild| 2 +-
 dev-qt/qdoc/qdoc-5.12..ebuild   | 2 +-
 dev-qt/qdoc/qdoc-5.13..ebuild   | 2 +-
 dev-qt/qdoc/qdoc-5..ebuild  | 2 +-
 dev-qt/qt3d/qt3d-5.12..ebuild   | 2 +-
 dev-qt/qt3d/qt3d-5.13..ebuild   | 2 +-
 dev-qt/qt3d/qt3d-5..ebuild  | 2 +-
 dev-qt/qtdatavis3d/qtdatavis3d-5.12..ebuild | 2 +-
 dev-qt/qtdatavis3d/qtdatavis3d-5.13..ebuild | 2 +-
 dev-qt/qtdatavis3d/qtdatavis3d-5..ebuild| 2 +-
 dev-qt/qtscxml/qtscxml-5.12..ebuild | 2 +-
 dev-qt/qtscxml/qtscxml-5.13..ebuild | 2 +-
 dev-qt/qtscxml/qtscxml-5..ebuild| 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.12..ebuild 
b/dev-qt/assistant/assistant-5.12..ebuild
index 135cf542..ad1fb398 100644
--- a/dev-qt/assistant/assistant-5.12..ebuild
+++ b/dev-qt/assistant/assistant-5.12..ebuild
@@ -8,7 +8,7 @@ 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 ~hppa ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="webkit"

diff --git a/dev-qt/assistant/assistant-5.13..ebuild 
b/dev-qt/assistant/assistant-5.13..ebuild
index 135cf542..ad1fb398 100644
--- a/dev-qt/assistant/assistant-5.13..ebuild
+++ b/dev-qt/assistant/assistant-5.13..ebuild
@@ -8,7 +8,7 @@ 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 ~hppa ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="webkit"

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index 135cf542..ad1fb398 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -8,7 +8,7 @@ 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 ~hppa ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="webkit"

diff --git a/dev-qt/linguist/linguist-5.12..ebuild 
b/dev-qt/linguist/linguist-5.12..ebuild
index ec3611f8..b09b8354 100644
--- a/dev-qt/linguist/linguist-5.12..ebuild
+++ b/dev-qt/linguist/linguist-5.12..ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-fbsd"
 fi
 
 IUSE=""

diff --git a/dev-qt/linguist/linguist-5.13..ebuild 
b/dev-qt/linguist/linguist-5.13..ebuild
index ec3611f8..b09b8354 100644
--- a/dev-qt/linguist/linguist-5.13..ebuild
+++ b/dev-qt/linguist/linguist-5.13..ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-fbsd"
 fi
 
 IUSE=""

diff --git a/dev-qt/linguist/linguist-5..ebuild 
b/dev-qt/linguist/linguist-5..ebuild
index ec3611f8..b09b8354 100644
--- a/dev-qt/linguist/linguist-5..ebuild
+++ b/dev-qt/linguist/linguist-5..ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2017-12-24 Thread Michael Palimaka 
commit: 18b5775c3c9b1454e84f42c899d7a766b2a8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Dec 25 07:56:00 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Dec 25 07:56:15 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=18b5775c

dev-qt/assistant: be clear that this is Qt 5

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 dev-qt/assistant/assistant-5.10.0.ebuild| 2 +-
 dev-qt/assistant/assistant-5.10..ebuild | 2 +-
 dev-qt/assistant/assistant-5.9..ebuild  | 2 +-
 dev-qt/assistant/assistant-5..ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.10.0.ebuild 
b/dev-qt/assistant/assistant-5.10.0.ebuild
index dcfcae78..ed774c31 100644
--- a/dev-qt/assistant/assistant-5.10.0.ebuild
+++ b/dev-qt/assistant/assistant-5.10.0.ebuild
@@ -41,7 +41,7 @@ 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 Assistant assistant 
'Qt;Development;Documentation'
+   make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 
'Qt;Development;Documentation'
 }
 
 pkg_postinst() {

diff --git a/dev-qt/assistant/assistant-5.10..ebuild 
b/dev-qt/assistant/assistant-5.10..ebuild
index dcfcae78..ed774c31 100644
--- a/dev-qt/assistant/assistant-5.10..ebuild
+++ b/dev-qt/assistant/assistant-5.10..ebuild
@@ -41,7 +41,7 @@ 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 Assistant assistant 
'Qt;Development;Documentation'
+   make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 
'Qt;Development;Documentation'
 }
 
 pkg_postinst() {

diff --git a/dev-qt/assistant/assistant-5.9..ebuild 
b/dev-qt/assistant/assistant-5.9..ebuild
index dcfcae78..ed774c31 100644
--- a/dev-qt/assistant/assistant-5.9..ebuild
+++ b/dev-qt/assistant/assistant-5.9..ebuild
@@ -41,7 +41,7 @@ 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 Assistant assistant 
'Qt;Development;Documentation'
+   make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 
'Qt;Development;Documentation'
 }
 
 pkg_postinst() {

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index dcfcae78..ed774c31 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -41,7 +41,7 @@ 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 Assistant assistant 
'Qt;Development;Documentation'
+   make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 
'Qt;Development;Documentation'
 }
 
 pkg_postinst() {

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2017-12-24 Thread Michael Palimaka 
commit: 969dcff479b5930914ba94206dce2748a4433cff
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Dec 25 07:48:44 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Dec 25 07:48:53 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=969dcff4

dev-qt/assistant: use fully qualified executable path

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 dev-qt/assistant/assistant-5.10.0.ebuild| 2 +-
 dev-qt/assistant/assistant-5.10..ebuild | 2 +-
 dev-qt/assistant/assistant-5.9..ebuild  | 2 +-
 dev-qt/assistant/assistant-5..ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.10.0.ebuild 
b/dev-qt/assistant/assistant-5.10.0.ebuild
index 633d6456..dcfcae78 100644
--- a/dev-qt/assistant/assistant-5.10.0.ebuild
+++ b/dev-qt/assistant/assistant-5.10.0.ebuild
@@ -41,7 +41,7 @@ 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 assistant Assistant assistant 
'Qt;Development;Documentation'
+   make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 
'Qt;Development;Documentation'
 }
 
 pkg_postinst() {

diff --git a/dev-qt/assistant/assistant-5.10..ebuild 
b/dev-qt/assistant/assistant-5.10..ebuild
index 633d6456..dcfcae78 100644
--- a/dev-qt/assistant/assistant-5.10..ebuild
+++ b/dev-qt/assistant/assistant-5.10..ebuild
@@ -41,7 +41,7 @@ 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 assistant Assistant assistant 
'Qt;Development;Documentation'
+   make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 
'Qt;Development;Documentation'
 }
 
 pkg_postinst() {

diff --git a/dev-qt/assistant/assistant-5.9..ebuild 
b/dev-qt/assistant/assistant-5.9..ebuild
index 633d6456..dcfcae78 100644
--- a/dev-qt/assistant/assistant-5.9..ebuild
+++ b/dev-qt/assistant/assistant-5.9..ebuild
@@ -41,7 +41,7 @@ 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 assistant Assistant assistant 
'Qt;Development;Documentation'
+   make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 
'Qt;Development;Documentation'
 }
 
 pkg_postinst() {

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index 633d6456..dcfcae78 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -41,7 +41,7 @@ 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 assistant Assistant assistant 
'Qt;Development;Documentation'
+   make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 
'Qt;Development;Documentation'
 }
 
 pkg_postinst() {

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2017-12-24 Thread Michael Palimaka 
commit: 03235d3408db759181a4c82263cd1dd782e8abab
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Dec 25 02:42:02 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Dec 25 02:42:14 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=03235d34

dev-qt/assistant: install icons and desktop file

Bug: https://bugs.gentoo.org/634566
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 dev-qt/assistant/assistant-5.10.0.ebuild| 20 +++-
 dev-qt/assistant/assistant-5.10..ebuild | 20 +++-
 dev-qt/assistant/assistant-5.9..ebuild  | 20 +++-
 dev-qt/assistant/assistant-5..ebuild| 20 +++-
 4 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.10.0.ebuild 
b/dev-qt/assistant/assistant-5.10.0.ebuild
index 6342c0fd..633d6456 100644
--- a/dev-qt/assistant/assistant-5.10.0.ebuild
+++ b/dev-qt/assistant/assistant-5.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit desktop gnome2-utils qt5-build
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
@@ -35,3 +35,21 @@ src_prepare() {
 
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 assistant 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
+}

diff --git a/dev-qt/assistant/assistant-5.10..ebuild 
b/dev-qt/assistant/assistant-5.10..ebuild
index 6342c0fd..633d6456 100644
--- a/dev-qt/assistant/assistant-5.10..ebuild
+++ b/dev-qt/assistant/assistant-5.10..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit desktop gnome2-utils qt5-build
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
@@ -35,3 +35,21 @@ src_prepare() {
 
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 assistant 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
+}

diff --git a/dev-qt/assistant/assistant-5.9..ebuild 
b/dev-qt/assistant/assistant-5.9..ebuild
index 6342c0fd..633d6456 100644
--- a/dev-qt/assistant/assistant-5.9..ebuild
+++ b/dev-qt/assistant/assistant-5.9..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit desktop gnome2-utils qt5-build
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
@@ -35,3 +35,21 @@ src_prepare() {
 
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 assistant 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
+}

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index 6342c0fd..633d6456 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 QT5_MODULE="qttools"
-inherit qt5-build
+inherit desktop gnome2-utils qt5-build
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
@@ -35,3 +35,21 @@ src_prepare() {
 
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 assistant 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
+}

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2017-10-07 Thread Davide Pesavento 
commit: 72af4e9d1d0c58c53e0e40e2748797f0eb20a389
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct  7 18:03:51 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Oct  7 18:03:51 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=72af4e9d

dev-qt/assistant: add missing slot

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-qt/assistant/assistant-5.10..ebuild | 2 +-
 dev-qt/assistant/assistant-5.9.2.ebuild | 2 +-
 dev-qt/assistant/assistant-5.9..ebuild  | 2 +-
 dev-qt/assistant/assistant-5..ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.10..ebuild 
b/dev-qt/assistant/assistant-5.10..ebuild
index 02ad7650..6342c0fd 100644
--- a/dev-qt/assistant/assistant-5.10..ebuild
+++ b/dev-qt/assistant/assistant-5.10..ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/assistant/assistant-5.9.2.ebuild 
b/dev-qt/assistant/assistant-5.9.2.ebuild
index 02ad7650..6342c0fd 100644
--- a/dev-qt/assistant/assistant-5.9.2.ebuild
+++ b/dev-qt/assistant/assistant-5.9.2.ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/assistant/assistant-5.9..ebuild 
b/dev-qt/assistant/assistant-5.9..ebuild
index 02ad7650..6342c0fd 100644
--- a/dev-qt/assistant/assistant-5.9..ebuild
+++ b/dev-qt/assistant/assistant-5.9..ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index 02ad7650..6342c0fd 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/, dev-qt/designer/

2017-07-25 Thread Michael Palimaka 
commit: b0c5d8c3dd86479acbd325dac93a104c200a767c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Jul 25 13:20:05 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Jul 25 13:20:41 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b0c5d8c3

dev-qt: unpin dev-qt/qtwebkit dependency for >=5.9

Qt 5.9 will be the last release of "old" qtwebkit and future releases will have
a different versioning scheme.

I have applied this change to earlier branches as qtwebkit-5.9 has some build
system changes that I suspet may not be backwards-compatible with earlier Qt
versions.

Gentoo-bug: 624404
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/assistant/assistant-5.9.1.ebuild| 2 +-
 dev-qt/assistant/assistant-5.9..ebuild | 2 +-
 dev-qt/assistant/assistant-5..ebuild   | 2 +-
 dev-qt/designer/designer-5.9.1.ebuild  | 2 +-
 dev-qt/designer/designer-5.9..ebuild   | 2 +-
 dev-qt/designer/designer-5..ebuild | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.9.1.ebuild 
b/dev-qt/assistant/assistant-5.9.1.ebuild
index 44fa4993..02ad7650 100644
--- a/dev-qt/assistant/assistant-5.9.1.ebuild
+++ b/dev-qt/assistant/assistant-5.9.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/assistant/assistant-5.9..ebuild 
b/dev-qt/assistant/assistant-5.9..ebuild
index 44fa4993..02ad7650 100644
--- a/dev-qt/assistant/assistant-5.9..ebuild
+++ b/dev-qt/assistant/assistant-5.9..ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index 44fa4993..02ad7650 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/designer/designer-5.9.1.ebuild 
b/dev-qt/designer/designer-5.9.1.ebuild
index 881db449..37b8aa6d 100644
--- a/dev-qt/designer/designer-5.9.1.ebuild
+++ b/dev-qt/designer/designer-5.9.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtwidgets-${PV}
~dev-qt/qtxml-${PV}
declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/designer/designer-5.9..ebuild 
b/dev-qt/designer/designer-5.9..ebuild
index 881db449..37b8aa6d 100644
--- a/dev-qt/designer/designer-5.9..ebuild
+++ b/dev-qt/designer/designer-5.9..ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtwidgets-${PV}
~dev-qt/qtxml-${PV}
declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/designer/designer-5..ebuild 
b/dev-qt/designer/designer-5..ebuild
index 881db449..37b8aa6d 100644
--- a/dev-qt/designer/designer-5..ebuild
+++ b/dev-qt/designer/designer-5..ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtwidgets-${PV}
~dev-qt/qtxml-${PV}
declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.9.1 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2016-04-09 Thread Davide Pesavento 
commit: c1b67d1ee74a820f558ac1c8ade28a9bf309d1e6
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Apr  9 16:03:57 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Apr  9 16:03:57 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c1b67d1e

dev-qt/assistant: revert the last bit of 
58183f2170343139ef6fccc604acb0749631e44e

We do have a proper qtwebkit-5.6.0 release now.

Package-Manager: portage-2.2.28

 dev-qt/assistant/assistant-5.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/assistant/assistant-5.6.0.ebuild 
b/dev-qt/assistant/assistant-5.6.0.ebuild
index 875ef33..bd7939c 100644
--- a/dev-qt/assistant/assistant-5.6.0.ebuild
+++ b/dev-qt/assistant/assistant-5.6.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.5.1 )
+   webkit? ( ~dev-qt/qtwebkit-${PV} )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2016-02-10 Thread Michael Palimaka 
commit: 2d1e91e180b113b5577bf89013e3e85641a6bfc8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Feb 10 13:19:55 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Feb 10 13:25:52 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2d1e91e1

Revert "dev-qt/assistant: depend upon the last released version of qtwebkit"

Upstream will still be providing unsupported source-only releases.

This reverts commit 58183f2170343139ef6fccc604acb0749631e44e.

Gentoo-bug: 573562

 dev-qt/assistant/assistant-5.6..ebuild | 2 +-
 dev-qt/assistant/assistant-5..ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.6..ebuild 
b/dev-qt/assistant/assistant-5.6..ebuild
index 41c24c2..2fcad05 100644
--- a/dev-qt/assistant/assistant-5.6..ebuild
+++ b/dev-qt/assistant/assistant-5.6..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.5.1 )
+   webkit? ( ~dev-qt/qtwebkit-${PV} )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index 41c24c2..2fcad05 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.5.1 )
+   webkit? ( ~dev-qt/qtwebkit-${PV} )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2016-01-06 Thread Michael Palimaka 
commit: 58183f2170343139ef6fccc604acb0749631e44e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan  6 13:32:37 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan  6 13:32:37 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=58183f21

dev-qt/assistant: depend upon the last released version of qtwebkit

No further releases are expected.

Package-Manager: portage-2.2.26

 dev-qt/assistant/assistant-5.5..ebuild | 2 +-
 dev-qt/assistant/assistant-5.6..ebuild | 2 +-
 dev-qt/assistant/assistant-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.5..ebuild 
b/dev-qt/assistant/assistant-5.5..ebuild
index 7505c99..7b1842a 100644
--- a/dev-qt/assistant/assistant-5.5..ebuild
+++ b/dev-qt/assistant/assistant-5.5..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.5.1 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/assistant/assistant-5.6..ebuild 
b/dev-qt/assistant/assistant-5.6..ebuild
index 7505c99..7b1842a 100644
--- a/dev-qt/assistant/assistant-5.6..ebuild
+++ b/dev-qt/assistant/assistant-5.6..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.5.1 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index 7505c99..7b1842a 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
-   webkit? ( ~dev-qt/qtwebkit-${PV} )
+   webkit? ( >=dev-qt/qtwebkit-5.5.1 )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/, dev-qt/qtwidgets/, dev-qt/qtquick1/, dev-qt/qtwebkit/, ...

2015-06-22 Thread Davide Pesavento 
commit: 3dae45e46cd33afbc82bc9989fd9903adf438fee
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon Jun 22 18:28:38 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Jun 22 18:28:38 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3dae45e4

[Qt5] Bump to 5.5.0 RC.

 dev-qt/assistant/Manifest  |   1 +
 dev-qt/assistant/assistant-5.5.0_rc.ebuild |  38 ++
 dev-qt/designer/Manifest   |   1 +
 dev-qt/designer/designer-5.5.0_rc.ebuild   |  41 ++
 dev-qt/linguist-tools/Manifest |   1 +
 .../linguist-tools/linguist-tools-5.5.0_rc.ebuild  |  36 +
 dev-qt/linguist/Manifest   |   1 +
 dev-qt/linguist/linguist-5.5.0_rc.ebuild   |  29 
 dev-qt/pixeltool/Manifest  |   1 +
 dev-qt/pixeltool/pixeltool-5.5.0_rc.ebuild |  27 
 dev-qt/qdbus/Manifest  |   1 +
 dev-qt/qdbus/qdbus-5.5.0_rc.ebuild |  26 
 dev-qt/qdbusviewer/Manifest|   1 +
 dev-qt/qdbusviewer/qdbusviewer-5.5.0_rc.ebuild |  28 
 dev-qt/qdoc/Manifest   |   1 +
 dev-qt/qdoc/qdoc-5.5.0_rc.ebuild   |  25 
 dev-qt/qtconcurrent/Manifest   |   1 +
 dev-qt/qtconcurrent/qtconcurrent-5.5.0_rc.ebuild   |  24 
 dev-qt/qtcore/Manifest |   1 +
 dev-qt/qtcore/qtcore-5.5.0_rc.ebuild   |  41 ++
 dev-qt/qtdbus/Manifest |   1 +
 dev-qt/qtdbus/qtdbus-5.5.0_rc.ebuild   |  40 ++
 dev-qt/qtdeclarative/Manifest  |   1 +
 dev-qt/qtdeclarative/qtdeclarative-5.5.0_rc.ebuild |  46 +++
 dev-qt/qtdiag/Manifest |   1 +
 dev-qt/qtdiag/qtdiag-5.5.0_rc.ebuild   |  26 
 dev-qt/qtgraphicaleffects/Manifest |   1 +
 .../qtgraphicaleffects-5.5.0_rc.ebuild |  28 
 dev-qt/qtgui/Manifest  |   1 +
 dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 149 +
 dev-qt/qthelp/Manifest |   1 +
 dev-qt/qthelp/qthelp-5.5.0_rc.ebuild   |  32 +
 dev-qt/qtimageformats/Manifest |   1 +
 .../qtimageformats/qtimageformats-5.5.0_rc.ebuild  |  24 
 dev-qt/qtmultimedia/Manifest   |   1 +
 dev-qt/qtmultimedia/qtmultimedia-5.5.0_rc.ebuild   |  58 
 dev-qt/qtnetwork/Manifest  |   1 +
 dev-qt/qtnetwork/qtnetwork-5.5.0_rc.ebuild |  54 
 dev-qt/qtopengl/Manifest   |   1 +
 dev-qt/qtopengl/qtopengl-5.5.0_rc.ebuild   |  35 +
 dev-qt/qtpaths/Manifest|   1 +
 dev-qt/qtpaths/qtpaths-5.5.0_rc.ebuild |  24 
 dev-qt/qtpositioning/Manifest  |   1 +
 dev-qt/qtpositioning/qtpositioning-5.5.0_rc.ebuild |  36 +
 dev-qt/qtprintsupport/Manifest |   1 +
 .../qtprintsupport/qtprintsupport-5.5.0_rc.ebuild  |  43 ++
 dev-qt/qtquick1/Manifest   |   1 +
 dev-qt/qtquick1/qtquick1-5.5.0_rc.ebuild   |  50 +++
 dev-qt/qtquickcontrols/Manifest|   1 +
 .../qtquickcontrols-5.5.0_rc.ebuild|  33 +
 dev-qt/qtscript/Manifest   |   1 +
 dev-qt/qtscript/qtscript-5.5.0_rc.ebuild   |  30 +
 dev-qt/qtsensors/Manifest  |   1 +
 dev-qt/qtsensors/qtsensors-5.5.0_rc.ebuild |  27 
 dev-qt/qtserialport/Manifest   |   1 +
 dev-qt/qtserialport/qtserialport-5.5.0_rc.ebuild   |  20 +++
 dev-qt/qtsql/Manifest  |   1 +
 dev-qt/qtsql/qtsql-5.5.0_rc.ebuild |  54 
 dev-qt/qtsvg/Manifest  |   1 +
 dev-qt/qtsvg/qtsvg-5.5.0_rc.ebuild |  24 
 dev-qt/qttest/Manifest |   1 +
 dev-qt/qttest/qttest-5.5.0_rc.ebuild   |  30 +
 dev-qt/qttranslations/Manifest |   1 +
 .../qttranslations/qttranslations-5.5.0_rc.ebuild  |  20 +++
 dev-qt/qtwayland/Manifest  |   1 +
 dev-qt/qtwayland/qtwayland-5.5.0_rc.ebuild |  38 ++
 dev-qt/qtwebchannel/Manifest   |   1 +
 dev-qt/qtwebchannel/qtwebchannel-5.5.0_rc.ebuild   |  27 
 dev-qt/qtwebkit/Manifest   |   1 +
 dev-qt/qtwebkit/qtwebkit-5.5.0_rc.ebuild   |  96 +
 dev-qt/qtwebsockets/Manifest   |   1 +
 dev-qt/qtwebsockets/qtwebsockets-5.5.0_rc.ebuild   |  28 
 dev-qt/qtwidgets/Manifest  |   1 +
 dev-qt/qtwidgets/qtwidgets-5.5.0_rc.ebuild |  43 ++
 dev-qt/qtx11extras/Manifest

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant-tools/, dev-qt/qthelp/, sets/

2014-09-10 Thread Davide Pesavento 
commit: e8b82c3d1fb2fa62e484f5157c95c1e76b977ca5
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Wed Sep 10 23:48:58 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Wed Sep 10 23:48:58 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e8b82c3d

[Qt5] Merge assistant-tools into qthelp. Fixes bug 517714.

---
 dev-qt/assistant-tools/Manifest|  1 -
 .../assistant-tools/assistant-tools-5.3.1.ebuild   | 33 --
 .../assistant-tools-5.3..ebuild| 33 --
 .../assistant-tools-5.4..ebuild| 33 --
 .../assistant-tools/assistant-tools-5..ebuild  | 33 --
 dev-qt/assistant-tools/metadata.xml|  9 --
 ...{qthelp-5.3.1.ebuild = qthelp-5.3.1-r1.ebuild} |  5 +++-
 dev-qt/qthelp/qthelp-5.3..ebuild   |  5 +++-
 dev-qt/qthelp/qthelp-5.4..ebuild   |  5 +++-
 dev-qt/qthelp/qthelp-5..ebuild |  5 +++-
 sets/qt5-tools |  1 -
 11 files changed, 16 insertions(+), 147 deletions(-)

diff --git a/dev-qt/assistant-tools/Manifest b/dev-qt/assistant-tools/Manifest
deleted file mode 100644
index aea5faf..000
--- a/dev-qt/assistant-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qttools-opensource-src-5.3.1.tar.xz 8992380 SHA256 
edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7 SHA512 
d8097b055c88e8f8cfa2a6c2c973d13827352e3298395b5a2c2d16204a92e5770fbc3ab2325575a80a676016ce699bddfec3616a21ecc1320b1e1ad60eabec93
 WHIRLPOOL 
957a9b65991f61a87b6af57889d43aa2cf32c6174a68a3d094bf5a8c5377a93843fcf9815ba226c3c6ff30b19a9c3b00502bd94c2f63b288aca40f780f74fccd

diff --git a/dev-qt/assistant-tools/assistant-tools-5.3.1.ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.3.1.ebuild
deleted file mode 100644
index be3a8c2..000
--- a/dev-qt/assistant-tools/assistant-tools-5.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-QT5_MODULE=qttools
-
-inherit qt5-build
-
-DESCRIPTION=Extra tools for working with Qt help files
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-   KEYWORDS=
-else
-   KEYWORDS=~amd64
-fi
-
-IUSE=
-
-DEPEND=
-   =dev-qt/qtcore-${PV}:5[debug=]
-   =dev-qt/qtgui-${PV}:5[debug=]
-   =dev-qt/qthelp-${PV}:5[debug=]
-   =dev-qt/qtwidgets-${PV}:5[debug=]
-
-RDEPEND=${DEPEND}
-
-QT5_TARGET_SUBDIRS=(
-   src/assistant/qcollectiongenerator
-   src/assistant/qhelpconverter
-   src/assistant/qhelpgenerator
-)

diff --git a/dev-qt/assistant-tools/assistant-tools-5.3..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.3..ebuild
deleted file mode 100644
index be3a8c2..000
--- a/dev-qt/assistant-tools/assistant-tools-5.3..ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-QT5_MODULE=qttools
-
-inherit qt5-build
-
-DESCRIPTION=Extra tools for working with Qt help files
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-   KEYWORDS=
-else
-   KEYWORDS=~amd64
-fi
-
-IUSE=
-
-DEPEND=
-   =dev-qt/qtcore-${PV}:5[debug=]
-   =dev-qt/qtgui-${PV}:5[debug=]
-   =dev-qt/qthelp-${PV}:5[debug=]
-   =dev-qt/qtwidgets-${PV}:5[debug=]
-
-RDEPEND=${DEPEND}
-
-QT5_TARGET_SUBDIRS=(
-   src/assistant/qcollectiongenerator
-   src/assistant/qhelpconverter
-   src/assistant/qhelpgenerator
-)

diff --git a/dev-qt/assistant-tools/assistant-tools-5.4..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.4..ebuild
deleted file mode 100644
index be3a8c2..000
--- a/dev-qt/assistant-tools/assistant-tools-5.4..ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-QT5_MODULE=qttools
-
-inherit qt5-build
-
-DESCRIPTION=Extra tools for working with Qt help files
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-   KEYWORDS=
-else
-   KEYWORDS=~amd64
-fi
-
-IUSE=
-
-DEPEND=
-   =dev-qt/qtcore-${PV}:5[debug=]
-   =dev-qt/qtgui-${PV}:5[debug=]
-   =dev-qt/qthelp-${PV}:5[debug=]
-   =dev-qt/qtwidgets-${PV}:5[debug=]
-
-RDEPEND=${DEPEND}
-
-QT5_TARGET_SUBDIRS=(
-   src/assistant/qcollectiongenerator
-   src/assistant/qhelpconverter
-   src/assistant/qhelpgenerator
-)

diff --git a/dev-qt/assistant-tools/assistant-tools-5..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5..ebuild
deleted file mode 100644
index be3a8c2..000
--- a/dev-qt/assistant-tools/assistant-tools-5..ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant-tools/

2014-06-12 Thread Michael Palimaka 
commit: 6811ca3ff3c03d0fa53b193a524ef22b486f727f
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Jun 12 16:58:31 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Jun 12 16:58:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6811ca3f

[dev-qt/assistant-tools] Add Qt 5 version.

Package-Manager: portage-2.2.10

---
 dev-qt/assistant-tools/Manifest|  1 +
 .../assistant-tools/assistant-tools-5.3.0.ebuild   | 33 ++
 .../assistant-tools-5.3..ebuild| 33 ++
 .../assistant-tools/assistant-tools-5..ebuild  | 33 ++
 dev-qt/assistant-tools/metadata.xml|  9 ++
 5 files changed, 109 insertions(+)

diff --git a/dev-qt/assistant-tools/Manifest b/dev-qt/assistant-tools/Manifest
new file mode 100644
index 000..2b38b87
--- /dev/null
+++ b/dev-qt/assistant-tools/Manifest
@@ -0,0 +1 @@
+DIST qttools-opensource-src-5.3.0.tar.xz 8987652 SHA256 
f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250 SHA512 
f52a10fc96ca3ea71800cbdb10b8166e819fd4008f1dfec984ea437b626240b2a32fa32ab7b60561acf785996d01bf5d0c5659e05bac3f6e05c7a34da06de63c
 WHIRLPOOL 
95f28fb326d6facd5714024e189d396e30c89dcc300ffbc464f675467e5e189155d9d72b3da1d067dca5d2faf8a64431c24e79f9516a7eb41f147734728f50f4

diff --git a/dev-qt/assistant-tools/assistant-tools-5.3.0.ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.3.0.ebuild
new file mode 100644
index 000..a9c1d66
--- /dev/null
+++ b/dev-qt/assistant-tools/assistant-tools-5.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE=qttools
+
+inherit qt5-build
+
+DESCRIPTION=The Qt toolkit is a comprehensive C++ application development 
framework
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~amd64 ~x86
+fi
+
+IUSE=
+
+DEPEND=
+   =dev-qt/qtcore-${PV}:5[debug=]
+   =dev-qt/qtgui-${PV}:5[debug=]
+   =dev-qt/qthelp-${PV}:5[debug=]
+   =dev-qt/qtwidgets-${PV}:5[debug=]
+
+RDEPEND=${DEPEND}
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/qcollectiongenerator
+   src/assistant/qhelpconverter
+   src/assistant/qhelpgenerator
+)

diff --git a/dev-qt/assistant-tools/assistant-tools-5.3..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.3..ebuild
new file mode 100644
index 000..a9c1d66
--- /dev/null
+++ b/dev-qt/assistant-tools/assistant-tools-5.3..ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE=qttools
+
+inherit qt5-build
+
+DESCRIPTION=The Qt toolkit is a comprehensive C++ application development 
framework
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~amd64 ~x86
+fi
+
+IUSE=
+
+DEPEND=
+   =dev-qt/qtcore-${PV}:5[debug=]
+   =dev-qt/qtgui-${PV}:5[debug=]
+   =dev-qt/qthelp-${PV}:5[debug=]
+   =dev-qt/qtwidgets-${PV}:5[debug=]
+
+RDEPEND=${DEPEND}
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/qcollectiongenerator
+   src/assistant/qhelpconverter
+   src/assistant/qhelpgenerator
+)

diff --git a/dev-qt/assistant-tools/assistant-tools-5..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5..ebuild
new file mode 100644
index 000..a9c1d66
--- /dev/null
+++ b/dev-qt/assistant-tools/assistant-tools-5..ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE=qttools
+
+inherit qt5-build
+
+DESCRIPTION=The Qt toolkit is a comprehensive C++ application development 
framework
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~amd64 ~x86
+fi
+
+IUSE=
+
+DEPEND=
+   =dev-qt/qtcore-${PV}:5[debug=]
+   =dev-qt/qtgui-${PV}:5[debug=]
+   =dev-qt/qthelp-${PV}:5[debug=]
+   =dev-qt/qtwidgets-${PV}:5[debug=]
+
+RDEPEND=${DEPEND}
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/qcollectiongenerator
+   src/assistant/qhelpconverter
+   src/assistant/qhelpgenerator
+)

diff --git a/dev-qt/assistant-tools/metadata.xml 
b/dev-qt/assistant-tools/metadata.xml
new file mode 100644
index 000..9d5bff1
--- /dev/null
+++ b/dev-qt/assistant-tools/metadata.xml
@@ -0,0 +1,9 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
+pkgmetadata
+   herdqt/herd
+   upstream
+   bugs-tohttps://bugreports.qt-project.org//bugs-to
+   dochttp://qt-project.org/doc//doc
+   /upstream
+/pkgmetadata

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant-tools/

2014-06-12 Thread Michael Palimaka 
commit: a0363083e776ae682976e12b10e4c1096ed39989
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Jun 12 17:09:42 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Jun 12 17:09:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a0363083

[dev-qt/assistant-tools] Drop untested KEYWORD.

Package-Manager: portage-2.2.10

---
 dev-qt/assistant-tools/assistant-tools-5.3.0.ebuild| 2 +-
 dev-qt/assistant-tools/assistant-tools-5.3..ebuild | 2 +-
 dev-qt/assistant-tools/assistant-tools-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/assistant-tools/assistant-tools-5.3.0.ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.3.0.ebuild
index a9c1d66..ab8a17b 100644
--- a/dev-qt/assistant-tools/assistant-tools-5.3.0.ebuild
+++ b/dev-qt/assistant-tools/assistant-tools-5.3.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION=The Qt toolkit is a comprehensive C++ 
application development frame
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=
 else
-   KEYWORDS=~amd64 ~x86
+   KEYWORDS=~amd64
 fi
 
 IUSE=

diff --git a/dev-qt/assistant-tools/assistant-tools-5.3..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5.3..ebuild
index a9c1d66..ab8a17b 100644
--- a/dev-qt/assistant-tools/assistant-tools-5.3..ebuild
+++ b/dev-qt/assistant-tools/assistant-tools-5.3..ebuild
@@ -13,7 +13,7 @@ DESCRIPTION=The Qt toolkit is a comprehensive C++ 
application development frame
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=
 else
-   KEYWORDS=~amd64 ~x86
+   KEYWORDS=~amd64
 fi
 
 IUSE=

diff --git a/dev-qt/assistant-tools/assistant-tools-5..ebuild 
b/dev-qt/assistant-tools/assistant-tools-5..ebuild
index a9c1d66..ab8a17b 100644
--- a/dev-qt/assistant-tools/assistant-tools-5..ebuild
+++ b/dev-qt/assistant-tools/assistant-tools-5..ebuild
@@ -13,7 +13,7 @@ DESCRIPTION=The Qt toolkit is a comprehensive C++ 
application development frame
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=
 else
-   KEYWORDS=~amd64 ~x86
+   KEYWORDS=~amd64
 fi
 
 IUSE=

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2014-05-15 Thread Michael Palimaka 
commit: de06b6b27147e3c68e34ce0083e535dd21144c1b
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu May 15 16:51:34 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu May 15 16:51:34 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=de06b6b2

[dev-qt/assistant] Add Qt5 version.

Package-Manager: portage-2.2.8-r1

---
 dev-qt/assistant/Manifest  |  1 +
 dev-qt/assistant/assistant-5.3.0_rc.ebuild | 42 ++
 dev-qt/assistant/assistant-5.3..ebuild | 33 +++
 dev-qt/assistant/assistant-5..ebuild   | 33 +++
 4 files changed, 109 insertions(+)

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
new file mode 100644
index 000..6c71c92
--- /dev/null
+++ b/dev-qt/assistant/Manifest
@@ -0,0 +1 @@
+DIST qttools-opensource-src-5.3.0-RC.tar.xz 8988688 SHA256 
4e39e77c589fb6e5d1773e18b8c76f49747bc2ff1b7eb1012ab4f05feb37ede7 SHA512 
cc040c95c2d42758de2e1e3779ff6c9580a27254fe4937f362a575f1526f323359d36b9046857c8083cedc54126fefa798c298ae04c1c1bb0e54e45a2e7038e5
 WHIRLPOOL 
621bdbd5a0c4186cc39ab4b01f441b77865282a0207735b554daa693b4ae44b5870b26f4de4ba7443eba6e7b4ce40037af5f66952962b3c2da867d1933821236

diff --git a/dev-qt/assistant/assistant-5.3.0_rc.ebuild 
b/dev-qt/assistant/assistant-5.3.0_rc.ebuild
new file mode 100644
index 000..ab4edd8
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.3.0_rc.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE=qttools
+
+inherit qt5-build
+
+DESCRIPTION=The Qt toolkit is a comprehensive C++ application development 
framework
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~amd64
+fi
+
+IUSE=webkit
+
+DEPEND=
+   =dev-qt/qtcore-${PV}:5[debug=]
+   =dev-qt/qtgui-${PV}:5[debug=]
+   =dev-qt/qthelp-${PV}:5[debug=]
+   =dev-qt/qtnetwork-${PV}:5[debug=]
+   =dev-qt/qtprintsupport-${PV}:5[debug=]
+   =dev-qt/qtsql-${PV}:5[debug=,sqlite]
+   =dev-qt/qtwidgets-${PV}:5[debug=]
+   webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+
+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
+}

diff --git a/dev-qt/assistant/assistant-5.3..ebuild 
b/dev-qt/assistant/assistant-5.3..ebuild
new file mode 100644
index 000..3228701
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.3..ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE=qttools
+
+inherit qt5-build
+
+DESCRIPTION=The Qt toolkit is a comprehensive C++ application development 
framework
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~amd64
+fi
+
+IUSE=
+
+DEPEND=
+   =dev-qt/qtcore-${PV}:5[debug=]
+   =dev-qt/qtgui-${PV}:5[debug=]
+   =dev-qt/qtnetwork-${PV}:5[debug=]
+   =dev-qt/qtsql-${PV}:5[debug=]
+   =dev-qt/qtwidgets-${PV}:5[debug=]
+
+RDEPEND=${DEPEND}
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/clucene
+   src/assistant/help
+)

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
new file mode 100644
index 000..3228701
--- /dev/null
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE=qttools
+
+inherit qt5-build
+
+DESCRIPTION=The Qt toolkit is a comprehensive C++ application development 
framework
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~amd64
+fi
+
+IUSE=
+
+DEPEND=
+   =dev-qt/qtcore-${PV}:5[debug=]
+   =dev-qt/qtgui-${PV}:5[debug=]
+   =dev-qt/qtnetwork-${PV}:5[debug=]
+   =dev-qt/qtsql-${PV}:5[debug=]
+   =dev-qt/qtwidgets-${PV}:5[debug=]
+
+RDEPEND=${DEPEND}
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/clucene
+   src/assistant/help
+)

[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2014-05-15 Thread Michael Palimaka 
commit: e76060d3f4b0de10da6bb2f6345b4bea6961c850
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu May 15 17:06:56 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu May 15 17:06:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e76060d3

[dev-qt/assistant] Use correct live ebuilds.

Package-Manager: portage-2.2.8-r1

---
 dev-qt/assistant/assistant-5.3..ebuild | 17 +
 dev-qt/assistant/assistant-5..ebuild   | 17 +
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.3..ebuild 
b/dev-qt/assistant/assistant-5.3..ebuild
index 3228701..ab4edd8 100644
--- a/dev-qt/assistant/assistant-5.3..ebuild
+++ b/dev-qt/assistant/assistant-5.3..ebuild
@@ -16,18 +16,27 @@ else
KEYWORDS=~amd64
 fi
 
-IUSE=
+IUSE=webkit
 
 DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
=dev-qt/qtgui-${PV}:5[debug=]
+   =dev-qt/qthelp-${PV}:5[debug=]
=dev-qt/qtnetwork-${PV}:5[debug=]
-   =dev-qt/qtsql-${PV}:5[debug=]
+   =dev-qt/qtprintsupport-${PV}:5[debug=]
+   =dev-qt/qtsql-${PV}:5[debug=,sqlite]
=dev-qt/qtwidgets-${PV}:5[debug=]
+   webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
 
 RDEPEND=${DEPEND}
 
 QT5_TARGET_SUBDIRS=(
-   src/assistant/clucene
-   src/assistant/help
+   src/assistant/assistant
 )
+
+src_prepare() {
+   qt_use_disable_mod webkit webkitwidgets \
+   src/assistant/assistant/assistant.pro
+
+   qt5-build_src_prepare
+}

diff --git a/dev-qt/assistant/assistant-5..ebuild 
b/dev-qt/assistant/assistant-5..ebuild
index 3228701..ab4edd8 100644
--- a/dev-qt/assistant/assistant-5..ebuild
+++ b/dev-qt/assistant/assistant-5..ebuild
@@ -16,18 +16,27 @@ else
KEYWORDS=~amd64
 fi
 
-IUSE=
+IUSE=webkit
 
 DEPEND=
=dev-qt/qtcore-${PV}:5[debug=]
=dev-qt/qtgui-${PV}:5[debug=]
+   =dev-qt/qthelp-${PV}:5[debug=]
=dev-qt/qtnetwork-${PV}:5[debug=]
-   =dev-qt/qtsql-${PV}:5[debug=]
+   =dev-qt/qtprintsupport-${PV}:5[debug=]
+   =dev-qt/qtsql-${PV}:5[debug=,sqlite]
=dev-qt/qtwidgets-${PV}:5[debug=]
+   webkit? ( =dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
 
 RDEPEND=${DEPEND}
 
 QT5_TARGET_SUBDIRS=(
-   src/assistant/clucene
-   src/assistant/help
+   src/assistant/assistant
 )
+
+src_prepare() {
+   qt_use_disable_mod webkit webkitwidgets \
+   src/assistant/assistant/assistant.pro
+
+   qt5-build_src_prepare
+}