From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8FB35138306 for ; Wed, 13 Jul 2016 17:25:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5ADD21C21A; Wed, 13 Jul 2016 17:25:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5811821C21A for ; Wed, 13 Jul 2016 17:25:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C71F340B23 for ; Wed, 13 Jul 2016 17:25:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA72F2440 for ; Wed, 13 Jul 2016 17:25:09 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1468430698.125bc025b7e91c3f4b60f219416b62be04fcbf00.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/phonon/phonon-4.8.3-r1.ebuild media-libs/phonon/phonon-4.9.0.ebuild media-libs/phonon/phonon-9999.ebuild X-VCS-Directories: media-libs/phonon/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 125bc025b7e91c3f4b60f219416b62be04fcbf00 X-VCS-Branch: master Date: Wed, 13 Jul 2016 17:25:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 51c7d3d3-8a8d-4515-b0c9-ca5c26d22110 X-Archives-Hash: 2d319c1c59418fb058dae7230b89e3fc commit: 125bc025b7e91c3f4b60f219416b62be04fcbf00 Author: Michael Palimaka gentoo org> AuthorDate: Wed Jul 13 17:23:10 2016 +0000 Commit: Michael Palimaka gentoo 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