missing dependency, gcc 4.1 patch thanks to Hanno

(Portage version: 2.0.53)

5 files changed, 80 insertions, 12 deletions

diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 007a6cb2e980..f8289076158a 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.26 2005/11/30 06:41:15 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.27 2005/12/03 19:45:46 carlo Exp $
+
+*kword-1.4.2-r1 (03 Dec 2005)
+
+  03 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kspread-1.4.2-gcc41.patch, +kword-1.4.2-r1.ebuild:
+  missing dependency, gcc 4.1 patch thanks to Hanno
 
   30 Nov 2005; Mark Loeser <halcy0n@gentoo.org> kword-1.4.2.ebuild:
   Stable on x86; bug #112840
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 2c4e0fb8f51c..43e112900282 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 72162b3bc99ca90bdcba9849b237569c ChangeLog 3137
+MD5 a93f3d6ead9d6ea8c071e41960acb6c0 ChangeLog 3330
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5 211
 MD5 4db1fd7ff582f6437830745f93412312 files/digest-kword-1.3.5-r1 287
 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 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2-r1 68
 MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
+MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
 MD5 113e6434c255e20ee8de241c0a1b53bd kword-1.3.5-r1.ebuild 1440
 MD5 5948a99247e2967f49cbd364cbe194d7 kword-1.3.5.ebuild 1378
 MD5 4a5def53a5e48ab29b32d9ddcd601258 kword-1.4.1-r1.ebuild 1396
 MD5 18ae024a439fc6a208affee87245e886 kword-1.4.1.ebuild 1200
+MD5 b83ac7e1d7220cb51ef2670300839568 kword-1.4.2-r1.ebuild 1185
 MD5 b0d602dfdc9115c98b9fe1f9a45052e2 kword-1.4.2.ebuild 1205
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDjUmWCRZPokWLroQRAvnWAJ0Q2a+xG0AepYrlS6flAZght9J1+wCeO4jU
-eVGGkxH3hjE9r1Pp3fY7FmE=
-=ACEI
------END PGP SIGNATURE-----
diff --git a/app-office/kword/files/digest-kword-1.4.2-r1 b/app-office/kword/files/digest-kword-1.4.2-r1
new file mode 100644
index 000000000000..a054824ae545
--- /dev/null
+++ b/app-office/kword/files/digest-kword-1.4.2-r1
@@ -0,0 +1 @@
+MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kword/files/kspread-1.4.2-gcc41.patch b/app-office/kword/files/kspread-1.4.2-gcc41.patch
new file mode 100644
index 000000000000..0477c74d1e1f
--- /dev/null
+++ b/app-office/kword/files/kspread-1.4.2-gcc41.patch
@@ -0,0 +1,11 @@
+--- kspread-1.4.2/kspread/kspread_cell.h	2005-10-05 12:31:33.000000000 +0200
++++ kspread-1.4.2-gcc41/kspread/kspread_cell.h	2005-12-02 15:05:50.336931500 +0100
+@@ -596,7 +596,7 @@
+      *
+      * @return the cell that decides the format for the cell in question.
+      */
+-    KSpreadCell *KSpreadCell::ultimateObscuringCell() const;
++    KSpreadCell *ultimateObscuringCell() const;
+ 
+     /**
+      * @return the obscuring cell list (might be empty)
diff --git a/app-office/kword/kword-1.4.2-r1.ebuild b/app-office/kword/kword-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..bca041bee538
--- /dev/null
+++ b/app-office/kword/kword-1.4.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2-r1.ebuild,v 1.1 2005/12/03 19:45:46 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice word processor."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
+	>=app-text/wv2-0.1.8
+	>=media-gfx/imagemagick-5.5.2
+	>=app-text/libwpd-0.8.2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkoscript lib/koscript
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkspreadcommon kspread"
+
+KMEXTRACTONLY="
+	lib/
+	kspread/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/kword"
+
+need-kde 3.3
+
+PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch"
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile liboofilter first
+	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
+
+	kde-meta_src_unpack makefiles
+}