From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A71931382C5 for ; Thu, 5 Apr 2018 18:18:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A35DFE0932; Thu, 5 Apr 2018 18:18:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F2C6E0932 for ; Thu, 5 Apr 2018 18:18:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C7A3335C78 for ; Thu, 5 Apr 2018 18:17:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1633A275 for ; Thu, 5 Apr 2018 18:17:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1522951532.c2500848e05e92f47b5ec7465453b0672c8db2f6.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/breeze/breeze-9999.ebuild X-VCS-Directories: kde-plasma/breeze/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c2500848e05e92f47b5ec7465453b0672c8db2f6 X-VCS-Branch: master Date: Thu, 5 Apr 2018 18:17:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 380b7532-3b98-4a2a-9577-fbb5129e0160 X-Archives-Hash: 9e6ff3dc99a90f649e4d453ce4a00671 commit: c2500848e05e92f47b5ec7465453b0672c8db2f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 5 18:05:32 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 5 18:05:32 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2500848 kde-plasma/breeze: Drop USE=qt4, flag-o-matic and multibuild eclasses Package-Manager: Portage-2.3.28, Repoman-2.3.9 kde-plasma/breeze/breeze-9999.ebuild | 53 +++++------------------------------- 1 file changed, 7 insertions(+), 46 deletions(-) diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild index fd7cc65eeb..3bf55c5b42 100644 --- a/kde-plasma/breeze/breeze-9999.ebuild +++ b/kde-plasma/breeze/breeze-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 }