diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2008-09-22 07:02:00 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2008-09-22 07:02:00 +0000 |
| commit | 5387e82eb312eaae7bafe991edfcaca15b669f55 (patch) | |
| tree | 2489180770ffa70f0a1834b5cb1bf810158b1680 /app-office/openoffice | |
| parent | Revbump for machine register fixups. (diff) | |
| download | gentoo-2-5387e82eb312eaae7bafe991edfcaca15b669f55.tar.gz gentoo-2-5387e82eb312eaae7bafe991edfcaca15b669f55.tar.bz2 gentoo-2-5387e82eb312eaae7bafe991edfcaca15b669f55.zip | |
Fix xulrunner deps, see bug #238280
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.0.0_rc1.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 61bcab64aad3..50e913e7f389 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.415 2008/09/20 17:49:02 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.416 2008/09/22 07:02:00 suka Exp $ + + 22 Sep 2008; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.0.0_rc1.ebuild: + Fix xulrunner deps, see bug #238280 20 Sep 2008; Andreas Proschofsky <suka@gentoo.org> files/gentoo-3.0.0_rc1.diff, +files/lucene-no-java.diff, diff --git a/app-office/openoffice/openoffice-3.0.0_rc1.ebuild b/app-office/openoffice/openoffice-3.0.0_rc1.ebuild index 87989f8ca1b9..9cf80535680b 100644 --- a/app-office/openoffice/openoffice-3.0.0_rc1.ebuild +++ b/app-office/openoffice/openoffice-3.0.0_rc1.ebuild @@ -1,9 +1,10 @@ # 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_rc1.ebuild,v 1.4 2008/09/20 17:49:02 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc1.ebuild,v 1.5 2008/09/22 07:02:00 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 @@ -139,7 +140,7 @@ DEPEND="${COMMON_DEPEND} pam? ( sys-libs/pam ) !dev-util/dmake >=dev-lang/python-2.3.4 - nsplugin? ( || ( =net-libs/xulrunner-1.8 =net-libs/xulrunner-1.9 =www-client/seamonkey-1* ) + nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* ) >=dev-libs/nspr-4.6.6 >=dev-libs/nss-3.11-r1 ) java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* ) |