[gentoo-commits] proj/kde:master commit in: sys-auth/polkit-qt/

["Johannes Huber" <johu@gentoo.org>]

commit:     7ec7c7662f2a9ef8a529e6faab79bc7f84fd2922
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 20:48:41 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 20:48:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ec7c766

sys-auth/polkit-qt: Drop Qt4 support

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-auth/polkit-qt/polkit-qt-9999.ebuild | 62 ++++++++------------------------
 1 file changed, 14 insertions(+), 48 deletions(-)

diff --git a/sys-auth/polkit-qt/polkit-qt-9999.ebuild b/sys-auth/polkit-qt/polkit-qt-9999.ebuild
index 6ef6906e1a..bf58a5bc98 100644
--- a/sys-auth/polkit-qt/polkit-qt-9999.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils multibuild git-r3
+inherit cmake-utils git-r3
 
 DESCRIPTION="PolicyKit Qt API wrapper library"
 HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/"
@@ -12,62 +12,28 @@ EGIT_REPO_URI=( "https://anongit.kde.org/polkit-qt-1" )
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug examples qt4 +qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="debug examples"
 
 RDEPEND="
 	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	>=sys-auth/polkit-0.103
-	qt4? (
-		dev-qt/qtcore:4[glib]
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[glib]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		examples? ( dev-qt/qtxml:5 )
-	)
+	examples? ( dev-qt/qtxml:5 )
 "
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README README.porting TODO )
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-			-DBUILD_EXAMPLES=$(usex examples)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_QT4=ON )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
-			mycmakeargs+=( -DUSE_QT5=ON )
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DUSE_QT4=OFF
+		-DUSE_QT5=ON
+	)
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	cmake-utils_src_configure
 }