Another fix for the templates install problem, see bug #242494. Also fix the build with gcc-3.x /

hardened, bugs #220026 and #242802
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo i686)

3 files changed, 73 insertions, 3 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 56508143dd96..ee0c02c00ae1 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.433 2008/10/20 10:10:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.434 2008/10/20 18:27:52 suka Exp $
+
+  20 Oct 2008; Andreas Proschofsky <suka@gentoo.org>
+  files/gentoo-3.0.0.diff, openoffice-3.0.0.ebuild:
+  Another fix for the templates install problem, see bug #242494. Also fix
+  the build with gcc-3.x / hardened, bugs #220026 and #242802
 
   20 Oct 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.0.0.ebuild:
diff --git a/app-office/openoffice/files/gentoo-3.0.0.diff b/app-office/openoffice/files/gentoo-3.0.0.diff
index d4d637ef60f8..ff047aff8113 100644
--- a/app-office/openoffice/files/gentoo-3.0.0.diff
+++ b/app-office/openoffice/files/gentoo-3.0.0.diff
@@ -51,4 +51,62 @@
  # Allow build to proceed with PaX enabled
  gentoo-pax-fix.diff, aprosky
  # support server-only versions of 64bit JDKs
+--- patches/dev300/svg-import-filter.diff
++++ patches/dev300/svg-import-filter.diff
+@@ -787,7 +787,7 @@
+ +			$(SLO)$/units.obj
+ +
+ +.IF "$(COMID)"=="gcc3"
+-+.IF "$(CCNUMVER)">="000400000000" 
+++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES"
+ +CFLAGS+=-DUSE_MODERN_SPIRIT
+ +.ENDIF
+  .ENDIF
+--- patches/dev300/scp2_extensions.diff 
++++ patches/dev300/scp2_extensions.diff 
+@@ -370,7 +370,7 @@
+ +/* ** SUN Template Pack (en-US)** */
+ +
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_en-US
+ +    PackageInfo = "packinfo_extensions.txt";
+ +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US);
+ +    ParentID = gid_Module_Optional_Extensions;
+@@ -385,7 +385,7 @@
+ +/* ** SUN Template Pack (de)** */
+ +
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_de
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_de
+ +    PackageInfo = "packinfo_extensions.txt";
+ +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de);
+ +    ParentID = gid_Module_Optional_Extensions;
+@@ -400,7 +400,7 @@
+ +/* ** SUN Template Pack (it)** */
+ +
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_it
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_it
+ +    PackageInfo = "packinfo_extensions.txt";
+ +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it);
+ +    ParentID = gid_Module_Optional_Extensions;
+@@ -415,7 +415,7 @@
+ +/* ** SUN Template Pack (fr)** */
+ +
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_fr
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_fr
+ +    PackageInfo = "packinfo_extensions.txt";
+ +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr);
+ +    ParentID = gid_Module_Optional_Extensions;
+@@ -430,7 +430,7 @@
+ +/* ** SUN Template Pack (es)** */
+ +
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_es
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_es
+ +    PackageInfo = "packinfo_extensions.txt";
+ +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es);
+ +    ParentID = gid_Module_Optional_Extensions;
 
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index ade4f68dda4d..a33b220cc1bd 100644
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.12 2008/10/20 10:10:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.13 2008/10/20 18:27:52 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -324,7 +324,14 @@ src_compile() {
 	filter-flags "-fstack-protector"
 	filter-flags "-fstack-protector-all"
 	filter-flags "-ftracer"
-	filter-flags "-fforce-addr"
+
+	if has_version <=sys-devel/gcc-3.4.7 ; then
+		use hardened || filter-flags "-fforce-addr"
+		is-flag -fomit-frame-pointer && append-flags "-momit-leaf-frame-pointer"
+	else
+		filter-flags "-fforce-addr"
+	fi
+
 	filter-flags "-O[s2-9]"
 
 	# Build with NVidia cards breaks otherwise