5 files changed, 18 insertions, 14 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 0e4ba52a75d1..ca36201d5bde 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.467 2009/05/31 15:35:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.468 2009/07/10 23:10:15 gengor Exp $
+
+  10 Jul 2009; Gordon Malm <gengor@gentoo.org> openoffice-3.0.0.ebuild,
+  openoffice-3.0.1.ebuild, openoffice-3.1.0.ebuild:
+  Filter SSP for <gcc-4 only, thanks to Magnus Granberg.
 
   31 May 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.1.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 061dab4d570d..cf522de323ba 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -79,8 +79,8 @@ DIST ooo310-m11-ure.tar.bz2 5160732 RMD160 fd419b3a6a77dac2d95bc55afba5591bed093
 DIST ooo310-m11-writer.tar.bz2 8955758 RMD160 876e1ecbd0bf8e6dbf9eaa95155868e44c33823f SHA1 fc37627f0a8aab578a64818f713ac87a838c4709 SHA256 093f42b6f102f3f9c7f934bdc071680fa50487628b8107aa335f623f8a770694
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 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 12923 RMD160 6193c13bc07a919621561b823dce61686f5aabcb SHA1 77f3a0ff4c49a999f4c71c5d8c7c7840888a93ad SHA256 d2081e66bdc81d3528fbf6d9b5369d3177c3f46191fa6865cc3d162db27d2f06
-MISC ChangeLog 97520 RMD160 f4b53a2d42876da6e3bdec63d001448571222d5a SHA1 bbb3aeeb3e8bef9bbc09f14a90e7b97d88a49195 SHA256 fe5455c8fcf8a00162cd7542139609d5e7d3712d97dcebc1709981f886b9f69e
+EBUILD openoffice-3.0.0.ebuild 12712 RMD160 04e5760f2b2d9dad2c2aa15443e35c42187fea0e SHA1 64c97928e4b326e1ee773229bbb0249d0eeacefe SHA256 5469a0cdb80f77ee6f2468cb88824ceeb71fec12c7dd64c8685b888ee3c34aeb
+EBUILD openoffice-3.0.1.ebuild 12242 RMD160 02d5f90be0c3f1963629d2cb8e3441e01cb4ee7c SHA1 2d24806b0d1b8c74d921f1196eba9bce49bfcadd SHA256 599d1c477b4adf36504c1689422c3b5ba1c6a7838167b31dc4afc9f46449c7cd
+EBUILD openoffice-3.1.0.ebuild 12927 RMD160 52b60794f9ba449935abf314dd0be949fb1ed220 SHA1 37f97493bfdaad1303bb1596162e88bda4880337 SHA256 b7b29b6329a09884c9006d9c4ee3ca24c05dfdabde9b412e13ec4838ffbd37e4
+MISC ChangeLog 97704 RMD160 816dcd149101c94b7948131c7d5562adc72e6dad SHA1 c9f50b1d4f9591b3373e616975c5a3065fe898c6 SHA256 c4bbec6512fea38ff2988fa666acf60ebea5ec61e475a933f61aa82c4534723a
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index 49f9669d175b..0739c0182132 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-2009 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.25 2009/05/12 20:36:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.26 2009/07/10 23:10:15 gengor Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -301,14 +301,14 @@ src_compile() {
 	filter-flags "-funroll-loops"
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-fno-default-inline"
-	filter-flags "-fstack-protector"
-	filter-flags "-fstack-protector-all"
 	filter-flags "-ftracer"
 	filter-flags "-fforce-addr"
 
 	filter-flags "-O[s2-9]"
 
 	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector"
+		filter-flags "-fstack-protector-all"
 		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
 	fi
 
diff --git a/app-office/openoffice/openoffice-3.0.1.ebuild b/app-office/openoffice/openoffice-3.0.1.ebuild
index 804e0b07a6ad..12182afb1ae4 100644
--- a/app-office/openoffice/openoffice-3.0.1.ebuild
+++ b/app-office/openoffice/openoffice-3.0.1.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.0.1.ebuild,v 1.11 2009/05/12 20:36:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.12 2009/07/10 23:10:15 gengor Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -282,14 +282,14 @@ src_configure() {
 	filter-flags "-funroll-loops"
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-fno-default-inline"
-	filter-flags "-fstack-protector"
-	filter-flags "-fstack-protector-all"
 	filter-flags "-ftracer"
 	filter-flags "-fforce-addr"
 
 	filter-flags "-O[s2-9]"
 
 	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector"
+		filter-flags "-fstack-protector-all"
 		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
 	fi
 
diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild
index 1289f816a98f..bbc740523f60 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.6 2009/05/31 15:35:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.7 2009/07/10 23:10:15 gengor Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -292,14 +292,14 @@ src_configure() {
 	filter-flags "-funroll-loops"
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-fno-default-inline"
-	filter-flags "-fstack-protector"
-	filter-flags "-fstack-protector-all"
 	filter-flags "-ftracer"
 	filter-flags "-fforce-addr"
 
 	filter-flags "-O[s2-9]"
 
 	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector"
+		filter-flags "-fstack-protector-all"
 		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
 	fi