14 files changed, 7 insertions, 395 deletions
diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 42b2fe1fc132..75d9a29e3cb5 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.39 2005/12/20 17:29:23 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.40 2005/12/20 19:23:59 carlo Exp $
+
+  20 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/koffice_1_3_xpdf_buffer_overflow.diff, -kword-1.3.5.ebuild,
+  -kword-1.3.5-r1.ebuild, -kword-1.4.1.ebuild, -kword-1.4.1-r1.ebuild,
+  -kword-1.4.2.ebuild, -kword-1.4.2-r5.ebuild:
+  clean up
 
 *kword-1.4.2-r7 (20 Dec 2005)
 *kword-1.4.2-r6 (20 Dec 2005)
diff --git a/app-office/kword/files/digest-kword-1.3.5 b/app-office/kword/files/digest-kword-1.3.5
deleted file mode 100644
index 4dc2ef3e1dd3..000000000000
--- a/app-office/kword/files/digest-kword-1.3.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 79896426542b0cf07e2e15f84946905a koffice-1.3.4.tar.bz2 10765924
-MD5 18f35fd33b62d4d0549130eceb6fca38 koffice-1.3.4-1.3.5.tar.xdelta 340954
-MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
diff --git a/app-office/kword/files/digest-kword-1.3.5-r1 b/app-office/kword/files/digest-kword-1.3.5-r1
deleted file mode 100644
index de0cb893c168..000000000000
--- a/app-office/kword/files/digest-kword-1.3.5-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 79896426542b0cf07e2e15f84946905a koffice-1.3.4.tar.bz2 10765924
-MD5 18f35fd33b62d4d0549130eceb6fca38 koffice-1.3.4-1.3.5.tar.xdelta 340954
-MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
-MD5 71a1baa8244dbcc1bfc2bd3c3e3dd40f post-koffice-1.3.5-rtfimport.diff 8620
diff --git a/app-office/kword/files/digest-kword-1.4.1 b/app-office/kword/files/digest-kword-1.4.1
deleted file mode 100644
index 47d9bab5c838..000000000000
--- a/app-office/kword/files/digest-kword-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91a7b68757addc5934c5a8209a4926d5 koffice-1.4.1.tar.bz2 19364338
diff --git a/app-office/kword/files/digest-kword-1.4.1-r1 b/app-office/kword/files/digest-kword-1.4.1-r1
deleted file mode 100644
index 6a96a65f5dd7..000000000000
--- a/app-office/kword/files/digest-kword-1.4.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 91a7b68757addc5934c5a8209a4926d5 koffice-1.4.1.tar.bz2 19364338
-MD5 9f77b327119fd1db0752dab785e2a975 post-koffice-1.4.1-rtfimport.diff 8614
diff --git a/app-office/kword/files/digest-kword-1.4.2 b/app-office/kword/files/digest-kword-1.4.2
deleted file mode 100644
index a054824ae545..000000000000
--- a/app-office/kword/files/digest-kword-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kword/files/digest-kword-1.4.2-r5 b/app-office/kword/files/digest-kword-1.4.2-r5
deleted file mode 100644
index a054824ae545..000000000000
--- a/app-office/kword/files/digest-kword-1.4.2-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kword/files/koffice_1_3_xpdf_buffer_overflow.diff b/app-office/kword/files/koffice_1_3_xpdf_buffer_overflow.diff
deleted file mode 100644
index dfcc74d0ac12..000000000000
--- a/app-office/kword/files/koffice_1_3_xpdf_buffer_overflow.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cc,v
-retrieving revision 1.3
-retrieving revision 1.3.2.1
-diff -u -r1.3 -r1.3.2.1
---- filters/kword/pdf/xpdf/xpdf/Gfx.cc	2003/01/25 23:17:44	1.3
-+++ filters/kword/pdf/xpdf/xpdf/Gfx.cc	2004/12/22 12:07:12	1.3.2.1
-@@ -2379,7 +2379,9 @@
-     haveMask = gFalse;
-     dict->lookup("Mask", &maskObj);
-     if (maskObj.isArray()) {
--      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-+      for (i = 0;
-+	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-+	   ++i) {
- 	maskObj.arrayGet(i, &obj1);
- 	maskColors[i] = obj1.getInt();
- 	obj1.free();
-===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cc,v
-retrieving revision 1.3
-retrieving revision 1.3.2.2
-diff -u -r1.3 -r1.3.2.2
---- filters/kword/pdf/xpdf/xpdf/GfxState.cc	2003/01/25 23:17:44	1.3
-+++ filters/kword/pdf/xpdf/xpdf/GfxState.cc	2004/12/22 13:50:53	1.3.2.2
-@@ -682,6 +682,11 @@
-   }
-   nCompsA = obj2.getInt();
-   obj2.free();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "ICCBased color space with too many (%d > %d) components",
-+	  nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   if (dict->lookup("Alternate", &obj2)->isNull() ||
-       !(altA = GfxColorSpace::parse(&obj2))) {
-     switch (nCompsA) {
-@@ -1023,6 +1028,11 @@
-     goto err2;
-   }
-   nCompsA = obj1.arrayGetLength();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "DeviceN color space with too many (%d > %d) components",
-+        nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   for (i = 0; i < nCompsA; ++i) {
-     if (!obj1.arrayGet(i, &obj2)->isName()) {
-       error(-1, "Bad DeviceN color space (names)");
diff --git a/app-office/kword/kword-1.3.5-r1.ebuild b/app-office/kword/kword-1.3.5-r1.ebuild
deleted file mode 100644
index a3586c57c31f..000000000000
--- a/app-office/kword/kword-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.3.5-r1.ebuild,v 1.2 2005/10/11 15:17:21 greg_g Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=1.3.5
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice Word Processor"
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2
-	mirror://kde/security_patches/post-koffice-1.3.5-rtfimport.diff"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
-IUSE=""
-SLOT="0"
-DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	>=app-text/wv2-0.1.8
-	>=media-gfx/imagemagick-5.4.5
-	dev-util/pkgconfig"
-PATCHES=""
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkoscript lib/koscript
-	libkospell lib/kospell
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-need-kde 3.1
-
-PATCHES="${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
-	${FILESDIR}/CAN-2005-0064.patch
-	${DISTDIR}/post-koffice-1.3.5-rtfimport.diff"
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile first liboofilter because it's needed by the kword's OOo filters
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
-
diff --git a/app-office/kword/kword-1.3.5.ebuild b/app-office/kword/kword-1.3.5.ebuild
deleted file mode 100644
index 80252eaeaf01..000000000000
--- a/app-office/kword/kword-1.3.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.3.5.ebuild,v 1.6 2005/07/12 18:14:47 josejx Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=1.3.5
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice Word Processor"
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
-IUSE=""
-SLOT="0"
-DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	>=app-text/wv2-0.1.8
-	>=media-gfx/imagemagick-5.4.5
-	dev-util/pkgconfig"
-PATCHES="$FILESDIR/xpdf_security_integer_overflow_2.diff"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkoscript lib/koscript
-	libkospell lib/kospell
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-need-kde 3.1
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	epatch ${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
-	epatch ${FILESDIR}/CAN-2005-0064.patch
-
-	# We need to compile first liboofilter because it's needed by the kword's OOo filters
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
-
diff --git a/app-office/kword/kword-1.4.1-r1.ebuild b/app-office/kword/kword-1.4.1-r1.ebuild
deleted file mode 100644
index 33928ca55c18..000000000000
--- a/app-office/kword/kword-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.1-r1.ebuild,v 1.7 2005/10/13 19:25:38 ranger Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice word processor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SRC_URI="${SRC_URI}
-	mirror://kde/security_patches/post-koffice-1.4.1-rtfimport.diff"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
-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"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkoscript lib/koscript
-	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.3
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# Fix RTF import buffer overflow. Applied in 1.4.2.
-	epatch "${DISTDIR}/post-koffice-1.4.1-rtfimport.diff"
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kword/kword-1.4.1.ebuild b/app-office/kword/kword-1.4.1.ebuild
deleted file mode 100644
index 452e713a2650..000000000000
--- a/app-office/kword/kword-1.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.1.ebuild,v 1.5 2005/09/12 14:07:17 agriffis 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 ppc ~ppc64 ~sparc x86"
-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"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkoscript lib/koscript
-	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.3
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kword/kword-1.4.2-r5.ebuild b/app-office/kword/kword-1.4.2-r5.ebuild
deleted file mode 100644
index 17f346af2afb..000000000000
--- a/app-office/kword/kword-1.4.2-r5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2-r5.ebuild,v 1.1 2005/12/09 20:41:28 carlo 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-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
-	libkoscript lib/koscript
-	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.3
-
-PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch ${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff"
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kword/kword-1.4.2.ebuild b/app-office/kword/kword-1.4.2.ebuild
deleted file mode 100644
index 79c3b6b42921..000000000000
--- a/app-office/kword/kword-1.4.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2.ebuild,v 1.6 2005/11/30 06:41:15 halcy0n 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 ~ia64 ~ppc ppc64 sparc x86"
-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"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkoscript lib/koscript
-	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.3
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}