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 BAEDA1382C5 for ; Wed, 25 Apr 2018 23:30:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0129E0921; Wed, 25 Apr 2018 23:30:18 +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 BA0D3E0920 for ; Wed, 25 Apr 2018 23:30:18 +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 B7AAD335C72 for ; Wed, 25 Apr 2018 23:30:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFCDF28B for ; Wed, 25 Apr 2018 23:30:09 +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: <1524698935.0aaad753e9d61e359df559b54931a0e61bcb1f79.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/oxygen/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/oxygen/oxygen-5.12.49.9999.ebuild X-VCS-Directories: kde-plasma/oxygen/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0aaad753e9d61e359df559b54931a0e61bcb1f79 X-VCS-Branch: master Date: Wed, 25 Apr 2018 23:30:09 +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: e5ad3cd9-da48-4b67-9c70-dae9817e166b X-Archives-Hash: 1654a8f8a9942b41c7d485b3fe0241bc commit: 0aaad753e9d61e359df559b54931a0e61bcb1f79 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 23:28:55 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 25 23:28:55 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0aaad753 kde-plasma/oxygen: Drop USE=qt4, flag-o-matic and multibuild eclasses Package-Manager: Portage-2.3.31, Repoman-2.3.9 kde-plasma/oxygen/oxygen-5.12.49.9999.ebuild | 59 +++------------------------- 1 file changed, 6 insertions(+), 53 deletions(-) diff --git a/kde-plasma/oxygen/oxygen-5.12.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.12.49.9999.ebuild index 80ce89acaf..d6545588f4 100644 --- a/kde-plasma/oxygen/oxygen-5.12.49.9999.ebuild +++ b/kde-plasma/oxygen/oxygen-5.12.49.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 }