Drop old version

Package-Manager: portage--svn/cvs/Linux i686

37 files changed, 63 insertions, 1767 deletions

diff --git a/app-office/karbon/ChangeLog b/app-office/karbon/ChangeLog
index 4b9434064291..642eb67c37c4 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.97 2009/09/27 12:29:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.98 2009/11/01 09:13:12 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -karbon-1.6.2.ebuild,
+  -files/karbon-1.6.2+gcc-4.3.patch:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org> ChangeLog:
   Marking karbon-1.6.3_p20090204 ppc64 stable for bug 276008
diff --git a/app-office/karbon/files/karbon-1.6.2+gcc-4.3.patch b/app-office/karbon/files/karbon-1.6.2+gcc-4.3.patch
deleted file mode 100644
index 7915c03f5370..000000000000
--- a/app-office/karbon/files/karbon-1.6.2+gcc-4.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: karbon-1.6.2/lib/kofficeui/KoContextCelp.h
-===================================================================
---- karbon-1.6.2.orig/lib/kofficeui/KoContextCelp.h
-+++ karbon-1.6.2/lib/kofficeui/KoContextCelp.h
-@@ -213,7 +213,7 @@ class KOFFICEUI_EXPORT KoContextHelpActi
- 	Q_OBJECT
- 
- 	public:
--		KoContextHelpAction( KActionCollection* parent, QWidget* parent = 0 );
-+		KoContextHelpAction( KActionCollection* parent, QWidget* popupParent = 0 );
- 		virtual ~KoContextHelpAction();
- 
- 	public slots:
diff --git a/app-office/karbon/karbon-1.6.2.ebuild b/app-office/karbon/karbon-1.6.2.ebuild
deleted file mode 100644
index 687821621d3c..000000000000
--- a/app-office/karbon/karbon-1.6.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.12 2009/06/30 20:41:09 tampakrap Exp $
-
-MAXKOFFICEVER=1.6.3
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice vector drawing application."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-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"
-
-PATCHES=( "${FILESDIR}/${P}+gcc-4.3.patch" )
-
-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
-
-	# Fixing the desktop file, cf. bug 190006
-	sed -i -e "s:postscript$:postscript;:g" "${S}"/karbon/data/karbon.desktop
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kexi/ChangeLog b/app-office/kexi/ChangeLog
index 70be34c8deb5..6575ed4612a9 100644
--- a/app-office/kexi/ChangeLog
+++ b/app-office/kexi/ChangeLog
@@ -1,6 +1,9 @@
 # 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.95 2009/09/27 12:30:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.96 2009/11/01 09:19:58 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kexi-1.6.3.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org> kexi-1.6.3_p20090204.ebuild:
   Marking kexi-1.6.3_p20090204 ppc64 stable for bug 276008
diff --git a/app-office/kexi/kexi-1.6.3.ebuild b/app-office/kexi/kexi-1.6.3.ebuild
deleted file mode 100644
index ea2b668c1c0c..000000000000
--- a/app-office/kexi/kexi-1.6.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.11 2009/06/30 20:48:07 tampakrap 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="3.5"
-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* )"
-
-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.5
-
-src_compile() {
-	local myconf="$(use_enable mysql) $(use_enable postgres pgsql) --enable-kexi-reports"
-
-	# Fix the desktop file. cf. bug 190006
-	sed -i -e "s:-msaccess:-msaccess;:g" "${S}"/kexi/kexi.desktop
-
-	kde-meta_src_compile
-}
diff --git a/app-office/kformula/ChangeLog b/app-office/kformula/ChangeLog
index 42088c84e2a5..66ac1dfc861b 100644
--- a/app-office/kformula/ChangeLog
+++ b/app-office/kformula/ChangeLog
@@ -1,6 +1,10 @@
 # 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.91 2009/09/27 12:31:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.92 2009/11/01 09:22:02 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kformula-1.6.2.ebuild,
+  -files/kformula-1.6.2-gcc-4.3.patch:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org>
   kformula-1.6.3_p20090204.ebuild:
diff --git a/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch b/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch
deleted file mode 100644
index 1f9ce05bc9c4..000000000000
--- a/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- branches/koffice/1.6/koffice/lib/kformula/textelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/textelement.h	2007/05/28 18:26:19	669186
-@@ -75,7 +75,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
-@@ -246,7 +246,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/symbolelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/symbolelement.h	2007/05/28 18:26:19	669186
-@@ -67,7 +67,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/spaceelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/spaceelement.h	2007/05/28 18:26:19	669186
-@@ -80,7 +80,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h	2007/05/28 18:26:19	669186
-@@ -94,7 +94,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/rootelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/rootelement.h	2007/05/28 18:26:19	669186
-@@ -68,7 +68,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
-@@ -79,7 +79,7 @@
-      * We can use our parentPosition to get our own origin then.
-      */
-     virtual void draw( QPainter& painter, const LuPixelRect& r,
--                       const ContextStyle& style,
-+                       const ContextStyle& cstyle,
-                        ContextStyle::TextStyle tstyle,
-                        ContextStyle::IndexStyle istyle,
- 					   StyleAttributes& style,
---- branches/koffice/1.6/koffice/lib/kformula/paddedelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/paddedelement.h	2007/05/28 18:26:19	669186
-@@ -34,7 +34,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/matrixelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/matrixelement.h	2007/05/28 18:26:19	669186
-@@ -82,7 +82,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
-@@ -377,7 +377,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/indexelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/indexelement.h	2007/05/28 18:26:19	669186
-@@ -79,7 +79,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
---- branches/koffice/1.6/koffice/lib/kformula/glyphelement.h	2007/05/28 18:20:51	669185
-+++ branches/koffice/1.6/koffice/lib/kformula/glyphelement.h	2007/05/28 18:26:19	669186
-@@ -33,7 +33,7 @@
-      * Calculates our width and height and
-      * our children's parentPosition.
-      */
--    virtual void calcSizes( const ContextStyle& style,
-+    virtual void calcSizes( const ContextStyle& cstyle,
- 						    ContextStyle::TextStyle tstyle,
- 						    ContextStyle::IndexStyle istyle,
- 							StyleAttributes& style );
diff --git a/app-office/kformula/kformula-1.6.2.ebuild b/app-office/kformula/kformula-1.6.2.ebuild
deleted file mode 100644
index 0757368e7949..000000000000
--- a/app-office/kformula/kformula-1.6.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.15 2009/06/30 20:50:42 tampakrap Exp $
-
-MAXKOFFICEVER=1.6.3
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice formula editor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	|| ( =kde-base/kcontrol-3.5* =kde-base/kdebase-3.5* )"
-
-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
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	# Fixing desktop files, cf. bug 190006
-	sed -i -e "s:x-kformula$:x-kformula;:g" "${S}"/kformula/kformula.desktop
-
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch   # 214365
-}
diff --git a/app-office/kivio/ChangeLog b/app-office/kivio/ChangeLog
index 1a1d1f729420..da2c9308be1d 100644
--- a/app-office/kivio/ChangeLog
+++ b/app-office/kivio/ChangeLog
@@ -1,6 +1,9 @@
 # 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.86 2009/09/27 12:31:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.87 2009/11/01 09:23:06 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kivio-1.6.2.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org> ChangeLog:
   Marking kivio-1.6.3_p20090204 ppc64 stable for bug 276008
diff --git a/app-office/kivio/kivio-1.6.2.ebuild b/app-office/kivio/kivio-1.6.2.ebuild
deleted file mode 100644
index a374ce662023..000000000000
--- a/app-office/kivio/kivio-1.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.11 2009/06/30 20:54:42 tampakrap Exp $
-
-MAXKOFFICEVER=1.6.3
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice flowchart and diagram tool."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-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
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	# Fixing desktop files, cf. bug 190006
-	sed -i -e "/^MimeType/{ /[^;]$/{ s/$/;/ } }" "${S}"/kivio/kiviopart/kivio.desktop
-}
diff --git a/app-office/koffice-data/ChangeLog b/app-office/koffice-data/ChangeLog
index 3f3883a0a9cd..e776a271aab8 100644
--- a/app-office/koffice-data/ChangeLog
+++ b/app-office/koffice-data/ChangeLog
@@ -1,6 +1,9 @@
 # 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.90 2009/09/27 12:32:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.91 2009/11/01 09:34:31 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -koffice-data-1.6.3.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org>
   koffice-data-1.6.3_p20090204.ebuild:
diff --git a/app-office/koffice-data/koffice-data-1.6.3.ebuild b/app-office/koffice-data/koffice-data-1.6.3.ebuild
deleted file mode 100644
index afacf62d741e..000000000000
--- a/app-office/koffice-data/koffice-data-1.6.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.10 2009/06/30 20:57:31 tampakrap 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="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-KMEXTRA="
-	mimetypes/
-	servicetypes/
-	pics/
-	templates/
-	autocorrect/"
-
-need-kde 3.5
diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index 0b6a3dce9df4..4c09edb19f7d 100644
--- a/app-office/koffice-libs/ChangeLog
+++ b/app-office/koffice-libs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/koffice-libs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.98 2009/09/27 12:33:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.99 2009/11/01 09:33:06 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -koffice-libs-1.6.3.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org>
   koffice-libs-1.6.3_p20090204.ebuild:
diff --git a/app-office/koffice-libs/koffice-libs-1.6.3.ebuild b/app-office/koffice-libs/koffice-libs-1.6.3.ebuild
deleted file mode 100644
index 6569194dd9db..000000000000
--- a/app-office/koffice-libs/koffice-libs-1.6.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.6.3.ebuild,v 1.9 2009/06/30 21:08:53 tampakrap Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-KMMODULE=lib
-inherit kde-meta eutils
-
-DESCRIPTION="Shared KOffice libraries."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
-	virtual/python
-	dev-lang/ruby"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-KMEXTRA="interfaces/
-	plugins/
-	tools/
-	filters/olefilters/
-	filters/xsltfilter/
-	filters/generic_wrapper/
-	kounavail/
-	doc/api/
-	doc/koffice/
-	doc/thesaurus/"
-
-KMEXTRACTONLY="
-	kchart/kdchart/"
-
-need-kde 3.5
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# Force the compilation of libkopainter.
-	sed -i 's:$(KOPAINTERDIR):kopainter:' "${S}/lib/Makefile.am"
-
-	if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then
-		einfo "User ${USER} has no X access, disabling some tests."
-		sed -e "s:SUBDIRS = . tests:SUBDIRS = .:" -i lib/store/Makefile.am || die "sed failed"
-		sed -e "s:SUBDIRS = kohyphen . tests:SUBDIRS = kohyphen .:" -i lib/kotext/Makefile.am || die "sed failed"
-	fi
-
-	kde-meta_src_unpack makefiles
-}
-
-src_compile() {
-	local myconf="--enable-scripting --with-pythonfir=/usr/$(get_libdir)/python${PYVER}/site-packages"
-	kde-meta_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde-meta_src_install
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-}
diff --git a/app-office/koffice-meta/ChangeLog b/app-office/koffice-meta/ChangeLog
index a1556947482f..f44a3cdf7422 100644
--- a/app-office/koffice-meta/ChangeLog
+++ b/app-office/koffice-meta/ChangeLog
@@ -1,6 +1,9 @@
 # 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.88 2009/09/27 12:37:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.89 2009/11/01 09:10:32 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -koffice-meta-1.6.3.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org>
   koffice-meta-1.6.3_p20090204.ebuild:
diff --git a/app-office/koffice-meta/koffice-meta-1.6.3.ebuild b/app-office/koffice-meta/koffice-meta-1.6.3.ebuild
deleted file mode 100644
index 1498e628228e..000000000000
--- a/app-office/koffice-meta/koffice-meta-1.6.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.9 2009/06/30 21:41:15 tampakrap 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="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange 1.6.2 $MAXKOFFICEVER app-office/karbon)
-	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
-	$(deprange $PV $MAXKOFFICEVER app-office/kexi)
-	$(deprange 1.6.2 $MAXKOFFICEVER app-office/kformula)
-	$(deprange 1.6.2 $MAXKOFFICEVER app-office/kivio)
-	$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
-	$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange 1.6.2 $MAXKOFFICEVER app-office/koshell)
-	$(deprange 1.6.2 $MAXKOFFICEVER app-office/kplato)
-	$(deprange $PV $MAXKOFFICEVER app-office/kpresenter)
-	$(deprange $PV $MAXKOFFICEVER app-office/krita)
-	$(deprange 1.6.2 $MAXKOFFICEVER app-office/kspread)
-	$(deprange 1.6.2 $MAXKOFFICEVER app-office/kugar)
-	$(deprange $PV $MAXKOFFICEVER app-office/kword)"
diff --git a/app-office/koshell/ChangeLog b/app-office/koshell/ChangeLog
index 2ece25188490..0fb375726555 100644
--- a/app-office/koshell/ChangeLog
+++ b/app-office/koshell/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/koshell
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/ChangeLog,v 1.81 2009/09/27 12:33:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/ChangeLog,v 1.82 2009/11/01 09:24:19 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -koshell-1.6.2.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org>
   koshell-1.6.3_p20090204.ebuild:
diff --git a/app-office/koshell/koshell-1.6.2.ebuild b/app-office/koshell/koshell-1.6.2.ebuild
deleted file mode 100644
index 84dfd98b8681..000000000000
--- a/app-office/koshell/koshell-1.6.2.ebuild
+++ /dev/null
@@ -1,34 +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/koshell/koshell-1.6.2.ebuild,v 1.10 2009/06/30 21:14:32 tampakrap Exp $
-
-MAXKOFFICEVER=1.6.3
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice workspace."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-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/"
-
-need-kde 3.4
diff --git a/app-office/kplato/ChangeLog b/app-office/kplato/ChangeLog
index 3a0bd227c4e9..d1eab4bf52d1 100644
--- a/app-office/kplato/ChangeLog
+++ b/app-office/kplato/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/kplato
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/ChangeLog,v 1.65 2009/09/27 12:34:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/ChangeLog,v 1.66 2009/11/01 09:25:45 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kplato-1.6.2.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org>
   kplato-1.6.3_p20090204.ebuild:
diff --git a/app-office/kplato/kplato-1.6.2.ebuild b/app-office/kplato/kplato-1.6.2.ebuild
deleted file mode 100644
index 4c57421d4e26..000000000000
--- a/app-office/kplato/kplato-1.6.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/kplato-1.6.2.ebuild,v 1.11 2009/06/30 21:18:11 tampakrap Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=1.6.3
-inherit kde-meta eutils
-
-DESCRIPTION="KPlato is a project management application."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-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="libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/
-	kugar/"
-
-KMCOMPILEONLY=""
-
-KMEXTRA="kdgantt"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:toolbar tests:toolbar:" ${S}/kplato/Makefile.am
-}
diff --git a/app-office/kpresenter/ChangeLog b/app-office/kpresenter/ChangeLog
index 0ddb2e9acd97..6ebd09ac0472 100644
--- a/app-office/kpresenter/ChangeLog
+++ b/app-office/kpresenter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/kpresenter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.88 2009/09/27 12:34:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.89 2009/11/01 09:26:37 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kpresenter-1.6.3.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org>
   kpresenter-1.6.3_p20090204.ebuild:
diff --git a/app-office/kpresenter/kpresenter-1.6.3.ebuild b/app-office/kpresenter/kpresenter-1.6.3.ebuild
deleted file mode 100644
index 04e2dfe28300..000000000000
--- a/app-office/kpresenter/kpresenter-1.6.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.6.3.ebuild,v 1.9 2009/06/30 21:20:48 tampakrap Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice presentation program."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-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/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kpresenter
-	filters/libdialogfilter"
-
-need-kde 3.5
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile filters first.
-	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > $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/krita/ChangeLog b/app-office/krita/ChangeLog
index 78fa3a1f22c2..94c002834cf0 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.99 2009/09/27 12:35:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.100 2009/11/01 09:28:19 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -krita-1.6.3.ebuild,
+  -files/krita-1.6.3+gcc-4.3.patch:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org> krita-1.6.3_p20090204.ebuild:
   Marking krita-1.6.3_p20090204 ppc64 stable for bug 276008
diff --git a/app-office/krita/files/krita-1.6.3+gcc-4.3.patch b/app-office/krita/files/krita-1.6.3+gcc-4.3.patch
deleted file mode 100644
index 916354f373ea..000000000000
--- a/app-office/krita/files/krita-1.6.3+gcc-4.3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nrua koffice-1.6.3/krita/core/kis_perspective_math.cpp koffice/krita/core/kis_perspective_math.cpp
---- koffice-1.6.3/krita/core/kis_perspective_math.cpp	2007-05-30 23:40:31.000000000 +0200
-+++ koffice/krita/core/kis_perspective_math.cpp	2008-03-12 00:56:21.000000000 +0100
-@@ -24,7 +24,7 @@
- 
- #if 1
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdlib.h>
- #include <math.h>
- //#define NDEBUG // uncomment to remove checking of assert()
-@@ -57,9 +57,9 @@
-         void  rprint()const;  //print entries on a single line
-         void resize(int n);
-         int operator==(const vector<ElType>& v)const;
--        friend   vector<ElType> operator*(ElType c,vector<ElType>& v );
--        friend   vector<ElType> operator*(vector<ElType>& v,ElType c );
--        friend ostream& operator<<(ostream& s,vector<ElType>& v);
-+        friend vector<ElType> operator* (ElType c,vector<ElType>& v );
-+        friend vector<ElType> operator*(vector<ElType>& v,ElType c );
-+        friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v);
- };
- template <class ElType>
-         void vector<ElType>::zero()
-@@ -129,10 +129,10 @@
-         void  vector<ElType>::rprint()const  //print entries on a single line
- {
-     int i;
--    cout << "VECTOR: ";
--    cout << "(";
--    for(i=0;i<len-1;i++) cout << data[i] << ",";
--    cout << data[len-1] << ")" << endl;
-+    std::cout << "VECTOR: ";
-+    std::cout << "(";
-+    for(i=0;i<len-1;i++) std::cout << data[i] << ",";
-+    std::cout << data[len-1] << ")" << std::endl;
-     return;
- }
- template <class ElType>
-@@ -164,7 +164,7 @@
-     return ans;
- }
- template <class ElType>
--        ostream& operator<<(ostream& s,vector<ElType>& v)
-+        std::ostream& operator<<(std::ostream& s,vector<ElType>& v)
- {
-     s << "(";
-     for(int i=0;i<v.len-1;i++) s << v.data[i] << ", ";
-@@ -192,7 +192,7 @@
-         matrix<ElType> operator-(const matrix<ElType>& a);
-         matrix<ElType> transpose();
-     //matrix<ElType> inverse();
--        friend ostream& operator<<(ostream& s,matrix<ElType>& m);
-+        friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m);
-         friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d);
-         friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b);
- };
-@@ -357,7 +357,7 @@
-     return ans;
- }
- template <class ElType>
--        ostream& operator<<(ostream& s,matrix<ElType>& m)
-+        std::ostream& operator<<(std::ostream& s,matrix<ElType>& m)
- {
-     for(int i=0; i<m.rows;i++) s << m[i];
-     return s;
-@@ -381,7 +381,7 @@
- //         kdDebug() << "new search" << endl;
-         for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp;
- /*            kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */}
--            if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;}
-+            if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;}
-             vv[i]=1.0/big;
-     }
-     for (j=0;j<n;j++)
- 
diff --git a/app-office/krita/krita-1.6.3.ebuild b/app-office/krita/krita-1.6.3.ebuild
deleted file mode 100644
index aa4faab1f361..000000000000
--- a/app-office/krita/krita-1.6.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6.3.ebuild,v 1.11 2009/06/30 21:24:06 tampakrap Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice image manipulation program."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-# See bug #130442.
-#IUSE="opengl"
-IUSE=""
-
-DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	>=media-gfx/imagemagick-6.2.5.5
-	>=media-libs/lcms-1.15
-	media-libs/tiff
-	media-libs/jpeg
-	>=media-libs/openexr-1.2.2-r2
-	media-libs/libpng
-	>=media-libs/libexif-0.6.13-r1
-	virtual/opengl
-	virtual/glu"
-RDEPEND="${DEPEND}"
-
-#opengl? ( virtual/opengl virtual/glu )"
-
-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
-	libkrossapi lib/kross/api/
-	libkrossmain lib/kross/main/"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/krita"
-
-PATCHES=( "${FILESDIR}/${P}+gcc-4.3.patch" )
-
-need-kde 3.5
-
-pkg_setup() {
-	# use opengl &&
-		if ! built_with_use =x11-libs/qt-3* opengl ; then
-			eerror "You need to build x11-libs/qt with opengl use flag enabled."
-			die
-		fi
-}
-
-src_unpack() {
-	kde-meta_src_unpack
-	# FIXME - disable broken tests for now
-	sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" "${S}"/krita/core/Makefile.am \
-		$(ls "${S}"/krita/colorspaces/*/Makefile.am)
-
-	# Fixing the desktop file, cf. bug 190006.
-	sed -i -e "/^R/{ /[^Y]$/{ s/$/Y/g; } }" "${S}"/krita/krita.desktop
-	sed -i -e "/^MimeType/{ /[^;]$/{ s/$/;/ } }" "${S}"/krita/krita.desktop
-}
-
-src_compile() {
-#	local myconf="$(use_with opengl gl)"
-
-	for i in $(find "${S}"/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_compile
-}
diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index 43c095477c80..a2f1104d3df8 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,6 +1,10 @@
 # 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.104 2009/09/27 12:36:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.105 2009/11/01 09:17:08 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kspread-1.6.3.ebuild,
+  -files/kspread-1.6.3-validate-desktop.diff, -files/kspread-gcc43.patch:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org>
   kspread-1.6.3_p20090204.ebuild:
diff --git a/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff b/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff
deleted file mode 100644
index 8b361026e483..000000000000
--- a/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- koffice-1.6.3/kspread/kspread.desktop.orig	2008-05-17 16:04:28.000000000 +0200
-+++ koffice-1.6.3/kspread/kspread.desktop	2008-05-17 16:04:34.000000000 +0200
-@@ -70,7 +70,7 @@
- GenericName[wa]=Tåvleus
- GenericName[zh_CN]=电子表格
- GenericName[zh_TW]=Spread 表格
--MimeType=application/vnd.oasis.opendocument.spreadsheet;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro
-+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro;
- Type=Application
- Icon=kspread
- X-KDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
diff --git a/app-office/kspread/files/kspread-gcc43.patch b/app-office/kspread/files/kspread-gcc43.patch
deleted file mode 100644
index 9ac8a6f6dfe6..000000000000
--- a/app-office/kspread/files/kspread-gcc43.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nrua koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
---- koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2007-05-30 23:43:20.000000000 +0200
-+++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2008-03-12 00:59:07.000000000 +0100
-@@ -174,12 +174,7 @@
- 	return m_cell->text();
- }
- 
--bool Cell::setText(const QString& text, bool asString) {
--
--	//FIXME: there is some problem with asString parameter, when it's set
--	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
--	//kspread: Cell at row 6, col 1 marked as formula, but formula is NULL
--
-+bool Cell::setText(const QString& text) {
- 	KSpread::ProtectedCheck prot;
- 	prot.setSheet (m_sheet);
- 	prot.add (QPoint (m_col, m_row));
-@@ -189,7 +184,7 @@
- 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
- 	dm->setSheet (m_sheet);
- 	dm->setValue (text);
--	dm->setParsing (!asString);
-+	dm->setParsing (true);
- 	dm->add (QPoint (m_col, m_row));
- 	dm->execute ();
- 
-diff -Nrua koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h
---- koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h	2007-05-30 23:43:20.000000000 +0200
-+++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	2008-03-12 00:59:07.000000000 +0100
-@@ -131,11 +131,10 @@
- 		*/
- 		const QString text() const;
- 		/**
--		* Set the text of the cell. If asString is true, the text
--		* will be handled as string else we try to parse the
--		* string to the expected value.
-+		* Set the text of the cell. the text
-+		* will be handled as string
- 		*/
--		bool setText(const QString& text, bool asString = false);
-+		bool setText(const QString& text);
- 
- 		/**
- 		* Return the textcolor as RGB-value in the format "#RRGGBB".
-
- 
diff --git a/app-office/kspread/kspread-1.6.3.ebuild b/app-office/kspread/kspread-1.6.3.ebuild
deleted file mode 100644
index e9379aa7c716..000000000000
--- a/app-office/kspread/kspread-1.6.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.8 2009/06/30 21:32:00 tampakrap 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="3.5"
-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"
-
-PATCHES=( "${FILESDIR}/kspread-1.6.3-validate-desktop.diff"
-		"${FILESDIR}/kspread-gcc43.patch" )
-
-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/kugar/ChangeLog b/app-office/kugar/ChangeLog
index ab259c777133..c5002c8dcdc0 100644
--- a/app-office/kugar/ChangeLog
+++ b/app-office/kugar/ChangeLog
@@ -1,6 +1,9 @@
 # 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.84 2009/09/27 12:36:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.85 2009/11/01 09:29:38 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kugar-1.6.2.ebuild:
+  Drop old version
 
   27 Sep 2009; Brent Baude <ranger@gentoo.org> kugar-1.6.3_p20090204.ebuild:
   Marking kugar-1.6.3_p20090204 ppc64 stable for bug 276008
diff --git a/app-office/kugar/kugar-1.6.2.ebuild b/app-office/kugar/kugar-1.6.2.ebuild
deleted file mode 100644
index d09bb5254fff..000000000000
--- a/app-office/kugar/kugar-1.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.10 2009/06/30 21:34:51 tampakrap Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=1.6.3
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice report viewer and generator."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-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/kword/ChangeLog b/app-office/kword/ChangeLog
index d0e6b8fa7152..8b9f24b23bdd 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,12 @@
 # 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.134 2009/10/01 15:23:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.135 2009/11/01 09:15:28 abcd Exp $
+
+  01 Nov 2009; Jonathan Callen <abcd@gentoo.org> -kword-1.6.3-r2.ebuild,
+  -files/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff,
+  -files/koffice-xpdf-CVE-2007-0104.diff,
+  -files/koffice-xpdf-CVE-2007-3387.diff, -files/kword-gcc43.patch:
+  Drop old version
 
   01 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> kword-2.0.2.ebuild:
   Update deps. Per bug #286964.
diff --git a/app-office/kword/files/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff b/app-office/kword/files/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
deleted file mode 100644
index dabcf23d44aa..000000000000
--- a/app-office/kword/files/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
+++ /dev/null
@@ -1,669 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/Stream.cc
-+++ filters/kword/pdf/xpdf/xpdf/Stream.cc
-@@ -1239,6 +1239,7 @@
- // CCITTFaxStream
- //------------------------------------------------------------------------
- 
-+#if 0
- CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
- 			       GBool byteAlignA, int columnsA, int rowsA,
- 			       GBool endOfBlockA, GBool blackA):
-@@ -1748,6 +1749,609 @@
-   }
-   return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
- }
-+#else // secfix
-+CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
-+			       GBool byteAlignA, int columnsA, int rowsA,
-+			       GBool endOfBlockA, GBool blackA):
-+    FilterStream(strA) {
-+  encoding = encodingA;
-+  endOfLine = endOfLineA;
-+  byteAlign = byteAlignA;
-+  columns = columnsA;
-+  if (columns < 1) {
-+    columns = 1;
-+  } else if (columns > (INT_MAX - 2)/sizeof(int)) {
-+    columns = (INT_MAX - 2)/sizeof(int);
-+  }
-+  rows = rowsA;
-+  endOfBlock = endOfBlockA;
-+  black = blackA;
-+  // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
-+  // ---> max codingLine size = columns + 1
-+  // refLine has one extra guard entry at the end
-+  // ---> max refLine size = columns + 2
-+  codingLine = (int *)gmalloc((columns + 1) * sizeof(int));
-+  refLine = (int *)gmalloc((columns + 2) * sizeof(int));
-+
-+  eof = gFalse;
-+  row = 0;
-+  nextLine2D = encoding < 0;
-+  inputBits = 0;
-+  codingLine[0] = columns;
-+  a0i = 0;
-+  outputBits = 0;
-+
-+  buf = EOF;
-+}
-+
-+CCITTFaxStream::~CCITTFaxStream() {
-+  delete str;
-+  gfree(refLine);
-+  gfree(codingLine);
-+}
-+
-+void CCITTFaxStream::reset() {
-+  short code1;
-+
-+  str->reset();
-+  eof = gFalse;
-+  row = 0;
-+  nextLine2D = encoding < 0;
-+  inputBits = 0;
-+  codingLine[0] = columns;
-+  a0i = 0;
-+  outputBits = 0;
-+  buf = EOF;
-+
-+  // skip any initial zero bits and end-of-line marker, and get the 2D
-+  // encoding tag
-+  while ((code1 = lookBits(12)) == 0) {
-+    eatBits(1);
-+  }
-+  if (code1 == 0x001) {
-+    eatBits(12);
-+  }
-+  if (encoding > 0) {
-+    nextLine2D = !lookBits(1);
-+    eatBits(1);
-+  }
-+}
-+
-+inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
-+  if (a1 > codingLine[a0i]) {
-+    if (a1 > columns) {
-+      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+      err = gTrue;
-+      a1 = columns;
-+    }
-+    if ((a0i & 1) ^ blackPixels) {
-+      ++a0i;
-+    }
-+    codingLine[a0i] = a1;
-+  }
-+}
-+
-+inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
-+  if (a1 > codingLine[a0i]) {
-+    if (a1 > columns) {
-+      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+      err = gTrue;
-+      a1 = columns;
-+    }
-+    if ((a0i & 1) ^ blackPixels) {
-+      ++a0i;
-+    }
-+    codingLine[a0i] = a1;
-+  } else if (a1 < codingLine[a0i]) {
-+    if (a1 < 0) {
-+      error(getPos(), "Invalid CCITTFax code");
-+      err = gTrue;
-+      a1 = 0;
-+    }
-+    while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
-+      --a0i;
-+    }
-+    codingLine[a0i] = a1;
-+  }
-+}
-+
-+int CCITTFaxStream::lookChar() {
-+  short code1, code2, code3;
-+  int b1i, blackPixels, i, bits;
-+  GBool gotEOL;
-+
-+  if (buf != EOF) {
-+    return buf;
-+  }
-+
-+  // read the next row
-+  if (outputBits == 0) {
-+
-+    // if at eof just return EOF
-+    if (eof) {
-+      return EOF;
-+    }
-+
-+    err = gFalse;
-+
-+    // 2-D encoding
-+    if (nextLine2D) {
-+      for (i = 0; codingLine[i] < columns; ++i) {
-+	refLine[i] = codingLine[i];
-+      }
-+      refLine[i++] = columns;
-+      refLine[i] = columns;
-+      codingLine[0] = 0;
-+      a0i = 0;
-+      b1i = 0;
-+      blackPixels = 0;
-+      // invariant:
-+      // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
-+      //                                                             <= columns
-+      // exception at left edge:
-+      //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
-+      // exception at right edge:
-+      //   refLine[b1i] = refLine[b1i+1] = columns is possible
-+      while (codingLine[a0i] < columns) {
-+	code1 = getTwoDimCode();
-+	switch (code1) {
-+	case twoDimPass:
-+	  addPixels(refLine[b1i + 1], blackPixels);
-+	  if (refLine[b1i + 1] < columns) {
-+	    b1i += 2;
-+	  }
-+	  break;
-+	case twoDimHoriz:
-+	  code1 = code2 = 0;
-+	  if (blackPixels) {
-+	    do {
-+	      code1 += code3 = getBlackCode();
-+	    } while (code3 >= 64);
-+	    do {
-+	      code2 += code3 = getWhiteCode();
-+	    } while (code3 >= 64);
-+	  } else {
-+	    do {
-+	      code1 += code3 = getWhiteCode();
-+	    } while (code3 >= 64);
-+	    do {
-+	      code2 += code3 = getBlackCode();
-+	    } while (code3 >= 64);
-+	  }
-+	  addPixels(codingLine[a0i] + code1, blackPixels);
-+	  if (codingLine[a0i] < columns) {
-+	    addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
-+	  }
-+	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	    b1i += 2;
-+	  }
-+	  break;
-+	case twoDimVertR3:
-+	  addPixels(refLine[b1i] + 3, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
-+	  }
-+	  break;
-+	case twoDimVertR2:
-+	  addPixels(refLine[b1i] + 2, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
-+	  }
-+	  break;
-+	case twoDimVertR1:
-+	  addPixels(refLine[b1i] + 1, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
-+	  }
-+	  break;
-+	case twoDimVert0:
-+	  addPixels(refLine[b1i], blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
-+	  }
-+	  break;
-+	case twoDimVertL3:
-+	  addPixelsNeg(refLine[b1i] - 3, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    if (b1i > 0) {
-+	      --b1i;
-+	    } else {
-+	      ++b1i;
-+	    }
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
-+	  }
-+	  break;
-+	case twoDimVertL2:
-+	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    if (b1i > 0) {
-+	      --b1i;
-+	    } else {
-+	      ++b1i;
-+	    }
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
-+	  }
-+	  break;
-+	case twoDimVertL1:
-+	  addPixelsNeg(refLine[b1i] - 1, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    if (b1i > 0) {
-+	      --b1i;
-+	    } else {
-+	      ++b1i;
-+	    }
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
-+	  }
-+	  break;
-+	case EOF:
-+	  addPixels(columns, 0);
-+	  eof = gTrue;
-+	  break;
-+	default:
-+	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-+	  addPixels(columns, 0);
-+	  err = gTrue;
-+	  break;
-+	}
-+      }
-+
-+    // 1-D encoding
-+    } else {
-+      codingLine[0] = 0;
-+      a0i = 0;
-+      blackPixels = 0;
-+      while (codingLine[a0i] < columns) {
-+	code1 = 0;
-+	if (blackPixels) {
-+	  do {
-+	    code1 += code3 = getBlackCode();
-+	  } while (code3 >= 64);
-+	} else {
-+	  do {
-+	    code1 += code3 = getWhiteCode();
-+	  } while (code3 >= 64);
-+	}
-+	addPixels(codingLine[a0i] + code1, blackPixels);
-+	blackPixels ^= 1;
-+      }
-+    }
-+
-+    // byte-align the row
-+    if (byteAlign) {
-+      inputBits &= ~7;
-+    }
-+
-+    // check for end-of-line marker, skipping over any extra zero bits
-+    gotEOL = gFalse;
-+    if (!endOfBlock && row == rows - 1) {
-+      eof = gTrue;
-+    } else {
-+      code1 = lookBits(12);
-+      while (code1 == 0) {
-+	eatBits(1);
-+	code1 = lookBits(12);
-+      }
-+      if (code1 == 0x001) {
-+	eatBits(12);
-+	gotEOL = gTrue;
-+      } else if (code1 == EOF) {
-+	eof = gTrue;
-+      }
-+    }
-+
-+    // get 2D encoding tag
-+    if (!eof && encoding > 0) {
-+      nextLine2D = !lookBits(1);
-+      eatBits(1);
-+    }
-+
-+    // check for end-of-block marker
-+    if (endOfBlock && gotEOL) {
-+      code1 = lookBits(12);
-+      if (code1 == 0x001) {
-+	eatBits(12);
-+	if (encoding > 0) {
-+	  lookBits(1);
-+	  eatBits(1);
-+	}
-+	if (encoding >= 0) {
-+	  for (i = 0; i < 4; ++i) {
-+	    code1 = lookBits(12);
-+	    if (code1 != 0x001) {
-+	      error(getPos(), "Bad RTC code in CCITTFax stream");
-+	    }
-+	    eatBits(12);
-+	    if (encoding > 0) {
-+	      lookBits(1);
-+	      eatBits(1);
-+	    }
-+	  }
-+	}
-+	eof = gTrue;
-+      }
-+
-+    // look for an end-of-line marker after an error -- we only do
-+    // this if we know the stream contains end-of-line markers because
-+    // the "just plow on" technique tends to work better otherwise
-+    } else if (err && endOfLine) {
-+      while (1) {
-+	code1 = lookBits(13);
-+	if (code1 == EOF) {
-+	  eof = gTrue;
-+	  return EOF;
-+	}
-+	if ((code1 >> 1) == 0x001) {
-+	  break;
-+	}
-+	eatBits(1);
-+      }
-+      eatBits(12); 
-+      if (encoding > 0) {
-+	eatBits(1);
-+	nextLine2D = !(code1 & 1);
-+      }
-+    }
-+
-+    // set up for output
-+    if (codingLine[0] > 0) {
-+      outputBits = codingLine[a0i = 0];
-+    } else {
-+      outputBits = codingLine[a0i = 1];
-+    }
-+
-+    ++row;
-+  }
-+
-+  // get a byte
-+  if (outputBits >= 8) {
-+    buf = (a0i & 1) ? 0x00 : 0xff;
-+    outputBits -= 8;
-+    if (outputBits == 0 && codingLine[a0i] < columns) {
-+      ++a0i;
-+      outputBits = codingLine[a0i] - codingLine[a0i - 1];
-+    }
-+  } else {
-+    bits = 8;
-+    buf = 0;
-+    do {
-+      if (outputBits > bits) {
-+	buf <<= bits;
-+	if (!(a0i & 1)) {
-+	  buf |= 0xff >> (8 - bits);
-+	}
-+	outputBits -= bits;
-+	bits = 0;
-+      } else {
-+	buf <<= outputBits;
-+	if (!(a0i & 1)) {
-+	  buf |= 0xff >> (8 - outputBits);
-+	}
-+	bits -= outputBits;
-+	outputBits = 0;
-+	if (codingLine[a0i] < columns) {
-+	  ++a0i;
-+	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
-+	} else if (bits > 0) {
-+	  buf <<= bits;
-+	  bits = 0;
-+	}
-+      }
-+    } while (bits);
-+  }
-+  if (black) {
-+    buf ^= 0xff;
-+  }
-+  return buf;
-+}
-+
-+short CCITTFaxStream::getTwoDimCode() {
-+  short code;
-+  CCITTCode *p;
-+  int n;
-+
-+  code = 0; // make gcc happy
-+  if (endOfBlock) {
-+    code = lookBits(7);
-+    p = &twoDimTab1[code];
-+    if (p->bits > 0) {
-+      eatBits(p->bits);
-+      return p->n;
-+    }
-+  } else {
-+    for (n = 1; n <= 7; ++n) {
-+      code = lookBits(n);
-+      if (n < 7) {
-+	code <<= 7 - n;
-+      }
-+      p = &twoDimTab1[code];
-+      if (p->bits == n) {
-+	eatBits(n);
-+	return p->n;
-+      }
-+    }
-+  }
-+  error(getPos(), "Bad two dim code (%04x) in CCITTFax stream", code);
-+  return EOF;
-+}
-+
-+short CCITTFaxStream::getWhiteCode() {
-+  short code;
-+  CCITTCode *p;
-+  int n;
-+
-+  code = 0; // make gcc happy
-+  if (endOfBlock) {
-+    code = lookBits(12);
-+    if (code == EOF) {
-+      return 1;
-+    }
-+    if ((code >> 5) == 0) {
-+      p = &whiteTab1[code];
-+    } else {
-+      p = &whiteTab2[code >> 3];
-+    }
-+    if (p->bits > 0) {
-+      eatBits(p->bits);
-+      return p->n;
-+    }
-+  } else {
-+    for (n = 1; n <= 9; ++n) {
-+      code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-+      if (n < 9) {
-+	code <<= 9 - n;
-+      }
-+      p = &whiteTab2[code];
-+      if (p->bits == n) {
-+	eatBits(n);
-+	return p->n;
-+      }
-+    }
-+    for (n = 11; n <= 12; ++n) {
-+      code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-+      if (n < 12) {
-+	code <<= 12 - n;
-+      }
-+      p = &whiteTab1[code];
-+      if (p->bits == n) {
-+	eatBits(n);
-+	return p->n;
-+      }
-+    }
-+  }
-+  error(getPos(), "Bad white code (%04x) in CCITTFax stream", code);
-+  // eat a bit and return a positive number so that the caller doesn't
-+  // go into an infinite loop
-+  eatBits(1);
-+  return 1;
-+}
-+
-+short CCITTFaxStream::getBlackCode() {
-+  short code;
-+  CCITTCode *p;
-+  int n;
-+
-+  code = 0; // make gcc happy
-+  if (endOfBlock) {
-+    code = lookBits(13);
-+    if (code == EOF) {
-+      return 1;
-+    }
-+    if ((code >> 7) == 0) {
-+      p = &blackTab1[code];
-+    } else if ((code >> 9) == 0 && (code >> 7) != 0) {
-+      p = &blackTab2[(code >> 1) - 64];
-+    } else {
-+      p = &blackTab3[code >> 7];
-+    }
-+    if (p->bits > 0) {
-+      eatBits(p->bits);
-+      return p->n;
-+    }
-+  } else {
-+    for (n = 2; n <= 6; ++n) {
-+      code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-+      if (n < 6) {
-+	code <<= 6 - n;
-+      }
-+      p = &blackTab3[code];
-+      if (p->bits == n) {
-+	eatBits(n);
-+	return p->n;
-+      }
-+    }
-+    for (n = 7; n <= 12; ++n) {
-+      code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-+      if (n < 12) {
-+	code <<= 12 - n;
-+      }
-+      if (code >= 64) {
-+	p = &blackTab2[code - 64];
-+	if (p->bits == n) {
-+	  eatBits(n);
-+	  return p->n;
-+	}
-+      }
-+    }
-+    for (n = 10; n <= 13; ++n) {
-+      code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-+      if (n < 13) {
-+	code <<= 13 - n;
-+      }
-+      p = &blackTab1[code];
-+      if (p->bits == n) {
-+	eatBits(n);
-+	return p->n;
-+      }
-+    }
-+  }
-+  error(getPos(), "Bad black code (%04x) in CCITTFax stream", code);
-+  // eat a bit and return a positive number so that the caller doesn't
-+  // go into an infinite loop
-+  eatBits(1);
-+  return 1;
-+}
-+
-+short CCITTFaxStream::lookBits(int n) {
-+  int c;
-+
-+  while (inputBits < n) {
-+    if ((c = str->getChar()) == EOF) {
-+      if (inputBits == 0) {
-+	return EOF;
-+      }
-+      // near the end of the stream, the caller may ask for more bits
-+      // than are available, but there may still be a valid code in
-+      // however many bits are available -- we need to return correct
-+      // data in this case
-+      return (inputBuf << (n - inputBits)) & (0xffff >> (16 - n));
-+    }
-+    inputBuf = (inputBuf << 8) + c;
-+    inputBits += 8;
-+  }
-+  return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
-+}
-+
-+#endif
- 
- GString *CCITTFaxStream::getPSFilter(const char *indent) {
-   GString *s;
-@@ -1929,6 +2533,12 @@
-     // allocate a buffer for the whole image
-     bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
-     bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
-+    if (bufWidth <= 0 || bufHeight <= 0 ||
-+	bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
-+      error(getPos(), "Invalid image size in DCT stream");
-+      y = height;
-+      return;
-+    }
-     for (i = 0; i < numComps; ++i) {
-       frameBuf[i] = (int *)gmalloc(bufWidth * bufHeight * sizeof(int));
-       memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
-@@ -2975,6 +3585,11 @@
-   }
-   scanInfo.firstCoeff = str->getChar();
-   scanInfo.lastCoeff = str->getChar();
-+  if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
-+      scanInfo.firstCoeff > scanInfo.lastCoeff) {
-+    error(getPos(), "Bad DCT coefficient numbers in scan info block");
-+    return gFalse;
-+  }
-   c = str->getChar();
-   scanInfo.ah = (c >> 4) & 0x0f;
-   scanInfo.al = c & 0x0f;
---- filters/kword/pdf/xpdf/xpdf/Stream.h
-+++ filters/kword/pdf/xpdf/xpdf/Stream.h
-@@ -513,13 +513,17 @@
-   int row;			// current row
-   int inputBuf;			// input buffer
-   int inputBits;		// number of bits in input buffer
--  short *refLine;		// reference line changing elements
--  int b1;			// index into refLine
--  short *codingLine;		// coding line changing elements
--  int a0;			// index into codingLine
-+  int *codingLine;             // coding line changing elements
-+  int *refLine;                        // reference line changing elements
-+  int a0i;                     // index into codingLine
-+  GBool err;                   // error on current line
-+
-   int outputBits;		// remaining output bits
-   int buf;			// character buffer
- 
-+  void addPixels(int a1, int black);
-+  void addPixelsNeg(int a1, int black);
-+
-   short getTwoDimCode();
-   short getWhiteCode();
-   short getBlackCode();
diff --git a/app-office/kword/files/koffice-xpdf-CVE-2007-0104.diff b/app-office/kword/files/koffice-xpdf-CVE-2007-0104.diff
deleted file mode 100644
index f5e51a1c706e..000000000000
--- a/app-office/kword/files/koffice-xpdf-CVE-2007-0104.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-------------------------------------------------------------------------
-r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines
-Changed paths:
-   M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc
-   M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h
-
-Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue.
-
-------------------------------------------------------------------------
-Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc
-===================================================================
---- filters/kword/pdf/xpdf/xpdf/Catalog.cc	(revision 622462)
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc	(revision 622463)
-@@ -24,6 +24,12 @@
- #include "Link.h"
- #include "Catalog.h"
- 
-+// This define is used to limit the depth of recursive readPageTree calls
-+// This is needed because the page tree nodes can reference their parents
-+// leaving us in an infinite loop
-+// Most sane pdf documents don't have a call depth higher than 10
-+#define MAX_CALL_DEPTH 1000
-+
- //------------------------------------------------------------------------
- // Catalog
- //------------------------------------------------------------------------
-@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) {
-     pageRefs[i].num = -1;
-     pageRefs[i].gen = -1;
-   }
--  numPages = readPageTree(pagesDict.getDict(), NULL, 0);
-+  numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0);
-   if (numPages != numPages0) {
-     error(-1, "Page count in top-level pages object is incorrect");
-   }
-@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() {
-   return s;
- }
- 
--int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) {
-+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) {
-   Object kids;
-   Object kid;
-   Object kidRef;
-@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic
-     // This should really be isDict("Pages"), but I've seen at least one
-     // PDF file where the /Type entry is missing.
-     } else if (kid.isDict()) {
--      if ((start = readPageTree(kid.getDict(), attrs1, start))
--	  < 0)
--	goto err2;
-+      if (callDepth > MAX_CALL_DEPTH) {
-+        error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH);
-+      } else {
-+        if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1))
-+	    < 0)
-+	  goto err2;
-+      }
-     } else {
-       error(-1, "Kid object (page %d) is wrong type (%s)",
- 	    start+1, kid.getTypeName());
-Index: filters/kword/pdf/xpdf/xpdf/Catalog.h
-===================================================================
---- filters/kword/pdf/xpdf/xpdf/Catalog.h	(revision 622462)
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.h	(revision 622463)
-@@ -82,7 +82,7 @@ private:
-   Object outline;		// outline dictionary
-   GBool ok;			// true if catalog is valid
- 
--  int readPageTree(Dict *pages, PageAttrs *attrs, int start);
-+  int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth);
-   Object *findDestInTree(Object *tree, GString *name, Object *obj);
- };
- 
diff --git a/app-office/kword/files/koffice-xpdf-CVE-2007-3387.diff b/app-office/kword/files/koffice-xpdf-CVE-2007-3387.diff
deleted file mode 100644
index ded0e07205a7..000000000000
--- a/app-office/kword/files/koffice-xpdf-CVE-2007-3387.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/Stream.cc
-+++ filters/kword/pdf/xpdf/xpdf/Stream.cc
-@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream 
-   predLine = NULL;
-   ok = gFalse;
- 
--  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
--     nComps >= INT_MAX / nBits ||
--      width >= INT_MAX / nComps / nBits)
--    return;
--
-   nVals = width * nComps;
--  if (nVals * nBits + 7 <= 0)
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+     nComps >= 4 || nBits > 16 ||
-+      width >= INT_MAX / nComps ||
-+      nVals >= (INT_MAX - 7) / nBits)
-     return;
- 
-   pixBytes = (nComps * nBits + 7) >> 3;
diff --git a/app-office/kword/files/kword-gcc43.patch b/app-office/kword/files/kword-gcc43.patch
deleted file mode 100644
index 7da230f4fac4..000000000000
--- a/app-office/kword/files/kword-gcc43.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- branches/koffice/1.6/koffice/filters/kword/wordperfect/import/TableStyle.cxx	2007/10/26 14:06:42	729649
-+++ branches/koffice/1.6/koffice/filters/kword/wordperfect/import/TableStyle.cxx	2007/10/26 14:20:47	729650
-@@ -36,6 +36,8 @@
- #include <minmax.h>
- #endif
- 
-+#include <cstring>
-+
- TableCellStyle::TableCellStyle(const WPXPropertyList &xPropList, const char *psName) :
- 	Style(psName),
-         mPropList(xPropList)
---- branches/koffice/1.6/koffice/filters/kword/wordperfect/import/TextRunStyle.cxx	2007/10/26 17:51:34	729711
-+++ branches/koffice/1.6/koffice/filters/kword/wordperfect/import/TextRunStyle.cxx	2007/10/26 17:51:55	729712
-@@ -37,6 +37,8 @@
- #include <minmax.h>
- #endif
- 
-+#include <cstring>
-+
- ParagraphStyle::ParagraphStyle(WPXPropertyList *pPropList, const WPXPropertyListVector &xTabStops, const WPXString &sName) :
- 	mpPropList(pPropList),
- 	mxTabStops(xTabStops),
diff --git a/app-office/kword/kword-1.6.3-r2.ebuild b/app-office/kword/kword-1.6.3-r2.ebuild
deleted file mode 100644
index 76a2522d010a..000000000000
--- a/app-office/kword/kword-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.10 2009/06/30 21:38:23 tampakrap Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice word processor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="3.5"
-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
-	${FILESDIR}/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
-	${FILESDIR}/${PN}-gcc43.patch
-	${FILESDIR}/${P}-gcc44.patch" )
-
-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
-
-	# Fix the desktop file. cf. bug 190006
-	sed -i -e "s:x-mswrite:x-mswrite;:g" "${S}"/kword/kword.desktop
-}