subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-office\/calligra\/"

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

2024-06-06 Thread Andreas Sturmlechner

commit: 87e54ac491002dcb3fa18a57110d700c12dcb7a7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  6 17:45:07 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  6 18:09:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e54ac4

app-office/calligra: Fix build with >=app-text/poppler-24.05

Thanks-to: Attila Tóth
Closes: https://bugs.gentoo.org/933490
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/calligra-3.2.1-r9.ebuild   |  1 +
 .../files/calligra-3.2.1-poppler-24.05.0.patch | 42 ++
 2 files changed, 43 insertions(+)

diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild 
b/app-office/calligra/calligra-3.2.1-r9.ebuild
index 32314e5d0f86..0503c3fba007 100644
--- a/app-office/calligra/calligra-3.2.1-r9.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r9.ebuild
@@ -130,6 +130,7 @@ PATCHES=(
"${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532
"${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343
"${FILESDIR}"/${P}-clang-16-configure.patch
+   "${FILESDIR}"/${P}-poppler-24.05.0.patch # bug 933490
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch 
b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch
new file mode 100644
index ..2ef45d675e3b
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch
@@ -0,0 +1,42 @@
+diff '--color=auto' -urNp calligra-3.2.1-orig/CMakeLists.txt 
calligra-3.2.1-dwok/CMakeLists.txt
+--- calligra-3.2.1-orig/CMakeLists.txt 2024-06-05 13:06:55.730007129 +0200
 calligra-3.2.1-dwok/CMakeLists.txt 2024-06-05 13:08:00.587082911 +0200
+@@ -104,7 +104,7 @@ if(NOT DEFINED RELEASE_BUILD)
+ endif()
+ message(STATUS "Release build: ${RELEASE_BUILD}")
+ 
+-set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01
++set (CMAKE_CXX_STANDARD 20) # required for >=poppler-22.04
+ 
+ 
+ #
+diff '--color=auto' -urNp calligra-3.2.1-orig/libs/pigment/lut.h 
calligra-3.2.1-dwok/libs/pigment/lut.h
+--- calligra-3.2.1-orig/libs/pigment/lut.h 2024-06-05 13:06:55.922010313 
+0200
 calligra-3.2.1-dwok/libs/pigment/lut.h 2024-06-05 13:09:24.460474108 
+0200
+@@ -143,7 +143,7 @@ typedef uint32_t lut_uint32;
+   template<>  
\
+   class LutKey<_INT_TYPE_> {   \
+ public:   
\
+-  LutKey<_INT_TYPE_>(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), 
m_max(max) \
++  LutKey(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) 
\
+   {   
\
+   }   
\
+ public:   
\
+@@ -183,7 +183,7 @@ PARTIAL_LUT_INT_SPECIALIZATION(lut_uint3
+   template<>  
\
+   class FullLutKey<_INT_TYPE_> {  
\
+ public:   
\
+-  FullLutKey<_INT_TYPE_>()
\
++  FullLutKey()
\
+   {   
\
+   }   
\
+ public:   
\
+@@ -233,7 +233,7 @@ class LutKey {
+   float f;
+ };
+   public:
+-LutKey(float min, float max, float precision) : m_min(min), 
m_max(max), m_precision(precision)
++LutKey(float min, float max, float precision) : m_min(min), m_max(max), 
m_precision(precision)
+ {
+   // Those values where computed using the test_linear and setting the 
shift and then using
+   // the standard deviation.

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

2024-03-15 Thread Andreas Sturmlechner

commit: 057cec87f1c1d0ca1f034a88f7c401101c4d70b3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 15 11:55:46 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 15 12:18:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057cec87

app-office/calligra: Switch okularpart headers to okular5

Bug: https://bugs.gentoo.org/926748
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/calligra-3.2.1-r9.ebuild   |  4 ++
 .../calligra/files/calligra-3.2.1-okularpart.patch | 78 ++
 2 files changed, 82 insertions(+)

diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild 
b/app-office/calligra/calligra-3.2.1-r9.ebuild
index fb8f5a53b31b..32314e5d0f86 100644
--- a/app-office/calligra/calligra-3.2.1-r9.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r9.ebuild
@@ -142,6 +142,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+   if has_version "media-gfx/okularpart:5"; then
+   eapply "${FILESDIR}/${P}-okularpart.patch"
+   fi
+
ecm_src_prepare
 
# Unconditionally disable deprecated deps (required by QtQuick1)

diff --git a/app-office/calligra/files/calligra-3.2.1-okularpart.patch 
b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
new file mode 100644
index ..75a3b0d05416
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
@@ -0,0 +1,78 @@
+From e3b1fe06a2593edcaf33f106b2f77679cd1ea9c8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 15 Mar 2024 12:39:45 +0100
+Subject: [PATCH] Switch okular headers to okular5
+
+Otherwise it will be using okular6's.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ extras/okularodpgenerator/OkularOdpGenerator.cpp | 2 +-
+ extras/okularodpgenerator/OkularOdpGenerator.h   | 6 +++---
+ extras/okularodtgenerator/OkularOdtGenerator.cpp | 2 +-
+ extras/okularodtgenerator/OkularOdtGenerator.h   | 6 +++---
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/extras/okularodpgenerator/OkularOdpGenerator.cpp 
b/extras/okularodpgenerator/OkularOdpGenerator.cpp
+index 823d039b3b0..a4614f38f6b 100644
+--- a/extras/okularodpgenerator/OkularOdpGenerator.cpp
 b/extras/okularodpgenerator/OkularOdpGenerator.cpp
+@@ -33,7 +33,7 @@
+ #include 
+ #include 
+ 
+-#include 
++#include 
+ 
+ #include 
+ 
+diff --git a/extras/okularodpgenerator/OkularOdpGenerator.h 
b/extras/okularodpgenerator/OkularOdpGenerator.h
+index 9107c52c52b..5564ec7f881 100644
+--- a/extras/okularodpgenerator/OkularOdpGenerator.h
 b/extras/okularodpgenerator/OkularOdpGenerator.h
+@@ -22,9 +22,9 @@
+ 
+ #include "kookulargenerator_odp_export.h"
+ 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
+ 
+ class KoPADocument;
+ 
+diff --git a/extras/okularodtgenerator/OkularOdtGenerator.cpp 
b/extras/okularodtgenerator/OkularOdtGenerator.cpp
+index 9ba114d6080..bccfb11a068 100644
+--- a/extras/okularodtgenerator/OkularOdtGenerator.cpp
 b/extras/okularodtgenerator/OkularOdtGenerator.cpp
+@@ -41,7 +41,7 @@
+ #include 
+ #include 
+ 
+-#include 
++#include 
+ 
+ 
+ OkularOdtGenerator::OkularOdtGenerator( QObject *parent, const QVariantList 
 )
+diff --git a/extras/okularodtgenerator/OkularOdtGenerator.h 
b/extras/okularodtgenerator/OkularOdtGenerator.h
+index d3e9692b385..994a81aae2c 100644
+--- a/extras/okularodtgenerator/OkularOdtGenerator.h
 b/extras/okularodtgenerator/OkularOdtGenerator.h
+@@ -22,9 +22,9 @@
+ 
+ #include "kookulargenerator_odt_export.h"
+ 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
+ 
+ class KWDocument;
+ 
+-- 
+2.44.0
+

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

2024-03-11 Thread Andreas Sturmlechner

commit: a9fa91b81b0af382213caa1ab2926ee45cbd81ab
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar  4 20:54:18 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 11 09:50:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9fa91b8

app-office/calligra: Add media-gfx/okularpart:5 alternative to okular:5

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

 .../{calligra-3.2.1-r8.ebuild => calligra-3.2.1-r9.ebuild}   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-office/calligra/calligra-3.2.1-r8.ebuild 
b/app-office/calligra/calligra-3.2.1-r9.ebuild
similarity index 97%
rename from app-office/calligra/calligra-3.2.1-r8.ebuild
rename to app-office/calligra/calligra-3.2.1-r9.ebuild
index 32df8e62e124..fb8f5a53b31b 100644
--- a/app-office/calligra/calligra-3.2.1-r8.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -74,7 +74,7 @@ COMMON_DEPEND="
virtual/libiconv
activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
charts? ( dev-libs/kdiagram:5 )
-   crypt? ( >=app-crypt/qca-2.3.0:2 )
+   crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] )
fontconfig? ( media-libs/fontconfig )
gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
gsl? ( sci-libs/gsl:= )
@@ -88,7 +88,10 @@ COMMON_DEPEND="
media-libs/libvisio
)
lcms? ( media-libs/lcms:2 )
-   okular? ( kde-apps/okular:5 )
+   okular? ( || (
+   media-gfx/okularpart:5
+   kde-apps/okular:5
+   ) )
pdf? ( app-text/poppler:=[qt5] )
phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
spacenav? ( dev-libs/libspnav )

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

2023-05-29 Thread Sam James

commit: 50ba5c7a257c7e00c1fcc5ad4619a3099bfc0347
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 20:55:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 20:55:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ba5c7a

app-office/calligra: Keyword 3.2.1-r8 arm64, #907075

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

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

diff --git a/app-office/calligra/calligra-3.2.1-r8.ebuild 
b/app-office/calligra/calligra-3.2.1-r8.ebuild
index 0c34bcc17c16..49aba50d91f5 100644
--- a/app-office/calligra/calligra-3.2.1-r8.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r8.ebuild
@@ -18,7 +18,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
PATCHSET="${P}-patchset-1"
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
-   KEYWORDS="amd64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2023-05-06 Thread Andreas Sturmlechner

commit: 0e0346e98e7e89b48c1ac6d5c43bfe5352b4360a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  6 18:11:59 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  6 18:11:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0346e9

app-office/calligra: drop 3.2.1-r5

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

 app-office/calligra/calligra-3.2.1-r5.ebuild | 192 ---
 1 file changed, 192 deletions(-)

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r5.ebuild
deleted file mode 100644
index 2acce0b09496..
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.88.0
-QTMIN=5.15.2
-inherit check-reqs ecm flag-o-matic kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://calligra.org/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   PATCHSET="${P}-patchset-1"
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-   https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
-   KEYWORDS="amd64 ~ppc64 ~riscv x86"
-fi
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
-   okular +pdf phonon spacenav +truetype X
-   $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
-
-RESTRICT="test"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-COMMON_DEPEND="
-   dev-lang/perl
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdelibs4support-${KFMIN}:5
-   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kross-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/sonnet-${KFMIN}:5
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-   charts? ( dev-libs/kdiagram:5 )
-   crypt? ( >=app-crypt/qca-2.3.0:2 )
-   fontconfig? ( media-libs/fontconfig )
-   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-   gsl? ( sci-libs/gsl:= )
-   import-filter? (
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   >=app-text/libwps-0.4
-   dev-libs/librevenge
-   media-libs/libvisio
-   )
-   lcms? ( media-libs/lcms:2 )
-   okular? ( kde-apps/okular:5 )
-   pdf? ( app-text/poppler:=[qt5] )
-   phonon? ( >=media-libs/phonon-4.11.0 )
-   spacenav? ( dev-libs/libspnav )
-   truetype? ( media-libs/freetype:2 )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-   calligra_features_sheets? ( dev-cpp/eigen:3 )
-   calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-libs/boost
-   lcms? ( dev-libs/imath:3 )
-   test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-   gemini? (
-   >=dev-qt/qtquickcontrols-${QTMIN}:5
-   >=dev-qt/qtquickcontrols2-${QTMIN}:5
-   >=kde-frameworks/kirigami-${KFMIN}:5
-   )
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-

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

2023-05-06 Thread Arthur Zamarin

commit: d4ff66cd43d232778b8050e778eb088e6a181d0a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:35:24 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:35:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ff66cd

app-office/calligra: Stabilize 3.2.1-r8 amd64, #904868

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/app-office/calligra/calligra-3.2.1-r8.ebuild 
b/app-office/calligra/calligra-3.2.1-r8.ebuild
index 77b7c25e2de8..0c34bcc17c16 100644
--- a/app-office/calligra/calligra-3.2.1-r8.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r8.ebuild
@@ -18,7 +18,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
PATCHSET="${P}-patchset-1"
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
-   KEYWORDS="~amd64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~ppc64 ~riscv x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2023-04-23 Thread Sam James

commit: 8b176731c02410fef4bd1dd567f9ee07c82d3960
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 13:03:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 13:03:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b176731

app-office/calligra: Stabilize 3.2.1-r8 x86, #904868

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

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

diff --git a/app-office/calligra/calligra-3.2.1-r8.ebuild 
b/app-office/calligra/calligra-3.2.1-r8.ebuild
index d757ece3bddd..77b7c25e2de8 100644
--- a/app-office/calligra/calligra-3.2.1-r8.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r8.ebuild
@@ -18,7 +18,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
PATCHSET="${P}-patchset-1"
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
-   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~ppc64 ~riscv x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2023-04-22 Thread Sam James

commit: 46f5f2f97a7786d593d77593844096d5ce84c501
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 22 16:45:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 22 16:47:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f5f2f9

app-office/calligra: fix configure w/ clang 16

May be misconfigured otherwise.

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

 ...ligra-3.2.1-r7.ebuild => calligra-3.2.1-r8.ebuild} |  1 +
 .../files/calligra-3.2.1-clang-16-configure.patch | 19 +++
 2 files changed, 20 insertions(+)

diff --git a/app-office/calligra/calligra-3.2.1-r7.ebuild 
b/app-office/calligra/calligra-3.2.1-r8.ebuild
similarity index 99%
rename from app-office/calligra/calligra-3.2.1-r7.ebuild
rename to app-office/calligra/calligra-3.2.1-r8.ebuild
index 27b0ebbf1634..d757ece3bddd 100644
--- a/app-office/calligra/calligra-3.2.1-r7.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r8.ebuild
@@ -126,6 +126,7 @@ PATCHES=(
"${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch
"${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532
"${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343
+   "${FILESDIR}"/${P}-clang-16-configure.patch
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch 
b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
new file mode 100644
index ..c723eca0b75f
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
@@ -0,0 +1,19 @@
+https://invent.kde.org/office/calligra/-/merge_requests/81
+https://invent.kde.org/office/calligra/-/commit/30c905a6a34ad656446839c844abb78a2aa3f586
+
+From 30c905a6a34ad656446839c844abb78a2aa3f586 Mon Sep 17 00:00:00 2001
+From: Florian Weimer 
+Date: Wed, 19 Apr 2023 10:34:25 +0200
+Subject: [PATCH] Avoid implicit declaration of atoi in CMake check
+
+Future compilers will not support implicit function declarations by
+default, so include  for a declaration of atoi.
+--- a/cmake/TestModernZlib.c
 b/cmake/TestModernZlib.c
+@@ -1,3 +1,4 @@
++#include 
+ #include 
+ #include 
+ 
+-- 
+GitLab

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

2023-04-22 Thread Andreas Sturmlechner

commit: 591c90d4a4afd60e49e7b89ef42da60a0ce0de58
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 22 13:32:08 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 22 13:35:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591c90d4

app-office/calligra: USE cmake FindGSL module instead of bundled one

Fixes potential build issues. Upstream commit
fb545574a3e3b48b937dc4f741048c7033735e04, readjusted on top of our
modifications.

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

 app-office/calligra/calligra-3.2.1-r7.ebuild   |  2 ++
 .../calligra-3.2.1-use-cmake-FindGSL-module.patch  | 29 ++
 2 files changed, 31 insertions(+)

diff --git a/app-office/calligra/calligra-3.2.1-r7.ebuild 
b/app-office/calligra/calligra-3.2.1-r7.ebuild
index f2e157c7c232..27b0ebbf1634 100644
--- a/app-office/calligra/calligra-3.2.1-r7.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r7.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 CHECKREQS_DISK_BUILD="4G"
+CMAKE_REMOVE_MODULES_LIST=( FindGSL )
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.88.0
@@ -124,6 +125,7 @@ PATCHES=(
"${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch
"${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch
"${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532
+   "${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343
 )
 
 pkg_pretend() {

diff --git 
a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch 
b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
new file mode 100644
index ..07e31a0ed77d
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
@@ -0,0 +1,29 @@
+From fb545574a3e3b48b937dc4f741048c7033735e04 Mon Sep 17 00:00:00 2001
+From: Dan Leinir Turthra Jensen 
+Date: Thu, 29 Apr 2021 13:02:39 +0100
+Subject: [PATCH] Fix GSL find module
+
+This increases the CMake requirement to 3.2 so we can use the GSL find
+module that ships with CMake since then. The custom find module
+apparently doesn't work right on Windows, so...
+---
+ sheets/plugins/solver/CMakeLists.txt |  4 +-
+ 1 filee changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sheets/plugins/solver/CMakeLists.txt 
b/sheets/plugins/solver/CMakeLists.txt
+index 41bc4a77ae9..ecd4bd8d218 100644
+--- a/sheets/plugins/solver/CMakeLists.txt
 b/sheets/plugins/solver/CMakeLists.txt
+@@ -25,8 +25,8 @@ calligrasheets_viewplugin_desktop_to_json(sheetssolver 
sheetssolver.desktop)
+ 
+ 
+ target_link_libraries( sheetssolver
+-${GSL_LIBRARIES}
+-${GSL_CBLAS_LIBRARIES}
++GSL::gsl
++GSL::gslcblas
+ calligrasheetscommon
+ )
+ 
+-- 
+GitLab

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

2023-03-31 Thread Andreas Sturmlechner

commit: 813cace6717f88a6ddbd1268ff3c03eab5200b84
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 31 19:07:58 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 31 19:08:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=813cace6

app-office/calligra: Drop unused dev-qt/qtscript dependency

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

 .../calligra/{calligra-3.2.1-r6.ebuild => calligra-3.2.1-r7.ebuild}  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-office/calligra/calligra-3.2.1-r6.ebuild 
b/app-office/calligra/calligra-3.2.1-r7.ebuild
similarity index 99%
rename from app-office/calligra/calligra-3.2.1-r6.ebuild
rename to app-office/calligra/calligra-3.2.1-r7.ebuild
index 4d434a0c1d25..f2e157c7c232 100644
--- a/app-office/calligra/calligra-3.2.1-r6.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r7.ebuild
@@ -40,7 +40,6 @@ COMMON_DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5

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

2023-03-29 Thread Andreas Sturmlechner

commit: b67543f8bb06015c098c3adea74641e27d531045
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 29 12:35:05 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 29 12:46:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67543f8

app-office/calligra: Drop unused KF5Kross dep, use patchset

See also:
https://invent.kde.org/office/calligra/-/merge_requests/79

Bug: https://bugs.gentoo.org/903532
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/Manifest   |   1 +
 app-office/calligra/calligra-3.2.1-r5.ebuild   |  20 +-
 ...ra-3.2.1-r5.ebuild => calligra-3.2.1-r6.ebuild} |  25 +-
 .../files/calligra-3.1.89-no-arch-detection.patch  |  17 -
 .../files/calligra-3.2.1-clang-16-c++17.patch  | 359 -
 .../calligra/files/calligra-3.2.1-cmake-3.16.patch |  86 
 .../files/calligra-3.2.1-cxx17-fixes.patch | 443 -
 .../calligra-3.2.1-cxx17-for-poppler-22.patch  |  31 --
 .../calligra/files/calligra-3.2.1-imath-1.patch|  30 --
 .../calligra/files/calligra-3.2.1-imath-2.patch|  25 --
 .../calligra/files/calligra-3.2.1-openexr-3.patch  |  93 -
 .../files/calligra-3.2.1-poppler-22.03.0-1.patch   |  73 
 .../files/calligra-3.2.1-poppler-22.03.0-2.patch   |  94 -
 .../files/calligra-3.2.1-poppler-22.04.0.patch |  25 --
 14 files changed, 26 insertions(+), 1296 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 351fbb7e9b7c..d7c2d4419fe5 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,2 @@
+DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 
5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9
 SHA512 
26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 
332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20
 SHA512 
e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r5.ebuild
index c9290de8b5ac..2acce0b09496 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.ebuild
@@ -14,7 +14,9 @@ DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   PATCHSET="${P}-patchset-1"
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+   https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
KEYWORDS="amd64 ~ppc64 ~riscv x86"
 fi
 
@@ -115,14 +117,14 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="sys-devel/gettext"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch
-   "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224
-   "${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch
-   "${FILESDIR}"/${P}-cxx17-for-poppler-22.patch
-   "${FILESDIR}"/${P}-cxx17-fixes.patch
-   "${FILESDIR}"/${P}-poppler-22.03.0-{1,2}.patch
-   "${FILESDIR}"/${P}-poppler-22.04.0.patch
-   "${FILESDIR}"/${P}-clang-16-c++17.patch
+   "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch
+   "${WORKDIR}"/${PATCHSET}/${P}-cmake-3.16.patch # bug 796224
+   "${WORKDIR}"/${PATCHSET}/${P}-{openexr-3,imath-{1,2}}.patch
+   "${WORKDIR}"/${PATCHSET}/${P}-cxx17-for-poppler-22.patch
+   "${WORKDIR}"/${PATCHSET}/${P}-cxx17-fixes.patch
+   "${WORKDIR}"/${PATCHSET}/${P}-poppler-22.03.0-{1,2}.patch
+   "${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch
+   "${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r6.ebuild
similarity index 87%
copy from app-office/calligra/calligra-3.2.1-r5.ebuild
copy to app-office/calligra/calligra-3.2.1-r6.ebuild
index c9290de8b5ac..4d434a0c1d25 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r6.ebuild
@@ -14,8 +14,10 @@ DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 ~ppc64 ~riscv x86"
+   PATCHSET="${P}-patchset-1"
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+   https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
+   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )
@@ -62,7 +64,6 @@ COMMON_DEPEND="
>=kde-frameworks/knotifications-${KFMIN}:5

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

2023-02-15 Thread Sam James

commit: e3ae04d9c5f068e17d903ac7d5b16336589fb56e
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 16 02:52:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 03:26:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ae04d9

app-office/calligra: fix build w/ clang 16 deux

I was a bit naive and just checked for the appearance of register warnings
by eye & -std=c++14 appearing and that's not good enough here, as we force
C++17 for Poppler in a patch.

Again, this is fixed upstream anyway, so this is a downstream-only patch.

Fixes: e0a0a09c1bb283024c1a10f737eba380a22bcc1f
Closes: https://bugs.gentoo.org/894578
Closes: https://bugs.gentoo.org/883067
Signed-off-by: Sam James  gentoo.org>

 app-office/calligra/calligra-3.2.1-r5.ebuild   |   4 +-
 .../files/calligra-3.2.1-clang-16-c++17.patch  | 359 +
 2 files changed, 360 insertions(+), 3 deletions(-)

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r5.ebuild
index f26074e74960..c9290de8b5ac 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.ebuild
@@ -122,6 +122,7 @@ PATCHES=(
"${FILESDIR}"/${P}-cxx17-fixes.patch
"${FILESDIR}"/${P}-poppler-22.03.0-{1,2}.patch
"${FILESDIR}"/${P}-poppler-22.04.0.patch
+   "${FILESDIR}"/${P}-clang-16-c++17.patch
 )
 
 pkg_pretend() {
@@ -144,9 +145,6 @@ src_prepare() {
 src_configure() {
local cal_ft myproducts
 
-   # Uses removed 'register' keyword, drop on next release. bug #883067
-   append-cxxflags -std=c++14
-
# applications
for cal_ft in ${CAL_FTS[@]}; do
use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )

diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch 
b/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch
new file mode 100644
index ..d826e006249d
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch
@@ -0,0 +1,359 @@
+Fixed in upstream master but in a far larger patch.
+
+C++ 17 removes 'register'. GCC allows it as an extension (for now?) but Clang
+16 which defaults to -std=c++17 doesn't.
+
+Further, we have to use C++17 for Poppler, so we can't just force e.g. c++14.
+
+https://bugs.gentoo.org/883067#c4
+https://bugs.gentoo.org/894578
+--- a/sheets/part/Digest.cpp
 b/sheets/part/Digest.cpp
+@@ -250,8 +250,8 @@ typedef struct digest_impl_st {
+  */
+ static void __rtl_digest_swapLong(sal_uInt32 *pData, sal_uInt32 nDatLen)
+ {
+-register sal_uInt32 *X;
+-register int i, n;
++sal_uInt32 *X;
++int i, n;
+ 
+ X = pData;
+ n = nDatLen;
+@@ -465,10 +465,10 @@ static void __rtl_digest_initSHA(
+  */
+ static void __rtl_digest_updateSHA(DigestContextSHA *ctx)
+ {
+-register sal_uInt32  A, B, C, D, E, T;
+-register sal_uInt32 *X;
++sal_uInt32  A, B, C, D, E, T;
++sal_uInt32 *X;
+ 
+-register DigestSHA_update_t *U;
++DigestSHA_update_t *U;
+ U = ctx->m_update;
+ 
+ A = ctx->m_nA;
+@@ -577,10 +577,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx)
+ static const sal_uInt8 end[4] = {
+ 0x80, 0x00, 0x00, 0x00
+ };
+-register const sal_uInt8 *p = end;
++const sal_uInt8 *p = end;
+ 
+-register sal_uInt32 *X;
+-register int i;
++sal_uInt32 *X;
++int i;
+ 
+ X = ctx->m_pData;
+ i = (ctx->m_nDatLen >> 2);
+--- a/sheets/ui/CellToolBase_p.cpp
 b/sheets/ui/CellToolBase_p.cpp
+@@ -246,7 +246,7 @@ void CellToolBase::Private::processArrowKey(QKeyEvent 
*event)
+ /* NOTE:  hitting the tab key also calls this function.  Don't forget
+ to account for it
+ */
+-register Sheet * const sheet = q->selection()->activeSheet();
++Sheet * const sheet = q->selection()->activeSheet();
+ if (!sheet)
+ return;
+ 
+@@ -300,7 +300,7 @@ void CellToolBase::Private::processEscapeKey(QKeyEvent * 
event)
+ 
+ bool CellToolBase::Private::processHomeKey(QKeyEvent* event)
+ {
+-register Sheet * const sheet = q->selection()->activeSheet();
++Sheet * const sheet = q->selection()->activeSheet();
+ if (!sheet)
+ return false;
+ 
+@@ -355,7 +355,7 @@ bool CellToolBase::Private::processHomeKey(QKeyEvent* 
event)
+ 
+ bool CellToolBase::Private::processEndKey(QKeyEvent *event)
+ {
+-register Sheet * const sheet = q->selection()->activeSheet();
++Sheet * const sheet = q->selection()->activeSheet();
+ if (!sheet)
+ return false;
+ 
+@@ -438,7 +438,7 @@ bool CellToolBase::Private::processNextKey(QKeyEvent 
*event)
+ 
+ void CellToolBase::Private::processOtherKey(QKeyEvent *event)
+ {
+-register Sheet * const sheet = q->selection()->activeSheet();
++Sheet * const sheet = q->selection()->activeSheet();
+ 
+ // No null character ...
+ if (event->text().isEmpty() ||

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

2023-02-15 Thread Sam James

commit: e0a0a09c1bb283024c1a10f737eba380a22bcc1f
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 15 08:26:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 15 08:26:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a0a09c

app-office/calligra: fix build w/ clang 16

It's fixed upstream in a very large commit which can't be applied cleanly
to 3.2.1-r5. We can drop this workaround upon the next release though.

Closes: https://bugs.gentoo.org/883067
Signed-off-by: Sam James  gentoo.org>

 app-office/calligra/calligra-3.2.1-r5.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r5.ebuild
index 49246e3bca3d..f26074e74960 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.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
@@ -8,7 +8,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.88.0
 QTMIN=5.15.2
-inherit check-reqs ecm kde.org
+inherit check-reqs ecm flag-o-matic kde.org
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://calligra.org/;
@@ -144,6 +144,9 @@ src_prepare() {
 src_configure() {
local cal_ft myproducts
 
+   # Uses removed 'register' keyword, drop on next release. bug #883067
+   append-cxxflags -std=c++14
+
# applications
for cal_ft in ${CAL_FTS[@]}; do
use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )

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

2022-10-06 Thread Andreas Sturmlechner

commit: 0196b959699adc99d1b5fbf9c76ec0febf1c59fd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  6 09:00:50 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  6 09:05:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0196b959

app-office/calligra: add cpe upstream metadata

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

 app-office/calligra/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 18a225de5401..b581a8d5393a 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@


https://bugs.kde.org/
+   cpe:/a:calligra:calligra


Enable kactivities support

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

2022-05-16 Thread Andreas Sturmlechner

commit: 4df1ed41c45ff68105b9f40ddbe40a93f680b60b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 16 18:44:12 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 16 18:45:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df1ed41

app-office/calligra: Fix build with >=app-text/poppler-22.04.0

Use upstream patches for app-text/poppler-22.03.0 instead of ArchLinux's.

Closes: https://bugs.gentoo.org/843605
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/calligra-3.2.1-r5.ebuild   |  3 +-
 .../files/calligra-3.2.1-poppler-22.03.0-1.patch   | 73 +
 .../files/calligra-3.2.1-poppler-22.03.0-2.patch   | 94 ++
 .../files/calligra-3.2.1-poppler-22.03.0.patch | 51 
 .../files/calligra-3.2.1-poppler-22.04.0.patch | 25 ++
 5 files changed, 194 insertions(+), 52 deletions(-)

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r5.ebuild
index d80568af53ec..49246e3bca3d 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.ebuild
@@ -120,7 +120,8 @@ PATCHES=(
"${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch
"${FILESDIR}"/${P}-cxx17-for-poppler-22.patch
"${FILESDIR}"/${P}-cxx17-fixes.patch
-   "${FILESDIR}"/${P}-poppler-22.03.0.patch # by Archlinux, TODO upstream
+   "${FILESDIR}"/${P}-poppler-22.03.0-{1,2}.patch
+   "${FILESDIR}"/${P}-poppler-22.04.0.patch
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch 
b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch
new file mode 100644
index ..2d308371a0a7
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch
@@ -0,0 +1,73 @@
+From 63ae4ecc780ba42901e6934302b75bd18d3bc5eb Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Wed, 13 Apr 2022 01:25:44 +0200
+Subject: [PATCH 1/3] PdfImport: Fix compile with newer poppler
+
+Brings a dependency on poppler-qt5 to be able to include the version
+header, honestly it's not strictly needed, one could do a
+check_cxx_source_compiles, but I don't care about Calligra enough to
+spend more time making it compile while it's using poppler the wrong
+way.
+---
+ CMakeLists.txt| 1 +
+ filters/karbon/pdf/CMakeLists.txt | 2 +-
+ filters/karbon/pdf/PdfImport.cpp  | 9 +
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bdd9ed74406..d8c86810b54 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -998,6 +998,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG
+ calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG
+ NOT_WIN "not supported on Windows"
+ PopplerXPDFHeaders_FOUND "poppler xpdf headers not found"
++Poppler_FOUND "poppler qt5 headers not found"
+ )
+ 
+ calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS
+diff --git a/filters/karbon/pdf/CMakeLists.txt 
b/filters/karbon/pdf/CMakeLists.txt
+index 94d4071da3d..ef360f44359 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
 b/filters/karbon/pdf/CMakeLists.txt
+@@ -19,7 +19,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp 
SvgOutputDev.cpp )
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+ calligra_filter_desktop_to_json(calligra_filter_pdf2svg 
calligra_filter_pdf2svg.desktop)
+ 
+-target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core)
++target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core 
Poppler::Qt5)
+ 
+ install(TARGETS calligra_filter_pdf2svg DESTINATION 
${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
+ 
+diff --git a/filters/karbon/pdf/PdfImport.cpp 
b/filters/karbon/pdf/PdfImport.cpp
+index 286f5fa78bc..c171c754116 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
 b/filters/karbon/pdf/PdfImport.cpp
+@@ -30,6 +30,10 @@
+ 
+ #include 
+ 
++#include 
++
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | 
(POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ // Don't show this warning: it's an issue in poppler
+ #ifdef __GNUC__
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+@@ -73,8 +77,13 @@ KoFilter::ConversionStatus PdfImport::convert(const 
QByteArray& from, const QByt
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+ 
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GooString * fname = new 
GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++std::unique_ptr fname = 
std::make_unique(QFile::encodeName(m_chain->inputFile()).data());
++PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
++#endif
+ if (! pdfDoc) {
+ #ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
+-- 
+2.35.1
+

diff --git

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

2022-03-12 Thread Andreas Sturmlechner

commit: a976c14d3eb189f1866b298e418e979f7a912350
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 12 15:39:32 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 12 15:52:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a976c14d

app-office/calligra: Fix build with >=app-text/poppler-22.03.0

Patch taken from Arch Linux

Closes: https://bugs.gentoo.org/834539
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/calligra-3.2.1-r5.ebuild   |  1 +
 .../files/calligra-3.2.1-poppler-22.03.0.patch | 51 ++
 2 files changed, 52 insertions(+)

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r5.ebuild
index 99221952f06f..d80568af53ec 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.ebuild
@@ -120,6 +120,7 @@ PATCHES=(
"${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch
"${FILESDIR}"/${P}-cxx17-for-poppler-22.patch
"${FILESDIR}"/${P}-cxx17-fixes.patch
+   "${FILESDIR}"/${P}-poppler-22.03.0.patch # by Archlinux, TODO upstream
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch 
b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch
new file mode 100644
index ..c704d7896e1f
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch
@@ -0,0 +1,51 @@
+From 8f328bef497a9e3bc628e4e294c1a70b0c8b0eab Mon Sep 17 00:00:00 2001
+From: foutrelis 
+Date: Wed, 2 Mar 2022 10:28:24 +
+Subject: [PATCH] Fix build with poppler 22.03.0
+
+diff -uprw a/filters/karbon/pdf/CMakeLists.txt 
b/filters/karbon/pdf/CMakeLists.txt
+--- a/filters/karbon/pdf/CMakeLists.txt2020-05-14 09:51:30.0 
+0300
 b/filters/karbon/pdf/CMakeLists.txt2022-03-02 12:19:08.039939530 
+0200
+@@ -14,6 +14,10 @@ if(Poppler_VERSION VERSION_LESS "0.83.0"
+ add_definitions("-DHAVE_POPPLER_PRE_0_83")
+ endif()
+ 
++if(Poppler_VERSION VERSION_LESS "22.3.0")
++add_definitions("-DHAVE_POPPLER_PRE_22_3")
++endif()
++
+ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+ 
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+diff -uprw a/filters/karbon/pdf/Pdf2OdgImport.cpp 
b/filters/karbon/pdf/Pdf2OdgImport.cpp
+--- a/filters/karbon/pdf/Pdf2OdgImport.cpp 2020-05-14 09:51:30.0 
+0300
 b/filters/karbon/pdf/Pdf2OdgImport.cpp 2022-03-02 12:20:35.125605950 
+0200
+@@ -86,8 +86,12 @@ KoFilter::ConversionStatus Pdf2OdgImport
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+ 
++#ifdef HAVE_POPPLER_PRE_22_3
+ GooString * fname = new 
GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++PDFDoc * pdfDoc = new 
PDFDoc(std::make_unique(QFile::encodeName(m_chain->inputFile()).data()));
++#endif
+ if (! pdfDoc) {
+ #ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
+diff -uprw a/filters/karbon/pdf/PdfImport.cpp 
b/filters/karbon/pdf/PdfImport.cpp
+--- a/filters/karbon/pdf/PdfImport.cpp 2020-05-14 09:51:30.0 +0300
 b/filters/karbon/pdf/PdfImport.cpp 2022-03-02 12:21:46.197510028 +0200
+@@ -73,8 +73,12 @@ KoFilter::ConversionStatus PdfImport::co
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+ 
++#ifdef HAVE_POPPLER_PRE_22_3
+ GooString * fname = new 
GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++PDFDoc * pdfDoc = new 
PDFDoc(std::make_unique(QFile::encodeName(m_chain->inputFile()).data()));
++#endif
+ if (! pdfDoc) {
+ #ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;

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

2022-02-03 Thread Andreas Sturmlechner

commit: 9c0c440fc5a9bad9aa545876f7f8f8567de9f205
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb  3 08:46:39 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  3 08:51:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0c440f

app-office/calligra: Drop 3.2.1-r3

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

 app-office/calligra/calligra-3.2.1-r3.ebuild | 187 ---
 1 file changed, 187 deletions(-)

diff --git a/app-office/calligra/calligra-3.2.1-r3.ebuild 
b/app-office/calligra/calligra-3.2.1-r3.ebuild
deleted file mode 100644
index c47da0b88466..
--- a/app-office/calligra/calligra-3.2.1-r3.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit check-reqs ecm kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://calligra.org/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms 
okular openexr
-   +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-BDEPEND="
-   sys-devel/gettext
-"
-COMMON_DEPEND="
-   dev-lang/perl
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdelibs4support-${KFMIN}:5
-   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kross-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/sonnet-${KFMIN}:5
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-   charts? ( dev-libs/kdiagram:5 )
-   crypt? ( >=app-crypt/qca-2.3.0:2 )
-   fontconfig? ( media-libs/fontconfig )
-   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-   gsl? ( sci-libs/gsl:= )
-   import-filter? (
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   >=app-text/libwps-0.4
-   dev-libs/librevenge
-   media-libs/libvisio
-   )
-   lcms? (
-   media-libs/ilmbase:=
-   media-libs/lcms:2
-   )
-   okular? ( kde-apps/okular:5 )
-   openexr? ( =media-libs/phonon-4.11.0 )
-   spacenav? ( dev-libs/libspnav )
-   truetype? ( media-libs/freetype:2 )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-   calligra_features_sheets? ( dev-cpp/eigen:3 )
-   calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-libs/boost
-   test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-   gemini? (
-   >=dev-qt/qtquickcontrols2-${QTMIN}:5
-   >=kde-frameworks/kirigami-${KFMIN}:5
-   )
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch
-   "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224
-)
-
-pkg_pretend() {
-

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

2022-02-02 Thread Sam James

commit: 7524e0412c1ab0795277a798fa81352482dbbdde
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb  3 06:08:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb  3 06:08:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7524e041

app-office/calligra: Stabilize 3.2.1-r5 x86, #831562

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

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

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r5.ebuild
index 7453ac87b462..99221952f06f 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~ppc64 ~riscv x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2022-02-02 Thread Sam James

commit: 040c5a771b8a1f0c56a37e87a7e8b89be483e956
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb  3 06:08:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb  3 06:08:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040c5a77

app-office/calligra: Stabilize 3.2.1-r5 amd64, #831562

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

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

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild 
b/app-office/calligra/calligra-3.2.1-r5.ebuild
index efe49eaa6a28..7453ac87b462 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2021-12-29 Thread Yixun Lan

commit: 1e7f7d7779108e6743d5f706d9641285539a8bb0
Author: Alex Fan  gmail  com>
AuthorDate: Tue Dec 28 10:08:18 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Dec 29 13:39:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7f7d77

app-office/calligra: keyword 3.2.1-r4 for ~riscv

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

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

diff --git a/app-office/calligra/calligra-3.2.1-r4.ebuild 
b/app-office/calligra/calligra-3.2.1-r4.ebuild
index 6ef745321e5d..9590f26021f2 100644
--- a/app-office/calligra/calligra-3.2.1-r4.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2021-12-20 Thread Andreas Sturmlechner

commit: e6b799b70528727944e2e7612f4625acf0e61e29
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 19 22:47:52 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 20 13:25:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b799b7

app-office/calligra: EAPI-8, drop IUSE openexr, missing RDEPEND

Fully switch to dev-libs/imath DEPEND.
Drop unused ENABLE_CSTESTER_TESTING cmake var, APP_CSTESTER not ON.
Silence cmake about Cauchy dependency (dead as can be).

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

 app-office/calligra/calligra-3.2.1-r4.ebuild   | 185 +
 .../calligra/files/calligra-3.2.1-imath.patch  |  30 
 .../calligra/files/calligra-3.2.1-openexr-3.patch  |  93 +++
 3 files changed, 308 insertions(+)

diff --git a/app-office/calligra/calligra-3.2.1-r4.ebuild 
b/app-office/calligra/calligra-3.2.1-r4.ebuild
new file mode 100644
index ..6ef745321e5d
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1-r4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.88.0
+QTMIN=5.15.2
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
+   okular +pdf phonon spacenav +truetype X
+   $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+RESTRICT="test"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+COMMON_DEPEND="
+   dev-lang/perl
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdelibs4support-${KFMIN}:5
+   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kross-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=kde-frameworks/sonnet-${KFMIN}:5
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   charts? ( dev-libs/kdiagram:5 )
+   crypt? ( >=app-crypt/qca-2.3.0:2 )
+   fontconfig? ( media-libs/fontconfig )
+   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+   gsl? ( sci-libs/gsl:= )
+   import-filter? (
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   lcms? ( media-libs/lcms:2 )
+   okular? ( kde-apps/okular:5 )
+   pdf? ( app-text/poppler:=[qt5] )
+   phonon? ( >=media-libs/phonon-4.11.0 )
+   spacenav? ( dev-libs/libspnav )
+   truetype? ( media-libs/freetype:2 )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+   calligra_features_sheets? ( dev-cpp/eigen:3 )
+   calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-libs/boost
+   lcms? ( dev-libs/imath:3 )
+   test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+

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

2021-07-21 Thread Marek Szuba

commit: d436dc699fc3a2f0eac9488e2e73c50f598a0043
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Jul 21 18:06:09 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jul 21 21:57:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d436dc69

app-office/calligra: add slot operator for openexr

- restrict to  posteo.net>
Signed-off-by: Marek Szuba  gentoo.org>

 .../calligra/{calligra-3.2.1-r2.ebuild => calligra-3.2.1-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-3.2.1-r2.ebuild 
b/app-office/calligra/calligra-3.2.1-r3.ebuild
similarity index 99%
rename from app-office/calligra/calligra-3.2.1-r2.ebuild
rename to app-office/calligra/calligra-3.2.1-r3.ebuild
index 7fa46d30c39..c47da0b8846 100644
--- a/app-office/calligra/calligra-3.2.1-r2.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r3.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
media-libs/lcms:2
)
okular? ( kde-apps/okular:5 )
-   openexr? ( media-libs/openexr )
+   openexr? ( =media-libs/phonon-4.11.0 )
spacenav? ( dev-libs/libspnav )

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

2021-06-17 Thread Andreas Sturmlechner

commit: 502c8c6d98afd5a69a0323dfa2ea708c94bbafeb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 17 12:18:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 17 12:18:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502c8c6d

app-office/calligra: Fix Fontconfig/Freetype cmake args/targets

Closes: https://bugs.gentoo.org/796224
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/calligra-3.2.1-r2.ebuild   |  5 +-
 .../calligra/files/calligra-3.2.1-cmake-3.16.patch | 86 ++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-3.2.1-r2.ebuild 
b/app-office/calligra/calligra-3.2.1-r2.ebuild
index 88df884a68a..7fa46d30c39 100644
--- a/app-office/calligra/calligra-3.2.1-r2.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r2.ebuild
@@ -117,7 +117,10 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch
+   "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224
+)
 
 pkg_pretend() {
check-reqs_pkg_pretend

diff --git a/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch 
b/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch
new file mode 100644
index 000..7e1fd9d41ea
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch
@@ -0,0 +1,86 @@
+From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= 
+Date: Tue, 8 Jun 2021 05:13:23 +
+Subject: [PATCH] Partial update of Commit 62f51070 to make it compileable
+ again
+
+Cmake to 3.16
+Fix Fontconfig's FOUND variable
+Fix Fontconfig's include_dirs variable
+Use Correct Target to link FontConfig and Freetype
+---
+ CMakeLists.txt   | 14 +-
+ libs/text/CMakeLists.txt |  4 ++--
+ 2 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ce210ebe01..71272ffef2d 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.16)
+ 
+ project(calligra)
+ 
+@@ -168,6 +168,8 @@ calligra_set_productset(${PRODUCTSET})
+ ## Look for ECM, Qt, KF5 ##
+ ###
+ ##
++set(REQUIRED_KF5_VERSION "5.7.0")
++set(REQUIRED_QT_VERSION "5.3.0")
+ 
+ find_package(ECM 5.19 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} 
${ECM_KDE_MODULE_DIR})
+@@ -199,9 +201,6 @@ include(MacroOptionalFindPackage)
+ include(MacroEnsureVersion)
+ include(MacroDesktopToJson)
+ 
+-
+-set(REQUIRED_KF5_VERSION "5.7.0")
+-
+ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ COMPONENTS
+ Archive
+@@ -251,9 +250,6 @@ if(${KF5_VERSION} VERSION_LESS "5.16.0")
+ set(CALLIGRA_OLD_PLUGIN_METADATA TRUE)
+ endif()
+ 
+-
+-set(REQUIRED_QT_VERSION "5.3.0")
+-
+ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
+ COMPONENTS
+ Core
+@@ -641,8 +637,8 @@ if(NOT WIN32 AND NOT APPLE)
+   )
+ endif()
+ 
+-if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND)
+-set(FONTCONFIG_INCLUDE_DIR "")
++if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND)
++set(Fontconfig_INCLUDE_DIRS "")
+ set(FREETYPE_INCLUDE_DIRS "")
+ else()
+ add_definitions( -DSHOULD_BUILD_FONT_CONVERSION )
+diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt
+index 16d7e066fa2..429afe79704 100644
+--- a/libs/text/CMakeLists.txt
 b/libs/text/CMakeLists.txt
+@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF )
+ endif()
+ 
+ if( FONTCONFIG_FOUND )
+-target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES})
++target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig)
+ endif()
+ 
+ if( FREETYPE_FOUND )
+-target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES})
++target_link_libraries(kotext PRIVATE Freetype::Freetype)
+ endif()
+ 
+ 
+-- 
+GitLab
+

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

2021-06-02 Thread Sam James

commit: 13f0b3cee573d17787b75fb296d7474806411576
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  2 21:25:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  2 21:50:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f0b3ce

app-office/calligra: subscribe to sci-libs/gsl subslot

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

 .../calligra/{calligra-3.2.1-r1.ebuild => calligra-3.2.1-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-3.2.1-r1.ebuild 
b/app-office/calligra/calligra-3.2.1-r2.ebuild
similarity index 99%
rename from app-office/calligra/calligra-3.2.1-r1.ebuild
rename to app-office/calligra/calligra-3.2.1-r2.ebuild
index ab0164eb599..88df884a68a 100644
--- a/app-office/calligra/calligra-3.2.1-r1.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r2.ebuild
@@ -76,7 +76,7 @@ COMMON_DEPEND="
crypt? ( >=app-crypt/qca-2.3.0:2 )
fontconfig? ( media-libs/fontconfig )
gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-   gsl? ( sci-libs/gsl )
+   gsl? ( sci-libs/gsl:= )
import-filter? (
app-text/libetonyek
app-text/libodfgen

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

2021-02-24 Thread Sam James

commit: 864ea46fc5352454d34bb33a66fca99713df2ecc
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 24 19:21:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 24 19:21:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864ea46f

app-office/calligra: Keyword 3.2.1-r1 ppc64, #769950

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

 app-office/calligra/calligra-3.2.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-3.2.1-r1.ebuild 
b/app-office/calligra/calligra-3.2.1-r1.ebuild
index ac8c6555199..fb5388edbf8 100644
--- a/app-office/calligra/calligra-3.2.1-r1.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
+   KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2020-10-29 Thread Andreas Sturmlechner

commit: 25fd7287378a822d27e44d2daf800b20efa18ca4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 29 20:27:04 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 29 20:28:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25fd7287

app-office/calligra: Drop 3.2.1 (r0)

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

 app-office/calligra/calligra-3.2.1.ebuild | 189 --
 1 file changed, 189 deletions(-)

diff --git a/app-office/calligra/calligra-3.2.1.ebuild 
b/app-office/calligra/calligra-3.2.1.ebuild
deleted file mode 100644
index df46c7181c6..000
--- a/app-office/calligra/calligra-3.2.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit check-reqs ecm kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://calligra.org/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms 
okular openexr
-   +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-BDEPEND="
-   sys-devel/gettext
-"
-COMMON_DEPEND="
-   dev-lang/perl
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdelibs4support-${KFMIN}:5
-   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kross-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/sonnet-${KFMIN}:5
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-   charts? ( dev-libs/kdiagram:5 )
-   crypt? ( app-crypt/qca:2[qt5(+)] )
-   fontconfig? ( media-libs/fontconfig )
-   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   >=app-text/libwps-0.4
-   dev-libs/librevenge
-   >=kde-frameworks/khtml-${KFMIN}:5
-   media-libs/libvisio
-   )
-   lcms? (
-   media-libs/ilmbase:=
-   media-libs/lcms:2
-   )
-   okular? ( kde-apps/okular:5 )
-   openexr? ( media-libs/openexr )
-   pdf? ( app-text/poppler:=[qt5] )
-   phonon? ( media-libs/phonon[qt5(+)] )
-   spacenav? ( dev-libs/libspnav )
-   truetype? ( media-libs/freetype:2 )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-   calligra_features_sheets? ( dev-cpp/eigen:3 )
-   calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-libs/boost
-   test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-   gemini? (
-   >=dev-qt/qtquickcontrols2-${QTMIN}:5
-   >=kde-frameworks/kirigami-${KFMIN}:5
-   )
-"
-
-RESTRICT+=" test"
-
-PATCHES=(

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

2020-10-29 Thread Andreas Sturmlechner

commit: c0336270035bd07e5a23182b03473b4dd67b6c89
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 29 20:26:14 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 29 20:28:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0336270

app-office/calligra: Hard-disable KF5Html

Only disables HTML_TO_ODS filter.

- Drop obsolete disabling of benchmarks dir
  After BUILD_TESTING patch was accepted upstream years ago.

- Cleanup media-libs/phonon[qt5(+)] and depend on >=media-libs/phonon-4.11.0

- Cleanup app-crypt/qca[qca(+)] and depend on >=app-crypt/qca-2.3.0:2

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

 app-office/calligra/calligra-3.2.1-r1.ebuild | 184 +++
 1 file changed, 184 insertions(+)

diff --git a/app-office/calligra/calligra-3.2.1-r1.ebuild 
b/app-office/calligra/calligra-3.2.1-r1.ebuild
new file mode 100644
index 000..ac8c6555199
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="amd64 x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms 
okular openexr
+   +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+   sys-devel/gettext
+"
+COMMON_DEPEND="
+   dev-lang/perl
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdelibs4support-${KFMIN}:5
+   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kross-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=kde-frameworks/sonnet-${KFMIN}:5
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   charts? ( dev-libs/kdiagram:5 )
+   crypt? ( >=app-crypt/qca-2.3.0:2 )
+   fontconfig? ( media-libs/fontconfig )
+   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   lcms? (
+   media-libs/ilmbase:=
+   media-libs/lcms:2
+   )
+   okular? ( kde-apps/okular:5 )
+   openexr? ( media-libs/openexr )
+   pdf? ( app-text/poppler:=[qt5] )
+   phonon? ( >=media-libs/phonon-4.11.0 )
+   spacenav? ( dev-libs/libspnav )
+   truetype? ( media-libs/freetype:2 )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+   calligra_features_sheets? ( dev-cpp/eigen:3 )
+   calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-libs/boost
+   test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   calligra_features_karbon?

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

2020-07-18 Thread Andreas Sturmlechner

commit: a7a23d6447956b728cf089be0637b49ff2f3e2d2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 18 00:56:10 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul 18 08:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a23d64

app-office/calligra: Drop 3.1.0-r4

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

 app-office/calligra/Manifest   |   1 -
 app-office/calligra/calligra-3.1.0-r4.ebuild   | 213 -
 app-office/calligra/files/calligra-3.1.0-doc.patch |  13 --
 .../files/calligra-3.1.0-missing-header.patch  |  23 ---
 .../files/calligra-3.1.0-no-arch-detection.patch   |  17 --
 .../calligra/files/calligra-3.1.0-no-webkit.patch  |  70 ---
 .../files/calligra-3.1.0-poppler-0.69.patch|  83 
 .../files/calligra-3.1.0-poppler-0.71.patch| 202 ---
 .../files/calligra-3.1.0-poppler-0.72.patch|  39 
 .../files/calligra-3.1.0-poppler-0.73.patch|  35 
 .../files/calligra-3.1.0-poppler-0.82.patch|  35 
 .../files/calligra-3.1.0-poppler-0.83.patch|  69 ---
 .../calligra/files/calligra-3.1.0-qt-5.11.patch| 109 ---
 .../files/calligra-3.1.0-stage-qt-5.11.patch   |  23 ---
 14 files changed, 932 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 867835ec111..351fbb7e9b7 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1 @@
-DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 
332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20
 SHA512 
e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f

diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild 
b/app-office/calligra/calligra-3.1.0-r4.ebuild
deleted file mode 100644
index 9e095aa4722..000
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK_DIR="xxx" # contains no language subdirs
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit check-reqs ecm
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-
-CAL_FTS=( karbon sheets stage words )
-
-IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms 
okular openexr
-   +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-BDEPEND="
-   sys-devel/gettext
-"
-COMMON_DEPEND="
-   dev-lang/perl
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdelibs4support-${KFMIN}:5
-   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kross-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-

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

2020-07-17 Thread Agostino Sarubbo

commit: ae749526af670c4f315c81fe6290bca6f4e40708
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 07:43:13 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 07:43:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae749526

app-office/calligra: x86 stable wrt bug #731970

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-office/calligra/calligra-3.2.1.ebuild 
b/app-office/calligra/calligra-3.2.1.ebuild
index b27ddaf9732..df46c7181c6 100644
--- a/app-office/calligra/calligra-3.2.1.ebuild
+++ b/app-office/calligra/calligra-3.2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2020-07-17 Thread Agostino Sarubbo

commit: 70778dea627484324627e840b371060fe016eca8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 07:19:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 07:19:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70778dea

app-office/calligra: amd64 stable wrt bug #731970

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-office/calligra/calligra-3.2.1.ebuild 
b/app-office/calligra/calligra-3.2.1.ebuild
index 240ca9b02ec..b27ddaf9732 100644
--- a/app-office/calligra/calligra-3.2.1.ebuild
+++ b/app-office/calligra/calligra-3.2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/;
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

2020-07-02 Thread Andreas Sturmlechner

commit: 870d3310f08747b45b6da6703a8996461f4fe927
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul  2 21:52:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul  2 21:52:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=870d3310

app-office/calligra: Drop 3.2.0

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

 app-office/calligra/Manifest  |   1 -
 app-office/calligra/calligra-3.2.0.ebuild | 201 --
 2 files changed, 202 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 508be952bbe..867835ec111 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,2 @@
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
-DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 
4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e
 SHA512 
625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 
332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20
 SHA512 
e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f

diff --git a/app-office/calligra/calligra-3.2.0.ebuild 
b/app-office/calligra/calligra-3.2.0.ebuild
deleted file mode 100644
index dc2f5fb9f55..000
--- a/app-office/calligra/calligra-3.2.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit check-reqs ecm kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/;
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms 
okular openexr
-   +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-BDEPEND="
-   sys-devel/gettext
-"
-COMMON_DEPEND="
-   dev-lang/perl
-   >=dev-qt/designer-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdelibs4support-${KFMIN}:5
-   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kross-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/sonnet-${KFMIN}:5
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-   charts? ( dev-libs/kdiagram:5 )
-   crypt? ( app-crypt/qca:2[qt5(+)] )
-   fontconfig? ( media-libs/fontconfig )
-   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   app-text/libetonyek
-   app-text/libodfgen
-

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

2020-06-28 Thread Andreas Sturmlechner

commit: f319b46cb3f9391b540a83f46497c446c5f50143
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 28 16:15:35 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 28 16:17:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f319b46c

app-office/calligra: 3.2.1 version bump

Closes: https://bugs.gentoo.org/722416
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/Manifest  |   1 +
 app-office/calligra/calligra-3.2.1.ebuild | 189 ++
 2 files changed, 190 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index ac459e7481d..508be952bbe 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,3 @@
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 
4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e
 SHA512 
625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013
+DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 
332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20
 SHA512 
e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f

diff --git a/app-office/calligra/calligra-3.2.1.ebuild 
b/app-office/calligra/calligra-3.2.1.ebuild
new file mode 100644
index 000..240ca9b02ec
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms 
okular openexr
+   +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+   sys-devel/gettext
+"
+COMMON_DEPEND="
+   dev-lang/perl
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdelibs4support-${KFMIN}:5
+   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kross-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=kde-frameworks/sonnet-${KFMIN}:5
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   charts? ( dev-libs/kdiagram:5 )
+   crypt? ( app-crypt/qca:2[qt5(+)] )
+   fontconfig? ( media-libs/fontconfig )
+   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   app-text/libetonyek
+

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

2020-04-24 Thread Andreas Sturmlechner

commit: 91811eefedfd2e0bd104987a3a6c029e07f29d39
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 24 13:32:45 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 24 14:10:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91811eef

app-office/calligra: 3.2.0 version bump

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

 app-office/calligra/Manifest   |   1 +
 app-office/calligra/calligra-3.2.0.ebuild  | 201 +
 .../files/calligra-3.1.89-no-arch-detection.patch  |  17 ++
 3 files changed, 219 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 510689b2e98..ac459e7481d 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,2 @@
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
+DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 
4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e
 SHA512 
625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013

diff --git a/app-office/calligra/calligra-3.2.0.ebuild 
b/app-office/calligra/calligra-3.2.0.ebuild
new file mode 100644
index 000..dc2f5fb9f55
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/;
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms 
okular openexr
+   +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+   sys-devel/gettext
+"
+COMMON_DEPEND="
+   dev-lang/perl
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdelibs4support-${KFMIN}:5
+   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kross-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=kde-frameworks/sonnet-${KFMIN}:5
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   charts? ( dev-libs/kdiagram:5 )
+   crypt? ( app-crypt/qca:2[qt5(+)] )
+   fontconfig? ( media-libs/fontconfig )
+   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   >=kde-frameworks/khtml-${KFMIN}:5
+   media-libs/libvisio
+   )
+   lcms? (
+

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

2019-12-26 Thread Andreas Sturmlechner

commit: c90b4b4306e609f2fbe135dad5e8109ff458f72c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 25 21:39:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 26 08:36:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90b4b43

app-office/calligra: Port to ecm.eclass and kde.org.eclass

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

 app-office/calligra/calligra-3.1.0-r4.ebuild | 119 ++-
 1 file changed, 61 insertions(+), 58 deletions(-)

diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild 
b/app-office/calligra/calligra-3.1.0-r4.ebuild
index f4c78118f36..9e095aa4722 100644
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -4,16 +4,19 @@
 EAPI=7
 
 CHECKREQS_DISK_BUILD="4G"
-KDE_DOC_DIR="xxx" # contains no language subdirs
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5
+ECM_HANDBOOK_DIR="xxx" # contains no language subdirs
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://www.calligra.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon sheets stage words )
@@ -27,60 +30,60 @@ BDEPEND="
sys-devel/gettext
 "
 COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
dev-lang/perl
+   >=dev-qt/designer-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdelibs4support-${KFMIN}:5
+   >=kde-frameworks/kemoticons-${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/knotifyconfig-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kross-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=kde-frameworks/sonnet-${KFMIN}:5
sys-libs/zlib
virtual/libiconv
-   activities? ( $(add_frameworks_dep kactivities) )
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
charts? ( dev-libs/kdiagram:5 )
crypt? ( app-crypt/qca:2[qt5(+)] )
fontconfig? ( media-libs/fontconfig )
-   gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
+   gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
gsl? ( sci-libs/gsl

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

2019-12-25 Thread Andreas Sturmlechner

commit: 91bae785446138e2818ca1c76de35b731c8fae45
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 25 21:14:54 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 25 21:20:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bae785

app-office/calligra: Fix build with app-text/poppler-0.83.0

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

 app-office/calligra/calligra-3.1.0-r4.ebuild   |  4 ++
 .../files/calligra-3.1.0-poppler-0.83.patch| 69 ++
 2 files changed, 73 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild 
b/app-office/calligra/calligra-3.1.0-r4.ebuild
index 411c8177f1c..f4c78118f36 100644
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -139,6 +139,10 @@ src_prepare() {
eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make 
upstreamable patch
fi
 
+   if has_version ">=app-text/poppler-0.83"; then
+   eapply "${FILESDIR}/${P}-poppler-0.83.patch" # TODO: make 
upstreamable patch
+   fi
+
if ! use test; then
sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-i libs/pigment/CMakeLists.txt || die

diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch 
b/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch
new file mode 100644
index 000..383131ab387
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch
@@ -0,0 +1,69 @@
+Source: Timo Gurr 
+Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795
+Reason: Fix build with poppler 0.83.0
+
+diff -Naur calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp 
calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp
+--- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp2019-12-04 
12:41:13.0 +0100
 calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp2019-12-04 
12:39:03.0 +0100
+@@ -60,19 +60,17 @@
+ }
+ 
+ // read config file
+-globalParams = new GlobalParams();
++globalParams.reset(new GlobalParams());
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+ 
+ GooString * fname = new 
GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
+ if (! pdfDoc) {
+-delete globalParams;
+ return KoFilter::StupidError;
+ }
+ 
+ if (! pdfDoc->isOk()) {
+-delete globalParams;
+ delete pdfDoc;
+ return KoFilter::StupidError;
+ }
+@@ -99,7 +97,6 @@
+ 
+ delete dev;
+ delete pdfDoc;
+-delete globalParams;
+ globalParams = 0;
+ 
+ return KoFilter::OK;
+diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 
calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 
12:41:14.0 +0100
 calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 
12:35:30.0 +0100
+@@ -172,7 +172,7 @@
+ *d->body << "/>" << endl;
+ }
+ 
+-QString SvgOutputDev::convertPath(GfxPath *path)
++QString SvgOutputDev::convertPath(const GfxPath *path)
+ {
+ if (! path)
+ return QString();
+@@ -180,7 +180,7 @@
+ QString output;
+ 
+ for (int i = 0; i < path->getNumSubpaths(); ++i) {
+-GfxSubpath * subpath = path->getSubpath(i);
++const GfxSubpath * subpath = path->getSubpath(i);
+ if (subpath->getNumPoints() > 0) {
+ output += QString("M%1 
%2").arg(subpath->getX(0)).arg(subpath->getY(0));
+ int j = 1;
+diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 
calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h   2019-12-04 
12:41:14.0 +0100
 calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h   2019-12-04 
12:30:41.0 +0100
+@@ -83,7 +83,7 @@
+ /// Dumps content to svg file
+ void dumpContent();
+ private:
+-QString convertPath(GfxPath *path);
++QString convertPath(const GfxPath *path);
+ QString convertMatrix(const QMatrix );
+ QString convertMatrix(const double * matrix);
+ QString printFill();

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

2019-11-02 Thread Andreas Sturmlechner

commit: 11e22c282ae1fc952dfcdfa407a40c55ab0e3cd0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  1 20:07:56 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov  2 15:22:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e22c28

app-office/calligra: Fix build with poppler-0.82.0

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

 app-office/calligra/calligra-3.1.0-r4.ebuild   |  4 +++
 .../files/calligra-3.1.0-poppler-0.82.patch| 35 ++
 2 files changed, 39 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild 
b/app-office/calligra/calligra-3.1.0-r4.ebuild
index 37e03558459..411c8177f1c 100644
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -135,6 +135,10 @@ pkg_setup() {
 src_prepare() {
kde5_src_prepare
 
+   if has_version ">=app-text/poppler-0.82"; then
+   eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make 
upstreamable patch
+   fi
+
if ! use test; then
sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-i libs/pigment/CMakeLists.txt || die

diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch 
b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
new file mode 100644
index 000..4cb9d1872eb
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
@@ -0,0 +1,35 @@
+Patch stolen from Mageia Cauldron but had to be modified quite a bit.
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp 
b/filters/karbon/pdf/SvgOutputDev.cpp
+index ffdbf01..70bc9f8 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
 b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString 
* s)
+ const char * p = s->c_str();
+ int len = s->getLength();
+ CharCode code;
+-Unicode *u = nullptr;
++const Unicode *u = nullptr;
+ int uLen;
+ double dx, dy, originX, originY;
+ while (len > 0) {
+@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object 
*/*ref*/, Stream *str,
+ 
+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+  int width, int height, GfxImageColorMap 
*colorMap,
+- bool /*interpolate*/, int *maskColors, bool 
inlineImg)
++ bool /*interpolate*/, const int *maskColors, 
bool inlineImg)
+ {
+ drawImage(state, ref, str, width, height, colorMap, maskColors, 
inlineImg);
+ }
+--- a/filters/karbon/pdf/SvgOutputDev.h
 b/filters/karbon/pdf/SvgOutputDev.h
+@@ -63,7 +63,7 @@ public:
+ // images
+ void drawImage(GfxState *state, Object *ref, Stream *str,
+int width, int height, GfxImageColorMap *colorMap,
+-   bool interpolate, int *maskColors, bool inlineImg) 
override;
++   bool interpolate, const int *maskColors, bool 
inlineImg) override;
+ 
+ // styles
+ virtual void updateAll(GfxState *state);

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

2019-08-16 Thread Andreas Sturmlechner

commit: dae79b9c349228887c34be2ea2590ac8903d9541
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 16 12:23:00 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 16 14:40:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae79b9c

app-office/calligra: Drop 3.1.0-r3

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

 app-office/calligra/calligra-3.1.0-r3.ebuild | 208 ---
 app-office/calligra/metadata.xml |   1 -
 2 files changed, 209 deletions(-)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
deleted file mode 100644
index c5fa5d75177..000
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_DOC_DIR="xxx" # contains no language subdirs
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-CAL_FTS=( karbon sheets stage words )
-
-IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms 
okular openexr +pdf
-   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-lang/perl
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( $(add_frameworks_dep kactivities) )
-   charts? ( dev-libs/kreport )
-   crypt? ( app-crypt/qca:2[qt5(+)] )
-   fontconfig? ( media-libs/fontconfig )
-   gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   $(add_frameworks_dep khtml)
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   >=app-text/libwps-0.4
-   dev-libs/librevenge
-   media-libs/libvisio
-   )
-   lcms? (
-   media-libs/ilmbase:=
-   media-libs/lcms:2
-   )
-   openexr? ( media-libs/openexr )
-   pdf? ( >=app-text/poppler-0.64:=[qt5] )
-   phonon? ( media-libs/phonon[qt5(+)] )
-   pim? ( =app-text/poppler-0.72"; then
-   eapply "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
-   eapply "${FILESDIR}"/${P}-poppler-0.73.patch
-   fi
-
-   if ! use test; then
-   sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-   -i libs/pigment/CMakeLists.txt || die
-   fi
-
-   # Unconditionally disable deprecated deps (required by QtQuick1)
-   punt_bogus_dep Qt5 Declarative
-   punt_bogus_dep Qt5 OpenGL
-
-   # Hack around the excessive use of CMake macros
-   if use okular && ! use calligra_features_words; then
-   sed -i -e "/add_subdirectory( *okularodtgenerator *)/ 
s/^/#DONT/" \
-   extras/CMakeLists.txt || die "Failed to disable 
OKULAR_GENERATOR_ODT"
-   fi
-
-   if use okular && ! use calligra_features_stage; then
-   sed -i -e "/add_subdirectory( *okularodpgenerator *)/ 
s/^/#DONT/" \
-

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

2019-08-16 Thread Andreas Sturmlechner

commit: 1d1ed4a6d999c59f8c7ab76b963afd28e4aa761b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 16 12:21:21 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 16 14:40:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d1ed4a6

app-office/calligra: EAPI-7 bump, drop USE pim, fix USE charts

USE pim:
KCalCore is only used in semanticitems which is not actually being built,
since RDF is not available. And it would not build anyway at this point.

USE charts:
bogus dependency on dev-libs/kreport -> dev-libs/kdiagram

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

 app-office/calligra/calligra-3.1.0-r4.ebuild | 202 +++
 app-office/calligra/metadata.xml |   2 +-
 2 files changed, 203 insertions(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild 
b/app-office/calligra/calligra-3.1.0-r4.ebuild
new file mode 100644
index 000..37e03558459
--- /dev/null
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_DOC_DIR="xxx" # contains no language subdirs
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+
+CAL_FTS=( karbon sheets stage words )
+
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms 
okular openexr
+   +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+   sys-devel/gettext
+"
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   charts? ( dev-libs/kdiagram:5 )
+   crypt? ( app-crypt/qca:2[qt5(+)] )
+   fontconfig? ( media-libs/fontconfig )
+   gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   $(add_frameworks_dep khtml)
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   lcms? (
+   media-libs/ilmbase:=
+   media-libs/lcms:2
+   )
+   openexr? ( media-libs/openexr )
+   pdf? ( >=app-text/poppler-0.73:=[qt5] )
+   phonon? ( media-libs/phonon[qt5(+)] )
+   spacenav? ( dev-libs/libspnav )
+   truetype? ( media-libs/freetype:2 )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+   calligra_features_sheets? ( dev-cpp/eigen:3 )
+   calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
+   calligra_features_words? (
+   dev-libs/libxslt
+   okular? ( $(add_kdeapps_dep okular) )
+   )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-libs/boost
+   test? ( $(add_frameworks_dep threadweaver) )
+"
+RDEPEND="${COMMON_DEPEND}
+   calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+   !app-office/calligra:4
+   !app-office/calligra-l10n:4
+"

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

2019-08-15 Thread Andreas Sturmlechner

commit: f9af956d7a714ed04eb43a4926f9f41734b91256
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 15 12:43:41 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 15 13:09:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9af956d

app-office/calligra: 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/calligra/calligra-3.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 77136854363..c5fa5d75177 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="
openexr? ( media-libs/openexr )
pdf? ( >=app-text/poppler-0.64:=[qt5] )
phonon? ( media-libs/phonon[qt5(+)] )
-   pim? ( $(add_kdeapps_dep kcalcore) )
+   pim? (

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

2019-08-11 Thread Andreas Sturmlechner

commit: 601b38ca8080c16e4adc418365d0dd76375b8dc4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 11 07:24:55 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 11 08:19:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=601b38ca

app-office/calligra: 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/calligra/calligra-3.1.0-r3.ebuild   |  1 +
 .../files/calligra-3.1.0-missing-header.patch  | 23 ++
 2 files changed, 24 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 81597b0d7d1..77136854363 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -121,6 +121,7 @@ PATCHES=(
"${FILESDIR}"/${P}-poppler-0.69.patch
"${FILESDIR}"/${P}-poppler-0.71.patch
"${FILESDIR}"/${P}-no-webkit.patch
+   "${FILESDIR}"/${P}-missing-header.patch
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-3.1.0-missing-header.patch 
b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
new file mode 100644
index 000..f15c3787172
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
@@ -0,0 +1,23 @@
+From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Tue, 23 Jul 2019 13:02:34 +0200
+Subject: Fix compilation with Qt 5.13 (missing include)
+
+---
+ sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp 
b/sheets/plugins/calendar/CalendarToolWidget.cpp
+index b10b230..0c5eeb6 100644
+--- a/sheets/plugins/calendar/CalendarToolWidget.cpp
 b/sheets/plugins/calendar/CalendarToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ namespace Calligra
+ {
+-- 
+cgit v1.1

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

2019-02-09 Thread Andreas Sturmlechner

commit: e872c7f40b402f97f45da4f99a756284025ce3df
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Feb  8 15:59:49 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  9 09:52:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e872c7f4

app-office/calligra: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11009
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/calligra-3.1.0-plan-qt-5.11.patch| 124 -
 1 file changed, 124 deletions(-)

diff --git a/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch 
b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
deleted file mode 100644
index d63f5ccbe87..000
--- a/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 18 Mar 2018 11:56:57 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
-Reviewers: #calligra:_3.0
-
-Tags: #calligra:_3.0
-
-Differential Revision: https://phabricator.kde.org/D11454

- plan/src/kptview.h | 1 +
- plan/src/kptviewlist.cpp   | 1 +
- plan/src/libs/ui/kptaccountseditor.cpp | 1 +
- plan/src/libs/ui/kptdocumentspanel.h   | 1 +
- plan/src/libs/ui/kptitemviewsettup.cpp | 2 +-
- plan/src/libs/ui/kpttaskeditor.cpp | 1 +
- plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
- plan/src/libs/widgets/KoPageLayoutWidget.cpp   | 2 ++
- 15 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/plan/src/kptview.h b/plan/src/kptview.h
-index 44d11935e71..a98e55342db 100644
 a/plan/src/kptview.h
-+++ b/plan/src/kptview.h
-@@ -28,6 +28,7 @@
- #include "kptcontext.h"
- #include "kptviewbase.h"
- 
-+#include 
- #include 
- #include 
- 
-diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
-index f34e702e055..0e6db7b2ffe 100644
 a/plan/src/kptviewlist.cpp
-+++ b/plan/src/kptviewlist.cpp
-@@ -25,6 +25,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- #include 
-diff --git a/plan/src/libs/ui/kptaccountseditor.cpp 
b/plan/src/libs/ui/kptaccountseditor.cpp
-index 7991fafd779..54e3a87c94f 100644
 a/plan/src/libs/ui/kptaccountseditor.cpp
-+++ b/plan/src/libs/ui/kptaccountseditor.cpp
-@@ -40,6 +40,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- #include 
-diff --git a/plan/src/libs/ui/kptdocumentspanel.h 
b/plan/src/libs/ui/kptdocumentspanel.h
-index 00ea3af80b2..491cb1ebb86 100644
 a/plan/src/libs/ui/kptdocumentspanel.h
-+++ b/plan/src/libs/ui/kptdocumentspanel.h
-@@ -26,6 +26,7 @@
- 
- #include "kptdocuments.h"
- 
-+#include 
- #include 
- #include 
- 
-diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp 
b/plan/src/libs/ui/kptitemviewsettup.cpp
-index d1c3b1fc157..7c97a070b9a 100644
 a/plan/src/libs/ui/kptitemviewsettup.cpp
-+++ b/plan/src/libs/ui/kptitemviewsettup.cpp
-@@ -25,9 +25,9 @@
- 
- #include "KoPageLayoutWidget.h"
- 
-+#include 
- #include 
- 
--
- namespace KPlato
- {
- 
-diff --git a/plan/src/libs/ui/kpttaskeditor.cpp 
b/plan/src/libs/ui/kpttaskeditor.cpp
-index 21546118d33..91db5acbb18 100644
 a/plan/src/libs/ui/kpttaskeditor.cpp
-+++ b/plan/src/libs/ui/kpttaskeditor.cpp
-@@ -45,6 +45,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- #include 
-diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp 
b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-index 344ebc2b599..9146f06ab8c 100644
 a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-@@ -31,6 +31,7 @@
- #include 
- 
- #include 
-+#include 
- #include 
- #include 
- #include 
-diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp 
b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..b67e9848807 100644
 a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
- 
- #include 
- 
-+#include 
-+
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private
- {
- public:
--- 
-2.16.2
-

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

2019-01-24 Thread Andreas Sturmlechner

commit: 88fc96ebeee2e19bf7f5b48b2037257a008bb5e4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 24 22:57:21 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 24 22:59:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fc96eb

app-office/calligra: Avoid dep on poppler[glib] for ifdef

Closes: https://bugs.gentoo.org/675972
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/calligra-3.1.0-r3.ebuild   |  8 ++--
 .../files/calligra-3.1.0-poppler-0.72.patch| 43 +++---
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index c3913bd48d1..81597b0d7d1 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -104,7 +104,6 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
dev-libs/boost
sys-devel/gettext
-   x11-misc/shared-mime-info
test? ( $(add_frameworks_dep threadweaver) )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -121,8 +120,6 @@ PATCHES=(
"${FILESDIR}"/${P}-stage-qt-5.11.patch
"${FILESDIR}"/${P}-poppler-0.69.patch
"${FILESDIR}"/${P}-poppler-0.71.patch
-   "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
-   "${FILESDIR}"/${P}-poppler-0.73.patch
"${FILESDIR}"/${P}-no-webkit.patch
 )
 
@@ -138,6 +135,11 @@ pkg_setup() {
 src_prepare() {
kde5_src_prepare
 
+   if has_version ">=app-text/poppler-0.72"; then
+   eapply "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
+   eapply "${FILESDIR}"/${P}-poppler-0.73.patch
+   fi
+
if ! use test; then
sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-i libs/pigment/CMakeLists.txt || die

diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch 
b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
index 3b2e690257b..817a8ddcd67 100644
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
@@ -1,54 +1,39 @@
-From 8f20ea906235cbee1d4aac4706e4eb03366875bf Mon Sep 17 00:00:00 2001
-From: "Tobias C. Berner" 
-Date: Mon, 7 Jan 2019 19:50:48 +0100
-Subject: [PATCH] Make compatible with poppler 0.72
+From 3784fdf0259a14f1f7b20c156dcfe42b45d76896 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 24 Jan 2019 23:55:02 +0100
+Subject: [PATCH] Fix build with poppler-0.72
 
+This is a downstream fix without backwards compat, not upstreamable.
 ---
- filters/karbon/pdf/SvgOutputDev.cpp | 13 +
- 1 file changed, 13 insertions(+)
+ filters/karbon/pdf/SvgOutputDev.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/filters/karbon/pdf/SvgOutputDev.cpp 
b/filters/karbon/pdf/SvgOutputDev.cpp
-index 4a1fad6bbcf..b1d4ea2d427 100644
+index 391e86cc117..bc72a003efb 100644
 --- a/filters/karbon/pdf/SvgOutputDev.cpp
 +++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -25,6 +25,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- #include 
-@@ -409,7 +410,11 @@ void SvgOutputDev::drawString(GfxState * state, const 
GooString * s)
+@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, const 
GooString * s)
  
  QString str;
  
-+#if POPPLER_CHECK_VERSION(0,72,0)
+-const char * p = s->getCString();
 +const char * p = s->c_str();
-+#else
- const char * p = s->getCString();
-+#endif
  int len = s->getLength();
  CharCode code;
  Unicode *u = nullptr;
-@@ -459,10 +464,18 @@ void SvgOutputDev::drawString(GfxState * state, const 
GooString * s)
+@@ -451,10 +451,10 @@ void SvgOutputDev::drawString(GfxState * state, const 
GooString * s)
  *d->body << " y=\"" << y << "px\"";
  
  if (font && font->getFamily()) {
-+#if POPPLER_CHECK_VERSION(0,72,0)
+-*d->body << " font-family=\"" << 
QString::fromLatin1(font->getFamily()->getCString()) << "\"";
 +*d->body << " font-family=\"" << 
QString::fromLatin1(font->getFamily()->c_str()) << "\"";
-+#else
- *d->body << " font-family=\"" << 
QString::fromLatin1(font->getFamily()->getCString()) << "\"";
-+#endif
  //debugPdf << "font family:" << QString::fromLatin1( 
font->getFamily()->getCString() );
  } else if (font && font->getName()) {
-+#if POPPLER_CHECK_VERSION(0,72,0)
+-*d->body << " font-family=\"" << 
QString::fromLatin1(font->getName()->getCString()) << "\"";
 +*d->body << " font-family=\"" << 
QString::fromLatin1(font->getName()->c_str()) << "\"";
-+#else
- *d->body << " font-family=\"" << 
QString::fromLatin1(font->getName()->getCString()) << "\"";
-+#endif
  //debugPdf << "font name:" << QString::fromLatin1( 
font->getName()->getCString() );
  }
  *d->body << "

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

2019-01-24 Thread Andreas Sturmlechner

commit: 59b084249c5d3cc781b3dfb9ab5fa939e57203f5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 24 21:51:18 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 24 22:26:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b08424

app-office/calligra: Add USE +charts

Fixes unhandled automagic dependency on dev-libs/kreport.

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

 app-office/calligra/calligra-3.1.0-r3.ebuild | 4 +++-
 app-office/calligra/metadata.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 24ca06bcb3a..c3913bd48d1 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon sheets stage words )
 
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular 
openexr +pdf
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms 
okular openexr +pdf
phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
@@ -65,6 +65,7 @@ COMMON_DEPEND="
sys-libs/zlib
virtual/libiconv
activities? ( $(add_frameworks_dep kactivities) )
+   charts? ( dev-libs/kreport )
crypt? ( app-crypt/qca:2[qt5(+)] )
fontconfig? ( media-libs/fontconfig )
gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
@@ -175,6 +176,7 @@ src_configure() {
-DWITH_Iconv=ON
-DPRODUCTSET="${myproducts[*]}"
$(cmake-utils_use_find_package activities KF5Activities)
+   $(cmake-utils_use_find_package charts KChart)
-DWITH_Qca-qt5=$(usex crypt)
-DWITH_Fontconfig=$(usex fontconfig)
$(cmake-utils_use_find_package gemini Libgit2)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 575f0b0a917..d5fb30da6eb 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@


Enable kactivities support
+   Build chartshape plugin for creating 
business charts with dev-libs/kreport
Enable tablet and 2:1 devices support
Enable support for various import 
filter file formats like WordPerfect, Visio and Apple Keynote
Build colorengine plugins using 
media-libs/lcms

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

2019-01-16 Thread Andreas Sturmlechner

commit: 9699b1c310d94b9a4c76336a5f0a4aebe2589e91
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 16 16:20:59 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 16 16:20:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9699b1c3

app-office/calligra: Fix build with poppler-0.73

Closes: https://bugs.gentoo.org/675454
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/calligra-3.1.0-r3.ebuild   |  1 +
 .../files/calligra-3.1.0-poppler-0.73.patch| 35 ++
 2 files changed, 36 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 329a851fea6..24ca06bcb3a 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -121,6 +121,7 @@ PATCHES=(
"${FILESDIR}"/${P}-poppler-0.69.patch
"${FILESDIR}"/${P}-poppler-0.71.patch
"${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
+   "${FILESDIR}"/${P}-poppler-0.73.patch
"${FILESDIR}"/${P}-no-webkit.patch
 )
 

diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch 
b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch
new file mode 100644
index 000..727f6edf3f1
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch
@@ -0,0 +1,35 @@
+From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Tue, 15 Jan 2019 22:24:08 +0100
+Subject: Guchar -> unsigned char
+
+It was just a typdef and it's now gone
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp 
b/filters/karbon/pdf/SvgOutputDev.cpp
+index 80f01a5..1a5aa30b 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
 b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, 
Stream *str,
+ if (maskColors) {
+ for (int y = 0; y < height; y++) {
+ dest = (unsigned int *)(buffer + y * 4 * width);
+-Guchar * pix = imgStr->getLine();
++unsigned char * pix = imgStr->getLine();
+ colorMap->getRGBLine(pix, dest, width);
+ 
+ for (int x = 0; x < width; x++) {
+@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, 
Stream *str,
+ } else {
+ for (int y = 0; y < height; y++) {
+ dest = (unsigned int *)(buffer + y * 4 * width);
+-Guchar * pix = imgStr->getLine();
++unsigned char * pix = imgStr->getLine();
+ colorMap->getRGBLine(pix, dest, width);
+ }
+ 
+-- 
+cgit v1.1
+

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

2019-01-16 Thread Andreas Sturmlechner

commit: 808e9e39e27c7ff7c8b1d73636927718e4924c2c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 16 11:52:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 16 12:00:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808e9e39

app-office/calligra: Drop 3.1.0-r2

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

 app-office/calligra/Manifest |   1 -
 app-office/calligra/calligra-3.1.0-r2.ebuild | 239 ---
 2 files changed, 240 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index f4101fe56ac..510689b2e98 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1 @@
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild 
b/app-office/calligra/calligra-3.1.0-r2.ebuild
deleted file mode 100644
index e2a76aa73c6..000
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_APPS_MINIMAL="17.12.0"
-KDE_DOC_DIR="xxx" # contains no language subdirs
-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
-   calligra_features_plan? ( 
mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="amd64 x86"
-
-CAL_FTS=( karbon plan sheets words )
-
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular 
openexr +pdf
-   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
-   calligra_experimental_features_stage"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# 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
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-lang/perl
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( $(add_frameworks_dep kactivities) )
-   crypt? ( app-crypt/qca:2[qt5(+)] )
-   fontconfig? ( media-libs/fontconfig )
-   gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   $(add_frameworks_dep khtml)
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-

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

2019-01-14 Thread Mikle Kolyada

commit: 8c5c8f6896b9061b5ca9d7d309b350f3a776863b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan 14 14:42:46 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan 14 14:42:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5c8f68

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

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

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

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 766e2b2b60a..c771b3f427f 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CAL_FTS=( karbon sheets stage words )

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

2019-01-07 Thread Andreas Sturmlechner

commit: e785021cfd5f1dba3d3ab7a11416960b322479f6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  8 01:12:51 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan  8 01:47:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e785021c

app-office/calligra: Fix build with poppler-0.72

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

 app-office/calligra/calligra-3.1.0-r3.ebuild   |  1 +
 .../files/calligra-3.1.0-poppler-0.72.patch| 54 ++
 2 files changed, 55 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index f126c2aad96..766e2b2b60a 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -120,6 +120,7 @@ PATCHES=(
"${FILESDIR}"/${P}-stage-qt-5.11.patch
"${FILESDIR}"/${P}-poppler-0.69.patch
"${FILESDIR}"/${P}-poppler-0.71.patch
+   "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
"${FILESDIR}"/${P}-no-webkit.patch
 )
 

diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch 
b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
new file mode 100644
index 000..3b2e690257b
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
@@ -0,0 +1,54 @@
+From 8f20ea906235cbee1d4aac4706e4eb03366875bf Mon Sep 17 00:00:00 2001
+From: "Tobias C. Berner" 
+Date: Mon, 7 Jan 2019 19:50:48 +0100
+Subject: [PATCH] Make compatible with poppler 0.72
+
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 13 +
+ 1 file changed, 13 insertions(+)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp 
b/filters/karbon/pdf/SvgOutputDev.cpp
+index 4a1fad6bbcf..b1d4ea2d427 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
 b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+@@ -409,7 +410,11 @@ void SvgOutputDev::drawString(GfxState * state, const 
GooString * s)
+ 
+ QString str;
+ 
++#if POPPLER_CHECK_VERSION(0,72,0)
++const char * p = s->c_str();
++#else
+ const char * p = s->getCString();
++#endif
+ int len = s->getLength();
+ CharCode code;
+ Unicode *u = nullptr;
+@@ -459,10 +464,18 @@ void SvgOutputDev::drawString(GfxState * state, const 
GooString * s)
+ *d->body << " y=\"" << y << "px\"";
+ 
+ if (font && font->getFamily()) {
++#if POPPLER_CHECK_VERSION(0,72,0)
++*d->body << " font-family=\"" << 
QString::fromLatin1(font->getFamily()->c_str()) << "\"";
++#else
+ *d->body << " font-family=\"" << 
QString::fromLatin1(font->getFamily()->getCString()) << "\"";
++#endif
+ //debugPdf << "font family:" << QString::fromLatin1( 
font->getFamily()->getCString() );
+ } else if (font && font->getName()) {
++#if POPPLER_CHECK_VERSION(0,72,0)
++*d->body << " font-family=\"" << 
QString::fromLatin1(font->getName()->c_str()) << "\"";
++#else
+ *d->body << " font-family=\"" << 
QString::fromLatin1(font->getName()->getCString()) << "\"";
++#endif
+ //debugPdf << "font name:" << QString::fromLatin1( 
font->getName()->getCString() );
+ }
+ *d->body << " font-size=\"" << qMax(state->getFontSize(), 
state->getTransformedFontSize()) << "px\"";
+-- 
+2.20.1

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

2019-01-01 Thread Andreas Sturmlechner

commit: 634a047520c11151ac1316bd382327fd1efcbfb9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  1 15:02:54 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan  1 19:40:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634a0475

app-office/calligra: Drop bogus Qt5WebKit dependency

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

 app-office/calligra/calligra-3.1.0-r3.ebuild   |  7 +--
 .../calligra/files/calligra-3.1.0-no-webkit.patch  | 70 ++
 2 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 46e011852b1..0fe2f8fc959 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -95,7 +95,6 @@ COMMON_DEPEND="
x11-libs/libX11
)
calligra_experimental_features_stage? (
-   $(add_qt_dep qtwebkit)
okular? ( $(add_kdeapps_dep okular) )
)
calligra_features_sheets? ( dev-cpp/eigen:3 )
@@ -124,6 +123,7 @@ PATCHES=(
"${FILESDIR}"/${P}-stage-qt-5.11.patch
"${FILESDIR}"/${P}-poppler-0.69.patch
"${FILESDIR}"/${P}-poppler-0.71.patch
+   "${FILESDIR}"/${P}-no-webkit.patch
 )
 
 pkg_pretend() {
@@ -147,11 +147,6 @@ src_prepare() {
punt_bogus_dep Qt5 Declarative
punt_bogus_dep Qt5 OpenGL
 
-   if ! use calligra_experimental_features_stage; then
-   punt_bogus_dep Qt5 WebKitWidgets
-   punt_bogus_dep Qt5 WebKit
-   fi
-
# Hack around the excessive use of CMake macros
if use okular && ! use calligra_features_words; then
sed -i -e "/add_subdirectory( *okularodtgenerator *)/ 
s/^/#DONT/" \

diff --git a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch 
b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch
new file mode 100644
index 000..f126e2e5138
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch
@@ -0,0 +1,70 @@
+From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001
+From: Dag Andersen 
+Date: Mon, 22 Oct 2018 09:41:53 +0200
+Subject: Stage does not use WebKit, so remove
+
+---
+ CMakeLists.txt| 21 +
+ stage/part/CMakeLists.txt |  1 -
+ 2 files changed, 1 insertion(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b148c0..1e29140 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -272,14 +272,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
+ Quick
+ QuickWidgets
+ Sql
+-WebKit
+-# WebKitWidgets
+-)
+-message("**")
+-message("**")
+-message("Qt WebKitWidgets is required for Stage's html export preview. This 
will need porting, as that module no longer exists.")
+-message("**")
+-message("**")
++)
+ 
+ # 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:
+@@ -313,14 +306,6 @@ set_package_properties(Qt5WebKit PROPERTIES
+ PURPOSE "Required for Braindump's Web shape"
+ TYPE OPTIONAL
+ )
+-set_package_properties(Qt5WebKitWidget PROPERTIES
+-PURPOSE "Required for Stage"
+-TYPE RECOMMENDED
+-)
+-
+-if(Qt5WebKit_FOUND)
+-add_definitions( -DCAN_USE_QTWEBKIT )
+-endif()
+ 
+ set(HAVE_OPENGL ${Qt5OpenGL_FOUND})
+ 
+@@ -983,10 +968,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF
+ Soprano_FOUND "Soprano not found"
+ )
+ 
+-# calligra_drop_product_on_bad_condition( PART_STAGE
+-# Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found"
+-# )
+-
+ calligra_drop_product_on_bad_condition( PART_SHEETS
+ EIGEN3_FOUND "Eigen devel not found"
+ )
+diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
+index d6000a1..9bdc840 100644
+--- a/stage/part/CMakeLists.txt
 b/stage/part/CMakeLists.txt
+@@ -165,7 +165,6 @@ target_link_libraries(calligrastageprivate
+ KF5::IconThemes
+ KF5::Completion
+ Qt5::Svg
+-# Qt5::WebKitWidgets
+ )
+ if(HAVE_OPENGL)
+ target_link_libraries(calligrastageprivate PRIVATE Qt5::OpenGL)
+-- 
+cgit v1.1

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

2019-01-01 Thread Andreas Sturmlechner

commit: e4a738799e02a5b5b005ced1943f9525ccca0ce3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  1 17:22:37 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan  1 19:40:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a73879

app-office/calligra: Move stage into CALLIGRA_FEATURES

Simplifies ebuild.

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

 app-office/calligra/calligra-3.1.0-r3.ebuild | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 0fe2f8fc959..f126c2aad96 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -16,11 +16,10 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 
-CAL_FTS=( karbon sheets words )
+CAL_FTS=( karbon sheets stage words )
 
 IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular 
openexr +pdf
-   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
-   calligra_experimental_features_stage"
+   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
 # Required for the matlab/octave formula tool
@@ -94,10 +93,8 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
x11-libs/libX11
)
-   calligra_experimental_features_stage? (
-   okular? ( $(add_kdeapps_dep okular) )
-   )
calligra_features_sheets? ( dev-cpp/eigen:3 )
+   calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
calligra_features_words? (
dev-libs/libxslt
okular? ( $(add_kdeapps_dep okular) )
@@ -153,7 +150,7 @@ src_prepare() {
extras/CMakeLists.txt || die "Failed to disable 
OKULAR_GENERATOR_ODT"
fi
 
-   if use okular && ! use calligra_experimental_features_stage; then
+   if use okular && ! use calligra_features_stage; then
sed -i -e "/add_subdirectory( *okularodpgenerator *)/ 
s/^/#DONT/" \
extras/CMakeLists.txt || die "Failed to disable 
OKULAR_GENERATOR_ODP"
fi
@@ -167,8 +164,6 @@ src_configure() {
use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
done
 
-   use calligra_experimental_features_stage && myproducts+=( STAGE )
-
use lcms && myproducts+=( PLUGIN_COLORENGINES )
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
 
@@ -197,7 +192,7 @@ src_configure() {
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
-DWITH_Eigen3=$(usex calligra_features_sheets)
-   -DBUILD_UNMAINTAINED=$(usex 
calligra_experimental_features_stage)
+   -DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-ENABLE_CSTESTER_TESTING=$(usex test)
-DWITH_Freetype=$(usex truetype)
)

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

2019-01-01 Thread Andreas Sturmlechner

commit: 3c55b2008f5417f6ddf252fddde26820cdad6b44
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  1 13:38:58 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan  1 19:40:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c55b200

app-office/calligra: Split out plan, fix build with >=poppler-0.71

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

 app-office/calligra/calligra-3.1.0-r3.ebuild   | 211 +
 .../files/calligra-3.1.0-poppler-0.69.patch|  83 
 .../files/calligra-3.1.0-poppler-0.71.patch| 202 
 3 files changed, 496 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild 
b/app-office/calligra/calligra-3.1.0-r3.ebuild
new file mode 100644
index 000..46e011852b1
--- /dev/null
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_DOC_DIR="xxx" # contains no language subdirs
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon sheets words )
+
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular 
openexr +pdf
+   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
+   calligra_experimental_features_stage"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5(+)] )
+   fontconfig? ( media-libs/fontconfig )
+   gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   $(add_frameworks_dep khtml)
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   lcms? (
+   media-libs/ilmbase:=
+   media-libs/lcms:2
+   )
+   openexr? ( media-libs/openexr )
+   pdf? ( >=app-text/poppler-0.64:=[qt5] )
+   phonon? ( media-libs/phonon[qt5(+)] )
+   pim? ( $(add_kdeapps_dep kcalcore) )
+   spacenav? ( dev-libs/libspnav )
+   truetype? ( media-libs/freetype:2 )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+   calligra_experimental_features_stage? (
+   $(add_qt_dep qtwebkit)
+   okular? ( $(add_kdeapps_dep okular) )
+   )
+   calligra_features_sheets? ( dev-cpp/eigen:3 )
+   calligra_features_words? (
+   dev-libs/libxslt
+   okular? ( $(add_kdeapps_dep okular) )
+   )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-libs/boost
+   sys-devel/gettext
+   x11-misc/shared-mime-info
+   test? ( $(add_frameworks_dep threadweaver) )
+"
+RDEPEND="${COMMON_DEPEND}
+   calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+   !app-office/calligra:4
+   !app-office/calligra-l10n:4
+"

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

2018-07-15 Thread Andreas Sturmlechner

commit: 005aebaa26b159d7c4a755c719bf2c5bb2b8d490
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 15 10:01:56 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 15 10:38:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005aebaa

app-office/calligra: Fix build with Qt-5.11

Closes: https://bugs.gentoo.org/661222
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-office/calligra/calligra-3.1.0-r2.ebuild   |  1 +
 .../files/calligra-3.1.0-stage-qt-5.11.patch   | 23 ++
 2 files changed, 24 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild 
b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 0389b5b7c9d..e2a76aa73c6 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -142,6 +142,7 @@ PATCHES=(
"${FILESDIR}"/${P}-no-arch-detection.patch
"${FILESDIR}"/${P}-doc.patch
"${FILESDIR}"/${P}-qt-5.11.patch
+   "${FILESDIR}"/${P}-stage-qt-5.11.patch
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch 
b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
new file mode 100644
index 000..120864e11d4
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
@@ -0,0 +1,23 @@
+From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Tue, 3 Apr 2018 00:31:19 +0200
+Subject: Fix compilation with Qt 5.11 (missing include)
+
+---
+ stage/part/KPrPresentationTool.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/stage/part/KPrPresentationTool.cpp 
b/stage/part/KPrPresentationTool.cpp
+index ae743da..3007f91 100644
+--- a/stage/part/KPrPresentationTool.cpp
 b/stage/part/KPrPresentationTool.cpp
+@@ -32,6 +32,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+-- 
+cgit v0.11.2

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

2018-04-05 Thread Andreas Sturmlechner

commit: ed29e62fa20e94e2601da05749127fab941b2050
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  5 23:23:28 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  5 23:24:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed29e62f

app-office/calligra: Drop 3.0.1

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-office/calligra/Manifest   |   1 -
 app-office/calligra/calligra-3.0.1.ebuild  | 241 -
 .../files/calligra-3.0.0-no-arch-detection.patch   |  17 --
 3 files changed, 259 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 8cf6fbe018a..f4101fe56ac 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,2 @@
-DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B 
e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2
 SHA512 
ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156

diff --git a/app-office/calligra/calligra-3.0.1.ebuild 
b/app-office/calligra/calligra-3.0.1.ebuild
deleted file mode 100644
index 7a2d180f4ec..000
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-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"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="amd64 x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular 
openexr +pdf
-   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
-   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-# 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)
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-lang/perl
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( $(add_frameworks_dep kactivities) )
-   crypt? ( app-crypt/qca:2[qt5] )
-   fontconfig? ( media-libs/fontconfig )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   $(add_frameworks_dep khtml)
-   app-text/libetonyek
-   app-text/libodfgen
-

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

2018-04-05 Thread Aaron Bauman

commit: 5b162280d7ca39bf4bf372db2d460e3f4c37a267
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Apr  5 20:03:36 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr  5 21:15:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b162280

app-office/calligra: amd64 stable

Bug: https://bugs.gentoo.org/650676
Package-Manager: Portage-2.3.28, Repoman-2.3.9

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

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild 
b/app-office/calligra/calligra-3.1.0-r2.ebuild
index b1da5f43076..0432e146b50 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.calligra.org/;
 LICENSE="GPL-2"
 
 [[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CAL_FTS=( karbon plan sheets words )

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

2018-03-24 Thread Andreas Sturmlechner

commit: 11ee88aed98350f2c08ed36c1daa802182c10a38
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 24 06:42:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 24 06:42:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ee88ae

app-office/calligra: Fix build w/o plan

Closes: https://bugs.gentoo.org/651318
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-office/calligra/calligra-3.1.0-r2.ebuild   |   2 +
 11.patch => calligra-3.1.0-plan-qt-5.11.patch} |  93 --
 .../calligra/files/calligra-3.1.0-qt-5.11.patch| 108 -
 3 files changed, 2 insertions(+), 201 deletions(-)

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild 
b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 2084d5f44db..b1da5f43076 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -159,6 +159,8 @@ src_prepare() {
sed -e "/add_subdirectory(plan)/s/#//" \
-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
-i CMakeLists.txt || die
+
+   eapply "${FILESDIR}"/${P}-plan-qt-5.11.patch
fi
kde5_src_prepare
 

diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch 
b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
similarity index 54%
copy from app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
copy to app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
index 09236c41de0..d63f5ccbe87 100644
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
+++ b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
@@ -9,8 +9,6 @@ Tags: #calligra:_3.0
 
 Differential Revision: https://phabricator.kde.org/D11454
 ---
- libs/widgets/KoCsvImportDialog.cpp | 1 +
- libs/widgets/KoPageLayoutWidget.cpp| 2 ++
  plan/src/kptview.h | 1 +
  plan/src/kptviewlist.cpp   | 1 +
  plan/src/libs/ui/kptaccountseditor.cpp | 1 +
@@ -19,38 +17,8 @@ Differential Revision: https://phabricator.kde.org/D11454
  plan/src/libs/ui/kpttaskeditor.cpp | 1 +
  plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
  plan/src/libs/widgets/KoPageLayoutWidget.cpp   | 2 ++
- plugins/chartshape/dialogs/TableEditorDialog.cpp   | 1 +
- plugins/formulashape/FormulaToolWidget.cpp | 1 +
- sheets/dialogs/LayoutDialog.cpp| 1 +
- words/part/dialogs/KWAnchoringProperties.cpp   | 1 +
- words/part/dialogs/KWRunAroundProperties.cpp   | 2 ++
  15 files changed, 18 insertions(+), 1 deletion(-)
 
-diff --git a/libs/widgets/KoCsvImportDialog.cpp 
b/libs/widgets/KoCsvImportDialog.cpp
-index 0ffdcf62a70..cdca006dc62 100644
 a/libs/widgets/KoCsvImportDialog.cpp
-+++ b/libs/widgets/KoCsvImportDialog.cpp
-@@ -21,6 +21,7 @@
- #include "KoCsvImportDialog.h"
- 
- // Qt
-+#include 
- #include 
- #include 
- 
-diff --git a/libs/widgets/KoPageLayoutWidget.cpp 
b/libs/widgets/KoPageLayoutWidget.cpp
-index f91555ca262..a3816f96d8a 100644
 a/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
- 
- #include 
- 
-+#include 
-+
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private
- {
- public:
 diff --git a/plan/src/kptview.h b/plan/src/kptview.h
 index 44d11935e71..a98e55342db 100644
 --- a/plan/src/kptview.h
@@ -151,67 +119,6 @@ index c9e17b748a9..b67e9848807 100644
  class Q_DECL_HIDDEN KoPageLayoutWidget::Private
  {
  public:
-diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp 
b/plugins/chartshape/dialogs/TableEditorDialog.cpp
-index c0d5136f09e..d2a772e83c2 100644
 a/plugins/chartshape/dialogs/TableEditorDialog.cpp
-+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
-@@ -24,6 +24,7 @@
- 
- // Qt
- #include 
-+#include 
- 
- // Calligra
- #include 
-diff --git a/plugins/formulashape/FormulaToolWidget.cpp 
b/plugins/formulashape/FormulaToolWidget.cpp
-index ed109192cc5..8f521779617 100644
 a/plugins/formulashape/FormulaToolWidget.cpp
-+++ b/plugins/formulashape/FormulaToolWidget.cpp
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
-diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
-index a0a9832ddfc..7d7db53823b 100644
 a/sheets/dialogs/LayoutDialog.cpp
-+++ b/sheets/dialogs/LayoutDialog.cpp
-@@ -36,6 +36,7 @@
- #include 
- 
- #include 
-+#include 
- #include 
- #include 
- #include 
-diff --git a/words/part/dialogs/KWAnchoringProperties.cpp 
b/words/part/dialogs/KWAnchoringProperties.cpp
-index d64208cbdb6..bfddb3a03f5 100644
 a/words/part/dialogs/KWAnchoringProperties.cpp
-+++

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

2018-03-22 Thread Andreas Sturmlechner

commit: 4b63ff19b2fff1a48a920987c16c3ca121732fcb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 22 10:40:33 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 22 12:15:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b63ff19

app-office/calligra: Update patch after upstream review

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../calligra/files/calligra-3.1.0-qt-5.11.patch| 45 --
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch 
b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
index e49f5747699..09236c41de0 100644
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
+++ b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
@@ -1,8 +1,13 @@
-From c52295c8dc90b964d26567d6750f46fd202145ae Mon Sep 17 00:00:00 2001
+From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner 
 Date: Sun, 18 Mar 2018 11:56:57 +0100
 Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
 
+Reviewers: #calligra:_3.0
+
+Tags: #calligra:_3.0
+
+Differential Revision: https://phabricator.kde.org/D11454
 ---
  libs/widgets/KoCsvImportDialog.cpp | 1 +
  libs/widgets/KoPageLayoutWidget.cpp| 2 ++
@@ -34,18 +39,18 @@ index 0ffdcf62a70..cdca006dc62 100644
  #include 
  
 diff --git a/libs/widgets/KoPageLayoutWidget.cpp 
b/libs/widgets/KoPageLayoutWidget.cpp
-index f91555ca262..2b9d04450b3 100644
+index f91555ca262..a3816f96d8a 100644
 --- a/libs/widgets/KoPageLayoutWidget.cpp
 +++ b/libs/widgets/KoPageLayoutWidget.cpp
-@@ -19,6 +19,8 @@
+@@ -23,6 +23,8 @@
  
- #include "KoPageLayoutWidget.h"
+ #include 
  
 +#include 
 +
- #include 
- 
- #include 
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
 diff --git a/plan/src/kptview.h b/plan/src/kptview.h
 index 44d11935e71..a98e55342db 100644
 --- a/plan/src/kptview.h
@@ -110,7 +115,7 @@ index d1c3b1fc157..7c97a070b9a 100644
  {
  
 diff --git a/plan/src/libs/ui/kpttaskeditor.cpp 
b/plan/src/libs/ui/kpttaskeditor.cpp
-index 5f79abfd917..d08d7f231f4 100644
+index 21546118d33..91db5acbb18 100644
 --- a/plan/src/libs/ui/kpttaskeditor.cpp
 +++ b/plan/src/libs/ui/kpttaskeditor.cpp
 @@ -45,6 +45,7 @@
@@ -134,18 +139,18 @@ index 344ebc2b599..9146f06ab8c 100644
  #include 
  #include 
 diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp 
b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..3abc81b939e 100644
+index c9e17b748a9..b67e9848807 100644
 --- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
 +++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -21,6 +21,8 @@
+@@ -23,6 +23,8 @@
  
- #include 
+ #include 
  
 +#include 
 +
- #include 
- 
  class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
 diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp 
b/plugins/chartshape/dialogs/TableEditorDialog.cpp
 index c0d5136f09e..d2a772e83c2 100644
 --- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
@@ -195,18 +200,18 @@ index d64208cbdb6..bfddb3a03f5 100644
  
  const int KWAnchoringProperties::vertRels[4][20] = {
 diff --git a/words/part/dialogs/KWRunAroundProperties.cpp 
b/words/part/dialogs/KWRunAroundProperties.cpp
-index e38599a06d7..d96df6405a5 100644
+index e38599a06d7..7e8b2d51ef9 100644
 --- a/words/part/dialogs/KWRunAroundProperties.cpp
 +++ b/words/part/dialogs/KWRunAroundProperties.cpp
-@@ -17,6 +17,8 @@
-  * Boston, MA 02110-1301, USA.
-  */
+@@ -28,6 +28,8 @@
+ 
+ #include 
  
 +#include 
 +
- #include "KWRunAroundProperties.h"
- #include "KWFrameDialog.h"
- #include "KWDocument.h"
+ KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
+ : m_state(state)
+ {
 -- 
 2.16.2

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

2018-03-18 Thread Andreas Sturmlechner

commit: d6b997b31b37d2e63f4642b77bad12a39c2c66df
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 18 13:20:02 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 18 14:02:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b997b3

app-office/calligra: Fix build with Qt 5.11

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-office/calligra/calligra-3.1.0-r2.ebuild   |   1 +
 .../calligra/files/calligra-3.1.0-qt-5.11.patch| 212 +
 2 files changed, 213 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild 
b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 4c861b1050f..2084d5f44db 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -141,6 +141,7 @@ RESTRICT+=" test"
 PATCHES=(
"${FILESDIR}"/${P}-no-arch-detection.patch
"${FILESDIR}"/${P}-doc.patch
+   "${FILESDIR}"/${P}-qt-5.11.patch
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch 
b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
new file mode 100644
index 000..e49f5747699
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
@@ -0,0 +1,212 @@
+From c52295c8dc90b964d26567d6750f46fd202145ae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 18 Mar 2018 11:56:57 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+---
+ libs/widgets/KoCsvImportDialog.cpp | 1 +
+ libs/widgets/KoPageLayoutWidget.cpp| 2 ++
+ plan/src/kptview.h | 1 +
+ plan/src/kptviewlist.cpp   | 1 +
+ plan/src/libs/ui/kptaccountseditor.cpp | 1 +
+ plan/src/libs/ui/kptdocumentspanel.h   | 1 +
+ plan/src/libs/ui/kptitemviewsettup.cpp | 2 +-
+ plan/src/libs/ui/kpttaskeditor.cpp | 1 +
+ plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
+ plan/src/libs/widgets/KoPageLayoutWidget.cpp   | 2 ++
+ plugins/chartshape/dialogs/TableEditorDialog.cpp   | 1 +
+ plugins/formulashape/FormulaToolWidget.cpp | 1 +
+ sheets/dialogs/LayoutDialog.cpp| 1 +
+ words/part/dialogs/KWAnchoringProperties.cpp   | 1 +
+ words/part/dialogs/KWRunAroundProperties.cpp   | 2 ++
+ 15 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/libs/widgets/KoCsvImportDialog.cpp 
b/libs/widgets/KoCsvImportDialog.cpp
+index 0ffdcf62a70..cdca006dc62 100644
+--- a/libs/widgets/KoCsvImportDialog.cpp
 b/libs/widgets/KoCsvImportDialog.cpp
+@@ -21,6 +21,7 @@
+ #include "KoCsvImportDialog.h"
+ 
+ // Qt
++#include 
+ #include 
+ #include 
+ 
+diff --git a/libs/widgets/KoPageLayoutWidget.cpp 
b/libs/widgets/KoPageLayoutWidget.cpp
+index f91555ca262..2b9d04450b3 100644
+--- a/libs/widgets/KoPageLayoutWidget.cpp
 b/libs/widgets/KoPageLayoutWidget.cpp
+@@ -19,6 +19,8 @@
+ 
+ #include "KoPageLayoutWidget.h"
+ 
++#include 
++
+ #include 
+ 
+ #include 
+diff --git a/plan/src/kptview.h b/plan/src/kptview.h
+index 44d11935e71..a98e55342db 100644
+--- a/plan/src/kptview.h
 b/plan/src/kptview.h
+@@ -28,6 +28,7 @@
+ #include "kptcontext.h"
+ #include "kptviewbase.h"
+ 
++#include 
+ #include 
+ #include 
+ 
+diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
+index f34e702e055..0e6db7b2ffe 100644
+--- a/plan/src/kptviewlist.cpp
 b/plan/src/kptviewlist.cpp
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include 
+diff --git a/plan/src/libs/ui/kptaccountseditor.cpp 
b/plan/src/libs/ui/kptaccountseditor.cpp
+index 7991fafd779..54e3a87c94f 100644
+--- a/plan/src/libs/ui/kptaccountseditor.cpp
 b/plan/src/libs/ui/kptaccountseditor.cpp
+@@ -40,6 +40,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+diff --git a/plan/src/libs/ui/kptdocumentspanel.h 
b/plan/src/libs/ui/kptdocumentspanel.h
+index 00ea3af80b2..491cb1ebb86 100644
+--- a/plan/src/libs/ui/kptdocumentspanel.h
 b/plan/src/libs/ui/kptdocumentspanel.h
+@@ -26,6 +26,7 @@
+ 
+ #include "kptdocuments.h"
+ 
++#include 
+ #include 
+ #include 
+ 
+diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp 
b/plan/src/libs/ui/kptitemviewsettup.cpp
+index d1c3b1fc157..7c97a070b9a 100644
+--- a/plan/src/libs/ui/kptitemviewsettup.cpp
 b/plan/src/libs/ui/kptitemviewsettup.cpp
+@@ -25,9 +25,9 @@
+ 
+ #include "KoPageLayoutWidget.h"
+ 
++#include 
+ #include 
+ 
+-
+ namespace KPlato
+ {
+ 
+diff --git a/plan/src/libs/ui/kpttaskeditor.cpp 
b/plan/src/libs/ui/kpttaskeditor.cpp
+index 5f79abfd917..d08d7f231f4 100644
+--- a/plan/src/libs/ui/kpttaskeditor.cpp
 b/plan/src/libs/ui/kpttaskeditor.cpp
+@@ -45,6 +45,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+

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

2018-03-15 Thread Andreas Sturmlechner

commit: 24789fae8eaa3957f341483d7f3c92cb164ed4d3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 15 15:35:43 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 15 16:33:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24789fae

app-office/calligra: Prepare for app-crypt/qca dropping USE=qt5

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-office/calligra/Manifest | 2 +-
 app-office/calligra/calligra-3.1.0-r2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 8cf6fbe018a..6e356112c66 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,3 @@
 DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B 
e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2
 SHA512 
ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
+DIST calligraplan-3.1.0.tar.xz 0 BLAKE2B 
786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce
 SHA512 
cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild 
b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 68e6f30d1dd..4c861b1050f 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
sys-libs/zlib
virtual/libiconv
activities? ( $(add_frameworks_dep kactivities) )
-   crypt? ( app-crypt/qca:2[qt5] )
+   crypt? ( app-crypt/qca:2[qt5(+)] )
fontconfig? ( media-libs/fontconfig )
gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
gsl? ( sci-libs/gsl )

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

2018-03-15 Thread Andreas Sturmlechner

commit: 03ac329bbdf30b3d9676cc0abbd562c09413a7d9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 15 15:36:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 15 16:33:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03ac329b

app-office/calligra: Drop 3.1.0-r1

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-office/calligra/Manifest |   2 +-
 app-office/calligra/calligra-3.1.0-r1.ebuild | 231 ---
 2 files changed, 1 insertion(+), 232 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 6e356112c66..8cf6fbe018a 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,3 @@
 DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B 
e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2
 SHA512 
ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
-DIST calligraplan-3.1.0.tar.xz 0 BLAKE2B 
786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce
 SHA512 
cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156

diff --git a/app-office/calligra/calligra-3.1.0-r1.ebuild 
b/app-office/calligra/calligra-3.1.0-r1.ebuild
deleted file mode 100644
index d0f98bb0a47..000
--- a/app-office/calligra/calligra-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_APPS_MINIMAL="17.12.0"
-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
-   calligra_features_plan? ( 
mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular 
openexr +pdf
-   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
-   calligra_experimental_features_stage"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# 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
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-

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

2018-03-15 Thread Andreas Sturmlechner

commit: be82e02e9b9524bedc5a21051a23c800e5135f1a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 19 16:58:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 15 16:33:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be82e02e

app-office/calligra: Workaround unexpected KDE_DOC_DIR content

Closes: https://bugs.gentoo.org/648126
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-office/calligra/calligra-3.1.0-r2.ebuild   | 235 +
 app-office/calligra/files/calligra-3.1.0-doc.patch |  13 ++
 2 files changed, 248 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild 
b/app-office/calligra/calligra-3.1.0-r2.ebuild
new file mode 100644
index 000..68e6f30d1dd
--- /dev/null
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_APPS_MINIMAL="17.12.0"
+KDE_DOC_DIR="xxx" # contains no language subdirs
+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
+   calligra_features_plan? ( 
mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular 
openexr +pdf
+   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
+   calligra_experimental_features_stage"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# 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
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5] )
+   fontconfig? ( media-libs/fontconfig )
+   gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   $(add_frameworks_dep khtml)
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   lcms? (
+   media-libs/ilmbase:=
+   media-libs/lcms:2
+   )
+   openexr? ( media-libs/openexr )
+   pdf? ( app-text/poppler[qt5] )
+   phonon? ( media-libs/phonon[qt5(+)] )
+   spacenav? ( dev-libs/libspnav )
+   truetype? ( media-libs/freetype:2 )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+   calligra_experimental_features_stage? (
+   $(add_qt_dep qtwebkit)
+   okular? ( $(add_kdeapps_dep okular) )
+   )
+   calligra_features_plan? (
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep kholidays)
+

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

2018-03-13 Thread Michael Palimaka

commit: 6ab571379485db206d518a63e49689108dc2e3d1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Mar 13 11:49:54 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Mar 13 12:51:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab57137

app-office/calligra: remove unnecessary := subslot operator on poppler

Per poppler's metadata.xml, the subslot reflects ABI compatibility of
libpoppler.so only, not libpoppler-{glib,qt4,cpp}.so.

Bug: https://bugs.gentoo.org/607908
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-office/calligra/calligra-3.0.1.ebuild| 4 ++--
 app-office/calligra/calligra-3.1.0-r1.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-office/calligra/calligra-3.0.1.ebuild 
b/app-office/calligra/calligra-3.0.1.ebuild
index 730f9e6ad9c..7a2d180f4ec 100644
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ b/app-office/calligra/calligra-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -91,7 +91,7 @@ COMMON_DEPEND="
media-libs/lcms:2
)
openexr? ( media-libs/openexr )
-   pdf? ( app-text/poppler:=[qt5] )
+   pdf? ( app-text/poppler[qt5] )
phonon? ( media-libs/phonon[qt5(+)] )
spacenav? ( dev-libs/libspnav )
truetype? ( media-libs/freetype:2 )

diff --git a/app-office/calligra/calligra-3.1.0-r1.ebuild 
b/app-office/calligra/calligra-3.1.0-r1.ebuild
index 7a42c16449a..d0f98bb0a47 100644
--- a/app-office/calligra/calligra-3.1.0-r1.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r1.ebuild
@@ -97,7 +97,7 @@ COMMON_DEPEND="
media-libs/lcms:2
)
openexr? ( media-libs/openexr )
-   pdf? ( app-text/poppler:=[qt5] )
+   pdf? ( app-text/poppler[qt5] )
phonon? ( media-libs/phonon[qt5(+)] )
spacenav? ( dev-libs/libspnav )
truetype? ( media-libs/freetype:2 )

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

2018-02-11 Thread Andreas Sturmlechner

commit: 941bb1d9f8bee2aaa10e785fa43137ca39dd75f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 10 13:30:39 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 11 22:00:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941bb1d9

app-office/calligra: Switch to kde-frameworks/kholidays

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-office/calligra/{calligra-3.1.0.ebuild => calligra-3.1.0-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-3.1.0.ebuild 
b/app-office/calligra/calligra-3.1.0-r1.ebuild
similarity index 99%
rename from app-office/calligra/calligra-3.1.0.ebuild
rename to app-office/calligra/calligra-3.1.0-r1.ebuild
index e74f8c930b4..7a42c16449a 100644
--- a/app-office/calligra/calligra-3.1.0.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r1.ebuild
@@ -111,7 +111,7 @@ COMMON_DEPEND="
)
calligra_features_plan? (
$(add_frameworks_dep khtml)
-   $(add_kdeapps_dep kholidays)
+   $(add_frameworks_dep kholidays)
dev-libs/kdiagram:5
pim? (
$(add_kdeapps_dep kcalcore)

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

2018-01-31 Thread Andreas Sturmlechner

commit: 0b6583ee076c90cf3e14081cafc081a94e7e0aa1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 31 16:51:26 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 31 17:51:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6583ee

app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE

Reported-by: Dennis Schridde  gmx.net>
Closes: https://bugs.gentoo.org/646164
Package-Manager: Portage-2.3.21, Repoman-2.3.6

 app-office/calligra/calligra-3.1.0.ebuild | 22 ++
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/app-office/calligra/calligra-3.1.0.ebuild 
b/app-office/calligra/calligra-3.1.0.ebuild
index b053f117b3a..e74f8c930b4 100644
--- a/app-office/calligra/calligra-3.1.0.ebuild
+++ b/app-office/calligra/calligra-3.1.0.ebuild
@@ -188,30 +188,19 @@ src_configure() {
 
# applications
for cal_ft in ${CAL_FTS[@]}; do
-   if use calligra_features_${cal_ft} ; then
-   myproducts+=( "${cal_ft^^}" )
-   fi
+   use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
done
 
-   [[ ${KDE_BUILD_TYPE} == release ]] && \
-   use calligra_experimental_features_stage && \
-   myproducts+=( CALLIGRA_FEATURES_STAGE )
+   use calligra_experimental_features_stage && myproducts+=( STAGE )
 
use lcms && myproducts+=( PLUGIN_COLORENGINES )
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
 
-   local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
-   if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-   mycmakeargs+=(
-   -DRELEASE_BUILD=ON
-   -DBUILD_UNMAINTAINED=$(usex 
calligra_experimental_features_stage)
-   )
-   fi
-
-   mycmakeargs+=(
+   local mycmakeargs=(
-DPACKAGERS_BUILD=OFF
+   -DRELEASE_BUILD=ON
-DWITH_Iconv=ON
+   -DPRODUCTSET="${myproducts[*]}"
$(cmake-utils_use_find_package activities KF5Activities)
-DWITH_Qca-qt5=$(usex crypt)
-DWITH_Fontconfig=$(usex fontconfig)
@@ -233,6 +222,7 @@ src_configure() {
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
-DWITH_Eigen3=$(usex calligra_features_sheets)
+   -DBUILD_UNMAINTAINED=$(usex 
calligra_experimental_features_stage)
-ENABLE_CSTESTER_TESTING=$(usex test)
-DWITH_Freetype=$(usex truetype)
)

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

2018-01-27 Thread Andreas Sturmlechner

commit: 2b37981a42b6f9259a31f4b1269dadcf6a36bb95
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 27 22:36:56 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 28 01:19:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b37981a

app-office/calligra: 3.1.0 version bump

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 app-office/calligra/Manifest   |   2 +
 app-office/calligra/calligra-3.1.0.ebuild  | 241 +
 .../files/calligra-3.1.0-no-arch-detection.patch   |  17 ++
 app-office/calligra/metadata.xml   |   1 +
 4 files changed, 261 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 776ebb77289..8cf6fbe018a 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,3 @@
 DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B 
e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2
 SHA512 
ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
+DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B 
b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50
 SHA512 
ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
+DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B 
af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed
 SHA512 
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156

diff --git a/app-office/calligra/calligra-3.1.0.ebuild 
b/app-office/calligra/calligra-3.1.0.ebuild
new file mode 100644
index 000..b053f117b3a
--- /dev/null
+++ b/app-office/calligra/calligra-3.1.0.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_APPS_MINIMAL="17.12.0"
+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
+   calligra_features_plan? ( 
mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular 
openexr +pdf
+   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
+   calligra_experimental_features_stage"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# 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
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5] )
+   fontconfig? (

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

2017-07-06 Thread Michael Palimaka

commit: 07319fb870a05e878406f2ae5ab497f87468306c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jul  6 12:47:30 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jul  6 12:48:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07319fb8

app-office/calligra: remove 2.9.11-r1

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-office/calligra/Manifest   |   1 -
 app-office/calligra/calligra-2.9.11-r1.ebuild  | 227 -
 .../files/calligra-2.9.1-no-arch-detection.patch   |  14 --
 .../files/calligra-2.9.11-libwps-0.4.patch |  46 -
 .../files/calligra-2.9.11-postgresql-9.6.patch |  19 --
 app-office/calligra/metadata.xml   |   7 -
 6 files changed, 314 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index dfb1872d714..89021be4b8c 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1 @@
-DIST calligra-2.9.11.tar.xz 196039892 SHA256 
b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 
69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8
 WHIRLPOOL 
973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
 DIST calligra-3.0.1.tar.xz 60764344 SHA256 
452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2 SHA512 
ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 WHIRLPOOL 
6e1dfecb877ee57bf43a9d2ec597972f474b4acb7fe7acff5ad6f72bc81cae9484e4ac7ad425652d6a08051810a1ff99efd2b854ead20b9e437746e080c99397

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
deleted file mode 100644
index ae488fe4583..000
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit check-reqs kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/;
-
-case ${PV} in
-   2.[456789].[789]?)
-   # beta or rc releases
-   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-   2.[456789].?|2.[456789].??)
-   # stable releases
-   SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-   2.[456789].)
-   # stable branch live ebuild
-   SRC_URI="" ;;
-   )
-   # master branch live ebuild
-   SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-   KEYWORDS="amd64 ~arm x86"
-fi
-
-IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
-+gsf gsl import-filter +jpeg jpeg2k +lcms mysql openexr +pdf +pim
-postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
-
-# Don't use Active, it's broken on desktops.
-CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage 
words"
-for cal_ft in ${CAL_FTS}; do
-   IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-   || ( $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) )
-   calligra_features_author? ( calligra_features_words )
-   calligra_features_gemini? ( opengl )
-   calligra_features_krita? ( eigen exif lcms opengl )
-   calligra_features_plan? ( pim )
-   calligra_features_sheets? ( eigen )
-   calligra_features_stage? ( webkit )
-   vc? ( calligra_features_krita )
-   test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-   dev-lang/perl
-   dev-libs/boost
-   dev-qt/qtcore:4[exceptions]
-   media-libs/libpng:0=
-   sys-libs/zlib
-   virtual/libiconv
-   color-management? ( media-libs/opencolorio )
-   crypt? ( app-crypt/qca:2[qt4] )
-   eigen? ( dev-cpp/eigen:3 )
-   exif? ( media-gfx/exiv2:= )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   freetds? ( dev-db/freetds )
-   glib? ( dev-libs/glib:2 )
-   gsf? ( gnome-extra/libgsf )
-   gsl? ( sci-libs/gsl:= )
-   import-filter? (
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   app-text/libwps
-   dev-libs/librevenge
-   media-libs/libvisio
-   )
-   jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:0 )
-   lcms? (
-

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

2017-07-04 Thread Agostino Sarubbo

commit: b0a445b78370c22376713c2cae81f1564bb4d4c6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul  4 15:47:42 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul  4 15:47:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a445b7

app-office/calligra: x86 stable wrt bug #623250

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-office/calligra/calligra-3.0.1.ebuild 
b/app-office/calligra/calligra-3.0.1.ebuild
index 73177bc090e..8b3981ac49c 100644
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ b/app-office/calligra/calligra-3.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.calligra.org/;
 LICENSE="GPL-2"
 
 [[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon plan sheets words )
 CAL_EXP_FTS=( braindump stage )

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

2017-07-04 Thread Agostino Sarubbo

commit: feaa04618632f634924d26fa1bce987d8ff10e4a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul  4 10:15:07 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul  4 10:15:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feaa0461

app-office/calligra: amd64 stable wrt bug #623250

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/app-office/calligra/calligra-3.0.1.ebuild 
b/app-office/calligra/calligra-3.0.1.ebuild
index e38e58efaa8..73177bc090e 100644
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ b/app-office/calligra/calligra-3.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.calligra.org/;
 LICENSE="GPL-2"
 
 [[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CAL_FTS=( karbon plan sheets words )
 CAL_EXP_FTS=( braindump stage )

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

2017-06-27 Thread Andreas Sturmlechner

commit: e0b532fc99180e3dba24b8da3b061b981c3cf424
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 27 18:33:39 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 27 18:34:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b532fc

app-office/calligra: Drop USE=vc and disable it

Nothing but trouble.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-office/calligra/calligra-3.0.1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-office/calligra/calligra-3.0.1.ebuild 
b/app-office/calligra/calligra-3.0.1.ebuild
index 0861d3a9810..e38e58efaa8 100644
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ b/app-office/calligra/calligra-3.0.1.ebuild
@@ -21,7 +21,7 @@ CAL_FTS=( karbon plan sheets words )
 CAL_EXP_FTS=( braindump stage )
 
 IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular 
openexr +pdf
-   phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
+   phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
$(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
@@ -127,7 +127,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
x11-misc/shared-mime-info
test? ( $(add_frameworks_dep threadweaver) )
-   vc? ( >=dev-libs/vc-1.1.0 )
 "
 RDEPEND="${COMMON_DEPEND}
calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
@@ -233,7 +232,7 @@ src_configure() {
-DWITH_Eigen3=$(usex calligra_features_sheets)
-ENABLE_CSTESTER_TESTING=$(usex test)
-DWITH_Freetype=$(usex truetype)
-   -DWITH_Vc=$(usex vc)
+   -DWITH_Vc=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
)

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

2017-06-18 Thread Michael Palimaka

commit: 88521ef42d1a163bfb8fdf2e869ae979293ad4fc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 18 12:02:47 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 18 12:08:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88521ef4

app-office/calligra: use HTTPS

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-office/calligra/calligra-2.9.11-r1.ebuild | 2 +-
 app-office/calligra/calligra-3.0.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 9358071c626..ae488fe4583 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -15,7 +15,7 @@ WEBKIT_REQUIRED="optional"
 inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/;
+HOMEPAGE="https://www.calligra.org/;
 
 case ${PV} in
2.[456789].[789]?)

diff --git a/app-office/calligra/calligra-3.0.1.ebuild 
b/app-office/calligra/calligra-3.0.1.ebuild
index 9469c2e3ccf..0861d3a9810 100644
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ b/app-office/calligra/calligra-3.0.1.ebuild
@@ -9,7 +9,7 @@ KDE_TEST="forceoptional-recursive"
 inherit check-reqs kde5 versionator
 
 DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/;
+HOMEPAGE="https://www.calligra.org/;
 [[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"

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

2017-06-05 Thread Andreas Sturmlechner

commit: 815b50d9f65e53fbecb7b5e0a372ecc2393031fb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun  5 19:59:23 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun  5 20:14:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815b50d9

app-office/calligra: Drop USE=kdcraw

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 app-office/calligra/calligra-2.9.11-r1.ebuild | 5 ++---
 app-office/calligra/metadata.xml  | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 645be6f19c5..9358071c626 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -40,7 +40,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 fi
 
 IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
-+gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql openexr +pdf +pim
++gsf gsl import-filter +jpeg jpeg2k +lcms mysql openexr +pdf +pim
 postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
 
 # Don't use Active, it's broken on desktops.
@@ -90,7 +90,6 @@ RDEPEND="
)
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
-   kdcraw? ( $(add_kdeapps_dep libkdcraw) )
lcms? (
media-libs/lcms:2
x11-libs/libX11
@@ -196,7 +195,7 @@ src_configure() {
-DWITH_LibWps=$(usex import-filter)
-DWITH_JPEG=$(usex jpeg)
-DWITH_OpenJPEG=$(usex jpeg2k)
-   -DWITH_Kdcraw=$(usex kdcraw)
+   -DWITH_Kdcraw=OFF
-DWITH_LCMS2=$(usex lcms)
-DWITH_MySQL=$(usex mysql)
-DWITH_Okular=OFF

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 721acdb3213..e19fadc0436 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -17,7 +17,6 @@
Enable support for C library routines from 
dev-libs/glib
Enable support for ODT structures extraction 
via gnome-extra/libgsf
Enable support for various import 
filter file formats like WordPerfect, Visio and Apple Keynote
-   Enable support for KDE image manipulating 
interface via kde-apps/libkdcraw
Build colorengine plugins using 
media-libs/lcms
Enable bindings for 
kde-apps/okular
Build stage/eventplugins and videoshape 
plugin using media-libs/phonon

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

2017-04-01 Thread Andreas Sturmlechner

commit: 5702862d406a1cbf658f56f4d6392825bbc4f4fe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  1 16:12:52 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  1 16:12:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5702862d

app-office/calligra-l10n: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../calligra-l10n/calligra-l10n-2.9.11.ebuild  | 86 --
 1 file changed, 86 deletions(-)

diff --git a/app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild 
b/app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild
deleted file mode 100644
index 6a495b9cb97..000
--- a/app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="https://www.kde.org/;
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="!app-office/koffice-l10n"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc"
-
-MY_LANGS="bs ca ca@valencia cs da de el en_GB es et fi fr gl hu it ja kk nb nl
-pl pt pt_BR ru sk sv tr uk zh_CN zh_TW"
-
-case ${PV} in
-   2.[456789].[789]?)
-   # beta or rc releases
-   URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}" ;;
-   2.[456789].?|2.[456789].??)
-   # stable releases
-   URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}" ;;
-   *)
-   SRC_URI="" ;;
-esac
-
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
-   IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}"
-   SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( 
${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
-   local lng dir
-   if [[ -z ${A} ]]; then
-   elog
-   elog "None of the requested L10N are supported by ${P}."
-   elog
-   elog "${P} supports these language codes:"
-   elog "${MY_LANGS//[@_]/-}"
-   elog
-   fi
-
-   [[ -n ${A} ]] && unpack ${A}
-   cd "${S}"
-
-   # add all L10N to cmake
-   if [[ -n ${A} ]]; then
-   for lng in ${MY_LANGS}; do
-   dir="${PN}-${lng}-${PV}"
-   if [[ -d "${dir}" ]] ; then
-   echo "add_subdirectory( ${dir} )" >> 
"${S}"/CMakeLists.txt
-   fi
-   done
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-   $(cmake-utils_use_build doc)
-   )
-   [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-   [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-   [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-   [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}

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

2017-04-01 Thread Andreas Sturmlechner

commit: efd19ca2c774795d8475a0b7f04dad791ddce667
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  1 16:14:02 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  1 16:14:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd19ca2

app-office/calligra: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/calligra-2.9.11.ebuild | 231 -
 app-office/calligra/metadata.xml   |   1 -
 2 files changed, 232 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11.ebuild 
b/app-office/calligra/calligra-2.9.11.ebuild
deleted file mode 100644
index 20bfc7798e8..000
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit check-reqs kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/;
-
-case ${PV} in
-   2.[456789].[789]?)
-   # beta or rc releases
-   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-   2.[456789].?|2.[456789].??)
-   # stable releases
-   SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-   2.[456789].)
-   # stable branch live ebuild
-   SRC_URI="" ;;
-   )
-   # master branch live ebuild
-   SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-   KEYWORDS="amd64 ~arm x86"
-fi
-
-IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql
-+okular openexr +pdf +pim postgres spacenav sybase test tiff +threads
-+truetype vc xbase +xml"
-
-# Don't use Active, it's broken on desktops.
-CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage 
words"
-for cal_ft in ${CAL_FTS}; do
-   IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-   || ( $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) )
-   calligra_features_author? ( calligra_features_words )
-   calligra_features_gemini? ( opengl )
-   calligra_features_krita? ( eigen exif lcms opengl )
-   calligra_features_plan? ( pim )
-   calligra_features_sheets? ( eigen )
-   calligra_features_stage? ( webkit )
-   vc? ( calligra_features_krita )
-   test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-   dev-lang/perl
-   dev-libs/boost
-   dev-qt/qtcore:4[exceptions]
-   media-libs/libpng:0
-   sys-libs/zlib
-   virtual/libiconv
-   attica? ( dev-libs/libattica )
-   color-management? ( media-libs/opencolorio )
-   crypt? ( app-crypt/qca:2[qt4(+)] )
-   eigen? ( dev-cpp/eigen:3 )
-   exif? ( media-gfx/exiv2:= )
-   fftw? ( sci-libs/fftw:3.0 )
-   fontconfig? ( media-libs/fontconfig )
-   freetds? ( dev-db/freetds )
-   glib? ( dev-libs/glib:2 )
-   gsf? ( gnome-extra/libgsf )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   app-text/libwps
-   dev-libs/librevenge
-   media-libs/libvisio
-   )
-   jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:0 )
-   kdcraw? ( $(add_kdeapps_dep libkdcraw) )
-   lcms? (
-   media-libs/lcms:2
-   x11-libs/libX11
-   )
-   mysql? ( virtual/mysql )
-   okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
-   opengl? (
-   media-libs/glew:0
-   virtual/glu
-   )
-   openexr? ( media-libs/openexr )
-   pdf? (
-   app-text/poppler:=
-   media-gfx/pstoedit
-   )
-   pim? ( $(add_kdeapps_dep kdepimlibs) )
-   postgres? (
-   dev-db/postgresql:*
-   dev-libs/libpqxx
-   )
-   spacenav? ( dev-libs/libspnav )
-   sybase? ( dev-db/freetds )
-   tiff? ( media-libs/tiff:0 )
-   truetype? ( media-libs/freetype:2 )
-   vc? ( =dev-db/sqlite-3.8.7:3[extensions(+)]
-   dev-libs/icu:=
-   )
-   calligra_features_krita? (
-   dev-qt/qtdeclarative:4
-   net-misc/curl
-   x11-libs/libX11
-   x11-libs/libXi
-   )
-   calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}
-   x11-misc/shared-mime-info
-"
-
-[[ ${PV} ==  ]] && LANGVERSION="2.9" ||

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

2017-04-01 Thread Agostino Sarubbo

commit: 046a97a76cf06bdf7cf44c9eb035583415fa3386
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr  1 16:05:32 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr  1 16:05:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=046a97a7

app-office/calligra: x86 stable wrt bug #613218

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-office/calligra/calligra-2.9.11-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 7f643dfec3c..645be6f19c5 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -36,7 +36,7 @@ LICENSE="GPL-2"
 SLOT="4"
 
 if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-   KEYWORDS="amd64 ~arm ~x86"
+   KEYWORDS="amd64 ~arm x86"
 fi
 
 IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib

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

2017-04-01 Thread Agostino Sarubbo

commit: 32b6cdd9c03f91948748cd9d898a70852c1eca92
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr  1 16:05:37 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr  1 16:05:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32b6cdd9

app-office/calligra-l10n: x86 stable wrt bug #613218

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild 
b/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild
index 71456e4853c..15f72e64f9b 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.kde.org/;
 LICENSE="GPL-2"
 SLOT="4"
 
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc"
 
 DEPEND="sys-devel/gettext"

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

2017-03-31 Thread Andreas Sturmlechner

commit: d835f1db2c95dfbbb5b97d4d17eade2f89bf3a80
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 31 18:46:52 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 31 20:22:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d835f1db

app-office/calligra: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/Manifest   |   1 -
 app-office/calligra/calligra-3.0.0.1-r2.ebuild | 248 -
 .../calligra/files/calligra-3.0.0.1-deps1.patch|  31 ---
 .../calligra/files/calligra-3.0.0.1-deps2.patch|  65 --
 .../calligra/files/calligra-3.0.0.1-deps3.patch|  31 ---
 .../files/calligra-3.0.0.1-nokdelibs4.patch|  38 
 .../files/calligra-3.0.0.1-relax-deps.patch|  34 ---
 7 files changed, 448 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 32aced423fd..dfb1872d714 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,2 @@
 DIST calligra-2.9.11.tar.xz 196039892 SHA256 
b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 
69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8
 WHIRLPOOL 
973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
-DIST calligra-3.0.0.1.tar.xz 6072 SHA256 
dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011 SHA512 
826495dfa843f51ecb1139ca8d6d19f6a3fd49e4ca186b4c6a5d1498cdecbfb38461a871153bf8b9944e729725e50918434849acc78c375591636d06ef5d5f6a
 WHIRLPOOL 
085be69fbc32fe54b567e81727aaed7bf613d8c6f2fc9d6eaaac3348e5a4e116278b6da86be953d7d17ea8854dc94021c11c81eb29d8c9a68c517b31457d2242
 DIST calligra-3.0.1.tar.xz 60764344 SHA256 
452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2 SHA512 
ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 WHIRLPOOL 
6e1dfecb877ee57bf43a9d2ec597972f474b4acb7fe7acff5ad6f72bc81cae9484e4ac7ad425652d6a08051810a1ff99efd2b854ead20b9e437746e080c99397

diff --git a/app-office/calligra/calligra-3.0.0.1-r2.ebuild 
b/app-office/calligra/calligra-3.0.0.1-r2.ebuild
deleted file mode 100644
index 745e657f988..000
--- a/app-office/calligra/calligra-3.0.0.1-r2.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/;
-[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular 
openexr +pdf
-   phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
-   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-# 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)
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-

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

2017-03-31 Thread Andreas Sturmlechner

commit: 0faf3f258c0e6be926885e9a77f34d2de6ea0746
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 31 18:44:56 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 31 20:22:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0faf3f25

app-office/calligra: 3.0.1 version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/Manifest  |   1 +
 app-office/calligra/calligra-3.0.1.ebuild | 242 ++
 2 files changed, 243 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 94b14504558..32aced423fd 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,3 @@
 DIST calligra-2.9.11.tar.xz 196039892 SHA256 
b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 
69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8
 WHIRLPOOL 
973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
 DIST calligra-3.0.0.1.tar.xz 6072 SHA256 
dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011 SHA512 
826495dfa843f51ecb1139ca8d6d19f6a3fd49e4ca186b4c6a5d1498cdecbfb38461a871153bf8b9944e729725e50918434849acc78c375591636d06ef5d5f6a
 WHIRLPOOL 
085be69fbc32fe54b567e81727aaed7bf613d8c6f2fc9d6eaaac3348e5a4e116278b6da86be953d7d17ea8854dc94021c11c81eb29d8c9a68c517b31457d2242
+DIST calligra-3.0.1.tar.xz 60764344 SHA256 
452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2 SHA512 
ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 WHIRLPOOL 
6e1dfecb877ee57bf43a9d2ec597972f474b4acb7fe7acff5ad6f72bc81cae9484e4ac7ad425652d6a08051810a1ff99efd2b854ead20b9e437746e080c99397

diff --git a/app-office/calligra/calligra-3.0.1.ebuild 
b/app-office/calligra/calligra-3.0.1.ebuild
new file mode 100644
index 000..9469c2e3ccf
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional-recursive"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/;
+[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular 
openexr +pdf
+   phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
+   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+# 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)
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5] )
+   fontconfig? ( media-libs/fontconfig )
+

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

2017-03-25 Thread Agostino Sarubbo

commit: fc5c3480b82de99eae7c2f44a108178e35814746
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Mar 25 14:41:31 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Mar 25 14:41:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5c3480

app-office/calligra: amd64 stable wrt bug #613218

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-office/calligra/calligra-2.9.11-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index deb7957310e..7f643dfec3c 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -36,7 +36,7 @@ LICENSE="GPL-2"
 SLOT="4"
 
 if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-   KEYWORDS="~amd64 ~arm ~x86"
+   KEYWORDS="amd64 ~arm ~x86"
 fi
 
 IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib

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

2017-03-25 Thread Agostino Sarubbo

commit: 055dfdce180a03a777236f5b6df3f2b0d5398f87
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Mar 25 14:41:36 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Mar 25 14:41:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=055dfdce

app-office/calligra-l10n: amd64 stable wrt bug #613218

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild 
b/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild
index e9e0adad9fb..71456e4853c 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.kde.org/;
 LICENSE="GPL-2"
 SLOT="4"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc"
 
 DEPEND="sys-devel/gettext"

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

2017-03-24 Thread Andreas Sturmlechner

commit: 49c862060915b1c844f73cc10016ae427ee8b8e4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 24 15:23:10 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 24 15:23:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c86206

app-office/calligra: Fix missing NEEDED entries

Adding QA_DT_NEEDED=usr/lib64/libkoversion.so.14.0.0

Gentoo-bug: 613414
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-office/calligra/calligra-2.9.11-r1.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index a67a0fe9ec1..deb7957310e 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -219,3 +219,10 @@ src_configure() {
 
kde4-base_src_configure
 }
+
+src_install() {
+   kde4-base_src_install
+
+   # bug 613414
+   QA_DT_NEEDED="usr/lib64/libkoversion.so.14.0.0"
+}

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

2017-03-21 Thread Andreas Sturmlechner

commit: 371eb8a1679d3e33e57a6d7860d2cbe734875bf2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 21 14:19:48 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 21 20:52:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371eb8a1

app-office/calligra: Fix >=libwps-0.4 detection

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/calligra-2.9.11-r1.ebuild  |  1 +
 .../files/calligra-2.9.11-libwps-0.4.patch | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index a28e2a28e24..a67a0fe9ec1 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -141,6 +141,7 @@ RESTRICT=test
 PATCHES=(
"${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch
"${FILESDIR}"/${P}-postgresql-9.6.patch
+   "${FILESDIR}"/${P}-libwps-0.4.patch
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch 
b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch
new file mode 100644
index 000..79595d9f883
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch
@@ -0,0 +1,46 @@
+Last-Update: 2015-06-17
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969
+Origin: 
http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070
+From: David Tardon 
+Description: adapt to libwps 0.4
+
+--- a/cmake/modules/FindLibWps.cmake
 b/cmake/modules/FindLibWps.cmake
+@@ -9,18 +9,18 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ 
+ include(LibFindMacros)
+ libfind_package(LIBWPS LibWpd)
+-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4)
+ 
+ find_path(LIBWPS_INCLUDE_DIR
+ NAMES libwps/libwps.h
+ HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
+-PATH_SUFFIXES libwps-0.3
++PATH_SUFFIXES libwps-0.4
+ )
+ 
+ find_library(LIBWPS_LIBRARY
+-NAMES wps wps-0.3
++NAMES wps wps-0.4
+ HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
+ )
+ 
+ set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES)
+--- a/filters/words/works/import/WPSImport.cpp
 b/filters/words/works/import/WPSImport.cpp
+@@ -90,9 +90,11 @@
+ }
+ bool isSupportedFormat(librevenge::RVNGInputStream )
+ {
+ WPSKind kind = WPS_TEXT;
+-WPSConfidence confidence = WPSDocument::isFileFormatSupported(, 
kind);
++WPSCreator creator = WPS_MSWORKS;
++bool needsEncoding = false;
++WPSConfidence confidence = WPSDocument::isFileFormatSupported(, 
kind, creator, needsEncoding);
+ if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT)
+ return false;
+ return true;
+ }

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

2017-03-21 Thread Andreas Sturmlechner

commit: c2c339a7c7a22826c17b51fa2cda6d806fb0b93f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 21 12:22:27 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 21 12:24:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c339a7

app-office/calligra: Must select at-least-one-of CALLIGRA_FEATURES

Gentoo-bug: 613316

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/calligra-2.9.11-r1.ebuild | 1 +
 app-office/calligra/calligra-2.9.11.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 205e39548e7..a28e2a28e24 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -51,6 +51,7 @@ done
 unset cal_ft
 
 REQUIRED_USE="
+   || ( $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) )
calligra_features_author? ( calligra_features_words )
calligra_features_gemini? ( opengl )
calligra_features_krita? ( eigen exif lcms opengl )

diff --git a/app-office/calligra/calligra-2.9.11.ebuild 
b/app-office/calligra/calligra-2.9.11.ebuild
index 94a744342b0..20bfc7798e8 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -52,6 +52,7 @@ done
 unset cal_ft
 
 REQUIRED_USE="
+   || ( $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) )
calligra_features_author? ( calligra_features_words )
calligra_features_gemini? ( opengl )
calligra_features_krita? ( eigen exif lcms opengl )

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

2017-03-19 Thread Andreas Sturmlechner

commit: caef77fb64360213433ce6ef590e1dedc8c5b6ed
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 19 13:56:17 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 19 13:56:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caef77fb

app-office/calligra: Drop USE=okular in preparation of kde-apps-16.12.3

Gentoo-bug: 612776

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/calligra-2.9.11-r1.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index efdeb5fdd20..205e39548e7 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -40,8 +40,8 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 fi
 
 IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
-+gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql +okular openexr
-+pdf +pim postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
++gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql openexr +pdf +pim
+postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
 
 # Don't use Active, it's broken on desktops.
 CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage 
words"
@@ -95,7 +95,6 @@ RDEPEND="
x11-libs/libX11
)
mysql? ( virtual/mysql )
-   okular? ( kde-apps/okular:4=[aqua=] )
openexr? ( media-libs/openexr:= )
opengl? (
media-libs/glew:0
@@ -198,7 +197,7 @@ src_configure() {
-DWITH_Kdcraw=$(usex kdcraw)
-DWITH_LCMS2=$(usex lcms)
-DWITH_MySQL=$(usex mysql)
-   -DWITH_Okular=$(usex okular)
+   -DWITH_Okular=OFF
-DWITH_OpenEXR=$(usex openexr)
-DUSEOPENGL=$(usex opengl)
-DWITH_Poppler=$(usex pdf)

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

2017-02-25 Thread Johannes Huber

commit: 33074d531e1385e0e569d6b21f084818837bc848
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Feb 25 22:00:49 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Feb 25 22:05:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33074d53

app-office/calligra: Drop marble use flag

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/calligra-2.9.11-r1.ebuild | 5 ++---
 app-office/calligra/calligra-2.9.11.ebuild| 9 -
 app-office/calligra/metadata.xml  | 1 -
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 9fcd32a7a8..b18093c2d1 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -41,7 +41,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 fi
 
 IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
-+gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql +okular openexr
++gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql +okular openexr
 +pdf +pim postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
 
 # Don't use Active, it's broken on desktops.
@@ -95,7 +95,6 @@ RDEPEND="
media-libs/lcms:2
x11-libs/libX11
)
-   marble? ( $(add_kdeapps_dep marble) )
mysql? ( virtual/mysql )
okular? ( kde-apps/okular:4=[aqua=] )
openexr? ( media-libs/openexr:= )
@@ -177,6 +176,7 @@ src_configure() {
-DPACKAGERS_BUILD=OFF
-DWITH_Soprano=OFF
-DWITH_KActivities=OFF
+   -DWITH_CalligraMarble=OFF
-DWITH_Iconv=ON
-DWITH_OCIO=$(usex color-management)
-DWITH_QCA2=$(usex crypt)
@@ -198,7 +198,6 @@ src_configure() {
-DWITH_OpenJPEG=$(usex jpeg2k)
-DWITH_Kdcraw=$(usex kdcraw)
-DWITH_LCMS2=$(usex lcms)
-   -DWITH_CalligraMarble=$(usex marble)
-DWITH_MySQL=$(usex mysql)
-DWITH_Okular=$(usex okular)
-DWITH_OpenEXR=$(usex openexr)

diff --git a/app-office/calligra/calligra-2.9.11.ebuild 
b/app-office/calligra/calligra-2.9.11.ebuild
index 361b71f6cb..f48bdda5b6 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -41,7 +41,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 fi
 
 IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql
 +okular openexr +pdf +pim postgres spacenav sybase test tiff +threads
 +truetype vc xbase +xml"
 
@@ -97,7 +97,6 @@ RDEPEND="
media-libs/lcms:2
x11-libs/libX11
)
-   marble? ( $(add_kdeapps_dep marble) )
mysql? ( virtual/mysql )
okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
opengl? (
@@ -181,7 +180,8 @@ src_configure() {
"-DCREATIVEONLY=OFF"
"-DPACKAGERS_BUILD=OFF"
"-DWITH_Soprano=OFF"
-   "-DWITH_KActivities=OFF"# deprecated Plasma 4 
activities integration
+   "-DWITH_KActivities=OFF"
+   "-DWITH_CalligraMarble=OFF"
)
 
# regular options
@@ -207,7 +207,6 @@ src_configure() {
$(cmake-utils_use_with jpeg2k OpenJPEG)
$(cmake-utils_use_with kdcraw Kdcraw)
$(cmake-utils_use_with lcms LCMS2)
-   $(cmake-utils_use_with marble CalligraMarble)
$(cmake-utils_use_with mysql MySQL)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with openexr OpenEXR)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 9c760ee454..c3442894b6 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -20,7 +20,6 @@
Enable support for various import 
filter file formats like WordPerfect, Visio and Apple Keynote
Enable support for KDE image manipulating 
interface via kde-apps/libkdcraw
Build colorengine plugins using 
media-libs/lcms
-   Enable displaying of maps using 
Marble
Enable bindings for 
kde-apps/okular
Build stage/eventplugins and videoshape 
plugin using media-libs/phonon
Enable support for KDE PIM resources 
integration

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

2017-01-29 Thread Andreas Sturmlechner

commit: 532423fcf84a3c18df2612bde5921a58fb4a466a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 29 15:15:02 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 29 23:00:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532423fc

app-office/calligra: Drop USE=attica, bump EAPI 6, config w/ PG9.6

Drop USE=attica, obsolete by GHNS default off
Drop unused build options: cstester, pqxx
Add upstream patch to detect PostgreSQL 9.6

Package-Manager: portage-2.3.3

 app-office/calligra/calligra-2.9.11-r1.ebuild  | 130 ++---
 .../files/calligra-2.9.11-postgresql-9.6.patch |  19 +++
 2 files changed, 78 insertions(+), 71 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 795c6aa..9fcd32a 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
 # krita/CMakeLists.txt
 
-EAPI=5
+EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="optional"
@@ -40,10 +40,9 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql
-+okular openexr +pdf +pim postgres spacenav sybase test tiff +threads
-+truetype vc xbase +xml"
+IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
++gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql +okular openexr
++pdf +pim postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
 
 # Don't use Active, it's broken on desktops.
 CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage 
words"
@@ -67,12 +66,11 @@ RDEPEND="
dev-lang/perl
dev-libs/boost
dev-qt/qtcore:4[exceptions]
-   media-libs/libpng:0
+   media-libs/libpng:0=
sys-libs/zlib
virtual/libiconv
-   attica? ( dev-libs/libattica )
color-management? ( media-libs/opencolorio )
-   crypt? ( app-crypt/qca:2[qt4(+)] )
+   crypt? ( app-crypt/qca:2[qt4] )
eigen? ( dev-cpp/eigen:3 )
exif? ( media-gfx/exiv2:= )
fftw? ( sci-libs/fftw:3.0 )
@@ -80,7 +78,7 @@ RDEPEND="
freetds? ( dev-db/freetds )
glib? ( dev-libs/glib:2 )
gsf? ( gnome-extra/libgsf )
-   gsl? ( sci-libs/gsl )
+   gsl? ( sci-libs/gsl:= )
import-filter? (
app-text/libetonyek
app-text/libodfgen
@@ -99,12 +97,12 @@ RDEPEND="
)
marble? ( $(add_kdeapps_dep marble) )
mysql? ( virtual/mysql )
-   okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
+   okular? ( kde-apps/okular:4=[aqua=] )
+   openexr? ( media-libs/openexr:= )
opengl? (
media-libs/glew:0
virtual/glu
)
-   openexr? ( media-libs/openexr )
pdf? (
app-text/poppler:=
media-gfx/pstoedit
@@ -121,7 +119,7 @@ RDEPEND="
vc? ( =dev-db/sqlite-3.8.7:3[extensions(+)]
+   dev-db/sqlite:3[extensions(+)]
dev-libs/icu:=
)
calligra_features_krita? (
@@ -142,7 +140,10 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 # bug 394273
 RESTRICT=test
 
-PATCHES=( "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch
+   "${FILESDIR}"/${P}-postgresql-9.6.patch
+)
 
 pkg_pretend() {
check-reqs_pkg_pretend
@@ -154,10 +155,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+   kde4-base_src_prepare
if ! use webkit; then
sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die
fi
-   kde4-base_src_prepare
 }
 
 src_configure() {
@@ -165,70 +166,57 @@ src_configure() {
 
# applications
for cal_ft in ${CAL_FTS}; do
-   # Switch to ^^ when we switch to EAPI=6.
-   #local prod=${cal_ft^^}
-   local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
-   use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
+   use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
done
 
local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
 
-   # first write out things we want to hard-enable
-   mycmakeargs+=(
-   "-DWITH_Iconv=ON"# available on all supported 
arches and many more
-   )
-
-   # default disablers
-   mycmakeargs+=(
-   "-DCREATIVEONLY=OFF"
-   "-DPACKAGERS_BUILD=OFF"
-   "-DWITH_Soprano=OFF"
-

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

2017-01-07 Thread Andreas Sturmlechner

commit: eab0160da05c97f4a7c663e2fc630d0a00cc513a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  7 10:41:34 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  7 10:59:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab0160d

app-office/calligra: Drop old

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-3.0.0.1-r1.ebuild | 253 -
 .../files/calligra-3.0.0.1-reenable-akonadi.patch  | 113 -
 2 files changed, 366 deletions(-)

diff --git a/app-office/calligra/calligra-3.0.0.1-r1.ebuild 
b/app-office/calligra/calligra-3.0.0.1-r1.ebuild
deleted file mode 100644
index 130d128..
--- a/app-office/calligra/calligra-3.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/;
-[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter jpeg2k +lcms 
okular openexr +pdf
-phonon pim marble spacenav +truetype vc +xml X $(printf 'calligra_features_%s 
' ${CAL_FTS[@]})
-$(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-REQUIRED_USE="calligra_features_sheets? ( eigen )"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-lang/perl
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( $(add_frameworks_dep kactivities) )
-   crypt? ( app-crypt/qca:2[qt5] )
-   eigen? ( dev-cpp/eigen:3 )
-   fontconfig? ( media-libs/fontconfig )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   $(add_frameworks_dep khtml)
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   >=app-text/libwps-0.4
-   dev-libs/librevenge
-   media-libs/libvisio
-   )
-   lcms? (
-   media-libs/ilmbase:=
-   media-libs/lcms:2
-   )
-   marble? ( $(add_kdeapps_dep marble) )
-   openexr? ( media-libs/openexr )
-   pdf? ( app-text/poppler:=[qt5] )
-   phonon? ( media-libs/phonon[qt5] )
-   spacenav? ( dev-libs/libspnav )
-   truetype? ( media-libs/freetype:2 )
-   X? (
-   $(add_qt_dep qtx11extras)
-   x11-libs/libX11
-   )
-   calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
-   calligra_experimental_features_stage? (
-   $(add_qt_dep qtwebkit)
-   okular? ( $(add_kdeapps_dep okular) )
-   )
-   calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
-   calligra_features_plan? (
-   $(add_frameworks_dep khtml)
-   $(add_qt_dep qtcore '' '' '5=')
-   dev-libs/kdiagram:5
-   =dev-libs/kproperty-3.0*:5
-   =dev-libs/kreport-3.0*:5
-   pim? (
-   $(add_kdeapps_dep akonadi)
-

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

2017-01-07 Thread Andreas Sturmlechner

commit: d4b39eab19ea8cc3460431379cded22e735171f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  7 10:40:57 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  7 10:59:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b39eab

app-office/calligra: Drop USE=eigen,marble,xml

Marble is currently not in use due to FEATURE_RDF disabled
Eigen is only used by sheets, so make it conditional on sheets
Drop no-op USE=xml

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-3.0.0.1-r2.ebuild | 249 +
 1 file changed, 249 insertions(+)

diff --git a/app-office/calligra/calligra-3.0.0.1-r2.ebuild 
b/app-office/calligra/calligra-3.0.0.1-r2.ebuild
new file mode 100644
index ..3dd0934
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0.1-r2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional-recursive"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/;
+[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular 
openexr +pdf
+   phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s ' 
${CAL_FTS[@]})
+   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+# 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)
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5] )
+   fontconfig? ( media-libs/fontconfig )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   $(add_frameworks_dep khtml)
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   lcms? (
+   media-libs/ilmbase:=
+   media-libs/lcms:2
+   )
+   openexr? ( media-libs/openexr )
+   pdf? ( app-text/poppler:=[qt5] )
+   phonon? ( media-libs/phonon[qt5] )
+   spacenav? ( dev-libs/libspnav )
+   truetype? ( media-libs/freetype:2 )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+   calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
+   calligra_experimental_features_stage? (
+   $(add_qt_dep qtwebkit)
+   okular? ( $(add_kdeapps_dep okular) )
+   )
+   calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
+   calligra_features_plan? (
+   $(add_frameworks_dep khtml)
+   $(add_qt_dep qtcore '' '' '5=')
+   dev-libs/kdiagram:5
+   =dev-libs/kproperty-3.0*:5
+

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

2017-01-06 Thread Andreas Sturmlechner

commit: 40af205e956491a6115c088a186080f63b84a9d4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan  4 13:27:19 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan  6 22:30:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40af205e

app-office/calligra: Fix DEPENDs, add USE=jpeg2k,phonon

Make USE=lcms do something (enable PLUGIN_COLORENGINES)
Make USE=spacenav do sth (enable PLUGIN_SPACENAVIGATOR)
Revert upstream disabling AkonadiContact
Block calligra-l10n:4
Drop unused libpng dependency
Move boost,threadweaver RDEPEND -> DEPEND
KDE_TEST=forceoptional-recursive to eliminate a truckload of warnings
Disable benchmarks as well, nothing is installed
Patch out bogus references to kdelibs4

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-3.0.0.1-r1.ebuild | 253 +
 .../calligra/files/calligra-3.0.0.1-deps1.patch|  31 +++
 .../calligra/files/calligra-3.0.0.1-deps2.patch|  65 ++
 .../calligra/files/calligra-3.0.0.1-deps3.patch|  31 +++
 .../files/calligra-3.0.0.1-nokdelibs4.patch|  38 
 .../files/calligra-3.0.0.1-reenable-akonadi.patch  | 113 +
 .../files/calligra-3.0.0.1-relax-deps.patch|  34 +++
 app-office/calligra/metadata.xml   |   2 +
 8 files changed, 567 insertions(+)

diff --git a/app-office/calligra/calligra-3.0.0.1-r1.ebuild 
b/app-office/calligra/calligra-3.0.0.1-r1.ebuild
new file mode 100644
index ..130d128
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0.1-r1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional-recursive"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/;
+[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter jpeg2k +lcms 
okular openexr +pdf
+phonon pim marble spacenav +truetype vc +xml X $(printf 'calligra_features_%s 
' ${CAL_FTS[@]})
+$(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+REQUIRED_USE="calligra_features_sheets? ( eigen )"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5] )
+   eigen? ( dev-cpp/eigen:3 )
+   fontconfig? ( media-libs/fontconfig )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   $(add_frameworks_dep khtml)
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   lcms? (
+   media-libs/ilmbase:=
+   media-libs/lcms:2
+   )
+   marble? ( $(add_kdeapps_dep marble) )
+   openexr? ( media-libs/openexr )
+   pdf? ( app-text/poppler:=[qt5] )
+   phonon? ( media-libs/phonon[qt5] )
+   spacenav? (

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

2017-01-06 Thread Andreas Sturmlechner

commit: bc67da033112ad06b72a1eb5019f20e0fe987b89
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan  4 14:27:54 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan  6 22:30:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc67da03

app-office/calligra: Drop old

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-3.0.0.1.ebuild| 235 -
 .../files/calligra-3.0.0-optionaldeps.patch|  20 --
 2 files changed, 255 deletions(-)

diff --git a/app-office/calligra/calligra-3.0.0.1.ebuild 
b/app-office/calligra/calligra-3.0.0.1.ebuild
deleted file mode 100644
index 15bb5b9..
--- a/app-office/calligra/calligra-3.0.0.1.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/;
-[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble 
okular
-   openexr +pdf spacenav +truetype vc +xml X $(printf 
'calligra_features_%s ' ${CAL_FTS[@]})
-   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-REQUIRED_USE="calligra_features_sheets? ( eigen )"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktexteditor)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_frameworks_dep threadweaver)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-lang/perl
-   dev-libs/boost
-   media-libs/libpng:0
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( $(add_frameworks_dep kactivities) )
-   crypt? ( app-crypt/qca:2[qt5] )
-   eigen? ( dev-cpp/eigen:3 )
-   fontconfig? ( media-libs/fontconfig )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   $(add_frameworks_dep khtml)
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   >=app-text/libwps-0.4
-   dev-libs/librevenge
-   media-libs/libvisio
-   )
-   lcms? ( media-libs/lcms:2 )
-   marble? ( $(add_kdeapps_dep marble) )
-   openexr? ( media-libs/openexr )
-   pdf? ( app-text/poppler:=[qt5] )
-   spacenav? ( dev-libs/libspnav )
-   truetype? ( media-libs/freetype:2 )
-   X? (
-   $(add_qt_dep qtx11extras)
-   x11-libs/libX11
-   )
-   calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
-   calligra_experimental_features_stage? (
-   $(add_qt_dep qtwebkit)
-   okular? ( $(add_kdeapps_dep okular) )
-   )
-   calligra_features_plan? (
-   $(add_frameworks_dep khtml)
-   $(add_qt_dep qtcore '' '' '5=')
-   dev-libs/kdiagram:5
-   dev-libs/kproperty:5
-   dev-libs/kreport:5
-   pim? (
-   $(add_kdeapps_dep akonadi)
-   $(add_kdeapps_dep akonadi-contacts)
-   $(add_kdeapps_dep

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

2017-01-04 Thread Andreas Sturmlechner

commit: 8efe316886bfb5d29b0d4e44677a0538b0601487
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  3 23:45:25 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  4 09:50:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efe3168

app-office/calligra: Drop old

Package-Manager: portage-2.3.0

 app-office/calligra/Manifest   |   1 -
 app-office/calligra/calligra-3.0.0-r1.ebuild   | 248 -
 .../calligra/files/calligra-3.0.0-plan-crash.patch | 199 -
 .../files/calligra-3.0.0-words-crash.patch |  75 ---
 4 files changed, 523 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index bf287c4..94b1450 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,2 @@
 DIST calligra-2.9.11.tar.xz 196039892 SHA256 
b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 
69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8
 WHIRLPOOL 
973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
 DIST calligra-3.0.0.1.tar.xz 6072 SHA256 
dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011 SHA512 
826495dfa843f51ecb1139ca8d6d19f6a3fd49e4ca186b4c6a5d1498cdecbfb38461a871153bf8b9944e729725e50918434849acc78c375591636d06ef5d5f6a
 WHIRLPOOL 
085be69fbc32fe54b567e81727aaed7bf613d8c6f2fc9d6eaaac3348e5a4e116278b6da86be953d7d17ea8854dc94021c11c81eb29d8c9a68c517b31457d2242
-DIST calligra-3.0.0.tar.gz 131474815 SHA256 
79490a61e876767cb10c9605f48104c3d8b91f76a607424d14ec4c73c0eff0b2 SHA512 
8bf93e1fd2b6d152c046c36c1386610d6607dd7846fd86a1d33bcf1d6bee9623c71b5eeb676ac272c8d8fc3843ce2681af2ba00e97a47e759b293aa58e73d5ca
 WHIRLPOOL 
3ffdc9c0ddc868c2e6632c47cbd9028c0212b293ec9317627757403873f2d84978d0e5a04675bf1d864f583ad40d0543657721d6b1ac3b4c80f8526f78c47e78

diff --git a/app-office/calligra/calligra-3.0.0-r1.ebuild 
b/app-office/calligra/calligra-3.0.0-r1.ebuild
deleted file mode 100644
index a7247a7..
--- a/app-office/calligra/calligra-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/;
-
-case ${PV} in
-   3.[0123456789].[789]?)
-   # beta or rc releases
-   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
-   3.[0123456789].?)
-   # stable releases
-   SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
-esac
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble 
okular
-   openexr +pdf spacenav +truetype vc +xml X $(printf 
'calligra_features_%s ' ${CAL_FTS[@]})
-   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-REQUIRED_USE="calligra_features_sheets? ( eigen )"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktexteditor)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_frameworks_dep threadweaver)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-

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

2017-01-04 Thread Andreas Sturmlechner

commit: 4fe289f4ffe6df26114f3cd8bd67562f1885b933
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  3 21:24:21 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  4 09:50:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe289f4

app-office/calligra: 3.0.0.1 version bump

Package-Manager: portage-2.3.0

 app-office/calligra/Manifest|   1 +
 app-office/calligra/calligra-3.0.0.1.ebuild | 235 
 2 files changed, 236 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index ddc8d3e..bf287c4 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,3 @@
 DIST calligra-2.9.11.tar.xz 196039892 SHA256 
b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 
69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8
 WHIRLPOOL 
973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
+DIST calligra-3.0.0.1.tar.xz 6072 SHA256 
dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011 SHA512 
826495dfa843f51ecb1139ca8d6d19f6a3fd49e4ca186b4c6a5d1498cdecbfb38461a871153bf8b9944e729725e50918434849acc78c375591636d06ef5d5f6a
 WHIRLPOOL 
085be69fbc32fe54b567e81727aaed7bf613d8c6f2fc9d6eaaac3348e5a4e116278b6da86be953d7d17ea8854dc94021c11c81eb29d8c9a68c517b31457d2242
 DIST calligra-3.0.0.tar.gz 131474815 SHA256 
79490a61e876767cb10c9605f48104c3d8b91f76a607424d14ec4c73c0eff0b2 SHA512 
8bf93e1fd2b6d152c046c36c1386610d6607dd7846fd86a1d33bcf1d6bee9623c71b5eeb676ac272c8d8fc3843ce2681af2ba00e97a47e759b293aa58e73d5ca
 WHIRLPOOL 
3ffdc9c0ddc868c2e6632c47cbd9028c0212b293ec9317627757403873f2d84978d0e5a04675bf1d864f583ad40d0543657721d6b1ac3b4c80f8526f78c47e78

diff --git a/app-office/calligra/calligra-3.0.0.1.ebuild 
b/app-office/calligra/calligra-3.0.0.1.ebuild
new file mode 100644
index ..15bb5b9
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0.1.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/;
+[[ ${KDE_BUILD_TYPE} == release ]] && 
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble 
okular
+   openexr +pdf spacenav +truetype vc +xml X $(printf 
'calligra_features_%s ' ${CAL_FTS[@]})
+   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+REQUIRED_USE="calligra_features_sheets? ( eigen )"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktexteditor)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_frameworks_dep threadweaver)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   dev-libs/boost
+   media-libs/libpng:0
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5] )
+   eigen? ( dev-cpp/eigen:3 )
+   fontconfig? (

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

2016-12-29 Thread Andreas Sturmlechner

commit: 040f3e11669ec6f7154588421cff00c1d6990578
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 29 02:35:38 2016 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 30 00:24:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040f3e11

app-office/calligra: Fix configure, remove file collisions, crash fixes

Gentoo-bug: 603584, 603772

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-3.0.0-r1.ebuild   | 248 +
 .../files/calligra-3.0.0-optionaldeps.patch|  20 ++
 .../calligra/files/calligra-3.0.0-plan-crash.patch | 199 +
 .../files/calligra-3.0.0-words-crash.patch |  75 +++
 4 files changed, 542 insertions(+)

diff --git a/app-office/calligra/calligra-3.0.0-r1.ebuild 
b/app-office/calligra/calligra-3.0.0-r1.ebuild
new file mode 100644
index ..a7247a7
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0-r1.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/;
+
+case ${PV} in
+   3.[0123456789].[789]?)
+   # beta or rc releases
+   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
+   3.[0123456789].?)
+   # stable releases
+   SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
+esac
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble 
okular
+   openexr +pdf spacenav +truetype vc +xml X $(printf 
'calligra_features_%s ' ${CAL_FTS[@]})
+   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+REQUIRED_USE="calligra_features_sheets? ( eigen )"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktexteditor)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_frameworks_dep threadweaver)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   dev-libs/boost
+   media-libs/libpng:0
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5] )
+   eigen? ( dev-cpp/eigen:3 )
+   fontconfig? ( media-libs/fontconfig )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   $(add_frameworks_dep khtml)
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   >=app-text/libwps-0.4
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   lcms? ( media-libs/lcms:2 )
+   marble? ( $(add_kdeapps_dep marble) )
+   openexr? ( media-libs/openexr )
+   pdf? ( app-text/poppler:=[qt5] )
+   spacenav? ( dev-libs/libspnav )
+   truetype? ( media-libs/freetype:2 )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+   calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
+   calligra_experimental_features_stage? (
+   $(add_qt_dep qtwebkit)
+   okular? ( $(add_kdeapps_dep okular) )
+   )
+

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

2016-12-29 Thread Andreas Sturmlechner

commit: bed633c32548357ac0a53135269a9558252b6935
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 29 02:36:40 2016 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 30 00:24:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bed633c3

app-office/calligra: Drop old

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-3.0.0.ebuild | 232 --
 1 file changed, 232 deletions(-)

diff --git a/app-office/calligra/calligra-3.0.0.ebuild 
b/app-office/calligra/calligra-3.0.0.ebuild
deleted file mode 100644
index 9d1016c..
--- a/app-office/calligra/calligra-3.0.0.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/;
-
-case ${PV} in
-   3.[0123456789].[789]?)
-   # beta or rc releases
-   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
-   3.[0123456789].?)
-   # stable releases
-   SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
-esac
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble 
okular
-   openexr +pdf spacenav +truetype vc +xml X $(printf 
'calligra_features_%s ' ${CAL_FTS[@]})
-   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-REQUIRED_USE="calligra_features_sheets? ( eigen )"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kemoticons)
-   $(add_frameworks_dep kglobalaccel)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktexteditor)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_frameworks_dep threadweaver)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-lang/perl
-   dev-libs/boost
-   media-libs/libpng:0
-   sys-libs/zlib
-   virtual/libiconv
-   activities? ( $(add_frameworks_dep kactivities) )
-   crypt? ( app-crypt/qca:2[qt5] )
-   eigen? ( dev-cpp/eigen:3 )
-   fontconfig? ( media-libs/fontconfig )
-   gsl? ( sci-libs/gsl )
-   import-filter? (
-   $(add_frameworks_dep khtml)
-   app-text/libetonyek
-   app-text/libodfgen
-   app-text/libwpd:*
-   app-text/libwpg:*
-   >=app-text/libwps-0.4
-   dev-libs/librevenge
-   media-libs/libvisio
-   )
-   lcms? ( media-libs/lcms:2 )
-   marble? ( $(add_kdeapps_dep marble) )
-   openexr? ( media-libs/openexr )
-   pdf? ( app-text/poppler:=[qt5] )
-   spacenav? ( dev-libs/libspnav )
-   truetype? ( media-libs/freetype:2 )
-   X? (
-   $(add_qt_dep qtx11extras)
-   x11-libs/libX11
-   )
-   calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
-   calligra_experimental_features_stage? (
-   $(add_qt_dep qtwebkit)
-   okular? ( $(add_kdeapps_dep okular) )
-   )
-   calligra_features_plan? (
-   $(add_qt_dep qtcore '' '' '5=')
-   dev-libs/kdiagram:5
-   dev-libs/kproperty:5
-   dev-libs/kreport:5
-   pim? (
-   $(add_kdeapps_dep akonadi)
-

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

2016-12-23 Thread Johannes Huber

commit: c4f7e87f3823e24991136f7570359fb99b4c9adb
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Dec 23 08:47:31 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Dec 23 08:47:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f7e87f

app-office/calligra: Version bump 3.0.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/Manifest   |   1 +
 app-office/calligra/calligra-3.0.0.ebuild  | 232 +
 .../files/calligra-3.0.0-no-arch-detection.patch   |  17 ++
 app-office/calligra/metadata.xml   |   1 +
 4 files changed, 251 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 22a983d..ddc8d3e 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,2 @@
 DIST calligra-2.9.11.tar.xz 196039892 SHA256 
b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 
69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8
 WHIRLPOOL 
973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
+DIST calligra-3.0.0.tar.gz 131474815 SHA256 
79490a61e876767cb10c9605f48104c3d8b91f76a607424d14ec4c73c0eff0b2 SHA512 
8bf93e1fd2b6d152c046c36c1386610d6607dd7846fd86a1d33bcf1d6bee9623c71b5eeb676ac272c8d8fc3843ce2681af2ba00e97a47e759b293aa58e73d5ca
 WHIRLPOOL 
3ffdc9c0ddc868c2e6632c47cbd9028c0212b293ec9317627757403873f2d84978d0e5a04675bf1d864f583ad40d0543657721d6b1ac3b4c80f8526f78c47e78

diff --git a/app-office/calligra/calligra-3.0.0.ebuild 
b/app-office/calligra/calligra-3.0.0.ebuild
new file mode 100644
index ..9d1016c
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/;
+
+case ${PV} in
+   3.[0123456789].[789]?)
+   # beta or rc releases
+   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
+   3.[0123456789].?)
+   # stable releases
+   SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
+esac
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble 
okular
+   openexr +pdf spacenav +truetype vc +xml X $(printf 
'calligra_features_%s ' ${CAL_FTS[@]})
+   $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+REQUIRED_USE="calligra_features_sheets? ( eigen )"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kemoticons)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kross)
+   $(add_frameworks_dep ktexteditor)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep sonnet)
+   $(add_frameworks_dep threadweaver)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-lang/perl
+   dev-libs/boost
+   media-libs/libpng:0
+   sys-libs/zlib
+   virtual/libiconv
+   activities? ( $(add_frameworks_dep kactivities) )
+   crypt? ( app-crypt/qca:2[qt5] )
+   eigen? ( dev-cpp/eigen:3 )
+   fontconfig? ( media-libs/fontconfig )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+

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

2016-12-08 Thread Johannes Huber

commit: 078b02c3a09367d6292dd0a1251c5d8ac89a8ee4
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Wed Dec  7 17:53:32 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Dec  8 14:10:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=078b02c3

app-office/calligra: add SLOT to media-libs/glew dependency

This fixes a repoman warning.

Signed-off-by: Johannes Huber  gentoo.org>

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

diff --git a/app-office/calligra/calligra-2.9.11.ebuild 
b/app-office/calligra/calligra-2.9.11.ebuild
index f0deaf9..361b71f 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -101,7 +101,7 @@ RDEPEND="
mysql? ( virtual/mysql )
okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
opengl? (
-   media-libs/glew
+   media-libs/glew:0
virtual/glu
)
openexr? ( media-libs/openexr )

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

2016-12-08 Thread Johannes Huber

commit: 3fb992b4a31755f1c289dbf1f1f25dfbd8557303
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Wed Dec  7 18:52:21 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Dec  8 14:10:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb992b4

app-office/calligra: Fix bug 584118

Prevent calligra from adding CPU flags automatically.

Reported-by: Alec Ari
Gentoo-bug: 584118
Closes: https://github.com/gentoo/gentoo/pull/3050

Package-Manager: portage-2.3.3
Signed-off-by: Guilherme Amadio  gentoo.org>
Signed-off-by: Johannes Huber  gentoo.org>

 app-office/calligra/calligra-2.9.11-r1.ebuild  | 234 +
 .../files/calligra-2.9.1-no-arch-detection.patch   |  14 ++
 2 files changed, 248 insertions(+)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
new file mode 100644
index ..795c6aa
--- /dev/null
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="optional"
+inherit check-reqs kde4-base versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/;
+
+case ${PV} in
+   2.[456789].[789]?)
+   # beta or rc releases
+   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
+   2.[456789].?|2.[456789].??)
+   # stable releases
+   SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+   2.[456789].)
+   # stable branch live ebuild
+   SRC_URI="" ;;
+   )
+   # master branch live ebuild
+   SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+   KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql
++okular openexr +pdf +pim postgres spacenav sybase test tiff +threads
++truetype vc xbase +xml"
+
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage 
words"
+for cal_ft in ${CAL_FTS}; do
+   IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+   calligra_features_author? ( calligra_features_words )
+   calligra_features_gemini? ( opengl )
+   calligra_features_krita? ( eigen exif lcms opengl )
+   calligra_features_plan? ( pim )
+   calligra_features_sheets? ( eigen )
+   calligra_features_stage? ( webkit )
+   vc? ( calligra_features_krita )
+   test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+   dev-lang/perl
+   dev-libs/boost
+   dev-qt/qtcore:4[exceptions]
+   media-libs/libpng:0
+   sys-libs/zlib
+   virtual/libiconv
+   attica? ( dev-libs/libattica )
+   color-management? ( media-libs/opencolorio )
+   crypt? ( app-crypt/qca:2[qt4(+)] )
+   eigen? ( dev-cpp/eigen:3 )
+   exif? ( media-gfx/exiv2:= )
+   fftw? ( sci-libs/fftw:3.0 )
+   fontconfig? ( media-libs/fontconfig )
+   freetds? ( dev-db/freetds )
+   glib? ( dev-libs/glib:2 )
+   gsf? ( gnome-extra/libgsf )
+   gsl? ( sci-libs/gsl )
+   import-filter? (
+   app-text/libetonyek
+   app-text/libodfgen
+   app-text/libwpd:*
+   app-text/libwpg:*
+   app-text/libwps
+   dev-libs/librevenge
+   media-libs/libvisio
+   )
+   jpeg? ( virtual/jpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   kdcraw? ( $(add_kdeapps_dep libkdcraw) )
+   lcms? (
+   media-libs/lcms:2
+   x11-libs/libX11
+   )
+   marble? ( $(add_kdeapps_dep marble) )
+   mysql? ( virtual/mysql )
+   okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
+   opengl? (
+   media-libs/glew:0
+   virtual/glu
+   )
+   openexr? ( media-libs/openexr )
+   pdf? (
+   app-text/poppler:=
+   media-gfx/pstoedit
+   )
+   pim? ( $(add_kdeapps_dep kdepimlibs) )
+   postgres? (
+   dev-db/postgresql:*
+   dev-libs/libpqxx
+   )
+   spacenav? ( dev-libs/libspnav )
+   sybase? ( dev-db/freetds )
+   tiff? ( media-libs/tiff:0 )
+   truetype? ( media-libs/freetype:2 )
+   vc? ( =dev-db/sqlite-3.8.7:3[extensions(+)]
+   dev-libs/icu:=
+   )
+   calligra_features_krita? (
+   dev-qt/qtdeclarative:4
+   net-misc/curl
+

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

2016-11-02 Thread Johannes Huber

commit: a672d48a300733363cab7121d088ad9fc5744ea2
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Nov  2 18:38:34 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Nov  2 18:38:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a672d48a

app-office/calligra: Drop deprecated Plasma 4 support

Package-Manager: portage-2.3.2

 app-office/calligra/calligra-2.9.11.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11.ebuild 
b/app-office/calligra/calligra-2.9.11.ebuild
index 89311ab..da995b5 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -41,7 +41,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 fi
 
 IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +kdepim +lcms
 marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
 +truetype vc xbase +xml"
 
@@ -93,7 +93,6 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
kdcraw? ( $(add_kdeapps_dep libkdcraw) )
-   kde? ( $(add_kdebase_dep kactivities) )
kdepim? ( $(add_kdeapps_dep kdepimlibs) )
lcms? (
media-libs/lcms:2
@@ -182,6 +181,7 @@ src_configure() {
"-DCREATIVEONLY=OFF"
"-DPACKAGERS_BUILD=OFF"
"-DWITH_Soprano=OFF"
+   "-DWITH_KActivities=OFF"# deprecated Plasma 4 
activities integration
)
 
# regular options
@@ -206,7 +206,6 @@ src_configure() {
$(cmake-utils_use_with jpeg JPEG)
$(cmake-utils_use_with jpeg2k OpenJPEG)
$(cmake-utils_use_with kdcraw Kdcraw)
-   $(cmake-utils_use_with kde KActivities)
$(cmake-utils_use_with kdepim KdepimLibs)
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble CalligraMarble)

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

2016-09-25 Thread Michael Palimaka

commit: 6643fcde974dbbba16ee34ebaaeff64b24e8b7eb
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Sep 24 23:06:03 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Sep 25 17:44:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6643fcde

app-office/calligra-l10n: Add CALLIGRA_FEATURES, EAPI 6

This enables e.g. krita to block calligra-l10n[calligra_features_krita]
for avoiding file collisions. Mostly copied from existing *-l10n ebuilds.

Gentoo-bug: 594772

Package-Manager: portage-2.3.0

 .../calligra-l10n/calligra-l10n-2.9.11-r1.ebuild   | 107 +
 1 file changed, 107 insertions(+)

diff --git a/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild 
b/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild
new file mode 100644
index ..5a17708
--- /dev/null
+++ b/app-office/calligra-l10n/calligra-l10n-2.9.11-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde4-base
+
+DESCRIPTION="Calligra localization package"
+HOMEPAGE="https://www.kde.org/;
+LICENSE="GPL-2"
+SLOT="4"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc"
+
+DEPEND="sys-devel/gettext"
+RDEPEND="!app-office/koffice-l10n"
+
+CAL_FTS="braindump flow karbon kexi krita plan sheets stage words"
+for cal_ft in ${CAL_FTS}; do
+   IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+MY_LANGS="bs ca ca@valencia cs da de el en_GB es et fi fr gl hu it ja kk nb nl
+pl pt pt_BR ru sk sv tr uk zh_CN zh_TW"
+
+case ${PV} in
+   2.[456789].[789]?)
+   # beta or rc releases
+   URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}" ;;
+   2.[456789].?|2.[456789].??)
+   # stable releases
+   URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}" ;;
+   *)
+   SRC_URI="" ;;
+esac
+
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+   IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}"
+   SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( 
${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
+done
+unset MY_LANG
+
+S="${WORKDIR}"
+
+pkg_setup() {
+   if [[ -z ${A} ]]; then
+   elog
+   elog "None of the requested L10N are supported by ${P}."
+   elog
+   elog "${P} supports these language codes:"
+   elog "${MY_LANGS//[@_]/-}"
+   elog
+   fi
+}
+
+src_unpack() {
+   [[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+   cat <<-EOF > CMakeLists.txt || die
+project(${PN})
+$(printf "add_subdirectory( %s )\n" \
+   `find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`)
+EOF
+
+   local cal_ft
+   for cal_ft in ${CAL_FTS}; do
+   if ! use calligra_features_${cal_ft} ; then
+   if ls -U ./*/messages/calligra/${cal_ft}*po > /dev/null 
2>&1; then
+   rm ./*/messages/calligra/${cal_ft}*po || \
+   die "Failed to remove ${cal_ft} 
messages"
+   fi
+   if ls -U ./*/docs/calligra/${cal_ft} > /dev/null 2>&1; 
then
+   sed -e "\:add_subdirectory(\s*${cal_ft}\s*): 
s:^:#:" \
+   -i ./*/docs/calligra/CMakeLists.txt || \
+   die "Failed to comment out ${cal_ft} 
docs"
+   fi
+   fi
+   done
+
+   kde4-base_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_DATA=ON
+   -DBUILD_DOC=$(usex doc)
+   -DBUILD_MESSAGES=ON
+   )
+   [[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+   [[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() { :; }
+
+src_install() {
+   [[ -n ${A} ]] && kde4-base_src_install
+}

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

2016-08-20 Thread Michael Palimaka

commit: fc0dc4854cc4f610009d513bf66a706730d779d6
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Aug 13 09:46:09 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Aug 20 18:28:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0dc485

app-office/calligra: Add WEBKIT_REQUIRED=optional

USE=-webkit disables:
- Kexi web form widget
- Web element for Calligra Reports
- Braindump webshape plugin

Package-Manager: portage-2.2.28

 app-office/calligra/calligra-2.9.11.ebuild | 9 +
 1 file changed, 9 insertions(+)

diff --git a/app-office/calligra/calligra-2.9.11.ebuild 
b/app-office/calligra/calligra-2.9.11.ebuild
index 27e0844..89311ab 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -12,6 +12,7 @@ CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="optional"
 KDE_LINGUAS_LIVE_OVERRIDE="true"
 OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="optional"
 inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
@@ -57,6 +58,7 @@ REQUIRED_USE="
calligra_features_krita? ( eigen exif lcms opengl )
calligra_features_plan? ( kdepim )
calligra_features_sheets? ( eigen )
+   calligra_features_stage? ( webkit )
vc? ( calligra_features_krita )
test? ( calligra_features_karbon )
 "
@@ -150,6 +152,13 @@ pkg_setup() {
check-reqs_pkg_setup
 }
 
+src_prepare() {
+   if ! use webkit; then
+   sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die
+   fi
+   kde4-base_src_prepare
+}
+
 src_configure() {
local cal_ft myproducts

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

2016-07-03 Thread Andreas Hüttel

commit: d07b8dd933bff7da2751c7b81b4ba5444545df5e
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Jul  3 19:36:40 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Jul  3 19:36:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d07b8dd9

app-office/calligra: Specify okular slot operator by writing the dependency 
manually, bug 577216

Package-Manager: portage-2.3.0

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

diff --git a/app-office/calligra/calligra-2.9.11.ebuild 
b/app-office/calligra/calligra-2.9.11.ebuild
index a60a989..27e0844 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -99,7 +99,7 @@ RDEPEND="
)
marble? ( $(add_kdeapps_dep marble) )
mysql? ( virtual/mysql )
-   okular? ( $(add_kdeapps_dep okular) )
+   okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
opengl? (
media-libs/glew
virtual/glu

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

2016-07-03 Thread Michał Górny

commit: e1d85c805e877677dcde6a7a819f150c3d5d7c2a
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul  2 12:55:56 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul  3 16:08:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d85c80

app-office/calligra-l10n: Migrate to L10N

 app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild 
b/app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild
index 7c3cb84..582a141 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild
@@ -34,8 +34,8 @@ SRC_URI=""
 SLOT="4"
 
 for MY_LANG in ${MY_LANGS} ; do
-   IUSE="${IUSE} linguas_${MY_LANG}"
-   SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( 
${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
+   IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}"
+   SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( 
${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
 done
 unset MY_LANG
 
@@ -45,19 +45,17 @@ src_unpack() {
local lng dir
if [[ -z ${A} ]]; then
elog
-   elog "You either have the LINGUAS variable unset, or it only"
-   elog "contains languages not supported by ${P}."
-   elog "You won't have any additional language support."
+   elog "None of the requested L10N are supported by ${P}."
elog
elog "${P} supports these language codes:"
-   elog "${MY_LANGS}"
+   elog "${MY_LANGS//[@_]/-}"
elog
fi
 
[[ -n ${A} ]] && unpack ${A}
cd "${S}"
 
-   # add all linguas to cmake
+   # add all L10N to cmake
if [[ -n ${A} ]]; then
for lng in ${MY_LANGS}; do
dir="${PN}-${lng}-${PV}"

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

2016-06-16 Thread Michael Palimaka

commit: a5d346f1dfbc56991e9c88ff073d35657ce67da1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun 16 18:09:46 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun 16 18:09:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d346f1

app-office/calligra-l10n: remove old

Package-Manager: portage-2.3.0_rc1

 app-office/calligra-l10n/Manifest  | 30 
 .../calligra-l10n/calligra-l10n-2.8.5.ebuild   | 89 --
 2 files changed, 119 deletions(-)

diff --git a/app-office/calligra-l10n/Manifest 
b/app-office/calligra-l10n/Manifest
index 2080ebb..6c221a7 100644
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@@ -1,59 +1,29 @@
-DIST calligra-l10n-bs-2.8.5.tar.xz 369028 SHA256 
232eaae993c88f712cc2e38ac90aea66d478b0e981bbc4fcecde508efe9b17ac SHA512 
7524d3d54af09107dae20bd167b26dad3c51990bef98fc0d30627ce3c36dc5162bf8dd286e473c56674f7c894fba310aaf67ec1f048091d06349ff9906c1b5ac
 WHIRLPOOL 
42d5be5b9f8575afd9012991a8ec9d375769861fcda1fed1563764ecda1b6755fc308deb225791a5469c344ef1ba09159291b8d98342f3049c18a1dc8b02c1cd
 DIST calligra-l10n-bs-2.9.11.tar.xz 418212 SHA256 
fb3ba145a6d5e34e87851af303f3cfb9c0a4e089ef8ee3e233fabc6477519d1b SHA512 
2e0b0f649bfc4c8c9944fad466f7c44b25a0d35de8f38f54e99eb3545dd850a2a50b1e636c99f7991289835d2d95aae2f6eef7e22317428ed099cfbc3a24abd0
 WHIRLPOOL 
4a03175ea779d4738408023f5947096eeaca8879e76459dcc2c22be896dd2db0c5b3d5f8664a5409316773795a31299b071c84e2025741ea85bd4a1c0ca53b29
-DIST calligra-l10n-ca-2.8.5.tar.xz 525332 SHA256 
fbd16eaf2d9ac3ded7550cee2ec06f2b5d47c80d49638ce0c8c625c5ef2969d7 SHA512 
f665125e023397130d7b4e602c75c268469ffac570734b9902895c23b6d5c6982d2b243541bcb27d4a508d9a10368f39949de434604575f2cab436b7e5aa9110
 WHIRLPOOL 
9bd93979c450c08f4fd1d36a0d87d575608ffac4455183eb789d39331de02685043fa43656588d54023ee42d3cea9bacba1c33c13de63ab90fdf39dc9efeaaac
 DIST calligra-l10n-ca-2.9.11.tar.xz 584848 SHA256 
5cd0a5be64fb23697fa5a0a5bc55723e3d3be24faab0e1d0604540052cd88d49 SHA512 
52432e9ff2d49759ad65513f3c86d2dfd23a8fb2bbb0d913aad695c0700d3d3cf3fecb6fca377edfa92793594fa9a5e070640c3cf2063d3742e5174decce633d
 WHIRLPOOL 
abfaf9c7844f89730ef618c74f034762cc4697ee2de28ce287ac7f5e8ef819433eb8b4341bb1f95147f61bf678393c99ec27a6aadd3c83f27726864f27eeeaa1
-DIST calligra-l10n...@valencia-2.8.5.tar.xz 358816 SHA256 
ed46537d00103138c47802e3246e0ca9d63cb85f59314746c9f4083e4bed305d SHA512 
67b7681b5de230ca23c5dfeed55c4b6999cff396cad1dc7eef43970638ab5cd529881846d6c98dcc12249e2a3bc5c4c1420ae7c616ee301f0ba9613cac910829
 WHIRLPOOL 
3c93f9e53d9cdc33762f4e86cd28706bdfdddbec6145f1686207ba8570d518388dee3285bc060f325ad631298a730e7c94555848f9373ca7339ca3198fe77b85
 DIST calligra-l10n...@valencia-2.9.11.tar.xz 393336 SHA256 
9b7b4198052216a08aaee9f78e0db356fae6b5cd3d84b3b626a932e02fcd62c9 SHA512 
9a2773c4ddad4884251682c65c3122c9f34ea4e31a09b296b40f4f348e9efdca582561fc3506a51f164e4af330ddac4320eac5d860837ff89da63cf73a7736ea
 WHIRLPOOL 
8e1ce50c5baa2c076a3e400bf007be086ca6c9ced4d0dc1cc12fc753aca2def4f36a371b7cf4efb43dc8e16fbe74a3231bf8cf8ba32e3f43ea3a81e8aa21f59f
-DIST calligra-l10n-cs-2.8.5.tar.xz 305084 SHA256 
f2fcaa7bbbe45137dac5d9a4e894390c2df7a826c7a55540ef1b55c5e9a63af7 SHA512 
a76d57f7f37fc52126887d19ce8a59e6c9b216fb8fde8c27b9947bfd6e15c2e2140317b8814138bfcc172fbf93a4dade1e3870768dceafbae0a1418159c229ac
 WHIRLPOOL 
cdf680b7177a7106165f50c2956ef4d8a853facd35b52208dda683378b2e50a40c35ecb2592eccceb93b44e4c0853871c29e68d2df8e37c9caea777e6834a73b
 DIST calligra-l10n-cs-2.9.11.tar.xz 334448 SHA256 
d0ac81daa3a083c78af8c5acf5745f67543133f669aa83709ab270a8b6a3fa39 SHA512 
a0693271c6a1b24512cb413fe197cbbc1abb61e7142e1da7ab3dd5bb3292cc1e1422f1e9752d6bd9b6c143d3cb1d458be55700fdf03549bfb6f94f606e33ee8f
 WHIRLPOOL 
549f71c713e2ebba3bfb8ee349eeea787eec6126166719b0df5851d2d349d560281afe4632615c54398ab44fcb445848e49f040536710ba5e7bfcadec693f453
-DIST calligra-l10n-da-2.8.5.tar.xz 419384 SHA256 
21eb6ab0d720aa448b609d180536006818febbe571cd779972fa728421da83c6 SHA512 
a0cbac8e7909759a8355a604452440b3981950f509f16d9280ff72693173cafa2de8164223dcf7684d3af0674f5e83d284ebf4dffa66a7fe2e29a495da4c8e6e
 WHIRLPOOL 
7518e31172dd2e1b740ef3ec40d3b053f258d7e86f216dce970f89f699047720dc09a869289b43b3e993a1902e2454f64b7c007e0734f790de91d08f37cb2296
 DIST calligra-l10n-da-2.9.11.tar.xz 464780 SHA256 
033ea6d93368e55c2cca28ce720139b256124ee603c2f55b0cdef8a0af684d09 SHA512 
4dccd4786bf528ec9bf34539d34a3d0bb5dc47ba67805b99f43e08e940b37e9217484bed23eadb0e8f22e77847a470e3c09af33ef1a73133d0ff9d5fa3969776
 WHIRLPOOL 
dbce5b3ada77e0ee8a072370ee44898266b8ffe7b1ccd21cd5b2a7db8f5ac2e599d523e4b72ffc84ae1f8f5456d2baf3097173f7646fbea249d8eda0325def3d
-DIST calligra-l10n-de-2.8.5.tar.xz 673632 SHA256 
236a22ff8aad700740dbdb23ea02957c487a32bdb718c8c351fd0782d9df3b51 SHA512 
2f3841ec3b49c0665591f7b0b7731c4c19135bb342c4ef5144c6ba6e9db091b1a0c92420fa2d292ed0e32f023da858b10114faf6a7c73edab6d79491fb9d4f5c
 WHIRLPOOL

1 2 >

1 - 100 of 120 matches

Mail list logo