[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2024-01-21 Thread Andreas Sturmlechner
commit: 5f923f257e9b1c367e8704ad499d38522bb665d2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 21 20:17:24 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 21 20:49:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f923f25

app-office/calligraplan: drop 3.3.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/calligraplan-3.3.0.ebuild | 89 ---
 1 file changed, 89 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild 
b/app-office/calligraplan/calligraplan-3.3.0.ebuild
deleted file mode 100644
index cfb35ec5f928..
--- a/app-office/calligraplan/calligraplan-3.3.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://calligra.org/plan/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
-   KEYWORDS="amd64 ~arm64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +holidays kwallet X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-   dev-lang/perl
-   >=dev-libs/kdiagram-2.8.0:5
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcalendarcore-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kglobalaccel-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-   kwallet? (
-   >=app-crypt/qca-2.3.0:2
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-"
-RDEPEND="${DEPEND}
-   !app-office/calligra[calligra_features_plan(-)]
-   >=dev-qt/qtsvg-${QTMIN}:5
-"
-
-RESTRICT="test"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package activities KF5Activities)
-   $(cmake_use_find_package holidays KF5Holidays)
-   $(cmake_use_find_package kwallet Qca-qt5)
-   $(cmake_use_find_package kwallet KF5Wallet)
-   )
-   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/

2024-01-21 Thread Andreas Sturmlechner
commit: fb559bc84696eab050dbfa1849fc13183921d16c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 21 20:15:41 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 21 20:49:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb559bc8

app-office/calligraplan: Port away from deprecated kinit

Closes: https://bugs.gentoo.org/922506
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../calligraplan/calligraplan-3.3.0-r1.ebuild  |  91 ++
 .../files/calligraplan-3.3.0-no-kinit.patch| 134 +
 2 files changed, 225 insertions(+)

diff --git a/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild 
b/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild
new file mode 100644
index ..79b9a52b5fff
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://calligra.org/plan/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
+   KEYWORDS="amd64 ~arm64 ~riscv x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet X"
+
+RESTRICT="test"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   dev-lang/perl
+   >=dev-libs/kdiagram-2.8.0:5
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcalendarcore-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemmodels-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
+   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+   kwallet? (
+   >=app-crypt/qca-2.3.0:2[qt5(+)]
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   !app-office/calligra[calligra_features_plan(-)]
+   >=dev-qt/qtsvg-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-kinit.patch" ) # bug 922506
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package activities KF5Activities)
+   $(cmake_use_find_package holidays KF5Holidays)
+   $(cmake_use_find_package kwallet Qca-qt5)
+   $(cmake_use_find_package kwallet KF5Wallet)
+   )
+   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+   ecm_src_configure
+}

diff --git a/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch 
b/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch
new file mode 100644
index ..16ee6b1e09a4
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch
@@ -0,0 +1,134 @@
+From 1883014daa5ae1dedf4d9356dbdaafd4d9d3014f Mon Sep 17 00:00:00 2001
+From: Nicolas Fella 
+Date: Sat, 17 Sep 2022 17:11:05 +0200
+Subject: [PATCH] Port away from deprecated kinit
+
+(cherry picked from commit d0c9c05bfb1d1eae6b1d92ac7d5a22ed5238329f)
+---
+ CMakeLists.txt |  1 -
+ src/CMakeLists.txt | 11 ---
+ src/main.cpp   |  2 +-
+ src/workpackage/CMakeLists.txt | 10 +++---
+ src/workpackage/main.cpp   |  2 +-
+ 5 files changed, 9 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 70025827..a354e4a0 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -112,7 +112,6 @@ set(REQUIRED_KF5_VERSION "5.45.0")
+ 
+ 

[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2023-05-27 Thread Sam James
commit: 3c46bf1e477c45500c92537c2e1bdb49c3ce81aa
Author: Sam James  gentoo  org>
AuthorDate: Sat May 27 09:46:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 27 09:46:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c46bf1e

app-office/calligraplan: Keyword 3.3.0 arm64, #907076

Signed-off-by: Sam James  gentoo.org>

 app-office/calligraplan/calligraplan-3.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild 
b/app-office/calligraplan/calligraplan-3.3.0.ebuild
index 0243e1578959..4c97f08c0c59 100644
--- a/app-office/calligraplan/calligraplan-3.3.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://calligra.org/plan/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
-   KEYWORDS="amd64 ~riscv x86"
+   KEYWORDS="amd64 ~arm64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2022-12-25 Thread Andreas Sturmlechner
commit: 86f5d050eec6b4d73994406238b98c7f25864ae2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 25 22:51:29 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 25 23:21:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f5d050

app-office/calligraplan: update EAPI 7 -> 8

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/calligraplan-3.3.0.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild 
b/app-office/calligraplan/calligraplan-3.3.0.ebuild
index 1dc19b1f31ca..0243e1578959 100644
--- a/app-office/calligraplan/calligraplan-3.3.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
@@ -74,7 +74,7 @@ RDEPEND="${DEPEND}
>=dev-qt/qtsvg-${QTMIN}:5
 "
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
local mycmakeargs=(



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2021-12-29 Thread Yixun Lan
commit: a1b53b1863aa89ebe7815ee4e9ab4d18c5f1bd4c
Author: Alex Fan  gmail  com>
AuthorDate: Tue Dec 28 10:08:41 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Dec 29 13:39:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b53b18

app-office/calligraplan: keyword 3.3.0 for ~riscv

Signed-off-by: Alex Fan  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 app-office/calligraplan/calligraplan-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild 
b/app-office/calligraplan/calligraplan-3.3.0.ebuild
index 49233752dc85..1dc19b1f31ca 100644
--- a/app-office/calligraplan/calligraplan-3.3.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.3.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://calligra.org/plan/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
-   KEYWORDS="amd64 x86"
+   KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/

2021-03-08 Thread Andreas Sturmlechner
commit: 3809304593af6433f4ad889503383c2e05bfba75
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar  8 20:40:42 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar  8 21:13:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38093045

app-office/calligraplan: Drop 3.2.2-r1

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest   |   1 -
 .../calligraplan/calligraplan-3.2.2-r1.ebuild  |  92 
 .../files/calligraplan-3.2.2-no-khtml.patch| 463 -
 .../files/calligraplan-3.2.2-qt-5.15.patch |  33 --
 4 files changed, 589 deletions(-)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 213ef3d8027..3ce12fd9cd1 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,2 +1 @@
-DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B 
b02248ac51c4593434f234b574c23c68fe687451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d
 SHA512 
9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915
 DIST calligraplan-3.3.0.tar.xz 4500032 BLAKE2B 
48983bcaad5f8bc60a9e689ab9347731eda6c82eae248df50fa3cdf4a2d9c1882a5f44cda503dcb7ba65452da874256ce4ec3ff2348cf0acd65a9b8a83b63aed
 SHA512 
165bb1d846e8ac96789b5123bd8e352ad77a4ae607d7e06008916f7729a457351c35779b43774f73a6a35bf9401626852cb4dd2ccf16cbcfb38d2abce56bd936

diff --git a/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild 
b/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild
deleted file mode 100644
index 275d4ee1d2f..000
--- a/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://calligra.org/plan/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +holidays kwallet X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kglobalaccel-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   dev-lang/perl
-   dev-libs/kdiagram:5
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-   kwallet? (
-   >=app-crypt/qca-2.3.0:2
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-"
-RDEPEND="${DEPEND}
-   !app-office/calligra[calligra_features_plan(-)]
-   >=dev-qt/qtsvg-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-   "${FILESDIR}/${P}-qt-5.15.patch" # bug 741710
-   "${FILESDIR}/${P}-no-khtml.patch"
-)
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package activities KF5Activities)
-   $(cmake_use_find_package holidays KF5Holidays)
-   $(cmake_use_find_package kwallet Qca-qt5)
-   $(cmake_use_find_package kwallet KF5Wallet)
-   )
-   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-   ecm_src_configure
-}

diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch 
b/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch
deleted file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2021-03-08 Thread Sam James
commit: d7410bab787d28ce186cdbd13bb711f5c6ce0f76
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  8 10:26:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  8 10:26:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7410bab

app-office/calligraplan: Stabilize 3.3.0 x86, #772434

Signed-off-by: Sam James  gentoo.org>

 app-office/calligraplan/calligraplan-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild 
b/app-office/calligraplan/calligraplan-3.3.0.ebuild
index 6d9534397b2..49233752dc8 100644
--- a/app-office/calligraplan/calligraplan-3.3.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.3.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://calligra.org/plan/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2021-03-08 Thread Sam James
commit: 240728f5b82c49202266c4daac462b1a2b1e9dc8
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  8 10:25:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  8 10:25:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240728f5

app-office/calligraplan: Stabilize 3.3.0 amd64, #772434

Signed-off-by: Sam James  gentoo.org>

 app-office/calligraplan/calligraplan-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild 
b/app-office/calligraplan/calligraplan-3.3.0.ebuild
index 7f8a64d80e3..6d9534397b2 100644
--- a/app-office/calligraplan/calligraplan-3.3.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.3.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://calligra.org/plan/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2021-01-28 Thread Andreas Sturmlechner
commit: 112b5d1f3043af0c633ee67798e047b74d08ae95
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 28 21:49:50 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 28 21:53:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=112b5d1f

app-office/calligraplan: 3.3.0 version bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest  |  1 +
 app-office/calligraplan/calligraplan-3.3.0.ebuild | 89 +++
 2 files changed, 90 insertions(+)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 68a14ae5c22..213ef3d8027 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1 +1,2 @@
 DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B 
b02248ac51c4593434f234b574c23c68fe687451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d
 SHA512 
9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915
+DIST calligraplan-3.3.0.tar.xz 4500032 BLAKE2B 
48983bcaad5f8bc60a9e689ab9347731eda6c82eae248df50fa3cdf4a2d9c1882a5f44cda503dcb7ba65452da874256ce4ec3ff2348cf0acd65a9b8a83b63aed
 SHA512 
165bb1d846e8ac96789b5123bd8e352ad77a4ae607d7e06008916f7729a457351c35779b43774f73a6a35bf9401626852cb4dd2ccf16cbcfb38d2abce56bd936

diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild 
b/app-office/calligraplan/calligraplan-3.3.0.ebuild
new file mode 100644
index 000..7f8a64d80e3
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.3.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://calligra.org/plan/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet X"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   dev-lang/perl
+   >=dev-libs/kdiagram-2.8.0:5
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcalendarcore-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemmodels-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+   kwallet? (
+   >=app-crypt/qca-2.3.0:2
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   !app-office/calligra[calligra_features_plan(-)]
+   >=dev-qt/qtsvg-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package activities KF5Activities)
+   $(cmake_use_find_package holidays KF5Holidays)
+   $(cmake_use_find_package kwallet Qca-qt5)
+   $(cmake_use_find_package kwallet KF5Wallet)
+   )
+   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2020-10-29 Thread Andreas Sturmlechner
commit: 887e67a8d6eb7998254aa18c80fa994347dc6242
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 29 19:32:04 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 29 19:41:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=887e67a8

app-office/calligraplan: Drop 3.2.2 (r0)

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/calligraplan-3.2.2.ebuild | 90 ---
 1 file changed, 90 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild 
b/app-office/calligraplan/calligraplan-3.2.2.ebuild
deleted file mode 100644
index 3287da88dd8..000
--- a/app-office/calligraplan/calligraplan-3.2.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +holidays kwallet X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kglobalaccel-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/khtml-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   dev-lang/perl
-   dev-libs/kdiagram:5
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-   kwallet? (
-   app-crypt/qca:2[qt5(+)]
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-"
-RDEPEND="${DEPEND}
-   !app-office/calligra[calligra_features_plan(-)]
-   >=dev-qt/qtsvg-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 741710
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package activities KF5Activities)
-   $(cmake_use_find_package holidays KF5Holidays)
-   $(cmake_use_find_package kwallet Qca-qt5)
-   $(cmake_use_find_package kwallet KF5Wallet)
-   )
-   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/

2020-10-29 Thread Andreas Sturmlechner
commit: 1834efa38ba3349b146aa504de48c91d176bbaa9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 29 19:29:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 29 19:41:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1834efa3

app-office/calligraplan: Patch out KF5KHtml dependency, fix DEPENDs

- Update HOMEPAGE

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../calligraplan/calligraplan-3.2.2-r1.ebuild  |  92 
 .../files/calligraplan-3.2.2-no-khtml.patch| 463 +
 2 files changed, 555 insertions(+)

diff --git a/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild 
b/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild
new file mode 100644
index 000..275d4ee1d2f
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://calligra.org/plan/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
+   KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet X"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   dev-lang/perl
+   dev-libs/kdiagram:5
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+   kwallet? (
+   >=app-crypt/qca-2.3.0:2
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   !app-office/calligra[calligra_features_plan(-)]
+   >=dev-qt/qtsvg-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+   "${FILESDIR}/${P}-qt-5.15.patch" # bug 741710
+   "${FILESDIR}/${P}-no-khtml.patch"
+)
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package activities KF5Activities)
+   $(cmake_use_find_package holidays KF5Holidays)
+   $(cmake_use_find_package kwallet Qca-qt5)
+   $(cmake_use_find_package kwallet KF5Wallet)
+   )
+   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+   ecm_src_configure
+}

diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch 
b/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch
new file mode 100644
index 000..c307e332f61
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch
@@ -0,0 +1,463 @@
+From 3097da1c42ba7fe3b6a26ccb64df64db9c5588b7 Mon Sep 17 00:00:00 2001
+From: Dag Andersen 
+Date: Mon, 26 Oct 2020 13:46:06 +0100
+Subject: [PATCH 1/2] Remove dependency on KHtml
+
+This also removes the introductory pages,
+but these should be cver by the documentation.
+---
+ CMakeLists.txt  | 10 +++
+ src/CMakeLists.txt  |  2 --
+ src/kptmaindocument.cpp |  1 -
+ src/kptmaindocument.h   |  5 
+ src/kptpart.cpp | 47 
+ src/kptpart.h   |  4 ---
+ src/kptview.cpp | 53 -
+ src/kptview.h   | 10 ---
+ src/libs/ui/CMakeLists.txt  |  5 +---
+ src/welcome/WelcomeView.cpp |  9 ---
+ src/welcome/WelcomeView.h   |  1 -
+ 

[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/

2020-09-13 Thread Andreas Sturmlechner
commit: 4641de7e07373988d5589b72cea167d486442e65
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 13 09:00:45 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 13 11:18:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4641de7e

app-office/calligraplan: Fix build with Qt 5.15

Reported-by: Leonid Kopylov  gmail.com>
Closes: https://bugs.gentoo.org/741710
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/calligraplan-3.2.2.ebuild  |  2 ++
 .../files/calligraplan-3.2.2-qt-5.15.patch | 33 ++
 2 files changed, 35 insertions(+)

diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild 
b/app-office/calligraplan/calligraplan-3.2.2.ebuild
index a8dc309bb5c..3287da88dd8 100644
--- a/app-office/calligraplan/calligraplan-3.2.2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.2.ebuild
@@ -75,6 +75,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 741710
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)

diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch 
b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch
new file mode 100644
index 000..fd925ffee68
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch
@@ -0,0 +1,33 @@
+From f77fb06dc5d9f7930da9c757d6916f1149dc42bd Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Sun, 29 Mar 2020 13:55:53 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+Summary:
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+Test Plan: Builds
+
+Reviewers: #calligra:_3.0, danders
+
+Differential Revision: https://phabricator.kde.org/D28403
+---
+ src/libs/ui/kptganttitemdelegate.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libs/ui/kptganttitemdelegate.cpp 
b/src/libs/ui/kptganttitemdelegate.cpp
+index 04217da4..d2f3e6d8 100644
+--- a/src/libs/ui/kptganttitemdelegate.cpp
 b/src/libs/ui/kptganttitemdelegate.cpp
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include 
+-- 
+GitLab
+



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2020-01-18 Thread Andreas Sturmlechner
commit: be0073b0330e667928b3e343602a189abe5c0003
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 18 19:38:40 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 18 19:39:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0073b0

app-office/calligraplan: 3.2.2 stable

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/calligraplan-3.2.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild 
b/app-office/calligraplan/calligraplan-3.2.2.ebuild
index 45620a30fd0..a8dc309bb5c 100644
--- a/app-office/calligraplan/calligraplan-3.2.2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2020-01-18 Thread Andreas Sturmlechner
commit: 653c9ceebc41957b6d4959f3aa3b7f1018c11437
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 18 19:39:12 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 18 19:39:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=653c9cee

app-office/calligraplan: Drop 3.2.1

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest  |  1 -
 app-office/calligraplan/calligraplan-3.2.1.ebuild | 88 ---
 2 files changed, 89 deletions(-)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index ebf3223442f..68a14ae5c22 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,2 +1 @@
-DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B 
dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9
 SHA512 
cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d11056bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5
 DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B 
b02248ac51c4593434f234b574c23c68fe687451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d
 SHA512 
9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915

diff --git a/app-office/calligraplan/calligraplan-3.2.1.ebuild 
b/app-office/calligraplan/calligraplan-3.2.1.ebuild
deleted file mode 100644
index c610d97f9c2..000
--- a/app-office/calligraplan/calligraplan-3.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +holidays kwallet X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kglobalaccel-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/khtml-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   dev-lang/perl
-   dev-libs/kdiagram:5
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-   kwallet? (
-   app-crypt/qca:2[qt5(+)]
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-"
-RDEPEND="${DEPEND}
-   !app-office/calligra[calligra_features_plan(-)]
-   >=dev-qt/qtsvg-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package activities KF5Activities)
-   $(cmake_use_find_package holidays KF5Holidays)
-   $(cmake_use_find_package kwallet Qca-qt5)
-   $(cmake_use_find_package kwallet KF5Wallet)
-   )
-   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-12-17 Thread Andreas Sturmlechner
commit: 109fcbbd879f3266fd549bfbc5052eefc1ac70c4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 17 13:54:20 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 17 17:06:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=109fcbbd

app-office/calligraplan: 3.2.2 version bump

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest  |  1 +
 app-office/calligraplan/calligraplan-3.2.2.ebuild | 88 +++
 2 files changed, 89 insertions(+)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 0af8917299c..ebf3223442f 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1 +1,2 @@
 DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B 
dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9
 SHA512 
cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d11056bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5
+DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B 
b02248ac51c4593434f234b574c23c68fe687451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d
 SHA512 
9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915

diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild 
b/app-office/calligraplan/calligraplan-3.2.2.ebuild
new file mode 100644
index 000..090d943589f
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://www.calligra.org/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet X"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/khtml-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   dev-lang/perl
+   dev-libs/kdiagram:5
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+   kwallet? (
+   app-crypt/qca:2[qt5(+)]
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   !app-office/calligra[calligra_features_plan(-)]
+   >=dev-qt/qtsvg-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package activities KF5Activities)
+   $(cmake-utils_use_find_package holidays KF5Holidays)
+   $(cmake-utils_use_find_package kwallet Qca-qt5)
+   $(cmake-utils_use_find_package kwallet KF5Wallet)
+   )
+   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/

2019-12-02 Thread Andreas Sturmlechner
commit: 3d905db98e4e2542be61b93b4774760c53c384a9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec  2 17:19:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec  3 05:03:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d905db9

app-office/calligraplan: Drop 3.1.0-r1 and 3.1.0-r3

And a lot of patches.

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest   |   1 -
 .../calligraplan/calligraplan-3.1.0-r1.ebuild  |  97 
 .../calligraplan/calligraplan-3.1.0-r3.ebuild  |  99 
 .../calligraplan-3.1.0-kcalcore-19.08-1.patch  |  46 
 .../calligraplan-3.1.0-kcalcore-19.08-2.patch  |  84 --
 .../files/calligraplan-3.1.0-missing-header.patch  |  24 
 .../files/calligraplan-3.1.0-qca.patch | 127 -
 .../files/calligraplan-3.1.0-qt-5.11.patch | 124 
 .../files/calligraplan-3.1.0-unused-deps.patch |  57 -
 app-office/calligraplan/metadata.xml   |   1 -
 10 files changed, 660 deletions(-)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 11fac6f2280..0af8917299c 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,2 +1 @@
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
 DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B 
dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9
 SHA512 
cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d11056bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5

diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
deleted file mode 100644
index 98cc37a7595..000
--- a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/;
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities +holidays kwallet pim X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep khtml)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-lang/perl
-   dev-libs/kdiagram:5
-   sys-libs/zlib
-   activities? ( $(add_frameworks_dep kactivities) )
-   holidays? ( $(add_frameworks_dep kholidays) )
-   kwallet? (
-   $(add_frameworks_dep kwallet)
-   app-crypt/qca:2[qt5(+)]
-   )
-   pim? (
-   https://www.calligra.org/;
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities +holidays kwallet pim X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep 

[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-12-02 Thread Mikle Kolyada
commit: aae0c38976053c98a61103c9e277aee71f319757
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Dec  2 16:30:05 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Dec  2 16:30:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aae0c389

app-office/calligraplan: x86 stable wrt bug #700038

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-office/calligraplan/calligraplan-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligraplan/calligraplan-3.2.1.ebuild 
b/app-office/calligraplan/calligraplan-3.2.1.ebuild
index 195dcedd70b..fa152b86599 100644
--- a/app-office/calligraplan/calligraplan-3.2.1.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-12-02 Thread Mikle Kolyada
commit: 77eb9ca6cfb2f8899ffb43f9d2dfc9c2b1abf276
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Dec  2 16:09:12 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Dec  2 16:12:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77eb9ca6

app-office/calligraplan: amd64 stable wrt bug #700038

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-office/calligraplan/calligraplan-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligraplan/calligraplan-3.2.1.ebuild 
b/app-office/calligraplan/calligraplan-3.2.1.ebuild
index 090d943589f..195dcedd70b 100644
--- a/app-office/calligraplan/calligraplan-3.2.1.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-12-01 Thread Andreas Sturmlechner
commit: 1af8bce62075813b92afcaab36cb1a1ebe05ec5b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  1 21:17:29 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  1 21:34:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af8bce6

app-office/calligraplan: Drop 3.2.0

Package-Manager: Portage-2.3.80, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest  |  1 -
 app-office/calligraplan/calligraplan-3.2.0.ebuild | 89 ---
 2 files changed, 90 deletions(-)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index d0e90936e42..11fac6f2280 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,3 +1,2 @@
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
-DIST calligraplan-3.2.0.tar.xz 3416652 BLAKE2B 
655457ff4a8a223efff5845d7438e0a9eddaafaef76a83a2d328902c835206bafb62add6ede379e2988af1f41ebcca867ca974ca3bb470deaa9689b2f493f89a
 SHA512 
7b9b40b90a831be64da72c7ec50f230df4f29dd9bac2c5202ee774ab1d31caf62336ce9d007a88a92da781d6a69dd1a4727957cbe557325741b659de6a9f7164
 DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B 
dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9
 SHA512 
cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d11056bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5

diff --git a/app-office/calligraplan/calligraplan-3.2.0.ebuild 
b/app-office/calligraplan/calligraplan-3.2.0.ebuild
deleted file mode 100644
index 512af68cc64..000
--- a/app-office/calligraplan/calligraplan-3.2.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +holidays kwallet X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kglobalaccel-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/khtml-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   dev-lang/perl
-   dev-libs/kdiagram:5
-   sys-libs/zlib
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-   kwallet? (
-   app-crypt/qca:2[qt5(+)]
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-"
-RDEPEND="${DEPEND}
-   !app-office/calligra[calligra_features_plan(-)]
-   >=dev-qt/qtsvg-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package activities KF5Activities)
-   $(cmake-utils_use_find_package holidays KF5Holidays)
-   $(cmake-utils_use_find_package kwallet Qca-qt5)
-   $(cmake-utils_use_find_package kwallet KF5Wallet)
-   )
-   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-12-01 Thread Andreas Sturmlechner
commit: b0f281f77d45ac32ff08d9bcbebd9e3be4b600ac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  1 21:13:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  1 21:34:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f281f7

app-office/calligraplan: 3.2.1 version bump

Package-Manager: Portage-2.3.80, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest  |  1 +
 app-office/calligraplan/calligraplan-3.2.1.ebuild | 88 +++
 2 files changed, 89 insertions(+)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index e889d44c787..d0e90936e42 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,2 +1,3 @@
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
 DIST calligraplan-3.2.0.tar.xz 3416652 BLAKE2B 
655457ff4a8a223efff5845d7438e0a9eddaafaef76a83a2d328902c835206bafb62add6ede379e2988af1f41ebcca867ca974ca3bb470deaa9689b2f493f89a
 SHA512 
7b9b40b90a831be64da72c7ec50f230df4f29dd9bac2c5202ee774ab1d31caf62336ce9d007a88a92da781d6a69dd1a4727957cbe557325741b659de6a9f7164
+DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B 
dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9
 SHA512 
cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d11056bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5

diff --git a/app-office/calligraplan/calligraplan-3.2.1.ebuild 
b/app-office/calligraplan/calligraplan-3.2.1.ebuild
new file mode 100644
index 000..090d943589f
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.2.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://www.calligra.org/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet X"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/khtml-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   dev-lang/perl
+   dev-libs/kdiagram:5
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+   kwallet? (
+   app-crypt/qca:2[qt5(+)]
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   !app-office/calligra[calligra_features_plan(-)]
+   >=dev-qt/qtsvg-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package activities KF5Activities)
+   $(cmake-utils_use_find_package holidays KF5Holidays)
+   $(cmake-utils_use_find_package kwallet Qca-qt5)
+   $(cmake-utils_use_find_package kwallet KF5Wallet)
+   )
+   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-11-14 Thread Andreas Sturmlechner
commit: 244bb6956e4c9e88e8fc7ef1ae3f782ab43bf542
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 14 09:53:13 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 14 10:55:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244bb695

app-office/calligraplan: 3.2.0 version bump

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest  |  1 +
 app-office/calligraplan/calligraplan-3.2.0.ebuild | 89 +++
 2 files changed, 90 insertions(+)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 7ff08e55465..e889d44c787 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1 +1,2 @@
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
+DIST calligraplan-3.2.0.tar.xz 3416652 BLAKE2B 
655457ff4a8a223efff5845d7438e0a9eddaafaef76a83a2d328902c835206bafb62add6ede379e2988af1f41ebcca867ca974ca3bb470deaa9689b2f493f89a
 SHA512 
7b9b40b90a831be64da72c7ec50f230df4f29dd9bac2c5202ee774ab1d31caf62336ce9d007a88a92da781d6a69dd1a4727957cbe557325741b659de6a9f7164

diff --git a/app-office/calligraplan/calligraplan-3.2.0.ebuild 
b/app-office/calligraplan/calligraplan-3.2.0.ebuild
new file mode 100644
index 000..512af68cc64
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.2.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://www.calligra.org/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet X"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/khtml-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   dev-lang/perl
+   dev-libs/kdiagram:5
+   sys-libs/zlib
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+   kwallet? (
+   app-crypt/qca:2[qt5(+)]
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   !app-office/calligra[calligra_features_plan(-)]
+   >=dev-qt/qtsvg-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package activities KF5Activities)
+   $(cmake-utils_use_find_package holidays KF5Holidays)
+   $(cmake-utils_use_find_package kwallet Qca-qt5)
+   $(cmake-utils_use_find_package kwallet KF5Wallet)
+   )
+   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/

2019-10-13 Thread Andreas Sturmlechner
commit: bde0ef6d982dd6b7c0c577b4a69f283cb45e7978
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 13 21:05:28 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 13 21:13:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde0ef6d

app-office/calligraplan: Drop obsolete patch to fix USE=pim

After kcalendarcore was fixed properly in upstream
commit 28eab632238352ab46f6c1db11f6ebf7d3ce0690, this patch is superfluous
and apparently breaks build with first release as a Framework in 5.63.

Cleanup dependencies at the same time; with a minimum >=19.08.0, there is
no more kde-apps/kcalcore to satisfy this package.

Closes: https://bugs.gentoo.org/697660
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../calligraplan/calligraplan-3.1.0-r3.ebuild  | 12 ++--
 .../calligraplan-3.1.0-kcalcore-19.08-3.patch  | 33 --
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
index ec094bc71c2..2f0f38c3d9f 100644
--- a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
@@ -60,14 +60,8 @@ DEPEND="
app-crypt/qca:2[qt5(+)]
)
pim? (
-   || (
-   $(add_frameworks_dep kcalendarcore)
-   $(add_kdeapps_dep kcalcore)
-   )
-   || (
-   $(add_frameworks_dep kcontacts)
-   $(add_kdeapps_dep kcontacts)
-   )
+   $(add_frameworks_dep kcalendarcore)
+   $(add_frameworks_dep kcontacts)
)
X? (
$(add_qt_dep qtx11extras)
@@ -87,7 +81,7 @@ PATCHES=(
"${FILESDIR}"/${P}-qca.patch
"${FILESDIR}"/${P}-missing-header.patch
"${FILESDIR}"/${P}-unused-deps.patch
-   "${FILESDIR}"/${P}-kcalcore-19.08-{1,2,3}.patch
+   "${FILESDIR}"/${P}-kcalcore-19.08-{1,2}.patch
 )
 
 src_configure() {

diff --git 
a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch 
b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch
deleted file mode 100644
index 14cc70ab1c8..000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2f5505cf03ff865349d06e1d5c39007c52e7cd10 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Fri, 16 Aug 2019 15:49:09 +0200
-Subject: [PATCH] Fix headers after kcalcore->kcalendercore rename happened
-

- .../filters/icalendar/export/icalendarexport.cpp   | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp 
b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-index bb6b097d..729d6e50 100644
 a/src/plugins/filters/icalendar/export/icalendarexport.cpp
-+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-@@ -31,11 +31,11 @@
- #include 
- #include "kptdebug.h"
- 
--#include 
--#include 
--#include 
--#include 
--#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
- 
- #include 
- #include 
--- 
-2.22.1
-



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-10-12 Thread Andreas Sturmlechner
commit: ecbdcd7367b9d3c97d4a6bc9ec736de1f5247a34
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct  9 22:32:03 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 12 21:13:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecbdcd73

app-office/calligraplan: Accept kde-frameworks/{kcalendarcore,kcontacts}

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...lligraplan-3.1.0-r2.ebuild => calligraplan-3.1.0-r3.ebuild} | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
similarity index 94%
rename from app-office/calligraplan/calligraplan-3.1.0-r2.ebuild
rename to app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
index 8be9484950d..ec094bc71c2 100644
--- a/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
@@ -60,8 +60,14 @@ DEPEND="
app-crypt/qca:2[qt5(+)]
)
pim? (
-   $(add_kdeapps_dep kcalcore)
-   $(add_kdeapps_dep kcontacts)
+   || (
+   $(add_frameworks_dep kcalendarcore)
+   $(add_kdeapps_dep kcalcore)
+   )
+   || (
+   $(add_frameworks_dep kcontacts)
+   $(add_kdeapps_dep kcontacts)
+   )
)
X? (
$(add_qt_dep qtx11extras)



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-08-16 Thread Andreas Sturmlechner
commit: 9111d8142a8c0a54f6478cc3ff2977dd803d8d50
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 16 12:49:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 16 14:40:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9111d814

app-office/calligraplan: Drop 3.1.0 (r0)

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/calligraplan-3.1.0.ebuild | 106 --
 1 file changed, 106 deletions(-)

diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0.ebuild
deleted file mode 100644
index 5fc27015f3a..000
--- a/app-office/calligraplan/calligraplan-3.1.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/;
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities +holidays kwallet pim X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled in plan
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep khtml)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-lang/perl
-   dev-libs/kdiagram:5
-   sys-libs/zlib
-   activities? ( $(add_frameworks_dep kactivities) )
-   holidays? ( $(add_frameworks_dep kholidays) )
-   kwallet? (
-   $(add_frameworks_dep kwallet)
-   app-crypt/qca:2[qt5(+)]
-   )
-   pim? (
-   

[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/

2019-08-16 Thread Andreas Sturmlechner
commit: 76b3807cb00c92d643409640b010b1a542e28574
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 16 13:09:41 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 16 14:40:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b3807c

app-office/calligraplan: Backport KCalCore 19.08.0 API changes

Upstream commits
3a01affd66f8dfdcc124e23595217f3ae5a09723
a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../calligraplan/calligraplan-3.1.0-r2.ebuild  | 99 ++
 .../calligraplan-3.1.0-kcalcore-19.08-1.patch  | 46 ++
 .../calligraplan-3.1.0-kcalcore-19.08-2.patch  | 84 ++
 .../calligraplan-3.1.0-kcalcore-19.08-3.patch  | 33 
 4 files changed, 262 insertions(+)

diff --git a/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild
new file mode 100644
index 000..8be9484950d
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_APPS_MINIMAL="19.08.0"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://www.calligra.org/;
+SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities +holidays kwallet pim X"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   dev-libs/kdiagram:5
+   sys-libs/zlib
+   activities? ( $(add_frameworks_dep kactivities) )
+   holidays? ( $(add_frameworks_dep kholidays) )
+   kwallet? (
+   $(add_frameworks_dep kwallet)
+   app-crypt/qca:2[qt5(+)]
+   )
+   pim? (
+   $(add_kdeapps_dep kcalcore)
+   $(add_kdeapps_dep kcontacts)
+   )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   !app-office/calligra[calligra_features_plan(-)]
+   !app-office/calligra-l10n:4
+   $(add_qt_dep qtsvg)
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-qt-5.11.patch
+   "${FILESDIR}"/${P}-qca.patch
+   "${FILESDIR}"/${P}-missing-header.patch
+   "${FILESDIR}"/${P}-unused-deps.patch
+   "${FILESDIR}"/${P}-kcalcore-19.08-{1,2,3}.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package activities KF5Activities)
+   $(cmake-utils_use_find_package holidays KF5Holidays)
+   $(cmake-utils_use_find_package pim KF5CalendarCore)
+   $(cmake-utils_use_find_package pim KF5Contacts)
+   $(cmake-utils_use_find_package kwallet Qca-qt5)
+   $(cmake-utils_use_find_package kwallet KF5Wallet)
+   )
+   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+   kde5_src_configure
+}

diff --git 
a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch 
b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
new file mode 100644
index 000..cfe8b552d9d
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
@@ -0,0 +1,46 @@
+From 3a01affd66f8dfdcc124e23595217f3ae5a09723 Mon Sep 17 00:00:00 2001
+From: Dag Andersen 
+Date: Thu, 20 Jun 2019 10:52:00 +0200
+Subject: ICal: Adapt to api changes in KCalCore
+
+---
+ CMakeLists.txt | 37 +++---
+ src/CMakeLists.txt  

[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/

2019-08-16 Thread Andreas Sturmlechner
commit: 72e3e39afb23a77afb3685a9c25db784f7874aa0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 16 12:47:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 16 14:40:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e3e39a

app-office/calligraplan: EAPI-7 bump, backported unused-deps patch

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../calligraplan/calligraplan-3.1.0-r1.ebuild  | 97 ++
 .../files/calligraplan-3.1.0-unused-deps.patch | 57 +
 2 files changed, 154 insertions(+)

diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
new file mode 100644
index 000..98cc37a7595
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://www.calligra.org/;
+SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="activities +holidays kwallet pim X"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   dev-libs/kdiagram:5
+   sys-libs/zlib
+   activities? ( $(add_frameworks_dep kactivities) )
+   holidays? ( $(add_frameworks_dep kholidays) )
+   kwallet? (
+   $(add_frameworks_dep kwallet)
+   app-crypt/qca:2[qt5(+)]
+   )
+   pim? (
+   
+Date: Tue, 1 Jan 2019 20:13:57 +0100
+Subject: Drop unused dependencies
+
+Test Plan: Built fine with deps removed.
+
+Reviewers: #calligra:_3.0, danders
+
+Reviewed By: #calligra:_3.0, danders
+
+Subscribers: danders
+
+Differential Revision: https://phabricator.kde.org/D17903
+---
+ CMakeLists.txt | 14 ++
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3cb4b63..a6a3c79 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -121,7 +121,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ IconThemes
+ ItemViews
+ JobWidgets
+-KCMUtils
+ KIO
+ Notifications
+ # NotifyConfig
+@@ -169,22 +168,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
+ COMPONENTS
+ Core
+ Gui
+-Network
+ PrintSupport
+-Svg
+ Test
+ Widgets
+ Xml
+ )
+-find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
+-COMPONENTS
+-DBus
+-OpenGL
+-#Quick
+-#Sql
+-# WebKit
+-# WebKitWidgets
+-)
++find_package(Qt5DBus ${REQUIRED_QT_VERSION} QUIET)
++
+ # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate 
call
+ # Including it in a collected find_package(Qt5 ...) call can lead to a 
fatal not-found error:
+ # * Qt5 (required version >= 5.3.0)
+-- 
+cgit v1.1



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-08-15 Thread Andreas Sturmlechner
commit: e2f5e03ce01d908319225b9a0fdd8c9fc70678c8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 15 12:44:14 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 15 13:09:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f5e03c

app-office/calligraplan: Pin kde-apps/kcalcore version to <19.04.50

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/calligraplan-3.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0.ebuild
index d18ff1274e1..5fc27015f3a 100644
--- a/app-office/calligraplan/calligraplan-3.1.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0.ebuild
@@ -59,7 +59,7 @@ DEPEND="
app-crypt/qca:2[qt5(+)]
)
pim? (
-   $(add_kdeapps_dep kcalcore)
+   

[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/

2019-08-11 Thread Andreas Sturmlechner
commit: 569f8c4dd13fc5ba4ec57f7cfd7367c34b92be5f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 11 07:56:09 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 11 08:19:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569f8c4d

app-office/calligraplan: Fix missing header with Frameworks 5.61

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/calligraplan-3.1.0.ebuild  |  1 +
 .../files/calligraplan-3.1.0-missing-header.patch  | 24 ++
 2 files changed, 25 insertions(+)

diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0.ebuild
index 9a721d96356..d18ff1274e1 100644
--- a/app-office/calligraplan/calligraplan-3.1.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0.ebuild
@@ -78,6 +78,7 @@ RESTRICT+=" test"
 PATCHES=(
"${FILESDIR}"/${P}-qt-5.11.patch
"${FILESDIR}"/${P}-qca.patch
+   "${FILESDIR}"/${P}-missing-header.patch
 )
 
 src_prepare() {

diff --git 
a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch 
b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
new file mode 100644
index 000..4ee031865a3
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
@@ -0,0 +1,24 @@
+From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Sun, 28 Jul 2019 00:07:33 +0200
+Subject: Fix compile on CI
+
+src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete 
type QMap
+---
+ src/workpackage/view.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/workpackage/view.h b/src/workpackage/view.h
+index 6cae32b..cd2fc4e 100644
+--- a/src/workpackage/view.h
 b/src/workpackage/view.h
+@@ -24,6 +24,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ 
+ class QPrinter;
+-- 
+cgit v1.1



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/

2019-01-14 Thread Mikle Kolyada
commit: 140f00e4c7dee050b6d7ddf438a86a785650c5e5
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan 14 14:42:52 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan 14 14:42:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=140f00e4

app-office/calligraplan: amd64 stable wrt bug #674856

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-office/calligraplan/calligraplan-3.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0.ebuild
index 1ee634ee176..750bd0f7af6 100644
--- a/app-office/calligraplan/calligraplan-3.1.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.calligra.org/;
 SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="activities +holidays kwallet pim X"
 
 # FIXME: Disabled by upstream for good reason



[gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/

2019-01-01 Thread Andreas Sturmlechner
commit: 8637d093d5b79d97f5ee4d27a83029845beb88d9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  1 16:17:16 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan  1 19:40:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8637d093

app-office/calligraplan: New package

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligraplan/Manifest   |   1 +
 app-office/calligraplan/calligraplan-3.1.0.ebuild  | 105 +
 .../files/calligraplan-3.1.0-qca.patch | 127 +
 .../files/calligraplan-3.1.0-qt-5.11.patch | 124 
 app-office/calligraplan/metadata.xml   |  18 +++
 5 files changed, 375 insertions(+)

diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
new file mode 100644
index 000..7ff08e55465
--- /dev/null
+++ b/app-office/calligraplan/Manifest
@@ -0,0 +1 @@
+DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156

diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild 
b/app-office/calligraplan/calligraplan-3.1.0.ebuild
new file mode 100644
index 000..1ee634ee176
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.1.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://www.calligra.org/;
+SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities +holidays kwallet pim X"
+
+# FIXME: Disabled by upstream for good reason
+# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled in plan
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   dev-libs/kdiagram:5
+   sys-libs/zlib
+   activities? ( $(add_frameworks_dep kactivities) )
+   holidays? ( $(add_frameworks_dep kholidays) )
+   kwallet? (
+   $(add_frameworks_dep kwallet)
+   app-crypt/qca:2[qt5(+)]
+   )
+   pim? (
+   $(add_kdeapps_dep kcalcore)
+   $(add_kdeapps_dep kcontacts)
+   )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   !app-office/calligra[calligra_features_plan(-)]
+   !app-office/calligra-l10n:4
+   $(add_qt_dep qtsvg)
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-qt-5.11.patch
+   "${FILESDIR}"/${P}-qca.patch
+)
+
+src_prepare() {
+   kde5_src_prepare
+   # Unconditionally disable deprecated deps
+   punt_bogus_dep Qt5 OpenGL
+   # FIXME: disable bogus deps
+   punt_bogus_dep KF5 KCMUtils
+   punt_bogus_dep Qt5 Network
+   punt_bogus_dep Qt5 Svg
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package activities KF5Activities)
+   $(cmake-utils_use_find_package holidays KF5Holidays)
+   $(cmake-utils_use_find_package pim KF5CalendarCore)
+   $(cmake-utils_use_find_package pim KF5Contacts)
+   $(cmake-utils_use_find_package kwallet Qca-qt5)
+   $(cmake-utils_use_find_package kwallet KF5Wallet)
+   )
+   # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+   kde5_src_configure
+}

diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch