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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2015-08-12 20:33 Johannes Huber
  0 siblings, 0 replies; 69+ messages in thread
From: Johannes Huber @ 2015-08-12 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     271966c13a98b7b47e6f0bba58cf70f475d84385
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 20:35:36 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 20:35:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271966c1

app-office/calligra: Drop Nepomuk support

Package-Manager: portage-2.2.20.1

 app-office/calligra/calligra-2.8.5.ebuild | 10 ++++------
 app-office/calligra/calligra-2.8.7.ebuild | 10 ++++------
 app-office/calligra/calligra-9999.ebuild  | 10 ++++------
 app-office/calligra/metadata.xml          |  1 -
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.5.ebuild b/app-office/calligra/calligra-2.8.5.ebuild
index c046361..5de581d 100644
--- a/app-office/calligra/calligra-2.8.5.ebuild
+++ b/app-office/calligra/calligra-2.8.5.ebuild
@@ -41,9 +41,9 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 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"
+import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql +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"
@@ -73,7 +73,6 @@ RDEPEND="
 	!app-office/krita
 	!app-office/kspread
 	!app-office/kword
-	$(add_kdebase_dep kdelibs 'nepomuk?')
 	$(add_kdeapps_dep knewstuff)
 	dev-lang/perl
 	dev-libs/boost
@@ -112,7 +111,6 @@ RDEPEND="
 	)
 	marble? ( $(add_kdeapps_dep marble) )
 	mysql? ( virtual/mysql )
-	nepomuk? ( dev-libs/soprano )
 	okular? ( $(add_kdeapps_dep okular) )
 	opengl? ( virtual/glu )
 	openexr? ( media-libs/openexr )
@@ -174,6 +172,7 @@ src_configure() {
 		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
 		"-DCREATIVEONLY=OFF"
 		"-DPACKAGERS_BUILD=OFF"
+		"-DWITH_Soprano=OFF"
 	)
 
 	# regular options
@@ -202,7 +201,6 @@ src_configure() {
 		$(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)

diff --git a/app-office/calligra/calligra-2.8.7.ebuild b/app-office/calligra/calligra-2.8.7.ebuild
index 4f7f95e..e521084 100644
--- a/app-office/calligra/calligra-2.8.7.ebuild
+++ b/app-office/calligra/calligra-2.8.7.ebuild
@@ -41,9 +41,9 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 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"
+import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql +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"
@@ -73,7 +73,6 @@ RDEPEND="
 	!app-office/krita
 	!app-office/kspread
 	!app-office/kword
-	$(add_kdebase_dep kdelibs 'nepomuk?')
 	$(add_kdeapps_dep knewstuff)
 	dev-lang/perl
 	dev-libs/boost
@@ -112,7 +111,6 @@ RDEPEND="
 	)
 	marble? ( $(add_kdeapps_dep marble) )
 	mysql? ( virtual/mysql )
-	nepomuk? ( dev-libs/soprano )
 	okular? ( $(add_kdeapps_dep okular) )
 	opengl? ( virtual/glu )
 	openexr? ( media-libs/openexr )
@@ -174,6 +172,7 @@ src_configure() {
 		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
 		"-DCREATIVEONLY=OFF"
 		"-DPACKAGERS_BUILD=OFF"
+		"-DWITH_Soprano=OFF"
 	)
 
 	# regular options
@@ -202,7 +201,6 @@ src_configure() {
 		$(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)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 4f7f95e..e521084 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -41,9 +41,9 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 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"
+import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql +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"
@@ -73,7 +73,6 @@ RDEPEND="
 	!app-office/krita
 	!app-office/kspread
 	!app-office/kword
-	$(add_kdebase_dep kdelibs 'nepomuk?')
 	$(add_kdeapps_dep knewstuff)
 	dev-lang/perl
 	dev-libs/boost
@@ -112,7 +111,6 @@ RDEPEND="
 	)
 	marble? ( $(add_kdeapps_dep marble) )
 	mysql? ( virtual/mysql )
-	nepomuk? ( dev-libs/soprano )
 	okular? ( $(add_kdeapps_dep okular) )
 	opengl? ( virtual/glu )
 	openexr? ( media-libs/openexr )
@@ -174,6 +172,7 @@ src_configure() {
 		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
 		"-DCREATIVEONLY=OFF"
 		"-DPACKAGERS_BUILD=OFF"
+		"-DWITH_Soprano=OFF"
 	)
 
 	# regular options
@@ -202,7 +201,6 @@ src_configure() {
 		$(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)

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 4f6e350..e0edfb2 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -13,7 +13,6 @@
 		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-apps/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-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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2015-08-18 11:20 Johannes Huber
  0 siblings, 0 replies; 69+ messages in thread
From: Johannes Huber @ 2015-08-18 11:20 UTC (permalink / raw
  To: gentoo-commits

commit:     40140f8ca8162288b9d5404183147109abcc5e2b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 11:22:17 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 11:22:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40140f8c

app-office/calligra: Drop glew USE flag

Add missing slot operator.

Gentoo-Bug: 532762

Package-Manager: portage-2.2.20.1

 app-office/calligra/calligra-2.8.7.ebuild | 20 +++++++++++---------
 app-office/calligra/calligra-9999.ebuild  | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.7.ebuild b/app-office/calligra/calligra-2.8.7.ebuild
index e521084..bce7b6d 100644
--- a/app-office/calligra/calligra-2.8.7.ebuild
+++ b/app-office/calligra/calligra-2.8.7.ebuild
@@ -40,7 +40,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glib +gsf gsl
 import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql +okular
 openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc xbase
 +xml"
@@ -77,7 +77,7 @@ RDEPEND="
 	dev-lang/perl
 	dev-libs/boost
 	dev-qt/qtcore:4[exceptions]
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
@@ -88,15 +88,14 @@ RDEPEND="
 	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/libwpd:*
+		app-text/libwpg:*
 		app-text/libwps
 		media-libs/libvisio
 	)
@@ -112,19 +111,22 @@ RDEPEND="
 	marble? ( $(add_kdeapps_dep marble) )
 	mysql? ( virtual/mysql )
 	okular? ( $(add_kdeapps_dep okular) )
-	opengl? ( virtual/glu )
+	opengl? (
+		media-libs/glew
+		virtual/glu
+	)
 	openexr? ( media-libs/openexr )
 	pdf? (
 		app-text/poppler:=
 		media-gfx/pstoedit
 	)
 	postgres? (
-		dev-db/postgresql
+		dev-db/postgresql:*
 		dev-libs/libpqxx
 	)
 	spacenav? ( dev-libs/libspnav  )
 	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
 	vc? ( dev-libs/vc )
 	xbase? ( dev-db/xbase )
@@ -184,7 +186,6 @@ src_configure() {
 		$(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)
@@ -203,6 +204,7 @@ src_configure() {
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_with okular Okular)
 		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl GLEW)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
 		$(cmake-utils_use_with pdf Pstoedit)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index e521084..bce7b6d 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -40,7 +40,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glib +gsf gsl
 import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql +okular
 openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc xbase
 +xml"
@@ -77,7 +77,7 @@ RDEPEND="
 	dev-lang/perl
 	dev-libs/boost
 	dev-qt/qtcore:4[exceptions]
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
@@ -88,15 +88,14 @@ RDEPEND="
 	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/libwpd:*
+		app-text/libwpg:*
 		app-text/libwps
 		media-libs/libvisio
 	)
@@ -112,19 +111,22 @@ RDEPEND="
 	marble? ( $(add_kdeapps_dep marble) )
 	mysql? ( virtual/mysql )
 	okular? ( $(add_kdeapps_dep okular) )
-	opengl? ( virtual/glu )
+	opengl? (
+		media-libs/glew
+		virtual/glu
+	)
 	openexr? ( media-libs/openexr )
 	pdf? (
 		app-text/poppler:=
 		media-gfx/pstoedit
 	)
 	postgres? (
-		dev-db/postgresql
+		dev-db/postgresql:*
 		dev-libs/libpqxx
 	)
 	spacenav? ( dev-libs/libspnav  )
 	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
 	vc? ( dev-libs/vc )
 	xbase? ( dev-db/xbase )
@@ -184,7 +186,6 @@ src_configure() {
 		$(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)
@@ -203,6 +204,7 @@ src_configure() {
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_with okular Okular)
 		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl GLEW)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
 		$(cmake-utils_use_with pdf Pstoedit)


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2015-09-03 13:08 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2015-09-03 13:08 UTC (permalink / raw
  To: gentoo-commits

commit:     efee6105629815a6214c1809098d72d5d609beeb
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 13:07:00 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 13:07:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efee6105

app-office/calligra: version bump.

Gentoo-bug: 559506

Package-Manager: portage-2.2.20.1

 app-office/calligra/Manifest              |   1 +
 app-office/calligra/calligra-2.9.7.ebuild | 224 ++++++++++++++++++++++++++++++
 2 files changed, 225 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 39ae24a..a8a3842 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,4 @@
 DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe
 DIST calligra-2.8.7.tar.xz 138966248 SHA256 af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512 e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442 WHIRLPOOL ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f177961111ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9
 DIST calligra-2.9.6.tar.xz 194239580 SHA256 78564137133e2f45065085df66ce2ab31478517c10163a06ba690a2d3a98a184 SHA512 d51b20c3d53a09ced3347b117de6827c5c29e31b198eff8bc136f0d6f604991371c6c4705d0ff3c6bcc64c017f0a14139d4b0529b02973909d80a25223e59f07 WHIRLPOOL 848884f830e0b8b2c6b8ed73d11222598295ca56ed4db826f4a9c3d3be42d5a65f5e50879a4fed68d6ae004962b799e23d6978a0943ff6b8900728b62dec43c0
+DIST calligra-2.9.7.tar.xz 194348264 SHA256 7a641a1669739ff55809fd6f2c22d673843ac41f64e82f5ca6cb3e60c7c82781 SHA512 89b6b43113dfd7304c9d88c79fe8ecce9d1cf5e6a82a401df6d0c5bad28c450af6e4012e859ccb1595f638513f79bb00f15cbc9f8cad03801c5aa1440b1b8a1f WHIRLPOOL d15fcf5458b25ae30e98031c541c85cac1658a435c8fa432fc7d3de44ebda7fa56ffab61b642c196d639d1bc9737f386e76dc75d7d51baa2efc0ed79d51dd9fc

diff --git a/app-office/calligra/calligra-2.9.7.ebuild b/app-office/calligra/calligra-2.9.7.ebuild
new file mode 100644
index 0000000..97cea47
--- /dev/null
+++ b/app-office/calligra/calligra-2.9.7.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+OPENGL_REQUIRED="optional"
+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 color-management +crypt +eigen +exif fftw +fontconfig freetds
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
+marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
++truetype vc xbase +xml"
+
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+	calligra_features_author? ( calligra_features_words )
+	calligra_features_gemini? ( opengl )
+	calligra_features_krita? ( eigen exif lcms opengl )
+	calligra_features_plan? ( kdepim )
+	calligra_features_sheets? ( eigen )
+	vc? ( calligra_features_krita )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	$(add_kdeapps_dep knewstuff)
+	dev-lang/perl
+	dev-libs/boost
+	dev-qt/qtcore:4[exceptions]
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/libiconv
+	attica? ( dev-libs/libattica )
+	color-management? ( media-libs/opencolorio )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
+	eigen? ( dev-cpp/eigen:3 )
+	exif? ( media-gfx/exiv2:= )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		app-text/libwps
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
+	kde? ( $(add_kdebase_dep kactivities) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? (
+		media-libs/lcms:2
+		x11-libs/libX11
+	)
+	marble? ( $(add_kdeapps_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdeapps_dep okular) )
+	opengl? (
+		media-libs/glew
+		virtual/glu
+	)
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler:=
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql:*
+		dev-libs/libpqxx
+	)
+	spacenav? ( dev-libs/libspnav )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vc? ( dev-libs/vc )
+	xbase? ( dev-db/xbase )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.8.7: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}
+	x11-misc/shared-mime-info
+"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+# bug 394273
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" )
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		use calligra_features_${cal_ft} && myproducts+=( ${cal_ft^^} )
+	done
+
+	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+	# first write out things we want to hard-enable
+	mycmakeargs+=(
+		"-DGHNS=ON"
+		"-DWITH_Iconv=ON"            # available on all supported arches and many more
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DCREATIVEONLY=OFF"
+		"-DPACKAGERS_BUILD=OFF"
+		"-DWITH_Soprano=OFF"
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with color-management OCIO)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen3)
+		$(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 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 LibRevenge)
+		$(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 CalligraMarble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use opengl USEOPENGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres CalligraPostgreSQL)
+		$(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)
+	)
+
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	kde4-base_src_configure
+}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2015-12-30 14:13 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2015-12-30 14:13 UTC (permalink / raw
  To: gentoo-commits

commit:     627d2440902e45b27712a556d5b1eff43fdc67e1
Author:     Matthew Dawson <matthew <AT> mjdsystems <DOT> ca>
AuthorDate: Sun Dec 27 16:50:32 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 14:13:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627d2440

app-office/calligra: Bump version to 2.9.10

Also fix ebuild to handle revision version numbers >=10, and disables
GHNS as it isn't supported by upstream.

 app-office/calligra/Manifest                                        | 1 +
 .../calligra/{calligra-9999.ebuild => calligra-2.9.10.ebuild}       | 6 +-----
 app-office/calligra/calligra-9999.ebuild                            | 6 +-----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index a8a3842..37f49a0 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,4 +1,5 @@
 DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe
 DIST calligra-2.8.7.tar.xz 138966248 SHA256 af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512 e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442 WHIRLPOOL ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f177961111ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9
+DIST calligra-2.9.10.tar.xz 194841508 SHA256 a9d16f0523e03141a3d2cd2e28e484a8aa0f0fead2352ac2c385688066a1d1ef SHA512 50b14b938ecbc70aed36d83e475225cbed8ecb72e0f407e4a1089472a43122c9278d768dad258d1b65534a0e42322295bab5c493d580d69730daf63e936a6df6 WHIRLPOOL 3679b2ec00f00844b640d38dafce6925abf8ef2c851c72d7ad0a4046d85a432367b20436bc6dbbd28527102d0e58df61e5683042508f15a134dc34c002162c29
 DIST calligra-2.9.6.tar.xz 194239580 SHA256 78564137133e2f45065085df66ce2ab31478517c10163a06ba690a2d3a98a184 SHA512 d51b20c3d53a09ced3347b117de6827c5c29e31b198eff8bc136f0d6f604991371c6c4705d0ff3c6bcc64c017f0a14139d4b0529b02973909d80a25223e59f07 WHIRLPOOL 848884f830e0b8b2c6b8ed73d11222598295ca56ed4db826f4a9c3d3be42d5a65f5e50879a4fed68d6ae004962b799e23d6978a0943ff6b8900728b62dec43c0
 DIST calligra-2.9.7.tar.xz 194348264 SHA256 7a641a1669739ff55809fd6f2c22d673843ac41f64e82f5ca6cb3e60c7c82781 SHA512 89b6b43113dfd7304c9d88c79fe8ecce9d1cf5e6a82a401df6d0c5bad28c450af6e4012e859ccb1595f638513f79bb00f15cbc9f8cad03801c5aa1440b1b8a1f WHIRLPOOL d15fcf5458b25ae30e98031c541c85cac1658a435c8fa432fc7d3de44ebda7fa56ffab61b642c196d639d1bc9737f386e76dc75d7d51baa2efc0ed79d51dd9fc

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-2.9.10.ebuild
similarity index 98%
copy from app-office/calligra/calligra-9999.ebuild
copy to app-office/calligra/calligra-2.9.10.ebuild
index db56918..04f1143 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-2.9.10.ebuild
@@ -21,7 +21,7 @@ case ${PV} in
 	2.[456789].[789]?)
 		# beta or rc releases
 		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-	2.[456789].?)
+	2.[456789].?|2.[456789].??)
 		# stable releases
 		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
 	2.[456789].9999)
@@ -62,7 +62,6 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	$(add_kdeapps_dep knewstuff)
 	dev-lang/perl
 	dev-libs/boost
 	dev-qt/qtcore:4[exceptions]
@@ -141,8 +140,6 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 # bug 394273
 RESTRICT=test
 
-PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" )
-
 pkg_pretend() {
 	check-reqs_pkg_pretend
 }
@@ -167,7 +164,6 @@ src_configure() {
 
 	# first write out things we want to hard-enable
 	mycmakeargs+=(
-		"-DGHNS=ON"
 		"-DWITH_Iconv=ON"            # available on all supported arches and many more
 	)
 

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index db56918..04f1143 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -21,7 +21,7 @@ case ${PV} in
 	2.[456789].[789]?)
 		# beta or rc releases
 		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-	2.[456789].?)
+	2.[456789].?|2.[456789].??)
 		# stable releases
 		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
 	2.[456789].9999)
@@ -62,7 +62,6 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	$(add_kdeapps_dep knewstuff)
 	dev-lang/perl
 	dev-libs/boost
 	dev-qt/qtcore:4[exceptions]
@@ -141,8 +140,6 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 # bug 394273
 RESTRICT=test
 
-PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" )
-
 pkg_pretend() {
 	check-reqs_pkg_pretend
 }
@@ -167,7 +164,6 @@ src_configure() {
 
 	# first write out things we want to hard-enable
 	mycmakeargs+=(
-		"-DGHNS=ON"
 		"-DWITH_Iconv=ON"            # available on all supported arches and many more
 	)
 


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-02-12 10:22 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2016-02-12 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     c0215fd8e55aceb371b095a81fe1093b18700e7b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 10:21:39 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 10:22:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0215fd8

app-office/calligra: version bump

Gentoo-bug: 573830

Package-Manager: portage-2.2.27

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

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 37f49a0..6080d09 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,5 +1,6 @@
 DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe
 DIST calligra-2.8.7.tar.xz 138966248 SHA256 af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512 e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442 WHIRLPOOL ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f177961111ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9
 DIST calligra-2.9.10.tar.xz 194841508 SHA256 a9d16f0523e03141a3d2cd2e28e484a8aa0f0fead2352ac2c385688066a1d1ef SHA512 50b14b938ecbc70aed36d83e475225cbed8ecb72e0f407e4a1089472a43122c9278d768dad258d1b65534a0e42322295bab5c493d580d69730daf63e936a6df6 WHIRLPOOL 3679b2ec00f00844b640d38dafce6925abf8ef2c851c72d7ad0a4046d85a432367b20436bc6dbbd28527102d0e58df61e5683042508f15a134dc34c002162c29
+DIST calligra-2.9.11.tar.xz 196039892 SHA256 b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8 WHIRLPOOL 973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
 DIST calligra-2.9.6.tar.xz 194239580 SHA256 78564137133e2f45065085df66ce2ab31478517c10163a06ba690a2d3a98a184 SHA512 d51b20c3d53a09ced3347b117de6827c5c29e31b198eff8bc136f0d6f604991371c6c4705d0ff3c6bcc64c017f0a14139d4b0529b02973909d80a25223e59f07 WHIRLPOOL 848884f830e0b8b2c6b8ed73d11222598295ca56ed4db826f4a9c3d3be42d5a65f5e50879a4fed68d6ae004962b799e23d6978a0943ff6b8900728b62dec43c0
 DIST calligra-2.9.7.tar.xz 194348264 SHA256 7a641a1669739ff55809fd6f2c22d673843ac41f64e82f5ca6cb3e60c7c82781 SHA512 89b6b43113dfd7304c9d88c79fe8ecce9d1cf5e6a82a401df6d0c5bad28c450af6e4012e859ccb1595f638513f79bb00f15cbc9f8cad03801c5aa1440b1b8a1f WHIRLPOOL d15fcf5458b25ae30e98031c541c85cac1658a435c8fa432fc7d3de44ebda7fa56ffab61b642c196d639d1bc9737f386e76dc75d7d51baa2efc0ed79d51dd9fc

diff --git a/app-office/calligra/calligra-2.9.11.ebuild b/app-office/calligra/calligra-2.9.11.ebuild
new file mode 100644
index 0000000..3a544c4
--- /dev/null
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+OPENGL_REQUIRED="optional"
+inherit check-reqs kde4-base versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+
+case ${PV} in
+	2.[456789].[789]?)
+		# beta or rc releases
+		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
+	2.[456789].?|2.[456789].??)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+	2.[456789].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 color-management +crypt +eigen +exif fftw +fontconfig freetds
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
+marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
++truetype vc xbase +xml"
+
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+	calligra_features_author? ( calligra_features_words )
+	calligra_features_gemini? ( opengl )
+	calligra_features_krita? ( eigen exif lcms opengl )
+	calligra_features_plan? ( kdepim )
+	calligra_features_sheets? ( eigen )
+	vc? ( calligra_features_krita )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/boost
+	dev-qt/qtcore:4[exceptions]
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/libiconv
+	attica? ( dev-libs/libattica )
+	color-management? ( media-libs/opencolorio )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
+	eigen? ( dev-cpp/eigen:3 )
+	exif? ( media-gfx/exiv2:= )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		app-text/libwps
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
+	kde? ( $(add_kdebase_dep kactivities) )
+	kdepim? ( $(add_kdeapps_dep kdepimlibs) )
+	lcms? (
+		media-libs/lcms:2
+		x11-libs/libX11
+	)
+	marble? ( $(add_kdeapps_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdeapps_dep okular) )
+	opengl? (
+		media-libs/glew
+		virtual/glu
+	)
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler:=
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql:*
+		dev-libs/libpqxx
+	)
+	spacenav? ( dev-libs/libspnav )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vc? ( dev-libs/vc )
+	xbase? ( dev-db/xbase )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.8.7:3[extensions(+)]
+		dev-libs/icu:=
+	)
+	calligra_features_krita? (
+		dev-qt/qtdeclarative:4
+		net-misc/curl
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${RDEPEND}
+	x11-misc/shared-mime-info
+"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+# bug 394273
+RESTRICT=test
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		# Switch to ^^ when we switch to EAPI=6.
+		#local prod=${cal_ft^^}
+		local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
+		use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
+	done
+
+	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+	# first write out things we want to hard-enable
+	mycmakeargs+=(
+		"-DWITH_Iconv=ON"            # available on all supported arches and many more
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DCREATIVEONLY=OFF"
+		"-DPACKAGERS_BUILD=OFF"
+		"-DWITH_Soprano=OFF"
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with color-management OCIO)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen3)
+		$(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 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 LibRevenge)
+		$(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 CalligraMarble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use opengl USEOPENGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres CalligraPostgreSQL)
+		$(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)
+	)
+
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	kde4-base_src_configure
+}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-02-14 16:52 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2016-02-14 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     9e2f870ebccbaa2f1e0c301bc0e739b4a44264b7
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 16:52:17 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:52:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e2f870e

app-office/calligra: restrict dev-libs/vc version

Gentoo-bug: 574578

Package-Manager: portage-2.2.27

 app-office/calligra/calligra-2.8.5.ebuild  | 4 ++--
 app-office/calligra/calligra-2.8.7.ebuild  | 4 ++--
 app-office/calligra/calligra-2.9.10.ebuild | 4 ++--
 app-office/calligra/calligra-2.9.11.ebuild | 2 +-
 app-office/calligra/calligra-2.9.6.ebuild  | 4 ++--
 app-office/calligra/calligra-2.9.7.ebuild  | 4 ++--
 app-office/calligra/calligra-9999.ebuild   | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app-office/calligra/calligra-2.8.5.ebuild b/app-office/calligra/calligra-2.8.5.ebuild
index 2e1ba2c..7e3abfb 100644
--- a/app-office/calligra/calligra-2.8.5.ebuild
+++ b/app-office/calligra/calligra-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -126,7 +126,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.7.9:3[extensions(+)]

diff --git a/app-office/calligra/calligra-2.8.7.ebuild b/app-office/calligra/calligra-2.8.7.ebuild
index fb7b733..3615a0d 100644
--- a/app-office/calligra/calligra-2.8.7.ebuild
+++ b/app-office/calligra/calligra-2.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -128,7 +128,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.7.9:3[extensions(+)]

diff --git a/app-office/calligra/calligra-2.9.10.ebuild b/app-office/calligra/calligra-2.9.10.ebuild
index 04f1143..b53f1a5 100644
--- a/app-office/calligra/calligra-2.9.10.ebuild
+++ b/app-office/calligra/calligra-2.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -117,7 +117,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]

diff --git a/app-office/calligra/calligra-2.9.11.ebuild b/app-office/calligra/calligra-2.9.11.ebuild
index 3a544c4..06d6e33 100644
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ b/app-office/calligra/calligra-2.9.11.ebuild
@@ -117,7 +117,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]

diff --git a/app-office/calligra/calligra-2.9.6.ebuild b/app-office/calligra/calligra-2.9.6.ebuild
index 3d401ec..ae7485f 100644
--- a/app-office/calligra/calligra-2.9.6.ebuild
+++ b/app-office/calligra/calligra-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -118,7 +118,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]

diff --git a/app-office/calligra/calligra-2.9.7.ebuild b/app-office/calligra/calligra-2.9.7.ebuild
index db56918..722ca60 100644
--- a/app-office/calligra/calligra-2.9.7.ebuild
+++ b/app-office/calligra/calligra-2.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -118,7 +118,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 04f1143..b53f1a5 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -117,7 +117,7 @@ RDEPEND="
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
+	vc? ( <dev-libs/vc-1.0.0 )
 	xbase? ( dev-db/xbase )
 	calligra_features_kexi? (
 		>=dev-db/sqlite-3.8.7:3[extensions(+)]


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-04-04 19:05 Johannes Huber
  0 siblings, 0 replies; 69+ messages in thread
From: Johannes Huber @ 2016-04-04 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     63221ac85e2a09a4b06da22eb7e31dc4650b55b5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 19:05:03 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 19:05:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63221ac8

app-office/calligra: Drop failing live ebuild

Need total re-write because of KDE Frameworks support. Gentoo KDE project
avoids live ebuild in main tree. Use kde overlay for experimental stuff.

Gentoo-bug: 563324

Package-Manager: portage-2.2.28

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

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
deleted file mode 100644
index b53f1a5..0000000
--- a/app-office/calligra/calligra-9999.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-OPENGL_REQUIRED="optional"
-inherit check-reqs kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-
-case ${PV} in
-	2.[456789].[789]?)
-		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-	2.[456789].?|2.[456789].??)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].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 color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
-marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
-+truetype vc xbase +xml"
-
-# Don't use Active, it's broken on desktops.
-CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_author? ( calligra_features_words )
-	calligra_features_gemini? ( opengl )
-	calligra_features_krita? ( eigen exif lcms opengl )
-	calligra_features_plan? ( kdepim )
-	calligra_features_sheets? ( eigen )
-	vc? ( calligra_features_krita )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/boost
-	dev-qt/qtcore:4[exceptions]
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	color-management? ( media-libs/opencolorio )
-	crypt? ( app-crypt/qca:2[qt4(+)] )
-	eigen? ( dev-cpp/eigen:3 )
-	exif? ( media-gfx/exiv2:= )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		app-text/libwps
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
-	kdepim? ( $(add_kdeapps_dep kdepimlibs) )
-	lcms? (
-		media-libs/lcms:2
-		x11-libs/libX11
-	)
-	marble? ( $(add_kdeapps_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdeapps_dep okular) )
-	opengl? (
-		media-libs/glew
-		virtual/glu
-	)
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql:*
-		dev-libs/libpqxx
-	)
-	spacenav? ( dev-libs/libspnav )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( <dev-libs/vc-1.0.0 )
-	xbase? ( dev-db/xbase )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.8.7: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}
-	x11-misc/shared-mime-info
-"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-# bug 394273
-RESTRICT=test
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		# Switch to ^^ when we switch to EAPI=6.
-		#local prod=${cal_ft^^}
-		local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
-		use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
-	done
-
-	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
-	# first write out things we want to hard-enable
-	mycmakeargs+=(
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-		"-DWITH_Soprano=OFF"
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with color-management OCIO)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen3)
-		$(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 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 LibRevenge)
-		$(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 CalligraMarble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use opengl USEOPENGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres CalligraPostgreSQL)
-		$(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)
-	)
-
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	kde4-base_src_configure
-}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-04-09 13:46 Agostino Sarubbo
  0 siblings, 0 replies; 69+ messages in thread
From: Agostino Sarubbo @ 2016-04-09 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     2e070d61089ed08d33abb250bfa04414e2854c95
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 13:45:34 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 13:45:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e070d61

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

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-06-16 18:10 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2016-06-16 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d719f5eb34d198646c509e292b576aaf83ea051d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 18:09:21 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 18:09:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d719f5eb

app-office/calligra: remove old

Package-Manager: portage-2.3.0_rc1

 app-office/calligra/Manifest              |   1 -
 app-office/calligra/calligra-2.8.5.ebuild | 229 ------------------------------
 2 files changed, 230 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 0287b87..22a983d 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1 @@
-DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe
 DIST calligra-2.9.11.tar.xz 196039892 SHA256 b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8 WHIRLPOOL 973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74

diff --git a/app-office/calligra/calligra-2.8.5.ebuild b/app-office/calligra/calligra-2.8.5.ebuild
deleted file mode 100644
index 7e3abfb..0000000
--- a/app-office/calligra/calligra-2.8.5.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-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 +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_kdeapps_dep knewstuff)
-	dev-lang/perl
-	dev-libs/boost
-	dev-qt/qtcore:4[exceptions]
-	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[qt4(+)] )
-	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_kdeapps_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
-	kdepim? ( $(add_kdeapps_dep kdepimlibs) )
-	lcms? (
-		media-libs/lcms:2
-		x11-libs/libX11
-	)
-	marble? ( $(add_kdeapps_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdeapps_dep okular) )
-	opengl? ( virtual/glu )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/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-1.0.0 )
-	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"
-		"-DWITH_Soprano=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 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
-}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-06-16 18:10 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2016-06-16 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     66903abbd619c3091810a6e5aa20e5e31e3c3801
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 18:09:01 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 18:09:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66903abb

app-office/calligra: x86 stable

Gentoo-bug: 579044

Package-Manager: portage-2.3.0_rc1

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-07-03 19:36 Andreas Hüttel
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Hüttel @ 2016-07-03 19:36 UTC (permalink / raw
  To: gentoo-commits

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

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

Package-Manager: portage-2.3.0

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-08-20 18:28 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2016-08-20 18:28 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Add WEBKIT_REQUIRED=optional

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

Package-Manager: portage-2.2.28

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-11-02 18:39 Johannes Huber
  0 siblings, 0 replies; 69+ messages in thread
From: Johannes Huber @ 2016-11-02 18:39 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop deprecated Plasma 4 support

Package-Manager: portage-2.3.2

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-12-08 14:10 Johannes Huber
  0 siblings, 0 replies; 69+ messages in thread
From: Johannes Huber @ 2016-12-08 14:10 UTC (permalink / raw
  To: gentoo-commits

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

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

This fixes a repoman warning.

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2016-12-30  0:26 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2016-12-30  0:26 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop old

Package-Manager: portage-2.3.0

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

diff --git a/app-office/calligra/calligra-3.0.0.ebuild b/app-office/calligra/calligra-3.0.0.ebuild
deleted file mode 100644
index 9d1016c..00000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-01-04  9:50 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-01-04  9:50 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: 3.0.0.1 version bump

Package-Manager: portage-2.3.0

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-01-07 10:59 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-01-07 10:59 UTC (permalink / raw
  To: gentoo-commits

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

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

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

Package-Manager: portage-2.3.0

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-02-25 22:05 Johannes Huber
  0 siblings, 0 replies; 69+ messages in thread
From: Johannes Huber @ 2017-02-25 22:05 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop marble use flag

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

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

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

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 9c760ee454..c3442894b6 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -20,7 +20,6 @@
 		<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-apps/libkdcraw</pkg></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="pim">Enable support for KDE PIM resources integration</flag>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-03-19 13:57 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-03-19 13:57 UTC (permalink / raw
  To: gentoo-commits

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

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

Gentoo-bug: 612776

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-03-21 12:24 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-03-21 12:24 UTC (permalink / raw
  To: gentoo-commits

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

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

Gentoo-bug: 613316

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-03-24 15:25 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-03-24 15:25 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Fix missing NEEDED entries

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-03-25 14:43 Agostino Sarubbo
  0 siblings, 0 replies; 69+ messages in thread
From: Agostino Sarubbo @ 2017-03-25 14:43 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-03-31 20:23 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-03-31 20:23 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: 3.0.1 version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-04-01 16:06 Agostino Sarubbo
  0 siblings, 0 replies; 69+ messages in thread
From: Agostino Sarubbo @ 2017-04-01 16:06 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-04-01 16:16 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-04-01 16:16 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/app-office/calligra/calligra-2.9.11.ebuild b/app-office/calligra/calligra-2.9.11.ebuild
deleted file mode 100644
index 20bfc7798e8..00000000000
--- a/app-office/calligra/calligra-2.9.11.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit check-reqs kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-
-case ${PV} in
-	2.[456789].[789]?)
-		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-	2.[456789].?|2.[456789].??)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].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 color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms mysql
-+okular openexr +pdf +pim postgres spacenav sybase test tiff +threads
-+truetype vc xbase +xml"
-
-# Don't use Active, it's broken on desktops.
-CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	|| ( $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) )
-	calligra_features_author? ( calligra_features_words )
-	calligra_features_gemini? ( opengl )
-	calligra_features_krita? ( eigen exif lcms opengl )
-	calligra_features_plan? ( pim )
-	calligra_features_sheets? ( eigen )
-	calligra_features_stage? ( webkit )
-	vc? ( calligra_features_krita )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/boost
-	dev-qt/qtcore:4[exceptions]
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	color-management? ( media-libs/opencolorio )
-	crypt? ( app-crypt/qca:2[qt4(+)] )
-	eigen? ( dev-cpp/eigen:3 )
-	exif? ( media-gfx/exiv2:= )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		app-text/libwps
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
-	lcms? (
-		media-libs/lcms:2
-		x11-libs/libX11
-	)
-	mysql? ( virtual/mysql )
-	okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
-	opengl? (
-		media-libs/glew:0
-		virtual/glu
-	)
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	pim? ( $(add_kdeapps_dep kdepimlibs) )
-	postgres? (
-		dev-db/postgresql:*
-		dev-libs/libpqxx
-	)
-	spacenav? ( dev-libs/libspnav )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( <dev-libs/vc-1.0.0 )
-	xbase? ( dev-db/xbase )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.8.7:3[extensions(+)]
-		dev-libs/icu:=
-	)
-	calligra_features_krita? (
-		dev-qt/qtdeclarative:4
-		net-misc/curl
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}
-	x11-misc/shared-mime-info
-"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-# bug 394273
-RESTRICT=test
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	if ! use webkit; then
-		sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die
-	fi
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		# Switch to ^^ when we switch to EAPI=6.
-		#local prod=${cal_ft^^}
-		local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
-		use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
-	done
-
-	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
-	# first write out things we want to hard-enable
-	mycmakeargs+=(
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-		"-DWITH_Soprano=OFF"
-		"-DWITH_KActivities=OFF"
-		"-DWITH_CalligraMarble=OFF"
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with color-management OCIO)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen3)
-		$(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 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 LibRevenge)
-		$(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 lcms LCMS2)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use opengl USEOPENGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with pim KdepimLibs)
-		$(cmake-utils_use_with postgres CalligraPostgreSQL)
-		$(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)
-	)
-
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index c3442894b6c..721acdb3213 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
-		<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-06-05 20:14 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-06-05 20:14 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop USE=kdcraw

Package-Manager: Portage-2.3.5, Repoman-2.3.1

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

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

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 721acdb3213..e19fadc0436 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -17,7 +17,6 @@
 		<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-apps/libkdcraw</pkg></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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-06-18 12:08 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2017-06-18 12:08 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: use HTTPS

Package-Manager: Portage-2.3.5, Repoman-2.3.2

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-06-27 18:34 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2017-06-27 18:34 UTC (permalink / raw
  To: gentoo-commits

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

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

Nothing but trouble.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-07-04 10:17 Agostino Sarubbo
  0 siblings, 0 replies; 69+ messages in thread
From: Agostino Sarubbo @ 2017-07-04 10:17 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2017-07-04 15:49 Agostino Sarubbo
  0 siblings, 0 replies; 69+ messages in thread
From: Agostino Sarubbo @ 2017-07-04 15:49 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2018-01-31 17:51 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2018-01-31 17:51 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2018-02-11 22:01 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2018-02-11 22:01 UTC (permalink / raw
  To: gentoo-commits

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

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

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2018-03-13 12:51 Michael Palimaka
  0 siblings, 0 replies; 69+ messages in thread
From: Michael Palimaka @ 2018-03-13 12:51 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2018-03-15 16:34 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2018-03-15 16:34 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop 3.1.0-r1

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

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

diff --git a/app-office/calligra/calligra-3.1.0-r1.ebuild b/app-office/calligra/calligra-3.1.0-r1.ebuild
deleted file mode 100644
index d0f98bb0a47..00000000000
--- a/app-office/calligra/calligra-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_APPS_MINIMAL="17.12.0"
-KDE_HANDBOOK="forceoptional"
-KDE_PO_DIRS="po plan/po"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-		calligra_features_plan? ( mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
-	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
-	calligra_experimental_features_stage"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# FIXME: Disabled by upstream for good reason
-# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled in plan
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( app-crypt/qca:2[qt5] )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		$(add_frameworks_dep khtml)
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? (
-		media-libs/ilmbase:=
-		media-libs/lcms:2
-	)
-	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler[qt5] )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-	calligra_experimental_features_stage? (
-		$(add_qt_dep qtwebkit)
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-	calligra_features_plan? (
-		$(add_frameworks_dep khtml)
-		$(add_frameworks_dep kholidays)
-		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}"/${P}-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-${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
-		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
-		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 )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake-utils_use_find_package activities KF5Activities)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(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)
-		-DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2018-03-15 16:34 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2018-03-15 16:34 UTC (permalink / raw
  To: gentoo-commits

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

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

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2018-04-05 21:16 Aaron Bauman
  0 siblings, 0 replies; 69+ messages in thread
From: Aaron Bauman @ 2018-04-05 21:16 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: amd64 stable

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2019-01-01 19:40 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2019-01-01 19:40 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Move stage into CALLIGRA_FEATURES

Simplifies ebuild.

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2019-01-14 14:43 Mikle Kolyada
  0 siblings, 0 replies; 69+ messages in thread
From: Mikle Kolyada @ 2019-01-14 14:43 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2019-01-16 12:01 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 12:01 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop 3.1.0-r2

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

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

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

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
deleted file mode 100644
index e2a76aa73c6..00000000000
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_APPS_MINIMAL="17.12.0"
-KDE_DOC_DIR="xxx" # contains no language subdirs
-KDE_HANDBOOK="forceoptional"
-KDE_PO_DIRS="po plan/po"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-		calligra_features_plan? ( mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="amd64 x86"
-
-CAL_FTS=( karbon plan sheets words )
-
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
-	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
-	calligra_experimental_features_stage"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# FIXME: Disabled by upstream for good reason
-# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled in plan
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		$(add_frameworks_dep khtml)
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? (
-		media-libs/ilmbase:=
-		media-libs/lcms:2
-	)
-	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler[qt5] )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-	calligra_experimental_features_stage? (
-		$(add_qt_dep qtwebkit)
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-	calligra_features_plan? (
-		$(add_frameworks_dep khtml)
-		$(add_frameworks_dep kholidays)
-		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}"/${P}-no-arch-detection.patch
-	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-stage-qt-5.11.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-${PV} plan || die
-		sed -e "/add_subdirectory(plan)/s/#//" \
-			-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
-			-i CMakeLists.txt || die
-
-		eapply "${FILESDIR}"/${P}-plan-qt-5.11.patch
-	fi
-	kde5_src_prepare
-
-	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
-		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 )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake-utils_use_find_package activities KF5Activities)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(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)
-		-DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2019-01-24 22:26 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2019-01-24 22:26 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Add USE +charts

Fixes unhandled automagic dependency on dev-libs/kreport.

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

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

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

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 575f0b0a917..d5fb30da6eb 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
+		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kreport</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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2019-08-15 13:09 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2019-08-15 13:09 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 77136854363..c5fa5d75177 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="
 	openexr? ( media-libs/openexr )
 	pdf? ( >=app-text/poppler-0.64:=[qt5] )
 	phonon? ( media-libs/phonon[qt5(+)] )
-	pim? ( $(add_kdeapps_dep kcalcore) )
+	pim? ( <kde-apps/kcalcore-19.04.50:5 )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
 	X? (


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2019-08-16 14:40 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2019-08-16 14:40 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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

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

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index d5fb30da6eb..6fda5aa811c 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,7 +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/kreport</pkg></flag>
+		<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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2019-08-16 14:40 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2019-08-16 14:40 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop 3.1.0-r3

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

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

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

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 6fda5aa811c..f31dd00ff91 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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2019-12-26  8:36 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2019-12-26  8:36 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild
index f4c78118f36..9e095aa4722 100644
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -4,16 +4,19 @@
 EAPI=7
 
 CHECKREQS_DISK_BUILD="4G"
-KDE_DOC_DIR="xxx" # contains no language subdirs
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5
+ECM_HANDBOOK_DIR="xxx" # contains no language subdirs
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://www.calligra.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon sheets stage words )
@@ -27,60 +30,60 @@ BDEPEND="
 	sys-devel/gettext
 "
 COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	dev-lang/perl
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
 	sys-libs/zlib
 	virtual/libiconv
-	activities? ( $(add_frameworks_dep kactivities) )
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	charts? ( dev-libs/kdiagram:5 )
 	crypt? ( app-crypt/qca:2[qt5(+)] )
 	fontconfig? ( media-libs/fontconfig )
-	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
+	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
 	gsl? ( sci-libs/gsl )
 	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
+		>=kde-frameworks/khtml-${KFMIN}:5
 		media-libs/libvisio
 	)
 	lcms? (
@@ -93,19 +96,19 @@ COMMON_DEPEND="
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
 	X? (
-		$(add_qt_dep qtx11extras)
+		>=dev-qt/qtx11extras-${QTMIN}:5
 		x11-libs/libX11
 	)
 	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
+	calligra_features_stage? ( okular? ( >=kde-apps/okular-19.04.3:5 ) )
 	calligra_features_words? (
 		dev-libs/libxslt
-		okular? ( $(add_kdeapps_dep okular) )
+		okular? ( >=kde-apps/okular-19.04.3:5 )
 	)
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
-	test? ( $(add_frameworks_dep threadweaver) )
+	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
@@ -128,12 +131,12 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	kde5_pkg_setup
+	ecm_pkg_setup
 	check-reqs_pkg_setup
 }
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if has_version ">=app-text/poppler-0.82"; then
 		eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make upstreamable patch
@@ -149,8 +152,8 @@ src_prepare() {
 	fi
 
 	# Unconditionally disable deprecated deps (required by QtQuick1)
-	punt_bogus_dep Qt5 Declarative
-	punt_bogus_dep Qt5 OpenGL
+	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
@@ -180,12 +183,12 @@ src_configure() {
 		-DRELEASE_BUILD=ON
 		-DWITH_Iconv=ON
 		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package charts KChart)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package charts KChart)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake-utils_use_find_package gemini Libgit2)
-		$(cmake-utils_use_find_package gemini Qt5QuickWidgets)
+		$(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)
@@ -194,7 +197,7 @@ src_configure() {
 		-DWITH_LibWpd=$(usex import-filter)
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package phonon Phonon4Qt5)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_Okular5=$(usex okular)
@@ -206,5 +209,5 @@ src_configure() {
 		-DWITH_Freetype=$(usex truetype)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2020-06-28 16:18 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2020-06-28 16:18 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: 3.2.1 version bump

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2020-07-02 21:52 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2020-07-02 21:52 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop 3.2.0

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2020-07-17  7:21 Agostino Sarubbo
  0 siblings, 0 replies; 69+ messages in thread
From: Agostino Sarubbo @ 2020-07-17  7:21 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2020-07-17  7:44 Agostino Sarubbo
  0 siblings, 0 replies; 69+ messages in thread
From: Agostino Sarubbo @ 2020-07-17  7:44 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2020-10-29 20:29 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 20:29 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop 3.2.1 (r0)

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2020-10-29 20:29 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 20:29 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Hard-disable KF5Html

Only disables HTML_TO_ODS filter.

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

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2021-02-24 19:21 Sam James
  0 siblings, 0 replies; 69+ messages in thread
From: Sam James @ 2021-02-24 19:21 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2021-06-02 22:36 Sam James
  0 siblings, 0 replies; 69+ messages in thread
From: Sam James @ 2021-06-02 22:36 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2021-07-21 21:57 Marek Szuba
  0 siblings, 0 replies; 69+ messages in thread
From: Marek Szuba @ 2021-07-21 21:57 UTC (permalink / raw
  To: gentoo-commits

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

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>

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2021-12-29 13:46 Yixun Lan
  0 siblings, 0 replies; 69+ messages in thread
From: Yixun Lan @ 2021-12-29 13:46 UTC (permalink / raw
  To: gentoo-commits

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

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

Signed-off-by: Alex Fan <alex.fan.q <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2022-02-03  6:08 Sam James
  0 siblings, 0 replies; 69+ messages in thread
From: Sam James @ 2022-02-03  6:08 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2022-02-03  6:09 Sam James
  0 siblings, 0 replies; 69+ messages in thread
From: Sam James @ 2022-02-03  6:09 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2022-02-03  8:51 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2022-02-03  8:51 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: Drop 3.2.1-r3

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2022-10-06  9:07 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2022-10-06  9:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0196b959699adc99d1b5fbf9c76ec0febf1c59fd
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:05:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0196b959

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 18a225de5401..b581a8d5393a 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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2023-02-15  8:29 Sam James
  0 siblings, 0 replies; 69+ messages in thread
From: Sam James @ 2023-02-15  8:29 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild
index 49246e3bca3d..f26074e74960 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.88.0
 QTMIN=5.15.2
-inherit check-reqs ecm kde.org
+inherit check-reqs ecm flag-o-matic kde.org
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://calligra.org/"
@@ -144,6 +144,9 @@ src_prepare() {
 src_configure() {
 	local cal_ft myproducts
 
+	# Uses removed 'register' keyword, drop on next release. bug #883067
+	append-cxxflags -std=c++14
+
 	# applications
 	for cal_ft in ${CAL_FTS[@]}; do
 		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2023-03-31 19:08 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2023-03-31 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     813cace6717f88a6ddbd1268ff3c03eab5200b84
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:08:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=813cace6

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2023-04-23 13:04 Sam James
  0 siblings, 0 replies; 69+ messages in thread
From: Sam James @ 2023-04-23 13:04 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2023-05-06  9:35 Arthur Zamarin
  0 siblings, 0 replies; 69+ messages in thread
From: Arthur Zamarin @ 2023-05-06  9:35 UTC (permalink / raw
  To: gentoo-commits

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

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

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2023-05-06 18:13 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2023-05-06 18:13 UTC (permalink / raw
  To: gentoo-commits

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

app-office/calligra: drop 3.2.1-r5

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

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

diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild
deleted file mode 100644
index 2acce0b09496..000000000000
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.88.0
-QTMIN=5.15.2
-inherit check-reqs ecm flag-o-matic kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://calligra.org/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	PATCHSET="${P}-patchset-1"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 ~riscv x86"
-fi
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
-	okular +pdf phonon spacenav +truetype X
-	$(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
-
-RESTRICT="test"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-COMMON_DEPEND="
-	dev-lang/perl
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	charts? ( dev-libs/kdiagram:5 )
-	crypt? ( >=app-crypt/qca-2.3.0:2 )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-	gsl? ( sci-libs/gsl:= )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? ( media-libs/lcms:2 )
-	okular? ( kde-apps/okular:5 )
-	pdf? ( app-text/poppler:=[qt5] )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	lcms? ( dev-libs/imath:3 )
-	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	gemini? (
-		>=dev-qt/qtquickcontrols-${QTMIN}:5
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cmake-3.16.patch # bug 796224
-	"${WORKDIR}"/${PATCHSET}/${P}-{openexr-3,imath-{1,2}}.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cxx17-for-poppler-22.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cxx17-fixes.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-poppler-22.03.0-{1,2}.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch
-)
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ecm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	ecm_punt_bogus_dep Qt5 Declarative
-	ecm_punt_bogus_dep Qt5 OpenGL
-}
-
-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 okular && myproducts+=( OKULAR )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=(
-		-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
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=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)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	ecm_src_configure
-}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2023-05-29 20:55 Sam James
  0 siblings, 0 replies; 69+ messages in thread
From: Sam James @ 2023-05-29 20:55 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2024-03-11  9:50 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2024-03-11  9:50 UTC (permalink / raw
  To: gentoo-commits

commit:     a9fa91b81b0af382213caa1ab2926ee45cbd81ab
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:50:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9fa91b8

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

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

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

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


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2024-09-09 18:32 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2024-09-09 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f0b6a44466702df5581551fd2d1626ce6844c0a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  9 18:15:18 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  9 18:29:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b6a444

app-office/calligra: add 4.0.1

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

 app-office/calligra/Manifest              |   1 +
 app-office/calligra/calligra-4.0.1.ebuild | 153 ++++++++++++++++++++++++++++++
 app-office/calligra/metadata.xml          |   1 +
 3 files changed, 155 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index d7c2d4419fe5..5cf5a8973143 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,3 @@
 DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
+DIST calligra-4.0.1.tar.xz 57780728 BLAKE2B 0ea82f5b21d36e04222db4ee282048b61a6d144630cc26d007d722fa8fc3081ee38e8f54b7256f9e722cccedc7ddc7489e3a3bd7dff34263d81cd5a7081aa6b2 SHA512 79569a1e75d5c70c8b2c3e5c7cf88d26d9b7a81be52c131c932521c65d1712a531829bcd29f7233f1ee7601fa363ca9ce2c4783a76dfdc5abe3c8b04b5741b78

diff --git a/app-office/calligra/calligra-4.0.1.ebuild b/app-office/calligra/calligra-4.0.1.ebuild
new file mode 100644
index 000000000000..f27d1244b2d1
--- /dev/null
+++ b/app-office/calligra/calligra-4.0.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+PATCHSET="${PN}-3.2.1-patchset-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+charts +crypt +fontconfig gsl +import-filter +lcms okular +pdf phonon
+	+truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+RESTRICT="test"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+COMMON_DEPEND="
+	dev-lang/perl
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(-)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qttools-${QTMIN}:6[designer]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=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/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	sys-libs/zlib
+	virtual/libiconv
+	charts? ( dev-libs/kdiagram:6 )
+	crypt? ( dev-libs/openssl:= )
+	fontconfig? ( media-libs/fontconfig )
+	gsl? ( sci-libs/gsl:= )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		>=app-text/libwps-0.4
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	lcms? ( media-libs/lcms:2 )
+	okular? ( kde-apps/okular:6 )
+	pdf? ( app-text/poppler:=[qt6] )
+	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 )
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	lcms? ( dev-libs/imath:3 )
+	test? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+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 okular && myproducts+=( OKULAR )
+
+	local mycmakeargs=(
+		-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
+		-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)
+		-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 Phonon4Qt6)
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular6=$(usex okular)
+		-DWITH_Poppler=$(usex pdf)
+		-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 b581a8d5393a..e6718f9f6204 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -22,5 +22,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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2024-09-09 18:55 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2024-09-09 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     0ef6a88552dfda469d4569fc1ffd6b7893c9af43
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:55:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef6a885

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 09de55c3d00f..e6dded498c02 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>


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2024-09-19 18:55 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2024-09-19 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     15def797197aa24c6d091742f2a13b156b5a3f36
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:54:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15def797

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

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

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

diff --git a/app-office/calligra/calligra-4.0.1-r1.ebuild b/app-office/calligra/calligra-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..1455b0a69e42
--- /dev/null
+++ b/app-office/calligra/calligra-4.0.1-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+PATCHSET="${PN}-3.2.1-patchset-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+charts +fontconfig gsl +import-filter +lcms okular +pdf phonon
+	+truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+RESTRICT="test"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+COMMON_DEPEND="
+	dev-lang/perl
+	dev-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]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qttools-${QTMIN}:6[designer]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=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/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	sys-libs/zlib
+	virtual/libiconv
+	charts? ( dev-libs/kdiagram:6 )
+	fontconfig? ( media-libs/fontconfig )
+	gsl? ( sci-libs/gsl:= )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		>=app-text/libwps-0.4
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	lcms? ( media-libs/lcms:2 )
+	okular? ( kde-apps/okular:6 )
+	pdf? ( app-text/poppler:=[qt6] )
+	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 )
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	lcms? ( dev-libs/imath:3 )
+	test? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+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 okular && myproducts+=( OKULAR )
+
+	local mycmakeargs=(
+		-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
+		-DPRODUCTSET="${myproducts[*]}"
+		$(cmake_use_find_package charts KChart6)
+		-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_use_find_package phonon Phonon4Qt6)
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular6=$(usex okular)
+		-DWITH_Poppler=$(usex pdf)
+		-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
+}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
@ 2024-09-19 18:55 Andreas Sturmlechner
  0 siblings, 0 replies; 69+ messages in thread
From: Andreas Sturmlechner @ 2024-09-19 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     3da1e9e7200d16710ea73b4befb80c64f994fb5d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 18:54:35 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 18:54:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da1e9e7

app-office/calligra: drop 4.0.1

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

 app-office/calligra/calligra-4.0.1.ebuild | 153 ------------------------------
 1 file changed, 153 deletions(-)

diff --git a/app-office/calligra/calligra-4.0.1.ebuild b/app-office/calligra/calligra-4.0.1.ebuild
deleted file mode 100644
index f27d1244b2d1..000000000000
--- a/app-office/calligra/calligra-4.0.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHECKREQS_DISK_BUILD="4G"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit check-reqs ecm kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://calligra.org/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-PATCHSET="${PN}-3.2.1-patchset-1"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+charts +crypt +fontconfig gsl +import-filter +lcms okular +pdf phonon
-	+truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
-
-RESTRICT="test"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-COMMON_DEPEND="
-	dev-lang/perl
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(-)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qttools-${QTMIN}:6[designer]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=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/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	sys-libs/zlib
-	virtual/libiconv
-	charts? ( dev-libs/kdiagram:6 )
-	crypt? ( dev-libs/openssl:= )
-	fontconfig? ( media-libs/fontconfig )
-	gsl? ( sci-libs/gsl:= )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? ( media-libs/lcms:2 )
-	okular? ( kde-apps/okular:6 )
-	pdf? ( app-text/poppler:=[qt6] )
-	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 )
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	lcms? ( dev-libs/imath:3 )
-	test? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ecm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-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 okular && myproducts+=( OKULAR )
-
-	local mycmakeargs=(
-		-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
-		-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)
-		-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 Phonon4Qt6)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular6=$(usex okular)
-		-DWITH_Poppler=$(usex pdf)
-		-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
-}


^ permalink raw reply related	[flat|nested] 69+ messages in thread

end of thread, other threads:[~2024-09-19 18:55 UTC | newest]

Thread overview: 69+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-31 19:08 [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-09-19 18:55 Andreas Sturmlechner
2024-09-19 18:55 Andreas Sturmlechner
2024-09-09 18:55 Andreas Sturmlechner
2024-09-09 18:32 Andreas Sturmlechner
2024-03-11  9:50 Andreas Sturmlechner
2023-05-29 20:55 Sam James
2023-05-06 18:13 Andreas Sturmlechner
2023-05-06  9:35 Arthur Zamarin
2023-04-23 13:04 Sam James
2023-02-15  8:29 Sam James
2022-10-06  9:07 Andreas Sturmlechner
2022-02-03  8:51 Andreas Sturmlechner
2022-02-03  6:09 Sam James
2022-02-03  6:08 Sam James
2021-12-29 13:46 Yixun Lan
2021-07-21 21:57 Marek Szuba
2021-06-02 22:36 Sam James
2021-02-24 19:21 Sam James
2020-10-29 20:29 Andreas Sturmlechner
2020-10-29 20:29 Andreas Sturmlechner
2020-07-17  7:44 Agostino Sarubbo
2020-07-17  7:21 Agostino Sarubbo
2020-07-02 21:52 Andreas Sturmlechner
2020-06-28 16:18 Andreas Sturmlechner
2019-12-26  8:36 Andreas Sturmlechner
2019-08-16 14:40 Andreas Sturmlechner
2019-08-16 14:40 Andreas Sturmlechner
2019-08-15 13:09 Andreas Sturmlechner
2019-01-24 22:26 Andreas Sturmlechner
2019-01-16 12:01 Andreas Sturmlechner
2019-01-14 14:43 Mikle Kolyada
2019-01-01 19:40 Andreas Sturmlechner
2018-04-05 21:16 Aaron Bauman
2018-03-15 16:34 Andreas Sturmlechner
2018-03-15 16:34 Andreas Sturmlechner
2018-03-13 12:51 Michael Palimaka
2018-02-11 22:01 Andreas Sturmlechner
2018-01-31 17:51 Andreas Sturmlechner
2017-07-04 15:49 Agostino Sarubbo
2017-07-04 10:17 Agostino Sarubbo
2017-06-27 18:34 Andreas Sturmlechner
2017-06-18 12:08 Michael Palimaka
2017-06-05 20:14 Andreas Sturmlechner
2017-04-01 16:16 Andreas Sturmlechner
2017-04-01 16:06 Agostino Sarubbo
2017-03-31 20:23 Andreas Sturmlechner
2017-03-25 14:43 Agostino Sarubbo
2017-03-24 15:25 Andreas Sturmlechner
2017-03-21 12:24 Andreas Sturmlechner
2017-03-19 13:57 Andreas Sturmlechner
2017-02-25 22:05 Johannes Huber
2017-01-07 10:59 Andreas Sturmlechner
2017-01-04  9:50 Andreas Sturmlechner
2016-12-30  0:26 Andreas Sturmlechner
2016-12-08 14:10 Johannes Huber
2016-11-02 18:39 Johannes Huber
2016-08-20 18:28 Michael Palimaka
2016-07-03 19:36 Andreas Hüttel
2016-06-16 18:10 Michael Palimaka
2016-06-16 18:10 Michael Palimaka
2016-04-09 13:46 Agostino Sarubbo
2016-04-04 19:05 Johannes Huber
2016-02-14 16:52 Michael Palimaka
2016-02-12 10:22 Michael Palimaka
2015-12-30 14:13 Michael Palimaka
2015-09-03 13:08 Michael Palimaka
2015-08-18 11:20 Johannes Huber
2015-08-12 20:33 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox