| 1 |
commit: 9e0663d66b2878e295170852722b2dbfb112cb26 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 8 19:08:05 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 8 19:08:05 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9e0663d6 |
| 7 |
|
| 8 |
[Qt4] Refactor phase functions so that ebuilds can override multilib_src_* |
| 9 |
|
| 10 |
--- |
| 11 |
dev-qt/assistant/assistant-4.8.6.ebuild | 14 ++--- |
| 12 |
dev-qt/assistant/assistant-4.8.9999.ebuild | 14 ++--- |
| 13 |
dev-qt/designer/designer-4.8.6.ebuild | 14 ++--- |
| 14 |
dev-qt/designer/designer-4.8.9999.ebuild | 14 ++--- |
| 15 |
dev-qt/linguist/linguist-4.8.6.ebuild | 14 ++--- |
| 16 |
dev-qt/linguist/linguist-4.8.9999.ebuild | 14 ++--- |
| 17 |
dev-qt/pixeltool/pixeltool-4.8.6.ebuild | 10 ++-- |
| 18 |
dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 10 ++-- |
| 19 |
dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild | 14 ++--- |
| 20 |
dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 14 ++--- |
| 21 |
dev-qt/qt3support/qt3support-4.8.6.ebuild | 10 ++-- |
| 22 |
dev-qt/qt3support/qt3support-4.8.9999.ebuild | 10 ++-- |
| 23 |
dev-qt/qtbearer/qtbearer-4.8.6.ebuild | 10 ++-- |
| 24 |
dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 10 ++-- |
| 25 |
dev-qt/qtcore/qtcore-4.8.6.ebuild | 14 ++--- |
| 26 |
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 14 ++--- |
| 27 |
dev-qt/qtdbus/qtdbus-4.8.6.ebuild | 9 ++-- |
| 28 |
dev-qt/qtdbus/qtdbus-4.8.9999.ebuild | 9 ++-- |
| 29 |
dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild | 9 ++-- |
| 30 |
dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 9 ++-- |
| 31 |
dev-qt/qtdemo/qtdemo-4.8.6.ebuild | 16 +++--- |
| 32 |
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 16 +++--- |
| 33 |
dev-qt/qtgui/qtgui-4.8.6.ebuild | 19 +++---- |
| 34 |
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 19 +++---- |
| 35 |
dev-qt/qthelp/qthelp-4.8.6.ebuild | 22 ++++---- |
| 36 |
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 22 ++++---- |
| 37 |
dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild | 10 ++-- |
| 38 |
dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild | 10 ++-- |
| 39 |
dev-qt/qtopengl/qtopengl-4.8.6.ebuild | 15 +++--- |
| 40 |
dev-qt/qtopengl/qtopengl-4.8.9999.ebuild | 15 +++--- |
| 41 |
dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild | 15 +++--- |
| 42 |
dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild | 15 +++--- |
| 43 |
dev-qt/qtphonon/qtphonon-4.8.6.ebuild | 13 ++--- |
| 44 |
dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 13 ++--- |
| 45 |
dev-qt/qtscript/qtscript-4.8.6.ebuild | 10 ++-- |
| 46 |
dev-qt/qtscript/qtscript-4.8.9999.ebuild | 10 ++-- |
| 47 |
dev-qt/qtsql/qtsql-4.8.6.ebuild | 10 ++-- |
| 48 |
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 10 ++-- |
| 49 |
dev-qt/qtsvg/qtsvg-4.8.6.ebuild | 10 ++-- |
| 50 |
dev-qt/qtsvg/qtsvg-4.8.9999.ebuild | 10 ++-- |
| 51 |
dev-qt/qttest/qttest-4.8.6.ebuild | 10 ++-- |
| 52 |
dev-qt/qttest/qttest-4.8.9999.ebuild | 10 ++-- |
| 53 |
dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild | 10 ++-- |
| 54 |
dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 10 ++-- |
| 55 |
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild | 9 ++-- |
| 56 |
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild | 9 ++-- |
| 57 |
eclass/qt4-build-multilib.eclass | 63 +++++++--------------- |
| 58 |
47 files changed, 305 insertions(+), 332 deletions(-) |
| 59 |
|
| 60 |
diff --git a/dev-qt/assistant/assistant-4.8.6.ebuild b/dev-qt/assistant/assistant-4.8.6.ebuild |
| 61 |
index 60846fa..0c9c6a2 100644 |
| 62 |
--- a/dev-qt/assistant/assistant-4.8.6.ebuild |
| 63 |
+++ b/dev-qt/assistant/assistant-4.8.6.ebuild |
| 64 |
@@ -38,19 +38,19 @@ src_prepare() { |
| 65 |
qt4-build-multilib_src_prepare |
| 66 |
} |
| 67 |
|
| 68 |
-src_configure() { |
| 69 |
- myconf+=" |
| 70 |
+multilib_src_configure() { |
| 71 |
+ local myconf=( |
| 72 |
-system-libpng -system-libjpeg -system-zlib |
| 73 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc |
| 74 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 75 |
-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns |
| 76 |
- $(qt_use webkit)" |
| 77 |
- |
| 78 |
- qt4-build-multilib_src_configure |
| 79 |
+ $(qt_use webkit) |
| 80 |
+ ) |
| 81 |
+ qt4_multilib_src_configure |
| 82 |
} |
| 83 |
|
| 84 |
-src_install() { |
| 85 |
- qt4-build-multilib_src_install |
| 86 |
+multilib_src_install_all() { |
| 87 |
+ qt4_multilib_src_install_all |
| 88 |
|
| 89 |
doicon tools/assistant/tools/assistant/images/assistant.png |
| 90 |
make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation' |
| 91 |
|
| 92 |
diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild b/dev-qt/assistant/assistant-4.8.9999.ebuild |
| 93 |
index 60846fa..0c9c6a2 100644 |
| 94 |
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild |
| 95 |
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild |
| 96 |
@@ -38,19 +38,19 @@ src_prepare() { |
| 97 |
qt4-build-multilib_src_prepare |
| 98 |
} |
| 99 |
|
| 100 |
-src_configure() { |
| 101 |
- myconf+=" |
| 102 |
+multilib_src_configure() { |
| 103 |
+ local myconf=( |
| 104 |
-system-libpng -system-libjpeg -system-zlib |
| 105 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc |
| 106 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 107 |
-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns |
| 108 |
- $(qt_use webkit)" |
| 109 |
- |
| 110 |
- qt4-build-multilib_src_configure |
| 111 |
+ $(qt_use webkit) |
| 112 |
+ ) |
| 113 |
+ qt4_multilib_src_configure |
| 114 |
} |
| 115 |
|
| 116 |
-src_install() { |
| 117 |
- qt4-build-multilib_src_install |
| 118 |
+multilib_src_install_all() { |
| 119 |
+ qt4_multilib_src_install_all |
| 120 |
|
| 121 |
doicon tools/assistant/tools/assistant/images/assistant.png |
| 122 |
make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation' |
| 123 |
|
| 124 |
diff --git a/dev-qt/designer/designer-4.8.6.ebuild b/dev-qt/designer/designer-4.8.6.ebuild |
| 125 |
index 0b0d858..0915f41 100644 |
| 126 |
--- a/dev-qt/designer/designer-4.8.6.ebuild |
| 127 |
+++ b/dev-qt/designer/designer-4.8.6.ebuild |
| 128 |
@@ -40,18 +40,18 @@ src_prepare() { |
| 129 |
done |
| 130 |
} |
| 131 |
|
| 132 |
-src_configure() { |
| 133 |
- myconf+=" |
| 134 |
+multilib_src_configure() { |
| 135 |
+ local myconf=( |
| 136 |
-system-libpng -system-libjpeg -system-zlib |
| 137 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 138 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 139 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 140 |
- |
| 141 |
- qt4-build-multilib_src_configure |
| 142 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 143 |
+ ) |
| 144 |
+ qt4_multilib_src_configure |
| 145 |
} |
| 146 |
|
| 147 |
-src_install() { |
| 148 |
- qt4-build-multilib_src_install |
| 149 |
+multilib_src_install() { |
| 150 |
+ qt4_multilib_src_install |
| 151 |
|
| 152 |
# qt-creator |
| 153 |
# some qt-creator headers are located |
| 154 |
|
| 155 |
diff --git a/dev-qt/designer/designer-4.8.9999.ebuild b/dev-qt/designer/designer-4.8.9999.ebuild |
| 156 |
index 0b0d858..0915f41 100644 |
| 157 |
--- a/dev-qt/designer/designer-4.8.9999.ebuild |
| 158 |
+++ b/dev-qt/designer/designer-4.8.9999.ebuild |
| 159 |
@@ -40,18 +40,18 @@ src_prepare() { |
| 160 |
done |
| 161 |
} |
| 162 |
|
| 163 |
-src_configure() { |
| 164 |
- myconf+=" |
| 165 |
+multilib_src_configure() { |
| 166 |
+ local myconf=( |
| 167 |
-system-libpng -system-libjpeg -system-zlib |
| 168 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 169 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 170 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 171 |
- |
| 172 |
- qt4-build-multilib_src_configure |
| 173 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 174 |
+ ) |
| 175 |
+ qt4_multilib_src_configure |
| 176 |
} |
| 177 |
|
| 178 |
-src_install() { |
| 179 |
- qt4-build-multilib_src_install |
| 180 |
+multilib_src_install() { |
| 181 |
+ qt4_multilib_src_install |
| 182 |
|
| 183 |
# qt-creator |
| 184 |
# some qt-creator headers are located |
| 185 |
|
| 186 |
diff --git a/dev-qt/linguist/linguist-4.8.6.ebuild b/dev-qt/linguist/linguist-4.8.6.ebuild |
| 187 |
index 62bfacf..8307f56 100644 |
| 188 |
--- a/dev-qt/linguist/linguist-4.8.6.ebuild |
| 189 |
+++ b/dev-qt/linguist/linguist-4.8.6.ebuild |
| 190 |
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}" |
| 191 |
|
| 192 |
QT4_TARGET_DIRECTORIES="tools/linguist/linguist" |
| 193 |
|
| 194 |
-src_configure() { |
| 195 |
- myconf+=" |
| 196 |
+multilib_src_configure() { |
| 197 |
+ local myconf=( |
| 198 |
-system-libpng -system-libjpeg -system-zlib |
| 199 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 200 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 201 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 202 |
- |
| 203 |
- qt4-build-multilib_src_configure |
| 204 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 205 |
+ ) |
| 206 |
+ qt4_multilib_src_configure |
| 207 |
} |
| 208 |
|
| 209 |
-src_install() { |
| 210 |
- qt4-build-multilib_src_install |
| 211 |
+multilib_src_install_all() { |
| 212 |
+ qt4_multilib_src_install_all |
| 213 |
|
| 214 |
newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png |
| 215 |
make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' |
| 216 |
|
| 217 |
diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild b/dev-qt/linguist/linguist-4.8.9999.ebuild |
| 218 |
index 62bfacf..8307f56 100644 |
| 219 |
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild |
| 220 |
+++ b/dev-qt/linguist/linguist-4.8.9999.ebuild |
| 221 |
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}" |
| 222 |
|
| 223 |
QT4_TARGET_DIRECTORIES="tools/linguist/linguist" |
| 224 |
|
| 225 |
-src_configure() { |
| 226 |
- myconf+=" |
| 227 |
+multilib_src_configure() { |
| 228 |
+ local myconf=( |
| 229 |
-system-libpng -system-libjpeg -system-zlib |
| 230 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 231 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 232 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 233 |
- |
| 234 |
- qt4-build-multilib_src_configure |
| 235 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 236 |
+ ) |
| 237 |
+ qt4_multilib_src_configure |
| 238 |
} |
| 239 |
|
| 240 |
-src_install() { |
| 241 |
- qt4-build-multilib_src_install |
| 242 |
+multilib_src_install_all() { |
| 243 |
+ qt4_multilib_src_install_all |
| 244 |
|
| 245 |
newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png |
| 246 |
make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' |
| 247 |
|
| 248 |
diff --git a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild |
| 249 |
index 07cf48b..d2254ef 100644 |
| 250 |
--- a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild |
| 251 |
+++ b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild |
| 252 |
@@ -25,12 +25,12 @@ RDEPEND="${DEPEND}" |
| 253 |
|
| 254 |
QT4_TARGET_DIRECTORIES="tools/pixeltool" |
| 255 |
|
| 256 |
-src_configure() { |
| 257 |
- myconf+=" |
| 258 |
+multilib_src_configure() { |
| 259 |
+ local myconf=( |
| 260 |
-system-libpng -system-libjpeg -system-zlib |
| 261 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 262 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 263 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 264 |
- |
| 265 |
- qt4-build-multilib_src_configure |
| 266 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 267 |
+ ) |
| 268 |
+ qt4_multilib_src_configure |
| 269 |
} |
| 270 |
|
| 271 |
diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild |
| 272 |
index 07cf48b..d2254ef 100644 |
| 273 |
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild |
| 274 |
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild |
| 275 |
@@ -25,12 +25,12 @@ RDEPEND="${DEPEND}" |
| 276 |
|
| 277 |
QT4_TARGET_DIRECTORIES="tools/pixeltool" |
| 278 |
|
| 279 |
-src_configure() { |
| 280 |
- myconf+=" |
| 281 |
+multilib_src_configure() { |
| 282 |
+ local myconf=( |
| 283 |
-system-libpng -system-libjpeg -system-zlib |
| 284 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 285 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 286 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 287 |
- |
| 288 |
- qt4-build-multilib_src_configure |
| 289 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 290 |
+ ) |
| 291 |
+ qt4_multilib_src_configure |
| 292 |
} |
| 293 |
|
| 294 |
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild |
| 295 |
index fe83d4c..74f27ba 100644 |
| 296 |
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild |
| 297 |
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild |
| 298 |
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}" |
| 299 |
|
| 300 |
QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer" |
| 301 |
|
| 302 |
-src_configure() { |
| 303 |
- myconf+=" |
| 304 |
+multilib_src_configure() { |
| 305 |
+ local myconf=( |
| 306 |
-system-libpng -system-libjpeg -system-zlib |
| 307 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 308 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 309 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 310 |
- |
| 311 |
- qt4-build-multilib_src_configure |
| 312 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 313 |
+ ) |
| 314 |
+ qt4_multilib_src_configure |
| 315 |
} |
| 316 |
|
| 317 |
-src_install() { |
| 318 |
- qt4-build-multilib_src_install |
| 319 |
+multilib_src_install_all() { |
| 320 |
+ qt4_multilib_src_install_all |
| 321 |
|
| 322 |
newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png |
| 323 |
make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development' |
| 324 |
|
| 325 |
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild |
| 326 |
index fe83d4c..74f27ba 100644 |
| 327 |
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild |
| 328 |
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild |
| 329 |
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}" |
| 330 |
|
| 331 |
QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer" |
| 332 |
|
| 333 |
-src_configure() { |
| 334 |
- myconf+=" |
| 335 |
+multilib_src_configure() { |
| 336 |
+ local myconf=( |
| 337 |
-system-libpng -system-libjpeg -system-zlib |
| 338 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 339 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 340 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 341 |
- |
| 342 |
- qt4-build-multilib_src_configure |
| 343 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 344 |
+ ) |
| 345 |
+ qt4_multilib_src_configure |
| 346 |
} |
| 347 |
|
| 348 |
-src_install() { |
| 349 |
- qt4-build-multilib_src_install |
| 350 |
+multilib_src_install_all() { |
| 351 |
+ qt4_multilib_src_install_all |
| 352 |
|
| 353 |
newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png |
| 354 |
make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development' |
| 355 |
|
| 356 |
diff --git a/dev-qt/qt3support/qt3support-4.8.6.ebuild b/dev-qt/qt3support/qt3support-4.8.6.ebuild |
| 357 |
index ab38a26..b5d12f9 100644 |
| 358 |
--- a/dev-qt/qt3support/qt3support-4.8.6.ebuild |
| 359 |
+++ b/dev-qt/qt3support/qt3support-4.8.6.ebuild |
| 360 |
@@ -28,10 +28,10 @@ QT4_TARGET_DIRECTORIES=" |
| 361 |
src/tools/uic3 |
| 362 |
tools/porting" |
| 363 |
|
| 364 |
-src_configure() { |
| 365 |
- myconf+=" |
| 366 |
+multilib_src_configure() { |
| 367 |
+ local myconf=( |
| 368 |
-qt3support |
| 369 |
- $(qt_use accessibility)" |
| 370 |
- |
| 371 |
- qt4-build-multilib_src_configure |
| 372 |
+ $(qt_use accessibility) |
| 373 |
+ ) |
| 374 |
+ qt4_multilib_src_configure |
| 375 |
} |
| 376 |
|
| 377 |
diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild b/dev-qt/qt3support/qt3support-4.8.9999.ebuild |
| 378 |
index ab38a26..b5d12f9 100644 |
| 379 |
--- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild |
| 380 |
+++ b/dev-qt/qt3support/qt3support-4.8.9999.ebuild |
| 381 |
@@ -28,10 +28,10 @@ QT4_TARGET_DIRECTORIES=" |
| 382 |
src/tools/uic3 |
| 383 |
tools/porting" |
| 384 |
|
| 385 |
-src_configure() { |
| 386 |
- myconf+=" |
| 387 |
+multilib_src_configure() { |
| 388 |
+ local myconf=( |
| 389 |
-qt3support |
| 390 |
- $(qt_use accessibility)" |
| 391 |
- |
| 392 |
- qt4-build-multilib_src_configure |
| 393 |
+ $(qt_use accessibility) |
| 394 |
+ ) |
| 395 |
+ qt4_multilib_src_configure |
| 396 |
} |
| 397 |
|
| 398 |
diff --git a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild |
| 399 |
index bb01c0a..5d2b47b 100644 |
| 400 |
--- a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild |
| 401 |
+++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild |
| 402 |
@@ -33,15 +33,15 @@ pkg_setup() { |
| 403 |
$(use networkmanager && echo src/plugins/bearer/networkmanager)" |
| 404 |
} |
| 405 |
|
| 406 |
-src_configure() { |
| 407 |
- myconf+=" |
| 408 |
+multilib_src_configure() { |
| 409 |
+ local myconf=( |
| 410 |
$(use connman || use networkmanager || echo -no-dbus) |
| 411 |
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon |
| 412 |
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
| 413 |
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg |
| 414 |
-no-cups -no-gtkstyle -no-nas-sound -no-opengl |
| 415 |
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
| 416 |
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" |
| 417 |
- |
| 418 |
- qt4-build-multilib_src_configure |
| 419 |
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
| 420 |
+ ) |
| 421 |
+ qt4_multilib_src_configure |
| 422 |
} |
| 423 |
|
| 424 |
diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild |
| 425 |
index bb01c0a..5d2b47b 100644 |
| 426 |
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild |
| 427 |
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild |
| 428 |
@@ -33,15 +33,15 @@ pkg_setup() { |
| 429 |
$(use networkmanager && echo src/plugins/bearer/networkmanager)" |
| 430 |
} |
| 431 |
|
| 432 |
-src_configure() { |
| 433 |
- myconf+=" |
| 434 |
+multilib_src_configure() { |
| 435 |
+ local myconf=( |
| 436 |
$(use connman || use networkmanager || echo -no-dbus) |
| 437 |
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon |
| 438 |
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
| 439 |
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg |
| 440 |
-no-cups -no-gtkstyle -no-nas-sound -no-opengl |
| 441 |
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
| 442 |
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" |
| 443 |
- |
| 444 |
- qt4-build-multilib_src_configure |
| 445 |
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
| 446 |
+ ) |
| 447 |
+ qt4_multilib_src_configure |
| 448 |
} |
| 449 |
|
| 450 |
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 451 |
index b7e20b6..4ceb304 100644 |
| 452 |
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 453 |
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 454 |
@@ -68,8 +68,8 @@ src_prepare() { |
| 455 |
configure || die "sed configure setBootstrapVariable failed" |
| 456 |
} |
| 457 |
|
| 458 |
-src_configure() { |
| 459 |
- myconf+=" |
| 460 |
+multilib_src_configure() { |
| 461 |
+ local myconf=( |
| 462 |
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon |
| 463 |
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
| 464 |
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg |
| 465 |
@@ -80,13 +80,13 @@ src_configure() { |
| 466 |
$(qt_use iconv) |
| 467 |
$(qt_use icu) |
| 468 |
$(use ssl && echo -openssl-linked || echo -no-openssl) |
| 469 |
- $(qt_use qt3support)" |
| 470 |
- |
| 471 |
- qt4-build-multilib_src_configure |
| 472 |
+ $(qt_use qt3support) |
| 473 |
+ ) |
| 474 |
+ qt4_multilib_src_configure |
| 475 |
} |
| 476 |
|
| 477 |
-src_install() { |
| 478 |
- qt4-build-multilib_src_install |
| 479 |
+multilib_src_install_all() { |
| 480 |
+ qt4_multilib_src_install_all |
| 481 |
|
| 482 |
# List all the multilib libdirs |
| 483 |
local libdirs= |
| 484 |
|
| 485 |
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 486 |
index b7e20b6..4ceb304 100644 |
| 487 |
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 488 |
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 489 |
@@ -68,8 +68,8 @@ src_prepare() { |
| 490 |
configure || die "sed configure setBootstrapVariable failed" |
| 491 |
} |
| 492 |
|
| 493 |
-src_configure() { |
| 494 |
- myconf+=" |
| 495 |
+multilib_src_configure() { |
| 496 |
+ local myconf=( |
| 497 |
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon |
| 498 |
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative |
| 499 |
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg |
| 500 |
@@ -80,13 +80,13 @@ src_configure() { |
| 501 |
$(qt_use iconv) |
| 502 |
$(qt_use icu) |
| 503 |
$(use ssl && echo -openssl-linked || echo -no-openssl) |
| 504 |
- $(qt_use qt3support)" |
| 505 |
- |
| 506 |
- qt4-build-multilib_src_configure |
| 507 |
+ $(qt_use qt3support) |
| 508 |
+ ) |
| 509 |
+ qt4_multilib_src_configure |
| 510 |
} |
| 511 |
|
| 512 |
-src_install() { |
| 513 |
- qt4-build-multilib_src_install |
| 514 |
+multilib_src_install_all() { |
| 515 |
+ qt4_multilib_src_install_all |
| 516 |
|
| 517 |
# List all the multilib libdirs |
| 518 |
local libdirs= |
| 519 |
|
| 520 |
diff --git a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild |
| 521 |
index df916b8..3127e24 100644 |
| 522 |
--- a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild |
| 523 |
+++ b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild |
| 524 |
@@ -36,8 +36,9 @@ QT4_TARGET_DIRECTORIES=" |
| 525 |
QCONFIG_ADD="dbus dbus-linked" |
| 526 |
QCONFIG_DEFINE="QT_DBUS" |
| 527 |
|
| 528 |
-src_configure() { |
| 529 |
- myconf+=" -dbus-linked" |
| 530 |
- |
| 531 |
- qt4-build-multilib_src_configure |
| 532 |
+multilib_src_configure() { |
| 533 |
+ local myconf=( |
| 534 |
+ -dbus-linked |
| 535 |
+ ) |
| 536 |
+ qt4_multilib_src_configure |
| 537 |
} |
| 538 |
|
| 539 |
diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild |
| 540 |
index df916b8..3127e24 100644 |
| 541 |
--- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild |
| 542 |
+++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild |
| 543 |
@@ -36,8 +36,9 @@ QT4_TARGET_DIRECTORIES=" |
| 544 |
QCONFIG_ADD="dbus dbus-linked" |
| 545 |
QCONFIG_DEFINE="QT_DBUS" |
| 546 |
|
| 547 |
-src_configure() { |
| 548 |
- myconf+=" -dbus-linked" |
| 549 |
- |
| 550 |
- qt4-build-multilib_src_configure |
| 551 |
+multilib_src_configure() { |
| 552 |
+ local myconf=( |
| 553 |
+ -dbus-linked |
| 554 |
+ ) |
| 555 |
+ qt4_multilib_src_configure |
| 556 |
} |
| 557 |
|
| 558 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild |
| 559 |
index 5a5c974..4750e3e 100644 |
| 560 |
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild |
| 561 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild |
| 562 |
@@ -44,11 +44,12 @@ pkg_setup() { |
| 563 |
src/3rdparty/webkit/Source/WebKit/qt/declarative" |
| 564 |
} |
| 565 |
|
| 566 |
-src_configure() { |
| 567 |
- myconf+=" |
| 568 |
+multilib_src_configure() { |
| 569 |
+ local myconf=( |
| 570 |
-declarative -no-gtkstyle |
| 571 |
$(qt_use accessibility) |
| 572 |
$(qt_use qt3support) |
| 573 |
- $(qt_use webkit)" |
| 574 |
- qt4-build-multilib_src_configure |
| 575 |
+ $(qt_use webkit) |
| 576 |
+ ) |
| 577 |
+ qt4_multilib_src_configure |
| 578 |
} |
| 579 |
|
| 580 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild |
| 581 |
index 5a5c974..4750e3e 100644 |
| 582 |
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild |
| 583 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild |
| 584 |
@@ -44,11 +44,12 @@ pkg_setup() { |
| 585 |
src/3rdparty/webkit/Source/WebKit/qt/declarative" |
| 586 |
} |
| 587 |
|
| 588 |
-src_configure() { |
| 589 |
- myconf+=" |
| 590 |
+multilib_src_configure() { |
| 591 |
+ local myconf=( |
| 592 |
-declarative -no-gtkstyle |
| 593 |
$(qt_use accessibility) |
| 594 |
$(qt_use qt3support) |
| 595 |
- $(qt_use webkit)" |
| 596 |
- qt4-build-multilib_src_configure |
| 597 |
+ $(qt_use webkit) |
| 598 |
+ ) |
| 599 |
+ qt4_multilib_src_configure |
| 600 |
} |
| 601 |
|
| 602 |
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild |
| 603 |
index e74659d..6128e3d 100644 |
| 604 |
--- a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild |
| 605 |
+++ b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild |
| 606 |
@@ -82,8 +82,8 @@ src_prepare() { |
| 607 |
examples/graphicsview/graphicsview.pro || die |
| 608 |
} |
| 609 |
|
| 610 |
-src_configure() { |
| 611 |
- myconf+=" |
| 612 |
+multilib_src_configure() { |
| 613 |
+ local myconf=( |
| 614 |
$(qt_use dbus) |
| 615 |
$(qt_use declarative) |
| 616 |
$(qt_use multimedia) -no-audio-backend |
| 617 |
@@ -91,14 +91,14 @@ src_configure() { |
| 618 |
$(qt_use openvg) |
| 619 |
$(qt_use phonon) -no-phonon-backend |
| 620 |
$(qt_use webkit) |
| 621 |
- $(qt_use xmlpatterns)" |
| 622 |
- |
| 623 |
- qt4-build-multilib_src_configure |
| 624 |
+ $(qt_use xmlpatterns) |
| 625 |
+ ) |
| 626 |
+ qt4_multilib_src_configure |
| 627 |
} |
| 628 |
|
| 629 |
-src_install() { |
| 630 |
+multilib_src_install_all() { |
| 631 |
+ qt4_multilib_src_install_all |
| 632 |
+ |
| 633 |
insinto "${QT4_DOCDIR#${EPREFIX}}"/src |
| 634 |
doins -r doc/src/images |
| 635 |
- |
| 636 |
- qt4-build-multilib_src_install |
| 637 |
} |
| 638 |
|
| 639 |
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild |
| 640 |
index e74659d..6128e3d 100644 |
| 641 |
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild |
| 642 |
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild |
| 643 |
@@ -82,8 +82,8 @@ src_prepare() { |
| 644 |
examples/graphicsview/graphicsview.pro || die |
| 645 |
} |
| 646 |
|
| 647 |
-src_configure() { |
| 648 |
- myconf+=" |
| 649 |
+multilib_src_configure() { |
| 650 |
+ local myconf=( |
| 651 |
$(qt_use dbus) |
| 652 |
$(qt_use declarative) |
| 653 |
$(qt_use multimedia) -no-audio-backend |
| 654 |
@@ -91,14 +91,14 @@ src_configure() { |
| 655 |
$(qt_use openvg) |
| 656 |
$(qt_use phonon) -no-phonon-backend |
| 657 |
$(qt_use webkit) |
| 658 |
- $(qt_use xmlpatterns)" |
| 659 |
- |
| 660 |
- qt4-build-multilib_src_configure |
| 661 |
+ $(qt_use xmlpatterns) |
| 662 |
+ ) |
| 663 |
+ qt4_multilib_src_configure |
| 664 |
} |
| 665 |
|
| 666 |
-src_install() { |
| 667 |
+multilib_src_install_all() { |
| 668 |
+ qt4_multilib_src_install_all |
| 669 |
+ |
| 670 |
insinto "${QT4_DOCDIR#${EPREFIX}}"/src |
| 671 |
doins -r doc/src/images |
| 672 |
- |
| 673 |
- qt4-build-multilib_src_install |
| 674 |
} |
| 675 |
|
| 676 |
diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 677 |
index 2adb6dc..ed74f5d 100644 |
| 678 |
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 679 |
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 680 |
@@ -129,8 +129,8 @@ src_prepare() { |
| 681 |
sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die |
| 682 |
} |
| 683 |
|
| 684 |
-src_configure() { |
| 685 |
- myconf+=" |
| 686 |
+multilib_src_configure() { |
| 687 |
+ local myconf=( |
| 688 |
$(qt_use accessibility) |
| 689 |
$(qt_use cups) |
| 690 |
$(qt_use glib) |
| 691 |
@@ -146,18 +146,15 @@ src_configure() { |
| 692 |
-system-libpng -system-libjpeg -system-zlib |
| 693 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 694 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 695 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 696 |
- |
| 697 |
- # bug 367045 |
| 698 |
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" |
| 699 |
- |
| 700 |
- qt4-build-multilib_src_configure |
| 701 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 702 |
+ $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug 367045 |
| 703 |
+ ) |
| 704 |
+ qt4_multilib_src_configure |
| 705 |
} |
| 706 |
|
| 707 |
-src_install() { |
| 708 |
- qt4-build-multilib_src_install |
| 709 |
+multilib_src_install_all() { |
| 710 |
+ qt4_multilib_src_install_all |
| 711 |
|
| 712 |
- # touch the available graphics systems |
| 713 |
dodir /usr/share/qt4/graphicssystems |
| 714 |
echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die |
| 715 |
echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die |
| 716 |
|
| 717 |
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 718 |
index 6a3641e..e4f0746 100644 |
| 719 |
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 720 |
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 721 |
@@ -126,8 +126,8 @@ src_prepare() { |
| 722 |
sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die |
| 723 |
} |
| 724 |
|
| 725 |
-src_configure() { |
| 726 |
- myconf+=" |
| 727 |
+multilib_src_configure() { |
| 728 |
+ local myconf=( |
| 729 |
$(qt_use accessibility) |
| 730 |
$(qt_use cups) |
| 731 |
$(qt_use glib) |
| 732 |
@@ -143,18 +143,15 @@ src_configure() { |
| 733 |
-system-libpng -system-libjpeg -system-zlib |
| 734 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 735 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 736 |
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 737 |
- |
| 738 |
- # bug 367045 |
| 739 |
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" |
| 740 |
- |
| 741 |
- qt4-build-multilib_src_configure |
| 742 |
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl |
| 743 |
+ $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug 367045 |
| 744 |
+ ) |
| 745 |
+ qt4_multilib_src_configure |
| 746 |
} |
| 747 |
|
| 748 |
-src_install() { |
| 749 |
- qt4-build-multilib_src_install |
| 750 |
+multilib_src_install_all() { |
| 751 |
+ qt4_multilib_src_install_all |
| 752 |
|
| 753 |
- # touch the available graphics systems |
| 754 |
dodir /usr/share/qt4/graphicssystems |
| 755 |
echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die |
| 756 |
echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die |
| 757 |
|
| 758 |
diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild |
| 759 |
index 70ac632..9b7a09c 100644 |
| 760 |
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild |
| 761 |
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild |
| 762 |
@@ -69,23 +69,23 @@ src_prepare() { |
| 763 |
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die |
| 764 |
} |
| 765 |
|
| 766 |
-src_configure() { |
| 767 |
- myconf+=" |
| 768 |
+multilib_src_configure() { |
| 769 |
+ local myconf=( |
| 770 |
-system-libpng -system-libjpeg -system-zlib |
| 771 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc |
| 772 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 773 |
-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns |
| 774 |
- -no-nas-sound -no-cups -no-nis -fontconfig" |
| 775 |
- |
| 776 |
- qt4-build-multilib_src_configure |
| 777 |
+ -no-nas-sound -no-cups -no-nis -fontconfig |
| 778 |
+ ) |
| 779 |
+ qt4_multilib_src_configure |
| 780 |
} |
| 781 |
|
| 782 |
-src_compile() { |
| 783 |
- qt4-build-multilib_src_compile |
| 784 |
+multilib_src_compile() { |
| 785 |
+ qt4_multilib_src_compile |
| 786 |
|
| 787 |
# qhelpgenerator needs libQtHelp.so.4 |
| 788 |
- export LD_LIBRARY_PATH=${S}/lib |
| 789 |
- export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework |
| 790 |
+ export LD_LIBRARY_PATH=${BUILD_DIR}/lib |
| 791 |
+ export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework |
| 792 |
|
| 793 |
if use doc; then |
| 794 |
emake docs |
| 795 |
@@ -95,8 +95,8 @@ src_compile() { |
| 796 |
fi |
| 797 |
} |
| 798 |
|
| 799 |
-src_install() { |
| 800 |
- qt4-build-multilib_src_install |
| 801 |
+multilib_src_install() { |
| 802 |
+ qt4_multilib_src_install |
| 803 |
|
| 804 |
emake INSTALL_ROOT="${D}" install_qchdocs |
| 805 |
|
| 806 |
|
| 807 |
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild |
| 808 |
index 70ac632..9b7a09c 100644 |
| 809 |
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild |
| 810 |
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild |
| 811 |
@@ -69,23 +69,23 @@ src_prepare() { |
| 812 |
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die |
| 813 |
} |
| 814 |
|
| 815 |
-src_configure() { |
| 816 |
- myconf+=" |
| 817 |
+multilib_src_configure() { |
| 818 |
+ local myconf=( |
| 819 |
-system-libpng -system-libjpeg -system-zlib |
| 820 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc |
| 821 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 822 |
-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns |
| 823 |
- -no-nas-sound -no-cups -no-nis -fontconfig" |
| 824 |
- |
| 825 |
- qt4-build-multilib_src_configure |
| 826 |
+ -no-nas-sound -no-cups -no-nis -fontconfig |
| 827 |
+ ) |
| 828 |
+ qt4_multilib_src_configure |
| 829 |
} |
| 830 |
|
| 831 |
-src_compile() { |
| 832 |
- qt4-build-multilib_src_compile |
| 833 |
+multilib_src_compile() { |
| 834 |
+ qt4_multilib_src_compile |
| 835 |
|
| 836 |
# qhelpgenerator needs libQtHelp.so.4 |
| 837 |
- export LD_LIBRARY_PATH=${S}/lib |
| 838 |
- export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework |
| 839 |
+ export LD_LIBRARY_PATH=${BUILD_DIR}/lib |
| 840 |
+ export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework |
| 841 |
|
| 842 |
if use doc; then |
| 843 |
emake docs |
| 844 |
@@ -95,8 +95,8 @@ src_compile() { |
| 845 |
fi |
| 846 |
} |
| 847 |
|
| 848 |
-src_install() { |
| 849 |
- qt4-build-multilib_src_install |
| 850 |
+multilib_src_install() { |
| 851 |
+ qt4_multilib_src_install |
| 852 |
|
| 853 |
emake INSTALL_ROOT="${D}" install_qchdocs |
| 854 |
|
| 855 |
|
| 856 |
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild |
| 857 |
index 32318e3..5f20ad2 100644 |
| 858 |
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild |
| 859 |
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild |
| 860 |
@@ -32,8 +32,8 @@ QT4_TARGET_DIRECTORIES="src/multimedia" |
| 861 |
QCONFIG_ADD="multimedia" |
| 862 |
QCONFIG_DEFINE="QT_MULTIMEDIA" |
| 863 |
|
| 864 |
-src_configure() { |
| 865 |
- myconf+=" |
| 866 |
+multilib_src_configure() { |
| 867 |
+ local myconf=( |
| 868 |
-multimedia -audio-backend |
| 869 |
$(qt_use alsa) |
| 870 |
-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend |
| 871 |
@@ -41,7 +41,7 @@ src_configure() { |
| 872 |
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl |
| 873 |
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl |
| 874 |
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
| 875 |
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" |
| 876 |
- |
| 877 |
- qt4-build-multilib_src_configure |
| 878 |
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
| 879 |
+ ) |
| 880 |
+ qt4_multilib_src_configure |
| 881 |
} |
| 882 |
|
| 883 |
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild |
| 884 |
index 32318e3..5f20ad2 100644 |
| 885 |
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild |
| 886 |
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild |
| 887 |
@@ -32,8 +32,8 @@ QT4_TARGET_DIRECTORIES="src/multimedia" |
| 888 |
QCONFIG_ADD="multimedia" |
| 889 |
QCONFIG_DEFINE="QT_MULTIMEDIA" |
| 890 |
|
| 891 |
-src_configure() { |
| 892 |
- myconf+=" |
| 893 |
+multilib_src_configure() { |
| 894 |
+ local myconf=( |
| 895 |
-multimedia -audio-backend |
| 896 |
$(qt_use alsa) |
| 897 |
-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend |
| 898 |
@@ -41,7 +41,7 @@ src_configure() { |
| 899 |
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl |
| 900 |
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl |
| 901 |
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
| 902 |
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" |
| 903 |
- |
| 904 |
- qt4-build-multilib_src_configure |
| 905 |
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
| 906 |
+ ) |
| 907 |
+ qt4_multilib_src_configure |
| 908 |
} |
| 909 |
|
| 910 |
diff --git a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild |
| 911 |
index 8c08988..77e064e 100644 |
| 912 |
--- a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild |
| 913 |
+++ b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild |
| 914 |
@@ -32,19 +32,18 @@ QT4_TARGET_DIRECTORIES=" |
| 915 |
QCONFIG_ADD="opengl" |
| 916 |
QCONFIG_DEFINE="QT_OPENGL" |
| 917 |
|
| 918 |
-src_configure() { |
| 919 |
- myconf+=" |
| 920 |
+multilib_src_configure() { |
| 921 |
+ local myconf=( |
| 922 |
-opengl |
| 923 |
$(qt_use qt3support) |
| 924 |
- $(qt_use egl)" |
| 925 |
- |
| 926 |
- qt4-build-multilib_src_configure |
| 927 |
+ $(qt_use egl) |
| 928 |
+ ) |
| 929 |
+ qt4_multilib_src_configure |
| 930 |
} |
| 931 |
|
| 932 |
-src_install() { |
| 933 |
- qt4-build-multilib_src_install |
| 934 |
+multilib_src_install_all() { |
| 935 |
+ qt4_multilib_src_install_all |
| 936 |
|
| 937 |
- # touch the available graphics systems |
| 938 |
dodir /usr/share/qt4/graphicssystems |
| 939 |
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die |
| 940 |
} |
| 941 |
|
| 942 |
diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild |
| 943 |
index 8c08988..77e064e 100644 |
| 944 |
--- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild |
| 945 |
+++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild |
| 946 |
@@ -32,19 +32,18 @@ QT4_TARGET_DIRECTORIES=" |
| 947 |
QCONFIG_ADD="opengl" |
| 948 |
QCONFIG_DEFINE="QT_OPENGL" |
| 949 |
|
| 950 |
-src_configure() { |
| 951 |
- myconf+=" |
| 952 |
+multilib_src_configure() { |
| 953 |
+ local myconf=( |
| 954 |
-opengl |
| 955 |
$(qt_use qt3support) |
| 956 |
- $(qt_use egl)" |
| 957 |
- |
| 958 |
- qt4-build-multilib_src_configure |
| 959 |
+ $(qt_use egl) |
| 960 |
+ ) |
| 961 |
+ qt4_multilib_src_configure |
| 962 |
} |
| 963 |
|
| 964 |
-src_install() { |
| 965 |
- qt4-build-multilib_src_install |
| 966 |
+multilib_src_install_all() { |
| 967 |
+ qt4_multilib_src_install_all |
| 968 |
|
| 969 |
- # touch the available graphics systems |
| 970 |
dodir /usr/share/qt4/graphicssystems |
| 971 |
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die |
| 972 |
} |
| 973 |
|
| 974 |
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild |
| 975 |
index 84799f5..23bf1dc 100644 |
| 976 |
--- a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild |
| 977 |
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild |
| 978 |
@@ -30,18 +30,17 @@ QT4_TARGET_DIRECTORIES=" |
| 979 |
QCONFIG_ADD="openvg" |
| 980 |
QCONFIG_DEFINE="QT_OPENVG" |
| 981 |
|
| 982 |
-src_configure() { |
| 983 |
- myconf+=" |
| 984 |
+multilib_src_configure() { |
| 985 |
+ local myconf=( |
| 986 |
-openvg -egl |
| 987 |
- $(qt_use qt3support)" |
| 988 |
- |
| 989 |
- qt4-build-multilib_src_configure |
| 990 |
+ $(qt_use qt3support) |
| 991 |
+ ) |
| 992 |
+ qt4_multilib_src_configure |
| 993 |
} |
| 994 |
|
| 995 |
-src_install() { |
| 996 |
- qt4-build-multilib_src_install |
| 997 |
+multilib_src_install() { |
| 998 |
+ qt4_multilib_src_install |
| 999 |
|
| 1000 |
- # touch the available graphics systems |
| 1001 |
dodir /usr/share/qt4/graphicssystems |
| 1002 |
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die |
| 1003 |
} |
| 1004 |
|
| 1005 |
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild |
| 1006 |
index 84799f5..23bf1dc 100644 |
| 1007 |
--- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild |
| 1008 |
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild |
| 1009 |
@@ -30,18 +30,17 @@ QT4_TARGET_DIRECTORIES=" |
| 1010 |
QCONFIG_ADD="openvg" |
| 1011 |
QCONFIG_DEFINE="QT_OPENVG" |
| 1012 |
|
| 1013 |
-src_configure() { |
| 1014 |
- myconf+=" |
| 1015 |
+multilib_src_configure() { |
| 1016 |
+ local myconf=( |
| 1017 |
-openvg -egl |
| 1018 |
- $(qt_use qt3support)" |
| 1019 |
- |
| 1020 |
- qt4-build-multilib_src_configure |
| 1021 |
+ $(qt_use qt3support) |
| 1022 |
+ ) |
| 1023 |
+ qt4_multilib_src_configure |
| 1024 |
} |
| 1025 |
|
| 1026 |
-src_install() { |
| 1027 |
- qt4-build-multilib_src_install |
| 1028 |
+multilib_src_install() { |
| 1029 |
+ qt4_multilib_src_install |
| 1030 |
|
| 1031 |
- # touch the available graphics systems |
| 1032 |
dodir /usr/share/qt4/graphicssystems |
| 1033 |
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die |
| 1034 |
} |
| 1035 |
|
| 1036 |
diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild |
| 1037 |
index be7dca9..5f2a9df 100644 |
| 1038 |
--- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild |
| 1039 |
+++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild |
| 1040 |
@@ -39,16 +39,17 @@ QT4_TARGET_DIRECTORIES=" |
| 1041 |
QCONFIG_ADD="phonon" |
| 1042 |
|
| 1043 |
pkg_setup() { |
| 1044 |
- QCONFIG_DEFINE="QT_PHONON |
| 1045 |
+ QCONFIG_DEFINE=" |
| 1046 |
+ QT_PHONON |
| 1047 |
$(use aqua || echo QT_GSTREAMER)" |
| 1048 |
} |
| 1049 |
|
| 1050 |
-src_configure() { |
| 1051 |
- myconf+=" |
| 1052 |
+multilib_src_configure() { |
| 1053 |
+ local myconf=( |
| 1054 |
-phonon -phonon-backend |
| 1055 |
-no-opengl -no-svg |
| 1056 |
$(qt_use dbus qdbus) |
| 1057 |
- $(qt_use qt3support)" |
| 1058 |
- |
| 1059 |
- qt4-build-multilib_src_configure |
| 1060 |
+ $(qt_use qt3support) |
| 1061 |
+ ) |
| 1062 |
+ qt4_multilib_src_configure |
| 1063 |
} |
| 1064 |
|
| 1065 |
diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild |
| 1066 |
index be7dca9..5f2a9df 100644 |
| 1067 |
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild |
| 1068 |
+++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild |
| 1069 |
@@ -39,16 +39,17 @@ QT4_TARGET_DIRECTORIES=" |
| 1070 |
QCONFIG_ADD="phonon" |
| 1071 |
|
| 1072 |
pkg_setup() { |
| 1073 |
- QCONFIG_DEFINE="QT_PHONON |
| 1074 |
+ QCONFIG_DEFINE=" |
| 1075 |
+ QT_PHONON |
| 1076 |
$(use aqua || echo QT_GSTREAMER)" |
| 1077 |
} |
| 1078 |
|
| 1079 |
-src_configure() { |
| 1080 |
- myconf+=" |
| 1081 |
+multilib_src_configure() { |
| 1082 |
+ local myconf=( |
| 1083 |
-phonon -phonon-backend |
| 1084 |
-no-opengl -no-svg |
| 1085 |
$(qt_use dbus qdbus) |
| 1086 |
- $(qt_use qt3support)" |
| 1087 |
- |
| 1088 |
- qt4-build-multilib_src_configure |
| 1089 |
+ $(qt_use qt3support) |
| 1090 |
+ ) |
| 1091 |
+ qt4_multilib_src_configure |
| 1092 |
} |
| 1093 |
|
| 1094 |
diff --git a/dev-qt/qtscript/qtscript-4.8.6.ebuild b/dev-qt/qtscript/qtscript-4.8.6.ebuild |
| 1095 |
index e00c21e..d45f75c 100644 |
| 1096 |
--- a/dev-qt/qtscript/qtscript-4.8.6.ebuild |
| 1097 |
+++ b/dev-qt/qtscript/qtscript-4.8.6.ebuild |
| 1098 |
@@ -26,8 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script" |
| 1099 |
QCONFIG_ADD="script" |
| 1100 |
QCONFIG_DEFINE="QT_SCRIPT" |
| 1101 |
|
| 1102 |
-src_configure() { |
| 1103 |
- myconf+=" |
| 1104 |
+multilib_src_configure() { |
| 1105 |
+ local myconf=( |
| 1106 |
$(qt_use iconv) |
| 1107 |
$(qt_use jit javascript-jit) |
| 1108 |
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama |
| 1109 |
@@ -35,7 +35,7 @@ src_configure() { |
| 1110 |
-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
| 1111 |
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
| 1112 |
-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg |
| 1113 |
- -no-gtkstyle" |
| 1114 |
- |
| 1115 |
- qt4-build-multilib_src_configure |
| 1116 |
+ -no-gtkstyle |
| 1117 |
+ ) |
| 1118 |
+ qt4_multilib_src_configure |
| 1119 |
} |
| 1120 |
|
| 1121 |
diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild b/dev-qt/qtscript/qtscript-4.8.9999.ebuild |
| 1122 |
index e00c21e..d45f75c 100644 |
| 1123 |
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild |
| 1124 |
+++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild |
| 1125 |
@@ -26,8 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script" |
| 1126 |
QCONFIG_ADD="script" |
| 1127 |
QCONFIG_DEFINE="QT_SCRIPT" |
| 1128 |
|
| 1129 |
-src_configure() { |
| 1130 |
- myconf+=" |
| 1131 |
+multilib_src_configure() { |
| 1132 |
+ local myconf=( |
| 1133 |
$(qt_use iconv) |
| 1134 |
$(qt_use jit javascript-jit) |
| 1135 |
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama |
| 1136 |
@@ -35,7 +35,7 @@ src_configure() { |
| 1137 |
-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
| 1138 |
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
| 1139 |
-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg |
| 1140 |
- -no-gtkstyle" |
| 1141 |
- |
| 1142 |
- qt4-build-multilib_src_configure |
| 1143 |
+ -no-gtkstyle |
| 1144 |
+ ) |
| 1145 |
+ qt4_multilib_src_configure |
| 1146 |
} |
| 1147 |
|
| 1148 |
diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild |
| 1149 |
index 803a39a..cd5918f 100644 |
| 1150 |
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild |
| 1151 |
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild |
| 1152 |
@@ -35,8 +35,8 @@ QT4_TARGET_DIRECTORIES=" |
| 1153 |
src/sql |
| 1154 |
src/plugins/sqldrivers" |
| 1155 |
|
| 1156 |
-src_configure() { |
| 1157 |
- myconf+=" |
| 1158 |
+multilib_src_configure() { |
| 1159 |
+ local myconf=( |
| 1160 |
$(qt_native_use freetds sql-tds plugin) |
| 1161 |
$(qt_native_use mysql sql-mysql plugin) $(use mysql && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") |
| 1162 |
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") |
| 1163 |
@@ -54,7 +54,7 @@ src_configure() { |
| 1164 |
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl |
| 1165 |
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
| 1166 |
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
| 1167 |
- -no-glib" |
| 1168 |
- |
| 1169 |
- qt4-build-multilib_src_configure |
| 1170 |
+ -no-glib |
| 1171 |
+ ) |
| 1172 |
+ qt4_multilib_src_configure |
| 1173 |
} |
| 1174 |
|
| 1175 |
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild |
| 1176 |
index 803a39a..cd5918f 100644 |
| 1177 |
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild |
| 1178 |
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild |
| 1179 |
@@ -35,8 +35,8 @@ QT4_TARGET_DIRECTORIES=" |
| 1180 |
src/sql |
| 1181 |
src/plugins/sqldrivers" |
| 1182 |
|
| 1183 |
-src_configure() { |
| 1184 |
- myconf+=" |
| 1185 |
+multilib_src_configure() { |
| 1186 |
+ local myconf=( |
| 1187 |
$(qt_native_use freetds sql-tds plugin) |
| 1188 |
$(qt_native_use mysql sql-mysql plugin) $(use mysql && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") |
| 1189 |
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") |
| 1190 |
@@ -54,7 +54,7 @@ src_configure() { |
| 1191 |
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl |
| 1192 |
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes |
| 1193 |
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb |
| 1194 |
- -no-glib" |
| 1195 |
- |
| 1196 |
- qt4-build-multilib_src_configure |
| 1197 |
+ -no-glib |
| 1198 |
+ ) |
| 1199 |
+ qt4_multilib_src_configure |
| 1200 |
} |
| 1201 |
|
| 1202 |
diff --git a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild |
| 1203 |
index 8813c14..b61bbe5 100644 |
| 1204 |
--- a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild |
| 1205 |
+++ b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild |
| 1206 |
@@ -31,8 +31,8 @@ QT4_TARGET_DIRECTORIES=" |
| 1207 |
QCONFIG_ADD="svg" |
| 1208 |
QCONFIG_DEFINE="QT_SVG" |
| 1209 |
|
| 1210 |
-src_configure() { |
| 1211 |
- myconf+=" |
| 1212 |
+multilib_src_configure() { |
| 1213 |
+ local myconf=( |
| 1214 |
-svg |
| 1215 |
$(qt_use accessibility) |
| 1216 |
-no-xkb -no-xrender |
| 1217 |
@@ -40,7 +40,7 @@ src_configure() { |
| 1218 |
-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng |
| 1219 |
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
| 1220 |
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
| 1221 |
- -no-fontconfig -no-glib -no-gtkstyle" |
| 1222 |
- |
| 1223 |
- qt4-build-multilib_src_configure |
| 1224 |
+ -no-fontconfig -no-glib -no-gtkstyle |
| 1225 |
+ ) |
| 1226 |
+ qt4_multilib_src_configure |
| 1227 |
} |
| 1228 |
|
| 1229 |
diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild |
| 1230 |
index 8813c14..b61bbe5 100644 |
| 1231 |
--- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild |
| 1232 |
+++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild |
| 1233 |
@@ -31,8 +31,8 @@ QT4_TARGET_DIRECTORIES=" |
| 1234 |
QCONFIG_ADD="svg" |
| 1235 |
QCONFIG_DEFINE="QT_SVG" |
| 1236 |
|
| 1237 |
-src_configure() { |
| 1238 |
- myconf+=" |
| 1239 |
+multilib_src_configure() { |
| 1240 |
+ local myconf=( |
| 1241 |
-svg |
| 1242 |
$(qt_use accessibility) |
| 1243 |
-no-xkb -no-xrender |
| 1244 |
@@ -40,7 +40,7 @@ src_configure() { |
| 1245 |
-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng |
| 1246 |
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
| 1247 |
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
| 1248 |
- -no-fontconfig -no-glib -no-gtkstyle" |
| 1249 |
- |
| 1250 |
- qt4-build-multilib_src_configure |
| 1251 |
+ -no-fontconfig -no-glib -no-gtkstyle |
| 1252 |
+ ) |
| 1253 |
+ qt4_multilib_src_configure |
| 1254 |
} |
| 1255 |
|
| 1256 |
diff --git a/dev-qt/qttest/qttest-4.8.6.ebuild b/dev-qt/qttest/qttest-4.8.6.ebuild |
| 1257 |
index d151b5f..2eb2656 100644 |
| 1258 |
--- a/dev-qt/qttest/qttest-4.8.6.ebuild |
| 1259 |
+++ b/dev-qt/qttest/qttest-4.8.6.ebuild |
| 1260 |
@@ -23,14 +23,14 @@ RDEPEND="${DEPEND}" |
| 1261 |
|
| 1262 |
QT4_TARGET_DIRECTORIES="src/testlib" |
| 1263 |
|
| 1264 |
-src_configure() { |
| 1265 |
- myconf+=" |
| 1266 |
+multilib_src_configure() { |
| 1267 |
+ local myconf=( |
| 1268 |
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor |
| 1269 |
-no-xinerama -no-xshape -no-sm -no-opengl |
| 1270 |
-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng |
| 1271 |
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
| 1272 |
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
| 1273 |
- -no-accessibility -no-fontconfig -no-glib -no-svg" |
| 1274 |
- |
| 1275 |
- qt4-build-multilib_src_configure |
| 1276 |
+ -no-accessibility -no-fontconfig -no-glib -no-svg |
| 1277 |
+ ) |
| 1278 |
+ qt4_multilib_src_configure |
| 1279 |
} |
| 1280 |
|
| 1281 |
diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild b/dev-qt/qttest/qttest-4.8.9999.ebuild |
| 1282 |
index d151b5f..2eb2656 100644 |
| 1283 |
--- a/dev-qt/qttest/qttest-4.8.9999.ebuild |
| 1284 |
+++ b/dev-qt/qttest/qttest-4.8.9999.ebuild |
| 1285 |
@@ -23,14 +23,14 @@ RDEPEND="${DEPEND}" |
| 1286 |
|
| 1287 |
QT4_TARGET_DIRECTORIES="src/testlib" |
| 1288 |
|
| 1289 |
-src_configure() { |
| 1290 |
- myconf+=" |
| 1291 |
+multilib_src_configure() { |
| 1292 |
+ local myconf=( |
| 1293 |
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor |
| 1294 |
-no-xinerama -no-xshape -no-sm -no-opengl |
| 1295 |
-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng |
| 1296 |
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
| 1297 |
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff |
| 1298 |
- -no-accessibility -no-fontconfig -no-glib -no-svg" |
| 1299 |
- |
| 1300 |
- qt4-build-multilib_src_configure |
| 1301 |
+ -no-accessibility -no-fontconfig -no-glib -no-svg |
| 1302 |
+ ) |
| 1303 |
+ qt4_multilib_src_configure |
| 1304 |
} |
| 1305 |
|
| 1306 |
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild |
| 1307 |
index d3719f0..bc6ee6b 100644 |
| 1308 |
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild |
| 1309 |
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild |
| 1310 |
@@ -63,13 +63,13 @@ src_prepare() { |
| 1311 |
qt4-build-multilib_src_prepare |
| 1312 |
} |
| 1313 |
|
| 1314 |
-src_configure() { |
| 1315 |
- myconf+=" |
| 1316 |
+multilib_src_configure() { |
| 1317 |
+ local myconf=( |
| 1318 |
-webkit |
| 1319 |
-system-sqlite |
| 1320 |
$(qt_use icu) |
| 1321 |
$(qt_use jit javascript-jit) |
| 1322 |
- $(use gstreamer || echo -DENABLE_VIDEO=0)" |
| 1323 |
- |
| 1324 |
- qt4-build-multilib_src_configure |
| 1325 |
+ $(use gstreamer || echo -DENABLE_VIDEO=0) |
| 1326 |
+ ) |
| 1327 |
+ qt4_multilib_src_configure |
| 1328 |
} |
| 1329 |
|
| 1330 |
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild |
| 1331 |
index d3719f0..bc6ee6b 100644 |
| 1332 |
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild |
| 1333 |
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild |
| 1334 |
@@ -63,13 +63,13 @@ src_prepare() { |
| 1335 |
qt4-build-multilib_src_prepare |
| 1336 |
} |
| 1337 |
|
| 1338 |
-src_configure() { |
| 1339 |
- myconf+=" |
| 1340 |
+multilib_src_configure() { |
| 1341 |
+ local myconf=( |
| 1342 |
-webkit |
| 1343 |
-system-sqlite |
| 1344 |
$(qt_use icu) |
| 1345 |
$(qt_use jit javascript-jit) |
| 1346 |
- $(use gstreamer || echo -DENABLE_VIDEO=0)" |
| 1347 |
- |
| 1348 |
- qt4-build-multilib_src_configure |
| 1349 |
+ $(use gstreamer || echo -DENABLE_VIDEO=0) |
| 1350 |
+ ) |
| 1351 |
+ qt4_multilib_src_configure |
| 1352 |
} |
| 1353 |
|
| 1354 |
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild |
| 1355 |
index e2941e9..2234419 100644 |
| 1356 |
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild |
| 1357 |
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild |
| 1358 |
@@ -29,8 +29,9 @@ QT4_TARGET_DIRECTORIES=" |
| 1359 |
QCONFIG_ADD="xmlpatterns" |
| 1360 |
QCONFIG_DEFINE="QT_XMLPATTERNS" |
| 1361 |
|
| 1362 |
-src_configure() { |
| 1363 |
- myconf+=" -xmlpatterns" |
| 1364 |
- |
| 1365 |
- qt4-build-multilib_src_configure |
| 1366 |
+multilib_src_configure() { |
| 1367 |
+ local myconf=( |
| 1368 |
+ -xmlpatterns |
| 1369 |
+ ) |
| 1370 |
+ qt4_multilib_src_configure |
| 1371 |
} |
| 1372 |
|
| 1373 |
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild |
| 1374 |
index e2941e9..2234419 100644 |
| 1375 |
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild |
| 1376 |
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild |
| 1377 |
@@ -29,8 +29,9 @@ QT4_TARGET_DIRECTORIES=" |
| 1378 |
QCONFIG_ADD="xmlpatterns" |
| 1379 |
QCONFIG_DEFINE="QT_XMLPATTERNS" |
| 1380 |
|
| 1381 |
-src_configure() { |
| 1382 |
- myconf+=" -xmlpatterns" |
| 1383 |
- |
| 1384 |
- qt4-build-multilib_src_configure |
| 1385 |
+multilib_src_configure() { |
| 1386 |
+ local myconf=( |
| 1387 |
+ -xmlpatterns |
| 1388 |
+ ) |
| 1389 |
+ qt4_multilib_src_configure |
| 1390 |
} |
| 1391 |
|
| 1392 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 1393 |
index c685334..7693930 100644 |
| 1394 |
--- a/eclass/qt4-build-multilib.eclass |
| 1395 |
+++ b/eclass/qt4-build-multilib.eclass |
| 1396 |
@@ -54,7 +54,16 @@ RDEPEND=" |
| 1397 |
dev-qt/qtchooser |
| 1398 |
" |
| 1399 |
|
| 1400 |
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm |
| 1401 |
+ |
| 1402 |
+# src_{configure,compile,test,install} are inherited from multilib-minimal |
| 1403 |
+EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm |
| 1404 |
+ |
| 1405 |
+multilib_src_configure() { qt4_multilib_src_configure; } |
| 1406 |
+multilib_src_compile() { qt4_multilib_src_compile; } |
| 1407 |
+multilib_src_test() { qt4_multilib_src_test; } |
| 1408 |
+multilib_src_install() { qt4_multilib_src_install; } |
| 1409 |
+multilib_src_install_all() { qt4_multilib_src_install_all; } |
| 1410 |
+ |
| 1411 |
|
| 1412 |
# @ECLASS-VARIABLE: PATCHES |
| 1413 |
# @DEFAULT_UNSET |
| 1414 |
@@ -257,14 +266,7 @@ qt4-build-multilib_src_prepare() { |
| 1415 |
epatch_user |
| 1416 |
} |
| 1417 |
|
| 1418 |
-# @FUNCTION: qt4-build-multilib_src_configure |
| 1419 |
-# @DESCRIPTION: |
| 1420 |
-# Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES. |
| 1421 |
-qt4-build-multilib_src_configure() { |
| 1422 |
- multilib-minimal_src_configure |
| 1423 |
-} |
| 1424 |
- |
| 1425 |
-multilib_src_configure() { |
| 1426 |
+qt4_multilib_src_configure() { |
| 1427 |
qt4_prepare_env |
| 1428 |
|
| 1429 |
if [[ ${PN} != qtcore ]]; then |
| 1430 |
@@ -373,8 +375,10 @@ multilib_src_configure() { |
| 1431 |
fi |
| 1432 |
fi |
| 1433 |
|
| 1434 |
- # append module-specific arguments |
| 1435 |
- conf+=(${myconf}) |
| 1436 |
+ conf+=( |
| 1437 |
+ # module-specific options |
| 1438 |
+ "${myconf[@]}" |
| 1439 |
+ ) |
| 1440 |
|
| 1441 |
einfo "Configuring with: ${conf[@]}" |
| 1442 |
"${S}"/configure "${conf[@]}" || die "configure failed" |
| 1443 |
@@ -389,41 +393,19 @@ multilib_src_configure() { |
| 1444 |
qt4_foreach_target_subdir qt4_qmake |
| 1445 |
} |
| 1446 |
|
| 1447 |
-# @FUNCTION: qt4-build-multilib_src_compile |
| 1448 |
-# @DESCRIPTION: |
| 1449 |
-# Compiles the code in QT4_TARGET_DIRECTORIES. |
| 1450 |
-qt4-build-multilib_src_compile() { |
| 1451 |
- multilib-minimal_src_compile |
| 1452 |
-} |
| 1453 |
- |
| 1454 |
-multilib_src_compile() { |
| 1455 |
+qt4_multilib_src_compile() { |
| 1456 |
qt4_prepare_env |
| 1457 |
|
| 1458 |
qt4_foreach_target_subdir emake |
| 1459 |
} |
| 1460 |
|
| 1461 |
-# @FUNCTION: qt4-build-multilib_src_test |
| 1462 |
-# @DESCRIPTION: |
| 1463 |
-# Runs unit tests in all QT4_TARGET_DIRECTORIES. |
| 1464 |
-qt4-build-multilib_src_test() { |
| 1465 |
- multilib-minimal_src_test |
| 1466 |
-} |
| 1467 |
- |
| 1468 |
-multilib_src_test() { |
| 1469 |
+qt4_multilib_src_test() { |
| 1470 |
qt4_prepare_env |
| 1471 |
|
| 1472 |
qt4_foreach_target_subdir emake -j1 check |
| 1473 |
} |
| 1474 |
|
| 1475 |
-# @FUNCTION: qt4-build-multilib_src_install |
| 1476 |
-# @DESCRIPTION: |
| 1477 |
-# Performs the actual installation, running 'emake install' |
| 1478 |
-# in all QT4_TARGET_DIRECTORIES, and installing qconfigs. |
| 1479 |
-qt4-build-multilib_src_install() { |
| 1480 |
- multilib-minimal_src_install |
| 1481 |
-} |
| 1482 |
- |
| 1483 |
-multilib_src_install() { |
| 1484 |
+qt4_multilib_src_install() { |
| 1485 |
qt4_prepare_env |
| 1486 |
|
| 1487 |
qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install |
| 1488 |
@@ -438,14 +420,7 @@ multilib_src_install() { |
| 1489 |
fix_includes |
| 1490 |
} |
| 1491 |
|
| 1492 |
-multilib_src_install_all() { |
| 1493 |
- qt4-build-multilib_src_install_all |
| 1494 |
-} |
| 1495 |
- |
| 1496 |
-# @FUNCTION: qt4-build-multilib_src_install_all |
| 1497 |
-# @DESCRIPTION: |
| 1498 |
-# Common install phase for all multilib ABIs. |
| 1499 |
-qt4-build-multilib_src_install_all() { |
| 1500 |
+qt4_multilib_src_install_all() { |
| 1501 |
# install private headers of a few modules |
| 1502 |
if has ${PN} qtcore qtdeclarative qtgui qtscript; then |
| 1503 |
local moduledir=${PN#qt} |
Archives