Slotmove to 3.5, remove old

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

24 files changed, 67 insertions, 281 deletions

diff --git a/app-office/karbon/ChangeLog b/app-office/karbon/ChangeLog
index 5853298da6bb..1801aac84f43 100644
--- a/app-office/karbon/ChangeLog
+++ b/app-office/karbon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/karbon
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.88 2009/06/25 12:29:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.89 2009/06/30 20:41:09 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -karbon-1.6.1.ebuild, karbon-1.6.2.ebuild, karbon-1.6.3_p20090204.ebuild:
+  slotmove to 3.5, remove old
 
 *karbon-2.0.1 (25 Jun 2009)
 
diff --git a/app-office/karbon/karbon-1.6.1.ebuild b/app-office/karbon/karbon-1.6.1.ebuild
deleted file mode 100644
index cd6032763fb7..000000000000
--- a/app-office/karbon/karbon-1.6.1.ebuild
+++ /dev/null
@@ -1,52 +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/karbon/karbon-1.6.1.ebuild,v 1.9 2007/03/02 04:02:06 jer Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice vector drawing 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)
-	>=media-gfx/imagemagick-5.5.2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libart_lgpl"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkopalette lib/kopalette
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/karbon"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter karbon" > $S/filters/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/karbon/karbon-1.6.2.ebuild b/app-office/karbon/karbon-1.6.2.ebuild
index 06e79ffc68e3..687821621d3c 100644
--- a/app-office/karbon/karbon-1.6.2.ebuild
+++ b/app-office/karbon/karbon-1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/karbon/karbon-1.6.2.ebuild,v 1.11 2008/04/21 18:59:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-1.6.2.ebuild,v 1.12 2009/06/30 20:41:09 tampakrap Exp $
 
 MAXKOFFICEVER=1.6.3
 KMNAME=koffice
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice vector drawing 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=""
 
diff --git a/app-office/karbon/karbon-1.6.3_p20090204.ebuild b/app-office/karbon/karbon-1.6.3_p20090204.ebuild
index ad6a52980962..136e6e2bd808 100644
--- a/app-office/karbon/karbon-1.6.3_p20090204.ebuild
+++ b/app-office/karbon/karbon-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/karbon/karbon-1.6.3_p20090204.ebuild,v 1.1 2009/02/08 17:20:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-1.6.3_p20090204.ebuild,v 1.2 2009/06/30 20:41:09 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -11,7 +11,7 @@ DESCRIPTION="KOffice vector drawing 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=""
 
@@ -20,6 +20,7 @@ DEPEND="~app-office/koffice-libs-1.6.3_p20090204
 	>=media-libs/freetype-2
 	media-libs/fontconfig
 	media-libs/libart_lgpl"
+RDEPEND="${DEPEND}"
 
 KMCOPYLIB="
 	libkformula lib/kformula
diff --git a/app-office/kchart/ChangeLog b/app-office/kchart/ChangeLog
index a40dfabd1a56..46a9d7302ff9 100644
--- a/app-office/kchart/ChangeLog
+++ b/app-office/kchart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kchart
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/ChangeLog,v 1.87 2009/06/25 12:32:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/ChangeLog,v 1.88 2009/06/30 20:45:09 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kchart-1.6.1.ebuild, kchart-1.6.3.ebuild, kchart-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *kchart-2.0.1 (25 Jun 2009)
 
diff --git a/app-office/kchart/kchart-1.6.1.ebuild b/app-office/kchart/kchart-1.6.1.ebuild
deleted file mode 100644
index 3671cab6fd4d..000000000000
--- a/app-office/kchart/kchart-1.6.1.ebuild
+++ /dev/null
@@ -1,48 +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/kchart/kchart-1.6.1.ebuild,v 1.10 2007/03/02 02:47:37 jer Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice integrated graph and chart drawing tool."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdeenablefinal"
-
-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
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkochart interfaces"
-
-KMEXTRACTONLY="lib/
-	interfaces/"
-
-KMEXTRA="filters/kchart"
-
-KMCOMPILEONLY="filters/libdialogfilter"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = libdialogfilter kchart" > $S/filters/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kchart/kchart-1.6.3.ebuild b/app-office/kchart/kchart-1.6.3.ebuild
index 51579dbaaa8d..8986cd62766a 100644
--- a/app-office/kchart/kchart-1.6.3.ebuild
+++ b/app-office/kchart/kchart-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/kchart/kchart-1.6.3.ebuild,v 1.9 2007/11/11 20:40:18 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-1.6.3.ebuild,v 1.10 2009/06/30 20:45:08 tampakrap Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice integrated graph and chart drawing tool."
 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="kdeenablefinal"
 
diff --git a/app-office/kchart/kchart-1.6.3_p20090204.ebuild b/app-office/kchart/kchart-1.6.3_p20090204.ebuild
index 526421525fc5..ca27987129cc 100644
--- a/app-office/kchart/kchart-1.6.3_p20090204.ebuild
+++ b/app-office/kchart/kchart-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/kchart/kchart-1.6.3_p20090204.ebuild,v 1.1 2009/02/08 17:21:17 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-1.6.3_p20090204.ebuild,v 1.2 2009/06/30 20:45:09 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -11,11 +11,12 @@ DESCRIPTION="KOffice integrated graph and chart drawing tool."
 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
 	libkofficecore lib/kofficecore
diff --git a/app-office/kexi/ChangeLog b/app-office/kexi/ChangeLog
index 38195ac44ee5..f525995c6bb2 100644
--- a/app-office/kexi/ChangeLog
+++ b/app-office/kexi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kexi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.88 2009/02/08 17:21:59 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.89 2009/06/30 20:48:07 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org> -kexi-1.6.1.ebuild,
+  kexi-1.6.3.ebuild, kexi-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *kexi-1.6.3_p20090204 (08 Feb 2009)
 
diff --git a/app-office/kexi/kexi-1.6.1.ebuild b/app-office/kexi/kexi-1.6.1.ebuild
deleted file mode 100644
index 01141c21c681..000000000000
--- a/app-office/kexi/kexi-1.6.1.ebuild
+++ /dev/null
@@ -1,46 +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/kexi/kexi-1.6.1.ebuild,v 1.11 2007/03/02 02:53:43 jer Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice integrated environment for database management."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mysql postgres kdeenablefinal"
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	sys-libs/readline
-	mysql? ( virtual/mysql )
-	postgres? ( <dev-libs/libpqxx-2.6.9 )"
-
-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
-	libkrossmain lib/kross/main/
-	libkrossapi lib/kross/api/"
-
-KMEXTRACTONLY="lib/"
-
-need-kde 3.4
-
-src_compile() {
-	local myconf="$(use_enable mysql) $(use_enable postgres pgsql) --enable-kexi-reports"
-
-	kde-meta_src_compile
-}
diff --git a/app-office/kexi/kexi-1.6.3.ebuild b/app-office/kexi/kexi-1.6.3.ebuild
index e21d429a6afd..ea2b668c1c0c 100644
--- a/app-office/kexi/kexi-1.6.3.ebuild
+++ b/app-office/kexi/kexi-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/kexi/kexi-1.6.3.ebuild,v 1.10 2008/06/16 14:01:48 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.6.3.ebuild,v 1.11 2009/06/30 20:48:07 tampakrap Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice integrated environment for database management."
 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="mysql postgres kdeenablefinal"
 
diff --git a/app-office/kexi/kexi-1.6.3_p20090204.ebuild b/app-office/kexi/kexi-1.6.3_p20090204.ebuild
index 0dd066d22a02..3e83a161fd4f 100644
--- a/app-office/kexi/kexi-1.6.3_p20090204.ebuild
+++ b/app-office/kexi/kexi-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/kexi/kexi-1.6.3_p20090204.ebuild,v 1.1 2009/02/08 17:21:59 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.6.3_p20090204.ebuild,v 1.2 2009/06/30 20:48:07 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -11,7 +11,7 @@ DESCRIPTION="KOffice integrated environment for database management."
 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="mysql postgres"
 
@@ -19,6 +19,7 @@ DEPEND="~app-office/koffice-libs-1.6.3_p20090204
 	sys-libs/readline
 	mysql? ( virtual/mysql )
 	postgres? ( =dev-libs/libpqxx-2.6* )"
+RDEPEND="${DEPEND}"
 
 KMCOPYLIB="
 	libkformula lib/kformula
diff --git a/app-office/kformula/ChangeLog b/app-office/kformula/ChangeLog
index 78dcd38a7ce6..938884a599b9 100644
--- a/app-office/kformula/ChangeLog
+++ b/app-office/kformula/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kformula
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.84 2009/02/08 17:22:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.85 2009/06/30 20:50:42 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kformula-1.6.1.ebuild, kformula-1.6.2.ebuild,
+  kformula-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *kformula-1.6.3_p20090204 (08 Feb 2009)
 
diff --git a/app-office/kformula/kformula-1.6.1.ebuild b/app-office/kformula/kformula-1.6.1.ebuild
deleted file mode 100644
index 904659bf56e5..000000000000
--- a/app-office/kformula/kformula-1.6.1.ebuild
+++ /dev/null
@@ -1,36 +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/kformula/kformula-1.6.1.ebuild,v 1.10 2007/07/13 07:04:13 mr_bones_ Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice formula editor."
-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
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/kformula"
-
-need-kde 3.4
diff --git a/app-office/kformula/kformula-1.6.2.ebuild b/app-office/kformula/kformula-1.6.2.ebuild
index 0de4a34123e1..0757368e7949 100644
--- a/app-office/kformula/kformula-1.6.2.ebuild
+++ b/app-office/kformula/kformula-1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/kformula/kformula-1.6.2.ebuild,v 1.14 2008/06/09 05:42:07 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.6.2.ebuild,v 1.15 2009/06/30 20:50:42 tampakrap Exp $
 
 MAXKOFFICEVER=1.6.3
 KMNAME=koffice
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice formula editor."
 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/kformula/kformula-1.6.3_p20090204.ebuild b/app-office/kformula/kformula-1.6.3_p20090204.ebuild
index e8f8a5e64a00..5e52ec4b18e1 100644
--- a/app-office/kformula/kformula-1.6.3_p20090204.ebuild
+++ b/app-office/kformula/kformula-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/kformula/kformula-1.6.3_p20090204.ebuild,v 1.2 2009/02/08 22:24:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.6.3_p20090204.ebuild,v 1.3 2009/06/30 20:50:42 tampakrap Exp $
 
 EAPI=1
 ARTS_REQUIRED="never"
@@ -12,12 +12,13 @@ DESCRIPTION="KOffice formula editor."
 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
 	~kde-base/kcontrol-3.5.10:3.5"
+RDEPEND="${DEPEND}"
 
 KMCOPYLIB="
 	libkformula lib/kformula
diff --git a/app-office/kivio/ChangeLog b/app-office/kivio/ChangeLog
index 33b4f1d58ee2..b822815e0641 100644
--- a/app-office/kivio/ChangeLog
+++ b/app-office/kivio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kivio
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.79 2009/02/08 17:23:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.80 2009/06/30 20:54:42 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org> -kivio-1.6.1.ebuild,
+  kivio-1.6.2.ebuild, kivio-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *kivio-1.6.3_p20090204 (08 Feb 2009)
 
diff --git a/app-office/kivio/kivio-1.6.1.ebuild b/app-office/kivio/kivio-1.6.1.ebuild
deleted file mode 100644
index 7148b859af34..000000000000
--- a/app-office/kivio/kivio-1.6.1.ebuild
+++ /dev/null
@@ -1,38 +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/kivio/kivio-1.6.1.ebuild,v 1.9 2007/03/02 03:12:16 jer Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice flowchart and diagram tool."
-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)
-	dev-lang/python"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkopalette lib/kopalette
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/kivio"
-
-need-kde 3.4
diff --git a/app-office/kivio/kivio-1.6.2.ebuild b/app-office/kivio/kivio-1.6.2.ebuild
index f44be7acfede..a374ce662023 100644
--- a/app-office/kivio/kivio-1.6.2.ebuild
+++ b/app-office/kivio/kivio-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/kivio/kivio-1.6.2.ebuild,v 1.10 2007/11/11 21:34:05 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.6.2.ebuild,v 1.11 2009/06/30 20:54:42 tampakrap Exp $
 
 MAXKOFFICEVER=1.6.3
 KMNAME=koffice
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice flowchart and diagram tool."
 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/kivio/kivio-1.6.3_p20090204.ebuild b/app-office/kivio/kivio-1.6.3_p20090204.ebuild
index 92ccf0b70800..dc92e8ef9699 100644
--- a/app-office/kivio/kivio-1.6.3_p20090204.ebuild
+++ b/app-office/kivio/kivio-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/kivio/kivio-1.6.3_p20090204.ebuild,v 1.2 2009/02/08 22:23:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.6.3_p20090204.ebuild,v 1.3 2009/06/30 20:54:42 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -11,12 +11,13 @@ DESCRIPTION="KOffice flowchart and diagram tool."
 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
 	dev-lang/python"
+RDEPEND="${DEPEND}"
 
 KMCOPYLIB="
 	libkformula lib/kformula
diff --git a/app-office/koffice-data/ChangeLog b/app-office/koffice-data/ChangeLog
index 32da9ae63f36..de336a780a0b 100644
--- a/app-office/koffice-data/ChangeLog
+++ b/app-office/koffice-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/koffice-data
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.81 2009/06/25 12:31:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.82 2009/06/30 20:57:31 tampakrap Exp $
+
+  30 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -koffice-data-1.6.1.ebuild, koffice-data-1.6.3.ebuild,
+  koffice-data-1.6.3_p20090204.ebuild:
+  Slotmove to 3.5, remove old
 
 *koffice-data-2.0.1 (25 Jun 2009)
 
diff --git a/app-office/koffice-data/koffice-data-1.6.1.ebuild b/app-office/koffice-data/koffice-data-1.6.1.ebuild
deleted file mode 100644
index 885815eb45c5..000000000000
--- a/app-office/koffice-data/koffice-data-1.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.6.1.ebuild,v 1.10 2008/04/11 19:30:51 ingmar Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-KMMODULE=
-inherit kde-meta eutils
-
-DESCRIPTION="Shared KOffice data files."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-KMEXTRA="
-	mimetypes/
-	servicetypes/
-	pics/
-	templates/
-	autocorrect/"
-
-need-kde 3.4
diff --git a/app-office/koffice-data/koffice-data-1.6.3.ebuild b/app-office/koffice-data/koffice-data-1.6.3.ebuild
index ffbd43ebd9c2..afacf62d741e 100644
--- a/app-office/koffice-data/koffice-data-1.6.3.ebuild
+++ b/app-office/koffice-data/koffice-data-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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-data/koffice-data-1.6.3.ebuild,v 1.9 2008/04/11 19:30:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.6.3.ebuild,v 1.10 2009/06/30 20:57:31 tampakrap Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ DESCRIPTION="Shared KOffice data files."
 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/koffice-data/koffice-data-1.6.3_p20090204.ebuild b/app-office/koffice-data/koffice-data-1.6.3_p20090204.ebuild
index 57e19281be5a..b39f86767ab1 100644
--- a/app-office/koffice-data/koffice-data-1.6.3_p20090204.ebuild
+++ b/app-office/koffice-data/koffice-data-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-data/koffice-data-1.6.3_p20090204.ebuild,v 1.1 2009/02/08 17:23:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.6.3_p20090204.ebuild,v 1.2 2009/06/30 20:57:31 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Shared KOffice data files."
 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=""