| 1 |
commit: 9c2f86b48a6f51fb14f3cfa3ba6e542fb180b426 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 24 15:09:53 2014 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 24 15:09:53 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9c2f86b4 |
| 7 |
|
| 8 |
[dev-qt/designer] Introduce declarative USE flag to avoid automagic dependency. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-qt/designer/designer-5.3.9999.ebuild | 6 +++++- |
| 14 |
dev-qt/designer/designer-5.4.0_alpha.ebuild | 6 +++++- |
| 15 |
dev-qt/designer/designer-5.4.9999.ebuild | 6 +++++- |
| 16 |
dev-qt/designer/designer-5.9999.ebuild | 6 +++++- |
| 17 |
4 files changed, 20 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-qt/designer/designer-5.3.9999.ebuild b/dev-qt/designer/designer-5.3.9999.ebuild |
| 20 |
index 02fbb0e..1355ae4 100644 |
| 21 |
--- a/dev-qt/designer/designer-5.3.9999.ebuild |
| 22 |
+++ b/dev-qt/designer/designer-5.3.9999.ebuild |
| 23 |
@@ -16,7 +16,7 @@ else |
| 24 |
KEYWORDS="~amd64 ~x86" |
| 25 |
fi |
| 26 |
|
| 27 |
-IUSE="webkit" |
| 28 |
+IUSE="declarative webkit" |
| 29 |
|
| 30 |
DEPEND=" |
| 31 |
>=dev-qt/qtcore-${PV}:5[debug=] |
| 32 |
@@ -25,6 +25,7 @@ DEPEND=" |
| 33 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 34 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 35 |
>=dev-qt/qtxml-${PV}:5[debug=] |
| 36 |
+ declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] ) |
| 37 |
webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 38 |
" |
| 39 |
RDEPEND="${DEPEND}" |
| 40 |
@@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=( |
| 41 |
) |
| 42 |
|
| 43 |
src_prepare() { |
| 44 |
+ qt_use_disable_mod declarative quickwidgets \ |
| 45 |
+ src/designer/src/plugins/plugins.pro |
| 46 |
+ |
| 47 |
qt_use_disable_mod webkit webkitwidgets \ |
| 48 |
src/designer/src/plugins/plugins.pro |
| 49 |
|
| 50 |
|
| 51 |
diff --git a/dev-qt/designer/designer-5.4.0_alpha.ebuild b/dev-qt/designer/designer-5.4.0_alpha.ebuild |
| 52 |
index 02fbb0e..1355ae4 100644 |
| 53 |
--- a/dev-qt/designer/designer-5.4.0_alpha.ebuild |
| 54 |
+++ b/dev-qt/designer/designer-5.4.0_alpha.ebuild |
| 55 |
@@ -16,7 +16,7 @@ else |
| 56 |
KEYWORDS="~amd64 ~x86" |
| 57 |
fi |
| 58 |
|
| 59 |
-IUSE="webkit" |
| 60 |
+IUSE="declarative webkit" |
| 61 |
|
| 62 |
DEPEND=" |
| 63 |
>=dev-qt/qtcore-${PV}:5[debug=] |
| 64 |
@@ -25,6 +25,7 @@ DEPEND=" |
| 65 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 66 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 67 |
>=dev-qt/qtxml-${PV}:5[debug=] |
| 68 |
+ declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] ) |
| 69 |
webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 70 |
" |
| 71 |
RDEPEND="${DEPEND}" |
| 72 |
@@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=( |
| 73 |
) |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
+ qt_use_disable_mod declarative quickwidgets \ |
| 77 |
+ src/designer/src/plugins/plugins.pro |
| 78 |
+ |
| 79 |
qt_use_disable_mod webkit webkitwidgets \ |
| 80 |
src/designer/src/plugins/plugins.pro |
| 81 |
|
| 82 |
|
| 83 |
diff --git a/dev-qt/designer/designer-5.4.9999.ebuild b/dev-qt/designer/designer-5.4.9999.ebuild |
| 84 |
index 02fbb0e..1355ae4 100644 |
| 85 |
--- a/dev-qt/designer/designer-5.4.9999.ebuild |
| 86 |
+++ b/dev-qt/designer/designer-5.4.9999.ebuild |
| 87 |
@@ -16,7 +16,7 @@ else |
| 88 |
KEYWORDS="~amd64 ~x86" |
| 89 |
fi |
| 90 |
|
| 91 |
-IUSE="webkit" |
| 92 |
+IUSE="declarative webkit" |
| 93 |
|
| 94 |
DEPEND=" |
| 95 |
>=dev-qt/qtcore-${PV}:5[debug=] |
| 96 |
@@ -25,6 +25,7 @@ DEPEND=" |
| 97 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 98 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 99 |
>=dev-qt/qtxml-${PV}:5[debug=] |
| 100 |
+ declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] ) |
| 101 |
webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 102 |
" |
| 103 |
RDEPEND="${DEPEND}" |
| 104 |
@@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=( |
| 105 |
) |
| 106 |
|
| 107 |
src_prepare() { |
| 108 |
+ qt_use_disable_mod declarative quickwidgets \ |
| 109 |
+ src/designer/src/plugins/plugins.pro |
| 110 |
+ |
| 111 |
qt_use_disable_mod webkit webkitwidgets \ |
| 112 |
src/designer/src/plugins/plugins.pro |
| 113 |
|
| 114 |
|
| 115 |
diff --git a/dev-qt/designer/designer-5.9999.ebuild b/dev-qt/designer/designer-5.9999.ebuild |
| 116 |
index 02fbb0e..1355ae4 100644 |
| 117 |
--- a/dev-qt/designer/designer-5.9999.ebuild |
| 118 |
+++ b/dev-qt/designer/designer-5.9999.ebuild |
| 119 |
@@ -16,7 +16,7 @@ else |
| 120 |
KEYWORDS="~amd64 ~x86" |
| 121 |
fi |
| 122 |
|
| 123 |
-IUSE="webkit" |
| 124 |
+IUSE="declarative webkit" |
| 125 |
|
| 126 |
DEPEND=" |
| 127 |
>=dev-qt/qtcore-${PV}:5[debug=] |
| 128 |
@@ -25,6 +25,7 @@ DEPEND=" |
| 129 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 130 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 131 |
>=dev-qt/qtxml-${PV}:5[debug=] |
| 132 |
+ declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] ) |
| 133 |
webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 134 |
" |
| 135 |
RDEPEND="${DEPEND}" |
| 136 |
@@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=( |
| 137 |
) |
| 138 |
|
| 139 |
src_prepare() { |
| 140 |
+ qt_use_disable_mod declarative quickwidgets \ |
| 141 |
+ src/designer/src/plugins/plugins.pro |
| 142 |
+ |
| 143 |
qt_use_disable_mod webkit webkitwidgets \ |
| 144 |
src/designer/src/plugins/plugins.pro |
Archives