Point to the right location for the rtfimport patch.

Package-Manager: portage-2.0.51.22-r3

diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index c685fc881f864062d484b11d025d9c1bbe75fc6c..c8ec3784c67ae40cb316cf8f2ec6f9c9ca3cbd66 100644 (file)
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 18ae024a439fc6a208affee87245e886 kword-1.4.1.ebuild 1200
+MD5 113e6434c255e20ee8de241c0a1b53bd kword-1.3.5-r1.ebuild 1440
+MD5 5c1f102e447bcc6d4931cf2c1d5b1818 kword-1.4.1-r1.ebuild 1398
 MD5 2646bbf1e7ffe55845e04223505ab763 ChangeLog 2306
-MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
+MD5 6262dd7918cc0eb294e391620c0707cc kword-1.4.2.ebuild 1202
+MD5 5948a99247e2967f49cbd364cbe194d7 kword-1.3.5.ebuild 1378
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5 211
-MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5-r1 211
-MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kword-1.4.1 68
+MD5 4db1fd7ff582f6437830745f93412312 files/digest-kword-1.3.5-r1 287
+MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDS9aontT9W3vfTuoRAuC8AJ4s6GHYdnQrBkQDm7K6GCz2UVJG2QCcD3YQ
-ov0FmkmQv0ICwLXKXwBQxuw=
-=7APm
------END PGP SIGNATURE-----
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kword-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2 68

diff --git a/app-office/kword/files/digest-kword-1.3.5-r1 b/app-office/kword/files/digest-kword-1.3.5-r1
index 4dc2ef3e1dd34d8bdece239b5a21f97fb159b042..de0cb893c16874a527865b03d907be650202087f 100644 (file)
--- a/app-office/kword/files/digest-kword-1.3.5-r1
+++ b/app-office/kword/files/digest-kword-1.3.5-r1
@@ -1,3 +1,4 @@
 MD5 79896426542b0cf07e2e15f84946905a koffice-1.3.4.tar.bz2 10765924
 MD5 18f35fd33b62d4d0549130eceb6fca38 koffice-1.3.4-1.3.5.tar.xdelta 340954
 MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
+MD5 71a1baa8244dbcc1bfc2bd3c3e3dd40f post-koffice-1.3.5-rtfimport.diff 8620

diff --git a/app-office/kword/kword-1.3.5-r1.ebuild b/app-office/kword/kword-1.3.5-r1.ebuild
index e93efec33bd3d63e37526df2f29213059a8f8395..a3586c57c31f7b2646eb786f807624063d4d6d05 100644 (file)
--- a/app-office/kword/kword-1.3.5-r1.ebuild
+++ b/app-office/kword/kword-1.3.5-r1.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/kword/kword-1.3.5-r1.ebuild,v 1.1 2005/10/11 14:54:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.3.5-r1.ebuild,v 1.2 2005/10/11 15:17:21 greg_g Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=1.3.5
@@ -8,7 +8,8 @@ inherit kde-meta eutils
 
 DESCRIPTION="KOffice Word Processor"
 HOMEPAGE="http://www.koffice.org/"
-SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
+SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2
+       mirror://kde/security_patches/post-koffice-1.3.5-rtfimport.diff"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ppc ~ppc64 x86"
 IUSE=""
@@ -41,7 +42,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_unpack() {
        kde-meta_src_unpack unpack