commit: 6b1497726c4b71fecc25ff142899690d385d095c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Apr 25 23:26:27 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Apr 25 23:28:05 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b149772
kde-plasma/breeze: Drop USE=qt4, flag-o-matic and multibuild eclasses Package-Manager: Portage-2.3.31, Repoman-2.3.9 kde-plasma/breeze/breeze-5.12.49.9999.ebuild | 53 ++++------------------------ 1 file changed, 7 insertions(+), 46 deletions(-) diff --git a/kde-plasma/breeze/breeze-5.12.49.9999.ebuild b/kde-plasma/breeze/breeze-5.12.49.9999.ebuild index fd7cc65eeb..3bf55c5b42 100644 --- a/kde-plasma/breeze/breeze-5.12.49.9999.ebuild +++ b/kde-plasma/breeze/breeze-5.12.49.9999.ebuild @@ -3,14 +3,12 @@ EAPI=6 -inherit flag-o-matic kde5 multibuild +inherit kde5 DESCRIPTION="Breeze visual style for the Plasma desktop" HOMEPAGE="https://cgit.kde.org/breeze.git"; KEYWORDS="" -IUSE="qt4 wayland X" - -REQUIRED_USE="qt4? ( X )" +IUSE="wayland X" COMMON_DEPEND=" $(add_frameworks_dep frameworkintegration) @@ -27,10 +25,6 @@ COMMON_DEPEND=" $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) - qt4? ( - kde-frameworks/kdelibs:4 - x11-libs/libX11 - ) wayland? ( $(add_frameworks_dep kwayland) ) X? ( $(add_qt_dep qtx11extras) @@ -39,49 +33,16 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kpackage) - qt4? ( dev-util/automoc:0 ) " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep breeze-icons) $(add_plasma_dep kde-cli-tools) " -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) - $(cmake-utils_use_find_package X XCB) - ) - 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) + $(cmake-utils_use_find_package X XCB) + ) + kde5_src_configure }
