From: Andreas Proschofsky Date: Mon, 22 Feb 2010 17:17:16 +0000 (+0000) Subject: Simplify mozilla stuff, raises dep on xulrunner, fixes bug #306123 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d3a21d1e3d353d518355dd169c22b2200c486f0;p=gentoo.git Simplify mozilla stuff, raises dep on xulrunner, fixes bug #306123 Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- 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 + openoffice-3.2.0.ebuild: + Simplify mozilla stuff, raises dep on xulrunner, fixes bug #306123 22 Feb 2010; Andreas Proschofsky openoffice-3.2.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index c961ae8290bd..510aa38e27c9 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -49,6 +49,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c -EBUILD openoffice-3.2.0.ebuild 12839 RMD160 f2db23ad13260882a143eddf228c7daf5c2400d8 SHA1 f30892a12970aee4d6459b0186e2e17286194c63 SHA256 058102cce36ba05eb4201f692795bffbca368cf477982011f32b6ceb1bac3890 -MISC ChangeLog 105684 RMD160 15e5dc9a08bb0768c884ccc3b9fddf8f93f60491 SHA1 ab9613f4bb93dcdd2de0e9dc2178c4d569f087f2 SHA256 c53ed62151e633b6a41563df15e12d9744e41fdd3463d4d294cfb709d0264ac6 +EBUILD openoffice-3.2.0.ebuild 12474 RMD160 1a551c4dfc2a15b5ce1533ac36e44d748058a111 SHA1 c602cc593f5e7d98cc222f1139b1dfcd023a7f94 SHA256 0f3ab4806e1d93b878de8bac88ecaf808be613dbeeee7bd592123d847f7a2c16 +MISC ChangeLog 105834 RMD160 dbd8b11ef9ded7537e3a6735e030d3271d4de862 SHA1 f0171d0df578e87f35012bda42842c5d7556478c SHA256 4d55dee081752a61d71cddd1638a1c2f069b198cd81cc5ab408669b74035331f MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 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-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}