public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
Date: Thu, 15 May 2014 17:07:25 +0000 (UTC)	[thread overview]
Message-ID: <1400173616.e76060d3f4b0de10da6bb2f6345b4bea6961c850.kensington@gentoo> (raw)

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
+}


             reply	other threads:[~2014-05-15 17:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-15 17:07 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-03-21 10:06 [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/ Andreas Sturmlechner
2021-09-15 20:33 Davide Pesavento
2020-11-22 22:56 Andreas Sturmlechner
2017-12-25  7:56 Michael Palimaka
2017-12-25  7:49 Michael Palimaka
2017-12-25  2:42 Michael Palimaka
2017-10-07 18:08 Davide Pesavento
2016-04-09 16:11 Davide Pesavento
2016-02-10 13:26 Michael Palimaka
2016-01-06 13:49 Michael Palimaka
2014-05-15 16:52 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1400173616.e76060d3f4b0de10da6bb2f6345b4bea6961c850.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox