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

[Davide Pesavento]

commit:     8f2e955183ee5287518b8f28fe9a4ba09e0d0e82
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 14:12:53 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 31 14:12:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f2e9551

[qt4-build-multilib.eclass] Sync.

 eclass/qt4-build-multilib.eclass | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index a244484..245c020 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -154,20 +154,6 @@ qt4-build-multilib_src_prepare() {
                        || die "sed failed (skip X11 tests)"
        fi
 
-       if use_if_iuse aqua; then
-               sed -i \
-                       -e '/^CONFIG/s:app_bundle::' \
-                       -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname 
absolute_library_soname:' \
-                       mkspecs/$(qt4_get_mkspec)/qmake.conf \
-                       || die "sed failed (aqua)"
-
-               # we are crazy and build cocoa + qt3support
-               if { ! in_iuse qt3support || use qt3support; } && [[ 
${CHOST##*-darwin} -ge 9 ]]; then
-                       sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" 
in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-                               configure || die "sed failed (cocoa + 
qt3support)"
-               fi
-       fi
-
        if [[ ${PN} == qtcore ]]; then
                # Bug 373061
                # qmake bus errors with -O2 or -O3 but -O1 works
@@ -182,6 +168,11 @@ qt4-build-multilib_src_prepare() {
                fi
        fi
 
+       if [[ ${PN} == qtwebkit ]]; then
+               # Bug 550780
+               filter-flags -fgraphite-identity -floop-strip-mine
+       fi
+
        # Bug 261632
        if use ppc64; then
                append-flags -mminimal-toc
@@ -220,6 +211,20 @@ qt4-build-multilib_src_prepare() {
                mkspecs/$(qt4_get_mkspec)/qmake.conf \
                || die "sed QMAKE_(LIB|INC)DIR failed"
 
+       if use_if_iuse aqua; then
+               sed -i \
+                       -e '/^CONFIG/s:app_bundle::' \
+                       -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname 
absolute_library_soname:' \
+                       mkspecs/$(qt4_get_mkspec)/qmake.conf \
+                       || die "sed failed (aqua)"
+
+               # we are crazy and build cocoa + qt3support
+               if { ! in_iuse qt3support || use qt3support; } && [[ 
${CHOST##*-darwin} -ge 9 ]]; then
+                       sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" 
in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
+                               configure || die "sed failed (cocoa + 
qt3support)"
+               fi
+       fi
+
        if [[ ${CHOST} == *-darwin* ]]; then
                # Set FLAGS and remove -arch, since our gcc-apple is multilib 
crippled (by design)
                sed -i \