| 1 |
commit: 0724e8b90b74643d8ea54018670135018899b5a3 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 1 16:17:16 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 4 23:18:30 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0724e8b9 |
| 7 |
|
| 8 |
app-office/calligraplan: Patches upstreamed, fix DEPENDs |
| 9 |
|
| 10 |
Upstream commits: |
| 11 |
4f00f651f78d4849f5289b6bca157954f8ff3aeb |
| 12 |
5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
app-office/calligraplan/calligraplan-9999.ebuild | 28 +++++++++++------------- |
| 18 |
app-office/calligraplan/metadata.xml | 1 + |
| 19 |
2 files changed, 14 insertions(+), 15 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-office/calligraplan/calligraplan-9999.ebuild b/app-office/calligraplan/calligraplan-9999.ebuild |
| 22 |
index b33b8ab6b3..4e46498a04 100644 |
| 23 |
--- a/app-office/calligraplan/calligraplan-9999.ebuild |
| 24 |
+++ b/app-office/calligraplan/calligraplan-9999.ebuild |
| 25 |
@@ -16,7 +16,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then |
| 26 |
fi |
| 27 |
|
| 28 |
LICENSE="GPL-2" |
| 29 |
-IUSE="activities dbus +holidays pim X" |
| 30 |
+IUSE="activities +holidays kwallet pim X" |
| 31 |
|
| 32 |
# FIXME: Disabled by upstream for good reason |
| 33 |
# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940) |
| 34 |
@@ -27,40 +27,40 @@ IUSE="activities dbus +holidays pim X" |
| 35 |
# =dev-libs/kreport-3.0*:5 |
| 36 |
DEPEND=" |
| 37 |
$(add_frameworks_dep karchive) |
| 38 |
- $(add_frameworks_dep kcmutils) |
| 39 |
$(add_frameworks_dep kconfig) |
| 40 |
$(add_frameworks_dep kconfigwidgets) |
| 41 |
$(add_frameworks_dep kcoreaddons) |
| 42 |
- $(add_frameworks_dep kemoticons) |
| 43 |
+ $(add_frameworks_dep kdbusaddons) |
| 44 |
$(add_frameworks_dep kglobalaccel) |
| 45 |
$(add_frameworks_dep kguiaddons) |
| 46 |
$(add_frameworks_dep khtml) |
| 47 |
$(add_frameworks_dep ki18n) |
| 48 |
$(add_frameworks_dep kiconthemes) |
| 49 |
$(add_frameworks_dep kio) |
| 50 |
- $(add_frameworks_dep kitemmodels) |
| 51 |
$(add_frameworks_dep kitemviews) |
| 52 |
$(add_frameworks_dep kjobwidgets) |
| 53 |
$(add_frameworks_dep knotifications) |
| 54 |
$(add_frameworks_dep kparts) |
| 55 |
+ $(add_frameworks_dep kservice) |
| 56 |
$(add_frameworks_dep ktextwidgets) |
| 57 |
- $(add_frameworks_dep kwallet) |
| 58 |
$(add_frameworks_dep kwidgetsaddons) |
| 59 |
$(add_frameworks_dep kwindowsystem) |
| 60 |
$(add_frameworks_dep kxmlgui) |
| 61 |
$(add_qt_dep designer) |
| 62 |
+ $(add_qt_dep qtdbus) |
| 63 |
$(add_qt_dep qtgui) |
| 64 |
- $(add_qt_dep qtnetwork) |
| 65 |
$(add_qt_dep qtprintsupport) |
| 66 |
- $(add_qt_dep qtsvg) |
| 67 |
$(add_qt_dep qtwidgets) |
| 68 |
$(add_qt_dep qtxml) |
| 69 |
dev-lang/perl |
| 70 |
dev-libs/kdiagram:5 |
| 71 |
sys-libs/zlib |
| 72 |
activities? ( $(add_frameworks_dep kactivities) ) |
| 73 |
- dbus? ( $(add_qt_dep qtdbus) ) |
| 74 |
holidays? ( $(add_frameworks_dep kholidays) ) |
| 75 |
+ kwallet? ( |
| 76 |
+ $(add_frameworks_dep kwallet) |
| 77 |
+ app-crypt/qca:2[qt5(+)] |
| 78 |
+ ) |
| 79 |
pim? ( |
| 80 |
$(add_kdeapps_dep kcalcore) |
| 81 |
$(add_kdeapps_dep kcontacts) |
| 82 |
@@ -73,23 +73,21 @@ DEPEND=" |
| 83 |
RDEPEND="${DEPEND} |
| 84 |
!app-office/calligra[calligra_features_plan(-)] |
| 85 |
!app-office/calligra-l10n:4 |
| 86 |
+ $(add_qt_dep qtsvg) |
| 87 |
" |
| 88 |
-RESTRICT+=" test" |
| 89 |
|
| 90 |
-src_prepare() { |
| 91 |
- kde5_src_prepare |
| 92 |
- # Unconditionally disable deprecated deps |
| 93 |
- punt_bogus_dep Qt5 OpenGL |
| 94 |
-} |
| 95 |
+RESTRICT+=" test" |
| 96 |
|
| 97 |
src_configure() { |
| 98 |
local mycmakeargs=( |
| 99 |
$(cmake-utils_use_find_package activities KF5Activities) |
| 100 |
- $(cmake-utils_use_find_package dbus Qt5DBus) |
| 101 |
$(cmake-utils_use_find_package holidays KF5Holidays) |
| 102 |
$(cmake-utils_use_find_package pim KF5CalendarCore) |
| 103 |
$(cmake-utils_use_find_package pim KF5Contacts) |
| 104 |
+ $(cmake-utils_use_find_package kwallet Qca-qt5) |
| 105 |
+ $(cmake-utils_use_find_package kwallet KF5Wallet) |
| 106 |
) |
| 107 |
+ # Qt5DBus can't be disabled because of KF5DBusAddons dependency |
| 108 |
|
| 109 |
kde5_src_configure |
| 110 |
} |
| 111 |
|
| 112 |
diff --git a/app-office/calligraplan/metadata.xml b/app-office/calligraplan/metadata.xml |
| 113 |
index f88bc8b8bb..a7529db60e 100644 |
| 114 |
--- a/app-office/calligraplan/metadata.xml |
| 115 |
+++ b/app-office/calligraplan/metadata.xml |
| 116 |
@@ -12,6 +12,7 @@ |
| 117 |
<use> |
| 118 |
<flag name="activities">Enable kactivities support</flag> |
| 119 |
<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag> |
| 120 |
+ <flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag> |
| 121 |
<flag name="pim">Enable support for KDE PIM resources integration</flag> |
| 122 |
</use> |
| 123 |
</pkgmetadata> |
Archives