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

[Michael Palimaka]

commit:     465542cd55d1b1e8abeae081aab71a70e86a79c1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 06:50:09 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 06:54:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=465542cd

dev-qt/qtwayland: fix xcomposite USE flag for 5.9

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwayland/qtwayland-5.9.1.ebuild    | 8 ++------
 dev-qt/qtwayland/qtwayland-5.9.9999.ebuild | 8 ++------
 dev-qt/qtwayland/qtwayland-5.9999.ebuild   | 8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild 
b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
index ff3ca8ba..9455cb3b 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
@@ -33,11 +33,7 @@ src_prepare() {
                src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
                tests/auto/compositor/compositor/compositor.pro
 
-       qt5-build_src_prepare
-}
+       use xcomposite || rm -r config.tests/xcomposite || die
 
-src_configure() {
-       qt_use_compile_test xcomposite
-
-       qt5-build_src_configure
+       qt5-build_src_prepare
 }

diff --git a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild
index ff3ca8ba..9455cb3b 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild
@@ -33,11 +33,7 @@ src_prepare() {
                src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
                tests/auto/compositor/compositor/compositor.pro
 
-       qt5-build_src_prepare
-}
+       use xcomposite || rm -r config.tests/xcomposite || die
 
-src_configure() {
-       qt_use_compile_test xcomposite
-
-       qt5-build_src_configure
+       qt5-build_src_prepare
 }

diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
index ff3ca8ba..9455cb3b 100644
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
@@ -33,11 +33,7 @@ src_prepare() {
                src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
                tests/auto/compositor/compositor/compositor.pro
 
-       qt5-build_src_prepare
-}
+       use xcomposite || rm -r config.tests/xcomposite || die
 
-src_configure() {
-       qt_use_compile_test xcomposite
-
-       qt5-build_src_configure
+       qt5-build_src_prepare
 }