| 1 |
commit: 7dfb6d0f9e5795a0050ce6315236ce16bd805b92 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 20 20:56:28 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 22 16:06:06 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7dfb6d0f |
| 7 |
|
| 8 |
kde-plasma/systemsettings: Add USE=classic, force handbook optional |
| 9 |
|
| 10 |
New use flag makes classic mode plugin optional. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.24 |
| 13 |
|
| 14 |
kde-plasma/systemsettings/metadata.xml | 3 +++ |
| 15 |
.../systemsettings/systemsettings-5.5.49.9999.ebuild | 14 +++++++++++--- |
| 16 |
kde-plasma/systemsettings/systemsettings-9999.ebuild | 14 +++++++++++--- |
| 17 |
3 files changed, 25 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/systemsettings/metadata.xml b/kde-plasma/systemsettings/metadata.xml |
| 20 |
index a23f444..5aac27d 100644 |
| 21 |
--- a/kde-plasma/systemsettings/metadata.xml |
| 22 |
+++ b/kde-plasma/systemsettings/metadata.xml |
| 23 |
@@ -2,4 +2,7 @@ |
| 24 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 25 |
<pkgmetadata> |
| 26 |
<herd>kde</herd> |
| 27 |
+ <use> |
| 28 |
+ <flag name="classic">Enable classic mode plugin, requires <pkg>kde-frameworks/khtml</pkg></flag> |
| 29 |
+ </use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
diff --git a/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild b/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild |
| 33 |
index b8b65dc..6d50ad0 100644 |
| 34 |
--- a/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild |
| 35 |
+++ b/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild |
| 36 |
@@ -4,12 +4,12 @@ |
| 37 |
|
| 38 |
EAPI=5 |
| 39 |
|
| 40 |
-KDE_HANDBOOK="true" |
| 41 |
+KDE_HANDBOOK="forceoptional" |
| 42 |
inherit kde5 |
| 43 |
|
| 44 |
DESCRIPTION="System settings utility" |
| 45 |
KEYWORDS="" |
| 46 |
-IUSE="gtk" |
| 47 |
+IUSE="classic gtk" |
| 48 |
|
| 49 |
DEPEND=" |
| 50 |
$(add_frameworks_dep kauth) |
| 51 |
@@ -19,7 +19,6 @@ DEPEND=" |
| 52 |
$(add_frameworks_dep kconfigwidgets) |
| 53 |
$(add_frameworks_dep kcoreaddons) |
| 54 |
$(add_frameworks_dep kdbusaddons) |
| 55 |
- $(add_frameworks_dep khtml) |
| 56 |
$(add_frameworks_dep ki18n) |
| 57 |
$(add_frameworks_dep kiconthemes) |
| 58 |
$(add_frameworks_dep kio) |
| 59 |
@@ -31,8 +30,17 @@ DEPEND=" |
| 60 |
dev-qt/qtdbus:5 |
| 61 |
dev-qt/qtgui:5 |
| 62 |
dev-qt/qtwidgets:5 |
| 63 |
+ classic? ( $(add_frameworks_dep khtml) ) |
| 64 |
" |
| 65 |
RDEPEND="${DEPEND} |
| 66 |
gtk? ( $(add_plasma_dep kde-gtk-config) ) |
| 67 |
!kde-base/systemsettings:4 |
| 68 |
" |
| 69 |
+ |
| 70 |
+src_configure() { |
| 71 |
+ local mycmakeargs=( |
| 72 |
+ $(cmake-utils_use_find_package classic KF5KHtml) |
| 73 |
+ ) |
| 74 |
+ |
| 75 |
+ kde5_src_configure |
| 76 |
+} |
| 77 |
|
| 78 |
diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild |
| 79 |
index b8b65dc..6d50ad0 100644 |
| 80 |
--- a/kde-plasma/systemsettings/systemsettings-9999.ebuild |
| 81 |
+++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild |
| 82 |
@@ -4,12 +4,12 @@ |
| 83 |
|
| 84 |
EAPI=5 |
| 85 |
|
| 86 |
-KDE_HANDBOOK="true" |
| 87 |
+KDE_HANDBOOK="forceoptional" |
| 88 |
inherit kde5 |
| 89 |
|
| 90 |
DESCRIPTION="System settings utility" |
| 91 |
KEYWORDS="" |
| 92 |
-IUSE="gtk" |
| 93 |
+IUSE="classic gtk" |
| 94 |
|
| 95 |
DEPEND=" |
| 96 |
$(add_frameworks_dep kauth) |
| 97 |
@@ -19,7 +19,6 @@ DEPEND=" |
| 98 |
$(add_frameworks_dep kconfigwidgets) |
| 99 |
$(add_frameworks_dep kcoreaddons) |
| 100 |
$(add_frameworks_dep kdbusaddons) |
| 101 |
- $(add_frameworks_dep khtml) |
| 102 |
$(add_frameworks_dep ki18n) |
| 103 |
$(add_frameworks_dep kiconthemes) |
| 104 |
$(add_frameworks_dep kio) |
| 105 |
@@ -31,8 +30,17 @@ DEPEND=" |
| 106 |
dev-qt/qtdbus:5 |
| 107 |
dev-qt/qtgui:5 |
| 108 |
dev-qt/qtwidgets:5 |
| 109 |
+ classic? ( $(add_frameworks_dep khtml) ) |
| 110 |
" |
| 111 |
RDEPEND="${DEPEND} |
| 112 |
gtk? ( $(add_plasma_dep kde-gtk-config) ) |
| 113 |
!kde-base/systemsettings:4 |
| 114 |
" |
| 115 |
+ |
| 116 |
+src_configure() { |
| 117 |
+ local mycmakeargs=( |
| 118 |
+ $(cmake-utils_use_find_package classic KF5KHtml) |
| 119 |
+ ) |
| 120 |
+ |
| 121 |
+ kde5_src_configure |
| 122 |
+} |
Archives