From f10be2b63ac5b524c61bf14aa4aeac8a391735d3 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Fri, 12 Jan 2007 12:06:57 +0000 Subject: [PATCH] Fix build without firefox or seamonkey, closes bug #161702 Package-Manager: portage-2.1.2_rc4-r8 --- app-office/openoffice/ChangeLog | 6 +++++- app-office/openoffice/Manifest | 16 ++++++++-------- app-office/openoffice/openoffice-2.1.0.ebuild | 3 ++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 484f98bd1218..8033dbc44156 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.287 2007/01/12 07:02:12 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.288 2007/01/12 12:06:57 suka Exp $ + + 12 Jan 2007; Andreas Proschofsky + openoffice-2.1.0.ebuild: + Fix build without firefox or seamonkey, closes bug #161702 *openoffice-2.1.0 (12 Jan 2007) diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 5b324a53a3f5..b7158107bc95 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -42,14 +42,14 @@ EBUILD openoffice-2.0.4.ebuild 9998 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5 MD5 7387216086e33c7907d1450fe64bb965 openoffice-2.0.4.ebuild 9998 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5c9c openoffice-2.0.4.ebuild 9998 SHA256 64895490bbc4c12cf6f552ffb37d847c79f37e8563fa8a115b50c1865a2bdc10 openoffice-2.0.4.ebuild 9998 -EBUILD openoffice-2.1.0.ebuild 11209 RMD160 cbceaddb4984c2c85e79aa39395496e771dee317 SHA1 3e2deb8ca937729e19b864f625623fba06cf99c9 SHA256 cf71f6cebbe18d4b5195058b37d8aaa24fa0d25fde300c4bd6475cb20f875df3 -MD5 fba5a96fe4b13bf743aefec2c2c65f12 openoffice-2.1.0.ebuild 11209 -RMD160 cbceaddb4984c2c85e79aa39395496e771dee317 openoffice-2.1.0.ebuild 11209 -SHA256 cf71f6cebbe18d4b5195058b37d8aaa24fa0d25fde300c4bd6475cb20f875df3 openoffice-2.1.0.ebuild 11209 -MISC ChangeLog 60083 RMD160 8c3a71d23df5c958c011e7af88727336e6a8f538 SHA1 bb6a56bfc825f3bc436bfe4e590452e707585a99 SHA256 9cecada124f55f41f804ba32ae61c7b6e26eda1c9ed3b5c9fb62f6f47f90d5e0 -MD5 99d0d2296f99810c7c6a4cb13165805f ChangeLog 60083 -RMD160 8c3a71d23df5c958c011e7af88727336e6a8f538 ChangeLog 60083 -SHA256 9cecada124f55f41f804ba32ae61c7b6e26eda1c9ed3b5c9fb62f6f47f90d5e0 ChangeLog 60083 +EBUILD openoffice-2.1.0.ebuild 11258 RMD160 3ca6bef79c66480fb7be2972ba06b7575ea0eeeb SHA1 c40fd41005ff111a4c8c0473daf55fdcd6ed19d7 SHA256 44253486a8a47aa07303c2eeaa6631b5ab9567f6d4b6e73dfc61e3e25a9c81b8 +MD5 7e2189c60308014930487ee77403e251 openoffice-2.1.0.ebuild 11258 +RMD160 3ca6bef79c66480fb7be2972ba06b7575ea0eeeb openoffice-2.1.0.ebuild 11258 +SHA256 44253486a8a47aa07303c2eeaa6631b5ab9567f6d4b6e73dfc61e3e25a9c81b8 openoffice-2.1.0.ebuild 11258 +MISC ChangeLog 60225 RMD160 229567f40c0ea00969ad9b42a46d09ddc93949fa SHA1 96ab69f5369a82f2ee454411520ccc4434e30460 SHA256 8f88e38eaa8fd312b0e6062b3c8096b086ff91f0ece2e04b789be7266c410697 +MD5 dc5af2a2840dc823c7e8928e927490f6 ChangeLog 60225 +RMD160 229567f40c0ea00969ad9b42a46d09ddc93949fa ChangeLog 60225 +SHA256 8f88e38eaa8fd312b0e6062b3c8096b086ff91f0ece2e04b789be7266c410697 ChangeLog 60225 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.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild index fb758c0f80ae..1490e24fc670 100644 --- a/app-office/openoffice/openoffice-2.1.0.ebuild +++ b/app-office/openoffice/openoffice-2.1.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.1.0.ebuild,v 1.1 2007/01/12 07:02:12 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.2 2007/01/12 12:06:57 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -225,6 +225,7 @@ src_unpack() { echo "`use_with firefox`" >> ${CONFFILE} else echo "--disable-mozilla" >> ${CONFFILE} + echo "--without-system-mozilla" >> ${CONFFILE} fi echo "`use_enable cups`" >> ${CONFFILE} -- 2.26.2