commit: 7dfb6d0f9e5795a0050ce6315236ce16bd805b92 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Dec 20 20:56:28 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> 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 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>kde</herd> + <use> + <flag name="classic">Enable classic mode plugin, requires <pkg>kde-frameworks/khtml</pkg></flag> + </use> </pkgmetadata> 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 +}
