summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2009-07-22 20:30:15 +0000
committerAndreas Proschofsky <suka@gentoo.org>2009-07-22 20:30:15 +0000
commit413a55a4451aad15b86938437ea4f7f80caae4c0 (patch)
tree6eeada0658e0a8a9e864be16aa5d7c4f2bc0fd7e /app-office/openoffice
parent#278740 (FEATURES misuse), work around #269221 (bad stripping) (diff)
downloadgentoo-2-413a55a4451aad15b86938437ea4f7f80caae4c0.tar.gz
gentoo-2-413a55a4451aad15b86938437ea4f7f80caae4c0.tar.bz2
gentoo-2-413a55a4451aad15b86938437ea4f7f80caae4c0.zip
Depend on xulrunner-1.9.0* for older releases
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'app-office/openoffice')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/openoffice-3.0.0.ebuild4
-rw-r--r--app-office/openoffice/openoffice-3.0.1.ebuild4
-rw-r--r--app-office/openoffice/openoffice-3.1.0.ebuild4
4 files changed, 11 insertions, 7 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5cae2b7a0195..1db142bb1974 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.469 2009/07/19 17:29:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.470 2009/07/22 20:30:14 suka Exp $
+
+ 22 Jul 2009; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-3.0.0.ebuild, openoffice-3.0.1.ebuild, openoffice-3.1.0.ebuild:
+ Depend on xulrunner-1.9.0* for older releases
19 Jul 2009; Torsten Veller <tove@gentoo.org> openoffice-3.0.0.ebuild,
openoffice-3.0.1.ebuild, openoffice-3.1.0.ebuild:
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index f2bef79e7045..b0f1a0150316 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.27 2009/07/19 17:29:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.28 2009/07/22 20:30:15 suka Exp $
WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.9"
@@ -84,7 +84,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
- nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
+ nsplugin? ( || ( =net-libs/xulrunner-1.9.0* net-libs/xulrunner:1.8 =www-client/seamonkey-1* )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
opengl? ( virtual/opengl
diff --git a/app-office/openoffice/openoffice-3.0.1.ebuild b/app-office/openoffice/openoffice-3.0.1.ebuild
index f90a82bd495a..3c93a7d8772c 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.13 2009/07/19 17:29:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.14 2009/07/22 20:30:15 suka Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -83,7 +83,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
- nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
+ nsplugin? ( || ( =net-libs/xulrunner-1.9.0* net-libs/xulrunner:1.8 =www-client/seamonkey-1* )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
opengl? ( virtual/opengl
diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild
index 0093e8cec751..6520d434db85 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.8 2009/07/19 17:29:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.9 2009/07/22 20:30:14 suka Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -85,7 +85,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
- nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
+ nsplugin? ( || ( =net-libs/xulrunner-1.9.0* net-libs/xulrunner:1.8 =www-client/seamonkey-1* )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
opengl? ( virtual/opengl