Fix build problems with gcc-4.4 (bug #269452) and glibc-2.10.1 (bug #270263) and correct post-install message for bash completion (bug #270185)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 78 insertions, 5 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 96de98eae556..53ed5b0be5aa 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.462 2009/05/17 07:53:04 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.463 2009/05/19 11:26:36 suka Exp $
+
+  19 May 2009; Andreas Proschofsky <suka@gentoo.org>
+  +files/buildfix-gcc44.diff, openoffice-3.1.0.ebuild,
+  +files/ooo_getline.diff:
+  Fix build problems with gcc-4.4 (bug #269452) and glibc-2.10.1 (bug 
+  #270263) and correct post-install message for bash completion (bug
+  #270185)
 
 *openoffice-3.1.0 (17 May 2009)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 96653607324a..3bcc299da20a 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,5 @@
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
+AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
 AUX buildfix-mono-2-2.diff 523 RMD160 993dee1c2ab796980e7f04f8b9c0aeefc19743c7 SHA1 b2aee23fa2a7d6fb0b1a1d1ca97609bfaaa7f696 SHA256 5f807dd7b892dfa30c177ed20e69c19f50541bfec2f94a2ff1caaa5aa656a324
 AUX fixsandbox.diff 412 RMD160 2f49f40ccb3b06c2678402f25fbc65658061c35c SHA1 d7ef14c375634358351ce13de4b01fabc54e9c33 SHA256 fd6d40c11f37ed1db0b09cfd1f166cf84e96a759b58064ce58980eb63b2b8d49
 AUX gentoo-3.0.0.diff 3086 RMD160 69856c46b641e09c5ffd561cf78c7f2334649d87 SHA1 a8aa9bde2cbde25c1fb54a84a4908a6b4f468873 SHA256 5c3e931564cadf9a5d212fab7c4708cf9f131057ffd1e15276dc343c36a4e33d
@@ -7,6 +8,7 @@ AUX gentoo-3.1.0.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1
 AUX hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
 AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+AUX ooo_getline.diff 1349 RMD160 2290aedd9b06eafe6acce6ac2718fb8ae6f981eb SHA1 14835c3de02cdec854cc817346606b09963883f1 SHA256 6a71026f913eaff566bb4e690814a2dacd441f97478926fb753918322fa1edbb
 AUX solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
 DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
@@ -80,6 +82,6 @@ DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766ee
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.0.0.ebuild 12712 RMD160 1f067c7899c55dad47cf2717474bb514c295bc8f SHA1 75e4bcc0ee1f7d67383abaef7cae785deda75a6e SHA256 173a0723104e6be35af7c0ffc80523961607e16fa484bf3c67a0d906c5b711f4
 EBUILD openoffice-3.0.1.ebuild 12242 RMD160 7ddb204426769993d93beb708ed536e91116659c SHA1 219dda129b89e472cdea0447a8a62dc2cf9bb051 SHA256 1a7d69c6e8aaafb64796025900044c97bd1e851a2d1e488b121dd6d515c8483e
-EBUILD openoffice-3.1.0.ebuild 12704 RMD160 1b5eab63e6b554b75dc8a8610eadfdd9b01160b1 SHA1 a9c0116cb57d679023eeeb3b2d0d2974e67ebc46 SHA256 dccb53aad88d126e808bc6844e1fe4fd18fe301a16b010a36399c41ee6a8fb46
-MISC ChangeLog 96639 RMD160 69af884776176ac48b540e1c499515a505850013 SHA1 1b2b86ba006c0a3794a270443d009a56ddbfd338 SHA256 21f2173565a7166f89cbae425c6be0d325ac90aca723dd97b0683eae66a62d0b
+EBUILD openoffice-3.1.0.ebuild 12877 RMD160 3c66fc7d0e34720b9a5e3db1af65951f1d08bde2 SHA1 0ba62d20fdfa5b8455e1a6ef1b69cc24c6029c44 SHA256 cf8837a127be21e80f9de748f5ce2c115d9493293effcfa35e2613804e70d161
+MISC ChangeLog 96926 RMD160 7a23d1657138d8d0a64409574486d03067823233 SHA1 c1a9309c2ed718de62c20b5f43355ae5eecc030a SHA256 49b672ee84ed083aabebfad3d0511220c16b8b6eccbf2a903b9305197ccc5024
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/buildfix-gcc44.diff b/app-office/openoffice/files/buildfix-gcc44.diff
new file mode 100644
index 000000000000..5da661e1f2d4
--- /dev/null
+++ b/app-office/openoffice/files/buildfix-gcc44.diff
@@ -0,0 +1,20 @@
+--- sw/source/core/doc/docbm.cxx	2009-05-17 16:41:34.765483089 -0500
++++ sw/source/core/doc/docbm.cxx	2009-05-17 16:41:39.141355157 -0500
+@@ -33,6 +33,7 @@
+ #include "precompiled_sw.hxx"
+ 
+ 
++#include <cstdio>
+ #include <tools/pstm.hxx>
+ #include <svx/linkmgr.hxx>
+ #include <fmtanchr.hxx>
+--- sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-17 17:06:33.556313757 -0500
++++ sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-17 17:06:46.964547351 -0500
+@@ -32,6 +32,7 @@
+ #include "precompiled_sw.hxx"
+ 
+ #include <iostream> 
++#include <cstdio>
+ #include "WW8TableInfo.hxx"
+ #include "swtable.hxx"
+ #include "pam.hxx"
diff --git a/app-office/openoffice/files/ooo_getline.diff b/app-office/openoffice/files/ooo_getline.diff
new file mode 100644
index 000000000000..9fed114c3979
--- /dev/null
+++ b/app-office/openoffice/files/ooo_getline.diff
@@ -0,0 +1,42 @@
+--- soltools/mkdepend/def.h.orig	2009-05-18 15:28:59.000000000 +0200
++++ soltools/mkdepend/def.h	2009-05-18 15:29:36.000000000 +0200
+@@ -154,7 +154,7 @@
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*ooo_getline();
+ char			*isdefined();
+ struct filepointer	*getfile();
+ struct inclist		*newinclude();
+--- soltools/mkdepend/main.c.orig	2009-05-18 15:29:08.000000000 +0200
++++ soltools/mkdepend/main.c	2009-05-18 15:30:23.000000000 +0200
+@@ -548,7 +548,7 @@
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *ooo_getline(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
+--- soltools/mkdepend/parse.c.orig	2009-05-18 15:29:17.000000000 +0200
++++ soltools/mkdepend/parse.c	2009-05-18 15:30:43.000000000 +0200
+@@ -45,7 +45,7 @@
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while ((line = getline(filep))) {
++	while ((line = ooo_getline(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
+ 		case IF:
+ 		doif:
+@@ -168,7 +168,7 @@
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while ((line = getline(filep))) {
++	while ((line = ooo_getline(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
+ 		case IF:
+ 		case IFFALSE:
diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild
index 37ed40a86d23..1fb874b72003 100644
--- a/app-office/openoffice/openoffice-3.1.0.ebuild
+++ b/app-office/openoffice/openoffice-3.1.0.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/openoffice/openoffice-3.1.0.ebuild,v 1.1 2009/05/17 07:53:04 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.2 2009/05/19 11:26:36 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -228,6 +228,8 @@ src_unpack() {
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/ooo_getline.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks
 	if use java ; then
@@ -369,7 +371,7 @@ pkg_postinst() {
 
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
-	bash-completion_pkg_postinst
+	BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst
 
 	[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin