Point to the right location for the rtfimport patch.

Package-Manager: portage-2.0.51.22-r3

diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 98bec3285dd3718de1ff366169f5c23b4cb65d8f..fec35e5a7faafedbb316452d3f805422db610b41 100644 (file)
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 bc9bbb8d06a70699ed4109a80f3fbe6d koffice-1.4.1-r1.ebuild 1750
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 9242394dfa6049940585a4d3fa962907 koffice-1.3.5-r3.ebuild 1289
 MD5 c5f0dc4879c5d219c18c05d9ded72b43 ChangeLog 16246
-MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
-MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r2 68
-MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r3 68
+MD5 bdcb79a8db04904d6e6c7110e0ff3ec9 koffice-1.3.5-r2.ebuild 1211
+MD5 3ea93db9f2f2175af3c12a4533272623 koffice-1.4.2.ebuild 1542
+MD5 216a4ec901dca4c7e574aae8a09c40da koffice-1.4.1.ebuild 1538
 MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-koffice-1.4.1 68
 MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-koffice-1.4.1-r1 144
+MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2 68
 MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
-MD5 bdcb79a8db04904d6e6c7110e0ff3ec9 koffice-1.3.5-r2.ebuild 1211
-MD5 f5fe73dec35175fc63b793a3e874ef31 koffice-1.3.5-r3.ebuild 1220
-MD5 bc9bbb8d06a70699ed4109a80f3fbe6d koffice-1.4.1-r1.ebuild 1750
-MD5 216a4ec901dca4c7e574aae8a09c40da koffice-1.4.1.ebuild 1538
-MD5 3ea93db9f2f2175af3c12a4533272623 koffice-1.4.2.ebuild 1542
-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDS9QNntT9W3vfTuoRAk70AJ0dVwP53tH1Ik0v7RIWLCctFEDkGACbBlhs
-mT1/SQgGR+ZQRx/acu2CyVE=
-=jJtp
------END PGP SIGNATURE-----
+MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r2 68
+MD5 fcd72b8c0a0e8d1e8bbf6b76ed92c5cc files/digest-koffice-1.3.5-r3 144

diff --git a/app-office/koffice/files/digest-koffice-1.3.5-r3 b/app-office/koffice/files/digest-koffice-1.3.5-r3
index 4835c633815479a622fef51eb8219b1b30dcc0bd..5405ead6b8f941cd965b6dadd3925087ecc0c8d9 100644 (file)
--- a/app-office/koffice/files/digest-koffice-1.3.5-r3
+++ b/app-office/koffice/files/digest-koffice-1.3.5-r3
@@ -1 +1,2 @@
 MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
+MD5 71a1baa8244dbcc1bfc2bd3c3e3dd40f post-koffice-1.3.5-rtfimport.diff 8620

diff --git a/app-office/koffice/koffice-1.3.5-r3.ebuild b/app-office/koffice/koffice-1.3.5-r3.ebuild
index f72ecc4896663e5aa044309d6ff42de0458fc550..a7f83251d374df303ef8838f7749821b307fba4b 100644 (file)
--- a/app-office/koffice/koffice-1.3.5-r3.ebuild
+++ b/app-office/koffice/koffice-1.3.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.5-r3.ebuild,v 1.1 2005/10/11 14:49:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.5-r3.ebuild,v 1.2 2005/10/11 15:11:17 greg_g Exp $
 
 inherit kde kde-functions eutils
 
@@ -9,7 +9,8 @@ inherit kde kde-functions eutils
 
 DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
 HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
+SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2
+       mirror://kde/security_patches/post-koffice-1.3.5-rtfimport.diff"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
@@ -32,7 +33,7 @@ need-kde 3.1
 
 PATCHES="${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
        ${FILESDIR}/CAN-2005-0064.patch
-       ${FILESDIR}/koffice-1.4.1-rtfimport.patch"
+       ${DISTDIR}/post-koffice-1.3.5-rtfimport.diff"
 
 src_compile() {
        export LIBPYTHON="`python-config --libs`"

diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 4df0b15a3f24ff1cece6fa90d6ff48e4fccff7bf..b0d7e0bc987f4a993c1bdf4ede4757223f85aec6 100644 (file)
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,14 +1,14 @@
-MD5 18ae024a439fc6a208affee87245e886 kword-1.4.1.ebuild 1200
-MD5 79ba9d56baecc7f6fd0ef257b66b0b59 kword-1.3.5-r1.ebuild 1371
-MD5 5948a99247e2967f49cbd364cbe194d7 kword-1.3.5.ebuild 1378
-MD5 7ac4b5a82ac92f1fddd5f301f9cbb56a kword-1.4.1-r1.ebuild 1399
-MD5 b0ec82bcef4a5a7cd22fd1459db31970 ChangeLog 2199
-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-MD5 6262dd7918cc0eb294e391620c0707cc kword-1.4.2.ebuild 1202
+MD5 2646bbf1e7ffe55845e04223505ab763 ChangeLog 2306
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
-MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5 211
-MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kword-1.4.1 68
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2 68
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5-r1 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kword-1.4.1 68
 MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-kword-1.4.1-r1 144
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2 68
+MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
+MD5 79ba9d56baecc7f6fd0ef257b66b0b59 kword-1.3.5-r1.ebuild 1371
+MD5 5948a99247e2967f49cbd364cbe194d7 kword-1.3.5.ebuild 1378
+MD5 5c1f102e447bcc6d4931cf2c1d5b1818 kword-1.4.1-r1.ebuild 1398
+MD5 18ae024a439fc6a208affee87245e886 kword-1.4.1.ebuild 1200
+MD5 6262dd7918cc0eb294e391620c0707cc kword-1.4.2.ebuild 1202
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157