Remove old version.
authorDiego Elio Pettenò <flameeyes@gentoo.org>
Sat, 10 Feb 2007 20:28:23 +0000 (20:28 +0000)
committerDiego Elio Pettenò <flameeyes@gentoo.org>
Sat, 10 Feb 2007 20:28:23 +0000 (20:28 +0000)
Package-Manager: portage-2.1.2-r9

24 files changed:
app-office/karbon/ChangeLog
app-office/karbon/files/digest-karbon-1.6.0 [deleted file]
app-office/karbon/karbon-1.6.0.ebuild [deleted file]
app-office/kchart/ChangeLog
app-office/kchart/files/digest-kchart-1.6.0 [deleted file]
app-office/kchart/kchart-1.6.0.ebuild [deleted file]
app-office/kexi/ChangeLog
app-office/kexi/files/digest-kexi-1.6.0 [deleted file]
app-office/kexi/kexi-1.6.0.ebuild [deleted file]
app-office/koffice-meta/ChangeLog
app-office/koffice-meta/files/digest-koffice-meta-1.6.0 [deleted file]
app-office/koffice-meta/koffice-meta-1.6.0.ebuild [deleted file]
app-office/koffice/ChangeLog
app-office/koffice/files/digest-koffice-1.6.0-r3 [deleted file]
app-office/koffice/files/digest-koffice-1.6.1 [deleted file]
app-office/koffice/files/koffice-ole-filter.patch [deleted file]
app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff [deleted file]
app-office/koffice/koffice-1.6.0-r3.ebuild [deleted file]
app-office/koffice/koffice-1.6.1.ebuild [deleted file]
app-office/kword/ChangeLog
app-office/kword/files/digest-kword-1.6.0 [deleted file]
app-office/kword/files/digest-kword-1.6.1 [deleted file]
app-office/kword/kword-1.6.0.ebuild [deleted file]
app-office/kword/kword-1.6.1.ebuild [deleted file]

index fdfee3177671342a2ddc254f109dc4c9c5c39693..d43f5074b1b02f43944e2ba0c2da16925cf8fcfb 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/karbon
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.62 2006/12/20 00:47:20 masterdriverz Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.63 2007/02/10 20:25:22 flameeyes Exp $
+
+  10 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -karbon-1.6.0.ebuild:
+  Remove old version.
 
   20 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
   karbon-1.6.0.ebuild:
diff --git a/app-office/karbon/files/digest-karbon-1.6.0 b/app-office/karbon/files/digest-karbon-1.6.0
deleted file mode 100644 (file)
index 2e01d4c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e669cf19b2e1c7db7029c0772c527c0d koffice-1.6.0.tar.bz2 56718478
-RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c koffice-1.6.0.tar.bz2 56718478
-SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2 koffice-1.6.0.tar.bz2 56718478
diff --git a/app-office/karbon/karbon-1.6.0.ebuild b/app-office/karbon/karbon-1.6.0.ebuild
deleted file mode 100644 (file)
index b0b98e6..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-1.6.0.ebuild,v 1.2 2006/12/20 00:47:20 masterdriverz 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdeenablefinal"
-
-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
-}
index c4ffed78438441a76438783983809387fa8a2d57..30de96d5356a95753d9a04f814df0f776c6cd5b9 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/kchart
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/ChangeLog,v 1.63 2006/12/20 01:28:48 masterdriverz Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/ChangeLog,v 1.64 2007/02/10 20:26:38 flameeyes Exp $
+
+  10 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kchart-1.6.0.ebuild:
+  Remove old version.
 
   20 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
   kchart-1.6.1.ebuild:
diff --git a/app-office/kchart/files/digest-kchart-1.6.0 b/app-office/kchart/files/digest-kchart-1.6.0
deleted file mode 100644 (file)
index 2e01d4c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e669cf19b2e1c7db7029c0772c527c0d koffice-1.6.0.tar.bz2 56718478
-RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c koffice-1.6.0.tar.bz2 56718478
-SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2 koffice-1.6.0.tar.bz2 56718478
diff --git a/app-office/kchart/kchart-1.6.0.ebuild b/app-office/kchart/kchart-1.6.0.ebuild
deleted file mode 100644 (file)
index c50b24a..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-1.6.0.ebuild,v 1.1 2006/10/19 16:03:34 flameeyes 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 ~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
-       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
-}
index 8f536d623a3730324155920ac2a873c5900921be..10d8dbb4f684c4d524c170a15bbfa10554c2a656 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/kexi
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.64 2006/12/20 02:27:12 masterdriverz Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.65 2007/02/10 20:28:23 flameeyes Exp $
+
+  10 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kexi-1.6.0.ebuild:
+  Remove old version.
 
   20 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
   kexi-1.6.1.ebuild:
diff --git a/app-office/kexi/files/digest-kexi-1.6.0 b/app-office/kexi/files/digest-kexi-1.6.0
deleted file mode 100644 (file)
index 2e01d4c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e669cf19b2e1c7db7029c0772c527c0d koffice-1.6.0.tar.bz2 56718478
-RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c koffice-1.6.0.tar.bz2 56718478
-SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2 koffice-1.6.0.tar.bz2 56718478
diff --git a/app-office/kexi/kexi-1.6.0.ebuild b/app-office/kexi/kexi-1.6.0.ebuild
deleted file mode 100644 (file)
index fe1421f..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.6.0.ebuild,v 1.2 2006/11/23 19:30:37 vivo 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="mysql postgres"
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-       sys-libs/readline
-       mysql? ( virtual/mysql )
-       postgres? ( dev-libs/libpqxx )"
-
-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
-}
index 89c87702b79e5089f6001d5a229c144320ef1f66..851527d4b15c6a4c7808a48caa7cfbc8fda0ff0f 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/koffice-meta
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.56 2006/12/01 18:16:56 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.57 2007/02/10 20:24:17 flameeyes Exp $
+
+  10 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -koffice-meta-1.6.0.ebuild:
+  Remove old version.
 
 *koffice-meta-1.6.1 (01 Dec 2006)
 
diff --git a/app-office/koffice-meta/files/digest-koffice-meta-1.6.0 b/app-office/koffice-meta/files/digest-koffice-meta-1.6.0
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/app-office/koffice-meta/koffice-meta-1.6.0.ebuild b/app-office/koffice-meta/koffice-meta-1.6.0.ebuild
deleted file mode 100644 (file)
index 378e116..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 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.0.ebuild,v 1.1 2006/10/19 16:35:57 flameeyes Exp $
-
-MAXKOFFICEVER=${PV}
-inherit kde-functions
-
-DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/karbon)
-       $(deprange $PV $MAXKOFFICEVER app-office/kchart)
-       $(deprange $PV $MAXKOFFICEVER app-office/kexi)
-       $(deprange $PV $MAXKOFFICEVER app-office/kformula)
-       $(deprange $PV $MAXKOFFICEVER app-office/kivio)
-       $(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
-       $(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-       $(deprange $PV $MAXKOFFICEVER app-office/koshell)
-       $(deprange $PV $MAXKOFFICEVER app-office/kplato)
-       $(deprange $PV $MAXKOFFICEVER app-office/kpresenter)
-       $(deprange $PV $MAXKOFFICEVER app-office/krita)
-       $(deprange $PV $MAXKOFFICEVER app-office/kspread)
-       $(deprange $PV $MAXKOFFICEVER app-office/kugar)
-       $(deprange $PV $MAXKOFFICEVER app-office/kword)"
index 8f097bb1b9318e6c0c32152e6bda1a21c2a6376f..0a6ec57ab15b40cb5ece538b5b8f58b7fd012e3c 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.203 2007/01/17 01:18:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.204 2007/02/10 20:22:27 flameeyes Exp $
+
+  10 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/koffice-xpdf-CVE-2007-0104.diff, -files/koffice-ole-filter.patch,
+  -koffice-1.6.0-r3.ebuild, -koffice-1.6.1.ebuild:
+  Remove old version.
 
 *koffice-1.6.1-r1 (17 Jan 2007)
 *koffice-1.5.2-r2 (17 Jan 2007)
diff --git a/app-office/koffice/files/digest-koffice-1.6.0-r3 b/app-office/koffice/files/digest-koffice-1.6.0-r3
deleted file mode 100644 (file)
index 2e01d4c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e669cf19b2e1c7db7029c0772c527c0d koffice-1.6.0.tar.bz2 56718478
-RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c koffice-1.6.0.tar.bz2 56718478
-SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2 koffice-1.6.0.tar.bz2 56718478
diff --git a/app-office/koffice/files/digest-koffice-1.6.1 b/app-office/koffice/files/digest-koffice-1.6.1
deleted file mode 100644 (file)
index 8296a04..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7b90b46b79019edc60761a6bff2d387 koffice-1.6.1.tar.bz2 56999028
-RMD160 ee4fa84a53f92035c0ab9427e0acb18feca701db koffice-1.6.1.tar.bz2 56999028
-SHA256 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 koffice-1.6.1.tar.bz2 56999028
diff --git a/app-office/koffice/files/koffice-ole-filter.patch b/app-office/koffice/files/koffice-ole-filter.patch
deleted file mode 100644 (file)
index ca8b9d0..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -uNrp koffice-1.4.1/filters/olefilters/lib/klaola.cc koffice-1.4.1-kees/filters/olefilters/lib/klaola.cc
---- koffice-1.4.1/filters/olefilters/lib/klaola.cc     2005-07-19 07:09:30.000000000 -0700
-+++ koffice-1.4.1-kees/filters/olefilters/lib/klaola.cc        2006-11-21 16:02:08.000000000 -0800
-@@ -197,11 +197,21 @@ bool KLaola::parseHeader() {
-     num_of_bbd_blocks=read32(0x2c);
-     root_startblock=read32(0x30);
-     sbd_startblock=read32(0x3c);
-+
-+    if (num_of_bbd_blocks >= 0x800000) {
-+        kdError(s_area) << "KLaola::parseHeader(): Too many bbd blocks found in header!" << endl;
-+        return false;
-+    }
-     bbd_list=new unsigned int[num_of_bbd_blocks];
-     unsigned int i, j;
--    for(i=0, j=0; i<num_of_bbd_blocks; ++i, j=j+4)
-+    for(i=0, j=0; i<num_of_bbd_blocks; ++i, j=j+4) {
-         bbd_list[i]=read32(0x4c+j);
-+        if (bbd_list[i] >= (0x800000 - 1)) {
-+            kdError(s_area) << "KLaola::parseHeader(): bbd " << i << " offset (" << bbd_list[i] << ") too large" << endl;
-+            return false;
-+        }
-+    }
-     return true;
- }
-@@ -283,7 +293,8 @@ const unsigned char *KLaola::readBBStrea
-     unsigned char *p=0;
-     tmp=start;
--    while(tmp!=-2 && tmp>=0 && tmp<=static_cast<int>(maxblock)) {
-+    /* 0x10000 chosen as arbitrary "too many blocks" limit to not loop forver */
-+    while(tmp!=-2 && tmp>=0 && i<0x10000 && tmp<=static_cast<int>(maxblock)) {
-         ++i;
-         tmp=nextBigBlock(tmp);
-     }
-@@ -293,7 +304,7 @@ const unsigned char *KLaola::readBBStrea
-             maxSblock=i*8-1;
-         i=0;
-         tmp=start;
--        while(tmp!=-2 && tmp>=0 && tmp<=static_cast<int>(maxblock)) {
-+        while(tmp!=-2 && tmp>=0 && i<0x10000 && tmp<=static_cast<int>(maxblock)) {
-             memcpy(&p[i*0x200], &m_file.data[(tmp+1)*0x200], 0x200);
-             tmp=nextBigBlock(tmp);
-             ++i;
-@@ -308,7 +319,8 @@ const unsigned char *KLaola::readSBStrea
-     unsigned char *p=0;
-     tmp=start;
--    while(tmp!=-2 && tmp>=0 && tmp<=static_cast<int>(maxSblock)) {
-+    /* 0x10000 chosen as arbitrary "too many blocks" limit to not loop forver */
-+    while(tmp!=-2 && tmp>=0 && i<0x10000 && tmp<=static_cast<int>(maxSblock)) {
-         ++i;
-         tmp=nextSmallBlock(tmp);
-     }
-@@ -316,7 +328,7 @@ const unsigned char *KLaola::readSBStrea
-         p=new unsigned char[i*0x40];
-         i=0;
-         tmp=start;
--        while(tmp!=-2 && tmp>=0 && tmp<=static_cast<int>(maxSblock)) {
-+        while(tmp!=-2 && tmp>=0 && i<0x10000 && tmp<=static_cast<int>(maxSblock)) {
-             memcpy(&p[i*0x40], &smallBlockFile[tmp*0x40], 0x40);
-             tmp=nextSmallBlock(tmp);
-             ++i;
-@@ -326,10 +338,20 @@ const unsigned char *KLaola::readSBStrea
- }
- void KLaola::readBigBlockDepot() {
-+    if (num_of_bbd_blocks >= 0x800000)
-+        return;
-     bigBlockDepot=new unsigned char[0x200*num_of_bbd_blocks];
--    for(unsigned int i=0; i<num_of_bbd_blocks; ++i)
--        memcpy(&bigBlockDepot[i*0x200], &m_file.data[(bbd_list[i]+1)*0x200], 0x200);
-+    for(unsigned int i=0; i<num_of_bbd_blocks; ++i) {
-+        unsigned int offset = (bbd_list[i]+1)*0x200;
-+        if (offset > m_file.length - 0x200) {
-+            /* attempting to read past end of file */
-+            memset(&bigBlockDepot[i*0x200], 0, 0x200);
-+        }
-+        else {
-+            memcpy(&bigBlockDepot[i*0x200], &m_file.data[offset], 0x200);
-+        }
-+    }
- }
- void KLaola::readSmallBlockDepot() {
diff --git a/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff b/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff
deleted file mode 100644 (file)
index f5e51a1..0000000
+++ /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/koffice/koffice-1.6.0-r3.ebuild b/app-office/koffice/koffice-1.6.0-r3.ebuild
deleted file mode 100644 (file)
index 9f2c5f7..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.6.0-r3.ebuild,v 1.2 2006/12/01 01:25:07 flameeyes Exp $
-
-inherit kde
-
-RV="${PV}"
-MY_P="koffice-${RV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KOffice is an integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
-#SRC_URI="mirror://kde/unstable/koffice-${PV/_/-}/src/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# See bug #130442.
-#IUSE="doc mysql opengl postgres"
-IUSE="doc mysql postgres"
-
-RDEPEND=">=media-libs/freetype-2
-       media-libs/fontconfig
-       media-libs/libart_lgpl
-       dev-libs/libxml2
-       dev-libs/libxslt
-       sys-libs/readline
-       mysql? ( virtual/mysql )
-       postgres? ( dev-libs/libpqxx )
-       virtual/python
-       dev-lang/ruby
-       >=app-text/wv2-0.1.9
-       >=app-text/libwpd-0.8.2
-       >=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"
-#      opengl? ( virtual/opengl virtual/glu )"
-
-DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen )"
-
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-       DEPEND="${DEPEND} !${x}"
-       RDEPEND="${RDEPEND} !${x}"
-done
-
-need-kde 3.4
-
-# TODO: kword sql plugin needs Qt compiled with sql support
-# the dependency on python is needed for scripting support in kexi
-# and for kivio/kiviopart/kiviosdk.
-
-PATCHES="${FILESDIR}/krita-1.6.0-corrupt_png_save.diff
-       ${FILESDIR}/koffice-ole-filter.patch"
-
-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_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`
-       sed -i -e "s:toolbar tests:toolbar:" ${S}/kplato/Makefile.am
-}
-
-src_compile() {
-       local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
-       # $(use_enable opengl gl)"
-
-       kde_src_compile
-       if use doc; then
-               make apidox || die
-       fi
-}
-
-src_install() {
-       kde_src_install
-       if use doc; then
-               make DESTDIR="${D}" install-apidox || die
-       fi
-
-       dodoc changes-*
-}
diff --git a/app-office/koffice/koffice-1.6.1.ebuild b/app-office/koffice/koffice-1.6.1.ebuild
deleted file mode 100644 (file)
index c624890..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.6.1.ebuild,v 1.1 2006/12/01 18:04:12 flameeyes Exp $
-
-inherit kde
-
-RV="${PV}"
-MY_P="koffice-${RV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KOffice is an integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
-#SRC_URI="mirror://kde/unstable/koffice-${PV/_/-}/src/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# See bug #130442.
-#IUSE="doc mysql opengl postgres"
-IUSE="doc mysql postgres"
-
-RDEPEND=">=media-libs/freetype-2
-       media-libs/fontconfig
-       media-libs/libart_lgpl
-       dev-libs/libxml2
-       dev-libs/libxslt
-       sys-libs/readline
-       mysql? ( virtual/mysql )
-       postgres? ( dev-libs/libpqxx )
-       virtual/python
-       dev-lang/ruby
-       >=app-text/wv2-0.1.9
-       >=app-text/libwpd-0.8.2
-       >=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"
-#      opengl? ( virtual/opengl virtual/glu )"
-
-DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen )"
-
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-       DEPEND="${DEPEND} !${x}"
-       RDEPEND="${RDEPEND} !${x}"
-done
-
-need-kde 3.4
-
-# TODO: kword sql plugin needs Qt compiled with sql support
-# the dependency on python is needed for scripting support in kexi
-# and for kivio/kiviopart/kiviosdk.
-
-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_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`
-       sed -i -e "s:toolbar tests:toolbar:" ${S}/kplato/Makefile.am
-}
-
-src_compile() {
-       local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
-       # $(use_enable opengl gl)"
-
-       kde_src_compile
-       if use doc; then
-               make apidox || die
-       fi
-}
-
-src_install() {
-       kde_src_install
-       if use doc; then
-               make DESTDIR="${D}" install-apidox || die
-       fi
-
-       dodoc changes-*
-}
index 9e56810d9557de88cb261d0dec33b4c66f3df90e..ee17651702814e357f815df80a21331c872e9a68 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.80 2007/01/17 01:09:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.81 2007/02/10 20:23:29 flameeyes Exp $
+
+  10 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kword-1.6.0.ebuild,
+  -kword-1.6.1.ebuild:
+  Remove old version.
 
 *kword-1.6.1-r1 (17 Jan 2007)
 *kword-1.5.2-r1 (17 Jan 2007)
diff --git a/app-office/kword/files/digest-kword-1.6.0 b/app-office/kword/files/digest-kword-1.6.0
deleted file mode 100644 (file)
index 2e01d4c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e669cf19b2e1c7db7029c0772c527c0d koffice-1.6.0.tar.bz2 56718478
-RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c koffice-1.6.0.tar.bz2 56718478
-SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2 koffice-1.6.0.tar.bz2 56718478
diff --git a/app-office/kword/files/digest-kword-1.6.1 b/app-office/kword/files/digest-kword-1.6.1
deleted file mode 100644 (file)
index 8296a04..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7b90b46b79019edc60761a6bff2d387 koffice-1.6.1.tar.bz2 56999028
-RMD160 ee4fa84a53f92035c0ab9427e0acb18feca701db koffice-1.6.1.tar.bz2 56999028
-SHA256 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 koffice-1.6.1.tar.bz2 56999028
diff --git a/app-office/kword/kword-1.6.0.ebuild b/app-office/kword/kword-1.6.0.ebuild
deleted file mode 100644 (file)
index fead2a0..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.0.ebuild,v 1.1 2006/10/19 16:44:12 flameeyes 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 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-       $(deprange $PV $MAXKOFFICEVER app-office/kspread)
-       >=app-text/wv2-0.1.8
-       >=media-gfx/imagemagick-5.5.2
-       >=app-text/libwpd-0.8.2"
-
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-KMCOPYLIB="libkformula lib/kformula
-       libkofficecore lib/kofficecore
-       libkofficeui lib/kofficeui
-       libkopainter lib/kopainter
-       libkotext lib/kotext
-       libkwmf lib/kwmf
-       libkowmf lib/kwmf
-       libkstore lib/store
-       libkspreadcommon kspread"
-
-KMEXTRACTONLY="
-       lib/
-       kspread/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-need-kde 3.4
-
-src_unpack() {
-       kde-meta_src_unpack unpack
-
-       # We need to compile libs first
-       echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-       for i in $(find ${S}/lib -iname "*\.ui"); do
-               ${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-       done
-
-       kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kword/kword-1.6.1.ebuild b/app-office/kword/kword-1.6.1.ebuild
deleted file mode 100644 (file)
index b6c164e..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.1.ebuild,v 1.1 2006/12/01 18:19:29 flameeyes 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 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-       $(deprange $PV $MAXKOFFICEVER app-office/kspread)
-       >=app-text/wv2-0.1.8
-       >=media-gfx/imagemagick-5.5.2
-       >=app-text/libwpd-0.8.2"
-
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-KMCOPYLIB="libkformula lib/kformula
-       libkofficecore lib/kofficecore
-       libkofficeui lib/kofficeui
-       libkopainter lib/kopainter
-       libkotext lib/kotext
-       libkwmf lib/kwmf
-       libkowmf lib/kwmf
-       libkstore lib/store
-       libkspreadcommon kspread"
-
-KMEXTRACTONLY="
-       lib/
-       kspread/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-need-kde 3.4
-
-src_unpack() {
-       kde-meta_src_unpack unpack
-
-       # We need to compile libs first
-       echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-       for i in $(find ${S}/lib -iname "*\.ui"); do
-               ${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-       done
-
-       kde-meta_src_unpack makefiles
-}