Sync with qt overlay - export AR and OBJDUMP too, use new configure option '-no-libpr...

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index de564e593f4fa96a57c47b7751a03c67e252a574..c84a4cda777797107a041a7576420c1ac9036769 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1589 2015/04/18 13:19:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1590 2015/04/19 18:22:15 kensington Exp $
+
+  19 Apr 2015; Michael Palimaka <kensington@gentoo.org> qt5-build.eclass:
+  Sync with qt overlay - export AR and OBJDUMP too, use new configure option
+  '-no-libproxy' beginning with Qt 5.5, and update gtkstyle comment.
 
   18 Apr 2015; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
   Ban eapi2 and 3 for gnome2.eclass (#539118)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 32263637d60421a756728a72993c8f705b931f93..7d6570ad65aacecd972ed5c32918ffc9df0ec870 100644 (file)
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.15 2015/04/01 18:45:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.16 2015/04/19 18:22:15 kensington Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -469,7 +469,7 @@ qt5_symlink_tools_to_build_dir() {
 # Runs ./configure for modules belonging to qtbase.
 qt5_base_configure() {
        # setup toolchain variables used by configure
-       tc-export CC CXX RANLIB STRIP
+       tc-export AR CC CXX OBJDUMP RANLIB STRIP
        export LD="$(tc-getCXX)"
 
        # configure arguments
@@ -534,6 +534,7 @@ qt5_base_configure() {
                -no-libpng -no-libjpeg
                -no-freetype -no-harfbuzz
                -no-openssl
+               $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
                -no-xinput2 -no-xcb-xlib
 
                # always enable glib event loop support
@@ -542,8 +543,8 @@ qt5_base_configure() {
                # disable everything to prevent automagic deps (part 2)
                -no-pulseaudio -no-alsa
 
-               # disable gtkstyle because it adds qt4 include paths to the compiler
-               # command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
+               # override in qtgui and qtwidgets where x11-libs/cairo[qt4] is blocked
+               # to avoid adding qt4 include paths (bug 433826)
                -no-gtkstyle
 
                # exclude examples and tests from default build