[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/

[Michael Palimaka]

commit:     125bc025b7e91c3f4b60f219416b62be04fcbf00
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 17:23:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 17:24:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=125bc025

media-libs/phonon: ensure zeitgeist is always disabled on a foreign ABI

dev-libs/libqzeitgeist is not multilib-enabled, so if not explicitly disabled
the native library may be detected during a foreign ABI build causing a build
failure.

Package-Manager: portage-2.3.0

 media-libs/phonon/phonon-4.8.3-r1.ebuild | 4 ++--
 media-libs/phonon/phonon-4.9.0.ebuild    | 2 +-
 media-libs/phonon/phonon-9999.ebuild     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/phonon/phonon-4.8.3-r1.ebuild 
b/media-libs/phonon/phonon-4.8.3-r1.ebuild
index c1b5b0e..6b06e7f 100644
--- a/media-libs/phonon/phonon-4.8.3-r1.ebuild
+++ b/media-libs/phonon/phonon-4.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -73,7 +73,7 @@ multilib_src_configure() {
                $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
                $(cmake-utils_use_with pulseaudio GLIB2)
                $(cmake-utils_use_with pulseaudio PulseAudio)
-               $(multilib_is_native_abi && cmake-utils_use_with zeitgeist 
QZeitgeist)
+               $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex 
zeitgeist) || echo -DWITH_QZeitgeist=OFF)
                
-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
        )
        if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then

diff --git a/media-libs/phonon/phonon-4.9.0.ebuild 
b/media-libs/phonon/phonon-4.9.0.ebuild
index 8a2830c..ae53534 100644
--- a/media-libs/phonon/phonon-4.9.0.ebuild
+++ b/media-libs/phonon/phonon-4.9.0.ebuild
@@ -69,7 +69,7 @@ multilib_src_configure() {
                -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
                -DWITH_GLIB2=$(usex pulseaudio)
                -DWITH_PulseAudio=$(usex pulseaudio)
-               $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex 
zeitgeist))
+               $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex 
zeitgeist) || echo -DWITH_QZeitgeist=OFF)
        )
 
        if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then

diff --git a/media-libs/phonon/phonon-9999.ebuild 
b/media-libs/phonon/phonon-9999.ebuild
index 8a2830c..ae53534 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -69,7 +69,7 @@ multilib_src_configure() {
                -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
                -DWITH_GLIB2=$(usex pulseaudio)
                -DWITH_PulseAudio=$(usex pulseaudio)
-               $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex 
zeitgeist))
+               $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex 
zeitgeist) || echo -DWITH_QZeitgeist=OFF)
        )
 
        if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then