From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 29BE71388C1 for ; Tue, 22 Dec 2015 16:06:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCB1221C0E6; Tue, 22 Dec 2015 16:06:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5707D21C0E6 for ; Tue, 22 Dec 2015 16:06:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54661340666 for ; Tue, 22 Dec 2015 16:06:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AE79AF8 for ; Tue, 22 Dec 2015 16:06:21 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1450800366.7dfb6d0f9e5795a0050ce6315236ce16bd805b92.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/systemsettings/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/systemsettings/metadata.xml kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild kde-plasma/systemsettings/systemsettings-9999.ebuild X-VCS-Directories: kde-plasma/systemsettings/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 7dfb6d0f9e5795a0050ce6315236ce16bd805b92 X-VCS-Branch: master Date: Tue, 22 Dec 2015 16:06:21 +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: 557f5c1f-27e7-4eb9-8d17-c0ff92ce46e9 X-Archives-Hash: 6922de33db88105a76b12fc12d18fa3c commit: 7dfb6d0f9e5795a0050ce6315236ce16bd805b92 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Dec 20 20:56:28 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Dec 22 16:06:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7dfb6d0f kde-plasma/systemsettings: Add USE=classic, force handbook optional New use flag makes classic mode plugin optional. Package-Manager: portage-2.2.24 kde-plasma/systemsettings/metadata.xml | 3 +++ .../systemsettings/systemsettings-5.5.49.9999.ebuild | 14 +++++++++++--- kde-plasma/systemsettings/systemsettings-9999.ebuild | 14 +++++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/kde-plasma/systemsettings/metadata.xml b/kde-plasma/systemsettings/metadata.xml index a23f444..5aac27d 100644 --- a/kde-plasma/systemsettings/metadata.xml +++ b/kde-plasma/systemsettings/metadata.xml @@ -2,4 +2,7 @@ kde + + Enable classic mode plugin, requires kde-frameworks/khtml + diff --git a/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild b/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild index b8b65dc..6d50ad0 100644 --- a/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild @@ -4,12 +4,12 @@ EAPI=5 -KDE_HANDBOOK="true" +KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="System settings utility" KEYWORDS="" -IUSE="gtk" +IUSE="classic gtk" DEPEND=" $(add_frameworks_dep kauth) @@ -19,7 +19,6 @@ DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep khtml) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio) @@ -31,8 +30,17 @@ DEPEND=" dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 + classic? ( $(add_frameworks_dep khtml) ) " RDEPEND="${DEPEND} gtk? ( $(add_plasma_dep kde-gtk-config) ) !kde-base/systemsettings:4 " + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package classic KF5KHtml) + ) + + kde5_src_configure +} diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild index b8b65dc..6d50ad0 100644 --- a/kde-plasma/systemsettings/systemsettings-9999.ebuild +++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild @@ -4,12 +4,12 @@ EAPI=5 -KDE_HANDBOOK="true" +KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="System settings utility" KEYWORDS="" -IUSE="gtk" +IUSE="classic gtk" DEPEND=" $(add_frameworks_dep kauth) @@ -19,7 +19,6 @@ DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep khtml) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio) @@ -31,8 +30,17 @@ DEPEND=" dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 + classic? ( $(add_frameworks_dep khtml) ) " RDEPEND="${DEPEND} gtk? ( $(add_plasma_dep kde-gtk-config) ) !kde-base/systemsettings:4 " + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package classic KF5KHtml) + ) + + kde5_src_configure +}