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

["Andreas Hüttel" <dilfridge@gentoo.org>]

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

Resync with main tree

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-office/calligra/ChangeLog              |    4 +
 app-office/calligra/Manifest               |   34 ++---
 app-office/calligra/calligra-2.3.73.ebuild |  205 ----------------------------
 app-office/calligra/calligra-2.3.74.ebuild |   20 ++-
 app-office/calligra/calligra-9999.ebuild   |  117 +++++++---------
 5 files changed, 88 insertions(+), 292 deletions(-)

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 7d6e8f3..01792b8 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.1 2011/07/22 15:10:36 dilfridge Exp $
 
+  26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -calligra-2.3.73.ebuild, calligra-2.3.74.ebuild, calligra-9999.ebuild:
+  Resync with main tree
+
   19 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   calligra-2.3.74.ebuild, +files/calligra-2.3.74-jpeglcms-2.patch,
   metadata.xml:

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 959867e..cd781ce 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -3,27 +3,25 @@ Hash: SHA512
 
 AUX calligra-2.3.74-jpeglcms-2.patch 1014 RMD160 cd9532d322789aa655448fb89ffed5835d4e24ae SHA1 fd6770d6b88c360e6a5d0426d6ae0c1f19614720 SHA256 f4593796592cc5973685b1a9b25ca1e4f20b3ed3a64043582324eaa89b301de2
 AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e10e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1
-DIST calligra-2.3.73.tar.bz2 106302430 RMD160 a9d91574efe3038dfec699734aa7980ac4d3dcac SHA1 ed69912f6570ad37e73ad24c966cab3f8018c00b SHA256 89b9045b47226c61877f521c0d2eb319fb4237bf0b8c86023663b7f435c1ea98
 DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821afff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447
-EBUILD calligra-2.3.73.ebuild 6354 RMD160 a2dea25a05f976f9009cb8d0a1a356517044b4ca SHA1 7cf2e66e45dac685e8a152017ae04cc211ecfc26 SHA256 1415e2b43555e9ac9a7a635a14d151476e55c56e56a3a27d103cafcc7ceea8e2
-EBUILD calligra-2.3.74.ebuild 5280 RMD160 9571ca4410c9d106b718524495defcd87b79d7da SHA1 6d578417a67a40ef3b03231ab7ad991ff0937353 SHA256 cf0452d4486ba69d8e19e398e5d4b67344d10e91faf96e761a72859c6129d535
-EBUILD calligra-9999.ebuild 6354 RMD160 a2dea25a05f976f9009cb8d0a1a356517044b4ca SHA1 7cf2e66e45dac685e8a152017ae04cc211ecfc26 SHA256 1415e2b43555e9ac9a7a635a14d151476e55c56e56a3a27d103cafcc7ceea8e2
-MISC ChangeLog 1124 RMD160 699403f7a0925505b343f71eea9846519c90085f SHA1 0abca167175e6fa86e71b67eea692f7c72288dbe SHA256 70a23aa7dc3b7d8a865e7d3184ce2c43b71cfa2b811087fc14466535f61e9700
+EBUILD calligra-2.3.74.ebuild 5626 RMD160 e2d99aea615eab8c0baa2a019d15c4c663703c99 SHA1 878736ee9745290fdcf87634461bee10a0cdc48f SHA256 6b21cf35ae71a67adf795c598006af10ace2305f510414ba50e7d675808543a8
+EBUILD calligra-9999.ebuild 5624 RMD160 e2d7697ce8f356dc204303f7f7e67296d1e728f4 SHA1 0676ad1c30b9bd7aa5dca7b64c170421f374e01d SHA256 613753b56ca5350272a374620bf67de410c3060f9f8b1f79ec53071e836d0fc7
+MISC ChangeLog 1279 RMD160 6170863f433344cbc0a23c45ee48950d65ef5b3f SHA1 40ee0d6c9ff584d5029c8de417d48130f1ac9151 SHA256 6de6199bb7863e725a2853eb25a62f586650cf0a4da2302aefd754979a8078fc
 MISC metadata.xml 1493 RMD160 5f1e1818172372ce04d3bf9c1812fbf99136b108 SHA1 517e3baf1c93ac56f14871bd86a2cdcaa323b3f9 SHA256 e67c6c2712484e6e0e0b64d607796b264bd7539e7a24e8a3cf410151a2330685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOTt1rAAoJENwGBM22xffeKNYQAJgIwrzw6mMypOxijF4GYUTT
-j9tGxOIBQXjCDuuSe52+i3CmCvUN/oY3+MdAlRDsk4MgEXvGxg8sR/SuzXkNac1W
-BK45K6GRuZcDjMb4hplCOYHUkfExLp3vjStaBy1Ji202buNAAP3aHiMj9qiON5V7
-3aiOqXAbh9hOZ1EtadkuGzwnd+H5Ceh/Vhw5TZKRENY0M7pB3sxZItDsPXzahOqY
-afYmhNEzmc0tikQf+B71ftdVll/qkT5o9+Ymvhoy035uhNpYa06U1gc2BwBUBKR+
-cdiakdqUbB3Fl3Xz6LoT2pcgIwcy9BI3KfQebZQAS82yKZ4bfHK0wIC97vaQ/1fP
-/U439cKl1hAMQt0rEnvB0XHTZ2XrIfFDwoU9MYOT8KF0oh0Ma5UdJ/2miKPViigN
-mFzkSK1/UiBB6zR+Xhc6HPgXaVDtEf4cubUpSpI+rSMad99vJNzbihQyH+ZZ+8d5
-T9bkNafzTFDNgOGYa1pq+1NjH8L/KEEHl9S/B4RNyFX9dEkyMi1FEYHnmRxLjZKs
-1mBa3dDXOolsR2hh+hvPCVlmdM/jyuVsgeBcxIlYk9eopmpWAMC04d6948yfYYTs
-5bQxNFMSmR4he06NBxyw0WNa2YptmKl1pH5llLcaVT9SubcxmMPoMzxwk6mJePMc
-Os/GT2zvJ/bDKFGiRw0G
-=77Jo
+iQIcBAEBCgAGBQJOWAiMAAoJENwGBM22xffeLtoP/jKLf1p+VYZ9OAGpRxPMe2ZC
+qm5tPGYcGDJT85wvRrBKZgCY12H14r8EpyZ/4eJ+XBF1rSABARkm+54AcFAQFl+D
+Fv3dRZZzO4tdEYHcGX9iZGyKbsGqdMRvlW6G4uBwzVpaYZrPYqrSRJx/dN26473K
+wKUljIVX3dNfqa109tyFhxhmbmAs5l0OMqf4U0QGe6YddFaNHAs41Kj8MZeWg3CP
+/W91vc0BzA6YDf01gDcCou7OwCZFmyFcJYqL+Hl/VUMeJS8r1AZFpLBngN9VL5oN
+nLO1r5E70DvSdWeKZa69IYauLbBufPqtD+n9AMo4gOvIQ3sJadm4hOaB5N8ERA83
+q7MH8hx1dGl7g7Ox2Wa5dTNcAXW9O8nE+eFvom3n7NzLlswJbfqFOg5dqM7Ln4Bc
+8ehVcDwsmr1H3hIN/0YqUa+ZEglcQR0xhJn5nTABkpjlpq2Rw4RfZ97OYET0aNIJ
+D5qZbRYltzVrjhO12n2Nebrx/YqDxjrgaM310f2OqkmzZa42y+m3O6KFddOdk7TM
+FQ71e+XJEfW01fgNxLYa9pYhlcaoAeT04V803a72kp18SBXKVeuK7KtGlJ1/BfdS
+0QkhLiGjeBArXVkIxqbAeNugf1XKV+fXPOiW2ogzbNw4PWlLlY2xz2ON4PykXuoP
+FkEUxyhaib50KyLYE800
+=WWjN
 -----END PGP SIGNATURE-----

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

diff --git a/app-office/calligra/calligra-2.3.74.ebuild b/app-office/calligra/calligra-2.3.74.ebuild
index ef3b568..23ca37e 100644
--- a/app-office/calligra/calligra-2.3.74.ebuild
+++ b/app-office/calligra/calligra-2.3.74.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.73.ebuild,v 1.2 2011/08/04 16:30:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.5 2011/08/26 20:46:55 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -24,24 +24,35 @@ SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase tiff +threads +truetype
++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 +wmf word-perfect xbase +xml +xslt"
 
 # please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage tables krita karbon braindump active"
+CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done
 unset cal_ft
 
 REQUIRED_USE="
-	calligra_features_tables? ( eigen )
+	calligra_features_kexi? ( calligra_features_tables )
 	calligra_features_krita? ( eigen exif lcms )
 	calligra_features_plan? ( kdepim )
+	calligra_features_tables? ( eigen )
+	test? ( calligra_features_karbon )
 "
 
 RDEPEND="
+	!app-office/karbon
+	!app-office/koffice-data
+	!app-office/koffice-l10n
 	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/krita
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/kspread
+	!app-office/kword
 	dev-db/sqlite:3
 	dev-lang/perl
 	dev-libs/boost
@@ -173,6 +184,7 @@ src_configure() {
 	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
 

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 1ea11dd..5a80563 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,11 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.73.ebuild,v 1.2 2011/08/04 16:30:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.1 2011/08/26 20:53:46 dilfridge Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
 
 EAPI=4
 
 KDE_SCM=git
-KDE_MINIMAL=4.6
+KDE_MINIMAL=4.6.4
 OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
 KDE_LINGUAS_LIVE_OVERRIDE=true
@@ -18,25 +22,44 @@ HOMEPAGE="http://www.calligra-suite.org/"
 LICENSE="GPL-2"
 SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
-+pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
-+wmf word-perfect +xml +xslt"
+IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
++wmf word-perfect xbase +xml +xslt"
 
-CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done
 unset cal_ft
 
+REQUIRED_USE="
+	calligra_features_kexi? ( calligra_features_tables )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim )
+	calligra_features_tables? ( eigen )
+	test? ( calligra_features_karbon )
+"
+
 RDEPEND="
+	!app-office/karbon
+	!app-office/koffice-data
+	!app-office/koffice-l10n
 	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/krita
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/kspread
+	!app-office/kword
 	dev-db/sqlite:3
 	dev-lang/perl
+	dev-libs/boost
 	dev-libs/libxml2
 	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
 	sys-libs/zlib
-	boost? ( dev-libs/boost )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2 )
@@ -54,6 +77,7 @@ RDEPEND="
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs) )
 	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
 	okular? ( $(add_kdebase_dep okular) )
 	openctl? ( >=media-libs/opengtl-0.9.15 )
@@ -62,10 +86,13 @@ RDEPEND="
 		app-text/poppler
 		media-gfx/pstoedit
 	)
-	png? ( media-libs/libpng )
-	postgres? ( dev-db/postgresql-base )
+	postgres? (
+		dev-db/postgresql-base
+		=dev-libs/libpqxx-3*
+	)
 	semantic-desktop? ( dev-libs/soprano )
 	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
 	word-perfect? (
@@ -73,67 +100,25 @@ RDEPEND="
 		app-text/libwps
 		app-text/libwpg
 	)
+	xbase? ( dev-db/xbase )
 	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
 "
 DEPEND="${RDEPEND}"
 
-# By default all bulds are enabled.
-# When you find out what some option does just describe it here and
-# make it optional if required.
-# The list is copied from ccmake output.
-#
-# BUILD_artistictextshape
-# BUILD_braindump - note collection app ; USE_EXPAND
-# BUILD_calligra - the generic "open file" office app ; default on
-# BUILD_chartshape
-# BUILD_colorengines
-# BUILD_commentshape
-# BUILD_converter
-# BUILD_cstester
-# BUILD_defaultTools
-# BUILD_divineProportion
-# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
-# BUILD_dockers
-# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
-# BUILD_generic_wrapper
-# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
-# BUILD_kexi - database manager ; handled as USE_EXPAND
-# BUILD_kformula   << formula editor, should be part of base libs
-# BUILD_koabstraction << part of base libs
-# BUILD_koreport   << reporting library, should be part of base libs
-# BUILD_kounavail  << part of base libs
-# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
-# BUILD_krita - image editor ; handled as USE_EXPAND
-# BUILD_kthesaurus << thesaurus framework, should be part of base libs
-# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
-# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
-# BUILD_mdb
-# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
-# BUILD_musicshape
-# BUILD_pathshapes
-# BUILD_pictureshape
-# BUILD_pluginshape
-# BUILD_quickprint
-# BUILD_reporting
-# BUILD_scan
-# BUILD_slidecompare
-# BUILD_staging
-# BUILD_tables - table editor ; handled as USE_EXPAND
-# BUILD_textediting
-# BUILD_textshape
-# BUILD_thumbnail
-# BUILD_treeshape
-# BUILD_variables
-# BUILD_vectorshape
-# BUILD_videoshape
-# BUILD_words - text editor ; handled as USE_EXPAND
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.74-jpeglcms.patch"
+	"${FILESDIR}/${PN}-2.3.74-jpeglcms-2.patch"
+)
 
 src_configure() {
 	local cal_ft
 
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
-		"-DWITH_LibXml2=ON" # harddep for few parts
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
 		"-DWITH_ZLIB=ON"
 		"-DGHNS=ON"
 		"-DWITH_X11=ON"
@@ -148,13 +133,12 @@ src_configure() {
 		"-DCREATIVEONLY=OFF"
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
 	)
 
 	# regular options
 	mycmakeargs+=(
-		$(cmake-utils_use_with boost Boost)
 		$(cmake-utils_use_with crypt QCA2)
 		$(cmake-utils_use_with eigen Eigen2)
 		$(cmake-utils_use_with exif Exiv2)
@@ -173,6 +157,7 @@ src_configure() {
 		$(cmake-utils_use_with kdcraw Kdcraw)
 		$(cmake-utils_use_with kdepim KdepimLibs)
 		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_with okular Okular)
 		$(cmake-utils_use_with openctl OpenCTL)
@@ -180,15 +165,16 @@ src_configure() {
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
 		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with png PNG)
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
 		$(cmake-utils_use_with tiff TIFF)
 		$(cmake-utils_use_with threads Threads)
 		$(cmake-utils_use_with truetype Freetype)
 		$(cmake-utils_use_with word-perfect WPD)
 		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
 		$(cmake-utils_use_with xslt LibXslt)
 		$(cmake-utils_use_build wmf libkowmf)
 		$(cmake-utils_use_build mso libmsooxml)
@@ -198,6 +184,7 @@ src_configure() {
 	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