summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2010-01-14 16:15:58 +0000
committerAndreas Proschofsky <suka@gentoo.org>2010-01-14 16:15:58 +0000
commit4598735b5a0181bbd876ec09a646a4374d66a431 (patch)
tree48f95e426d3aeb889445e5e735a3e35c9b3196c8 /app-office/openoffice
parentMarking nokogiri-1.4.1 ~ppc for bug 297822 (diff)
downloadgentoo-2-4598735b5a0181bbd876ec09a646a4374d66a431.tar.gz
gentoo-2-4598735b5a0181bbd876ec09a646a4374d66a431.tar.bz2
gentoo-2-4598735b5a0181bbd876ec09a646a4374d66a431.zip
Remove seamonkey-1 support for bug #300409
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'app-office/openoffice')
-rw-r--r--app-office/openoffice/ChangeLog8
-rw-r--r--app-office/openoffice/openoffice-3.1.1.ebuild10
2 files changed, 10 insertions, 8 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index affe68115e97..944d262f0d38 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.504 2009/11/28 20:54:32 suka Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.505 2010/01/14 16:15:58 suka Exp $
+
+ 14 Jan 2010; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-3.1.1.ebuild:
+ Remove seamonkey-1 support for bug #300409
28 Nov 2009; Andreas Proschofsky <suka@gentoo.org>
openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index 47b60f7e8394..d0a191469ade 100644
--- a/app-office/openoffice/openoffice-3.1.1.ebuild
+++ b/app-office/openoffice/openoffice-3.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.25 2009/11/28 20:54:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.26 2010/01/14 16:15:58 suka Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -98,7 +98,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
dev-java/lucene-analyzers:2.3
dev-java/rhino:1.5 )
mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
- nsplugin? ( || ( net-libs/xulrunner:1.9 net-libs/xulrunner:1.8 =www-client/seamonkey-1* )
+ nsplugin? ( || ( net-libs/xulrunner:1.9 net-libs/xulrunner:1.8 )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
opengl? ( virtual/opengl
@@ -211,10 +211,8 @@ pkg_setup() {
BRWS="libxul"
elif pkg-config --exists xulrunner-xpcom; then
BRWS="xulrunner"
- elif pkg-config --exists seamonkey-xpcom; then
- BRWS="seamonkey"
else
- die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!"
+ die "USE flag [nsplugin] set but no installed xulrunner found!"
fi
fi