[gentoo-commits] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     84d05828b8b2516d5f6f50a9905e56d1ec8d1f0d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 20:26:06 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 20:26:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=84d05828

app-office/calligra: 3.0.90 version bump

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../{calligra-9999.ebuild => calligra-3.0.90.ebuild}         | 12 +++++++++++-
 app-office/calligra/calligra-9999.ebuild                     | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild 
b/app-office/calligra/calligra-3.0.90.ebuild
similarity index 93%
copy from app-office/calligra/calligra-9999.ebuild
copy to app-office/calligra/calligra-3.0.90.ebuild
index 8c55ddf184..ea03fe44a5 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-3.0.90.ebuild
@@ -5,12 +5,16 @@ EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="forceoptional"
+KDE_PO_DIRS="po plan/po"
 KDE_TEST="forceoptional"
+PLANVER="3.0.91"
 inherit check-reqs kde5 versionator
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://www.calligra.org/";
-[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+       SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz
+               calligra_features_plan? ( 
mirror://kde/unstable/${PN}/${PN}plan-${PLANVER}.tar.xz )"
 
 LICENSE="GPL-2"
 
@@ -145,6 +149,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+       if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; 
then
+               mv ../${PN}plan-${PLANVER} plan || die
+               sed -e "/add_subdirectory(plan)/s/#//" \
+                       -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
+                       -i CMakeLists.txt || die
+       fi
        kde5_src_prepare
 
        if ! use test; then

diff --git a/app-office/calligra/calligra-9999.ebuild 
b/app-office/calligra/calligra-9999.ebuild
index 8c55ddf184..a7e58e4bf2 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -5,12 +5,15 @@ EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="forceoptional"
+KDE_PO_DIRS="po plan/po"
 KDE_TEST="forceoptional"
 inherit check-reqs kde5 versionator
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://www.calligra.org/";
-[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+       SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
+               calligra_features_plan? ( 
mirror://kde/stable/${PN}/${PN}plan-${PV}.tar.xz )"
 
 LICENSE="GPL-2"
 
@@ -145,6 +148,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+       if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; 
then
+               mv ../${PN}plan-${PV} plan || die
+               sed -e "/add_subdirectory(plan)/s/#//" \
+                       -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
+                       -i CMakeLists.txt || die
+       fi
        kde5_src_prepare
 
        if ! use test; then