diff options
author | Martin von Gagern <Martin.vGagern@gmx.net> | 2009-11-11 19:43:34 +0100 |
---|---|---|
committer | Martin von Gagern <Martin.vGagern@gmx.net> | 2009-11-11 19:43:34 +0100 |
commit | e6f7afd8f526984b61defacc1799c06b3f71145a (patch) | |
tree | 8efb0cc252b678d0da47d71d7070657fbab5bedb /app-office | |
parent | Remove deprected ebuilds && generate manifests (diff) | |
download | kde-sunset-e6f7afd8f526984b61defacc1799c06b3f71145a.tar.gz kde-sunset-e6f7afd8f526984b61defacc1799c06b3f71145a.tar.bz2 kde-sunset-e6f7afd8f526984b61defacc1799c06b3f71145a.zip |
Synchronized from official portage tree.
There have been some improvements to some of the packages since the
kde-sunset overlay was created. Here I try to include these impruvements
into the overlay, as long as they affect packages related to KDE 3.
Diffstat (limited to 'app-office')
50 files changed, 191 insertions, 1380 deletions
diff --git a/app-office/kletterwizard/ChangeLog b/app-office/kletterwizard/ChangeLog index e6e57233..ef8de8a9 100644 --- a/app-office/kletterwizard/ChangeLog +++ b/app-office/kletterwizard/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/kletterwizard # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.29 2009/04/30 17:54:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.30 2009/10/19 15:05:24 ssuominen Exp $ + + 19 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> + -files/kletterwizard-0.9.6-gentoo.diff, -kletterwizard-0.9.7.ebuild, + -files/kletterwizard-0.9.7-gcc-4.1.patch, kletterwizard-0.9.8.ebuild: + amd64/x86 stable wrt #226695 30 Apr 2009; Alexis Ballier <aballier@gentoo.org> kletterwizard-0.9.8.ebuild: diff --git a/app-office/kletterwizard/Manifest b/app-office/kletterwizard/Manifest index 652fac30..7aadbcd3 100644 --- a/app-office/kletterwizard/Manifest +++ b/app-office/kletterwizard/Manifest @@ -1,19 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX kletterwizard-0.9.6-gentoo.diff 1505 RMD160 2808e16c02a4594f9fdc1a21c4c7be413cbc6e9c SHA1 46d0b7caa5a63c0eef885fbd5de1662db6cda224 SHA256 e6b64892a378073a0a75607b4d7a1c312cfafe33fc71630f6cc939affe138d2a -AUX kletterwizard-0.9.7-gcc-4.1.patch 517 RMD160 da4aa22d6e1a0116e95ac63627dddc5b971f4a85 SHA1 aff6df469f0b19575b6e7eada6c4fecc47244c42 SHA256 abe084da0427aba02cd02703d675a3ae7ef624738c4a5128741b57bfeca920b2 AUX kletterwizard-0.9.8-gentoo.diff 877 RMD160 e936b7016142f92116dd5f1556d050d11f7f9b95 SHA1 73947c2b5ae93dd76b8f0db7dee0a96b75b6dbfa SHA256 908660be543cd7080d9b671062775abccd855a280e16382072c64d93fd5d8d5b -DIST kletterwizard-0.9.7.tar.gz 997714 RMD160 003d766df6f4e0c3c584a574cde1c94419d6f388 SHA1 e945d80340feac6181b7dd94b58e9b5b3ba6a4e8 SHA256 34c9bfb3037d52150e6458992369a60ee979376934c50d92244e9a84b2e4f24b DIST kletterwizard-0.9.8.tar.gz 1140531 RMD160 62f11efc142be3c8ede393a1dbaef5dd391d340f SHA1 97b1fff66182483c3e836cce5034a66236a6a0a5 SHA256 534e9f4810449166ef3b7e2e350cc91c2c74ad8e7d4cf34599302f763f7b341a -EBUILD kletterwizard-0.9.7.ebuild 930 RMD160 fe6abe2e1c2379c4db98f973e574d8c96f0a107e SHA1 f266958c0ef2ecefd7748d17f47c9079d9d9b3d0 SHA256 df70947c7712efaefe277d14984cdc05b379c1a95a85ec05c49c84c1105729fb -EBUILD kletterwizard-0.9.8.ebuild 973 RMD160 d573f53ea4ec625e7ef67f3f334ddb605e3a8fd3 SHA1 7d2c8be0a435b1292f2fc9859640a22e8febe467 SHA256 f072cfdc53ab0a01f201434ee03329c312ac76acc5baea0d19c554ea4c075a6b -MISC ChangeLog 4371 RMD160 0d53bc76605866bd36e242b46a6dcc4d30718dc9 SHA1 9b6381909bb3909fa7e485425040ccf161fbd00b SHA256 f1b1f0d2c23ebf319f31c32221a06cbce0064570d175cc1e70f21fb73261ede2 +EBUILD kletterwizard-0.9.8.ebuild 936 RMD160 a340b889524e511b809e4f1dd59195ed82a4ecec SHA1 4e90f0e3322e104f55b990417a938f79adfdf68f SHA256 e9c74acdb14c7b9d68b53fd45c9a607c22f25b81b5cf0969545a6c6b100989ee +MISC ChangeLog 4601 RMD160 414fe143aa189969ba2e8e8f6810e20c270e962d SHA1 bffbb8f1035343959122c692b02ec988524f8542 SHA256 c3966bd3f6097d9f4111df83bd2f532a86a50839c88656c6eccd42a0af9fda11 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkn55csACgkQvFcC4BYPU0oStgCgnZRRwd6T+Os1GkQrPQRWicum -3AcAn1sHMhaPxt1ra15wlQgUWoGS2IXo -=twg7 ------END PGP SIGNATURE----- diff --git a/app-office/kletterwizard/files/kletterwizard-0.9.6-gentoo.diff b/app-office/kletterwizard/files/kletterwizard-0.9.6-gentoo.diff deleted file mode 100644 index bcf3e9da..00000000 --- a/app-office/kletterwizard/files/kletterwizard-0.9.6-gentoo.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- klw-latex/Makefile.orig 2004-07-25 15:51:58.775033528 -0400 -+++ klw-latex/Makefile 2004-07-25 15:52:15.329516864 -0400 -@@ -431,7 +431,6 @@ - -mkdir -p ${DOSSIER}/tex/latex/klw/ - cp klw.cls ${DOSSIER}/tex/latex/klw/ - cp rechnung.sty ${DOSSIER}/tex/latex/klw/ -- texhash - - uninstall : - -rm -rf ${DOSSIER}/tex/latex/klw ---- klw-latex/Makefile.am.orig 2004-07-25 15:51:43.225397432 -0400 -+++ klw-latex/Makefile.am 2004-07-25 15:52:24.384140352 -0400 -@@ -9,7 +9,6 @@ - -mkdir -p ${DOSSIER}/tex/latex/klw/ - cp klw.cls ${DOSSIER}/tex/latex/klw/ - cp rechnung.sty ${DOSSIER}/tex/latex/klw/ -- texhash - - - uninstall : ---- klw-latex/Makefile.in.orig 2004-07-25 14:01:55.131939872 -0400 -+++ klw-latex/Makefile.in 2004-07-25 15:51:30.433342120 -0400 -@@ -244,7 +244,7 @@ - localstatedir = @localstatedir@ - mandir = @mandir@ - oldincludedir = @oldincludedir@ --prefix = @prefix@ -+prefix = ${DESTDIR}/@prefix@ - program_transform_name = @program_transform_name@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ -@@ -263,7 +263,7 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --DOSSIER = @texmfpath@ -+DOSSIER = ${DESTDIR}/@texmfpath@ - subdir = klw-latex - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -@@ -431,7 +431,6 @@ - -mkdir -p ${DOSSIER}/tex/latex/klw/ - cp klw.cls ${DOSSIER}/tex/latex/klw/ - cp rechnung.sty ${DOSSIER}/tex/latex/klw/ -- texhash - - uninstall : - -rm -rf ${DOSSIER}/tex/latex/klw diff --git a/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch b/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch deleted file mode 100644 index a7aba56b..00000000 --- a/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/klwletter.cpp.orig 2006-11-25 19:35:14.000000000 +0000 -+++ src/klwletter.cpp 2006-11-25 19:35:31.000000000 +0000 -@@ -228,7 +228,7 @@ - { - KProcess *proc = new KProcess; - *proc << klwSettings::latex(); -- *proc << " \\nonstopmode\\input\{" << letterTexfile->name() << "\}"; -+ *proc << " \\nonstopmode\\input{" << letterTexfile->name() << "}"; - proc->setWorkingDirectory(letterTmpDir->name()); - connect(proc,SIGNAL(processExited(KProcess* )),this,SLOT(letterBuildPS())); - proc->start(); diff --git a/app-office/kletterwizard/kletterwizard-0.9.7.ebuild b/app-office/kletterwizard/kletterwizard-0.9.7.ebuild deleted file mode 100644 index e8abc282..00000000 --- a/app-office/kletterwizard/kletterwizard-0.9.7.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.7.ebuild,v 1.8 2008/09/03 11:34:07 opfer Exp $ - -inherit kde - -DESCRIPTION="KLetterWizard is a KDE application which simplifies letter writing and produces output via LaTeX." -HOMEPAGE="http://www.kluenter.de/klw.html" -SRC_URI="http://www.kluenter.de/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="kdeenablefinal" - -DEPEND="virtual/latex-base - || ( =kde-base/kghostview-3.5* =kde-base/kdegraphics-3.5* )" -RDEPEND="${DEPEND}" - -need-kde 3.4 - -src_unpack() { - kde_src_unpack - epatch "${FILESDIR}/${PN}-0.9.6-gentoo.diff" - epatch "${FILESDIR}/${P}-gcc-4.1.patch" -} - -src_compile() { - myconf="--with-texmf-path=/usr/share/texmf" - kde_src_compile -} - -pkg_postinst() { - einfo "Running texhash to complete install..." - texhash -} diff --git a/app-office/kletterwizard/kletterwizard-0.9.8.ebuild b/app-office/kletterwizard/kletterwizard-0.9.8.ebuild index f985c79a..ae24bc14 100644 --- a/app-office/kletterwizard/kletterwizard-0.9.8.ebuild +++ b/app-office/kletterwizard/kletterwizard-0.9.8.ebuild @@ -1,30 +1,30 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.8.ebuild,v 1.10 2009/04/30 17:54:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.8.ebuild,v 1.11 2009/10/19 15:05:24 ssuominen Exp $ inherit kde DESCRIPTION="KLetterWizard is a KDE application which simplifies letter writing and produces output via LaTeX." HOMEPAGE="http://www.kluenter.de/klw" SRC_URI="http://www.kluenter.de/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" IUSE="kdeenablefinal" DEPEND="virtual/latex-base - || ( =kde-base/kghostview-3.5* =kde-base/kdegraphics-3.5* )" + =kde-base/kghostview-3.5*" RDEPEND="${DEPEND} || ( >=dev-texlive/texlive-latexextra-2008 dev-tex/latex-unicode )" -need-kde 3.4 +need-kde 3.5 -S="${WORKDIR}/${PN}" +S=${WORKDIR}/${PN} src_unpack() { kde_src_unpack - epatch "${FILESDIR}/${P}-gentoo.diff" + epatch "${FILESDIR}"/${P}-gentoo.diff } src_compile() { diff --git a/app-office/kmm_kbanking/ChangeLog b/app-office/kmm_kbanking/ChangeLog index 1b8a5363..0d789b75 100644 --- a/app-office/kmm_kbanking/ChangeLog +++ b/app-office/kmm_kbanking/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/kmm_kbanking # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmm_kbanking/ChangeLog,v 1.3 2009/08/19 16:16:58 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kmm_kbanking/ChangeLog,v 1.4 2009/10/25 23:38:55 abcd Exp $ + + 25 Oct 2009; Jonathan Callen <abcd@gentoo.org> + -kmm_kbanking-0.9.10.ebuild: + drop old version *kmm_kbanking-1.0 (19 Aug 2009) diff --git a/app-office/kmm_kbanking/Manifest b/app-office/kmm_kbanking/Manifest index 55f85574..3f3a227c 100644 --- a/app-office/kmm_kbanking/Manifest +++ b/app-office/kmm_kbanking/Manifest @@ -1,6 +1,4 @@ -DIST kmm_kbanking-0.9.10.tar.bz2 602714 RMD160 5b03eb6fb9472e4f3378e902a73bf3fcd66abad9 SHA1 a5727cd2a8600fe24c2f342dccfd3831195a205a SHA256 7425f1d3f46a75af0883cd9aece07fe61f2a66d387044c0509832b8c8521933a DIST kmm_kbanking-1.0.tar.gz 644319 RMD160 03e798e4fa2ccbe497f22d598d1f6da517f3ba9d SHA1 3507c62d4d9e2a1427ef594d5b5f59a277ae8bc9 SHA256 dedc24492c65636fa0386bcfba339eccebe81beb87880d273c1ace145272aa25 -EBUILD kmm_kbanking-0.9.10.ebuild 937 RMD160 e5b0abb36b0d3f34c7e52c56ce702417469296e8 SHA1 4e8b02b37ee1a866db8b4a2dc6ed0e52a7a06497 SHA256 136f694d14443c919c3a817d9bdb9f0716d618455143e19ca875c75d1805f21b EBUILD kmm_kbanking-1.0.ebuild 880 RMD160 e35d3f6f7cc794e6a5bf3aed784612e664601732 SHA1 28c7f28a7bf5d021a87151f61f98e3ea2f749507 SHA256 50d61e3e219d35db48ed985071371bbe4433bac5cf6648bbc6ea1c1976525b40 -MISC ChangeLog 961 RMD160 ff454b9010e0a7f30c731c8317856bad30f10cae SHA1 5ddc2f25c30ed4cd3d3b93325347501faa02823c SHA256 e232215368f5a3019fdcaefbd206567876446120eb98c0b27b11bdce13f721c9 +MISC ChangeLog 1060 RMD160 454b97b8c0d94403b559ff264aa97959ff0991f0 SHA1 db5b6ba32343b894145ffd0f0c8e12d73f58f20a SHA256 c71780b9a45d344936c170fc9ad9670fc960c640198405a43a7732c2e2e4a396 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/app-office/kmm_kbanking/kmm_kbanking-0.9.10.ebuild b/app-office/kmm_kbanking/kmm_kbanking-0.9.10.ebuild deleted file mode 100644 index a848a8ae..00000000 --- a/app-office/kmm_kbanking/kmm_kbanking-0.9.10.ebuild +++ /dev/null @@ -1,36 +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/kmm_kbanking/kmm_kbanking-0.9.10.ebuild,v 1.2 2009/07/06 09:52:14 hanno Exp $ - -EAPI="2" -ARTS_REQUIRED="never" -inherit kde - -DESCRIPTION="KMyMoney2 HBCI plugin utilizing AqBanking." -HOMEPAGE="http://www.aquamaniac.de/sites/download/packages.php?package=05&showall=1" -SRC_URI="http://www2.aquamaniac.de/sites/download/download.php?package=05&release=08&file=01&dummy=${P}.tar.bz2 -> ${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=app-office/kmymoney2-0.9.2 - || ( - >=net-libs/aqbanking-3.8.1[hbci,kde,qt3] - >=net-libs/aqbanking-4.0.0[qt3,kde] - ) - >=sys-libs/gwenhywfar-3.5.2" -RDEPEND="${DEPEND}" - -need-kde 3.5 - -src_configure() { - local myconf - myconf="${myconf} \ - --enable-aqbanking \ - --enable-gwenhywfar \ - --without-arts" - - kde_src_configure -} diff --git a/app-office/kmymoney2/ChangeLog b/app-office/kmymoney2/ChangeLog index a46f5a8b..3c39126c 100644 --- a/app-office/kmymoney2/ChangeLog +++ b/app-office/kmymoney2/ChangeLog @@ -1,6 +1,31 @@ # ChangeLog for app-office/kmymoney2 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.80 2009/08/19 16:10:48 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.85 2009/11/10 02:14:15 fauli Exp $ + + 10 Nov 2009; Christian Faulhammer <fauli@gentoo.org> + kmymoney2-1.0.2.ebuild: + stable x86, bug 292584 + + 09 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> + kmymoney2-1.0.2.ebuild: + Remove USE arts and rename USE sqlite3 to sqlite. + +*kmymoney2-1.0.2 (05 Oct 2009) + + 05 Oct 2009; Timo Gurr <tgurr@gentoo.org> -kmymoney2-1.0.1.ebuild, + +kmymoney2-1.0.2.ebuild: + Version bump, remove old. + +*kmymoney2-1.0.1 (13 Sep 2009) + + 13 Sep 2009; Timo Gurr <tgurr@gentoo.org> -kmymoney2-0.9.3.ebuild, + -kmymoney2-1.0.0.ebuild, +kmymoney2-1.0.1.ebuild: + Version bump, remove old. + + 07 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +files/0.8.8-gcc4.3.patch, kmymoney2-0.8.8.ebuild, kmymoney2-1.0.0.ebuild: + Add gcc4.3 patch to 0.8.8. Fix crypt dep in 1.0.0. Per bugs #264525 and + #283118. *kmymoney2-1.0.0 (19 Aug 2009) diff --git a/app-office/kmymoney2/Manifest b/app-office/kmymoney2/Manifest index a0c29d54..76557369 100644 --- a/app-office/kmymoney2/Manifest +++ b/app-office/kmymoney2/Manifest @@ -1,11 +1,8 @@ +AUX 0.8.8-gcc4.3.patch 556 RMD160 addb5f1e194013d06e76cbf1082fc0ce05a134af SHA1 18c81f168fea71f42ac3a21b542005e6f537b32b SHA256 bcd2bdcc4fd37649eb3f1d88ead6a13751d9171ee1859a17d3e3908b7a7ff815 AUX kmymoney2.desktop.diff 598 RMD160 d696a4e357424d956742e015f5bb287b50717392 SHA1 ef2dec205d3dee0a233a32d26b7ff8947f4a513f SHA256 71b9f54e4190e56ae016d989bb03dbef3eb7b5fc205eba4cd0a5737993ea78ae DIST kmymoney2-0.8.8.tar.bz2 6144296 RMD160 16805ae67a4219be209b5e7645c48d6b76edcd31 SHA1 60c44490519ee5fb85fb248933cbcede885c83de SHA256 88c93af9dd768aa4deb18d531f72a323710b680c7bab13b96dfa641024d564a7 -DIST kmymoney2-0.8.9.tar.bz2 6161688 RMD160 f7a332e667aea347fcf47163cc8607e795fec11a SHA1 c53d77cde7b1c4e8a4e613001dd5cdb48cb43525 SHA256 d23717d273e366ba84d7ef3138d71b1b7d758e6c626e83439df7fc1a567c3965 -DIST kmymoney2-0.9.3.tar.bz2 7724798 RMD160 2e9f3867c2c7dd7308876e89b6a1b1fd1f6a2494 SHA1 88ebaf136569999f74d726efba4d0f00895f88a5 SHA256 d4497c4981de8f30dadb17e24cc774cdc98a9aeec251b0f77d56045fdbbda984 -DIST kmymoney2-1.0.0.tar.bz2 11219845 RMD160 ecc35c25b37b8284c08c3e01c8852cb0c7c596b2 SHA1 c52790f04d2541e430103e61eb8b267cecd024c5 SHA256 cdca119e2ed517a830144472bc6ea743e906823c6a03ff8a16b8e672fe37a0a9 -EBUILD kmymoney2-0.8.8.ebuild 1276 RMD160 1b99e93219fab31bc1459fae44f0ba792c0c6bb3 SHA1 b1cc7a825f2db6a286a3aabfe754be3342312d21 SHA256 2607c917ca313c857cf26c0546c3af35b9055c7c347925db3ae4ba6b566abd27 -EBUILD kmymoney2-0.8.9.ebuild 1236 RMD160 6ad51873565ca8acfcd6bda24428135b599cc7c0 SHA1 798f8dbeb6f316099ecacf1e1c9faf91d0db14ef SHA256 316a93d7b928a32f241137200b305b2ffec33e842c5c207919fa5d3da54033fe -EBUILD kmymoney2-0.9.3.ebuild 1296 RMD160 e75ff469f92e3be33abc6a83127f1ff9219404e3 SHA1 c26149ecee9a54209bc7fe186924632cd400262a SHA256 a6dd7307b9ea81e2bb4a216e8db0318813063d160420d7d6a654291acf28c0a3 -EBUILD kmymoney2-1.0.0.ebuild 1296 RMD160 bc49b0d77bda937cea4951a12fc453dcafd7ec36 SHA1 0deb013c3a33650988babc1e2b65394cccb7d6d4 SHA256 9ef6f856bd4161d0af896a303a55ed2bd1298f981860ef27eaca6b65dd2bc123 -MISC ChangeLog 10648 RMD160 81c79231167ed802c48e4cdd20e4df1ce6cf9fa2 SHA1 48af3484e30306703cff7f16b6cef6b2e34bf1d5 SHA256 8d95e4894a34491829b132e607661e40a33c1eea1d6c4a6afaebc4b62657ac66 +DIST kmymoney2-1.0.2.tar.bz2 11841805 RMD160 477be235fae648fcfb33a68c46c7caa60b35a972 SHA1 21627b93ce082f090d732d56c2381c5f71df5db9 SHA256 16f18087f678d552533c72e248b81ca1268ccfc539c15693f383a8b37be59285 +EBUILD kmymoney2-0.8.8.ebuild 1315 RMD160 20a718528ce98ae3e8c14ced12bae4d75d178abb SHA1 b41a6bb4c0dacd3102eb79463e64b3fcb4fa7483 SHA256 32b6968546775fc3cf8c986c9088a06e716a5947117c88e8cae44c48b8f5183a +EBUILD kmymoney2-1.0.2.ebuild 1267 RMD160 8d9db37766d18ea37dffa069f952a73c39669a6d SHA1 3dace67ca7143b1199ef6b4bb597910f0dc5e337 SHA256 e3068f3d8a8aa944a50526b4cda486d91508977cf27b8b2f5c34d7f9eb9973fa +MISC ChangeLog 11445 RMD160 ee14c85bbe6452232cf205001a61360f39897a5d SHA1 49f5c7c319ea9743505a118ddfbfa83d71734f7c SHA256 13a08d02cfd0f988ce90f8f4de750dcc23285d1620167ab056bd5d5d1c8eb225 MISC metadata.xml 323 RMD160 0f1bb56d62ac59678b8582c818c971002fe0b880 SHA1 6bcee84bade72323278353e67c1d8a5f37439952 SHA256 a446cc8189316c91fabdf76858442b3f31ef000a58b1a6d88ed992214e08b6b6 diff --git a/app-office/kmymoney2/files/0.8.8-gcc4.3.patch b/app-office/kmymoney2/files/0.8.8-gcc4.3.patch new file mode 100644 index 00000000..93ed615e --- /dev/null +++ b/app-office/kmymoney2/files/0.8.8-gcc4.3.patch @@ -0,0 +1,11 @@ +--- kmymoney2/mymoney/storage/mymoneystoragebin.h.old 2009-06-02 13:17:27.000000000 +0200 ++++ kmymoney2/mymoney/storage/mymoneystoragebin.h 2009-06-02 13:17:49.000000000 +0200 +@@ -107,7 +107,7 @@ + const MyMoneyTransaction readTransaction(QDataStream& s); + + void writeSplits(QDataStream& s, const MyMoneyTransaction& t); +- void writeSplit(QDataStream& s, const MyMoneySplit& s); ++ void writeSplit(QDataStream& s, const MyMoneySplit& t); + const QValueList<MyMoneySplit> readSplits(QDataStream& s); + const MyMoneySplit readSplit(QDataStream& s); + diff --git a/app-office/kmymoney2/kmymoney2-0.8.8.ebuild b/app-office/kmymoney2/kmymoney2-0.8.8.ebuild index 07fbdee7..e2fcf9e1 100644 --- a/app-office/kmymoney2/kmymoney2-0.8.8.ebuild +++ b/app-office/kmymoney2/kmymoney2-0.8.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.8.ebuild,v 1.7 2008/12/09 18:38:03 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.8.ebuild,v 1.8 2009/09/07 12:21:05 scarabeus Exp $ inherit kde @@ -28,7 +28,10 @@ need-kde 3.5 # TODO: support maketest # (needs cppunit in DEPEND) -PATCHES=( "${FILESDIR}/kmymoney2.desktop.diff" ) +PATCHES=( + "${FILESDIR}/kmymoney2.desktop.diff" + "${FILESDIR}/${PV}-gcc4.3.patch" +) pkg_setup() { if use hbci && ! built_with_use net-libs/aqbanking kde; then diff --git a/app-office/kmymoney2/kmymoney2-0.8.9.ebuild b/app-office/kmymoney2/kmymoney2-0.8.9.ebuild deleted file mode 100644 index 9f3397e8..00000000 --- a/app-office/kmymoney2/kmymoney2-0.8.9.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.9.ebuild,v 1.1 2008/09/17 22:58:15 deathwing00 Exp $ - -inherit kde - -DESCRIPTION="Personal Finances Manager for KDE." -HOMEPAGE="http://kmymoney2.sourceforge.net" -SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="crypt ofx hbci" - -DEPEND="dev-libs/libxml2 - hbci? ( >=net-libs/aqbanking-1.8.0_beta ) - ofx? ( >=dev-libs/libofx-0.7 )" - -RDEPEND="${DEPEND} - crypt? ( app-crypt/gnupg )" - -#DEPEND="${DEPEND} -# dev-util/cppunit" - -need-kde 3.5 - -# TODO: support maketest -# (needs cppunit in DEPEND) - -pkg_setup() { - if use hbci && ! built_with_use net-libs/aqbanking kde; then - eerror "The HBCI plugin is shipped by net-libs/aqbanking," - eerror "which has to be built with KDE support." - die "rebuild net-libs/aqbanking with USE=kde" - fi -} - -src_compile() { - local myconf="$(use_enable ofx ofxplugin) - $(use_enable hbci kbanking) - --disable-cppunit" - - # bug 132665 - replace-flags "-Os" "-O2" - - kde_src_compile -} - -src_install() { - kde_src_install - # bug 139082 - rm "${D}"/usr/bin/kmymoney -} diff --git a/app-office/kmymoney2/kmymoney2-1.0.0.ebuild b/app-office/kmymoney2/kmymoney2-1.0.0.ebuild deleted file mode 100644 index 797ed83a..00000000 --- a/app-office/kmymoney2/kmymoney2-1.0.0.ebuild +++ /dev/null @@ -1,54 +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/kmymoney2/kmymoney2-1.0.0.ebuild,v 1.1 2009/08/19 16:10:48 tgurr Exp $ - -EAPI="2" -inherit kde - -DESCRIPTION="Personal Finances Manager for KDE." -HOMEPAGE="http://kmymoney2.sourceforge.net" -SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="crypt ofx qtdesigner sqlite3 test" - -COMMON_DEPEND="dev-libs/libxml2 - ofx? ( >=dev-libs/libofx-0.8.2 - || ( dev-cpp/libxmlpp:2.6 >=dev-cpp/libxmlpp-1.0.1:0 ) - >=net-misc/curl-7.9.7 - app-text/opensp ) - sqlite3? ( =dev-db/sqlite-3* )" - -DEPEND="${COMMON_DEPEND} - >=dev-util/pkgconfig-0.9.0 - test? ( >=dev-util/cppunit-1.8.0 )" - -RDEPEND="${COMMON_DEPEND} - crypt? ( app-crypt/gnupg )" - -need-kde 3.5 - -src_configure() { - local myconf - myconf="${myconf} \ - $(use_enable ofx ofxplugin) - $(use_enable ofx ofxbanking) - $(use_enable qtdesigner) - $(use_enable sqlite3) - $(use_enable test cppunit)" - - kde_src_configure -} - -src_test() { - # Parallel make check is broken - make -j1 check || die "Make check failed!" -} - -pkg_postinst() { - echo - elog "If you want HBCI support in ${P}, please install app-office/kmm_kbanking separately." - echo -} diff --git a/app-office/kmymoney2/kmymoney2-0.9.3.ebuild b/app-office/kmymoney2/kmymoney2-1.0.2.ebuild index 9af8c111..47d18c7a 100644 --- a/app-office/kmymoney2/kmymoney2-0.9.3.ebuild +++ b/app-office/kmymoney2/kmymoney2-1.0.2.ebuild @@ -1,50 +1,51 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.9.3.ebuild,v 1.1 2009/05/28 23:55:02 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-1.0.2.ebuild,v 1.3 2009/11/10 02:14:15 fauli Exp $ -EAPI="2" +EAPI=2 +ARTS_REQUIRED=never inherit kde DESCRIPTION="Personal Finances Manager for KDE." HOMEPAGE="http://kmymoney2.sourceforge.net" SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="crypt ofx qtdesigner sqlite3 test" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86" +IUSE="crypt ofx qtdesigner sqlite test" COMMON_DEPEND="dev-libs/libxml2 ofx? ( >=dev-libs/libofx-0.8.2 || ( dev-cpp/libxmlpp:2.6 >=dev-cpp/libxmlpp-1.0.1:0 ) >=net-misc/curl-7.9.7 app-text/opensp ) - sqlite3? ( =dev-db/sqlite-3* )" + sqlite? ( =dev-db/sqlite-3* )" DEPEND="${COMMON_DEPEND} >=dev-util/pkgconfig-0.9.0 test? ( >=dev-util/cppunit-1.8.0 )" RDEPEND="${COMMON_DEPEND} - crypt? ( app-crypt/gnupg )" + crypt? ( + app-crypt/gnupg + app-crypt/pinentry + )" need-kde 3.5 src_configure() { - local myconf - myconf="${myconf} \ - $(use_enable ofx ofxplugin) + local myconf="$(use_enable ofx ofxplugin) $(use_enable ofx ofxbanking) $(use_enable qtdesigner) - $(use_enable sqlite3) + $(use_enable sqlite sqlite3) $(use_enable test cppunit)" kde_src_configure } src_test() { - # Parallel make check is broken - make -j1 check || die "Make check failed!" + emake -j1 check || die } pkg_postinst() { diff --git a/app-office/koffice-data/ChangeLog b/app-office/koffice-data/ChangeLog index 0d672c78..e776a271 100644 --- a/app-office/koffice-data/ChangeLog +++ b/app-office/koffice-data/ChangeLog @@ -1,6 +1,13 @@ # 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.89 2009/08/12 10:13:37 scarabeus 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: + Marking koffice-data-1.6.3_p20090204 ppc64 stable for bug 276008 12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -koffice-data-2.0.0.ebuild, -koffice-data-2.0.1.ebuild: diff --git a/app-office/koffice-data/Manifest b/app-office/koffice-data/Manifest index dafdd521..7bd2663e 100644 --- a/app-office/koffice-data/Manifest +++ b/app-office/koffice-data/Manifest @@ -1,6 +1,4 @@ -DIST koffice-1.6.3.tar.bz2 56829391 RMD160 e474ba48fa983fafb61ad58fb79cddda69ec6908 SHA1 de84214dec913eac1d47dab04dd93f3d81729fd3 SHA256 c3975f0a59f50aaa5547f1709b6fad54f746fd06815859b374676b426dce12cb DIST koffice-1.6.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a336940cd7f3f9cd SHA1 94c15023abd58d7405876d3d62088dfd82f0b042 SHA256 0baa7537a705e068449f13b2b69aa75de8eb5a3664e52234a11af555f019f466 -EBUILD koffice-data-1.6.3.ebuild 574 RMD160 8ead9bc7e12e630678f5eb6e86a04f21b937401b SHA1 8d52342d7b4d266ffb456ab7a5988a2aa6896401 SHA256 883b1becd8fea276bbfd31aff7ffbe69534ab2ba66d835ccab56ac0996e4e488 -EBUILD koffice-data-1.6.3_p20090204.ebuild 585 RMD160 cc9d6db90b36087a761d046ac5d227ce35b951a2 SHA1 8fcc277880dbacae8be4267d9fafdb869f49404c SHA256 89c86b20e814ed83ffdfc8c065da1983e27ca12a42ceb69bbe5ed7123c30cda7 -MISC ChangeLog 10900 RMD160 f4236bc7368ca15d0c2ccac50cee482a95bc2262 SHA1 0dbbd7df5e404facbaf0fbf4eca6cd39d2c0a286 SHA256 f548fb033627025733a4b9eacc31384ec331472ab5f012282d10bfb3eae53945 +EBUILD koffice-data-1.6.3_p20090204.ebuild 583 RMD160 4fe92495da2b514eac82aed314ff98546bea0651 SHA1 b13a7e35d54f181c61f30517166a5b3fa7b34818 SHA256 4a9f30d8b195bb92348a448ff3ed4099b0781e49626f87e4b984f3741e4630c9 +MISC ChangeLog 11146 RMD160 ba7ebe62295f74d3e2ff0b5b067697bc1fc426d6 SHA1 8f694d33e5404f6b8444431841951a78c9832f68 SHA256 ce76fb32a67c4cdb42fafb022fec5f13a3d8909d3956e9bd6101efb7b8c1a566 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 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 afacf62d..00000000 --- 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-data/koffice-data-1.6.3_p20090204.ebuild b/app-office/koffice-data/koffice-data-1.6.3_p20090204.ebuild index 95c45072..6d3e59ca 100644 --- a/app-office/koffice-data/koffice-data-1.6.3_p20090204.ebuild +++ b/app-office/koffice-data/koffice-data-1.6.3_p20090204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.6.3_p20090204.ebuild,v 1.7 2009/07/23 14:01:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.6.3_p20090204.ebuild,v 1.8 2009/09/27 12:32:27 ranger Exp $ ARTS_REQUIRED="never" @@ -13,7 +13,7 @@ HOMEPAGE="http://www.koffice.org/" LICENSE="GPL-2 LGPL-2" SLOT="3.5" -KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" KMEXTRA=" diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog index d0b997ae..4c09edb1 100644 --- a/app-office/koffice-libs/ChangeLog +++ b/app-office/koffice-libs/ChangeLog @@ -1,6 +1,13 @@ # 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.97 2009/08/12 10:11:33 scarabeus 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: + Marking koffice-libs-1.6.3_p20090204 ppc64 stable for bug 276008 12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -koffice-libs-2.0.0.ebuild, -koffice-libs-2.0.1.ebuild: diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest index 67de96eb..269a3815 100644 --- a/app-office/koffice-libs/Manifest +++ b/app-office/koffice-libs/Manifest @@ -1,4 +1,4 @@ DIST koffice-1.6.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a336940cd7f3f9cd SHA1 94c15023abd58d7405876d3d62088dfd82f0b042 SHA256 0baa7537a705e068449f13b2b69aa75de8eb5a3664e52234a11af555f019f466 -EBUILD koffice-libs-1.6.3_p20090204.ebuild 1635 RMD160 b220f8ce222297c196288a30f714200cfb7b58fa SHA1 8f0969dd4da3986de56580f2ef180edde5f0fcf3 SHA256 79dc0747238c3101ab60760b3fd9ec9ec6f4c7f40fad1843c3b20763de163668 -MISC ChangeLog 12189 RMD160 feea7a59b2141e5d12a0b08e2e2d9053c4999052 SHA1 6bda9f476999d1ecb002ab864293aab968d970b9 SHA256 0b19a1e72a3fcf04bf958384fd30085015e66a3b7130b3d1efb06bd5bad6f9f7 +EBUILD koffice-libs-1.6.3_p20090204.ebuild 1633 RMD160 c3650575e3a98ecff76b32043ffbba203e49700e SHA1 aec281194663ba39c937b6c485c925fa821e65ed SHA256 bdad5cd3b66cde30a80d04fbbf247cd2154be9d58cc06054244e34f2b472794f +MISC ChangeLog 12435 RMD160 c3dfbd6f350c37dccba76662534c353cfea8ceb1 SHA1 76662035659cd268e2047696b5fb3ed59a8982c4 SHA256 b106f1e7a5356a7f6e848216b8beecea4feef51e28761d5e28dd948c644d34e8 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 diff --git a/app-office/koffice-libs/koffice-libs-1.6.3_p20090204.ebuild b/app-office/koffice-libs/koffice-libs-1.6.3_p20090204.ebuild index a8b5e7c6..6f4493b5 100644 --- a/app-office/koffice-libs/koffice-libs-1.6.3_p20090204.ebuild +++ b/app-office/koffice-libs/koffice-libs-1.6.3_p20090204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.6.3_p20090204.ebuild,v 1.7 2009/07/23 14:02:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.6.3_p20090204.ebuild,v 1.8 2009/09/27 12:33:06 ranger Exp $ ARTS_REQUIRED="never" @@ -13,7 +13,7 @@ HOMEPAGE="http://www.koffice.org/" LICENSE="GPL-2 LGPL-2" SLOT="3.5" -KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="doc" RDEPEND="~app-office/koffice-data-1.6.3_p20090204 diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest index 8872b395..c9c889be 100644 --- a/app-office/koffice/Manifest +++ b/app-office/koffice/Manifest @@ -1,18 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX koffice-1.6.3-gcc43.patch 7295 RMD160 ca71ff7040b730430e9204f7ea0444ce12871bd4 SHA1 d52967622a661a842e6654250bc9956bf29c217f SHA256 28ea09e20e21c358294ecacec473d21178f023bfb9b360711835b114f6f61a18 AUX koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 15961 RMD160 ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 SHA1 a3d1d85567ccf729a2237f4aa837f7e025ce00ae SHA256 ed9b3ee5b1590aae930dc2829b9a463fac9cee5ab3e412423a4991109f507942 -AUX koffice-xpdf-CVE-2007-0104.diff 3185 RMD160 1ea990a06dfdc709362a6cb0fbb69851da86a3d6 SHA1 bef37ffafbae9a509363f7bc63806ab7162576b9 SHA256 36585b64bc23c9e352c0ff4edff9788add81381049dff5ae1d9de708f9696bfe AUX koffice-xpdf-CVE-2007-3387.diff 601 RMD160 7f620ec00ca05da91596f2d750d32ed8aa8bec95 SHA1 bff4f540389a77320bc87e2dedece50b82932e59 SHA256 8f4df5133452dba1469ec605393503d2b233d7aaccbbee0e5e42b79c24be9062 DIST koffice-1.6.3.tar.bz2 56829391 RMD160 e474ba48fa983fafb61ad58fb79cddda69ec6908 SHA1 de84214dec913eac1d47dab04dd93f3d81729fd3 SHA256 c3975f0a59f50aaa5547f1709b6fad54f746fd06815859b374676b426dce12cb EBUILD koffice-1.6.3-r2.ebuild 3840 RMD160 40666fa7501de4c2fb365fcc2c3fbdc3dd449242 SHA1 bd974b2eac9d2ee7af41aebc0e22841c4986f1fc SHA256 dd20299f5fe3325c456cee054e475065562b118b11213f3c2c83124c06bc88d1 MISC ChangeLog 33940 RMD160 fc89648306dcc610900e84692bf00aaf2613ba80 SHA1 e38c6a09d949a251ba1d1f909a97946341bd0f92 SHA256 f78140b7b8ab09c54b95c9089b3c75c4d963830e3edd53c4a98b18927f9d1caa MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkpLUXUACgkQjDdoMVfcAHh6zQCfa2khNfsJtGYJeWU4zrOVOZVG -Jw4AoM50+Y0hIArxtbt44a6EjbQWYZIO -=WFI1 ------END PGP SIGNATURE----- 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 index f5e51a1c..00000000 --- a/app-office/koffice/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/kplato/ChangeLog b/app-office/kplato/ChangeLog index bf56c39d..d1eab4bf 100644 --- a/app-office/kplato/ChangeLog +++ b/app-office/kplato/ChangeLog @@ -1,6 +1,13 @@ # 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.64 2009/08/12 10:15:42 scarabeus 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: + Marking kplato-1.6.3_p20090204 ppc64 stable for bug 276008 12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kplato-2.0.0.ebuild, -kplato-2.0.1.ebuild: diff --git a/app-office/kplato/Manifest b/app-office/kplato/Manifest index 5a773566..a4afb288 100644 --- a/app-office/kplato/Manifest +++ b/app-office/kplato/Manifest @@ -1,4 +1,4 @@ DIST koffice-1.6.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a336940cd7f3f9cd SHA1 94c15023abd58d7405876d3d62088dfd82f0b042 SHA256 0baa7537a705e068449f13b2b69aa75de8eb5a3664e52234a11af555f019f466 -EBUILD kplato-1.6.3_p20090204.ebuild 870 RMD160 b24077f41b3cb198d1414f4e3448f00ecbfee5bd SHA1 9c14195baf14843bb5ec5ec898b3f39fc2a3909c SHA256 2537457432b5d35d785c1e64f5901aad144b53702135fb654d99e8a284d7834b -MISC ChangeLog 7381 RMD160 b6e0b95d119be1ab2cb1a35e39b75f6d8858897e SHA1 f461b666432f6e6913936c9343707a073fce8c6f SHA256 3f610ee04172c39a76a9d4c720aa4b4054d1d3c908dfb6f792bfc18a377bdfae +EBUILD kplato-1.6.3_p20090204.ebuild 868 RMD160 53707579bdc7eadc3467e3f6319032876c949097 SHA1 d8ca9b5cb540e6162d0d4b78434bf1ef4eeaaff6 SHA256 59c4ed5b30baa7b75046d675d431694e01561e8e4da3e01ea306fd42b51eafce +MISC ChangeLog 7609 RMD160 f35f1aa15af21e4258e3e342de8f3d5dabaf151a SHA1 273ec9a235702232c6bb3acf2a56ab270b4f289c SHA256 fbe2af788bc4a43aac7c7f2db1521bade056ed3fdd17736e2f5a0d32c08dad3e MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 diff --git a/app-office/kplato/kplato-1.6.3_p20090204.ebuild b/app-office/kplato/kplato-1.6.3_p20090204.ebuild index 2e01d1b9..2c8d2f7b 100644 --- a/app-office/kplato/kplato-1.6.3_p20090204.ebuild +++ b/app-office/kplato/kplato-1.6.3_p20090204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/kplato-1.6.3_p20090204.ebuild,v 1.7 2009/07/23 14:08:10 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/kplato-1.6.3_p20090204.ebuild,v 1.8 2009/09/27 12:34:15 ranger Exp $ ARTS_REQUIRED="never" @@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/" LICENSE="GPL-2 LGPL-2" SLOT="3.5" -KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" DEPEND="~app-office/koffice-libs-1.6.3_p20090204" diff --git a/app-office/kpresenter/ChangeLog b/app-office/kpresenter/ChangeLog index a5c9a6a9..6ebd09ac 100644 --- a/app-office/kpresenter/ChangeLog +++ b/app-office/kpresenter/ChangeLog @@ -1,6 +1,13 @@ # 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.87 2009/08/12 10:15:14 scarabeus 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: + Marking kpresenter-1.6.3_p20090204 ppc64 stable for bug 276008 12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kpresenter-2.0.0.ebuild, -kpresenter-2.0.1.ebuild: diff --git a/app-office/kpresenter/Manifest b/app-office/kpresenter/Manifest index d1c7e525..0da592b3 100644 --- a/app-office/kpresenter/Manifest +++ b/app-office/kpresenter/Manifest @@ -1,4 +1,4 @@ DIST koffice-1.6.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a336940cd7f3f9cd SHA1 94c15023abd58d7405876d3d62088dfd82f0b042 SHA256 0baa7537a705e068449f13b2b69aa75de8eb5a3664e52234a11af555f019f466 -EBUILD kpresenter-1.6.3_p20090204.ebuild 1187 RMD160 8b578e2824dbdb3c19481d70a355c222a57248f8 SHA1 212e0eb35195541dbef8118ef4efb0c9bae7c7df SHA256 853b3e989ff721de23ccc4bd8d609ac7143d2feea6c8dad769115bd84722efd8 -MISC ChangeLog 10378 RMD160 8a084f1c278b29004fb127644309cf874859cd78 SHA1 9982ac39e24ceb0e5d54d3de7c616c586475c50c SHA256 8be3ceb3b0727a5ea7fbb240595e3c3cc3341ca611ea2ec7348d0772ed9efee4 +EBUILD kpresenter-1.6.3_p20090204.ebuild 1185 RMD160 513a426568e52e0fd820f6cde0c1acde4e805430 SHA1 184e951356d9380d2670b2d5a35823d689066bd3 SHA256 33f15953ee03015ad51e44520a938d0ce1f019d495a64dd7ab99803dafec88cc +MISC ChangeLog 10618 RMD160 432bffcf5981f4dca707f46cc25b1210aeaf7df0 SHA1 af015fc986b490b9422cefa2743a8e25bd91cbdc SHA256 0444889cf4966d3db35675dec1914dbd24c0d41a17bdc6a1f1263efc7a6791d6 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 diff --git a/app-office/kpresenter/kpresenter-1.6.3_p20090204.ebuild b/app-office/kpresenter/kpresenter-1.6.3_p20090204.ebuild index 3719cf43..75941ffe 100644 --- a/app-office/kpresenter/kpresenter-1.6.3_p20090204.ebuild +++ b/app-office/kpresenter/kpresenter-1.6.3_p20090204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.6.3_p20090204.ebuild,v 1.8 2009/07/23 14:09:06 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.6.3_p20090204.ebuild,v 1.9 2009/09/27 12:34:51 ranger Exp $ ARTS_REQUIRED="never" @@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/" LICENSE="GPL-2 LGPL-2" SLOT="3.5" -KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" DEPEND="~app-office/koffice-libs-1.6.3_p20090204" diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog index 47060250..94c00283 100644 --- a/app-office/krita/ChangeLog +++ b/app-office/krita/ChangeLog @@ -1,6 +1,13 @@ # 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.98 2009/08/12 10:14:48 scarabeus 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 12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -krita-2.0.0.ebuild, -krita-2.0.1.ebuild: diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest index b5d9f97a..eab50b59 100644 --- a/app-office/krita/Manifest +++ b/app-office/krita/Manifest @@ -1,5 +1,4 @@ -AUX krita-1.6.3+gcc-4.3.patch 3030 RMD160 58dcaafdd42ff369173dbbca726653923670833a SHA1 3c0c7a13b1bcb25b41d264422ced3c6f87503d56 SHA256 99d9175f0834aa2e6428430e0ec3617796c7c1eda195a29367c3b0816c3c62f2 DIST koffice-1.6.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a336940cd7f3f9cd SHA1 94c15023abd58d7405876d3d62088dfd82f0b042 SHA256 0baa7537a705e068449f13b2b69aa75de8eb5a3664e52234a11af555f019f466 -EBUILD krita-1.6.3_p20090204.ebuild 1710 RMD160 b4aefba67c5c717591393536221061332a9a3b55 SHA1 7729f98998a67b9320b994eb0b9010096557e65a SHA256 ba9cd9d3616b722916aa3f0c6254f999ce036b13951d763dece63068446c2871 -MISC ChangeLog 11778 RMD160 94c5944a43fcd18b849d7fb01c811d82179743a2 SHA1 455f2a089d3f333dad4f0d8737ac8b6a066bdc41 SHA256 9fbcf10251f3b535349587310870e05a6fa8f4280e679f661c35d7ff5a913082 +EBUILD krita-1.6.3_p20090204.ebuild 1709 RMD160 e3d38c0ba00d254a731c2eb989766adf11cba568 SHA1 95ba4fb4f97575f8411227e0d4fb3f9550a74851 SHA256 869af5290dbcda6fd45736cba994a9aa8ff2b19d161bfca639b606e3aff36a90 +MISC ChangeLog 12038 RMD160 461213044169e2ff992d2c04988adcb7900c968c SHA1 bf204782b42898fba8766837c68f8409fe4741e7 SHA256 c6d1fcc1c5301796f17516696a3d70c827df941314f5dba00b4cf5a933f6f7d3 MISC metadata.xml 318 RMD160 2341b49b24f95cc26f19933f8a785c5550970e3f SHA1 7264bf7bba1b5e206e47b8e85b783d3f5292ecc9 SHA256 41a628ecdd9b2fcd3405c2a146b1780eb75d282b956da88120963e441a1135d4 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 916354f3..00000000 --- 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_p20090204.ebuild b/app-office/krita/krita-1.6.3_p20090204.ebuild index a0ce720a..8c9f35ff 100644 --- a/app-office/krita/krita-1.6.3_p20090204.ebuild +++ b/app-office/krita/krita-1.6.3_p20090204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6.3_p20090204.ebuild,v 1.9 2009/07/23 14:09:57 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6.3_p20090204.ebuild,v 1.10 2009/09/27 12:35:29 ranger Exp $ ARTS_REQUIRED="never" @@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/" LICENSE="GPL-2 LGPL-2" SLOT="3.5" -KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" DEPEND="~app-office/koffice-libs-1.6.3_p20090204 diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog index eeba88a6..a2f1104d 100644 --- a/app-office/kspread/ChangeLog +++ b/app-office/kspread/ChangeLog @@ -1,6 +1,14 @@ # 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.103 2009/08/12 10:12:01 scarabeus 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: + Marking kspread-1.6.3_p20090204 ppc64 stable for bug 276008 12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kspread-2.0.0.ebuild, -kspread-2.0.1.ebuild: diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest index 8696812d..250d92fe 100644 --- a/app-office/kspread/Manifest +++ b/app-office/kspread/Manifest @@ -1,7 +1,5 @@ AUX kspread-1.6.3-gcc44.patch 344 RMD160 3853b8ef510cafb7acadd907dbaaa4b01fdd599b SHA1 a39d23a4c85e15fdee8dc3ef86aa84db0ab61b9c SHA256 9d86dfb5402fe99d8bb34ab560bc18720276671c5b038cad5384d8a14bd251c4 -AUX kspread-1.6.3-validate-desktop.diff 644 RMD160 78d1d7b51d0b7f94d733d969d8e6df35c7bf3be8 SHA1 9a701530409109358d1f99db0a760f61e4940307 SHA256 d12d9722cbe8cda1fbf9ff76b857c5fc75307728670c404a085ab93227860737 -AUX kspread-gcc43.patch 1845 RMD160 86e2307aeb68287ab86701b3e3df5669f9101df7 SHA1 0f2e1bf3e8fc73b22fd1f9e8d8c84e532107a6d0 SHA256 baf156ff701c8f7b7e68d8f6b74658f1fce28003bc768a7807d848a6704e71b5 DIST koffice-1.6.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a336940cd7f3f9cd SHA1 94c15023abd58d7405876d3d62088dfd82f0b042 SHA256 0baa7537a705e068449f13b2b69aa75de8eb5a3664e52234a11af555f019f466 -EBUILD kspread-1.6.3_p20090204.ebuild 1595 RMD160 540e26a95941d6dafd3c2135fc8f77141b9181df SHA1 5016583dc2e06365ce282c1502aeb01104cb4f81 SHA256 5714b5494dab51e557d61ee0992fde40c7b3e5ad1b2d187e046dbca8e6e4280c -MISC ChangeLog 12147 RMD160 19d5157a435f5e268fad6b4e1023e037eb28a683 SHA1 07a8ac6dd321fdd25bab3fb51434c7fdfb18f71a SHA256 2e5a7127d92a6c8a9d888ea4c889b2b5d2c3648e576f547da56374c5e45c0de1 +EBUILD kspread-1.6.3_p20090204.ebuild 1593 RMD160 6fbd0e8df101d4d858154cc89813a5a66f29498b SHA1 4d350eae581796297122ed46cabf60c060e48c44 SHA256 3278badeb22341be55c714c82bb92fda7010caa2c592190e80697594377f8fc8 +MISC ChangeLog 12452 RMD160 bc8a06f6709844a2560cbbd24b38f2b5a661e6cb SHA1 2a70c606d13197d87943286e2585a0382108c836 SHA256 79bc54c1725d854e6ed7a722000053567dfef65d062b0a9a608d89afa877426f MISC metadata.xml 251 RMD160 3c3b2fcd341b05560e1dbee57312b4ea2b58743c SHA1 9311ba89b57f0be473ac87fdfe02a199dda49297 SHA256 27d3543025845d9e297f029fb35c2c090003943d6f27ee7e3a734e2fc7ff07c4 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 8b361026..00000000 --- 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 9ac8a6f6..00000000 --- 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_p20090204.ebuild b/app-office/kspread/kspread-1.6.3_p20090204.ebuild index b6cb9a44..79088a2b 100644 --- a/app-office/kspread/kspread-1.6.3_p20090204.ebuild +++ b/app-office/kspread/kspread-1.6.3_p20090204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.3_p20090204.ebuild,v 1.8 2009/07/23 14:10:47 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6.3_p20090204.ebuild,v 1.9 2009/09/27 12:36:06 ranger Exp $ ARTS_REQUIRED="never" @@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/" LICENSE="GPL-2 LGPL-2" SLOT="3.5" -KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" DEPEND="~app-office/koffice-libs-1.6.3_p20090204 diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog index ce4e846a..8b9f24b2 100644 --- a/app-office/kword/ChangeLog +++ b/app-office/kword/ChangeLog @@ -1,6 +1,18 @@ # 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.131 2009/08/12 10:13:05 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. + + 27 Sep 2009; Brent Baude <ranger@gentoo.org> kword-1.6.3_p20090204.ebuild: + Marking kword-1.6.3_p20090204 ppc64 stable for bug 276008 12 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kword-2.0.0.ebuild, -kword-2.0.1.ebuild: diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest index 808500b9..d8ea2e9f 100644 --- a/app-office/kword/Manifest +++ b/app-office/kword/Manifest @@ -1,9 +1,5 @@ -AUX koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 15961 RMD160 ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 SHA1 a3d1d85567ccf729a2237f4aa837f7e025ce00ae SHA256 ed9b3ee5b1590aae930dc2829b9a463fac9cee5ab3e412423a4991109f507942 -AUX koffice-xpdf-CVE-2007-0104.diff 3185 RMD160 1ea990a06dfdc709362a6cb0fbb69851da86a3d6 SHA1 bef37ffafbae9a509363f7bc63806ab7162576b9 SHA256 36585b64bc23c9e352c0ff4edff9788add81381049dff5ae1d9de708f9696bfe -AUX koffice-xpdf-CVE-2007-3387.diff 601 RMD160 7f620ec00ca05da91596f2d750d32ed8aa8bec95 SHA1 bff4f540389a77320bc87e2dedece50b82932e59 SHA256 8f4df5133452dba1469ec605393503d2b233d7aaccbbee0e5e42b79c24be9062 AUX kword-1.6.3-gcc44.patch 1281 RMD160 79639290e96e1591627918a25f64b566ce547c80 SHA1 a9f32253e9b0bc78d96d8a1286972576d776cd2f SHA256 47b5e3e6df0794ae89cd1e0f7333e3a591e540f5dd48aba2064cc95967f743cb -AUX kword-gcc43.patch 889 RMD160 e532b436acd9395eb9b58027d24420269d6d6a86 SHA1 0976929632092684cdee838d68f780dbb3d8614d SHA256 711283969b08992c7d04a3aa19ba11ceff721a9524302fe787a8e3d808c193b7 DIST koffice-1.6.3_p20090204.tar.bz2 105139802 RMD160 c9207791de8df4c32a19e1d6a336940cd7f3f9cd SHA1 94c15023abd58d7405876d3d62088dfd82f0b042 SHA256 0baa7537a705e068449f13b2b69aa75de8eb5a3664e52234a11af555f019f466 -EBUILD kword-1.6.3_p20090204.ebuild 1323 RMD160 b1d8e7b4d3ac3c31708d8b714865c4e15e6df96a SHA1 7556a1bd8c8e716e570d9d8d226f7c8a34b7d90b SHA256 fb36d54ea8d24d22e76038c7ce066e6111e376829366ffc90f63226d459e8098 -MISC ChangeLog 16183 RMD160 a05656c3e8a10399584715b1619cb51996697905 SHA1 4e3dafc08e2fffb5513b6c3573f5da725cb5e07b SHA256 30be613ddf2cb324b2f8db5bb17c9795e74a22e49b6ed0f582033c45a7e45a70 +EBUILD kword-1.6.3_p20090204.ebuild 1321 RMD160 8b7441c4f3d4bc51e37ffe0949d8f1902d4b31ba SHA1 bfcff3dbee1a4f51f1dbf7ed76a3f96524699845 SHA256 84c127a0a5ab7143c2bb7911dbb1e7db755609ade8f6402ad72fe0c592521280 +MISC ChangeLog 16686 RMD160 c68e854d8d988c5e3321f43663fc1273b7de7c08 SHA1 43ccc12edb0d5dddf7d0df83eb430ac8adb1b825 SHA256 113ce4b386e7023b13eda5e8abf39b3ef7b6e7f54ffe7614162aaac6d0a418f0 MISC metadata.xml 283 RMD160 fbaac5a3e6372bbdfbd1c8e2f21667b24177083a SHA1 234fa1319e29712e6ac237921eeaae0a591d0602 SHA256 40523c9d7d6ebd6453db54f4912636eaa7b089efdeb7c4f2ee8cbf0abebeb57e 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 dabcf23d..00000000 --- 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 f5e51a1c..00000000 --- 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 ded0e072..00000000 --- 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 7da230f4..00000000 --- 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_p20090204.ebuild b/app-office/kword/kword-1.6.3_p20090204.ebuild index 190ec237..dbec75f3 100644 --- a/app-office/kword/kword-1.6.3_p20090204.ebuild +++ b/app-office/kword/kword-1.6.3_p20090204.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3_p20090204.ebuild,v 1.10 2009/07/23 14:12:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6.3_p20090204.ebuild,v 1.11 2009/09/27 12:37:20 ranger Exp $ ARTS_REQUIRED="never" @@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/" LICENSE="GPL-2 LGPL-2" SLOT="3.5" -KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" DEPEND="~app-office/koffice-libs-1.6.3_p20090204 diff --git a/app-office/qbankmanager/ChangeLog b/app-office/qbankmanager/ChangeLog index 1d1ba4c7..6a71b5d4 100644 --- a/app-office/qbankmanager/ChangeLog +++ b/app-office/qbankmanager/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for app-office/qbankmanager # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/ChangeLog,v 1.36 2009/08/02 15:25:35 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/ChangeLog,v 1.39 2009/10/22 16:31:45 armin76 Exp $ + + 22 Oct 2009; Raúl Porcel <armin76@gentoo.org> + qbankmanager-0.9.51_beta.ebuild: + sparc stable wrt #275705 + + 27 Sep 2009; nixnut <nixnut@gentoo.org> qbankmanager-0.9.51_beta.ebuild: + ppc stable #275705 + +*qbankmanager-0.9.52_beta (14 Sep 2009) + + 14 Sep 2009; Hanno Boeck <hanno@gentoo.org> + +qbankmanager-0.9.52_beta.ebuild: + Version bump. 02 Aug 2009; Markus Meier <maekke@gentoo.org> qbankmanager-0.9.51_beta.ebuild: diff --git a/app-office/qbankmanager/Manifest b/app-office/qbankmanager/Manifest index a9faaba2..298ae757 100644 --- a/app-office/qbankmanager/Manifest +++ b/app-office/qbankmanager/Manifest @@ -1,19 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX qbankmanager-gcc-4.3.patch 2686 RMD160 1a9489b8114c969eb0a9d8137eb1d36b53bb21a4 SHA1 ac41a0e3d5fc70c92695f076bf5e0d6eafc65744 SHA256 df129a55408c67f18151971de9a8a01063e5d989a4959d5402dc4c6f22b997ff DIST qbankmanager-0.9.39.tar.gz 662532 RMD160 00addbe5f69d55c6ffbc4193dd10e2b83b04eca3 SHA1 418e2675699b0c0c0a633806e06029311ec29195 SHA256 4b66d0afe93fa747b1f40ea82c2238da90501096aa1eac12abd9caab2f46769a DIST qbankmanager-0.9.50.tar.gz 680083 RMD160 f0cd961be9630bad93b6cc9f159225948dee749d SHA1 8a5adca6e4e9cf2a32df0e5b01061618c46d34fa SHA256 0a25d04a83076463cb9b44a2afe8e515e313a003c014d52aeffbfbd65366dff5 DIST qbankmanager-0.9.51_beta.tar.gz 719464 RMD160 bbcab938a84daf7711567e2ecb97926f37bee5ee SHA1 5ab82ebcaff71ca72c71ac16e6f2693dfb59c0b9 SHA256 8e46c411a22edffbae89c9eace6a02e6cb90605a880f9fcf89cb8d17340b4bcf EBUILD qbankmanager-0.9.39.ebuild 1067 RMD160 255e5aeb363fec9fd4e9e7a537848f43aafda394 SHA1 c89b3d1508e404dde83be41cf7e2b9e114060a5d SHA256 4e0c95d91589cf626552429ef814230a9f4008c975ec274ead8450cac289566e EBUILD qbankmanager-0.9.50.ebuild 978 RMD160 f7ba645851784fcc83e3bfe74f7020d4d93a5f07 SHA1 4d50f0c20ff3dc43ff76542506981612f8b73c7f SHA256 e291690cbf705a8c575c648226537a1ef16532879d38085503aea7cf933b2f35 -EBUILD qbankmanager-0.9.51_beta.ebuild 863 RMD160 971fd9f980d946146393ab311e075f8e07caf088 SHA1 d0cb117ff6245e6deb967dea4cc548b8ea8632f9 SHA256 4771a8ce170fe729506afc7cfbf90239276390b766cea90fe65e26360c016e69 -MISC ChangeLog 4993 RMD160 9a5236ffb42076e2ee3492bc6561545619a9c7bb SHA1 c4de1ff390b02d723a565ade5f7ec111f93444a1 SHA256 461665e10ef25b9174af6b5f97478a0598232779c9e80e358180be14d85b4726 +EBUILD qbankmanager-0.9.51_beta.ebuild 862 RMD160 72fd38afb2cef42cd32d25c42aad3f03cb1acabc SHA1 c42160b97464db8f01ab0c03adc70c6a98815488 SHA256 463ed9f4000a73919a29c568f217462de6cfd86c98d2b78004354b7021abd933 +MISC ChangeLog 5343 RMD160 6bc596742059bf20bf601f86fa636cd748b34709 SHA1 8631bee0951ee82480af3ba37a337ea7742cbdac SHA256 6cd94715c20963da5be843f07535dc19594fb83c41e81581e532e4e61b25ff5f MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkp1sCIACgkQkKaRLQcq0GJRzwCghfZLmKc651TxHpoCFougp2B1 -PIwAnRWEo5/p9Jlzzn6Igm7TRuHNP3I2 -=/s9Q ------END PGP SIGNATURE----- diff --git a/app-office/qbankmanager/qbankmanager-0.9.51_beta.ebuild b/app-office/qbankmanager/qbankmanager-0.9.51_beta.ebuild index c54b0ead..ee3b33e1 100644 --- a/app-office/qbankmanager/qbankmanager-0.9.51_beta.ebuild +++ b/app-office/qbankmanager/qbankmanager-0.9.51_beta.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/qbankmanager-0.9.51_beta.ebuild,v 1.3 2009/08/02 15:25:35 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/qbankmanager-0.9.51_beta.ebuild,v 1.5 2009/10/22 16:31:45 armin76 Exp $ EAPI="2" @@ -12,7 +12,7 @@ SRC_URI="http://www2.aquamaniac.de/sites/download/download.php?package=04&releas LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="debug" DEPEND=">=net-libs/aqbanking-3.7.2[qt3] |