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

[Michael Palimaka]

commit:     e76060d3f4b0de10da6bb2f6345b4bea6961c850
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 17:06:56 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 15 17:06:56 2014 +0000
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.9999.ebuild | 17 +++++++++++++----
 dev-qt/assistant/assistant-5.9999.ebuild   | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.3.9999.ebuild 
b/dev-qt/assistant/assistant-5.3.9999.ebuild
index 3228701..ab4edd8 100644
--- a/dev-qt/assistant/assistant-5.3.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.3.9999.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.9999.ebuild 
b/dev-qt/assistant/assistant-5.9999.ebuild
index 3228701..ab4edd8 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.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
+}