19 files changed, 45 insertions, 393 deletions
diff --git a/app-office/koffice-meta/ChangeLog b/app-office/koffice-meta/ChangeLog
index 3481ae5972a9..9d2bc8864bea 100644
--- a/app-office/koffice-meta/ChangeLog
+++ b/app-office/koffice-meta/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/koffice-meta
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.79 2009/06/25 12:32:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.80 2009/06/30 21:41:15 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -koffice-meta-1.6.1.ebuild, koffice-meta-1.6.3.ebuild,
+  koffice-meta-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *koffice-meta-2.0.1 (25 Jun 2009)
 
diff --git a/app-office/koffice-meta/koffice-meta-1.6.1.ebuild b/app-office/koffice-meta/koffice-meta-1.6.1.ebuild
deleted file mode 100644
index 4ddb2b711005..000000000000
--- a/app-office/koffice-meta/koffice-meta-1.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.6.1.ebuild,v 1.9 2007/03/02 04:09:30 jer Exp $
-
-MAXKOFFICEVER=${PV}
-inherit kde-functions
-
-DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/karbon)
-	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
-	$(deprange $PV $MAXKOFFICEVER app-office/kexi)
-	$(deprange $PV $MAXKOFFICEVER app-office/kformula)
-	$(deprange $PV $MAXKOFFICEVER app-office/kivio)
-	$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
-	$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/koshell)
-	$(deprange $PV $MAXKOFFICEVER app-office/kplato)
-	$(deprange $PV $MAXKOFFICEVER app-office/kpresenter)
-	$(deprange $PV $MAXKOFFICEVER app-office/krita)
-	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
-	$(deprange $PV $MAXKOFFICEVER app-office/kugar)
-	$(deprange $PV $MAXKOFFICEVER app-office/kword)"
diff --git a/app-office/koffice-meta/koffice-meta-1.6.3.ebuild b/app-office/koffice-meta/koffice-meta-1.6.3.ebuild
index 1e0472844f5c..1498e628228e 100644
--- a/app-office/koffice-meta/koffice-meta-1.6.3.ebuild
+++ b/app-office/koffice-meta/koffice-meta-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.6.3.ebuild,v 1.8 2007/07/26 17:43:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.6.3.ebuild,v 1.9 2009/06/30 21:41:15 tampakrap Exp $
 
 MAXKOFFICEVER=${PV}
 inherit kde-functions
@@ -9,7 +9,7 @@ DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
diff --git a/app-office/koffice-meta/koffice-meta-1.6.3_p20090204.ebuild b/app-office/koffice-meta/koffice-meta-1.6.3_p20090204.ebuild
index fcbbcda59d8c..77527bc63da9 100644
--- a/app-office/koffice-meta/koffice-meta-1.6.3_p20090204.ebuild
+++ b/app-office/koffice-meta/koffice-meta-1.6.3_p20090204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.6.3_p20090204.ebuild,v 1.1 2009/02/08 17:25:01 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.6.3_p20090204.ebuild,v 1.2 2009/06/30 21:41:15 tampakrap Exp $
 
 MAXKOFFICEVER=${PV}
 inherit kde-functions
@@ -9,7 +9,7 @@ DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index 83ac3e5f808b..7b82ff87c0b9 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kspread
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.95 2009/06/25 12:28:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.96 2009/06/30 21:32:00 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kspread-1.6.1.ebuild, -kspread-1.6.2.ebuild, kspread-1.6.3.ebuild,
+  kspread-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *kspread-2.0.1 (25 Jun 2009)
 
diff --git a/app-office/kspread/kspread-1.6.1.ebuild b/app-office/kspread/kspread-1.6.1.ebuild
deleted file mode 100644
index 8733feb09d52..000000000000
--- a/app-office/kspread/kspread-1.6.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.1.ebuild,v 1.9 2007/03/02 03:02:15 jer Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice spreadsheet application."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
-	$(deprange $PV $MAXKOFFICEVER app-office/kexi)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkochart interfaces
-	libkrossmain lib/kross/main
-	libkrossapi lib/kross/api
-	libkexidb kexi/kexidb
-	libkexidbparser kexi/kexidb/parser"
-
-KMEXTRACTONLY="lib/
-	interfaces/
-	filters/kexi
-	kexi/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kspread"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter kspread" > ${S}/filters/Makefile.am
-
-	# Work around broken conditional
-	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > ${S}/filters/kspread/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kspread/kspread-1.6.2.ebuild b/app-office/kspread/kspread-1.6.2.ebuild
deleted file mode 100644
index 45738b1e62b2..000000000000
--- a/app-office/kspread/kspread-1.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.2.ebuild,v 1.9 2007/07/26 17:36:03 corsair Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=1.6.3
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice spreadsheet application."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
-	$(deprange $PV $MAXKOFFICEVER app-office/kexi)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkochart interfaces
-	libkrossmain lib/kross/main
-	libkrossapi lib/kross/api
-	libkexidb kexi/kexidb
-	libkexidbparser kexi/kexidb/parser"
-
-KMEXTRACTONLY="lib/
-	interfaces/
-	filters/kexi
-	kexi/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kspread"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter kspread" > ${S}/filters/Makefile.am
-
-	# Work around broken conditional
-	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > ${S}/filters/kspread/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kspread/kspread-1.6.3.ebuild b/app-office/kspread/kspread-1.6.3.ebuild
index 0775f68660ef..e9379aa7c716 100644
--- a/app-office/kspread/kspread-1.6.3.ebuild
+++ b/app-office/kspread/kspread-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.3.ebuild,v 1.7 2009/03/18 06:45:23 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.3.ebuild,v 1.8 2009/06/30 21:32:00 tampakrap Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=1.6.3
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice spreadsheet application."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
@@ -45,8 +45,8 @@ KMCOMPILEONLY="filters/liboofilter"
 
 KMEXTRA="filters/kspread"
 
-PATCHES="${FILESDIR}/kspread-1.6.3-validate-desktop.diff
-	${FILESDIR}/kspread-gcc43.patch"
+PATCHES=( "${FILESDIR}/kspread-1.6.3-validate-desktop.diff"
+		"${FILESDIR}/kspread-gcc43.patch" )
 
 need-kde 3.4
 
diff --git a/app-office/kspread/kspread-1.6.3_p20090204.ebuild b/app-office/kspread/kspread-1.6.3_p20090204.ebuild
index 3912c1ab8172..f50a1ee88dc9 100644
--- a/app-office/kspread/kspread-1.6.3_p20090204.ebuild
+++ b/app-office/kspread/kspread-1.6.3_p20090204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.3_p20090204.ebuild,v 1.2 2009/06/20 17:54:07 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.3_p20090204.ebuild,v 1.3 2009/06/30 21:32:00 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -11,13 +11,14 @@ DESCRIPTION="KOffice spreadsheet application."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="~app-office/koffice-libs-1.6.3_p20090204
 	~app-office/kchart-1.6.3_p20090204
 	~app-office/kexi-1.6.3_p20090204"
+RDEPEND="${DEPEND}"
 
 KMCOPYLIB="
 	libkformula lib/kformula
diff --git a/app-office/kugar/ChangeLog b/app-office/kugar/ChangeLog
index e14064429b58..264878f8e80e 100644
--- a/app-office/kugar/ChangeLog
+++ b/app-office/kugar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kugar
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.77 2009/02/08 17:29:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.78 2009/06/30 21:34:51 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org> -kugar-1.6.1.ebuild,
+  kugar-1.6.2.ebuild, kugar-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *kugar-1.6.3_p20090204 (08 Feb 2009)
 
diff --git a/app-office/kugar/kugar-1.6.1.ebuild b/app-office/kugar/kugar-1.6.1.ebuild
deleted file mode 100644
index 58ffbe4c5ad8..000000000000
--- a/app-office/kugar/kugar-1.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.6.1.ebuild,v 1.9 2007/03/02 03:28:48 jer Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice report viewer and generator."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkoproperty lib/koproperty
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/kugar"
-
-need-kde 3.4
diff --git a/app-office/kugar/kugar-1.6.2.ebuild b/app-office/kugar/kugar-1.6.2.ebuild
index 770d5aa0ffb6..d09bb5254fff 100644
--- a/app-office/kugar/kugar-1.6.2.ebuild
+++ b/app-office/kugar/kugar-1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.6.2.ebuild,v 1.9 2007/07/26 17:37:57 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.6.2.ebuild,v 1.10 2009/06/30 21:34:51 tampakrap Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=1.6.3
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice report viewer and generator."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
diff --git a/app-office/kugar/kugar-1.6.3_p20090204.ebuild b/app-office/kugar/kugar-1.6.3_p20090204.ebuild
index 9e428a8167f3..3fd3943d7782 100644
--- a/app-office/kugar/kugar-1.6.3_p20090204.ebuild
+++ b/app-office/kugar/kugar-1.6.3_p20090204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.6.3_p20090204.ebuild,v 1.1 2009/02/08 17:29:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.6.3_p20090204.ebuild,v 1.2 2009/06/30 21:34:51 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -11,11 +11,12 @@ DESCRIPTION="KOffice report viewer and generator."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="~app-office/koffice-libs-1.6.3_p20090204"
+RDEPEND="${DEPEND}"
 
 KMCOPYLIB="
 	libkformula lib/kformula
diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 9382be6bbeb3..c5e1b8791958 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.123 2009/06/25 12:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.124 2009/06/30 21:38:23 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kword-1.6.1-r1.ebuild, -kword-1.6.3.ebuild, -kword-1.6.3-r1.ebuild,
+  kword-1.6.3-r2.ebuild, kword-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *kword-2.0.1 (25 Jun 2009)
 
diff --git a/app-office/kword/kword-1.6.1-r1.ebuild b/app-office/kword/kword-1.6.1-r1.ebuild
deleted file mode 100644
index 6d49e1d297b7..000000000000
--- a/app-office/kword/kword-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.1-r1.ebuild,v 1.9 2007/03/02 04:05:49 jer Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice word processor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
-	>=app-text/wv2-0.1.8
-	>=media-gfx/imagemagick-5.5.2
-	>=app-text/libwpd-0.8.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkspreadcommon kspread"
-
-KMEXTRACTONLY="
-	lib/
-	kspread/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-PATCHES="${FILESDIR}/koffice-xpdf-CVE-2007-0104.diff"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile libs first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kword/kword-1.6.3-r1.ebuild b/app-office/kword/kword-1.6.3-r1.ebuild
deleted file mode 100644
index 3c81c40f9379..000000000000
--- a/app-office/kword/kword-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3-r1.ebuild,v 1.7 2007/08/12 14:42:02 beandog Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice word processor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange 1.6.2 $MAXKOFFICEVER app-office/kspread)
-	>=app-text/wv2-0.1.8
-	>=media-gfx/imagemagick-5.5.2
-	>=app-text/libwpd-0.8.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkspreadcommon kspread"
-
-KMEXTRACTONLY="
-	lib/
-	kspread/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-need-kde 3.5
-
-PATCHES="${FILESDIR}/koffice-xpdf-CVE-2007-3387.diff"
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile libs first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kword/kword-1.6.3-r2.ebuild b/app-office/kword/kword-1.6.3-r2.ebuild
index 3fe3f26db9ef..76a2522d010a 100644
--- a/app-office/kword/kword-1.6.3-r2.ebuild
+++ b/app-office/kword/kword-1.6.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3-r2.ebuild,v 1.9 2009/06/01 03:25:54 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3-r2.ebuild,v 1.10 2009/06/30 21:38:23 tampakrap Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice word processor."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
diff --git a/app-office/kword/kword-1.6.3.ebuild b/app-office/kword/kword-1.6.3.ebuild
deleted file mode 100644
index bd6fd23c5c72..000000000000
--- a/app-office/kword/kword-1.6.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3.ebuild,v 1.8 2007/07/26 17:40:25 corsair Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice word processor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange 1.6.2 $MAXKOFFICEVER app-office/kspread)
-	>=app-text/wv2-0.1.8
-	>=media-gfx/imagemagick-5.5.2
-	>=app-text/libwpd-0.8.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkspreadcommon kspread"
-
-KMEXTRACTONLY="
-	lib/
-	kspread/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-need-kde 3.5
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile libs first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kword/kword-1.6.3_p20090204.ebuild b/app-office/kword/kword-1.6.3_p20090204.ebuild
index 6a48e9c7333b..053e74dce9eb 100644
--- a/app-office/kword/kword-1.6.3_p20090204.ebuild
+++ b/app-office/kword/kword-1.6.3_p20090204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3_p20090204.ebuild,v 1.4 2009/06/20 09:05:31 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3_p20090204.ebuild,v 1.5 2009/06/30 21:38:23 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -11,7 +11,7 @@ DESCRIPTION="KOffice word processor."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""