From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/designer/
Date: Wed, 24 Sep 2014 15:10:11 +0000 (UTC) [thread overview]
Message-ID: <1411571393.9c2f86b48a6f51fb14f3cfa3ba6e542fb180b426.kensington@gentoo> (raw)
commit: 9c2f86b48a6f51fb14f3cfa3ba6e542fb180b426
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 24 15:09:53 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 24 15:09:53 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9c2f86b4
[dev-qt/designer] Introduce declarative USE flag to avoid automagic dependency.
Package-Manager: portage-2.2.10
---
dev-qt/designer/designer-5.3.9999.ebuild | 6 +++++-
dev-qt/designer/designer-5.4.0_alpha.ebuild | 6 +++++-
dev-qt/designer/designer-5.4.9999.ebuild | 6 +++++-
dev-qt/designer/designer-5.9999.ebuild | 6 +++++-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/dev-qt/designer/designer-5.3.9999.ebuild b/dev-qt/designer/designer-5.3.9999.ebuild
index 02fbb0e..1355ae4 100644
--- a/dev-qt/designer/designer-5.3.9999.ebuild
+++ b/dev-qt/designer/designer-5.3.9999.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="webkit"
+IUSE="declarative webkit"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
@@ -25,6 +25,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
>=dev-qt/qtxml-${PV}:5[debug=]
+ declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] )
webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
@@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=(
)
src_prepare() {
+ qt_use_disable_mod declarative quickwidgets \
+ src/designer/src/plugins/plugins.pro
+
qt_use_disable_mod webkit webkitwidgets \
src/designer/src/plugins/plugins.pro
diff --git a/dev-qt/designer/designer-5.4.0_alpha.ebuild b/dev-qt/designer/designer-5.4.0_alpha.ebuild
index 02fbb0e..1355ae4 100644
--- a/dev-qt/designer/designer-5.4.0_alpha.ebuild
+++ b/dev-qt/designer/designer-5.4.0_alpha.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="webkit"
+IUSE="declarative webkit"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
@@ -25,6 +25,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
>=dev-qt/qtxml-${PV}:5[debug=]
+ declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] )
webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
@@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=(
)
src_prepare() {
+ qt_use_disable_mod declarative quickwidgets \
+ src/designer/src/plugins/plugins.pro
+
qt_use_disable_mod webkit webkitwidgets \
src/designer/src/plugins/plugins.pro
diff --git a/dev-qt/designer/designer-5.4.9999.ebuild b/dev-qt/designer/designer-5.4.9999.ebuild
index 02fbb0e..1355ae4 100644
--- a/dev-qt/designer/designer-5.4.9999.ebuild
+++ b/dev-qt/designer/designer-5.4.9999.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="webkit"
+IUSE="declarative webkit"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
@@ -25,6 +25,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
>=dev-qt/qtxml-${PV}:5[debug=]
+ declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] )
webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
@@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=(
)
src_prepare() {
+ qt_use_disable_mod declarative quickwidgets \
+ src/designer/src/plugins/plugins.pro
+
qt_use_disable_mod webkit webkitwidgets \
src/designer/src/plugins/plugins.pro
diff --git a/dev-qt/designer/designer-5.9999.ebuild b/dev-qt/designer/designer-5.9999.ebuild
index 02fbb0e..1355ae4 100644
--- a/dev-qt/designer/designer-5.9999.ebuild
+++ b/dev-qt/designer/designer-5.9999.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="webkit"
+IUSE="declarative webkit"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
@@ -25,6 +25,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
>=dev-qt/qtxml-${PV}:5[debug=]
+ declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] )
webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
@@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=(
)
src_prepare() {
+ qt_use_disable_mod declarative quickwidgets \
+ src/designer/src/plugins/plugins.pro
+
qt_use_disable_mod webkit webkitwidgets \
src/designer/src/plugins/plugins.pro
next reply other threads:[~2014-09-24 15:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 15:10 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-08 9:29 [gentoo-commits] proj/qt:master commit in: dev-qt/designer/ Andreas Sturmlechner
2022-03-21 10:06 Andreas Sturmlechner
2021-09-15 20:33 Davide Pesavento
2020-11-22 22:56 Andreas Sturmlechner
2019-01-07 19:19 Davide Pesavento
2017-12-25 8:57 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
2015-03-17 14:17 Michael Palimaka
2015-03-16 16:44 Michael Palimaka
2014-07-10 19:18 Davide Pesavento
2013-07-09 10:15 Davide Pesavento
2013-05-27 6:08 Davide Pesavento
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=1411571393.9c2f86b48a6f51fb14f3cfa3ba6e542fb180b426.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