summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-05-30 18:16:06 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-05-30 18:16:06 +0000
commit6ed5ee5b5de68b7d821fbc83755b3834ecb16d5d (patch)
tree992c36525e741ca3fae4c84caa36e6e68d974392 /app-office
parentversion bump, #126603, #123022 - thanks to Joshua Schmidlkofer, Neil Dökkalf... (diff)
downloadgentoo-2-6ed5ee5b5de68b7d821fbc83755b3834ecb16d5d.tar.gz
gentoo-2-6ed5ee5b5de68b7d821fbc83755b3834ecb16d5d.tar.bz2
gentoo-2-6ed5ee5b5de68b7d821fbc83755b3834ecb16d5d.zip
inherit java-pkg and call java-pkg_pkg_setup for bug #134131
(Portage version: 2.1_rc3-r2)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/openoffice-2.0.2-r2.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index bc063ca8ff8d..cf24bc962c0a 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.220 2006/05/24 08:53:18 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.221 2006/05/30 18:16:06 suka Exp $
+
+ 30 May 2006; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.0.2-r2.ebuild:
+ inherit java-pkg and call java-pkg_pkg_setup for bug #134131
24 May 2006; Andreas Proschofsky <suka@gentoo.org>
openoffice-2.0.2-r2.ebuild:
diff --git a/app-office/openoffice/openoffice-2.0.2-r2.ebuild b/app-office/openoffice/openoffice-2.0.2-r2.ebuild
index 14bfcc40a0a8..532d7d0f9621 100644
--- a/app-office/openoffice/openoffice-2.0.2-r2.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2-r2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2-r2.ebuild,v 1.8 2006/05/24 08:53:18 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2-r2.ebuild,v 1.9 2006/05/30 18:16:06 suka Exp $
-inherit check-reqs eutils fdo-mime flag-o-matic kde-functions mono toolchain-funcs
+inherit check-reqs eutils fdo-mime flag-o-matic java-pkg kde-functions mono toolchain-funcs
IUSE="binfilter cairo eds firefox gnome gtk java kde ldap mono mozilla xml"
@@ -144,6 +144,8 @@ pkg_setup() {
#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"
+ use java && java-pkg_pkg_setup
+
}
src_unpack() {
@@ -192,7 +194,7 @@ src_compile() {
filter-flags "-fno-default-inline"
filter-flags "-fstack-protector"
filter-flags "-ftracer"
- append-flags "-fno-strict-aliasing"
+ filter-flags "-ffast-math"
replace-flags "-O3" "-O2"
replace-flags "-Os" "-O2"