1 |
commit: e89a583378434c2e961ecb2ca355e24da4ac5170 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Oct 8 21:31:35 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 9 14:56:02 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e89a5833 |
7 |
|
8 |
app-office/skrooge: Add USE=designer,kde; KDE_HANDBOOK=optional |
9 |
|
10 |
QT_MINIMAL=5.7.0 allows to drop kdelibs4support and make the KDE_HANDBOOK |
11 |
change. |
12 |
|
13 |
Package-Manager: portage-2.3.0 |
14 |
|
15 |
app-office/skrooge/metadata.xml | 1 + |
16 |
app-office/skrooge/skrooge-9999.ebuild | 20 +++++++++++++------- |
17 |
2 files changed, 14 insertions(+), 7 deletions(-) |
18 |
|
19 |
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml |
20 |
index fd15ec3..330eaf6 100644 |
21 |
--- a/app-office/skrooge/metadata.xml |
22 |
+++ b/app-office/skrooge/metadata.xml |
23 |
@@ -8,5 +8,6 @@ |
24 |
<use> |
25 |
<flag name="activities">Enable kactivities support</flag> |
26 |
<flag name="crypt">Enable encryption using <pkg>dev-db/sqlcipher</pkg></flag> |
27 |
+ <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> |
28 |
</use> |
29 |
</pkgmetadata> |
30 |
|
31 |
diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild |
32 |
index 81fd308..2ff9248 100644 |
33 |
--- a/app-office/skrooge/skrooge-9999.ebuild |
34 |
+++ b/app-office/skrooge/skrooge-9999.ebuild |
35 |
@@ -5,8 +5,9 @@ |
36 |
EAPI=6 |
37 |
|
38 |
KDE_GCC_MINIMAL="4.9" |
39 |
-KDE_HANDBOOK="forceoptional" |
40 |
+KDE_HANDBOOK="optional" |
41 |
KDE_TEST="forceoptional" |
42 |
+QT_MINIMAL="5.7.0" |
43 |
VIRTUALX_REQUIRED="test" |
44 |
inherit kde5 |
45 |
|
46 |
@@ -16,7 +17,7 @@ HOMEPAGE="http://www.skrooge.org/" |
47 |
|
48 |
LICENSE="GPL-2" |
49 |
KEYWORDS="" |
50 |
-IUSE="activities crypt ofx" |
51 |
+IUSE="activities crypt designer kde ofx" |
52 |
|
53 |
COMMON_DEPEND=" |
54 |
$(add_frameworks_dep karchive) |
55 |
@@ -25,7 +26,6 @@ COMMON_DEPEND=" |
56 |
$(add_frameworks_dep kconfigwidgets) |
57 |
$(add_frameworks_dep kcoreaddons) |
58 |
$(add_frameworks_dep kdbusaddons) |
59 |
- $(add_frameworks_dep kdelibs4support) |
60 |
$(add_frameworks_dep ki18n) |
61 |
$(add_frameworks_dep kiconthemes) |
62 |
$(add_frameworks_dep kio) |
63 |
@@ -34,7 +34,6 @@ COMMON_DEPEND=" |
64 |
$(add_frameworks_dep knotifications) |
65 |
$(add_frameworks_dep knotifyconfig) |
66 |
$(add_frameworks_dep kparts) |
67 |
- $(add_frameworks_dep krunner) |
68 |
$(add_frameworks_dep kservice) |
69 |
$(add_frameworks_dep ktextwidgets) |
70 |
$(add_frameworks_dep kwallet) |
71 |
@@ -56,24 +55,29 @@ COMMON_DEPEND=" |
72 |
activities? ( $(add_frameworks_dep kactivities) ) |
73 |
crypt? ( dev-db/sqlcipher ) |
74 |
!crypt? ( dev-db/sqlite:3 ) |
75 |
+ kde? ( $(add_frameworks_dep krunner) ) |
76 |
ofx? ( >=dev-libs/libofx-0.9.1 ) |
77 |
" |
78 |
DEPEND="${COMMON_DEPEND} |
79 |
- $(add_frameworks_dep kdesignerplugin) |
80 |
$(add_frameworks_dep kguiaddons) |
81 |
$(add_frameworks_dep kjobwidgets) |
82 |
$(add_frameworks_dep kwindowsystem) |
83 |
- $(add_qt_dep designer) |
84 |
dev-libs/libxslt |
85 |
virtual/pkgconfig |
86 |
x11-misc/shared-mime-info |
87 |
+ designer? ( |
88 |
+ $(add_frameworks_dep kdesignerplugin) |
89 |
+ $(add_qt_dep designer) |
90 |
+ ) |
91 |
" |
92 |
RDEPEND="${COMMON_DEPEND} |
93 |
!app-office/skrooge:4 |
94 |
" |
95 |
|
96 |
+REQUIRED_USE="test? ( designer )" |
97 |
+ |
98 |
# hangs + installs files |
99 |
-RESTRICT="test" |
100 |
+RESTRICT+=" test" |
101 |
|
102 |
DOCS=( AUTHORS CHANGELOG README TODO ) |
103 |
|
104 |
@@ -81,7 +85,9 @@ src_configure() { |
105 |
local mycmakeargs=( |
106 |
-DSKG_BUILD_TEST=$(usex test) |
107 |
-DSKG_CIPHER=$(usex crypt) |
108 |
+ -DSKG_DESIGNER=$(usex designer) |
109 |
$(cmake-utils_use_find_package activities KF5Activities) |
110 |
+ $(cmake-utils_use_find_package kde KF5Runner) |
111 |
$(cmake-utils_use_find_package ofx LibOfx) |
112 |
) |