missing dependency, gcc 4.1 patches thanks to Hanno

(Portage version: 2.0.53)

6 files changed, 112 insertions, 12 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 591cd5415949..6587741f970f 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.127 2005/11/30 06:42:17 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.128 2005/12/03 19:43:16 carlo Exp $
+
+*koffice-1.4.2-r1 (03 Dec 2005)
+
+  03 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kexi-1.4.2-gcc41.patch, +files/kspread-1.4.2-gcc41.patch,
+  +koffice-1.4.2-r1.ebuild:
+  missing dependency, gcc 4.1 patches thanks to Hanno
 
   30 Nov 2005; Mark Loeser <halcy0n@gentoo.org> koffice-1.4.2.ebuild:
   Stable on x86; bug #112840
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index bc0800b891b4..e1346e1676d0 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,24 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7f23bbf57d2de4ae9a4b52550585c99d ChangeLog 17596
+MD5 a5a0f0be3fe99e0c013cc485e6944af1 ChangeLog 17828
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
 MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r2 68
 MD5 fcd72b8c0a0e8d1e8bbf6b76ed92c5cc files/digest-koffice-1.3.5-r3 144
 MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-koffice-1.4.1 68
 MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-koffice-1.4.1-r1 144
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r1 68
+MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
 MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
+MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
 MD5 bdcb79a8db04904d6e6c7110e0ff3ec9 koffice-1.3.5-r2.ebuild 1211
 MD5 9242394dfa6049940585a4d3fa962907 koffice-1.3.5-r3.ebuild 1289
 MD5 3dd6867f27cde022182ed16a091cb0c0 koffice-1.4.1-r1.ebuild 1747
 MD5 216a4ec901dca4c7e574aae8a09c40da koffice-1.4.1.ebuild 1538
+MD5 fe15f0827a302ab5388b5acd9b4c3090 koffice-1.4.2-r1.ebuild 1542
 MD5 57795f4f39bb45ba42f8ec112ab278de koffice-1.4.2.ebuild 1545
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDjUnTCRZPokWLroQRApLDAJ4nr4hsHut+A6nNvFS3VQ49/2ft5gCgq7zR
-fXssu3ab9KdPOOr7lOMGgjA=
-=g57b
------END PGP SIGNATURE-----
diff --git a/app-office/koffice/files/digest-koffice-1.4.2-r1 b/app-office/koffice/files/digest-koffice-1.4.2-r1
new file mode 100644
index 000000000000..a054824ae545
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.4.2-r1
@@ -0,0 +1 @@
+MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/koffice/files/kexi-1.4.2-gcc41.patch b/app-office/koffice/files/kexi-1.4.2-gcc41.patch
new file mode 100644
index 000000000000..879010273e19
--- /dev/null
+++ b/app-office/koffice/files/kexi-1.4.2-gcc41.patch
@@ -0,0 +1,22 @@
+--- koffice-1.4.2/kexi/migration/mysql/mysqlmigrate.h	2005-10-05 12:25:13.000000000 +0200
++++ kexi-1.4.2-gcc41/kexi/migration/mysql/mysqlmigrate.h	2005-12-02 18:28:10.059616750 +0100
+@@ -60,7 +60,7 @@
+ 			~MySQLMigrate();
+ 			//Constructor
+ 			MySQLMigrate();
+-			MySQLMigrate::MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
++			MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
+ 			
+ 			KexiDB::Field::Type type(const QString& table, const MYSQL_FIELD* t);
+ 			
+@@ -69,8 +69,8 @@
+ 			
+ 			QStringList examineEnumField(const QString& table,
+ 			                             const MYSQL_FIELD* fld);
+-			void MySQLMigrate::getConstraints(int mysqlConstraints, KexiDB::Field* fld);
+-			void MySQLMigrate::getOptions(int flags, KexiDB::Field* fld);
++			void getConstraints(int mysqlConstraints, KexiDB::Field* fld);
++			void getOptions(int flags, KexiDB::Field* fld);
+ 
+ 		/*! driver's static version information, it is automatically implemented
+ 		 in implementation using KEXIDB_DRIVER macro (see driver_p.h) */
diff --git a/app-office/koffice/files/kspread-1.4.2-gcc41.patch b/app-office/koffice/files/kspread-1.4.2-gcc41.patch
new file mode 100644
index 000000000000..0477c74d1e1f
--- /dev/null
+++ b/app-office/koffice/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/koffice/koffice-1.4.2-r1.ebuild b/app-office/koffice/koffice-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..ca4d8d7ff46f
--- /dev/null
+++ b/app-office/koffice/koffice-1.4.2-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.4.2-r1.ebuild,v 1.1 2005/12/03 19:43:17 carlo Exp $
+
+inherit kde
+
+DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc javascript mysql postgres"
+
+RDEPEND=">=media-gfx/imagemagick-5.5.2
+	>=app-text/wv2-0.1.9
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	media-libs/libart_lgpl
+	dev-libs/libxml2
+	dev-libs/libxslt
+	sys-libs/readline
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-libs/libpqxx )
+	dev-lang/python
+	>=media-libs/lcms-1.12
+	javascript? ( kde-base/kjsembed )
+	>=app-text/libwpd-0.8.2"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig"
+
+# add blockers on split packages derived from this one
+for x in $(get-child-packages ${CATEGORY}/${PN}); do
+	DEPEND="${DEPEND} !${x}"
+	RDEPEND="${RDEPEND} !${x}"
+done
+
+need-kde 3.3
+
+# TODO: kword sql plugin needs Qt compiled with sql support
+# the dependency on python is needed for scripting support in kexi
+# and for kivio/kiviopart/kiviosdk.
+
+PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch ${FILESDIR}/kexi-1.4.2-gcc41.patch"
+
+src_compile() {
+	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
+
+	kde_src_compile
+	if use doc; then
+		make apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+	if use doc; then
+		make DESTDIR="${D}" install-apidox || die
+	fi
+
+	dodoc changes-*
+}