[koffice] Blind version bump with pmask, for the brave or insane. Does not build yet.

24 files changed, 460 insertions, 6 deletions

diff --git a/app-office/karbon/Manifest b/app-office/karbon/Manifest
index 62737eeb4fa..8cdafbb141a 100644
--- a/app-office/karbon/Manifest
+++ b/app-office/karbon/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD karbon-2.1.81.ebuild 646 RMD160 98511b86186749364d1f5b455b8fa45e22ba75b0 SHA1 93bf5fbc645e7c780109487cff08b2a6a82f65bf SHA256 813169b8e8eadb819dfc9b41af6b022a8793153edded60a2ab50644becc8d55f
+EBUILD karbon-2.2.0.ebuild 646 RMD160 98511b86186749364d1f5b455b8fa45e22ba75b0 SHA1 93bf5fbc645e7c780109487cff08b2a6a82f65bf SHA256 813169b8e8eadb819dfc9b41af6b022a8793153edded60a2ab50644becc8d55f
 EBUILD karbon-9999.ebuild 617 RMD160 48d0848e237d9aee290a19e7ad68f9867c9842a4 SHA1 6d35b4d9dc17be5e4b538a2775ba4c393b365840 SHA256 cc2da5110d50312e3b68bec13bcf635f7564878632f6e5bb9a99910144c9dfc9
 MISC metadata.xml 294 RMD160 f659e3aae5ebd8df5b9edb4e242335bbe63dff15 SHA1 bc9ee1e6b54d2fbfd080c7232cff6be7af58d337 SHA256 4c974c7e7e60514567d6a5683862a9d96ea993d6d3b427538315ff7eee1c40d6
diff --git a/app-office/karbon/karbon-2.2.0.ebuild b/app-office/karbon/karbon-2.2.0.ebuild
new file mode 100644
index 00000000000..73aa3240274
--- /dev/null
+++ b/app-office/karbon/karbon-2.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+KMNAME="koffice"
+KMMODULE="${PN}"
+
+inherit kde4-meta
+
+DESCRIPTION="KOffice vector drawing application."
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+pstoedit wpg"
+
+DEPEND="
+	media-libs/libart_lgpl
+	pstoedit? ( media-gfx/pstoedit )
+	wpg? ( media-libs/libwpg )
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="filters/${KMMODULE}"
+KMEXTRACTONLY="
+	libs/
+	plugins/
+	filters/
+"
+KMLOADLIBS="koffice-libs"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with wpg)
+		$(cmake-utils_use_with pstoedit)
+	)
+	kde4-meta_src_configure
+}
diff --git a/app-office/kchart/Manifest b/app-office/kchart/Manifest
index e19bf1aa674..a74a1350bc8 100644
--- a/app-office/kchart/Manifest
+++ b/app-office/kchart/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD kchart-2.1.81.ebuild 548 RMD160 2b026fb1b52b5ce135fc04878f16c173f406ce36 SHA1 3aa2db0b88667d909199cd267cda2dfa5d905ef6 SHA256 3508c587ee373017cb92b8c4ecc0d298a78627f4363a743eb7acb24cd48a9935
+EBUILD kchart-2.2.0.ebuild 548 RMD160 2b026fb1b52b5ce135fc04878f16c173f406ce36 SHA1 3aa2db0b88667d909199cd267cda2dfa5d905ef6 SHA256 3508c587ee373017cb92b8c4ecc0d298a78627f4363a743eb7acb24cd48a9935
 EBUILD kchart-9999.ebuild 519 RMD160 70bd31aa57c003af97bc2dacec6c49ccae106123 SHA1 5931aa6054c4b0ccd233614ce745be01d67760d6 SHA256 e42f42705ecbc8afba7ab964a7b535bdffde76ec679add44a81bc95d90d7ce7c
 MISC metadata.xml 274 RMD160 36613e453c44bddc105b680b428646468b763cf4 SHA1 5deb517eb48fbfbea683de59a817db233c00dd4f SHA256 e50185f7c5b54b6190f71b75a1903d7ad01a3fb441a06d739c8fbd51bf4b6b1b
diff --git a/app-office/kchart/kchart-2.2.0.ebuild b/app-office/kchart/kchart-2.2.0.ebuild
new file mode 100644
index 00000000000..e5427923fe5
--- /dev/null
+++ b/app-office/kchart/kchart-2.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="${PN}"
+inherit kde4-meta
+
+DESCRIPTION="KOffice chart application."
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="reports"
+
+KMEXTRACTONLY="
+	libs/
+	interfaces/
+	filters/
+	plugins/
+"
+KMEXTRA="
+	filters/${KMMODULE}/
+	libs/koreport/
+"
+
+KMLOADLIBS="koffice-libs"
+
+src_configure() {
+	 mycmakeargs=(
+		-DBUILD_kchart=ON
+		$(cmake-utils_use_build reports koreport)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 4ceaea77ab3..dd82fa3b3a5 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD kexi-2.1.81.ebuild 935 RMD160 767ad0eb205544acefc89006d6bbdfdbb6ee42f6 SHA1 2abf7b3cafba504d72f0c3c428040ca24986a2d2 SHA256 73fd28ae5ab1aa6138620cc828ad13a5035532eb65ccafe9bb5d15c65757e9c2
+EBUILD kexi-2.2.0.ebuild 935 RMD160 767ad0eb205544acefc89006d6bbdfdbb6ee42f6 SHA1 2abf7b3cafba504d72f0c3c428040ca24986a2d2 SHA256 73fd28ae5ab1aa6138620cc828ad13a5035532eb65ccafe9bb5d15c65757e9c2
 EBUILD kexi-9999.ebuild 906 RMD160 9f24c011c1c5c5e5110be00e41fb29d8901f25ce SHA1 673860cd29a25f10711445b9d84fc68d0e85a9a9 SHA256 2de2f75c4553b407b0bff37fcf84a838f0a6fef8b457518a525231f349e66dfd
 MISC metadata.xml 230 RMD160 11ce609521d877b1af804bcdb5eb3a9ccf6366b6 SHA1 766f6ad75989dbb94be31cc184d25ac4ddaed49c SHA256 5a7841a4f5cfcb2fe22ca5c486359fbb625ea829166a7407bc02178dcbf585d0
diff --git a/app-office/kexi/kexi-2.2.0.ebuild b/app-office/kexi/kexi-2.2.0.ebuild
new file mode 100644
index 00000000000..dd75f0e1799
--- /dev/null
+++ b/app-office/kexi/kexi-2.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+inherit kde4-meta
+
+DESCRIPTION="KOffice integrated environment for database management."
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="freetds mysql postgres reports xbase"
+
+DEPEND="
+	sys-libs/readline
+	app-arch/bzip2
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/mysql )
+	postgres? ( =dev-libs/libpqxx-2.6* )
+	reports? ( ~app-office/kchart-${PV}:${SLOT}[reports] )
+	xbase? ( dev-db/xbase )
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="koffice-libs"
+KMEXTRACTONLY="
+	libs/
+	kspread/
+"
+
+src_configure() {
+	 mycmakeargs=(
+		-DWITH_WEBFORMS=Off
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_with postgres Pqxx)
+		$(cmake-utils_use_with xbase XBase)
+		-DBUILD_kexi=ON
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/app-office/koffice-data/Manifest b/app-office/koffice-data/Manifest
index 7b599057860..0650fc19c64 100644
--- a/app-office/koffice-data/Manifest
+++ b/app-office/koffice-data/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD koffice-data-2.1.81.ebuild 431 RMD160 91ad23046c97e36de6a240e6420dc8fef769c82a SHA1 6652ac5711fef721f8b873b4c236feec5cfa8389 SHA256 52fd868458510ac0050263066ca3702369fd3bbe9d029f1f81e4c1f1ec37d1f1
+EBUILD koffice-data-2.2.0.ebuild 431 RMD160 91ad23046c97e36de6a240e6420dc8fef769c82a SHA1 6652ac5711fef721f8b873b4c236feec5cfa8389 SHA256 52fd868458510ac0050263066ca3702369fd3bbe9d029f1f81e4c1f1ec37d1f1
 EBUILD koffice-data-9999.ebuild 402 RMD160 467e7999b1a324eb57fee3d5de0961782ee2cc4f SHA1 a37de81011c0bfa3867cce76ca3e59249f6a89df SHA256 4957cac8ce002cbc66156933de172ba4009ae2d62fbc43f075b6a03c04d2db87
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-office/koffice-data/koffice-data-2.2.0.ebuild b/app-office/koffice-data/koffice-data-2.2.0.ebuild
new file mode 100644
index 00000000000..14f1866841b
--- /dev/null
+++ b/app-office/koffice-data/koffice-data-2.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Shared KOffice data files."
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/lcms-1.18"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="pics/
+	servicetypes/
+	templates/"
+KMEXTRACTONLY="
+	doc/CMakeLists.txt
+	doc/koffice.desktop"
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index 51bc28f181f..15563ad2120 100644
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD koffice-libs-2.1.81.ebuild 1252 RMD160 8fb7f4256420a16415421bff54ca64751375e8c4 SHA1 8283e7d1f95be1c5fa8106e1ab6157c5d79eccaf SHA256 49a2d0281475114ed01fed9144074df5aa2adfa5a016c9858693c4663ae9d9c8
+EBUILD koffice-libs-2.2.0.ebuild 1252 RMD160 8fb7f4256420a16415421bff54ca64751375e8c4 SHA1 8283e7d1f95be1c5fa8106e1ab6157c5d79eccaf SHA256 49a2d0281475114ed01fed9144074df5aa2adfa5a016c9858693c4663ae9d9c8
 EBUILD koffice-libs-9999.ebuild 1223 RMD160 41f576f1666d6ff338b212a06fe58d2cfafac56b SHA1 f5f47858401a673ebdb42c020e49125c8df7cb1d SHA256 6dc27c8a325dbf2bdb871fd47f88e1215dc7663ef41b6c52692e9cf3515fa389
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-office/koffice-libs/koffice-libs-2.2.0.ebuild b/app-office/koffice-libs/koffice-libs-2.2.0.ebuild
new file mode 100644
index 00000000000..71e3bd9fb55
--- /dev/null
+++ b/app-office/koffice-libs/koffice-libs-2.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="libs"
+OPENGL_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="Shared KOffice libraries."
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="crypt openexr"
+
+RDEPEND="
+	>=app-office/koffice-data-${PV}:${SLOT}
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=kde-base/kdepimlibs-${KDE_MINIMAL}
+	>=media-libs/lcms-1.15
+	crypt? ( app-crypt/qca:2 )
+	openexr? ( media-libs/openexr )
+	opengl? ( media-libs/mesa )
+"
+DEPEND="${RDEPEND}"
+#	doc? ( app-doc/doxygen )"
+
+KMEXTRA="
+	doc/koffice/
+	doc/thesaurus/
+	filters/generic_wrapper/
+	filters/libkowmf/
+	filters/libmsooxml/
+	filters/xsltfilter/
+	interfaces/
+	kounavail/
+	plugins/
+	tools/
+"
+#	doc/api/"
+KMEXTRACTONLY="
+	doc/koffice.desktop
+	kchart/kdchart/
+"
+
+KMSAVELIBS="true"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with openexr OpenEXR)
+	)
+	use crypt && \
+		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	newdoc kounavail/README README.kounavail || die
+
+	kde4-meta_src_install
+}
diff --git a/app-office/koffice-meta/Manifest b/app-office/koffice-meta/Manifest
index ac5567c9bad..673e4b586cc 100644
--- a/app-office/koffice-meta/Manifest
+++ b/app-office/koffice-meta/Manifest
@@ -1,3 +1,4 @@
 EBUILD koffice-meta-2.1.81.ebuild 725 RMD160 702f87f6afaa0edfc476dab4aff25ef61f7d9295 SHA1 cf063aecef721e1961f5c22e07d8471aac710d2f SHA256 7a1cf72788a4b8db0c706171466013b76af2d222cb4c265ae56d953fa262efb6
+EBUILD koffice-meta-2.2.0.ebuild 725 RMD160 702f87f6afaa0edfc476dab4aff25ef61f7d9295 SHA1 cf063aecef721e1961f5c22e07d8471aac710d2f SHA256 7a1cf72788a4b8db0c706171466013b76af2d222cb4c265ae56d953fa262efb6
 EBUILD koffice-meta-9999.ebuild 730 RMD160 dd5974b888127309e467637e5ed3b4bde5dc92d3 SHA1 8e47bb7ebe23b1b7d26839bc03e4feb25c68ac97 SHA256 3aa77a3a724984ec16c8b3682bbcc998bf70564489f263601cbe38954ab1c97c
 MISC metadata.xml 275 RMD160 2e279a2589160ea37e8ddabdba09482fe1904932 SHA1 4a430b0dc26b43954eb797e4f4dcda4fdbd68f79 SHA256 b20389bfa995e3fd9dfe48fe8aed5102bfc0690ac828e46be9babd70d87ad354
diff --git a/app-office/koffice-meta/koffice-meta-2.2.0.ebuild b/app-office/koffice-meta/koffice-meta-2.2.0.ebuild
new file mode 100644
index 00000000000..39113534a17
--- /dev/null
+++ b/app-office/koffice-meta/koffice-meta-2.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2"
+
+SLOT="2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="nls reports"
+
+RDEPEND="
+	>=app-office/karbon-${PV}:${SLOT}
+	>=app-office/kchart-${PV}:${SLOT}[reports?]
+	>=app-office/kexi-${PV}:${SLOT}
+	>=app-office/koffice-data-${PV}:${SLOT}
+	>=app-office/koffice-libs-${PV}:${SLOT}
+	>=app-office/kpresenter-${PV}:${SLOT}
+	>=app-office/krita-${PV}:${SLOT}
+	>=app-office/kspread-${PV}:${SLOT}
+	>=app-office/kword-${PV}:${SLOT}
+	reports? ( >=app-office/kplato-${PV}:${SLOT} )
+"
diff --git a/app-office/kplato/Manifest b/app-office/kplato/Manifest
index cabc0ffe394..ba7bd3ee1dc 100644
--- a/app-office/kplato/Manifest
+++ b/app-office/kplato/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD kplato-2.1.81.ebuild 586 RMD160 33e445c1d69c8b242a21ebd498eb02e89e19b497 SHA1 7bc9e8156af4a614638cb2044bb8234af096b1b2 SHA256 b976038ff79609d8505aed9fa43c48e9e95f7c869c9258c62706c297a8f3bb15
+EBUILD kplato-2.2.0.ebuild 586 RMD160 33e445c1d69c8b242a21ebd498eb02e89e19b497 SHA1 7bc9e8156af4a614638cb2044bb8234af096b1b2 SHA256 b976038ff79609d8505aed9fa43c48e9e95f7c869c9258c62706c297a8f3bb15
 EBUILD kplato-9999.ebuild 557 RMD160 bf23ccc2ec0b5043992b7903666630411489c54c SHA1 0dabcc362faf5e2c63163aa70f99a522964bc483 SHA256 a69f688802f6a2c2f6fa31e59bdf6bbc3be1cad5d51e7db70a988c56fde83627
 MISC metadata.xml 274 RMD160 36613e453c44bddc105b680b428646468b763cf4 SHA1 5deb517eb48fbfbea683de59a817db233c00dd4f SHA256 e50185f7c5b54b6190f71b75a1903d7ad01a3fb441a06d739c8fbd51bf4b6b1b
diff --git a/app-office/kplato/kplato-2.2.0.ebuild b/app-office/kplato/kplato-2.2.0.ebuild
new file mode 100644
index 00000000000..e808346f3e2
--- /dev/null
+++ b/app-office/kplato/kplato-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="${PN}"
+inherit kde4-meta
+
+DESCRIPTION="KPlato is a project management application."
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="~app-office/kchart-${PV}:${SLOT}[reports]"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="libs/"
+KMEXTRA="
+	filters/${KMMODULE}/
+	kdgantt/
+"
+KMLOADLIBS="koffice-libs"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with python PythonLibs)
+		-DBUILD_kplato=ON
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/app-office/kpresenter/Manifest b/app-office/kpresenter/Manifest
index 5365e1b27f2..b277d0f8194 100644
--- a/app-office/kpresenter/Manifest
+++ b/app-office/kpresenter/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD kpresenter-2.1.81.ebuild 457 RMD160 92dc170a373549c86525826d635ae704074ff3c8 SHA1 be240e80acbd6af9158b75948c963922da5d6a4d SHA256 97ce58068626f7cbbf5afe7ad4abf83c236f2fc5298a46cae15ac47670c6bd62
+EBUILD kpresenter-2.2.0.ebuild 457 RMD160 92dc170a373549c86525826d635ae704074ff3c8 SHA1 be240e80acbd6af9158b75948c963922da5d6a4d SHA256 97ce58068626f7cbbf5afe7ad4abf83c236f2fc5298a46cae15ac47670c6bd62
 EBUILD kpresenter-9999.ebuild 428 RMD160 a69a0a96baeba8013c3673cd32d2506bde6136be SHA1 16d0720fd1d30d1958f014c2c9223d64d46c8551 SHA256 b21e91d0695005d287fb8a6dc51cae9238a1d2b04eb28f9db8de700947b004d0
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-office/kpresenter/kpresenter-2.2.0.ebuild b/app-office/kpresenter/kpresenter-2.2.0.ebuild
new file mode 100644
index 00000000000..2130619d563
--- /dev/null
+++ b/app-office/kpresenter/kpresenter-2.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="${PN}"
+inherit kde4-meta
+
+DESCRIPTION="KOffice presentation program."
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/boost-1.35.0"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	filters/libmsooxml/
+	libs/
+"
+KMEXTRA="
+	filters/${KMMODULE}/
+	filters/libmso/
+"
+
+KMLOADLIBS="koffice-libs"
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index c51992e6314..66a0dffc720 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD krita-2.1.81.ebuild 1133 RMD160 787c1a20bc6b49f2ec19351227a1e0f5874cb3ed SHA1 b0f4d464a7dfd05a6fbf39ca0e45dfe8ad8fa3b4 SHA256 a17620406fe90ee24d31f953e14fba6735e5f29ab5db44b1ab7c0fe751a30c28
+EBUILD krita-2.2.0.ebuild 1133 RMD160 787c1a20bc6b49f2ec19351227a1e0f5874cb3ed SHA1 b0f4d464a7dfd05a6fbf39ca0e45dfe8ad8fa3b4 SHA256 a17620406fe90ee24d31f953e14fba6735e5f29ab5db44b1ab7c0fe751a30c28
 EBUILD krita-9999.ebuild 1104 RMD160 86e06ec9fb552faba785bfbdcdebcf30e06e92dc SHA1 43a46c4cafe7c4391e030ee7f8f6e3ece3e9c10c SHA256 3f431e8c9a64ebc579d5567f37cd47520cfa40e7aceab46d1ddc3f9e221b998e
 MISC metadata.xml 318 RMD160 2341b49b24f95cc26f19933f8a785c5550970e3f SHA1 7264bf7bba1b5e206e47b8e85b783d3f5292ecc9 SHA256 41a628ecdd9b2fcd3405c2a146b1780eb75d282b956da88120963e441a1135d4
diff --git a/app-office/krita/krita-2.2.0.ebuild b/app-office/krita/krita-2.2.0.ebuild
new file mode 100644
index 00000000000..f220298b5ac
--- /dev/null
+++ b/app-office/krita/krita-2.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="${PN}"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KOffice image manipulation program."
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="gmm +kdcraw openexr +pdf +tiff"
+
+DEPEND="
+	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
+	>=dev-cpp/eigen-2.0.3:2
+	>=media-libs/qimageblitz-0.0.4
+	>=media-gfx/exiv2-0.16
+	>=media-gfx/imagemagick-0.6.4.9.2[openexr=,png,tiff?]
+	gmm? ( sci-mathematics/gmm )
+	kdcraw? ( >=kde-base/libkdcraw-${KDE_MINIMAL} )
+	opengl? ( media-libs/glew )
+	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="libs/"
+
+KMLOADLIBS="koffice-libs"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_Eigen2=ON
+		-DWITH_Exiv2=ON
+		-DWITH_JPEG=ON
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with gmm)
+		$(cmake-utils_use_with tiff)
+		$(cmake-utils_use_with kdcraw)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with opengl GLEW)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index 89ac785d16e..6e0478a9b61 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD kspread-2.1.81.ebuild 610 RMD160 16c40386387c26aa8f9a712b6e356bc6e7dc5893 SHA1 0fd29af2aef460765356cce77a2de76af20f847e SHA256 d6ddd724001cd7ba15dec08581f1bcf6359eb10c10e3fe1d0e11530fd2c05508
+EBUILD kspread-2.2.0.ebuild 610 RMD160 16c40386387c26aa8f9a712b6e356bc6e7dc5893 SHA1 0fd29af2aef460765356cce77a2de76af20f847e SHA256 d6ddd724001cd7ba15dec08581f1bcf6359eb10c10e3fe1d0e11530fd2c05508
 EBUILD kspread-9999.ebuild 581 RMD160 46b8808c2dfd6bd1793f3e5a30fa65a6d9d39170 SHA1 c783be391705787a4623bac22662fb0e53f4b94e SHA256 67cf671744f88ffa138f764a4085653fc3db4daeb8d36c6af4c86fccf1fa05a7
 MISC metadata.xml 251 RMD160 3c3b2fcd341b05560e1dbee57312b4ea2b58743c SHA1 9311ba89b57f0be473ac87fdfe02a199dda49297 SHA256 27d3543025845d9e297f029fb35c2c090003943d6f27ee7e3a734e2fc7ff07c4
diff --git a/app-office/kspread/kspread-2.2.0.ebuild b/app-office/kspread/kspread-2.2.0.ebuild
new file mode 100644
index 00000000000..90a8d7bae74
--- /dev/null
+++ b/app-office/kspread/kspread-2.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="${PN}"
+inherit kde4-meta
+
+DESCRIPTION="KOffice spreadsheet application."
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+solver"
+
+DEPEND="
+	dev-cpp/eigen:2
+	solver? ( sci-libs/gsl )
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kchart/
+	interfaces/
+	libs/
+	filters/
+	plugins/
+"
+KMEXTRA="filters/${KMMODULE}/"
+
+KMLOADLIBS="koffice-libs"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_Eigen2=ON
+		$(cmake-utils_use_with solver GSL)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index b7764893d91..47fb47a7cc5 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,4 +1,6 @@
 DIST koffice-2.1.81.tar.bz2 55755334 RMD160 6d16beefd077bf56150ec232b28bef85da7fc6f8 SHA1 25e791e640c56f3653523dad9815e1e9bbf60063 SHA256 65d38c93277ce93810715112449738b626dafb05f36fb9b6dff6c4f59760e9cd
+DIST koffice-2.2.0.tar.bz2 56558832 RMD160 090fb8a5899a5f11a91ca65a0f1dc2aaac5ac26e SHA1 274623699eb666730a0c8d92f81fb99680217345 SHA256 6ae139a606b41409b333f76db1d1bb1069decceb1adca2ff6982115bf31b4761
 EBUILD kword-2.1.81.ebuild 577 RMD160 2ec6e50e632607aed004fd13db69278b2db3af0d SHA1 f93e793d5a0911d877f232b352f799c98886b113 SHA256 b13a108115c010ce8eaa84bd8bc77512ebf12860934a7aa04c9293afd87cb0f3
+EBUILD kword-2.2.0.ebuild 577 RMD160 2ec6e50e632607aed004fd13db69278b2db3af0d SHA1 f93e793d5a0911d877f232b352f799c98886b113 SHA256 b13a108115c010ce8eaa84bd8bc77512ebf12860934a7aa04c9293afd87cb0f3
 EBUILD kword-9999.ebuild 548 RMD160 7b876c504a440b620700b6050076f117a5fd5cd3 SHA1 dae8d65d8c8a65ac43de3dc9ff33df17a8ee372e SHA256 cbb9961022bb0176230daed5d8ceff6b5c2be968525d07a0b3bb1f03333925b8
 MISC metadata.xml 230 RMD160 4baf1157c69691adfe27d3b8730f57b45ecca9f3 SHA1 294022ab883718c74c0f806d82352acddd9c9e05 SHA256 36a35f8d7c2eff6446ba42fa9b34b937e005d59cf63d72779b1ca351876ed282
diff --git a/app-office/kword/kword-2.2.0.ebuild b/app-office/kword/kword-2.2.0.ebuild
new file mode 100644
index 00000000000..1bf33ab93d2
--- /dev/null
+++ b/app-office/kword/kword-2.2.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="${PN}"
+inherit kde4-meta
+
+DESCRIPTION="KOffice word processor."
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="wpd"
+
+DEPEND="
+	wpd? ( app-text/libwpd )
+"
+RDEPEND="${DEPEND}
+	!app-text/wv2
+"
+
+KMEXTRA="filters/${KMMODULE}/
+	filters/libmso/
+"
+
+KMEXTRACTONLY="
+	filters/
+	kspread/
+	libs/
+	plugins/
+"
+
+KMLOADLIBS="koffice-libs"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with wpd)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 2d1d966ad84..da68f3c33f0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -273,12 +273,6 @@ kde-base/kfilereplace:4.5
 kde-base/kimagemapeditor:4.5
 kde-base/klinkstatus:4.5
 kde-base/kommander:4.5
-
-# Andreas K. Huettel <mail@akhuettel.de> (30 May 2010)
-# See bug 314539
-# As long as KDE 4.5 is masked, so should be this:
-=dev-libs/libattica-0.1.4
-
 kde-base/kdeaccessibility-meta:4.5
 kde-base/kdeadmin-meta:4.5
 kde-base/kdeartwork-meta:4.5
diff --git a/profiles/package.mask.d/koffice-2.2.0 b/profiles/package.mask.d/koffice-2.2.0
new file mode 100644
index 00000000000..d501df603a7
--- /dev/null
+++ b/profiles/package.mask.d/koffice-2.2.0
@@ -0,0 +1,15 @@
+# Andreas Huettel <mail@akhuettel>
+# Mask koffice 2.2.0, needs depedencies review
+# and can still be broken a lot
+~app-office/karbon-2.2.0
+~app-office/kchart-2.2.0
+~app-office/kexi-2.2.0
+~app-office/koffice-data-2.2.0
+~app-office/koffice-libs-2.2.0
+~app-office/kplato-2.2.0
+~app-office/kpresenter-2.2.0
+~app-office/krita-2.2.0
+~app-office/kspread-2.2.0
+~app-office/kword-2.2.0
+~app-office/koffice-l10n-2.2.0
+~app-office/koffice-meta-2.2.0