[gentoo-commits] gentoo-x86 commit in app-office/openoffice: openoffice-3.0.0.ebuild ChangeLog

["Andreas Proschofsky (suka)" <suka@gentoo.org>]

suka        08/10/24 10:15:51

  Modified:             openoffice-3.0.0.ebuild ChangeLog
  Log:
  Improve CFLAGS filtering for gcc 3.4.x, thanks to Gordon Malm <gengor@gentoo.org>
  (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo i686)

Revision  Changes    Path
1.14                 app-office/openoffice/openoffice-3.0.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?r1=1.13&r2=1.14

Index: openoffice-3.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice-3.0.0.ebuild	20 Oct 2008 18:27:52 -0000	1.13
+++ openoffice-3.0.0.ebuild	24 Oct 2008 10:15:51 -0000	1.14
@@ -1,12 +1,12 @@
 # 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.13 2008/10/20 18:27:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.14 2008/10/24 10:15:51 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
 EAPI="1"
 
-inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
+inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
 
 IUSE="cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
@@ -324,16 +324,14 @@
 	filter-flags "-fstack-protector"
 	filter-flags "-fstack-protector-all"
 	filter-flags "-ftracer"
-
-	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 "-fforce-addr"
 
 	filter-flags "-O[s2-9]"
 
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+	fi
+
 	# Build with NVidia cards breaks otherwise
 	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
 



1.435                app-office/openoffice/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.435&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.435&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.434&r2=1.435

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- ChangeLog	20 Oct 2008 18:27:52 -0000	1.434
+++ ChangeLog	24 Oct 2008 10:15:51 -0000	1.435
@@ -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.434 2008/10/20 18:27:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.435 2008/10/24 10:15:51 suka Exp $
+
+  24 Oct 2008; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.0.0.ebuild:
+  Improve CFLAGS filtering for gcc 3.4.x, thanks to Gordon Malm
+  <gengor@gentoo.org>
 
   20 Oct 2008; Andreas Proschofsky <suka@gentoo.org>
   files/gentoo-3.0.0.diff, openoffice-3.0.0.ebuild: