diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-09-20 07:03:41 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-09-20 07:03:41 +0000 |
| commit | 281024551bab9287c3148819b273d9364a53f341 (patch) | |
| tree | cb1ae8be280ea59fe4658c467e8823c1c4451686 /app-office | |
| parent | Trying to fix internal STLport build on ppc, see bug #193056 (diff) | |
| download | historical-281024551bab9287c3148819b273d9364a53f341.tar.gz historical-281024551bab9287c3148819b273d9364a53f341.tar.bz2 historical-281024551bab9287c3148819b273d9364a53f341.zip | |
Fix mozilla stuff, see bug #192917
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 16 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.3.0.ebuild | 6 |
3 files changed, 18 insertions, 10 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 9654c7a86afe..6f87c0eab790 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.340 2007/09/20 06:44:20 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.341 2007/09/20 07:03:41 suka Exp $ + + 20 Sep 2007; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.3.0.ebuild: + Fix mozilla stuff, see bug #192917 20 Sep 2007; Andreas Proschofsky <suka@gentoo.org> +files/2.3.0/stlport-ppc-buildfix.diff, diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index d6f54ba18d6c..4967a4c1b315 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -76,14 +76,14 @@ EBUILD openoffice-2.2.1.ebuild 11889 RMD160 d8f060050e051a083d51b6afc2738903cfe0 MD5 dac1ed6e687aa78d5b87cce285332fb7 openoffice-2.2.1.ebuild 11889 RMD160 d8f060050e051a083d51b6afc2738903cfe09a18 openoffice-2.2.1.ebuild 11889 SHA256 98f7525fe494ff952810acc6ae454c6fba6041462737335790e6ed39b36a625d openoffice-2.2.1.ebuild 11889 -EBUILD openoffice-2.3.0.ebuild 12060 RMD160 c2776134b5b911571615f15f51295e3c0fa38356 SHA1 5099994b1ee4fa635f57a90188ba115933034e4c SHA256 d60214f72f67c155c7da24e55301074187a1138727c034609269755caa19e8c9 -MD5 79630ba73eb903d2a59a03c7ed07ea91 openoffice-2.3.0.ebuild 12060 -RMD160 c2776134b5b911571615f15f51295e3c0fa38356 openoffice-2.3.0.ebuild 12060 -SHA256 d60214f72f67c155c7da24e55301074187a1138727c034609269755caa19e8c9 openoffice-2.3.0.ebuild 12060 -MISC ChangeLog 70927 RMD160 1ddc9fe1973aa975de6fe0b229a6e752b9190b69 SHA1 93328794ca4fc9e14bf318f94c4ff2ade4fdf653 SHA256 214143f7767906a39e6939137dd859459c02cdcbe438cd4bd7aa981104ceec61 -MD5 6ae68bae94202073dca963847040ac83 ChangeLog 70927 -RMD160 1ddc9fe1973aa975de6fe0b229a6e752b9190b69 ChangeLog 70927 -SHA256 214143f7767906a39e6939137dd859459c02cdcbe438cd4bd7aa981104ceec61 ChangeLog 70927 +EBUILD openoffice-2.3.0.ebuild 12223 RMD160 f0335e5592d4ada661a8a26c560243c70d35aeee SHA1 88a5ff1db76114ceef6b7dcbc069f954b91001cb SHA256 5cc6c22e2ffca39be790a948292f5051bc4dd5e28dd57c6b51353acab2fb116f +MD5 fc2210d038ce4de2befedf0a677ecdd6 openoffice-2.3.0.ebuild 12223 +RMD160 f0335e5592d4ada661a8a26c560243c70d35aeee openoffice-2.3.0.ebuild 12223 +SHA256 5cc6c22e2ffca39be790a948292f5051bc4dd5e28dd57c6b51353acab2fb116f openoffice-2.3.0.ebuild 12223 +MISC ChangeLog 71045 RMD160 3f9ec0e2fce8002e714c779497de614e593f2b51 SHA1 9941995e2b1b04730e2458302d52926427ba7424 SHA256 cff3dab0a3333e6069b508ef6e27d428c9f82463dbd929b3ab18a60ec24fbeb0 +MD5 346503fd1521118c1f74d1f821356f0a ChangeLog 71045 +RMD160 3f9ec0e2fce8002e714c779497de614e593f2b51 ChangeLog 71045 +SHA256 cff3dab0a3333e6069b508ef6e27d428c9f82463dbd929b3ab18a60ec24fbeb0 ChangeLog 71045 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461 diff --git a/app-office/openoffice/openoffice-2.3.0.ebuild b/app-office/openoffice/openoffice-2.3.0.ebuild index f90973b9eb2b..a1a8197a5c43 100644 --- a/app-office/openoffice/openoffice-2.3.0.ebuild +++ b/app-office/openoffice/openoffice-2.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.4 2007/09/20 06:44:20 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.5 2007/09/20 07:03:41 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -73,6 +73,9 @@ COMMON_DEPEND="!app-office/openoffice-bin !firefox? ( seamonkey? ( www-client/seamonkey >=dev-libs/nspr-4.6.2 >=dev-libs/nss-3.11-r1 ) ) + !firefox? ( !seamonkey? ( xulrunner? ( net-libs/xulrunner + >=dev-libs/nspr-4.6.2 + >=dev-libs/nss-3.11-r1 ) ) ) sound? ( >=media-libs/portaudio-18.1-r5 >=media-libs/libsndfile-1.0.9 ) webdav? ( >=net-misc/neon-0.24.7 ) @@ -241,6 +244,7 @@ src_unpack() { echo "--with-system-mozilla=${browser}" >> ${CONFFILE} else echo "--disable-mozilla" >> ${CONFFILE} + echo "--without-system-mozilla" >> ${CONFFILE} fi echo "`use_enable cups`" >> ${CONFFILE} |