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

hardened, bugs #220026 and #242802
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo i686

4 files changed, 76 insertions, 6 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/Manifest b/app-office/openoffice/Manifest
index 6b1f9250954c..a73a24265313 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,5 +1,5 @@
 AUX gentoo-2.4.1.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7
-AUX gentoo-3.0.0.diff 1292 RMD160 a741142a401bfac8c359e35c5f72bdc12fa20fbe SHA1 e072e64993f94b9c9b867d4e44a5e2034be981fa SHA256 67fd6491eb1491dc55c7d10bbb40788b364f7ec966026c725ee6605dcc9c5e53
+AUX gentoo-3.0.0.diff 3633 RMD160 77f499a41b67197cbd964cbf3371747aada4edae SHA1 1ce3b4c0e9a97f8cafba5b336486b89faa1a0bfc SHA256 29779d4248718cc3c0a71947396a2843dced0a0048810dae2e0185e6dc4442b7
 AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 DIST OOo_2.4.1_src_binfilter.tar.bz2 6674779 RMD160 04ffce167f94a250f94f05923a70af0b0744c417 SHA1 a50c7f317643b756c2b0e8937fa9d64b99f05ed9 SHA256 b40403f9adc395846e33f2fc02e0bff133976766988702ef8b13e83448fbd390
@@ -44,6 +44,6 @@ DIST scsolver.2008-10-07.tar.bz2 230102 RMD160 f14539950ca5bd0c25a37f5f1504460b7
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
 EBUILD openoffice-2.4.1.ebuild 12597 RMD160 cfeb6649376b401d6a24d46c989526e042044b06 SHA1 7c88d424b6de8ef1d041b15df6b219cd017a4dd4 SHA256 402e684acf7565024b645c024f0cce4f8f56579f3fe50b9120fe7db0eccaa7a8
-EBUILD openoffice-3.0.0.ebuild 13168 RMD160 098cbc820643848ce9354f66c4eb5b2eb9b48c54 SHA1 c47f404b4be3086ab201df91f0ea176287e3b9c2 SHA256 b3d9d60f0a21cd322a5dacf7deef4f21882c4b5c5e0763a15db9b3b5079e7a48
-MISC ChangeLog 90250 RMD160 dcb91061bfc138c80bc2c9905d30bf0cd1440d67 SHA1 ac70d0b605482ba4b3f522c15e08ef670e23cb0f SHA256 e4be95344d53a83180dd69b1569eb6dbf61714f02227d0f059b03cf2498de426
+EBUILD openoffice-3.0.0.ebuild 13347 RMD160 0617afdf7217c3627433e2003bc27fd010ed3bd1 SHA1 537e57a2dc14f8ea323c1dc7b2a4bc6860d88d27 SHA256 93d462075ccea27e069b25d36b808d12f17a711b34862b62034faa349307b348
+MISC ChangeLog 90493 RMD160 c890491d4a3e2f4faad083339a9dd0fb64b5309e SHA1 69b94576229d02882927c7ffa2546a451d067723 SHA256 480c6637b8fbb93c67b4fad9946dc6260f93dd2995386aa4cf663af3c652b7d9
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
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