| 1 |
commit: d676566215e2c43fe6d9570b6a2e0b32df4dc72d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 27 22:11:25 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 28 21:41:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d6765662 |
| 7 |
|
| 8 |
dev-qt: Use qt5_tools_configure where possible |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-qt/designer/designer-5.15.0_beta4.ebuild | 14 -------------- |
| 13 |
dev-qt/designer/designer-5.15.9999.ebuild | 14 -------------- |
| 14 |
dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild | 14 -------------- |
| 15 |
dev-qt/pixeltool/pixeltool-5.15.9999.ebuild | 14 -------------- |
| 16 |
dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild | 13 ------------- |
| 17 |
dev-qt/qdoc/qdoc-5.15.9999.ebuild | 13 ------------- |
| 18 |
dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild | 14 -------------- |
| 19 |
dev-qt/qtdiag/qtdiag-5.15.9999.ebuild | 14 -------------- |
| 20 |
dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild | 14 -------------- |
| 21 |
dev-qt/qtpaths/qtpaths-5.15.9999.ebuild | 16 +--------------- |
| 22 |
dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild | 14 -------------- |
| 23 |
dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild | 16 +--------------- |
| 24 |
12 files changed, 2 insertions(+), 168 deletions(-) |
| 25 |
|
| 26 |
diff --git a/dev-qt/designer/designer-5.15.0_beta4.ebuild b/dev-qt/designer/designer-5.15.0_beta4.ebuild |
| 27 |
index a8446a05..bd0d9546 100644 |
| 28 |
--- a/dev-qt/designer/designer-5.15.0_beta4.ebuild |
| 29 |
+++ b/dev-qt/designer/designer-5.15.0_beta4.ebuild |
| 30 |
@@ -25,10 +25,6 @@ DEPEND=" |
| 31 |
" |
| 32 |
RDEPEND="${DEPEND}" |
| 33 |
|
| 34 |
-QT5_TARGET_SUBDIRS=( |
| 35 |
- src/designer |
| 36 |
-) |
| 37 |
- |
| 38 |
src_prepare() { |
| 39 |
qt_use_disable_mod declarative quickwidgets \ |
| 40 |
src/designer/src/plugins/plugins.pro |
| 41 |
@@ -39,16 +35,6 @@ src_prepare() { |
| 42 |
qt5-build_src_prepare |
| 43 |
} |
| 44 |
|
| 45 |
-src_configure() { |
| 46 |
- # Most of qttools require files that are only generated when qmake is |
| 47 |
- # run in the root directory. |
| 48 |
- # Related bugs: 633776, 676948, and 716514. |
| 49 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 50 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 51 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 52 |
- qt5-build_src_configure |
| 53 |
-} |
| 54 |
- |
| 55 |
src_install() { |
| 56 |
qt5-build_src_install |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/dev-qt/designer/designer-5.15.9999.ebuild b/dev-qt/designer/designer-5.15.9999.ebuild |
| 60 |
index a8446a05..bd0d9546 100644 |
| 61 |
--- a/dev-qt/designer/designer-5.15.9999.ebuild |
| 62 |
+++ b/dev-qt/designer/designer-5.15.9999.ebuild |
| 63 |
@@ -25,10 +25,6 @@ DEPEND=" |
| 64 |
" |
| 65 |
RDEPEND="${DEPEND}" |
| 66 |
|
| 67 |
-QT5_TARGET_SUBDIRS=( |
| 68 |
- src/designer |
| 69 |
-) |
| 70 |
- |
| 71 |
src_prepare() { |
| 72 |
qt_use_disable_mod declarative quickwidgets \ |
| 73 |
src/designer/src/plugins/plugins.pro |
| 74 |
@@ -39,16 +35,6 @@ src_prepare() { |
| 75 |
qt5-build_src_prepare |
| 76 |
} |
| 77 |
|
| 78 |
-src_configure() { |
| 79 |
- # Most of qttools require files that are only generated when qmake is |
| 80 |
- # run in the root directory. |
| 81 |
- # Related bugs: 633776, 676948, and 716514. |
| 82 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 83 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 84 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 85 |
- qt5-build_src_configure |
| 86 |
-} |
| 87 |
- |
| 88 |
src_install() { |
| 89 |
qt5-build_src_install |
| 90 |
|
| 91 |
|
| 92 |
diff --git a/dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild b/dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild |
| 93 |
index 6e644ada..e3a011cf 100644 |
| 94 |
--- a/dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild |
| 95 |
+++ b/dev-qt/pixeltool/pixeltool-5.15.0_beta4.ebuild |
| 96 |
@@ -19,17 +19,3 @@ DEPEND=" |
| 97 |
~dev-qt/qtwidgets-${PV} |
| 98 |
" |
| 99 |
RDEPEND="${DEPEND}" |
| 100 |
- |
| 101 |
-QT5_TARGET_SUBDIRS=( |
| 102 |
- src/pixeltool |
| 103 |
-) |
| 104 |
- |
| 105 |
-src_configure() { |
| 106 |
- # Most of qttools require files that are only generated when qmake is |
| 107 |
- # run in the root directory. |
| 108 |
- # Related bugs: 633776, 676948, and 716514. |
| 109 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 110 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 111 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 112 |
- qt5-build_src_configure |
| 113 |
-} |
| 114 |
|
| 115 |
diff --git a/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild b/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild |
| 116 |
index 6e644ada..e3a011cf 100644 |
| 117 |
--- a/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild |
| 118 |
+++ b/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild |
| 119 |
@@ -19,17 +19,3 @@ DEPEND=" |
| 120 |
~dev-qt/qtwidgets-${PV} |
| 121 |
" |
| 122 |
RDEPEND="${DEPEND}" |
| 123 |
- |
| 124 |
-QT5_TARGET_SUBDIRS=( |
| 125 |
- src/pixeltool |
| 126 |
-) |
| 127 |
- |
| 128 |
-src_configure() { |
| 129 |
- # Most of qttools require files that are only generated when qmake is |
| 130 |
- # run in the root directory. |
| 131 |
- # Related bugs: 633776, 676948, and 716514. |
| 132 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 133 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 134 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 135 |
- qt5-build_src_configure |
| 136 |
-} |
| 137 |
|
| 138 |
diff --git a/dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild b/dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild |
| 139 |
index dddcd583..9052d517 100644 |
| 140 |
--- a/dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild |
| 141 |
+++ b/dev-qt/qdoc/qdoc-5.15.0_beta4.ebuild |
| 142 |
@@ -20,22 +20,9 @@ DEPEND=" |
| 143 |
" |
| 144 |
RDEPEND="${DEPEND}" |
| 145 |
|
| 146 |
-QT5_TARGET_SUBDIRS=( |
| 147 |
- src/qdoc |
| 148 |
-) |
| 149 |
- |
| 150 |
src_prepare() { |
| 151 |
qt_use_disable_mod qml qmldevtools-private \ |
| 152 |
src/qdoc/qdoc.pro |
| 153 |
|
| 154 |
qt5-build_src_prepare |
| 155 |
} |
| 156 |
- |
| 157 |
-src_configure() { |
| 158 |
- # src/qdoc requires files that are only generated when qmake is |
| 159 |
- # run in the root directory. bug 676948; same fix as bug 633776 |
| 160 |
- mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die |
| 161 |
- qt5_qmake "${QT5_BUILD_DIR}" |
| 162 |
- cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die |
| 163 |
- qt5-build_src_configure |
| 164 |
-} |
| 165 |
|
| 166 |
diff --git a/dev-qt/qdoc/qdoc-5.15.9999.ebuild b/dev-qt/qdoc/qdoc-5.15.9999.ebuild |
| 167 |
index dddcd583..9052d517 100644 |
| 168 |
--- a/dev-qt/qdoc/qdoc-5.15.9999.ebuild |
| 169 |
+++ b/dev-qt/qdoc/qdoc-5.15.9999.ebuild |
| 170 |
@@ -20,22 +20,9 @@ DEPEND=" |
| 171 |
" |
| 172 |
RDEPEND="${DEPEND}" |
| 173 |
|
| 174 |
-QT5_TARGET_SUBDIRS=( |
| 175 |
- src/qdoc |
| 176 |
-) |
| 177 |
- |
| 178 |
src_prepare() { |
| 179 |
qt_use_disable_mod qml qmldevtools-private \ |
| 180 |
src/qdoc/qdoc.pro |
| 181 |
|
| 182 |
qt5-build_src_prepare |
| 183 |
} |
| 184 |
- |
| 185 |
-src_configure() { |
| 186 |
- # src/qdoc requires files that are only generated when qmake is |
| 187 |
- # run in the root directory. bug 676948; same fix as bug 633776 |
| 188 |
- mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die |
| 189 |
- qt5_qmake "${QT5_BUILD_DIR}" |
| 190 |
- cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die |
| 191 |
- qt5-build_src_configure |
| 192 |
-} |
| 193 |
|
| 194 |
diff --git a/dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild b/dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild |
| 195 |
index 94e64960..c6a3b3f5 100644 |
| 196 |
--- a/dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild |
| 197 |
+++ b/dev-qt/qtdiag/qtdiag-5.15.0_beta4.ebuild |
| 198 |
@@ -21,10 +21,6 @@ DEPEND=" |
| 199 |
" |
| 200 |
RDEPEND="${DEPEND}" |
| 201 |
|
| 202 |
-QT5_TARGET_SUBDIRS=( |
| 203 |
- src/qtdiag |
| 204 |
-) |
| 205 |
- |
| 206 |
src_prepare() { |
| 207 |
qt_use_disable_mod network network \ |
| 208 |
src/qtdiag/qtdiag.pro |
| 209 |
@@ -34,13 +30,3 @@ src_prepare() { |
| 210 |
|
| 211 |
qt5-build_src_prepare |
| 212 |
} |
| 213 |
- |
| 214 |
-src_configure() { |
| 215 |
- # Most of qttools require files that are only generated when qmake is |
| 216 |
- # run in the root directory. |
| 217 |
- # Related bugs: 633776, 676948, and 716514. |
| 218 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 219 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 220 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 221 |
- qt5-build_src_configure |
| 222 |
-} |
| 223 |
|
| 224 |
diff --git a/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild |
| 225 |
index 94e64960..c6a3b3f5 100644 |
| 226 |
--- a/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild |
| 227 |
+++ b/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild |
| 228 |
@@ -21,10 +21,6 @@ DEPEND=" |
| 229 |
" |
| 230 |
RDEPEND="${DEPEND}" |
| 231 |
|
| 232 |
-QT5_TARGET_SUBDIRS=( |
| 233 |
- src/qtdiag |
| 234 |
-) |
| 235 |
- |
| 236 |
src_prepare() { |
| 237 |
qt_use_disable_mod network network \ |
| 238 |
src/qtdiag/qtdiag.pro |
| 239 |
@@ -34,13 +30,3 @@ src_prepare() { |
| 240 |
|
| 241 |
qt5-build_src_prepare |
| 242 |
} |
| 243 |
- |
| 244 |
-src_configure() { |
| 245 |
- # Most of qttools require files that are only generated when qmake is |
| 246 |
- # run in the root directory. |
| 247 |
- # Related bugs: 633776, 676948, and 716514. |
| 248 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 249 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 250 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 251 |
- qt5-build_src_configure |
| 252 |
-} |
| 253 |
|
| 254 |
diff --git a/dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild b/dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild |
| 255 |
index 6999dd88..c221a484 100644 |
| 256 |
--- a/dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild |
| 257 |
+++ b/dev-qt/qtpaths/qtpaths-5.15.0_beta4.ebuild |
| 258 |
@@ -17,17 +17,3 @@ DEPEND=" |
| 259 |
~dev-qt/qtcore-${PV} |
| 260 |
" |
| 261 |
RDEPEND="${DEPEND}" |
| 262 |
- |
| 263 |
-QT5_TARGET_SUBDIRS=( |
| 264 |
- src/qtpaths |
| 265 |
-) |
| 266 |
- |
| 267 |
-src_configure() { |
| 268 |
- # Most of qttools require files that are only generated when qmake is |
| 269 |
- # run in the root directory. |
| 270 |
- # Related bugs: 633776, 676948, and 716514. |
| 271 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 272 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 273 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 274 |
- qt5-build_src_configure |
| 275 |
-} |
| 276 |
|
| 277 |
diff --git a/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild b/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild |
| 278 |
index 7cbdff0f..c221a484 100644 |
| 279 |
--- a/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild |
| 280 |
+++ b/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild |
| 281 |
@@ -1,4 +1,4 @@ |
| 282 |
-# Copyright 1999-2019 Gentoo Authors |
| 283 |
+# Copyright 1999-2020 Gentoo Authors |
| 284 |
# Distributed under the terms of the GNU General Public License v2 |
| 285 |
|
| 286 |
EAPI=7 |
| 287 |
@@ -17,17 +17,3 @@ DEPEND=" |
| 288 |
~dev-qt/qtcore-${PV} |
| 289 |
" |
| 290 |
RDEPEND="${DEPEND}" |
| 291 |
- |
| 292 |
-QT5_TARGET_SUBDIRS=( |
| 293 |
- src/qtpaths |
| 294 |
-) |
| 295 |
- |
| 296 |
-src_configure() { |
| 297 |
- # Most of qttools require files that are only generated when qmake is |
| 298 |
- # run in the root directory. |
| 299 |
- # Related bugs: 633776, 676948, and 716514. |
| 300 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 301 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 302 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 303 |
- qt5-build_src_configure |
| 304 |
-} |
| 305 |
|
| 306 |
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild |
| 307 |
index 44e33e18..30824146 100644 |
| 308 |
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild |
| 309 |
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta4.ebuild |
| 310 |
@@ -17,17 +17,3 @@ DEPEND=" |
| 311 |
~dev-qt/qtcore-${PV} |
| 312 |
" |
| 313 |
RDEPEND="${DEPEND}" |
| 314 |
- |
| 315 |
-QT5_TARGET_SUBDIRS=( |
| 316 |
- src/qtplugininfo |
| 317 |
-) |
| 318 |
- |
| 319 |
-src_configure() { |
| 320 |
- # Most of qttools require files that are only generated when qmake is |
| 321 |
- # run in the root directory. |
| 322 |
- # Related bugs: 633776, 676948, and 716514. |
| 323 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 324 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 325 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 326 |
- qt5-build_src_configure |
| 327 |
-} |
| 328 |
|
| 329 |
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild |
| 330 |
index 2e2bcc16..30824146 100644 |
| 331 |
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild |
| 332 |
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild |
| 333 |
@@ -1,4 +1,4 @@ |
| 334 |
-# Copyright 1999-2019 Gentoo Authors |
| 335 |
+# Copyright 1999-2020 Gentoo Authors |
| 336 |
# Distributed under the terms of the GNU General Public License v2 |
| 337 |
|
| 338 |
EAPI=7 |
| 339 |
@@ -17,17 +17,3 @@ DEPEND=" |
| 340 |
~dev-qt/qtcore-${PV} |
| 341 |
" |
| 342 |
RDEPEND="${DEPEND}" |
| 343 |
- |
| 344 |
-QT5_TARGET_SUBDIRS=( |
| 345 |
- src/qtplugininfo |
| 346 |
-) |
| 347 |
- |
| 348 |
-src_configure() { |
| 349 |
- # Most of qttools require files that are only generated when qmake is |
| 350 |
- # run in the root directory. |
| 351 |
- # Related bugs: 633776, 676948, and 716514. |
| 352 |
- mkdir -p "${QT5_BUILD_DIR}" || die |
| 353 |
- qt5_qmake "${QT_BUILD_DIR}" |
| 354 |
- cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die |
| 355 |
- qt5-build_src_configure |
| 356 |
-} |
Archives