media-libs/phonon: Fix some cmake warnings

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
index 2474f3bab8dbb172af14a7c6aa0c3709af8cfd5a..c7057d376919bda57c9efe4cfda7192f32db51bf 100644 (file)
--- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
@@ -67,15 +67,20 @@ multilib_src_configure() {
                -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
                -DWITH_GLIB2=$(usex pulseaudio)
                -DWITH_PulseAudio=$(usex pulseaudio)
-               -DWITH_QZeitgeist=OFF
                -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
        )
 
        if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-               mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
+               mycmakeargs+=(
+                       -DPHONON_BUILD_PHONON4QT5=OFF
+                       -DWITH_QZeitgeist=OFF
+               )
        fi
        if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-               mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
+               mycmakeargs+=(
+                       -DPHONON_BUILD_PHONON4QT5=ON
+                       -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
+               )
        fi
 
        cmake-utils_src_configure

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index e39cec4c2f6707045ba3057bdb65352ea34c9eaf..838ebcade94a8151adab742f01163b5a7648b109 100644 (file)
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -63,15 +63,20 @@ multilib_src_configure() {
                -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
                -DWITH_GLIB2=$(usex pulseaudio)
                -DWITH_PulseAudio=$(usex pulseaudio)
-               -DWITH_QZeitgeist=OFF
                -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
        )
 
        if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-               mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
+               mycmakeargs+=(
+                       -DPHONON_BUILD_PHONON4QT5=OFF
+                       -DWITH_QZeitgeist=OFF
+               )
        fi
        if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-               mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
+               mycmakeargs+=(
+                       -DPHONON_BUILD_PHONON4QT5=ON
+                       -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
+               )
        fi
 
        cmake-utils_src_configure