Adjust useflags and review what is in koffice-2.1.

16 files changed, 22 insertions, 59 deletions

diff --git a/app-office/karbon/Manifest b/app-office/karbon/Manifest
index c19d936c77e..c21a716905b 100644
--- a/app-office/karbon/Manifest
+++ b/app-office/karbon/Manifest
@@ -1,4 +1,4 @@
 DIST koffice-2.0.91.tar.bz2 77032178 RMD160 611465df0212722d68048aaa181a813cb62eac97 SHA1 b3d17c0d9bcc10e67b778e6e7204672f879b2b2b SHA256 f335caa3efa27be5d993c09f1c23f7e68a684db84011d644fc864c296a2e27e3
-EBUILD karbon-2.0.91.ebuild 641 RMD160 2c6af7c639ec901e9ae049e82a0f221efbdb4942 SHA1 bd2e34ed9b1ce732df5153538510eeb5a4492e32 SHA256 f2efadee1c048caacbe3c5a6fc75caa8bc4202ce9089dbab93f477c98a9a5a8a
-EBUILD karbon-9999.ebuild 630 RMD160 34890ab7f9c84572fe380bdab20590610acdba9d SHA1 fe7cf768bf3b8ad9719b36c51974779e7abc5235 SHA256 189d77252db6a95a1346141557032286eec200b257cdd33f21225026e4a4dc8f
+EBUILD karbon-2.0.91.ebuild 640 RMD160 09176e183de76896f965ab508b2f06aba2fd0e23 SHA1 12f04142ebf4c2080fcdb9b1bbeb0f3fea5b4de4 SHA256 9ef176412c3b60e154bd40c14bdda9e620559c3abacb1e6302b66e138af5ab1a
+EBUILD karbon-9999.ebuild 629 RMD160 1fb073bd74ff783c6689be7cbd790b2a9b5f2758 SHA1 3540b18ec009380881f9b3b949aa9fc5bdd0376a SHA256 50677a871b933cf36f73f85abe2ce660ba3fbb98ea061da36c9d8d9a34e69646
 MISC metadata.xml 294 RMD160 f659e3aae5ebd8df5b9edb4e242335bbe63dff15 SHA1 bc9ee1e6b54d2fbfd080c7232cff6be7af58d337 SHA256 4c974c7e7e60514567d6a5683862a9d96ea993d6d3b427538315ff7eee1c40d6
diff --git a/app-office/karbon/karbon-2.0.91.ebuild b/app-office/karbon/karbon-2.0.91.ebuild
index 31127fb77e6..391bafecceb 100644
--- a/app-office/karbon/karbon-2.0.91.ebuild
+++ b/app-office/karbon/karbon-2.0.91.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="KOffice vector drawing application."
 
 KEYWORDS="~amd64 ~x86"
-IUSE="+pstoedit +wpg"
+IUSE="+pstoedit wpg"
 
 DEPEND="
 	media-libs/libart_lgpl
diff --git a/app-office/karbon/karbon-9999.ebuild b/app-office/karbon/karbon-9999.ebuild
index 56814ac898f..6f1ea372039 100644
--- a/app-office/karbon/karbon-9999.ebuild
+++ b/app-office/karbon/karbon-9999.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="KOffice vector drawing application."
 
 KEYWORDS=""
-IUSE="+pstoedit +wpg"
+IUSE="+pstoedit wpg"
 
 DEPEND="
 	media-libs/libart_lgpl
diff --git a/app-office/kivio/Manifest b/app-office/kivio/Manifest
index 36202ad1746..1747c1dd3c9 100644
--- a/app-office/kivio/Manifest
+++ b/app-office/kivio/Manifest
@@ -1,3 +1 @@
-DIST koffice-2.0.82.tar.bz2 74700438 RMD160 ac332c472c529babc6dacc6a5683b3ce8915a746 SHA1 e6f1441035c980cb0b73068479d010a78662fa04 SHA256 f15e85bf0bc0cfa9f253b01aa808d01a3db9a04f3033a80b690cc76949410d95
-EBUILD kivio-2.0.82.ebuild 560 RMD160 ec03c1c2a50711ebcae853e65738eee9d49d3597 SHA1 e7b136e017c2c02195e522b4db43105543a43a9c SHA256 28a5c014095ac6c9e3666f6b314fe2345b759a1aec15628f5c326b14b244465f
 EBUILD kivio-9999.ebuild 549 RMD160 1736df36bacb9c95618a77e5dae5951151669bbb SHA1 e55c33560677ceaf5280bc8d6b97c9450e40dce1 SHA256 1016ca988f663676d7c60b9e21174fec098f90b544d3681b538564e92ed9c9c6
diff --git a/app-office/kivio/kivio-2.0.82.ebuild b/app-office/kivio/kivio-2.0.82.ebuild
deleted file mode 100644
index 6536bb70bd7..00000000000
--- a/app-office/kivio/kivio-2.0.82.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KMNAME="koffice"
-inherit kde4-meta
-
-DESCRIPTION="KOffice flowchart application."
-KEYWORDS="~amd64 ~x86"
-IUSE="debug python"
-
-DEPEND="
-	python? ( >=kde-base/pykde4-${KDE_MINIMAL} )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	filters/${KMMODULE}
-"
-KMEXTRACTONLY="
-	filters/
-	libs/
-	plugins/
-"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with python PythonLibs)"
-
-	kde4-meta_src_configure
-}
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index 23618caeb1e..8c9fbe92031 100644
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -1,4 +1,4 @@
 DIST koffice-2.0.91.tar.bz2 77032178 RMD160 611465df0212722d68048aaa181a813cb62eac97 SHA1 b3d17c0d9bcc10e67b778e6e7204672f879b2b2b SHA256 f335caa3efa27be5d993c09f1c23f7e68a684db84011d644fc864c296a2e27e3
-EBUILD koffice-libs-2.0.91.ebuild 1342 RMD160 b2b39e51c974bf5851e0e2fad4fe6c35c1b8c887 SHA1 4604e92cd0a0d95059a6b1e71a4face56a99bc52 SHA256 5182741a66a424801e15e076eb6af5c673d9448529971664c904ab8521b49414
-EBUILD koffice-libs-9999.ebuild 1331 RMD160 1421acefa13ba86ff0217a7089a2afa6578cff8c SHA1 5bee9de50e1b093f6674e237229d7701951bbfca SHA256 d2a83cfdc5406923901a29e8e28d8127bf601d53303e7b264f7bef14f64058dd
+EBUILD koffice-libs-2.0.91.ebuild 1349 RMD160 c6b176cd1efa6fe279f2c2dccf57e68e52e3d2d7 SHA1 fb6318365f38070592bac526baf76bb7da3d7fe9 SHA256 c3af79578ea2a3b94f669ff79531148ea920f0c00230a4928da1dbb44804bf24
+EBUILD koffice-libs-9999.ebuild 1338 RMD160 fa2709e0ed75a07c84b5b7d11fa88b87cdc098a6 SHA1 a059fa2bc396d9e9c40ad912a25006bd2b3b27ec SHA256 27e98a1a482185a8605185395ee0e432ad1ebf32a6c99e8a884efe0d70b44202
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-office/koffice-libs/koffice-libs-2.0.91.ebuild b/app-office/koffice-libs/koffice-libs-2.0.91.ebuild
index 767e654f102..8176444735b 100644
--- a/app-office/koffice-libs/koffice-libs-2.0.91.ebuild
+++ b/app-office/koffice-libs/koffice-libs-2.0.91.ebuild
@@ -63,7 +63,7 @@ src_configure() {
 }
 
 src_install() {
-	newdoc kounavail/README README.kounavail
+	newdoc kounavail/README README.kounavail || die
 
 	kde4-meta_src_install
 }
diff --git a/app-office/koffice-libs/koffice-libs-9999.ebuild b/app-office/koffice-libs/koffice-libs-9999.ebuild
index f04f1d38e21..ead68441c18 100644
--- a/app-office/koffice-libs/koffice-libs-9999.ebuild
+++ b/app-office/koffice-libs/koffice-libs-9999.ebuild
@@ -63,7 +63,7 @@ src_configure() {
 }
 
 src_install() {
-	newdoc kounavail/README README.kounavail
+	newdoc kounavail/README README.kounavail || die
 
 	kde4-meta_src_install
 }
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index 7c65d31c3e8..0c87e30ad63 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -1,4 +1,4 @@
 DIST koffice-2.0.91.tar.bz2 77032178 RMD160 611465df0212722d68048aaa181a813cb62eac97 SHA1 b3d17c0d9bcc10e67b778e6e7204672f879b2b2b SHA256 f335caa3efa27be5d993c09f1c23f7e68a684db84011d644fc864c296a2e27e3
-EBUILD krita-2.0.91.ebuild 1107 RMD160 e64d5307b371bfee3352d0da0f1ab5896d351d33 SHA1 d98294483e4313e355fdd55f44c33743a753a079 SHA256 7377ca8b6f359080b6ca008970b57962230b368be69b44cc056d6f9c0549fc24
-EBUILD krita-9999.ebuild 1096 RMD160 3e7a99258e7b112782feab8ac49da27132df48c7 SHA1 b9e20a9c99444dfcfb4a7d25556e69848eecec32 SHA256 c487b810c00c783de726928bab2ad2298f780d3adac7df68493e97dfc001451b
+EBUILD krita-2.0.91.ebuild 1122 RMD160 0e69a21814566f02ac8adcf67eca923b54ff66ce SHA1 9e41198dc37b54cd2d9b1bd22ef2974c8a50b11a SHA256 7d6fa182192da4d6b8774d3bfc41b7a053e609559f4fd5559cf80c4e128c9aff
+EBUILD krita-9999.ebuild 1111 RMD160 c58aa998b3c9c9aecc3239c3991e1bb900b6da89 SHA1 cdd1f56aa0854c6429b7e7fa634554499a58d7ec SHA256 45b8668b77f938842af753471321bdc22663df2a0fef24b16281273df49aa0a0
 MISC metadata.xml 318 RMD160 2341b49b24f95cc26f19933f8a785c5550970e3f SHA1 7264bf7bba1b5e206e47b8e85b783d3f5292ecc9 SHA256 41a628ecdd9b2fcd3405c2a146b1780eb75d282b956da88120963e441a1135d4
diff --git a/app-office/krita/krita-2.0.91.ebuild b/app-office/krita/krita-2.0.91.ebuild
index 11dde380ac9..87cffca29b2 100644
--- a/app-office/krita/krita-2.0.91.ebuild
+++ b/app-office/krita/krita-2.0.91.ebuild
@@ -12,7 +12,7 @@ inherit kde4-meta
 DESCRIPTION="KOffice image manipulation program."
 
 KEYWORDS="~amd64 ~x86"
-IUSE="+gmm +kdcraw +openexr +pdf +tiff"
+IUSE="gmm +kdcraw openexr +pdf +tiff"
 
 DEPEND="
 	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
@@ -21,7 +21,7 @@ DEPEND="
 	>=media-gfx/exiv2-0.16
 	>=media-gfx/imagemagick-0.6.4.9.2[openexr=,png,tiff?]
 	gmm? ( sci-mathematics/gmm )
-	kdcraw? ( kde-base/libkdcraw )
+	kdcraw? ( >=kde-base/libkdcraw-${KDE_MINIMAL} )
 	opengl? ( media-libs/glew )
 	pdf? (
 		>=virtual/poppler-qt4-0.10.5
diff --git a/app-office/krita/krita-9999.ebuild b/app-office/krita/krita-9999.ebuild
index 4936838bfb0..dc0314bcabe 100644
--- a/app-office/krita/krita-9999.ebuild
+++ b/app-office/krita/krita-9999.ebuild
@@ -12,7 +12,7 @@ inherit kde4-meta
 DESCRIPTION="KOffice image manipulation program."
 
 KEYWORDS=""
-IUSE="+gmm +kdcraw +openexr +pdf +tiff"
+IUSE="gmm +kdcraw openexr +pdf +tiff"
 
 DEPEND="
 	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
@@ -21,7 +21,7 @@ DEPEND="
 	>=media-gfx/exiv2-0.16
 	>=media-gfx/imagemagick-0.6.4.9.2[openexr=,png,tiff?]
 	gmm? ( sci-mathematics/gmm )
-	kdcraw? ( kde-base/libkdcraw )
+	kdcraw? ( >=kde-base/libkdcraw-${KDE_MINIMAL} )
 	opengl? ( media-libs/glew )
 	pdf? (
 		>=virtual/poppler-qt4-0.10.5
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index 605ced85978..9e082f19f28 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,4 +1,4 @@
 DIST koffice-2.0.91.tar.bz2 77032178 RMD160 611465df0212722d68048aaa181a813cb62eac97 SHA1 b3d17c0d9bcc10e67b778e6e7204672f879b2b2b SHA256 f335caa3efa27be5d993c09f1c23f7e68a684db84011d644fc864c296a2e27e3
-EBUILD kspread-2.0.91.ebuild 602 RMD160 d6af47edca8986df65aac33e69dab333c929a5f2 SHA1 e31c20185df7bad3914e8c4ffdd771e2e14c64c4 SHA256 4062650bd3aa9fddd9b0f37080c672afc35627b09f778b2ecbb64b0535086937
+EBUILD kspread-2.0.91.ebuild 601 RMD160 c0afdacf4be4c3a607395bec79b3f4391ad9d184 SHA1 b6a85bfe1fa5b0f470e496d82a277dc786ea7b35 SHA256 bb5d2776ca54d11ebb6ffdb61d99927f15d088b0454a6a450de363927aaf61eb
 EBUILD kspread-9999.ebuild 591 RMD160 ca6dd3397d6002600b904a111ce2606f553020c2 SHA1 2101e542ad93b06d97c6361ec8efcc62832532e3 SHA256 a5a4868cd52c2f3b61a5ca19a445d28edb514aad44f75992498496b496eb193f
 MISC metadata.xml 251 RMD160 3c3b2fcd341b05560e1dbee57312b4ea2b58743c SHA1 9311ba89b57f0be473ac87fdfe02a199dda49297 SHA256 27d3543025845d9e297f029fb35c2c090003943d6f27ee7e3a734e2fc7ff07c4
diff --git a/app-office/kspread/kspread-2.0.91.ebuild b/app-office/kspread/kspread-2.0.91.ebuild
index 300c77f394b..604928dc580 100644
--- a/app-office/kspread/kspread-2.0.91.ebuild
+++ b/app-office/kspread/kspread-2.0.91.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="KOffice spreadsheet application."
 
 KEYWORDS="~amd64 ~x86"
-IUSE="+solver"
+IUSE="solver"
 
 DEPEND="dev-cpp/eigen:2
 	solver? ( sci-libs/gsl )
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 9c8c9cb1d84..7f88f11d50f 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,4 +1,4 @@
 DIST koffice-2.0.91.tar.bz2 77032178 RMD160 611465df0212722d68048aaa181a813cb62eac97 SHA1 b3d17c0d9bcc10e67b778e6e7204672f879b2b2b SHA256 f335caa3efa27be5d993c09f1c23f7e68a684db84011d644fc864c296a2e27e3
-EBUILD kword-2.0.91.ebuild 578 RMD160 bc45407a0ae0df8d52ee41787487866fb5e799e4 SHA1 edc51fe57f4fc52e8b2953e7c823ba2e457dca73 SHA256 9292008095d6973ee801ce2623b4741dc99cb5bf3a113f072d3f4e9d389adcc5
-EBUILD kword-9999.ebuild 593 RMD160 06b376c99d42cecd7c04b581680577b443207b4a SHA1 6b646b7d9fda625702ff5ccefc27fb086e254a48 SHA256 35340329f97b18208556dd59ad50424b461b4bee8948896b19632cf87a7a8990
+EBUILD kword-2.0.91.ebuild 577 RMD160 54c964860fb25987a155f928c9f2d8c4637d2b62 SHA1 f36e851ef1f781d90f77e9c6d9f39c9e2f243838 SHA256 d920c62201747785eea58e9a70162d4f496f7577d85ef0c2a93e95d0a923c430
+EBUILD kword-9999.ebuild 566 RMD160 65dd89afd12911afdd4acb32ecd6ee51d14c1e4e SHA1 fb1b5d862ab3235a79405e648bcb7cb4638dfbef SHA256 65c23f861e5ac9c136eb5baee16c31166893402b23e221f767b4c2c747b48964
 MISC metadata.xml 283 RMD160 fbaac5a3e6372bbdfbd1c8e2f21667b24177083a SHA1 234fa1319e29712e6ac237921eeaae0a591d0602 SHA256 40523c9d7d6ebd6453db54f4912636eaa7b089efdeb7c4f2ee8cbf0abebeb57e
diff --git a/app-office/kword/kword-2.0.91.ebuild b/app-office/kword/kword-2.0.91.ebuild
index 342deafdc04..4e15fae01a7 100644
--- a/app-office/kword/kword-2.0.91.ebuild
+++ b/app-office/kword/kword-2.0.91.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="KOffice word processor."
 
 KEYWORDS="~amd64 ~x86"
-IUSE="+wpd +wv2"
+IUSE="wpd +wv2"
 
 DEPEND="
 	app-text/libwpd
diff --git a/app-office/kword/kword-9999.ebuild b/app-office/kword/kword-9999.ebuild
index 304e6594b69..682c6c7e204 100644
--- a/app-office/kword/kword-9999.ebuild
+++ b/app-office/kword/kword-9999.ebuild
@@ -11,11 +11,11 @@ inherit kde4-meta
 DESCRIPTION="KOffice word processor."
 
 KEYWORDS=""
-IUSE="+wpd +wv2"
+IUSE="wpd +wv2"
 
 DEPEND="
-	wpd? ( app-text/libwpd )
-	wv2? ( >=app-text/wv2-0.4.1 )
+	app-text/libwpd
+	app-text/wv2
 "
 RDEPEND="${DEPEND}"