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

[Andreas Sturmlechner]

commit:     a9dcfd77d6f9d6583cb2039e8e420955c214f811
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 12:25:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 09:48:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9dcfd77

media-libs/phonon: Drop USE=qt4 and remove cmake-multilib

Qt5 does not support multilib.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/phonon/phonon-9999.ebuild | 99 +++++-------------------------------
 1 file changed, 13 insertions(+), 86 deletions(-)

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index b16a70f4b3c..e560a9e5983 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,14 +11,14 @@ else
 	inherit git-r3
 fi
 
-inherit cmake-multilib multibuild qmake-utils
+inherit cmake-utils qmake-utils
 
 DESCRIPTION="KDE multimedia API"
 HOMEPAGE="https://phonon.kde.org/"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-IUSE="debug designer gstreamer pulseaudio qt4 +vlc"
+IUSE="debug designer gstreamer pulseaudio +vlc"
 
 RDEPEND="
 	!!dev-qt/qtphonon:4
@@ -28,101 +28,28 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	designer? ( dev-qt/designer:5 )
 	pulseaudio? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		>=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
-	)
-	qt4? (
-		>=dev-qt/qtcore-4.8.7-r2:4[${MULTILIB_USEDEP}]
-		>=dev-qt/qtdbus-4.8.7:4[${MULTILIB_USEDEP}]
-		>=dev-qt/qtgui-4.8.7:4[${MULTILIB_USEDEP}]
-		designer? ( >=dev-qt/designer-4.8.7:4[${MULTILIB_USEDEP}] )
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
 	)
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig
 "
 PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5(+)] )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
+	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) qt5 )
-}
-
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DPHONON_BUILD_PHONON4QT5=ON
 		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
 		-DWITH_GLIB2=$(usex pulseaudio)
 		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
+		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
 	)
-
-	if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-		mycmakeargs+=(
-			-DPHONON_BUILD_PHONON4QT5=OFF
-			-DWITH_QZeitgeist=OFF
-		)
-	fi
-	if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-		mycmakeargs+=(
-			-DPHONON_BUILD_PHONON4QT5=ON
-			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		)
-	fi
-
 	cmake-utils_src_configure
 }
-
-src_configure() {
-	myconfigure() {
-		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
-		if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_configure
-		elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-			multilib_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	mycompile() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_compile
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_compile
-		fi
-	}
-
-	multibuild_foreach_variant mycompile
-}
-
-src_test() {
-	mytest() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_test
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_test
-		fi
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	myinstall() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			cmake-multilib_src_install
-		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			cmake-utils_src_install
-		fi
-	}
-
-	multibuild_foreach_variant myinstall
-}