[gentoo-commits] proj/kde:master commit in: kde-plasma/oxygen/

[Andreas Sturmlechner]

commit:     1cb8ef057c0218877c9f9d96cbb2fbd0eaf480b9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  5 18:03:42 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  5 18:03:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1cb8ef05

kde-plasma/oxygen: Drop USE=qt4, flag-o-matic and multibuild eclasses

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 kde-plasma/oxygen/oxygen-9999.ebuild | 59 ++++--------------------------------
 1 file changed, 6 insertions(+), 53 deletions(-)

diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild
index 80ce89acaf..d6545588f4 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-9999.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=6
 
-inherit flag-o-matic kde5 multibuild
+inherit kde5
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/oxygen.git"
 KEYWORDS=""
-IUSE="qt4 wayland"
+IUSE="wayland"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -28,66 +28,19 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
 	x11-libs/libxcb
-	qt4? (
-		>=dev-qt/qtcore-4.8.7-r2:4
-		>=dev-qt/qtdbus-4.8.7:4
-		>=dev-qt/qtgui-4.8.7:4
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
 	wayland? ( $(add_frameworks_dep kwayland) )
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kservice)
-	qt4? (
-		dev-util/automoc:0
-		virtual/pkgconfig
-	)
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	qt4? (
-		!kde-plasma/kstyles:4
-		!kde-plasma/liboxygenstyle:4
-	)
 	!kde-plasma/kdebase-cursors:4
 "
 
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			use debug || append-cppflags -DQT_NO_DEBUG
-			mycmakeargs+=(
-				-DUSE_KDE4=true
-				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-			)
-			cmake-utils_src_configure
-		else
-			mycmakeargs+=(
-				$(cmake-utils_use_find_package wayland KF5Wayland)
-			)
-			kde5_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+	kde5_src_configure
 }