diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2010-02-22 17:17:16 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2010-02-22 17:17:16 +0000 |
| commit | ca5a2119d1a7ed0584185813ba471f41b0ecda76 (patch) | |
| tree | 7a1b89891999afeeaeb2942ad66c26c72b59a92f /app-office | |
| parent | Use /usr/share/doc instead of /usr/doc for documentation wrt bug #255916 by f... (diff) | |
| download | gentoo-2-ca5a2119d1a7ed0584185813ba471f41b0ecda76.tar.gz gentoo-2-ca5a2119d1a7ed0584185813ba471f41b0ecda76.tar.bz2 gentoo-2-ca5a2119d1a7ed0584185813ba471f41b0ecda76.zip | |
Simplify mozilla stuff, raises dep on xulrunner, fixes bug #306123
(Portage version: 2.2_rc63/cvs/Linux i686)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.0.ebuild | 23 |
2 files changed, 9 insertions, 20 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 59c4bea05d47..0eff427c04e1 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.512 2010/02/22 16:45:29 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.513 2010/02/22 17:17:16 suka Exp $ + + 22 Feb 2010; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.2.0.ebuild: + Simplify mozilla stuff, raises dep on xulrunner, fixes bug #306123 22 Feb 2010; Andreas Proschofsky <suka@gentoo.org> openoffice-3.2.0.ebuild: diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index 6b8a43d3d77b..f67bb2d9ca09 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # 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.2.0.ebuild,v 1.6 2010/02/22 16:45:29 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.7 2010/02/22 17:17:16 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -79,7 +79,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 ) + nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.6.6 >=dev-libs/nss-3.11-r1 ) opengl? ( virtual/opengl @@ -188,16 +188,6 @@ pkg_setup() { die fi - if use nsplugin; then - if pkg-config --exists libxul; then - BRWS="libxul" - elif pkg-config --exists xulrunner-xpcom; then - BRWS="xulrunner" - else - die "USE flag [nsplugin] set but no installed xulrunner found!" - fi - fi - java-pkg-opt-2_pkg_setup # sys-libs/db version used @@ -243,13 +233,8 @@ src_prepare() { echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE} fi - if use nsplugin ; then - echo "--enable-mozilla" >> ${CONFFILE} - echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE} - else - echo "--disable-mozilla" >> ${CONFFILE} - echo "--without-system-mozilla" >> ${CONFFILE} - fi + echo $(use_enable nsplugin mozilla) >> ${CONFFILE} + echo $(use_with nsplugin system-mozilla libxul) >> ${CONFFILE} echo $(use_enable binfilter) >> ${CONFFILE} echo $(use_enable cups) >> ${CONFFILE} |