1 |
commit: 84d05828b8b2516d5f6f50a9905e56d1ec8d1f0d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 31 20:26:06 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 31 20:26:06 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=84d05828 |
7 |
|
8 |
app-office/calligra: 3.0.90 version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
.../{calligra-9999.ebuild => calligra-3.0.90.ebuild} | 12 +++++++++++- |
13 |
app-office/calligra/calligra-9999.ebuild | 11 ++++++++++- |
14 |
2 files changed, 21 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-3.0.90.ebuild |
17 |
similarity index 93% |
18 |
copy from app-office/calligra/calligra-9999.ebuild |
19 |
copy to app-office/calligra/calligra-3.0.90.ebuild |
20 |
index 8c55ddf184..ea03fe44a5 100644 |
21 |
--- a/app-office/calligra/calligra-9999.ebuild |
22 |
+++ b/app-office/calligra/calligra-3.0.90.ebuild |
23 |
@@ -5,12 +5,16 @@ EAPI=6 |
24 |
|
25 |
CHECKREQS_DISK_BUILD="4G" |
26 |
KDE_HANDBOOK="forceoptional" |
27 |
+KDE_PO_DIRS="po plan/po" |
28 |
KDE_TEST="forceoptional" |
29 |
+PLANVER="3.0.91" |
30 |
inherit check-reqs kde5 versionator |
31 |
|
32 |
DESCRIPTION="KDE Office Suite" |
33 |
HOMEPAGE="https://www.calligra.org/" |
34 |
-[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
35 |
+[[ ${KDE_BUILD_TYPE} == release ]] && \ |
36 |
+ SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz |
37 |
+ calligra_features_plan? ( mirror://kde/unstable/${PN}/${PN}plan-${PLANVER}.tar.xz )" |
38 |
|
39 |
LICENSE="GPL-2" |
40 |
|
41 |
@@ -145,6 +149,12 @@ pkg_setup() { |
42 |
} |
43 |
|
44 |
src_prepare() { |
45 |
+ if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then |
46 |
+ mv ../${PN}plan-${PLANVER} plan || die |
47 |
+ sed -e "/add_subdirectory(plan)/s/#//" \ |
48 |
+ -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ |
49 |
+ -i CMakeLists.txt || die |
50 |
+ fi |
51 |
kde5_src_prepare |
52 |
|
53 |
if ! use test; then |
54 |
|
55 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
56 |
index 8c55ddf184..a7e58e4bf2 100644 |
57 |
--- a/app-office/calligra/calligra-9999.ebuild |
58 |
+++ b/app-office/calligra/calligra-9999.ebuild |
59 |
@@ -5,12 +5,15 @@ EAPI=6 |
60 |
|
61 |
CHECKREQS_DISK_BUILD="4G" |
62 |
KDE_HANDBOOK="forceoptional" |
63 |
+KDE_PO_DIRS="po plan/po" |
64 |
KDE_TEST="forceoptional" |
65 |
inherit check-reqs kde5 versionator |
66 |
|
67 |
DESCRIPTION="KDE Office Suite" |
68 |
HOMEPAGE="https://www.calligra.org/" |
69 |
-[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
70 |
+[[ ${KDE_BUILD_TYPE} == release ]] && \ |
71 |
+ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz |
72 |
+ calligra_features_plan? ( mirror://kde/stable/${PN}/${PN}plan-${PV}.tar.xz )" |
73 |
|
74 |
LICENSE="GPL-2" |
75 |
|
76 |
@@ -145,6 +148,12 @@ pkg_setup() { |
77 |
} |
78 |
|
79 |
src_prepare() { |
80 |
+ if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then |
81 |
+ mv ../${PN}plan-${PV} plan || die |
82 |
+ sed -e "/add_subdirectory(plan)/s/#//" \ |
83 |
+ -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ |
84 |
+ -i CMakeLists.txt || die |
85 |
+ fi |
86 |
kde5_src_prepare |
87 |
|
88 |
if ! use test; then |