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

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

[Andreas Sturmlechner]

commit:     7e767b7fc149dd1e929ee656262816848f261a0a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  5 18:00:57 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  5 18:00:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e767b7f

app-office/calligra: Drop bogus poppler-qt5-relaxation

Package-Manager: Portage-2.3.28, Repoman-2.3.9

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 18ae6f103b..03f3dac6e8 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     03328f6fed56b799c6942a077c1afe7b32f1d421
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 18:49:37 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 18:50:44 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=03328f6f

app-office/calligra: Drop IUSE crypt and fix dependency

OpenSSL was added as required dependency when package was ported away
(until then optional) QCA in commit adee19863d5b5a65a1ae8cccdb2d526d2a989e37

Bug: https://bugs.gentoo.org/939722
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index f27d1244b2..1455b0a69e 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -25,7 +25,7 @@ CAL_FTS=( karbon sheets stage words )
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+charts +crypt +fontconfig gsl +import-filter +lcms okular +pdf phonon
+IUSE="+charts +fontconfig gsl +import-filter +lcms okular +pdf phonon
 	+truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
 
 RESTRICT="test"
@@ -34,6 +34,7 @@ RESTRICT="test"
 # Required for the matlab/octave formula tool
 COMMON_DEPEND="
 	dev-lang/perl
+	dev-libs/openssl:=
 	>=dev-libs/qtkeychain-0.14.2:=[qt6(-)]
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
@@ -64,7 +65,6 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	charts? ( dev-libs/kdiagram:6 )
-	crypt? ( dev-libs/openssl:= )
 	fontconfig? ( media-libs/fontconfig )
 	gsl? ( sci-libs/gsl:= )
 	import-filter? (
@@ -129,7 +129,6 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
 		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake_use_find_package charts KChart6)
-		$(cmake_use_find_package crypt OpenSSL)
 		-DWITH_Fontconfig=$(usex fontconfig)
 		-DWITH_GSL=$(usex gsl)
 		-DWITH_LibEtonyek=$(usex import-filter)

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

[Andreas Sturmlechner]

commit:     9752b36d684e8d2328c78d4346318e4c3ce6e46e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  9 18:03:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  9 18:13:14 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9752b36d

app-office/calligra: Update dependencies, drop IUSE gemini, spacenav

Upstream commits:
d2dd8c3ee5f8ae1acf7f4ca508b9fb7ea74c75ed
722d7a7f5350cc4f07ffbd34c612ab34f1085444
53417334f9b6dcd4b40abbe6d82edb414684e1cf
d67f7a7ec613268e3022830eccce8ee1609e327c
b0c80f2e1f926d51c72bfe38ab3f703c2f4ab262
3f6b4aaae281005fe0208da7f5a5f0c8e34e44df
9fdd45d60459c01d9a247a884dbf96e214588a47
28ea6598fff6be8dcc4b3e5935d675d057614a02
50d3283f563296af3e6ed5d7589c1a95f15be386
a3f58e92ac9da582fcbda989be4e11dd41d6b845
39f529b98affaabdb1de54b187c96cc03162db96

Bug: https://bugs.gentoo.org/939296
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 28 ++++++++++++----------------
 app-office/calligra/metadata.xml         |  2 --
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 599bc227ca..f27d1244b2 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -25,9 +25,8 @@ CAL_FTS=( karbon sheets stage words )
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+charts +crypt +fontconfig gemini gsl +import-filter +lcms
-	okular +pdf phonon spacenav +truetype webengine X
-	$(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+IUSE="+charts +crypt +fontconfig gsl +import-filter +lcms okular +pdf phonon
+	+truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
 
 RESTRICT="test"
 
@@ -35,9 +34,9 @@ RESTRICT="test"
 # Required for the matlab/octave formula tool
 COMMON_DEPEND="
 	dev-lang/perl
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(-)]
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=dev-qt/qttools-${QTMIN}:6[designer]
 	>=kde-frameworks/karchive-${KFMIN}:6
@@ -52,11 +51,11 @@ COMMON_DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kiconthemes-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
 	>=kde-frameworks/kitemviews-${KFMIN}:6
 	>=kde-frameworks/kjobwidgets-${KFMIN}:6
 	>=kde-frameworks/knotifications-${KFMIN}:6
 	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
@@ -67,7 +66,6 @@ COMMON_DEPEND="
 	charts? ( dev-libs/kdiagram:6 )
 	crypt? ( dev-libs/openssl:= )
 	fontconfig? ( media-libs/fontconfig )
-	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] )
 	gsl? ( sci-libs/gsl:= )
 	import-filter? (
 		app-text/libetonyek
@@ -81,8 +79,7 @@ COMMON_DEPEND="
 	lcms? ( media-libs/lcms:2 )
 	okular? ( kde-apps/okular:6 )
 	pdf? ( app-text/poppler:=[qt6] )
-	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
-	spacenav? ( dev-libs/libspnav )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(-)] )
 	truetype? ( media-libs/freetype:2 )
 	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
 	calligra_features_sheets? ( dev-cpp/eigen:3 )
@@ -96,9 +93,11 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!${CATEGORY}/${PN}:5
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	gemini? ( >=kde-frameworks/kirigami-${KFMIN}:6 )
 "
-BDEPEND="sys-devel/gettext"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
 PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream
 
@@ -121,7 +120,6 @@ src_configure() {
 
 	use lcms && myproducts+=( PLUGIN_COLORENGINES )
 	use okular && myproducts+=( OKULAR )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
 
 	local mycmakeargs=(
 		-DPACKAGERS_BUILD=OFF
@@ -129,12 +127,10 @@ src_configure() {
 		-DWITH_Iconv=ON
 		-DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace
 		-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF6CalendarCore=ON
 		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake_use_find_package charts KChartQt6)
+		$(cmake_use_find_package charts KChart6)
 		$(cmake_use_find_package crypt OpenSSL)
 		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake_use_find_package gemini LibGit2)
 		-DWITH_GSL=$(usex gsl)
 		-DWITH_LibEtonyek=$(usex import-filter)
 		-DWITH_LibOdfGen=$(usex import-filter)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index d1459fc538..09de55c3d0 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -15,12 +15,10 @@
 	</upstream>
 	<use>
 		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>
-		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
-		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 		<flag name="webengine">Enable Braindump support using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     b403ddde99b7f21796f99242f6c8d615de6c56c2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  9 18:34:05 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  9 18:34:05 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b403ddde

app-office/calligra: add kde-invent upstream metadata

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 09de55c3d0..e6dded498c 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -12,6 +12,7 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="cpe">cpe:/a:calligra:calligra</remote-id>
+		<remote-id type="kde-invent">office/calligra</remote-id>
 	</upstream>
 	<use>
 		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>

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

[Andreas Sturmlechner]

commit:     2d667ee0106e81d5dceabb15bde4e1ec4fd39330
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  9 17:57:37 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 06:20:09 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d667ee0

app-office/calligra: Add IUSE webengine, drop obsolete src_prepare()

Upstream commits:
e876a0402c3f50e9c35cb9ec217bf46273a50c6b
8f124e62623820882fc0dbbcaa3547c06c74eda5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 12 +++---------
 app-office/calligra/metadata.xml         |  1 +
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index e07d50bb97..599bc227ca 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -26,7 +26,7 @@ CAL_FTS=( karbon sheets stage words )
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+charts +crypt +fontconfig gemini gsl +import-filter +lcms
-	okular +pdf phonon spacenav +truetype X
+	okular +pdf phonon spacenav +truetype webengine X
 	$(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
 
 RESTRICT="test"
@@ -84,6 +84,7 @@ COMMON_DEPEND="
 	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
 	calligra_features_sheets? ( dev-cpp/eigen:3 )
 	calligra_features_words? ( dev-libs/libxslt )
 "
@@ -110,14 +111,6 @@ pkg_setup() {
 	check-reqs_pkg_setup
 }
 
-src_prepare() {
-	ecm_src_prepare
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	ecm_punt_qt_module Declarative
-	ecm_punt_qt_module OpenGL
-}
-
 src_configure() {
 	local cal_ft myproducts
 
@@ -157,6 +150,7 @@ src_configure() {
 		-DWITH_Eigen3=$(usex calligra_features_sheets)
 		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
 		-DWITH_Freetype=$(usex truetype)
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
 	)
 
 	ecm_src_configure

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index c18f607fe5..d1459fc538 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -21,5 +21,6 @@
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
+		<flag name="webengine">Enable Braindump support using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     a574d2919567f740ab812f76084da154afad39ab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 20:54:18 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 09:54:02 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a574d291

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

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index dd528c1291..89491111f0 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -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] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     f4510895488f9fe20670156d6716c036498d3307
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 18:10:50 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 18:10:50 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4510895

app-office/calligra: Patch upstreamed

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index b36dd7f1d2..30ef35e215 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -116,10 +116,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 BDEPEND="sys-devel/gettext"
 
-PATCHES=(
-	"${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch # downstream
-	"${WORKDIR}"/${PATCHSET}/${PN}-3.2.1-kross-optional.patch # bug 903532
-)
+PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream
 
 pkg_pretend() {
 	check-reqs_pkg_pretend

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

[Andreas Sturmlechner]

commit:     c4fcee0335b73084c2625d46bc75171bf4fff6b0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 19:07:58 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 19:10:02 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c4fcee03

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

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 30ef35e215..0612c3b29d 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -41,7 +41,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] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     be96190da8c7b0d2400019d1a5bb3cb7b0c2ab92
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 14:47:18 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 15:17:12 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=be96190d

app-office/calligra: Add app-crypt/qca[qt5(+)] USEdep

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 547f961a15..ab09d26962 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -73,7 +73,7 @@ COMMON_DEPEND="
 	virtual/libiconv
 	activities? ( >=kde-frameworks/kactivities-${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:= )

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

[Andreas Sturmlechner]

commit:     007a25ba681f875e458ae4d6860283c227c7bb4e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 09:00:50 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 09:01:57 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=007a25ba

app-office/calligra: add cpe upstream metadata

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 18a225de54..b581a8d539 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="cpe">cpe:/a:calligra:calligra</remote-id>
 	</upstream>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>

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

[Andreas Sturmlechner]

commit:     c1e15e649bfc58bf637d827ec8121f64fa0e594f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 23:09:50 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 13:24:30 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c1e15e64

app-office/calligra: Drop IUSE openexr, unused cmake var

Fully switch to dev-libs/imath
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 <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 8e33f6a836..aea9b71186 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CHECKREQS_DISK_BUILD="4G"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit check-reqs ecm kde.org
 
@@ -23,16 +23,13 @@ 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
+	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
-BDEPEND="
-	sys-devel/gettext
-"
 COMMON_DEPEND="
 	dev-lang/perl
 	>=dev-qt/designer-${QTMIN}:5
@@ -89,12 +86,8 @@ COMMON_DEPEND="
 		dev-libs/librevenge
 		media-libs/libvisio
 	)
-	lcms? (
-		media-libs/ilmbase:=
-		media-libs/lcms:2
-	)
+	lcms? ( media-libs/lcms:2 )
 	okular? ( kde-apps/okular:5 )
-	openexr? ( <media-libs/openexr-3.0.0:0= )
 	pdf? ( app-text/poppler:=[qt5] )
 	phonon? ( >=media-libs/phonon-4.11.0 )
 	spacenav? ( dev-libs/libspnav )
@@ -108,6 +101,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
+	lcms? ( dev-libs/imath:3 )
 	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -118,6 +112,7 @@ RDEPEND="${COMMON_DEPEND}
 		>=kde-frameworks/kirigami-${KFMIN}:5
 	)
 "
+BDEPEND="sys-devel/gettext"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
 
@@ -154,6 +149,8 @@ src_configure() {
 		-DPACKAGERS_BUILD=OFF
 		-DRELEASE_BUILD=ON
 		-DWITH_Iconv=ON
+		-DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace
+		-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
 		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake_use_find_package activities KF5Activities)
@@ -173,11 +170,9 @@ src_configure() {
 		$(cmake_use_find_package phonon Phonon4Qt5)
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
 		-DWITH_Poppler=$(usex pdf)
 		-DWITH_Eigen3=$(usex calligra_features_sheets)
 		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-		-DENABLE_CSTESTER_TESTING=$(usex test)
 		-DWITH_Freetype=$(usex truetype)
 	)
 

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

[Andreas Sturmlechner]

commit:     be0a3bb40b8d24bcb9ac0a10019df6ec76daa96c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  2 21:25:03 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 13:24:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=be0a3bb4

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

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index e8f83b177a..8e33f6a836 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -79,7 +79,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] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     5f8b1bc25c5c7efa9403b6a1136138db6bb6bb3f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 19:21:45 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 13:24:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f8b1bc2

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

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index bb32e8f326..e8f83b177a 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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 ~ppc64 ~x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )

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

[Andreas Sturmlechner]

commit:     2dc06b90114acfa805e64adcf7a41cb96edd17bf
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Jul 21 18:06:09 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 22 20:12:28 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2dc06b90

app-office/calligra: add slot operator for openexr

- restrict to <openexr-3
- commit straight to stable, only slot operator was added

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index fb73425bef..e47493c267 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -94,7 +94,7 @@ COMMON_DEPEND="
 		media-libs/lcms:2
 	)
 	okular? ( kde-apps/okular:5 )
-	openexr? ( media-libs/openexr )
+	openexr? ( <media-libs/openexr-3.0.0:0= )
 	pdf? ( app-text/poppler:=[qt5] )
 	phonon? ( >=media-libs/phonon-4.11.0 )
 	spacenav? ( dev-libs/libspnav )

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

[Andreas Sturmlechner]

commit:     8f10c87242e4f26dd6360fd646cdd968baf57b69
Author:     Matt Smith <matt <AT> offtopica <DOT> uk>
AuthorDate: Sun Apr  4 11:46:59 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 14 16:05:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f10c872

app-office/calligra: Fix invalid CMake argument

Bug: https://bugs.gentoo.org/779982
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matt Smith <matt <AT> offtopica.uk>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 61cd7e88a5..fb73425bef 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -177,7 +177,7 @@ src_configure() {
 		-DWITH_Poppler=$(usex pdf)
 		-DWITH_Eigen3=$(usex calligra_features_sheets)
 		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
+		-DENABLE_CSTESTER_TESTING=$(usex test)
 		-DWITH_Freetype=$(usex truetype)
 	)
 

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

[Andreas Sturmlechner]

commit:     ba577ccdb7f20e8614cd384d56b0839b6f05a26e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 19:40:20 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 20:02:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ba577ccd

app-office/calligra: Add missing RDEPEND

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 53958655aa..61cd7e88a5 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -22,8 +22,11 @@ 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[@]})"
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
+	okular openexr +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
@@ -110,13 +113,12 @@ DEPEND="${COMMON_DEPEND}
 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
 	)
 "
 
-RESTRICT+=" test"
-
 PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
 
 pkg_pretend() {

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

[Andreas Sturmlechner]

commit:     95ff08b3b6ab347079792bd7d33b1595fa94bd0c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 10:51:38 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 10:51:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=95ff08b3

app-office/calligra: Drop unused cmake var

Upstream porting away from KF5Html.

Upstream commit abf0753cd899515740bbdcaadb8e9c76309d5df4

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index f0b4971a45..a40aa8d72b 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -153,7 +153,6 @@ src_configure() {
 		-DRELEASE_BUILD=ON
 		-DWITH_Iconv=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package charts KChart)

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

[Andreas Sturmlechner]

commit:     80fdce9510c1ac8b75cf46f55d40458e967d8466
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 20:31:53 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 20:35:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=80fdce95

app-office/calligra: Hard-disable KF5Html

Only disables HTML_TO_ODS filter.

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index a98e7e7da3..f0b4971a45 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -84,7 +84,6 @@ COMMON_DEPEND="
 		app-text/libwpg:*
 		>=app-text/libwps-0.4
 		dev-libs/librevenge
-		>=kde-frameworks/khtml-${KFMIN}:5
 		media-libs/libvisio
 	)
 	lcms? (
@@ -153,6 +152,8 @@ src_configure() {
 		-DPACKAGERS_BUILD=OFF
 		-DRELEASE_BUILD=ON
 		-DWITH_Iconv=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package charts KChart)
@@ -169,7 +170,6 @@ src_configure() {
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
 		$(cmake_use_find_package phonon Phonon4Qt5)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_Okular5=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)

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

[Andreas Sturmlechner]

commit:     4b79735cd79634afbe19226db22d76857d6f8296
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 11:51:50 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 12:12:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4b79735c

app-office/calligra: Drop obsolete disabling of benchmarks dir

After BUILD_TESTING patch was accepted upstream years ago.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 0f902d1ef6..a691747ec1 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -132,11 +132,6 @@ pkg_setup() {
 src_prepare() {
 	ecm_src_prepare
 
-	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)
 	ecm_punt_bogus_dep Qt5 Declarative
 	ecm_punt_bogus_dep Qt5 OpenGL

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

[Andreas Sturmlechner]

commit:     11221b8974932885eb93bbc77911326af6551ec5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 16:04:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 16:13:30 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=11221b89

app-office/calligra: Add okular to myproducts to build the feature

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

 app-office/calligra/calligra-9999.ebuild | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index abbe914de8..240ca9b02e 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -22,7 +22,7 @@ CAL_FTS=( karbon sheets stage words )
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr
+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)
@@ -91,6 +91,7 @@ COMMON_DEPEND="
 		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(+)] )
@@ -101,11 +102,7 @@ COMMON_DEPEND="
 		x11-libs/libX11
 	)
 	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_stage? ( okular? ( kde-apps/okular:5 ) )
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( kde-apps/okular:5 )
-	)
+	calligra_features_words? ( dev-libs/libxslt )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -118,6 +115,7 @@ RDEPEND="${COMMON_DEPEND}
 		>=kde-frameworks/kirigami-${KFMIN}:5
 	)
 "
+
 RESTRICT+=" test"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
@@ -142,17 +140,6 @@ src_prepare() {
 	# Unconditionally disable deprecated deps (required by QtQuick1)
 	ecm_punt_bogus_dep Qt5 Declarative
 	ecm_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/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
 }
 
 src_configure() {
@@ -164,6 +151,7 @@ src_configure() {
 	done
 
 	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use okular && myproducts+=( OKULAR )
 	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
 
 	local mycmakeargs=(

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

[Andreas Sturmlechner]

commit:     eb7db86b5d365d4a71cfbf90f1914246d47cf45b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 19:34:48 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 20 19:34:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb7db86b

app-office/calligra: Update HOMEPAGE

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

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 1761cd8c2a..840fe6daa4 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -11,7 +11,7 @@ QTMIN=5.12.3
 inherit check-reqs ecm kde.org
 
 DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
+HOMEPAGE="https://www.calligra.org"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"

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

[Andreas Sturmlechner]

commit:     026ba4b14992e543a40c14b5e704ab276743d126
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 18:41:43 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 18:41:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=026ba4b1

app-office/calligra: Drop 3.1.90

3.2.0 is available in Gentoo ebuild repository.

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

 app-office/calligra/calligra-3.1.90.ebuild | 201 -----------------------------
 1 file changed, 201 deletions(-)

diff --git a/app-office/calligra/calligra-3.1.90.ebuild b/app-office/calligra/calligra-3.1.90.ebuild
deleted file mode 100644
index 6fd64d56a3..0000000000
--- a/app-office/calligra/calligra-3.1.90.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/unstable/${PN}/${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
-	)
-	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_stage? ( okular? ( kde-apps/okular:5 ) )
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( kde-apps/okular:5 )
-	)
-"
-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 )
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ecm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	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)
-	ecm_punt_bogus_dep Qt5 Declarative
-	ecm_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/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
-	done
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package charts KChart)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake_use_find_package gemini Libgit2)
-		$(cmake_use_find_package gemini Qt5QuickWidgets)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	ecm_src_configure
-}

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

[Andreas Sturmlechner]

commit:     03b5a9035fc2a355d37cba4f4a8825f08b86bcad
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 22:10:16 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  8 22:10:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=03b5a903

app-office/calligra: 3.1.90 version bump

Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-3.1.90.ebuild b/app-office/calligra/calligra-3.1.90.ebuild
new file mode 100644
index 0000000000..6fd64d56a3
--- /dev/null
+++ b/app-office/calligra/calligra-3.1.90.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/unstable/${PN}/${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
+	)
+	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_stage? ( okular? ( kde-apps/okular:5 ) )
+	calligra_features_words? (
+		dev-libs/libxslt
+		okular? ( kde-apps/okular:5 )
+	)
+"
+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 )
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+
+	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)
+	ecm_punt_bogus_dep Qt5 Declarative
+	ecm_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/" \
+			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+	fi
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS[@]}; do
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+	done
+
+	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+	local mycmakeargs=(
+		-DPACKAGERS_BUILD=OFF
+		-DRELEASE_BUILD=ON
+		-DWITH_Iconv=ON
+		-DPRODUCTSET="${myproducts[*]}"
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package charts KChart)
+		-DWITH_Qca-qt5=$(usex crypt)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		$(cmake_use_find_package gemini Libgit2)
+		$(cmake_use_find_package gemini Qt5QuickWidgets)
+		-DWITH_GSL=$(usex gsl)
+		-DWITH_LibEtonyek=$(usex import-filter)
+		-DWITH_LibOdfGen=$(usex import-filter)
+		-DWITH_LibRevenge=$(usex import-filter)
+		-DWITH_LibVisio=$(usex import-filter)
+		-DWITH_LibWpd=$(usex import-filter)
+		-DWITH_LibWpg=$(usex import-filter)
+		-DWITH_LibWps=$(usex import-filter)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular5=$(usex okular)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Eigen3=$(usex calligra_features_sheets)
+		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+		-ENABLE_CSTESTER_TESTING=$(usex test)
+		-DWITH_Freetype=$(usex truetype)
+	)
+
+	ecm_src_configure
+}

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

[Andreas Sturmlechner]

commit:     d9b64cf4c2a168dfdb554662b2105750b92c3fe5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 20:31:34 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 20:31:34 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9b64cf4

app-office/calligra: Add new RDEPEND for USE gemini

Upstream commit d6cdb21118b234d91a641edd20be905b6fce1412

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 6b9e866a40..1761cd8c2a 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -113,6 +113,10 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+	gemini? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/kirigami-${KFMIN}:5
+	)
 "
 RESTRICT+=" test"
 

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

[Andreas Sturmlechner]

commit:     bed6ffd6498eac438db02666fbff354b8be8d7c1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  8 14:04:11 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 14:04:11 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bed6ffd6

app-office/calligra: Better sorting

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 3e7943e7c4..6b9e866a40 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 	sys-devel/gettext
 "
 COMMON_DEPEND="
+	dev-lang/perl
 	>=dev-qt/designer-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -41,7 +42,6 @@ COMMON_DEPEND="
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	dev-lang/perl
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5

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

[Andreas Sturmlechner]

commit:     6969a52abc328f7ff4df87d5d5f5744a0ef16a10
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  8 13:09:59 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 13:09:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6969a52a

app-office/calligra: Drop flow CALLIGRA_FEATURE

Upstream commit f8786b001b75b33e57a9e2c615a37ece7866f350

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 2 +-
 app-office/calligra/metadata.xml         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 7f4c655568..3e7943e7c4 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
-CAL_FTS=( flow karbon sheets stage words )
+CAL_FTS=( karbon sheets stage words )
 
 LICENSE="GPL-2"
 SLOT="5"

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index a26eb5e811..f31dd00ff9 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>
-		<flag name="calligra_features_flow">Build Calligra flowchart and diagram tool</flag>
 		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>

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

[Andreas Sturmlechner]

commit:     9f88e5977b16562afa6696935fb44a946079c8cf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 18:32:03 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 18:36:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f88e597

app-office/calligra: Drop obsolete blocker

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

 app-office/calligra/calligra-9999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index e816c68638..6b6321c20c 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -110,8 +110,6 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	!app-office/calligra:4
-	!app-office/calligra-l10n:4
 "
 RESTRICT+=" test"
 

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

[Andreas Sturmlechner]

commit:     8ffbbc559629df1228672124465a3a6ec73059c7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 11:35:23 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 11:39:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ffbbc55

app-office/calligra: Drop 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.

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

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index b0f8220b25..28a6f55d9d 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -20,7 +20,7 @@ CAL_FTS=( flow karbon sheets stage words )
 
 LICENSE="GPL-2"
 IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
-	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+	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
@@ -90,7 +90,6 @@ COMMON_DEPEND="
 	openexr? ( media-libs/openexr )
 	pdf? ( app-text/poppler:=[qt5] )
 	phonon? ( media-libs/phonon[qt5(+)] )
-	pim? ( $(add_kdeapps_dep kcalcore) )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
 	X? (
@@ -183,7 +182,7 @@ src_configure() {
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_Okular5=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 4b25191534..7e51f93936 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
-		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 	</use>
 </pkgmetadata>

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

[Andreas Sturmlechner]

commit:     481dbec79e4946838b38ec1ba3f3252e0003d788
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 11:44:11 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 12:16:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=481dbec7

app-office/calligra: Add USE +charts

Fixes unhandled automagic dependency on dev-libs/kdiagram.

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

 app-office/calligra/calligra-9999.ebuild | 11 +++++------
 app-office/calligra/metadata.xml         |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 28a6f55d9d..e816c68638 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -19,8 +19,8 @@ fi
 CAL_FTS=( flow karbon sheets stage words )
 
 LICENSE="GPL-2"
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
-	phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+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
@@ -69,6 +69,7 @@ COMMON_DEPEND="
 	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') )
@@ -96,10 +97,7 @@ COMMON_DEPEND="
 		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
 	)
-	calligra_features_sheets? (
-		dev-cpp/eigen:3
-		dev-libs/kdiagram:5
-	)
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
 	calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
 	calligra_features_words? (
 		dev-libs/libxslt
@@ -169,6 +167,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 7e51f93936..a26eb5e811 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
+		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>
 		<flag name="calligra_features_flow">Build Calligra flowchart and diagram tool</flag>
 		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>

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

[Andreas Sturmlechner]

commit:     e1599441374f44822b35bab2558623f5eb7547fd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 23:08:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 23:08:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e1599441

app-office/calligra: Re-add CALLIGRA_FEATURES=flow

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 1d30c2e05b..b0f8220b25 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
-CAL_FTS=( karbon sheets stage words )
+CAL_FTS=( flow karbon sheets stage words )
 
 LICENSE="GPL-2"
 IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 575f0b0a91..4b25191534 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
+		<flag name="calligra_features_flow">Build Calligra flowchart and diagram tool</flag>
 		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>

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

[Andreas Sturmlechner]

commit:     5a05fd29b9b80a3eed80f904affc7c1f30c201a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 09:58:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 09:58:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a05fd29

app-office/calligra: Fix DEPENDs

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index c3c4c92078..1d30c2e05b 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -26,7 +26,6 @@ IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openex
 # Required for the matlab/octave formula tool
 BDEPEND="
 	sys-devel/gettext
-	test? ( $(add_frameworks_dep threadweaver) )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -110,6 +109,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
+	test? ( $(add_frameworks_dep threadweaver) )
 "
 RDEPEND="${COMMON_DEPEND}
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )

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

[Andreas Sturmlechner]

commit:     584013980f4c9625c6c4f5f40728398cb0a16d84
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 16:15:46 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 20:28:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=58401398

app-office/calligra: EAPI-7 bump

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-9999.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index f2912e9e58..c3c4c92078 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="forceoptional"
@@ -24,6 +24,10 @@ IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openex
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
 # Required for the matlab/octave formula tool
+BDEPEND="
+	sys-devel/gettext
+	test? ( $(add_frameworks_dep threadweaver) )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
@@ -106,9 +110,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}
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )

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

[Andreas Sturmlechner]

commit:     db2cde57c5d6e41198378844df710f64bcf6c435
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 17:28:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  1 21:45:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db2cde57

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 <asturm <AT> gentoo.org>

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 1c65c68094..f2912e9e58 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -16,12 +16,11 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
-CAL_FTS=( karbon sheets words )
+CAL_FTS=( karbon sheets stage words )
 
 LICENSE="GPL-2"
 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
@@ -95,13 +94,11 @@ 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
 		dev-libs/kdiagram:5
 	)
+	calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
 	calligra_features_words? (
 		dev-libs/libxslt
 		okular? ( $(add_kdeapps_dep okular) )
@@ -149,7 +146,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
@@ -163,8 +160,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 )
 
@@ -193,7 +188,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] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     8cd065b1b19ecfd1db0053de6fa0032cd4f423fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 16:49:19 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  1 16:49:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8cd065b1

app-office/calligra: Drop unused Qt5WebKit dependency

Upstream commit 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d

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

 app-office/calligra/calligra-9999.ebuild | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index c8bdc8cb76..1c65c68094 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,13 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
 CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
@@ -16,6 +11,11 @@ inherit check-reqs kde5
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://www.calligra.org/"
 
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 CAL_FTS=( karbon sheets words )
 
 LICENSE="GPL-2"
@@ -96,7 +96,6 @@ COMMON_DEPEND="
 		x11-libs/libX11
 	)
 	calligra_experimental_features_stage? (
-		$(add_qt_dep qtwebkit)
 		okular? ( $(add_kdeapps_dep okular) )
 	)
 	calligra_features_sheets? (
@@ -144,11 +143,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/" \

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

[Andreas Sturmlechner]

commit:     16afe5bffa390b50e2fd289893d6b4480db6a801
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 12:51:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 12:52:23 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=16afe5bf

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

!!! existing preserved libs:
>>> package: app-text/poppler-0.63.0
 *  - /usr/lib64/libpoppler.so.73
 *  - /usr/lib64/libpoppler.so.73.0.0
 *      used by /usr/lib64/qt5/plugins/calligra/formatfilters/calligra_filter_pdf2svg.so

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 03f3dac6e8..1602364fe6 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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] proj/kde:master commit in: app-office/calligra/

[Michael Palimaka]

commit:     9f9ac76029d3c3997fa83cbb1749d80673b42482
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 11:49:56 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 11:50:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f9ac760

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

Per poppler's metadata.txt, 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-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 79b6407bea..18ae6f103b 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     f66a42b8497831d81a73a1c37542113041b74a25
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 21:51:37 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 22:09:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f66a42b8

app-office/calligra: Drop unused versionator.eclass

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 14c26f0e0b..79b6407bea 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -8,7 +8,7 @@ KDE_APPS_MINIMAL="17.12.0"
 KDE_HANDBOOK="forceoptional"
 KDE_PO_DIRS="po plan/po"
 KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
+inherit check-reqs kde5
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://www.calligra.org/"

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

[Andreas Sturmlechner]

commit:     83f3c754fa7577752c7d4a02ffba6ad7446ed0a8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 13:06:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 13:06:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=83f3c754

app-office/calligra: Relax poppler/qca qt5-usedeps

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index dc4aede4b5..14c26f0e0b 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -78,7 +78,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 )
@@ -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] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     46d4bbe2c4c8fc8cec81eef6a5ad930438acac36
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 16:53:27 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 16:53:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=46d4bbe2

app-office/calligra: Drop obsolete 3.0.90

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 app-office/calligra/calligra-3.0.90.ebuild | 242 -----------------------------
 1 file changed, 242 deletions(-)

diff --git a/app-office/calligra/calligra-3.0.90.ebuild b/app-office/calligra/calligra-3.0.90.ebuild
deleted file mode 100644
index 8f08c931a7..0000000000
--- a/app-office/calligra/calligra-3.0.90.ebuild
+++ /dev/null
@@ -1,242 +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"
-PLANVER="3.0.91"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz
-		calligra_features_plan? ( mirror://kde/unstable/${PN}/${PN}plan-${PLANVER}.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_kdeapps_dep kholidays)
-		dev-libs/kdiagram:5
-		pim? (
-			$(add_kdeapps_dep kcalcore)
-			$(add_kdeapps_dep kcontacts)
-		)
-	)
-	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
-"
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}"-3.0.90-no-arch-detection.patch )
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde5_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then
-		mv ../${PN}plan-${PLANVER} plan || die
-		sed -e "/add_subdirectory(plan)/s/#//" \
-			-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
-			-i CMakeLists.txt || die
-	fi
-	kde5_src_prepare
-
-	if ! use test; then
-		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
-
-	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/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
-	fi
-
-	if use okular && ! use calligra_experimental_features_stage; then
-		sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		if use calligra_features_${cal_ft} ; then
-			myproducts+=( "${cal_ft^^}" )
-		fi
-	done
-
-	[[ ${KDE_BUILD_TYPE} == release ]] && \
-		use calligra_experimental_features_stage && \
-			myproducts+=( CALLIGRA_FEATURES_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+=(
-		-DPACKAGERS_BUILD=OFF
-		-DWITH_Iconv=ON
-		$(cmake-utils_use_find_package activities KF5Activities)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake-utils_use_find_package gemini Libgit2)
-		$(cmake-utils_use_find_package gemini Qt5QuickWidgets)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	kde5_src_configure
-}

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

[Andreas Sturmlechner]

commit:     923908ce76d31f96ec1678f71569c8a6ae622eeb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 21:04:45 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 21:04:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=923908ce

app-office/calligra: Raise KDE_APPS_MINIMAL to 17.12.0

Package-Manager: Portage-2.3.19, Repoman-2.3.6

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

diff --git a/app-office/calligra/calligra-3.0.90.ebuild b/app-office/calligra/calligra-3.0.90.ebuild
index ea03fe44a5..72c2b50c8e 100644
--- a/app-office/calligra/calligra-3.0.90.ebuild
+++ b/app-office/calligra/calligra-3.0.90.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
+KDE_APPS_MINIMAL="17.12.0"
 KDE_HANDBOOK="forceoptional"
 KDE_PO_DIRS="po plan/po"
 KDE_TEST="forceoptional"

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index a7e58e4bf2..e5784ea6d5 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
+KDE_APPS_MINIMAL="17.12.0"
 KDE_HANDBOOK="forceoptional"
 KDE_PO_DIRS="po plan/po"
 KDE_TEST="forceoptional"

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

[Andreas Sturmlechner]

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

app-office/calligra: 3.0.90 version bump

Package-Manager: Portage-2.3.19, Repoman-2.3.6

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

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

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

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

[Johannes Huber]

commit:     1d963f717fa6127aa2faf5fb0c15e81c70b886a9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 12:17:04 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 12:17:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d963f71

app-office/calligra: Drop subslot on dev-qt/qtcore

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-office/calligra/calligra-9999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 8de26ffcf6..db53b6af33 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -26,7 +26,6 @@ IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openex
 
 # 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)
@@ -107,7 +106,6 @@ COMMON_DEPEND="
 	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

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

[Andreas Sturmlechner]

commit:     78e1db9d5ff09853149a34e9d2bf47d833188d6d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 19:37:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 19:37:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=78e1db9d

app-office/calligra: BUILD_TESTING=OFF fixed upstream

Upstream commit 9d3982b36b30da944f11d22205203db67866f47b

Package-Manager: Portage-2.3.8, Repoman-2.3.3

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 0861d3a981..d528c84c2f 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
 inherit check-reqs kde5 versionator
 
 DESCRIPTION="KDE Office Suite"

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

[Andreas Sturmlechner]

commit:     0e8cc9b0031079307cbceb4cb5eb4a50b545c5ce
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 21:48:54 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 21:48:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0e8cc9b0

app-office/calligra: Switch KDE_TEST back to forceoptional

Package-Manager: Portage-2.3.6, Repoman-2.3.1

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 0861d3a981..d528c84c2f 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
 inherit check-reqs kde5 versionator
 
 DESCRIPTION="KDE Office Suite"

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

[Michael Palimaka]

commit:     6ff382589789e40004a474a59b2d3ea469402932
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 12:02:42 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 12:08:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ff38258

app-office/calligra: use HTTPS

Package-Manager: Portage-2.3.5, Repoman-2.3.2

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 9469c2e3cc..0861d3a981 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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] proj/kde:master commit in: app-office/calligra/

[Andreas Sturmlechner]

commit:     c9220ce92914ba3d7b5de3bfe437ec2e6c6d3036
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 10:51:17 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 10:51:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c9220ce9

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-9999.ebuild | 26 ++++++++++++--------------
 app-office/calligra/metadata.xml         |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 1b17523..148bf75 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -21,15 +21,17 @@ 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 )"
+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)
@@ -73,7 +75,6 @@ COMMON_DEPEND="
 	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? (
@@ -90,7 +91,6 @@ COMMON_DEPEND="
 		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] )
@@ -113,12 +113,11 @@ COMMON_DEPEND="
 		=dev-libs/kproperty-3.0*:5
 		=dev-libs/kreport-3.0*:5
 		pim? (
-			$(add_kdeapps_dep akonadi)
-			$(add_kdeapps_dep akonadi-contacts)
 			$(add_kdeapps_dep kcalcore)
 			$(add_kdeapps_dep kcontacts)
 		)
 	)
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
 	calligra_features_words? (
 		dev-libs/libxslt
 		okular? ( $(add_kdeapps_dep okular) )
@@ -208,12 +207,14 @@ src_configure() {
 		)
 	fi
 
+	use calligra_features_karbon && \
+		mycmakeargs+=( $(cmake-utils_use_find_package jpeg2k OpenJPEG) )
+
 	mycmakeargs+=(
 		-DPACKAGERS_BUILD=OFF
 		-DWITH_Iconv=ON
 		$(cmake-utils_use_find_package activities KF5Activities)
 		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Eigen3=$(usex eigen)
 		-DWITH_Fontconfig=$(usex fontconfig)
 		-DWITH_GSL=$(usex gsl)
 		-DWITH_LibEtonyek=$(usex import-filter)
@@ -223,17 +224,14 @@ src_configure() {
 		-DWITH_LibWpd=$(usex import-filter)
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package jpeg2k OpenJPEG)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pim KF5Akonadi)
-		$(cmake-utils_use_find_package pim KF5AkonadiContact)
 		$(cmake-utils_use_find_package pim KF5CalendarCore)
 		$(cmake-utils_use_find_package pim KF5Contacts)
 		-DWITH_LCMS2=$(usex lcms)
-		$(cmake-utils_use_find_package marble Marble)
 		-DWITH_Okular5=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)
 		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Eigen3=$(usex calligra_features_sheets)
 		-ENABLE_CSTESTER_TESTING=$(usex test)
 		-DWITH_Freetype=$(usex truetype)
 		-DWITH_Vc=$(usex vc)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 31b5858..5558990 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,11 +11,9 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
-		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
-		<flag name="marble">Enable displaying of maps using Marble</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>

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

[Andreas Sturmlechner]

commit:     abbe0501207afd394c8fdfb8c0a2f279893e21a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 22:45:40 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 22:45:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=abbe0501

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)
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

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-9999.ebuild | 51 ++++++++++++++++++--------------
 app-office/calligra/metadata.xml         |  2 ++
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 916e31e..1b17523 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -6,20 +6,12 @@ EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
 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
+[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 
@@ -29,9 +21,9 @@ 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[@]})"
+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 )"
 
@@ -55,20 +47,18 @@ COMMON_DEPEND="
 	$(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 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)
@@ -79,8 +69,6 @@ COMMON_DEPEND="
 	$(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) )
@@ -98,10 +86,14 @@ COMMON_DEPEND="
 		dev-libs/librevenge
 		media-libs/libvisio
 	)
-	lcms? ( media-libs/lcms:2 )
+	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? (
@@ -113,12 +105,13 @@ COMMON_DEPEND="
 		$(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:5
-		dev-libs/kreport:5
+		=dev-libs/kproperty-3.0*:5
+		=dev-libs/kreport-3.0*:5
 		pim? (
 			$(add_kdeapps_dep akonadi)
 			$(add_kdeapps_dep akonadi-contacts)
@@ -132,17 +125,20 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
 	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] )
 	!app-office/calligra:4
+	!app-office/calligra-l10n:4
 "
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-no-arch-detection.patch" )
+PATCHES=( "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch )
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
@@ -156,6 +152,11 @@ pkg_setup() {
 src_prepare() {
 	kde5_src_prepare
 
+	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
@@ -195,6 +196,9 @@ src_configure() {
 		fi
 	done
 
+	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
 	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
 
 	if [[ ${KDE_BUILD_TYPE} == release ]] ; then
@@ -219,6 +223,8 @@ src_configure() {
 		-DWITH_LibWpd=$(usex import-filter)
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
+		$(cmake-utils_use_find_package jpeg2k OpenJPEG)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
 		$(cmake-utils_use_find_package pim KF5Akonadi)
 		$(cmake-utils_use_find_package pim KF5AkonadiContact)
 		$(cmake-utils_use_find_package pim KF5CalendarCore)
@@ -228,7 +234,6 @@ src_configure() {
 		-DWITH_Okular5=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)
 		-DWITH_Poppler=$(usex pdf)
-		$(cmake-utils_use_find_package spacenav Spnav)
 		-ENABLE_CSTESTER_TESTING=$(usex test)
 		-DWITH_Freetype=$(usex truetype)
 		-DWITH_Vc=$(usex vc)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 432740f..31b5858 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -14,8 +14,10 @@
 		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="pim">Enable support for KDE PIM resources integration</flag>
+		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
 		<flag name="marble">Enable displaying of maps using Marble</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
+		<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 		<flag name="vc">Build with <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag>
 	</use>

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

[Andreas Sturmlechner]

commit:     0547ce7a6ddce8c17cb3036f69bbe84f9604ca8c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 02:35:38 2016 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 00:42:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0547ce7a

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

Gentoo-bug: 603584, 603772

Package-Manager: portage-2.3.0

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 11d1221..a89e5bd 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -114,6 +114,7 @@ COMMON_DEPEND="
 		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
@@ -196,10 +197,17 @@ src_configure() {
 
 	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
 
+	if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+		mycmakeargs+=(
+			-DRELEASE_BUILD=ON
+			-DBUILD_UNMAINTAINED=${experimental}
+		)
+	fi
+
 	mycmakeargs+=(
 		-DPACKAGERS_BUILD=OFF
-		-DBUILD_UNMAINTAINED=${experimental}
 		-DWITH_Iconv=ON
+		$(cmake-utils_use_find_package activities KF5Activities)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Eigen3=$(usex eigen)
 		-DWITH_Fontconfig=$(usex fontconfig)

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

[Johannes Huber]

commit:     de9139e620b86778aee69a386f67aa01b9748951
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 08:53:33 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 08:53:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=de9139e6

app-office/calligra: Remove 3.0.0

Moved to gentoo main tree.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 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..0000000
--- 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)
-			$(add_kdeapps_dep akonadi-contacts)
-			$(add_kdeapps_dep kcalcore)
-			$(add_kdeapps_dep kcontacts)
-		)
-	)
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	!app-office/calligra:4
-"
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-no-arch-detection.patch" )
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde5_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	punt_bogus_dep Qt5 Declarative
-	punt_bogus_dep Qt5 OpenGL
-
-	if ! use calligra_experimental_features_stage && \
-			! use calligra_experimental_features_braindump; 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/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
-	fi
-
-	if use okular && ! use calligra_experimental_features_stage; then
-		sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
-}
-
-src_configure() {
-	local cal_ft myproducts experimental=OFF
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		if use calligra_features_${cal_ft} ; then
-			myproducts+=( "${cal_ft^^}" )
-		fi
-	done
-	# experimental/unmaintained applications
-	for cal_ft in ${CAL_EXP_FTS[@]}; do
-		if use calligra_experimental_features_${cal_ft} ; then
-			experimental=ON
-			myproducts+=( "${cal_ft^^}" )
-		fi
-	done
-
-	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
-	mycmakeargs+=(
-		-DPACKAGERS_BUILD=OFF
-		-DBUILD_UNMAINTAINED=${experimental}
-		-DWITH_Iconv=ON
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Eigen3=$(usex eigen)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package pim KF5Akonadi)
-		$(cmake-utils_use_find_package pim KF5AkonadiContact)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		-DWITH_LCMS2=$(usex lcms)
-		$(cmake-utils_use_find_package marble Marble)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		$(cmake-utils_use_find_package spacenav Spnav)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-		-DWITH_Vc=$(usex vc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
-	)
-
-	kde5_src_configure
-}

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

[Johannes Huber]

commit:     43217d14fbd278d1889f7194bccfd769ae3c4a32
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 08:45:21 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 08:45:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=43217d14

app-office/calligra: Restrict tests

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/app-office/calligra/calligra-3.0.0.ebuild b/app-office/calligra/calligra-3.0.0.ebuild
index 0bca8c7..9d1016c 100644
--- a/app-office/calligra/calligra-3.0.0.ebuild
+++ b/app-office/calligra/calligra-3.0.0.ebuild
@@ -139,6 +139,7 @@ RDEPEND="${COMMON_DEPEND}
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
 	!app-office/calligra:4
 "
+RESTRICT+=" test"
 
 PATCHES=( "${FILESDIR}/${P}-no-arch-detection.patch" )
 

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 2098cb9..11d1221 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -139,6 +139,7 @@ RDEPEND="${COMMON_DEPEND}
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
 	!app-office/calligra:4
 "
+RESTRICT+=" test"
 
 PATCHES=( "${FILESDIR}/${PN}-3.0.0-no-arch-detection.patch" )
 

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

[Johannes Huber]

commit:     c865a0cd1076b830cc67e7788147ab19f61f8af2
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Dec  5 18:23:29 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 08:29:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c865a0cd

app-office/calligra: 3.0.0 version bump

Closes: #840
Package-Manager: portage-2.3.0

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 .../{calligra-9999.ebuild => calligra-3.0.0.ebuild}       | 15 +++++++--------
 app-office/calligra/calligra-9999.ebuild                  | 15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-3.0.0.ebuild
similarity index 93%
copy from app-office/calligra/calligra-9999.ebuild
copy to app-office/calligra/calligra-3.0.0.ebuild
index d65e6b5..80da5d8 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-3.0.0.ebuild
@@ -15,10 +15,10 @@ HOMEPAGE="http://www.calligra.org/"
 case ${PV} in
 	3.[0123456789].[789]?)
 		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
+		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
 	3.[0123456789].?)
 		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz"
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
 esac
 
 LICENSE="GPL-2"
@@ -26,8 +26,8 @@ LICENSE="GPL-2"
 [[ ${KDE_BUILD_TYPE} == release ]] && \
 KEYWORDS="~amd64 ~x86"
 
-CAL_FTS=( plan sheets words )
-CAL_EXP_FTS=( braindump karbon stage )
+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[@]})
@@ -35,6 +35,8 @@ IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble ok
 
 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)
@@ -134,13 +136,10 @@ DEPEND="${COMMON_DEPEND}
 	vc? ( >=dev-libs/vc-1.1.0 )
 "
 RDEPEND="${COMMON_DEPEND}
-	calligra_experimental_features_karbon? ( media-gfx/pstoedit[plotutils] )
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
 	!app-office/calligra:4
 "
 
-#[[ ${PV} == 9999 ]] && LANGVERSION="3.0" || LANGVERSION="$(get_version_component_range 1-2)"
-#PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
 PATCHES=( "${FILESDIR}/${PN}-vc-cxxflags.patch" )
 
 pkg_pretend() {

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index d65e6b5..80da5d8 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -15,10 +15,10 @@ HOMEPAGE="http://www.calligra.org/"
 case ${PV} in
 	3.[0123456789].[789]?)
 		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
+		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
 	3.[0123456789].?)
 		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz"
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
 esac
 
 LICENSE="GPL-2"
@@ -26,8 +26,8 @@ LICENSE="GPL-2"
 [[ ${KDE_BUILD_TYPE} == release ]] && \
 KEYWORDS="~amd64 ~x86"
 
-CAL_FTS=( plan sheets words )
-CAL_EXP_FTS=( braindump karbon stage )
+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[@]})
@@ -35,6 +35,8 @@ IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble ok
 
 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)
@@ -134,13 +136,10 @@ DEPEND="${COMMON_DEPEND}
 	vc? ( >=dev-libs/vc-1.1.0 )
 "
 RDEPEND="${COMMON_DEPEND}
-	calligra_experimental_features_karbon? ( media-gfx/pstoedit[plotutils] )
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
 	!app-office/calligra:4
 "
 
-#[[ ${PV} == 9999 ]] && LANGVERSION="3.0" || LANGVERSION="$(get_version_component_range 1-2)"
-#PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
 PATCHES=( "${FILESDIR}/${PN}-vc-cxxflags.patch" )
 
 pkg_pretend() {

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

[Michael Palimaka]

commit:     73d60d1284197e42e9634d73444246ca3628a496
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct 26 15:56:35 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 10:57:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=73d60d12

app-office/calligra: Fix DEPENDs

Raise app-text/libwps DEPEND to >=0.4
Drop kde-apps/kdgantt2 (using KGantt from KDiagram).

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-9999.ebuild | 20 +++++++++-----------
 app-office/calligra/metadata.xml         |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 47c14b2..876a63b 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
 [[ ${KDE_BUILD_TYPE} == release ]] && \
 KEYWORDS="~amd64 ~x86"
 
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms kdepim
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim
 	marble okular openexr +pdf spacenav +truetype vc +webkit +xml X"
 
 CAL_FTS="braindump karbon plan sheets stage words"
@@ -98,7 +98,7 @@ COMMON_DEPEND="
 		app-text/libodfgen
 		app-text/libwpd:*
 		app-text/libwpg:*
-		app-text/libwps
+		>=app-text/libwps-0.4
 		dev-libs/librevenge
 		media-libs/libvisio
 	)
@@ -118,12 +118,11 @@ COMMON_DEPEND="
 		dev-libs/kdiagram:5
 		dev-libs/kproperty:5
 		dev-libs/kreport:5
-		kdepim? (
+		pim? (
 			$(add_kdeapps_dep akonadi)
 			$(add_kdeapps_dep akonadi-contacts)
 			$(add_kdeapps_dep kcalcore)
 			$(add_kdeapps_dep kcontacts)
-			$(add_kdeapps_dep kdgantt2)
 		)
 	)
 	calligra_features_stage? (
@@ -210,17 +209,16 @@ src_configure() {
 		-DWITH_LibWpd=$(usex import-filter)
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package kdepim KF5Akonadi)
-		$(cmake-utils_use_find_package kdepim KF5AkonadiContact)
-		$(cmake-utils_use_find_package kdepim KF5CalendarCore)
-		$(cmake-utils_use_find_package kdepim KF5Contacts)
-		$(cmake-utils_use_find_package kdepim KGantt)
+		$(cmake-utils_use_find_package pim KF5Akonadi)
+		$(cmake-utils_use_find_package pim KF5AkonadiContact)
+		$(cmake-utils_use_find_package pim KF5CalendarCore)
+		$(cmake-utils_use_find_package pim KF5Contacts)
 		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_CalligraMarble=$(usex marble)
+		$(cmake-utils_use_find_package marble Marble)
 		-DWITH_Okular5=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)
 		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Spnav=$(usex spacenav)
+		$(cmake-utils_use_find_package spacenav Spnav)
 		-ENABLE_CSTESTER_TESTING=$(usex test)
 		-DWITH_Freetype=$(usex truetype)
 		-DWITH_Vc=$(usex vc)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index bf486c6..432740f 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -13,7 +13,7 @@
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
-		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
+		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 		<flag name="marble">Enable displaying of maps using Marble</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>

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

[Michael Palimaka]

commit:     076dffa869ba6536e223556755ebddf0e631d394
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 20 10:21:44 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 17:22:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=076dffa8

app-office/calligra: Fix DEPENDs, drop unported CALLIGRA_FEATURES

Gentoo-bug: 589358

Package-Manager: portage-2.2.28

 app-office/calligra/calligra-9999.ebuild | 69 ++++++++++++++++++++------------
 app-office/calligra/metadata.xml         |  3 +-
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 84ff3bd..fa80431 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -26,11 +26,11 @@ LICENSE="GPL-2"
 [[ ${KDE_BUILD_TYPE} == release ]] && \
 KEYWORDS="~amd64 ~x86"
 
-IUSE="activities +crypt +eigen +fontconfig +glib gsl import-filter +lcms kdepim
-	marble okular openexr opengl +pdf spacenav +threads +truetype vc +xml X"
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms kdepim
+	marble okular openexr +pdf spacenav +truetype vc +webkit +xml X"
 
 # Don't use Active, it's broken on desktops.
-CAL_FTS="author braindump flow gemini karbon plan sheets stage words"
+CAL_FTS="author braindump karbon plan sheets stage words"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done
@@ -38,15 +38,11 @@ unset cal_ft
 
 REQUIRED_USE="
 	calligra_features_author? ( calligra_features_words )
-	calligra_features_gemini? ( opengl )
 	calligra_features_sheets? ( eigen )
+	calligra_features_stage? ( webkit )
 	test? ( calligra_features_karbon )
 "
 
-# 	calligra_features_gemini (
-# 		dev-libs/libgit2
-# 		dev-libs/libqgit2	# needs porting (currently doesn't build)
-# 	)
 # drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -97,7 +93,6 @@ COMMON_DEPEND="
 	crypt? ( app-crypt/qca:2[qt5] )
 	eigen? ( dev-cpp/eigen:3 )
 	fontconfig? ( media-libs/fontconfig )
-	glib? ( dev-libs/glib:2 )
 	gsl? ( sci-libs/gsl )
 	import-filter? (
 		$(add_frameworks_dep khtml)
@@ -111,23 +106,17 @@ COMMON_DEPEND="
 	)
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdeapps_dep marble) )
-	okular? ( $(add_kdeapps_dep okular) )
-	opengl? ( $(add_qt_dep qtopengl) )
 	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
+	pdf? ( app-text/poppler:=[qt5] )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
 	X? (
 		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
 	)
+	calligra_features_braindump? ( webkit? ( $(add_qt_dep qtwebkit) ) )
 	calligra_features_plan? (
 		$(add_qt_dep qtcore '' '' '5=')
-		$(add_frameworks_dep kdelibs4support)
 		$(add_kdeapps_dep kdiagram)
 		$(add_kdeapps_dep kproperty)
 		$(add_kdeapps_dep kreport)
@@ -139,14 +128,22 @@ COMMON_DEPEND="
 			$(add_kdeapps_dep kdgantt2)
 		)
 	)
-	calligra_features_sheets? ( $(add_frameworks_dep kdelibs4support) )
-	calligra_features_words? ( dev-libs/libxslt )
+	calligra_features_stage? (
+		$(add_qt_dep qtwebkit)
+		okular? ( $(add_kdeapps_dep okular) )
+	)
+	calligra_features_words? (
+		dev-libs/libxslt
+		okular? ( $(add_kdeapps_dep okular) )
+	)
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	x11-misc/shared-mime-info
+	vc? ( >=dev-libs/vc-1.1.0 )
 "
 RDEPEND="${COMMON_DEPEND}
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
 	!app-office/calligra:4
 "
 
@@ -162,6 +159,30 @@ pkg_setup() {
 	check-reqs_pkg_setup
 }
 
+src_prepare() {
+	kde5_src_prepare
+
+	# Unconditionally disable deprecated deps (required by QtQuick1)
+	punt_bogus_dep Qt5 Declarative
+	punt_bogus_dep Qt5 OpenGL
+
+	if ! use webkit; 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/" \
+			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/" \
+			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+	fi
+}
+
 src_configure() {
 	local cal_ft myproducts
 
@@ -181,7 +202,6 @@ src_configure() {
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Eigen3=$(usex eigen)
 		-DWITH_Fontconfig=$(usex fontconfig)
-		-DWITH_GLIB2=$(usex glib)
 		-DWITH_GSL=$(usex gsl)
 		-DWITH_LibEtonyek=$(usex import-filter)
 		-DWITH_LibOdfGen=$(usex import-filter)
@@ -197,16 +217,15 @@ src_configure() {
 		$(cmake-utils_use_find_package kdepim KGantt)
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_CalligraMarble=$(usex marble)
-		-DWITH_Okular=$(usex okular)
+		-DWITH_Okular5=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)
-		-DUSEOPENGL=$(usex opengl)
 		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Pstoedit=$(usex pdf)
 		-DWITH_Spnav=$(usex spacenav)
-		-DBUILD_cstester=$(usex test)
-		-DWITH_Threads=$(usex threads)
+		-ENABLE_CSTESTER_TESTING=$(usex test)
 		-DWITH_Freetype=$(usex truetype)
 		-DWITH_Vc=$(usex vc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
 	)
 
 	kde5_src_configure

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index e40c4ea..bf486c6 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -12,12 +12,11 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
-		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
 		<flag name="marble">Enable displaying of maps using Marble</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
-		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
+		<flag name="vc">Build with <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag>
 	</use>
 </pkgmetadata>

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

[Michael Palimaka]

commit:     3984dda472f32dcfac8bede617f390e6384880cc
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 18:51:54 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 18:52:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3984dda4

app-office/calligra: introduce subslot dependency when plan is enabled

Upstream-commit: 6ce04cc681c584d2520af180fa1efa20b97ee5a6

Package-Manager: portage-2.3.0

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 7214bb2..84ff3bd 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -47,6 +47,7 @@ REQUIRED_USE="
 # 		dev-libs/libgit2
 # 		dev-libs/libqgit2	# needs porting (currently doesn't build)
 # 	)
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
@@ -125,6 +126,7 @@ COMMON_DEPEND="
 		x11-libs/libX11
 	)
 	calligra_features_plan? (
+		$(add_qt_dep qtcore '' '' '5=')
 		$(add_frameworks_dep kdelibs4support)
 		$(add_kdeapps_dep kdiagram)
 		$(add_kdeapps_dep kproperty)

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

[Johannes Huber]

commit:     1985c2f94f7a77d1ff4dbb0c389bb017d9125acf
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 31 14:30:29 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 18:54:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1985c2f9

app-office/calligra: Frameworks merged to master

Package-Manager: portage-2.2.27

 app-office/calligra/calligra-9999.ebuild | 212 +++++++++++++++++++++++++++++++
 app-office/calligra/metadata.xml         |  23 ++++
 2 files changed, 235 insertions(+)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
new file mode 100644
index 0000000..5a48881
--- /dev/null
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_DOXYGEN="true"
+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.xz" ;;
+	3.[0123456789].?)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz"
+esac
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+IUSE="activities +crypt +eigen +fontconfig +glib gsl import-filter +lcms kdepim
+	marble okular openexr opengl +pdf spacenav +threads +truetype vc +xml X"
+
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon 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_sheets? ( eigen )
+	test? ( calligra_features_karbon )
+"
+
+# 	calligra_features_gemini (
+# 		dev-libs/libgit2
+# 		dev-libs/libqgit2	# needs porting (currently doesn't build)
+# 	)
+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 )
+	glib? ( dev-libs/glib:2 )
+	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
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdeapps_dep marble) )
+	okular? ( $(add_kdeapps_dep okular) )
+	opengl? ( $(add_qt_dep qtopengl) )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler:=
+		media-gfx/pstoedit
+	)
+	spacenav? ( dev-libs/libspnav )
+	truetype? ( media-libs/freetype:2 )
+	vc? ( dev-libs/vc )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+	calligra_features_plan? (
+		$(add_frameworks_dep kdelibs4support)
+		$(add_kdeapps_dep kdiagram)
+		$(add_kdeapps_dep kproperty)
+		$(add_kdeapps_dep kreport)
+		kdepim? (
+			$(add_kdeapps_dep akonadi)
+			$(add_kdeapps_dep akonadi-contact)
+			$(add_kdeapps_dep kcalcore)
+			$(add_kdeapps_dep kcontacts)
+			$(add_kdeapps_dep kdgantt2)
+		)
+	)
+	calligra_features_sheets? ( $(add_frameworks_dep kdelibs4support) )
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4
+"
+
+#[[ ${PV} == 9999 ]] && LANGVERSION="3.0" || LANGVERSION="$(get_version_component_range 1-2)"
+#PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde5_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		local prod=${cal_ft^^}
+		if use calligra_features_${cal_ft} ; then
+			myproducts+=( "${prod}" )
+		fi
+	done
+
+	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+	mycmakeargs+=(
+		-DPACKAGERS_BUILD=OFF
+		-DWITH_Iconv=ON
+		-DBUILD_cstester=$(usex test)
+		$(cmake-utils_use_find_package kdepim KF5Akonadi)
+		$(cmake-utils_use_find_package kdepim KF5AkonadiContact)
+		$(cmake-utils_use_find_package kdepim KF5CalendarCore)
+		$(cmake-utils_use_find_package kdepim KF5Contacts)
+		$(cmake-utils_use_find_package kdepim KGantt)
+		-DUSEOPENGL=$(usex opengl)
+		-DWITH_Qca-qt5=$(usex crypt)
+		-DWITH_Eigen3=$(usex eigen)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		-DWITH_GLIB2=$(usex glib)
+		-DWITH_GSL=$(usex gsl)
+		-DWITH_LibEtonyek=$(usex import-filter)
+		-DWITH_LibOdfGen=$(usex import-filter)
+		-DWITH_LibRevenge=$(usex import-filter)
+		-DWITH_LibVisio=$(usex import-filter)
+		-DWITH_LibWpd=$(usex import-filter)
+		-DWITH_LibWpg=$(usex import-filter)
+		-DWITH_LibWps=$(usex import-filter)
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_CalligraMarble=$(usex marble)
+		-DWITH_Okular=$(usex okular)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Pstoedit=$(usex pdf)
+		-DWITH_Spnav=$(usex spacenav)
+		-DWITH_Threads=$(usex threads)
+		-DWITH_Freetype=$(usex truetype)
+		-DWITH_Vc=$(usex vc)
+	)
+
+	kde5_src_configure
+}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
new file mode 100644
index 0000000..e40c4ea
--- /dev/null
+++ b/app-office/calligra/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="activities">Enable kactivities support</flag>
+		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
+		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
+		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
+		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
+		<flag name="marble">Enable displaying of maps using Marble</flag>
+		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
+		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
+		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
+	</use>
+</pkgmetadata>

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

[Johannes Huber]

commit:     2dddfa92b71c05011932276dae13f37cd82bad89
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 18:58:58 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 18:58:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2dddfa92

app-office/calligra: Sort configure by use flags

Package-Manager: portage-2.2.28

 app-office/calligra/calligra-9999.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 5a48881..bb190a5 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -177,13 +177,6 @@ src_configure() {
 	mycmakeargs+=(
 		-DPACKAGERS_BUILD=OFF
 		-DWITH_Iconv=ON
-		-DBUILD_cstester=$(usex test)
-		$(cmake-utils_use_find_package kdepim KF5Akonadi)
-		$(cmake-utils_use_find_package kdepim KF5AkonadiContact)
-		$(cmake-utils_use_find_package kdepim KF5CalendarCore)
-		$(cmake-utils_use_find_package kdepim KF5Contacts)
-		$(cmake-utils_use_find_package kdepim KGantt)
-		-DUSEOPENGL=$(usex opengl)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Eigen3=$(usex eigen)
 		-DWITH_Fontconfig=$(usex fontconfig)
@@ -196,13 +189,20 @@ src_configure() {
 		-DWITH_LibWpd=$(usex import-filter)
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
+		$(cmake-utils_use_find_package kdepim KF5Akonadi)
+		$(cmake-utils_use_find_package kdepim KF5AkonadiContact)
+		$(cmake-utils_use_find_package kdepim KF5CalendarCore)
+		$(cmake-utils_use_find_package kdepim KF5Contacts)
+		$(cmake-utils_use_find_package kdepim KGantt)
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_CalligraMarble=$(usex marble)
 		-DWITH_Okular=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)
+		-DUSEOPENGL=$(usex opengl)
 		-DWITH_Poppler=$(usex pdf)
 		-DWITH_Pstoedit=$(usex pdf)
 		-DWITH_Spnav=$(usex spacenav)
+		-DBUILD_cstester=$(usex test)
 		-DWITH_Threads=$(usex threads)
 		-DWITH_Freetype=$(usex truetype)
 		-DWITH_Vc=$(usex vc)

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

[Michael Palimaka]

commit:     b67a9474c849ad3b27f86a8dad703475fac0b491
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 27 07:58:48 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 27 07:58:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b67a9474

[app-office/calligra] Remove live ebuild which is also in the main tree.

---
 app-office/calligra/calligra-9999.ebuild | 230 -------------------------------
 app-office/calligra/metadata.xml         |  22 ---
 2 files changed, 252 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
deleted file mode 100644
index be14f9f..0000000
--- a/app-office/calligra/calligra-9999.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# 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"
-KDE_MINIMAL="4.13.1"
-OPENGL_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].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# 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 +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
-import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
-+okular openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc
-xbase +xml"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
-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_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_sheets? ( eigen )
-	vc? ( calligra_features_krita )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	$(add_kdebase_dep kdelibs 'nepomuk?')
-	dev-lang/perl
-	dev-libs/boost
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=dev-qt/qtgui-4.8.1-r1:4
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2:= )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	glew? ( media-libs/glew )
-	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
-		media-libs/libvisio
-	)
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? (
-		media-libs/lcms:2
-		x11-libs/libX11
-	)
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	nepomuk? ( dev-libs/soprano )
-	okular? ( $(add_kdebase_dep okular) )
-	opengl? ( virtual/glu )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		virtual/postgresql
-		dev-libs/libpqxx
-	)
-	spacenav? ( dev-libs/libspnav  )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
-	xbase? ( dev-db/xbase )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions(+)]
-		dev-libs/icu:=
-	)
-	calligra_features_krita? (
-		dev-qt/qtdeclarative:4
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-RESTRICT=test
-# bug 394273
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with import-filter LibEtonyek)
-		$(cmake-utils_use_with import-filter LibOdfGen)
-		$(cmake-utils_use_with import-filter LibVisio)
-		$(cmake-utils_use_with import-filter LibWpd)
-		$(cmake-utils_use_with import-filter LibWpg)
-		$(cmake-utils_use_with import-filter LibWps)
-		$(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 Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with xbase XBase)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
deleted file mode 100644
index 31ecdb0..0000000
--- a/app-office/calligra/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<herd>openoffice</herd>
-	<use>
-		<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
-		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
-		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
-		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
-		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
-		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
-		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
-		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
-		<flag name="marble">Enable displaying of maps using Marble</flag>
-		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
-		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
-		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
-		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
-		<flag name="xbase">Enable support for xbase compatible database formats</flag>
-	</use>
-</pkgmetadata>

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

[Michael Palimaka]

commit:     6361d25dfaf8fbbd733d53264626bb55297902e0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 15 14:01:14 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 15 14:01:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6361d25d

[app-office/calligra] Drop CVS header.

Package-Manager: portage-2.2.14

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 637f420..be14f9f 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.48 2014/11/03 11:15:35 titanofold Exp $
+# $Header: $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt

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

[Manuel Rüger]

commit:     c71ee0ad3b312a986d6a8454dabfa81230e61026
Author:     Manuel Rüger <manuel <AT> rueg <DOT> eu>
AuthorDate: Fri Nov 14 18:44:14 2014 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Nov 14 18:44:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c71ee0ad

[app-office/calligra] Sync with tree.

Package-Manager: portage-2.2.14

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index f18cdb9..637f420 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.48 2014/11/03 11:15:35 titanofold Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -120,7 +120,7 @@ RDEPEND="
 		media-gfx/pstoedit
 	)
 	postgres? (
-		dev-db/postgresql-base
+		virtual/postgresql
 		dev-libs/libpqxx
 	)
 	spacenav? ( dev-libs/libspnav  )

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

[Michael Palimaka]

commit:     fe68e0e8b56a8fcf2e9b17141bd39fda67e66767
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 16 10:46:33 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun 16 10:48:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fe68e0e8

[app-office/calligra] In portage.

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.3.ebuild | 230 ------------------------------
 app-office/calligra/metadata.xml          |   2 -
 2 files changed, 232 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
deleted file mode 100644
index f18cdb9..0000000
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# 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"
-KDE_MINIMAL="4.13.1"
-OPENGL_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].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# 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 +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
-import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
-+okular openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc
-xbase +xml"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
-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_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_sheets? ( eigen )
-	vc? ( calligra_features_krita )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	$(add_kdebase_dep kdelibs 'nepomuk?')
-	dev-lang/perl
-	dev-libs/boost
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=dev-qt/qtgui-4.8.1-r1:4
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2:= )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	glew? ( media-libs/glew )
-	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
-		media-libs/libvisio
-	)
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? (
-		media-libs/lcms:2
-		x11-libs/libX11
-	)
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	nepomuk? ( dev-libs/soprano )
-	okular? ( $(add_kdebase_dep okular) )
-	opengl? ( virtual/glu )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	spacenav? ( dev-libs/libspnav  )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
-	xbase? ( dev-db/xbase )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions(+)]
-		dev-libs/icu:=
-	)
-	calligra_features_krita? (
-		dev-qt/qtdeclarative:4
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-RESTRICT=test
-# bug 394273
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with import-filter LibEtonyek)
-		$(cmake-utils_use_with import-filter LibOdfGen)
-		$(cmake-utils_use_with import-filter LibVisio)
-		$(cmake-utils_use_with import-filter LibWpd)
-		$(cmake-utils_use_with import-filter LibWpg)
-		$(cmake-utils_use_with import-filter LibWps)
-		$(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 Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with xbase XBase)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index af43b2c..31ecdb0 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -15,10 +15,8 @@
 		<flag name="marble">Enable displaying of maps using Marble</flag>
 		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
-		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
-		<flag name="xslt">Enable xslt and exslt support format support</flag>
 	</use>
 </pkgmetadata>

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

[Michael Palimaka]

commit:     437f1422fda400886ff01603d9c5f96abb5751c4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 19:07:42 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 19:07:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=437f1422

[app-office/calligra] Remove unused dependencies, USE flags, and build options discovered with CMAKE_WARN_UNUSED_CLI.

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.3.ebuild | 34 +++++--------------------------
 app-office/calligra/calligra-9999.ebuild  | 34 +++++--------------------------
 2 files changed, 10 insertions(+), 58 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
index 36df3f4..f18cdb9 100644
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -40,10 +40,10 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
-+okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
-+truetype vc xbase +xml +xslt"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
+import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
++okular openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc
+xbase +xml"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
@@ -76,7 +76,6 @@ RDEPEND="
 	$(add_kdebase_dep kdelibs 'nepomuk?')
 	dev-lang/perl
 	dev-libs/boost
-	dev-libs/libxml2
 	$(add_kdebase_dep knewstuff)
 	media-libs/libpng
 	sys-libs/zlib
@@ -89,7 +88,6 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0 )
 	fontconfig? ( media-libs/fontconfig )
 	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
 	glew? ( media-libs/glew )
 	glib? ( dev-libs/glib:2 )
 	gsf? ( gnome-extra/libgsf )
@@ -116,7 +114,6 @@ RDEPEND="
 	nepomuk? ( dev-libs/soprano )
 	okular? ( $(add_kdebase_dep okular) )
 	opengl? ( virtual/glu )
-	opengtl? ( >=media-libs/opengtl-0.9.15 )
 	openexr? ( media-libs/openexr )
 	pdf? (
 		app-text/poppler:=
@@ -127,13 +124,11 @@ RDEPEND="
 		dev-libs/libpqxx
 	)
 	spacenav? ( dev-libs/libspnav  )
-	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
 	vc? ( dev-libs/vc )
 	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.7.9:3[extensions(+)]
 		dev-libs/icu:=
@@ -143,6 +138,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXi
 	)
+	calligra_features_words? ( dev-libs/libxslt )
 "
 DEPEND="${RDEPEND}"
 
@@ -166,28 +162,17 @@ src_configure() {
 
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
 		"-DWITH_PNG=ON"
 		"-DWITH_ZLIB=ON"
 		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
 		"-DWITH_Iconv=ON"            # available on all supported arches and many more
 	)
 
 	# default disablers
 	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
 		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
 		"-DCREATIVEONLY=OFF"
 		"-DPACKAGERS_BUILD=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
 	)
 
 	# regular options
@@ -199,11 +184,8 @@ src_configure() {
 		$(cmake-utils_use_with fftw FFTW3)
 		$(cmake-utils_use_with fontconfig Fontconfig)
 		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
 		$(cmake-utils_use_with glew GLEW)
 		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
 		$(cmake-utils_use_with import-filter LibEtonyek)
 		$(cmake-utils_use_with import-filter LibOdfGen)
@@ -219,10 +201,8 @@ src_configure() {
 		$(cmake-utils_use_with lcms LCMS2)
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_build mysql mySQL)
 		$(cmake-utils_use_with nepomuk Soprano)
 		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
@@ -230,16 +210,12 @@ src_configure() {
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
 		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_build sybase sybase)
 		$(cmake-utils_use_with tiff TIFF)
 		$(cmake-utils_use_with threads Threads)
 		$(cmake-utils_use_with truetype Freetype)
 		$(cmake-utils_use_with vc Vc)
 		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_build xbase xbase)
-		$(cmake-utils_use_with xslt LibXslt)
 	)
 
 	# applications

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 36df3f4..f18cdb9 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -40,10 +40,10 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
-+okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
-+truetype vc xbase +xml +xslt"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
+import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
++okular openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc
+xbase +xml"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
@@ -76,7 +76,6 @@ RDEPEND="
 	$(add_kdebase_dep kdelibs 'nepomuk?')
 	dev-lang/perl
 	dev-libs/boost
-	dev-libs/libxml2
 	$(add_kdebase_dep knewstuff)
 	media-libs/libpng
 	sys-libs/zlib
@@ -89,7 +88,6 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0 )
 	fontconfig? ( media-libs/fontconfig )
 	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
 	glew? ( media-libs/glew )
 	glib? ( dev-libs/glib:2 )
 	gsf? ( gnome-extra/libgsf )
@@ -116,7 +114,6 @@ RDEPEND="
 	nepomuk? ( dev-libs/soprano )
 	okular? ( $(add_kdebase_dep okular) )
 	opengl? ( virtual/glu )
-	opengtl? ( >=media-libs/opengtl-0.9.15 )
 	openexr? ( media-libs/openexr )
 	pdf? (
 		app-text/poppler:=
@@ -127,13 +124,11 @@ RDEPEND="
 		dev-libs/libpqxx
 	)
 	spacenav? ( dev-libs/libspnav  )
-	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
 	vc? ( dev-libs/vc )
 	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.7.9:3[extensions(+)]
 		dev-libs/icu:=
@@ -143,6 +138,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXi
 	)
+	calligra_features_words? ( dev-libs/libxslt )
 "
 DEPEND="${RDEPEND}"
 
@@ -166,28 +162,17 @@ src_configure() {
 
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
 		"-DWITH_PNG=ON"
 		"-DWITH_ZLIB=ON"
 		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
 		"-DWITH_Iconv=ON"            # available on all supported arches and many more
 	)
 
 	# default disablers
 	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
 		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
 		"-DCREATIVEONLY=OFF"
 		"-DPACKAGERS_BUILD=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
 	)
 
 	# regular options
@@ -199,11 +184,8 @@ src_configure() {
 		$(cmake-utils_use_with fftw FFTW3)
 		$(cmake-utils_use_with fontconfig Fontconfig)
 		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
 		$(cmake-utils_use_with glew GLEW)
 		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
 		$(cmake-utils_use_with import-filter LibEtonyek)
 		$(cmake-utils_use_with import-filter LibOdfGen)
@@ -219,10 +201,8 @@ src_configure() {
 		$(cmake-utils_use_with lcms LCMS2)
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_build mysql mySQL)
 		$(cmake-utils_use_with nepomuk Soprano)
 		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
@@ -230,16 +210,12 @@ src_configure() {
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
 		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_build sybase sybase)
 		$(cmake-utils_use_with tiff TIFF)
 		$(cmake-utils_use_with threads Threads)
 		$(cmake-utils_use_with truetype Freetype)
 		$(cmake-utils_use_with vc Vc)
 		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_build xbase xbase)
-		$(cmake-utils_use_with xslt LibXslt)
 	)
 
 	# applications

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

[Michael Palimaka]

commit:     76944b65110974ede64f050b76fa5c7bf3322d43
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 18:34:20 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 18:34:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=76944b65

[app-office/calligra] Add missing dependencies.

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.3.ebuild | 10 +++++++++-
 app-office/calligra/calligra-9999.ebuild  | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
index 8f926c9..36df3f4 100644
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -107,7 +107,10 @@ RDEPEND="
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
 	kde? ( $(add_kdebase_dep kactivities) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
+	lcms? (
+		media-libs/lcms:2
+		x11-libs/libX11
+	)
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
 	nepomuk? ( dev-libs/soprano )
@@ -135,6 +138,11 @@ RDEPEND="
 		>=dev-db/sqlite-3.7.9:3[extensions(+)]
 		dev-libs/icu:=
 	)
+	calligra_features_krita? (
+		dev-qt/qtdeclarative:4
+		x11-libs/libX11
+		x11-libs/libXi
+	)
 "
 DEPEND="${RDEPEND}"
 

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 8f926c9..36df3f4 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -107,7 +107,10 @@ RDEPEND="
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
 	kde? ( $(add_kdebase_dep kactivities) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
+	lcms? (
+		media-libs/lcms:2
+		x11-libs/libX11
+	)
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
 	nepomuk? ( dev-libs/soprano )
@@ -135,6 +138,11 @@ RDEPEND="
 		>=dev-db/sqlite-3.7.9:3[extensions(+)]
 		dev-libs/icu:=
 	)
+	calligra_features_krita? (
+		dev-qt/qtdeclarative:4
+		x11-libs/libX11
+		x11-libs/libXi
+	)
 "
 DEPEND="${RDEPEND}"
 

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

[Michael Palimaka]

commit:     c804dbe21776c8e3a4c97d3c5f5cad0a0a9c66c9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 18:25:52 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 18:25:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c804dbe2

[app-office/calligra] Remove apparently obsolete REQUIRED_USE entries.

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.3.ebuild | 4 +---
 app-office/calligra/calligra-9999.ebuild  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
index 06ffed0..8f926c9 100644
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -54,9 +54,7 @@ unset cal_ft
 
 REQUIRED_USE="
 	calligra_features_author? ( calligra_features_words )
-	calligra_features_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif glew lcms )
+	calligra_features_krita? ( eigen exif lcms )
 	calligra_features_plan? ( kdepim )
 	calligra_features_sheets? ( eigen )
 	vc? ( calligra_features_krita )

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 06ffed0..8f926c9 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -54,9 +54,7 @@ unset cal_ft
 
 REQUIRED_USE="
 	calligra_features_author? ( calligra_features_words )
-	calligra_features_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif glew lcms )
+	calligra_features_krita? ( eigen exif lcms )
 	calligra_features_plan? ( kdepim )
 	calligra_features_sheets? ( eigen )
 	vc? ( calligra_features_krita )

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

[Michael Palimaka]

commit:     8789fde7db8f983546b45fd054380d5fca1ae1c0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 18:07:28 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 18:07:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8789fde7

[app-office/calligra] Resort features to match upstream changes.

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.3.ebuild | 2 +-
 app-office/calligra/calligra-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
index 36c196d..06ffed0 100644
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -46,7 +46,7 @@ gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
 +truetype vc xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
+CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 36c196d..06ffed0 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -46,7 +46,7 @@ gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
 +truetype vc xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
+CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done

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

[Michael Palimaka]

commit:     b6384f86bb684195b3c18884bd5e0691b88d082e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 18:03:28 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 18:03:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b6384f86

[app-office/calligra] Use KDE_BUILD_TYPE.

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.3.ebuild | 6 +++---
 app-office/calligra/calligra-9999.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
index 2bbbb7a..36c196d 100644
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -36,9 +36,9 @@ esac
 LICENSE="GPL-2"
 SLOT="4"
 
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
+if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
 gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 2bbbb7a..36c196d 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -36,9 +36,9 @@ esac
 LICENSE="GPL-2"
 SLOT="4"
 
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
+if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
 gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk

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

[Michael Palimaka]

commit:     8de90deb6b66adff601c0166a42d3bc1cbfd79e0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 17:59:58 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 17:59:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8de90deb

[app-office/calligra] Sort eclass options.

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.3.ebuild | 8 ++++----
 app-office/calligra/calligra-9999.ebuild  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
index 17cb1a0..2bbbb7a 100644
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.2.ebuild,v 1.2 2014/05/24 11:28:43 johu Exp $
+# $Header: $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -8,11 +8,11 @@
 
 EAPI=5
 
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
 CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
 KDE_MINIMAL="4.13.1"
+OPENGL_REQUIRED="optional"
 inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 3e3dfda..2bbbb7a 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -8,11 +8,11 @@
 
 EAPI=5
 
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
 CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
 KDE_MINIMAL="4.13.1"
+OPENGL_REQUIRED="optional"
 inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"

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

[Michael Palimaka]

commit:     72c5491a166e7eb07285ad29576e1b1a6351cf2e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 17:53:03 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 17:53:03 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=72c5491a

[app-office/calligra] Version bump in progress.

Package-Manager: portage-2.2.10

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

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
new file mode 100644
index 0000000..fb6673f
--- /dev/null
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.2.ebuild,v 1.2 2014/05/24 11:28:43 johu Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+OPENGL_REQUIRED=optional
+KDE_HANDBOOK=optional
+KDE_LINGUAS_LIVE_OVERRIDE=true
+CHECKREQS_DISK_BUILD="4G"
+KDE_MINIMAL="4.13.1"
+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].?)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+	2.[456789].9999)
+		# stable branch live ebuild
+		SRC_URI="" ;;
+	9999)
+		# master branch live ebuild
+		SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
+gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
++okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
++truetype vc xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
+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_kexi? ( calligra_features_sheets )
+	calligra_features_words? ( calligra_features_sheets )
+	calligra_features_krita? ( eigen exif glew lcms )
+	calligra_features_plan? ( kdepim )
+	calligra_features_sheets? ( eigen )
+	vc? ( calligra_features_krita )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!app-office/karbon
+	!app-office/kexi
+	!app-office/koffice-data
+	!app-office/koffice-l10n
+	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/krita
+	!app-office/kspread
+	!app-office/kword
+	$(add_kdebase_dep kdelibs 'nepomuk?')
+	dev-lang/perl
+	dev-libs/boost
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
+	sys-libs/zlib
+	>=dev-qt/qtgui-4.8.1-r1:4
+	virtual/libiconv
+	attica? ( dev-libs/libattica )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2:= )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	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
+		media-libs/libvisio
+	)
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kde? ( $(add_kdebase_dep kactivities) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
+	mysql? ( virtual/mysql )
+	nepomuk? ( dev-libs/soprano )
+	okular? ( $(add_kdebase_dep okular) )
+	opengl? ( virtual/glu )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler:=
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql-base
+		dev-libs/libpqxx
+	)
+	spacenav? ( dev-libs/libspnav  )
+	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	vc? ( dev-libs/vc )
+	xbase? ( dev-db/xbase )
+	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions(+)]
+		dev-libs/icu:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+RESTRICT=test
+# bug 394273
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
+		"-DWITH_Iconv=ON"            # available on all supported arches and many more
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
+		"-DCREATIVEONLY=OFF"
+		"-DPACKAGERS_BUILD=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DQT3SUPPORT=OFF"			 # Qt5 is on the way!
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with import-filter LibEtonyek)
+		$(cmake-utils_use_with import-filter LibOdfGen)
+		$(cmake-utils_use_with import-filter LibVisio)
+		$(cmake-utils_use_with import-filter LibWpd)
+		$(cmake-utils_use_with import-filter LibWpg)
+		$(cmake-utils_use_with import-filter LibWps)
+		$(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 Marble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_build mysql mySQL)
+		$(cmake-utils_use_with nepomuk Soprano)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with opengtl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_build postgres pqxx)
+		$(cmake-utils_use_with spacenav Spnav)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
+		$(cmake-utils_use_build sybase sybase)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with vc Vc)
+		$(cmake-utils_use_with xbase XBase)
+		$(cmake-utils_use_build xbase xbase)
+		$(cmake-utils_use_with xslt LibXslt)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	# filters
+
+	kde4-base_src_configure
+}

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

[Michael Palimaka]

commit:     484d0d1055e427f30884c4292028bcbc3ede4c0e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 17:54:28 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 17:54:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=484d0d10

[app-office/calligra] Qt3Support is required to build Kexi, wrt bug #512890.

It's doesn't affect anythin else and it was already pulled in by the eclass
so it's safe to leave the upstream default.

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.3.ebuild | 1 -
 app-office/calligra/calligra-9999.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.3.ebuild b/app-office/calligra/calligra-2.8.3.ebuild
index fb6673f..17cb1a0 100644
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -182,7 +182,6 @@ src_configure() {
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
 		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DQT3SUPPORT=OFF"			 # Qt5 is on the way!
 	)
 
 	# regular options

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index eb64b8c..3e3dfda 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -182,7 +182,6 @@ src_configure() {
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
 		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DQT3SUPPORT=OFF"			 # Qt5 is on the way!
 	)
 
 	# regular options

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

[Johannes Huber]

commit:     69f64a79742cf8e952af0731fa9fd3f1ecb569fe
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 11:30:55 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 24 11:30:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=69f64a79

[app-office/calligra] Enable USE kdepim by default, bug #510384

Package-Manager: portage-2.2.10

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index a2b231e..eb64b8c 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -41,7 +41,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
+gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
 +okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
 +truetype vc xbase +xml +xslt"
 

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

[Johannes Huber]

commit:     b397cf4706c1e8edd784467b7a8ffc707040b429
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May 13 18:51:29 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May 13 18:51:29 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b397cf47

[app-office/calligra] Moved to the tree

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.0.ebuild | 251 ------------------------------
 app-office/calligra/calligra-2.8.2.ebuild | 249 -----------------------------
 2 files changed, 500 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.0.ebuild
deleted file mode 100644
index 84d3cbf..0000000
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-CHECKREQS_DISK_BUILD="4G"
-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].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# master branch live ebuild
-		SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
-opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
-+threads +truetype vc xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
-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_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_sheets? ( eigen )
-	kdepim? ( semantic-desktop )
-	vc? ( calligra_features_krita )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=dev-qt/qtgui-4.8.1-r1:4
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2:= )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	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
-		media-libs/libvisio
-	)
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	opengl? ( virtual/glu )
-	opengtl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	semantic-desktop? (
-		dev-libs/soprano
-	)
-	spacenav? ( dev-libs/libspnav  )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions(+)]
-		dev-libs/icu:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-RESTRICT=test
-# bug 394273
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DQT3SUPPORT=OFF"			 # Qt5 is on the way!
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with import-filter LibEtonyek)
-		$(cmake-utils_use_with import-filter LibOdfGen)
-		$(cmake-utils_use_with import-filter LibVisio)
-		$(cmake-utils_use_with import-filter LibWpd)
-		$(cmake-utils_use_with import-filter LibWpg)
-		$(cmake-utils_use_with import-filter LibWps)
-		$(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 Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_build mysql mySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with opengtl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_build sybase sybase)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_build xbase xbase)
-		$(cmake-utils_use_with xslt LibXslt)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/calligra-2.8.2.ebuild b/app-office/calligra/calligra-2.8.2.ebuild
deleted file mode 100644
index a2b231e..0000000
--- a/app-office/calligra/calligra-2.8.2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-CHECKREQS_DISK_BUILD="4G"
-KDE_MINIMAL="4.13.1"
-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].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# master branch live ebuild
-		SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
-+okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
-+truetype vc xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
-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_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif glew lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_sheets? ( eigen )
-	vc? ( calligra_features_krita )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	$(add_kdebase_dep kdelibs 'nepomuk?')
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=dev-qt/qtgui-4.8.1-r1:4
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2:= )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	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
-		media-libs/libvisio
-	)
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	nepomuk? ( dev-libs/soprano )
-	okular? ( $(add_kdebase_dep okular) )
-	opengl? ( virtual/glu )
-	opengtl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	spacenav? ( dev-libs/libspnav  )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions(+)]
-		dev-libs/icu:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-RESTRICT=test
-# bug 394273
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DQT3SUPPORT=OFF"			 # Qt5 is on the way!
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with import-filter LibEtonyek)
-		$(cmake-utils_use_with import-filter LibOdfGen)
-		$(cmake-utils_use_with import-filter LibVisio)
-		$(cmake-utils_use_with import-filter LibWpd)
-		$(cmake-utils_use_with import-filter LibWpg)
-		$(cmake-utils_use_with import-filter LibWps)
-		$(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 Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_build mysql mySQL)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with opengtl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_build sybase sybase)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_build xbase xbase)
-		$(cmake-utils_use_with xslt LibXslt)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}

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

[Johannes Huber]

commit:     f246878d0e03e559b8d7f3f290b074505ebe58fb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May 13 11:40:21 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May 13 11:40:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f246878d

[app-office/calligra] USE flag changes

* Fix build for calligra features krita by requiring glew by Frank Krömmelbein
<kroemmelbein <AT> gmx.de>
* Introduce nepomuk USE flag bug #508350

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.2.ebuild | 20 +++++++++-----------
 app-office/calligra/calligra-9999.ebuild  | 20 +++++++++-----------
 app-office/calligra/metadata.xml          |  1 +
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.2.ebuild b/app-office/calligra/calligra-2.8.2.ebuild
index 84d3cbf..a2b231e 100644
--- a/app-office/calligra/calligra-2.8.2.ebuild
+++ b/app-office/calligra/calligra-2.8.2.ebuild
@@ -12,6 +12,7 @@ OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
 KDE_LINGUAS_LIVE_OVERRIDE=true
 CHECKREQS_DISK_BUILD="4G"
+KDE_MINIMAL="4.13.1"
 inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
@@ -39,10 +40,10 @@ SLOT="4"
 [[ ${PV} == *9999 ]] || \
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
-opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
-+threads +truetype vc xbase +xml +xslt"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
++okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
++truetype vc xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -55,10 +56,9 @@ REQUIRED_USE="
 	calligra_features_author? ( calligra_features_words )
 	calligra_features_kexi? ( calligra_features_sheets )
 	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_krita? ( eigen exif glew lcms )
 	calligra_features_plan? ( kdepim )
 	calligra_features_sheets? ( eigen )
-	kdepim? ( semantic-desktop )
 	vc? ( calligra_features_krita )
 	test? ( calligra_features_karbon )
 "
@@ -75,7 +75,7 @@ RDEPEND="
 	!app-office/krita
 	!app-office/kspread
 	!app-office/kword
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'nepomuk?')
 	dev-lang/perl
 	dev-libs/boost
 	dev-libs/libxml2
@@ -112,6 +112,7 @@ RDEPEND="
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
+	nepomuk? ( dev-libs/soprano )
 	okular? ( $(add_kdebase_dep okular) )
 	opengl? ( virtual/glu )
 	opengtl? ( >=media-libs/opengtl-0.9.15 )
@@ -124,9 +125,6 @@ RDEPEND="
 		dev-db/postgresql-base
 		dev-libs/libpqxx
 	)
-	semantic-desktop? (
-		dev-libs/soprano
-	)
 	spacenav? ( dev-libs/libspnav  )
 	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
@@ -217,6 +215,7 @@ src_configure() {
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_build mysql mySQL)
+		$(cmake-utils_use_with nepomuk Soprano)
 		$(cmake-utils_use_with okular Okular)
 		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
@@ -225,7 +224,6 @@ src_configure() {
 		$(cmake-utils_use_with pdf Pstoedit)
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with sybase FreeTDS)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 84d3cbf..a2b231e 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -12,6 +12,7 @@ OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
 KDE_LINGUAS_LIVE_OVERRIDE=true
 CHECKREQS_DISK_BUILD="4G"
+KDE_MINIMAL="4.13.1"
 inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
@@ -39,10 +40,10 @@ SLOT="4"
 [[ ${PV} == *9999 ]] || \
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
-opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
-+threads +truetype vc xbase +xml +xslt"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
++okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
++truetype vc xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -55,10 +56,9 @@ REQUIRED_USE="
 	calligra_features_author? ( calligra_features_words )
 	calligra_features_kexi? ( calligra_features_sheets )
 	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_krita? ( eigen exif glew lcms )
 	calligra_features_plan? ( kdepim )
 	calligra_features_sheets? ( eigen )
-	kdepim? ( semantic-desktop )
 	vc? ( calligra_features_krita )
 	test? ( calligra_features_karbon )
 "
@@ -75,7 +75,7 @@ RDEPEND="
 	!app-office/krita
 	!app-office/kspread
 	!app-office/kword
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'nepomuk?')
 	dev-lang/perl
 	dev-libs/boost
 	dev-libs/libxml2
@@ -112,6 +112,7 @@ RDEPEND="
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
+	nepomuk? ( dev-libs/soprano )
 	okular? ( $(add_kdebase_dep okular) )
 	opengl? ( virtual/glu )
 	opengtl? ( >=media-libs/opengtl-0.9.15 )
@@ -124,9 +125,6 @@ RDEPEND="
 		dev-db/postgresql-base
 		dev-libs/libpqxx
 	)
-	semantic-desktop? (
-		dev-libs/soprano
-	)
 	spacenav? ( dev-libs/libspnav  )
 	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
@@ -217,6 +215,7 @@ src_configure() {
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_build mysql mySQL)
+		$(cmake-utils_use_with nepomuk Soprano)
 		$(cmake-utils_use_with okular Okular)
 		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
@@ -225,7 +224,6 @@ src_configure() {
 		$(cmake-utils_use_with pdf Pstoedit)
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with sybase FreeTDS)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 6ad4b18..af43b2c 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
 		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
 		<flag name="marble">Enable displaying of maps using Marble</flag>
+		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
 		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>

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

[Johannes Huber]

commit:     68c0ac5f55b2ed0b62477eabaaeeece2c498d63a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May  4 23:44:35 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May  4 23:44:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=68c0ac5f

[app-office/calligra] Sync with latest

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.0.ebuild | 28 +++++++++++++++++-----------
 app-office/calligra/metadata.xml          |  1 -
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.0.ebuild
index c6f36c9..84d3cbf 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.0.ebuild
@@ -40,9 +40,9 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
-+truetype vc word-perfect xbase +xml +xslt"
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
+opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
++threads +truetype vc xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -96,6 +96,14 @@ RDEPEND="
 	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
+		media-libs/libvisio
+	)
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -125,11 +133,6 @@ RDEPEND="
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
 	vc? ( dev-libs/vc )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
 	xbase? ( dev-db/xbase )
 	xslt? ( dev-libs/libxslt )
 	calligra_features_kexi? (
@@ -199,6 +202,12 @@ src_configure() {
 		$(cmake-utils_use_with glib GObject)
 		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with import-filter LibEtonyek)
+		$(cmake-utils_use_with import-filter LibOdfGen)
+		$(cmake-utils_use_with import-filter LibVisio)
+		$(cmake-utils_use_with import-filter LibWpd)
+		$(cmake-utils_use_with import-filter LibWpg)
+		$(cmake-utils_use_with import-filter LibWps)
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)
@@ -216,7 +225,6 @@ src_configure() {
 		$(cmake-utils_use_with pdf Pstoedit)
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
@@ -226,8 +234,6 @@ src_configure() {
 		$(cmake-utils_use_with threads Threads)
 		$(cmake-utils_use_with truetype Freetype)
 		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
 		$(cmake-utils_use_with xbase XBase)
 		$(cmake-utils_use_build xbase xbase)
 		$(cmake-utils_use_with xslt LibXslt)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index a213e5d..6ad4b18 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
-		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
 		<flag name="xslt">Enable xslt and exslt support format support</flag>
 	</use>

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

[Johannes Huber]

commit:     009b0f3e68b478a5b3e90d07adc27abdfc620f43
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May  4 12:48:36 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May  4 12:48:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=009b0f3e

[app-office/calligra] Version bump, bug #503544

Package-Manager: portage-2.2.10

---
 app-office/calligra/{calligra-2.8.1.ebuild => calligra-2.8.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.1.ebuild b/app-office/calligra/calligra-2.8.2.ebuild
similarity index 100%
rename from app-office/calligra/calligra-2.8.1.ebuild
rename to app-office/calligra/calligra-2.8.2.ebuild

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

[Johannes Huber]

commit:     38058ab8d6ece54df529fc71dc6ff2e2ee33c279
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  6 11:16:48 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr  6 11:16:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38058ab8

[app-office/calligra] Version bump, remove old, bug #503544

Package-Manager: portage-2.2.10

---
 ...calligra-2.8.0.ebuild => calligra-2.8.1.ebuild} | 28 +++++++++++++---------
 app-office/calligra/calligra-9999.ebuild           | 28 +++++++++++++---------
 app-office/calligra/metadata.xml                   |  2 +-
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.1.ebuild
similarity index 92%
rename from app-office/calligra/calligra-2.8.0.ebuild
rename to app-office/calligra/calligra-2.8.1.ebuild
index c6f36c9..84d3cbf 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.1.ebuild
@@ -40,9 +40,9 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
-+truetype vc word-perfect xbase +xml +xslt"
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
+opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
++threads +truetype vc xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -96,6 +96,14 @@ RDEPEND="
 	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
+		media-libs/libvisio
+	)
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -125,11 +133,6 @@ RDEPEND="
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
 	vc? ( dev-libs/vc )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
 	xbase? ( dev-db/xbase )
 	xslt? ( dev-libs/libxslt )
 	calligra_features_kexi? (
@@ -199,6 +202,12 @@ src_configure() {
 		$(cmake-utils_use_with glib GObject)
 		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with import-filter LibEtonyek)
+		$(cmake-utils_use_with import-filter LibOdfGen)
+		$(cmake-utils_use_with import-filter LibVisio)
+		$(cmake-utils_use_with import-filter LibWpd)
+		$(cmake-utils_use_with import-filter LibWpg)
+		$(cmake-utils_use_with import-filter LibWps)
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)
@@ -216,7 +225,6 @@ src_configure() {
 		$(cmake-utils_use_with pdf Pstoedit)
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
@@ -226,8 +234,6 @@ src_configure() {
 		$(cmake-utils_use_with threads Threads)
 		$(cmake-utils_use_with truetype Freetype)
 		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
 		$(cmake-utils_use_with xbase XBase)
 		$(cmake-utils_use_build xbase xbase)
 		$(cmake-utils_use_with xslt LibXslt)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index c6f36c9..84d3cbf 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -40,9 +40,9 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
-+truetype vc word-perfect xbase +xml +xslt"
+gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular
+opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff
++threads +truetype vc xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -96,6 +96,14 @@ RDEPEND="
 	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
+		media-libs/libvisio
+	)
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
@@ -125,11 +133,6 @@ RDEPEND="
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
 	vc? ( dev-libs/vc )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
 	xbase? ( dev-db/xbase )
 	xslt? ( dev-libs/libxslt )
 	calligra_features_kexi? (
@@ -199,6 +202,12 @@ src_configure() {
 		$(cmake-utils_use_with glib GObject)
 		$(cmake-utils_use_with gsf LIBGSF)
 		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with import-filter LibEtonyek)
+		$(cmake-utils_use_with import-filter LibOdfGen)
+		$(cmake-utils_use_with import-filter LibVisio)
+		$(cmake-utils_use_with import-filter LibWpd)
+		$(cmake-utils_use_with import-filter LibWpg)
+		$(cmake-utils_use_with import-filter LibWps)
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)
@@ -216,7 +225,6 @@ src_configure() {
 		$(cmake-utils_use_with pdf Pstoedit)
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
@@ -226,8 +234,6 @@ src_configure() {
 		$(cmake-utils_use_with threads Threads)
 		$(cmake-utils_use_with truetype Freetype)
 		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
 		$(cmake-utils_use_with xbase XBase)
 		$(cmake-utils_use_build xbase xbase)
 		$(cmake-utils_use_with xslt LibXslt)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 136e326..6ad4b18 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
 		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
 		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
+		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
 		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
 		<flag name="marble">Enable displaying of maps using Marble</flag>
@@ -16,7 +17,6 @@
 		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
-		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
 		<flag name="xslt">Enable xslt and exslt support format support</flag>
 	</use>

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

[Johannes Huber]

commit:     246a12c9d088ceaf3d89d18752023a816cbe2e5a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  5 12:52:38 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Apr  5 12:52:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=246a12c9

[app-office/calligra] Check required disk space for build, bug #505374

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.0.ebuild | 12 +++++++++++-
 app-office/calligra/calligra-9999.ebuild  | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.0.ebuild
index a2a5c2f..c6f36c9 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.0.ebuild
@@ -11,7 +11,8 @@ EAPI=5
 OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
 KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
+CHECKREQS_DISK_BUILD="4G"
+inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="http://www.calligra.org/"
@@ -144,6 +145,15 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 RESTRICT=test
 # bug 394273
 
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	check-reqs_pkg_setup
+}
+
 src_configure() {
 	local cal_ft
 

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index a2a5c2f..c6f36c9 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -11,7 +11,8 @@ EAPI=5
 OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
 KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
+CHECKREQS_DISK_BUILD="4G"
+inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="http://www.calligra.org/"
@@ -144,6 +145,15 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 RESTRICT=test
 # bug 394273
 
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	check-reqs_pkg_setup
+}
+
 src_configure() {
 	local cal_ft
 

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

[Johannes Huber]

commit:     0aa1c6d7f5b73caac12191194654a5e2f00ace45
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  5 12:18:49 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Apr  5 12:18:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0aa1c6d7

[app-office/calligra] Remove ancient MINIMAL declarations

Package-Manager: portage-2.2.10

---
 app-office/calligra/calligra-2.8.0.ebuild | 4 ----
 app-office/calligra/calligra-9999.ebuild  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.0.ebuild
index c43cda6..a2a5c2f 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.0.ebuild
@@ -8,12 +8,8 @@
 
 EAPI=5
 
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
 OPENGL_REQUIRED=optional
-
 KDE_HANDBOOK=optional
-
 KDE_LINGUAS_LIVE_OVERRIDE=true
 inherit kde4-base versionator
 

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index c43cda6..a2a5c2f 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -8,12 +8,8 @@
 
 EAPI=5
 
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
 OPENGL_REQUIRED=optional
-
 KDE_HANDBOOK=optional
-
 KDE_LINGUAS_LIVE_OVERRIDE=true
 inherit kde4-base versionator
 

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

[Johannes Huber]

commit:     3032aa23b27e78b302fb839d4556794772dd72be
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  5 12:15:12 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Apr  5 12:15:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3032aa23

[app-office/calligra] Import live ebuild for easier maintenance

Package-Manager: portage-2.2.10

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
new file mode 100644
index 0000000..c43cda6
--- /dev/null
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+KDE_MINIMAL=4.6.4
+QT_MINIMAL=4.8.1
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit 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].?)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+	2.[456789].9999)
+		# stable branch live ebuild
+		SRC_URI="" ;;
+	9999)
+		# master branch live ebuild
+		SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
++pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
++truetype vc word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
+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_kexi? ( calligra_features_sheets )
+	calligra_features_words? ( calligra_features_sheets )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim )
+	calligra_features_sheets? ( eigen )
+	kdepim? ( semantic-desktop )
+	vc? ( calligra_features_krita )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!app-office/karbon
+	!app-office/kexi
+	!app-office/koffice-data
+	!app-office/koffice-l10n
+	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/krita
+	!app-office/kspread
+	!app-office/kword
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	dev-lang/perl
+	dev-libs/boost
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
+	sys-libs/zlib
+	>=dev-qt/qtgui-4.8.1-r1:4
+	virtual/libiconv
+	attica? ( dev-libs/libattica )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2:= )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kde? ( $(add_kdebase_dep kactivities) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	opengl? ( virtual/glu )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler:=
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql-base
+		dev-libs/libpqxx
+	)
+	semantic-desktop? (
+		dev-libs/soprano
+	)
+	spacenav? ( dev-libs/libspnav  )
+	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	vc? ( dev-libs/vc )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		app-text/libwpg
+	)
+	xbase? ( dev-db/xbase )
+	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions(+)]
+		dev-libs/icu:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+RESTRICT=test
+# bug 394273
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
+		"-DWITH_Iconv=ON"            # available on all supported arches and many more
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
+		"-DCREATIVEONLY=OFF"
+		"-DPACKAGERS_BUILD=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DQT3SUPPORT=OFF"			 # Qt5 is on the way!
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(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 Marble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_build mysql mySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with opengtl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_build postgres pqxx)
+		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with spacenav Spnav)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
+		$(cmake-utils_use_build sybase sybase)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with vc Vc)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
+		$(cmake-utils_use_build xbase xbase)
+		$(cmake-utils_use_with xslt LibXslt)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	# filters
+
+	kde4-base_src_configure
+}

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

[Johannes Huber]

commit:     798e1769fd00051ca4d425060e7ea0a7522324e0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 10:07:38 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 10:07:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=798e1769

[app-office/calligra] Cleanup header

Package-Manager: portage-2.2.8-r1

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

diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.0.ebuild
index 6012411..c43cda6 100644
--- a/app-office/calligra/calligra-2.8.0.ebuild
+++ b/app-office/calligra/calligra-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.7.5.ebuild,v 1.7 2014/02/09 19:10:58 kensington Exp $
+# $Header: $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt

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

[David Heidelberger]

commit:     dab17d00683a315dafe55a75e7db296b59ca6e21
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Thu Mar  6 12:44:52 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Thu Mar  6 12:45:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dab17d00

app-office/calligra: bump 2.8.0

Package-Manager: portage-2.2.8-r1

---
 app-office/calligra/calligra-2.8.0.ebuild | 239 ++++++++++++++++++++++++++++++
 app-office/calligra/metadata.xml          |  23 +++
 2 files changed, 262 insertions(+)

diff --git a/app-office/calligra/calligra-2.8.0.ebuild b/app-office/calligra/calligra-2.8.0.ebuild
new file mode 100644
index 0000000..6012411
--- /dev/null
+++ b/app-office/calligra/calligra-2.8.0.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.7.5.ebuild,v 1.7 2014/02/09 19:10:58 kensington Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+KDE_MINIMAL=4.6.4
+QT_MINIMAL=4.8.1
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit 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].?)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+	2.[456789].9999)
+		# stable branch live ebuild
+		SRC_URI="" ;;
+	9999)
+		# master branch live ebuild
+		SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
++pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads
++truetype vc word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
+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_kexi? ( calligra_features_sheets )
+	calligra_features_words? ( calligra_features_sheets )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim )
+	calligra_features_sheets? ( eigen )
+	kdepim? ( semantic-desktop )
+	vc? ( calligra_features_krita )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!app-office/karbon
+	!app-office/kexi
+	!app-office/koffice-data
+	!app-office/koffice-l10n
+	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/krita
+	!app-office/kspread
+	!app-office/kword
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	dev-lang/perl
+	dev-libs/boost
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
+	sys-libs/zlib
+	>=dev-qt/qtgui-4.8.1-r1:4
+	virtual/libiconv
+	attica? ( dev-libs/libattica )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2:= )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kde? ( $(add_kdebase_dep kactivities) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	opengl? ( virtual/glu )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler:=
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql-base
+		dev-libs/libpqxx
+	)
+	semantic-desktop? (
+		dev-libs/soprano
+	)
+	spacenav? ( dev-libs/libspnav  )
+	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	vc? ( dev-libs/vc )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		app-text/libwpg
+	)
+	xbase? ( dev-db/xbase )
+	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions(+)]
+		dev-libs/icu:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+RESTRICT=test
+# bug 394273
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
+		"-DWITH_Iconv=ON"            # available on all supported arches and many more
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
+		"-DCREATIVEONLY=OFF"
+		"-DPACKAGERS_BUILD=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DQT3SUPPORT=OFF"			 # Qt5 is on the way!
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(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 Marble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_build mysql mySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with opengtl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_build postgres pqxx)
+		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with spacenav Spnav)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
+		$(cmake-utils_use_build sybase sybase)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with vc Vc)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
+		$(cmake-utils_use_build xbase xbase)
+		$(cmake-utils_use_with xslt LibXslt)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	# filters
+
+	kde4-base_src_configure
+}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
new file mode 100644
index 0000000..136e326
--- /dev/null
+++ b/app-office/calligra/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>openoffice</herd>
+	<use>
+		<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
+		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
+		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
+		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
+		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
+		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
+		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
+		<flag name="marble">Enable displaying of maps using Marble</flag>
+		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
+		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
+		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
+		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
+		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
+		<flag name="xbase">Enable support for xbase compatible database formats</flag>
+		<flag name="xslt">Enable xslt and exslt support format support</flag>
+	</use>
+</pkgmetadata>

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

[Johannes Huber]

commit:     d2bb240fda9b2dccd998261f54197d15034a9021
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 15:59:44 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 15:59:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2bb240f

[app-office/calligra] Newer version bumped in tree.

Package-Manager: portage-2.2.4

---
 app-office/calligra/calligra-2.7.1.ebuild | 232 ------------------------------
 app-office/calligra/metadata.xml          |  23 ---
 2 files changed, 255 deletions(-)

diff --git a/app-office/calligra/calligra-2.7.1.ebuild b/app-office/calligra/calligra-2.7.1.ebuild
deleted file mode 100644
index 9a43e65..0000000
--- a/app-office/calligra/calligra-2.7.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.3 2013/04/27 12:29:59 scarabeus Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
-OPENGL_REQUIRED=optional
-
-KDE_HANDBOOK=optional
-
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit 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].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# master branch live ebuild
-		SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~amd64 ~x86"
-
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres spacenav +ssl sybase test tiff +threads +truetype vc word-perfect
-xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
-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_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_sheets? ( eigen )
-	vc? ( calligra_features_krita )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	dev-libs/soprano
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=dev-qt/qtgui-4.8.1-r1:4
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	opengl? ( virtual/glu )
-	opengtl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	spacenav? ( dev-libs/libspnav  )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions(+)]
-		dev-libs/icu:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-RESTRICT=test
-# bug 394273
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-		"-DQT3SUPPORT=ON"            # kde4-base.eclass pulls this in anyway
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_build mysql mySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with opengtl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_build sybase sybase)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_build xbase xbase)
-		$(cmake-utils_use_with xslt LibXslt)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
deleted file mode 100644
index 1324bdc..0000000
--- a/app-office/calligra/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<herd>openoffice</herd>
-	<use>
-		<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
-		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
-		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
-		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
-		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
-		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
-		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
-		<flag name="marble">Enable displaying of maps using Marble</flag>
-		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
-		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
-		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
-		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on kria</flag>
-		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
-		<flag name="xbase">Enable support for xbase compatible database formats</flag>
-		<flag name="xslt">Enable xslt and exslt support format support</flag>
-	</use>
-</pkgmetadata>

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

[Michael Palimaka]

commit:     e3a34ffa8046aa2568ea72557e6603f845a34a23
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 16:02:16 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 16:02:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e3a34ffa

[app-office/calligra] Sync with portage.

Package-Manager: portage-2.2.1

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

diff --git a/app-office/calligra/calligra-2.7.1.ebuild b/app-office/calligra/calligra-2.7.1.ebuild
index fc2858d..9a43e65 100644
--- a/app-office/calligra/calligra-2.7.1.ebuild
+++ b/app-office/calligra/calligra-2.7.1.ebuild
@@ -132,7 +132,7 @@ RDEPEND="
 	xbase? ( dev-db/xbase )
 	xslt? ( dev-libs/libxslt )
 	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions]
+		>=dev-db/sqlite-3.7.9:3[extensions(+)]
 		dev-libs/icu:=
 	)
 "

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

[Michael Palimaka]

commit:     2ade051d421f866d924fc6eaca62b3bc485c131e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 07:42:02 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 07:42:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2ade051d

[app-office/calligra] Pin virtual/jpeg SLOT to 0.

Package-Manager: portage-2.1.13.5

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

diff --git a/app-office/calligra/calligra-2.7.1.ebuild b/app-office/calligra/calligra-2.7.1.ebuild
index 79e2ad4..fc2858d 100644
--- a/app-office/calligra/calligra-2.7.1.ebuild
+++ b/app-office/calligra/calligra-2.7.1.ebuild
@@ -99,8 +99,8 @@ RDEPEND="
 	glib? ( dev-libs/glib:2 )
 	gsf? ( gnome-extra/libgsf )
 	gsl? ( sci-libs/gsl )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)') )
 	lcms? ( media-libs/lcms:2 )

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

[David Heidelberger]

commit:     84317639f6042dae3ecfe0670e3613b111708f26
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sat Aug  3 10:51:11 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sat Aug  3 10:51:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=84317639

[app-office/calligra] bump to 2.7.1

Package-Manager: portage-2.2.0_alpha191

---
 app-office/calligra/{calligra-2.6.92.ebuild => calligra-2.7.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-office/calligra/calligra-2.6.92.ebuild b/app-office/calligra/calligra-2.7.1.ebuild
similarity index 100%
rename from app-office/calligra/calligra-2.6.92.ebuild
rename to app-office/calligra/calligra-2.7.1.ebuild

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

[Johannes Huber]

commit:     79dd987a14b7871e347a0f8e071687155131fcf6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 15:15:56 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 15:15:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=79dd987a

[app-office/calligra] Add build support for dev-libs/vc wrt bug #475280.

Package-Manager: portage-2.2.0_alpha186

---
 app-office/calligra/calligra-2.6.92.ebuild | 10 +++++++---
 app-office/calligra/metadata.xml           |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app-office/calligra/calligra-2.6.92.ebuild b/app-office/calligra/calligra-2.6.92.ebuild
index b3ee3af..79e2ad4 100644
--- a/app-office/calligra/calligra-2.6.92.ebuild
+++ b/app-office/calligra/calligra-2.6.92.ebuild
@@ -40,12 +40,12 @@ SLOT="4"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres spacenav +ssl sybase test tiff +threads +truetype word-perfect xbase
-+xml +xslt"
++pdf postgres spacenav +ssl sybase test tiff +threads +truetype vc word-perfect
+xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
 CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
@@ -61,6 +61,7 @@ REQUIRED_USE="
 	calligra_features_krita? ( eigen exif lcms )
 	calligra_features_plan? ( kdepim )
 	calligra_features_sheets? ( eigen )
+	vc? ( calligra_features_krita )
 	test? ( calligra_features_karbon )
 "
 
@@ -122,6 +123,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
+	vc? ( dev-libs/vc )
 	word-perfect? (
 		app-text/libwpd
 		app-text/libwps
@@ -166,6 +168,7 @@ src_configure() {
 		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
 		"-DWITH_LCMS=OFF"            # we use lcms:2
 		"-DCREATIVEONLY=OFF"
+		"-DPACKAGERS_BUILD=OFF"
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
 		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
@@ -209,6 +212,7 @@ src_configure() {
 		$(cmake-utils_use_with tiff TIFF)
 		$(cmake-utils_use_with threads Threads)
 		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with vc Vc)
 		$(cmake-utils_use_with word-perfect WPD)
 		$(cmake-utils_use_with word-perfect WPG)
 		$(cmake-utils_use_with xbase XBase)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index dcfc992..1324bdc 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
 		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
+		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on kria</flag>
 		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
 		<flag name="xslt">Enable xslt and exslt support format support</flag>

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

[David Heidelberger]

commit:     9fb32076003641447747c4ef870f104a23c69a62
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sat Jun  1 11:12:22 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sat Jun  1 11:12:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9fb32076

app-office/calligra: update beta1 to beta2 (2.6.91)

Package-Manager: portage-2.2.0_alpha177

---
 app-office/calligra/{calligra-2.6.90.ebuild => calligra-2.6.91.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-office/calligra/calligra-2.6.90.ebuild b/app-office/calligra/calligra-2.6.91.ebuild
similarity index 100%
rename from app-office/calligra/calligra-2.6.90.ebuild
rename to app-office/calligra/calligra-2.6.91.ebuild

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

[David Heidelberger]

commit:     87f3a5c76156dc9d03da035517433f221fddfa5b
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Thu May  9 11:20:40 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Thu May  9 11:20:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=87f3a5c7

[app-office/calligra-2.6.90] bump 2.7 beta

---
 app-office/calligra/calligra-2.6.90.ebuild |  229 ++++++++++++++++++++++++++++
 app-office/calligra/metadata.xml           |   22 +++
 2 files changed, 251 insertions(+), 0 deletions(-)

diff --git a/app-office/calligra/calligra-2.6.90.ebuild b/app-office/calligra/calligra-2.6.90.ebuild
new file mode 100644
index 0000000..6723ac3
--- /dev/null
+++ b/app-office/calligra/calligra-2.6.90.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.3.ebuild,v 1.3 2013/04/27 12:29:59 scarabeus Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+KDE_MINIMAL=4.6.4
+QT_MINIMAL=4.8.1
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit 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.bz2" ;;
+	2.[456789].?)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
+	2.[456789].9999)
+		# stable branch live ebuild
+		SRC_URI="" ;;
+	9999)
+		# master branch live ebuild
+		SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
++pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
+word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="author kexi words flow plan stage sheets krita karbon braindump"
+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_kexi? ( calligra_features_sheets )
+	calligra_features_words? ( calligra_features_sheets )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim semantic-desktop )
+	calligra_features_sheets? ( eigen )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!app-office/karbon
+	!app-office/kexi
+	!app-office/koffice-data
+	!app-office/koffice-l10n
+	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/krita
+	!app-office/kspread
+	!app-office/kword
+	dev-lang/perl
+	dev-libs/boost
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
+	sys-libs/zlib
+	>=dev-qt/qtgui-4.8.1-r1:4
+	virtual/libiconv
+	attica? ( dev-libs/libattica )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2 )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	opengl? ( virtual/glu )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler:=
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql-base
+		dev-libs/libpqxx
+	)
+	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+	spacenav? ( dev-libs/libspnav  )
+	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		app-text/libwpg
+	)
+	xbase? ( dev-db/xbase )
+	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions]
+		dev-libs/icu:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+RESTRICT=test
+# bug 394273
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
+		"-DWITH_Iconv=ON"            # available on all supported arches and many more
+		"-DQT3SUPPORT=ON"            # kde4-base.eclass pulls this in anyway
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
+		"-DCREATIVEONLY=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with jpeg2k OpenJPEG)
+		$(cmake-utils_use_with kdcraw Kdcraw)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with marble Marble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_build mysql mySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with opengtl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_build postgres pqxx)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with spacenav Spnav)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
+		$(cmake-utils_use_build sybase sybase)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
+		$(cmake-utils_use_build xbase xbase)
+		$(cmake-utils_use_with xslt LibXslt)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	# filters
+
+	kde4-base_src_configure
+}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
new file mode 100644
index 0000000..dcfc992
--- /dev/null
+++ b/app-office/calligra/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>openoffice</herd>
+	<use>
+		<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
+		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
+		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
+		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
+		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
+		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
+		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
+		<flag name="marble">Enable displaying of maps using Marble</flag>
+		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
+		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
+		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
+		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
+		<flag name="xbase">Enable support for xbase compatible database formats</flag>
+		<flag name="xslt">Enable xslt and exslt support format support</flag>
+	</use>
+</pkgmetadata>

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

[Andreas Hüttel]

commit:     c79ad88ec8df17c1f8bc31a7e823273b3f20e3d9
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Aug 26 20:54:31 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 20:54:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c79ad88e

[app-office/calligra] Moved live ebuild to main tree for simpler maintenance

---
 app-office/calligra/calligra-9999.ebuild |  205 ------------------------------
 app-office/calligra/metadata.xml         |   22 ---
 2 files changed, 0 insertions(+), 227 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
deleted file mode 100644
index 2944ecb..0000000
--- a/app-office/calligra/calligra-9999.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra-suite.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
-+pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
-+wmf word-perfect +xml +xslt"
-
-CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-RDEPEND="
-	!app-office/koffice-libs
-	dev-db/sqlite:3
-	dev-lang/perl
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	sys-libs/zlib
-	boost? ( dev-libs/boost )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	png? ( media-libs/libpng )
-	postgres? ( dev-db/postgresql-base )
-	semantic-desktop? ( dev-libs/soprano )
-	ssl? ( dev-libs/openssl )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		media-libs/libwpg
-	)
-	xslt? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}"
-
-# By default all bulds are enabled.
-# When you find out what some option does just describe it here and
-# make it optional if required.
-# The list is copied from ccmake output.
-#
-# BUILD_artistictextshape
-# BUILD_braindump - note collection app ; USE_EXPAND
-# BUILD_calligra - the generic "open file" office app ; default on
-# BUILD_chartshape
-# BUILD_colorengines
-# BUILD_commentshape
-# BUILD_converter
-# BUILD_cstester
-# BUILD_defaultTools
-# BUILD_divineProportion
-# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
-# BUILD_dockers
-# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
-# BUILD_generic_wrapper
-# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
-# BUILD_kexi - database manager ; handled as USE_EXPAND
-# BUILD_kformula   << formula editor, should be part of base libs
-# BUILD_koabstraction << part of base libs
-# BUILD_koreport   << reporting library, should be part of base libs
-# BUILD_kounavail  << part of base libs
-# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
-# BUILD_krita - image editor ; handled as USE_EXPAND
-# BUILD_kthesaurus << thesaurus framework, should be part of base libs
-# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
-# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
-# BUILD_mdb
-# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
-# BUILD_musicshape
-# BUILD_pathshapes
-# BUILD_pictureshape
-# BUILD_pluginshape
-# BUILD_quickprint
-# BUILD_reporting
-# BUILD_scan
-# BUILD_slidecompare
-# BUILD_staging
-# BUILD_tables - table editor ; handled as USE_EXPAND
-# BUILD_textediting
-# BUILD_textshape
-# BUILD_thumbnail
-# BUILD_treeshape
-# BUILD_variables
-# BUILD_vectorshape
-# BUILD_videoshape
-# BUILD_words - text editor ; handled as USE_EXPAND
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_LibXml2=ON" # harddep for few parts
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
-		"-DWITH_XBase=OFF" # i am not the one to support this
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with boost Boost)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with png PNG)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build wmf libkowmf)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
deleted file mode 100644
index 21d5610..0000000
--- a/app-office/calligra/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>dilfridge@gentoo.org</email>
-	</maintainer>
-	<herd>kde</herd>
-	<use>
-		<flag name="boost">Enable <pkg>dev-libs/boost</pkg> templating support</flag>
-		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
-		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
-		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
-		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
-		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
-		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
-		<flag name="mso">Enable support for various MS Office TM file formats</flag>
-		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
-		<flag name="openctl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
-		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
-		<flag name="xslt">Enable xslt and exslt support format support</flag>
-	</use>
-</pkgmetadata>

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

[Andreas Hüttel]

commit:     d06cb9f85fe4ef2694d512917949e8fb15a2d3b9
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 15:11:41 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 15:11:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d06cb9f8

[app-office/calligra] Cleanup / moved to main tree

(Portage version: 2.1.10.7/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 app-office/calligra/calligra-2.3.71.ebuild |  205 ----------------------------
 app-office/calligra/calligra-2.3.73.ebuild |  205 ----------------------------
 2 files changed, 0 insertions(+), 410 deletions(-)

diff --git a/app-office/calligra/calligra-2.3.71.ebuild b/app-office/calligra/calligra-2.3.71.ebuild
deleted file mode 100644
index 2944ecb..0000000
--- a/app-office/calligra/calligra-2.3.71.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra-suite.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
-+pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
-+wmf word-perfect +xml +xslt"
-
-CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-RDEPEND="
-	!app-office/koffice-libs
-	dev-db/sqlite:3
-	dev-lang/perl
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	sys-libs/zlib
-	boost? ( dev-libs/boost )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	png? ( media-libs/libpng )
-	postgres? ( dev-db/postgresql-base )
-	semantic-desktop? ( dev-libs/soprano )
-	ssl? ( dev-libs/openssl )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		media-libs/libwpg
-	)
-	xslt? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}"
-
-# By default all bulds are enabled.
-# When you find out what some option does just describe it here and
-# make it optional if required.
-# The list is copied from ccmake output.
-#
-# BUILD_artistictextshape
-# BUILD_braindump - note collection app ; USE_EXPAND
-# BUILD_calligra - the generic "open file" office app ; default on
-# BUILD_chartshape
-# BUILD_colorengines
-# BUILD_commentshape
-# BUILD_converter
-# BUILD_cstester
-# BUILD_defaultTools
-# BUILD_divineProportion
-# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
-# BUILD_dockers
-# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
-# BUILD_generic_wrapper
-# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
-# BUILD_kexi - database manager ; handled as USE_EXPAND
-# BUILD_kformula   << formula editor, should be part of base libs
-# BUILD_koabstraction << part of base libs
-# BUILD_koreport   << reporting library, should be part of base libs
-# BUILD_kounavail  << part of base libs
-# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
-# BUILD_krita - image editor ; handled as USE_EXPAND
-# BUILD_kthesaurus << thesaurus framework, should be part of base libs
-# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
-# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
-# BUILD_mdb
-# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
-# BUILD_musicshape
-# BUILD_pathshapes
-# BUILD_pictureshape
-# BUILD_pluginshape
-# BUILD_quickprint
-# BUILD_reporting
-# BUILD_scan
-# BUILD_slidecompare
-# BUILD_staging
-# BUILD_tables - table editor ; handled as USE_EXPAND
-# BUILD_textediting
-# BUILD_textshape
-# BUILD_thumbnail
-# BUILD_treeshape
-# BUILD_variables
-# BUILD_vectorshape
-# BUILD_videoshape
-# BUILD_words - text editor ; handled as USE_EXPAND
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_LibXml2=ON" # harddep for few parts
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
-		"-DWITH_XBase=OFF" # i am not the one to support this
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with boost Boost)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with png PNG)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build wmf libkowmf)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/calligra-2.3.73.ebuild b/app-office/calligra/calligra-2.3.73.ebuild
deleted file mode 100644
index 2944ecb..0000000
--- a/app-office/calligra/calligra-2.3.73.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra-suite.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
-+pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
-+wmf word-perfect +xml +xslt"
-
-CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-RDEPEND="
-	!app-office/koffice-libs
-	dev-db/sqlite:3
-	dev-lang/perl
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	sys-libs/zlib
-	boost? ( dev-libs/boost )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	png? ( media-libs/libpng )
-	postgres? ( dev-db/postgresql-base )
-	semantic-desktop? ( dev-libs/soprano )
-	ssl? ( dev-libs/openssl )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		media-libs/libwpg
-	)
-	xslt? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}"
-
-# By default all bulds are enabled.
-# When you find out what some option does just describe it here and
-# make it optional if required.
-# The list is copied from ccmake output.
-#
-# BUILD_artistictextshape
-# BUILD_braindump - note collection app ; USE_EXPAND
-# BUILD_calligra - the generic "open file" office app ; default on
-# BUILD_chartshape
-# BUILD_colorengines
-# BUILD_commentshape
-# BUILD_converter
-# BUILD_cstester
-# BUILD_defaultTools
-# BUILD_divineProportion
-# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
-# BUILD_dockers
-# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
-# BUILD_generic_wrapper
-# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
-# BUILD_kexi - database manager ; handled as USE_EXPAND
-# BUILD_kformula   << formula editor, should be part of base libs
-# BUILD_koabstraction << part of base libs
-# BUILD_koreport   << reporting library, should be part of base libs
-# BUILD_kounavail  << part of base libs
-# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
-# BUILD_krita - image editor ; handled as USE_EXPAND
-# BUILD_kthesaurus << thesaurus framework, should be part of base libs
-# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
-# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
-# BUILD_mdb
-# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
-# BUILD_musicshape
-# BUILD_pathshapes
-# BUILD_pictureshape
-# BUILD_pluginshape
-# BUILD_quickprint
-# BUILD_reporting
-# BUILD_scan
-# BUILD_slidecompare
-# BUILD_staging
-# BUILD_tables - table editor ; handled as USE_EXPAND
-# BUILD_textediting
-# BUILD_textshape
-# BUILD_thumbnail
-# BUILD_treeshape
-# BUILD_variables
-# BUILD_vectorshape
-# BUILD_videoshape
-# BUILD_words - text editor ; handled as USE_EXPAND
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_LibXml2=ON" # harddep for few parts
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
-		"-DWITH_XBase=OFF" # i am not the one to support this
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with boost Boost)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with png PNG)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build wmf libkowmf)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-
-	# filters
-
-	kde4-base_src_configure
-}

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

[Andreas Hüttel]

commit:     08d68ff5ce20a38710fb107da39f00e46a36980a
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 20:44:34 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 20:44:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=08d68ff5

[app-office/calligra] Version bump

(Portage version: 2.1.10.6/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 app-office/calligra/calligra-2.3.73.ebuild |  205 ++++++++++++++++++++++++++++
 1 files changed, 205 insertions(+), 0 deletions(-)

diff --git a/app-office/calligra/calligra-2.3.73.ebuild b/app-office/calligra/calligra-2.3.73.ebuild
new file mode 100644
index 0000000..2944ecb
--- /dev/null
+++ b/app-office/calligra/calligra-2.3.73.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6
+OPENGL_REQUIRED=optional
+KDE_HANDBOOK=optional
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra-suite.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
++pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
++wmf word-perfect +xml +xslt"
+
+CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+RDEPEND="
+	!app-office/koffice-libs
+	dev-db/sqlite:3
+	dev-lang/perl
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	sys-libs/zlib
+	boost? ( dev-libs/boost )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2 )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? ( media-libs/lcms:2 )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	openctl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler
+		media-gfx/pstoedit
+	)
+	png? ( media-libs/libpng )
+	postgres? ( dev-db/postgresql-base )
+	semantic-desktop? ( dev-libs/soprano )
+	ssl? ( dev-libs/openssl )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		media-libs/libwpg
+	)
+	xslt? ( dev-libs/libxslt )
+"
+DEPEND="${RDEPEND}"
+
+# By default all bulds are enabled.
+# When you find out what some option does just describe it here and
+# make it optional if required.
+# The list is copied from ccmake output.
+#
+# BUILD_artistictextshape
+# BUILD_braindump - note collection app ; USE_EXPAND
+# BUILD_calligra - the generic "open file" office app ; default on
+# BUILD_chartshape
+# BUILD_colorengines
+# BUILD_commentshape
+# BUILD_converter
+# BUILD_cstester
+# BUILD_defaultTools
+# BUILD_divineProportion
+# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
+# BUILD_dockers
+# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
+# BUILD_generic_wrapper
+# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
+# BUILD_kexi - database manager ; handled as USE_EXPAND
+# BUILD_kformula   << formula editor, should be part of base libs
+# BUILD_koabstraction << part of base libs
+# BUILD_koreport   << reporting library, should be part of base libs
+# BUILD_kounavail  << part of base libs
+# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
+# BUILD_krita - image editor ; handled as USE_EXPAND
+# BUILD_kthesaurus << thesaurus framework, should be part of base libs
+# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
+# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
+# BUILD_mdb
+# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
+# BUILD_musicshape
+# BUILD_pathshapes
+# BUILD_pictureshape
+# BUILD_pluginshape
+# BUILD_quickprint
+# BUILD_reporting
+# BUILD_scan
+# BUILD_slidecompare
+# BUILD_staging
+# BUILD_tables - table editor ; handled as USE_EXPAND
+# BUILD_textediting
+# BUILD_textshape
+# BUILD_thumbnail
+# BUILD_treeshape
+# BUILD_variables
+# BUILD_vectorshape
+# BUILD_videoshape
+# BUILD_words - text editor ; handled as USE_EXPAND
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DWITH_LibXml2=ON" # harddep for few parts
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
+		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-DWITH_XBase=OFF" # i am not the one to support this
+		"-DCREATIVEONLY=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with boost Boost)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with iconv Iconv)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with jpeg2k OpenJPEG)
+		$(cmake-utils_use_with kdcraw Kdcraw)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with png PNG)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xslt LibXslt)
+		$(cmake-utils_use_build wmf libkowmf)
+		$(cmake-utils_use_build mso libmsooxml)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+
+	# filters
+
+	kde4-base_src_configure
+}

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

[Andreas Hüttel]

commit:     c34f9ef5921114037e673d3f938022231d127618
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 20:22:05 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 20:22:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c34f9ef5

[app-office/calligra] Add myself as maintainer

(Portage version: 2.1.10.6/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 app-office/calligra/metadata.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 5f41ad7..21d5610 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer>
+		<email>dilfridge@gentoo.org</email>
+	</maintainer>
 	<herd>kde</herd>
 	<use>
 		<flag name="boost">Enable <pkg>dev-libs/boost</pkg> templating support</flag>

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

[Tomas Chvatal]

commit:     d61471eeaade9a9680c0e1dcba35ed35ceb31c66
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 10:58:25 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue May 24 10:58:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d61471ee

[app-office/calligra] Document local useflags.

---
 app-office/calligra/calligra-2.3.71.ebuild |   13 ++++++++-----
 app-office/calligra/calligra-9999.ebuild   |   13 ++++++++-----
 app-office/calligra/metadata.xml           |   14 ++++++++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/app-office/calligra/calligra-2.3.71.ebuild b/app-office/calligra/calligra-2.3.71.ebuild
index d061716..2944ecb 100644
--- a/app-office/calligra/calligra-2.3.71.ebuild
+++ b/app-office/calligra/calligra-2.3.71.ebuild
@@ -8,6 +8,7 @@ KDE_SCM=git
 KDE_MINIMAL=4.6
 OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
+KDE_LINGUAS_LIVE_OVERRIDE=true
 inherit kde4-base
 
 DESCRIPTION="KDE Office Suite"
@@ -19,7 +20,7 @@ SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
-+png +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
++pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
 +wmf word-perfect +xml +xslt"
 
 CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
@@ -57,10 +58,12 @@ RDEPEND="
 	okular? ( $(add_kdebase_dep okular) )
 	openctl? ( >=media-libs/opengtl-0.9.15 )
 	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler
+		media-gfx/pstoedit
+	)
 	png? ( media-libs/libpng )
-	poppler? ( app-text/poppler )
 	postgres? ( dev-db/postgresql-base )
-	pstoedit? ( media-gfx/pstoedit )
 	semantic-desktop? ( dev-libs/soprano )
 	ssl? ( dev-libs/openssl )
 	tiff? ( media-libs/tiff )
@@ -175,10 +178,10 @@ src_configure() {
 		$(cmake-utils_use_with openctl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
 		$(cmake-utils_use_with png PNG)
-		$(cmake-utils_use_with poppler Poppler)
 		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with pstoedit Pstoedit)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with tiff TIFF)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index d061716..2944ecb 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -8,6 +8,7 @@ KDE_SCM=git
 KDE_MINIMAL=4.6
 OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
+KDE_LINGUAS_LIVE_OVERRIDE=true
 inherit kde4-base
 
 DESCRIPTION="KDE Office Suite"
@@ -19,7 +20,7 @@ SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
-+png +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
++pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
 +wmf word-perfect +xml +xslt"
 
 CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
@@ -57,10 +58,12 @@ RDEPEND="
 	okular? ( $(add_kdebase_dep okular) )
 	openctl? ( >=media-libs/opengtl-0.9.15 )
 	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler
+		media-gfx/pstoedit
+	)
 	png? ( media-libs/libpng )
-	poppler? ( app-text/poppler )
 	postgres? ( dev-db/postgresql-base )
-	pstoedit? ( media-gfx/pstoedit )
 	semantic-desktop? ( dev-libs/soprano )
 	ssl? ( dev-libs/openssl )
 	tiff? ( media-libs/tiff )
@@ -175,10 +178,10 @@ src_configure() {
 		$(cmake-utils_use_with openctl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
 		$(cmake-utils_use_with png PNG)
-		$(cmake-utils_use_with poppler Poppler)
 		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with pstoedit Pstoedit)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with tiff TIFF)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index a23f444..5f41ad7 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -2,4 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="boost">Enable <pkg>dev-libs/boost</pkg> templating support</flag>
+		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
+		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
+		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
+		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
+		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
+		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
+		<flag name="mso">Enable support for various MS Office TM file formats</flag>
+		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
+		<flag name="openctl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
+		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
+		<flag name="xslt">Enable xslt and exslt support format support</flag>
+	</use>
 </pkgmetadata>

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

[Tomas Chvatal]

commit:     0d061172de9a3892c7823a302b1e219c46ea6979
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 09:08:08 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon May 16 09:08:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0d061172

[app-office/calligra] Depend just on eigen:2

---
 app-office/calligra/calligra-2.3.71.ebuild |    2 +-
 app-office/calligra/calligra-9999.ebuild   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-2.3.71.ebuild b/app-office/calligra/calligra-2.3.71.ebuild
index 7299e19..d061716 100644
--- a/app-office/calligra/calligra-2.3.71.ebuild
+++ b/app-office/calligra/calligra-2.3.71.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	sys-libs/zlib
 	boost? ( dev-libs/boost )
 	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen )
+	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2 )
 	fftw? ( sci-libs/fftw:3.0 )
 	fontconfig? ( media-libs/fontconfig )

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 7299e19..d061716 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	sys-libs/zlib
 	boost? ( dev-libs/boost )
 	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen )
+	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2 )
 	fftw? ( sci-libs/fftw:3.0 )
 	fontconfig? ( media-libs/fontconfig )

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

[Tomas Chvatal]

commit:     4c7c198ab4d841c7d1814e3c312847207849d3c0
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 08:53:38 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon May 16 08:53:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4c7c198a

[app-office/calligra] Add more options

---
 app-office/calligra/calligra-2.3.71.ebuild |   38 +++++++++++++++------------
 app-office/calligra/calligra-9999.ebuild   |   24 +++++++++--------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/app-office/calligra/calligra-2.3.71.ebuild b/app-office/calligra/calligra-2.3.71.ebuild
index 94308f5..7299e19 100644
--- a/app-office/calligra/calligra-2.3.71.ebuild
+++ b/app-office/calligra/calligra-2.3.71.ebuild
@@ -18,11 +18,11 @@ LICENSE="GPL-2"
 SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +okular openctl openexr +png
-+poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
-word-perfect +xml +xslt"
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
++png +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
++wmf word-perfect +xml +xslt"
 
-CAL_FTS="karbon kexi kpresenter krita tables words"
+CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done
@@ -77,9 +77,11 @@ DEPEND="${RDEPEND}"
 # By default all bulds are enabled.
 # When you find out what some option does just describe it here and
 # make it optional if required.
+# The list is copied from ccmake output.
+#
 # BUILD_artistictextshape
-# BUILD_braindump
-# BUILD_calligra
+# BUILD_braindump - note collection app ; USE_EXPAND
+# BUILD_calligra - the generic "open file" office app ; default on
 # BUILD_chartshape
 # BUILD_colorengines
 # BUILD_commentshape
@@ -89,21 +91,21 @@ DEPEND="${RDEPEND}"
 # BUILD_divineProportion
 # BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
 # BUILD_dockers
-# BUILD_flow
+# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
 # BUILD_generic_wrapper
 # BUILD_karbon - vector drawing app ; handled as USE_EXPAND
 # BUILD_kexi - database manager ; handled as USE_EXPAND
-# BUILD_kformula
-# BUILD_koabstraction
-# BUILD_koreport
-# BUILD_kounavail
-# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND
+# BUILD_kformula   << formula editor, should be part of base libs
+# BUILD_koabstraction << part of base libs
+# BUILD_koreport   << reporting library, should be part of base libs
+# BUILD_kounavail  << part of base libs
+# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
 # BUILD_krita - image editor ; handled as USE_EXPAND
-# BUILD_kthesaurus
-# BUILD_libkowmf
-# BUILD_libmsooxml
+# BUILD_kthesaurus << thesaurus framework, should be part of base libs
+# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
+# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
 # BUILD_mdb
-# BUILD_mobile
+# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
 # BUILD_musicshape
 # BUILD_pathshapes
 # BUILD_pictureshape
@@ -137,6 +139,7 @@ src_configure() {
 
 	# default disablers
 	mycmakeargs+=(
+		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
 		"-DWITH_LCMS=OFF" # we use lcms:2
 		"-DWITH_XBase=OFF" # i am not the one to support this
 		"-DCREATIVEONLY=OFF"
@@ -184,10 +187,11 @@ src_configure() {
 		$(cmake-utils_use_with word-perfect WPD)
 		$(cmake-utils_use_with word-perfect WPG)
 		$(cmake-utils_use_with xslt LibXslt)
+		$(cmake-utils_use_build wmf libkowmf)
+		$(cmake-utils_use_build mso libmsooxml)
 	)
 
 	# applications
-	CAL_FTS="karbon kexi kpresenter krita tables words"
 	for cal_ft in ${CAL_FTS}; do
 		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
 	done

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 394ab21..7299e19 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -18,11 +18,11 @@ LICENSE="GPL-2"
 SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +okular openctl openexr +png
-+poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
-word-perfect +xml +xslt"
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
++png +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
++wmf word-perfect +xml +xslt"
 
-CAL_FTS="words stage tables karbon krita kexi flow kplato braindump"
+CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done
@@ -77,12 +77,11 @@ DEPEND="${RDEPEND}"
 # By default all bulds are enabled.
 # When you find out what some option does just describe it here and
 # make it optional if required.
-#
-# where does that list come from? cmakelist looks a bit different :(
+# The list is copied from ccmake output.
 #
 # BUILD_artistictextshape
-# BUILD_braindump - note collection app (<< alpha); USE_EXPAND
-# BUILD_calligra - the generic "open file" office app ; USE_EXPAND? default on?
+# BUILD_braindump - note collection app ; USE_EXPAND
+# BUILD_calligra - the generic "open file" office app ; default on
 # BUILD_chartshape
 # BUILD_colorengines
 # BUILD_commentshape
@@ -103,10 +102,10 @@ DEPEND="${RDEPEND}"
 # BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
 # BUILD_krita - image editor ; handled as USE_EXPAND
 # BUILD_kthesaurus << thesaurus framework, should be part of base libs
-# BUILD_libkowmf   << wmf filter (use wmf?)
-# BUILD_libmsooxml << msooxml filter (use something?)
+# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
+# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
 # BUILD_mdb
-# BUILD_mobile << "Maemo 5 Office UI for KOffice" ?!
+# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
 # BUILD_musicshape
 # BUILD_pathshapes
 # BUILD_pictureshape
@@ -140,6 +139,7 @@ src_configure() {
 
 	# default disablers
 	mycmakeargs+=(
+		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
 		"-DWITH_LCMS=OFF" # we use lcms:2
 		"-DWITH_XBase=OFF" # i am not the one to support this
 		"-DCREATIVEONLY=OFF"
@@ -187,6 +187,8 @@ src_configure() {
 		$(cmake-utils_use_with word-perfect WPD)
 		$(cmake-utils_use_with word-perfect WPG)
 		$(cmake-utils_use_with xslt LibXslt)
+		$(cmake-utils_use_build wmf libkowmf)
+		$(cmake-utils_use_build mso libmsooxml)
 	)
 
 	# applications

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

[Andreas K. Huettel]

commit:     57fef6bf9399070b531d44c73159de6d2b818065
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun May 15 21:14:23 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May 15 21:14:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=57fef6bf

[app-office/calligra] Some notes

---
 app-office/calligra/calligra-9999.ebuild |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 94308f5..394ab21 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -22,7 +22,7 @@ gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +okular openctl openexr +png
 +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
 word-perfect +xml +xslt"
 
-CAL_FTS="karbon kexi kpresenter krita tables words"
+CAL_FTS="words stage tables karbon krita kexi flow kplato braindump"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done
@@ -77,9 +77,12 @@ DEPEND="${RDEPEND}"
 # By default all bulds are enabled.
 # When you find out what some option does just describe it here and
 # make it optional if required.
+#
+# where does that list come from? cmakelist looks a bit different :(
+#
 # BUILD_artistictextshape
-# BUILD_braindump
-# BUILD_calligra
+# BUILD_braindump - note collection app (<< alpha); USE_EXPAND
+# BUILD_calligra - the generic "open file" office app ; USE_EXPAND? default on?
 # BUILD_chartshape
 # BUILD_colorengines
 # BUILD_commentshape
@@ -89,21 +92,21 @@ DEPEND="${RDEPEND}"
 # BUILD_divineProportion
 # BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
 # BUILD_dockers
-# BUILD_flow
+# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
 # BUILD_generic_wrapper
 # BUILD_karbon - vector drawing app ; handled as USE_EXPAND
 # BUILD_kexi - database manager ; handled as USE_EXPAND
-# BUILD_kformula
-# BUILD_koabstraction
-# BUILD_koreport
-# BUILD_kounavail
-# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND
+# BUILD_kformula   << formula editor, should be part of base libs
+# BUILD_koabstraction << part of base libs
+# BUILD_koreport   << reporting library, should be part of base libs
+# BUILD_kounavail  << part of base libs
+# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
 # BUILD_krita - image editor ; handled as USE_EXPAND
-# BUILD_kthesaurus
-# BUILD_libkowmf
-# BUILD_libmsooxml
+# BUILD_kthesaurus << thesaurus framework, should be part of base libs
+# BUILD_libkowmf   << wmf filter (use wmf?)
+# BUILD_libmsooxml << msooxml filter (use something?)
 # BUILD_mdb
-# BUILD_mobile
+# BUILD_mobile << "Maemo 5 Office UI for KOffice" ?!
 # BUILD_musicshape
 # BUILD_pathshapes
 # BUILD_pictureshape
@@ -187,7 +190,6 @@ src_configure() {
 	)
 
 	# applications
-	CAL_FTS="karbon kexi kpresenter krita tables words"
 	for cal_ft in ${CAL_FTS}; do
 		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
 	done

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

[Tomas Chvatal]

commit:     d769778d432c42e4d4f601de2145a3a6d4daba90
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 16:54:51 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May 15 16:54:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d769778d

[app-office/calligra] Add keywords.

---
 app-office/calligra/calligra-2.3.71.ebuild |    2 +-
 app-office/calligra/calligra-9999.ebuild   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-2.3.71.ebuild b/app-office/calligra/calligra-2.3.71.ebuild
index 08a89fa..94308f5 100644
--- a/app-office/calligra/calligra-2.3.71.ebuild
+++ b/app-office/calligra/calligra-2.3.71.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.calligra-suite.org/"
 
 LICENSE="GPL-2"
 SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS=""
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +okular openctl openexr +png
 +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 08a89fa..94308f5 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.calligra-suite.org/"
 
 LICENSE="GPL-2"
 SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS=""
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +okular openctl openexr +png
 +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype

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

[Tomas Chvatal]

commit:     119a1591c9c6fc1494fbf65c004d9f2dd73ea62b
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 16:53:40 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May 15 16:53:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=119a1591

[app-office/calligra] progress++, add alpha, i shall kill first one opening bugs against it...

---
 ...calligra-9999.ebuild => calligra-2.3.71.ebuild} |   65 +++++++++++++++++++-
 app-office/calligra/calligra-9999.ebuild           |   65 +++++++++++++++++++-
 2 files changed, 128 insertions(+), 2 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-2.3.71.ebuild
similarity index 69%
copy from app-office/calligra/calligra-9999.ebuild
copy to app-office/calligra/calligra-2.3.71.ebuild
index bd0d44f..08a89fa 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-2.3.71.ebuild
@@ -7,19 +7,27 @@ EAPI=4
 KDE_SCM=git
 KDE_MINIMAL=4.6
 OPENGL_REQUIRED=optional
+KDE_HANDBOOK=optional
 inherit kde4-base
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="http://www.calligra-suite.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+[[ ${PV} == 9999 ]] || KEYWORDS=""
 IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +okular openctl openexr +png
 +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
 word-perfect +xml +xslt"
 
+CAL_FTS="karbon kexi kpresenter krita tables words"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
 RDEPEND="
 	!app-office/koffice-libs
 	dev-db/sqlite:3
@@ -66,7 +74,58 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+# By default all bulds are enabled.
+# When you find out what some option does just describe it here and
+# make it optional if required.
+# BUILD_artistictextshape
+# BUILD_braindump
+# BUILD_calligra
+# BUILD_chartshape
+# BUILD_colorengines
+# BUILD_commentshape
+# BUILD_converter
+# BUILD_cstester
+# BUILD_defaultTools
+# BUILD_divineProportion
+# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
+# BUILD_dockers
+# BUILD_flow
+# BUILD_generic_wrapper
+# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
+# BUILD_kexi - database manager ; handled as USE_EXPAND
+# BUILD_kformula
+# BUILD_koabstraction
+# BUILD_koreport
+# BUILD_kounavail
+# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND
+# BUILD_krita - image editor ; handled as USE_EXPAND
+# BUILD_kthesaurus
+# BUILD_libkowmf
+# BUILD_libmsooxml
+# BUILD_mdb
+# BUILD_mobile
+# BUILD_musicshape
+# BUILD_pathshapes
+# BUILD_pictureshape
+# BUILD_pluginshape
+# BUILD_quickprint
+# BUILD_reporting
+# BUILD_scan
+# BUILD_slidecompare
+# BUILD_staging
+# BUILD_tables - table editor ; handled as USE_EXPAND
+# BUILD_textediting
+# BUILD_textshape
+# BUILD_thumbnail
+# BUILD_treeshape
+# BUILD_variables
+# BUILD_vectorshape
+# BUILD_videoshape
+# BUILD_words - text editor ; handled as USE_EXPAND
+
 src_configure() {
+	local cal_ft
+
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
 		"-DWITH_LibXml2=ON" # harddep for few parts
@@ -128,6 +187,10 @@ src_configure() {
 	)
 
 	# applications
+	CAL_FTS="karbon kexi kpresenter krita tables words"
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
 
 	# filters
 

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index bd0d44f..08a89fa 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -7,19 +7,27 @@ EAPI=4
 KDE_SCM=git
 KDE_MINIMAL=4.6
 OPENGL_REQUIRED=optional
+KDE_HANDBOOK=optional
 inherit kde4-base
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="http://www.calligra-suite.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+[[ ${PV} == 9999 ]] || KEYWORDS=""
 IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +okular openctl openexr +png
 +poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
 word-perfect +xml +xslt"
 
+CAL_FTS="karbon kexi kpresenter krita tables words"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
 RDEPEND="
 	!app-office/koffice-libs
 	dev-db/sqlite:3
@@ -66,7 +74,58 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+# By default all bulds are enabled.
+# When you find out what some option does just describe it here and
+# make it optional if required.
+# BUILD_artistictextshape
+# BUILD_braindump
+# BUILD_calligra
+# BUILD_chartshape
+# BUILD_colorengines
+# BUILD_commentshape
+# BUILD_converter
+# BUILD_cstester
+# BUILD_defaultTools
+# BUILD_divineProportion
+# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
+# BUILD_dockers
+# BUILD_flow
+# BUILD_generic_wrapper
+# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
+# BUILD_kexi - database manager ; handled as USE_EXPAND
+# BUILD_kformula
+# BUILD_koabstraction
+# BUILD_koreport
+# BUILD_kounavail
+# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND
+# BUILD_krita - image editor ; handled as USE_EXPAND
+# BUILD_kthesaurus
+# BUILD_libkowmf
+# BUILD_libmsooxml
+# BUILD_mdb
+# BUILD_mobile
+# BUILD_musicshape
+# BUILD_pathshapes
+# BUILD_pictureshape
+# BUILD_pluginshape
+# BUILD_quickprint
+# BUILD_reporting
+# BUILD_scan
+# BUILD_slidecompare
+# BUILD_staging
+# BUILD_tables - table editor ; handled as USE_EXPAND
+# BUILD_textediting
+# BUILD_textshape
+# BUILD_thumbnail
+# BUILD_treeshape
+# BUILD_variables
+# BUILD_vectorshape
+# BUILD_videoshape
+# BUILD_words - text editor ; handled as USE_EXPAND
+
 src_configure() {
+	local cal_ft
+
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
 		"-DWITH_LibXml2=ON" # harddep for few parts
@@ -128,6 +187,10 @@ src_configure() {
 	)
 
 	# applications
+	CAL_FTS="karbon kexi kpresenter krita tables words"
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
 
 	# filters
 

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

[Tomas Chvatal]

commit:     ac01dd635abef76ca0caf8560865234f16b96b8c
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 09:16:03 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri May 13 09:16:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ac01dd63

[app-office/calligra] Enable some sane defaults.

---
 app-office/calligra/calligra-9999.ebuild |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 18598b2..bd0d44f 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -15,10 +15,10 @@ HOMEPAGE="http://www.calligra-suite.org/"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="boost crypt eigen exif fftw fontconfig freetds gif glew glib gsf gsl
-iconv jpeg jpeg2k +kdcraw kdepim lcms mysql +okular openctl openexr png
-+poppler postgres pstoedit semantic-desktop ssl tiff threads truetype
-word-perfect xml xslt"
+IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +okular openctl openexr +png
++poppler postgres pstoedit +semantic-desktop +ssl tiff +threads +truetype
+word-perfect +xml +xslt"
 
 RDEPEND="
 	!app-office/koffice-libs

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

[Tomas Chvatal]

commit:     9e3afa96cae14ef5f61663baeae33fb764cb2d87
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 09:14:36 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu May 12 09:14:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9e3afa96

[app-office/calligra] Use correct slot.

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index a37d6f7..18598b2 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen )
 	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3 )
+	fftw? ( sci-libs/fftw:3.0 )
 	fontconfig? ( media-libs/fontconfig )
 	freetds? ( dev-db/freetds )
 	gif? ( media-libs/giflib )

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

[Tomas Chvatal]

commit:     f6f3a9e5ac9ecaa6afdc91ea4bea4bb47ef54200
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 16:46:49 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu May  5 16:47:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f6f3a9e5

[app-office/calligra] Add initial calligra ebuild. TODO: BUID_x for optional building specified parts like words/kexi

---
 app-office/calligra/calligra-9999.ebuild |  135 ++++++++++++++++++++++++++++++
 app-office/calligra/metadata.xml         |    5 +
 2 files changed, 140 insertions(+), 0 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
new file mode 100644
index 0000000..a37d6f7
--- /dev/null
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6
+OPENGL_REQUIRED=optional
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra-suite.org/"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost crypt eigen exif fftw fontconfig freetds gif glew glib gsf gsl
+iconv jpeg jpeg2k +kdcraw kdepim lcms mysql +okular openctl openexr png
++poppler postgres pstoedit semantic-desktop ssl tiff threads truetype
+word-perfect xml xslt"
+
+RDEPEND="
+	!app-office/koffice-libs
+	dev-db/sqlite:3
+	dev-lang/perl
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	sys-libs/zlib
+	boost? ( dev-libs/boost )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen )
+	exif? ( media-gfx/exiv2 )
+	fftw? ( sci-libs/fftw:3 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? ( media-libs/lcms:2 )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	openctl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	poppler? ( app-text/poppler )
+	postgres? ( dev-db/postgresql-base )
+	pstoedit? ( media-gfx/pstoedit )
+	semantic-desktop? ( dev-libs/soprano )
+	ssl? ( dev-libs/openssl )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		media-libs/libwpg
+	)
+	xslt? ( dev-libs/libxslt )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DWITH_LibXml2=ON" # harddep for few parts
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-DWITH_XBase=OFF" # i am not the one to support this
+		"-DCREATIVEONLY=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with boost Boost)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with iconv Iconv)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with jpeg2k OpenJPEG)
+		$(cmake-utils_use_with kdcraw Kdcraw)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with png PNG)
+		$(cmake-utils_use_with poppler Poppler)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_with pstoedit Pstoedit)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xslt LibXslt)
+	)
+
+	# applications
+
+	# filters
+
+	kde4-base_src_configure
+}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/app-office/calligra/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>