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

[Michael Palimaka]

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