From cd6fd1a7be9f304ae095681b174422b65ad7a160 Mon Sep 17 00:00:00 2001 From: Raúl Porcel Date: Mon, 17 Mar 2008 14:12:28 +0000 Subject: Fix deps for net-libs/xulrunner and www-client/mozilla-firefox Package-Manager: portage-2.1.4.4 --- app-office/openoffice/ChangeLog | 5 ++++- app-office/openoffice/Manifest | 4 ++-- app-office/openoffice/openoffice-2.3.1-r1.ebuild | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'app-office') diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 9cb07d7daea4..3262e8c89fa0 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.371 2008/03/07 14:33:44 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.372 2008/03/17 14:12:28 armin76 Exp $ + + 17 Mar 2008; Raúl Porcel openoffice-2.3.1-r1.ebuild: + Fix deps for net-libs/xulrunner and www-client/mozilla-firefox 07 Mar 2008; Andreas Proschofsky -files/2.3.1/gentoo-2.3.1.diff, diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index fb1303ef72e5..db3913e4b80e 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -18,6 +18,6 @@ DIST ooo-build-2.3.1.2.tar.gz 8919121 RMD160 bbf48c05b9bfbd4633bc798b2e92c45c464 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e -EBUILD openoffice-2.3.1-r1.ebuild 12383 RMD160 1870c5400ac1b5796a550033e79f89a84f412ae5 SHA1 8e49a130097ef19d0a09de076a1db10db95a01a0 SHA256 8047184ad6019b2cf7f8c5f57f07ebd1668a3ea3c5cbfc5f267a1d8bec5c42cf -MISC ChangeLog 77540 RMD160 da6ed7a44635fbb1c89d8edfd3e8d6c3c135e322 SHA1 51cf9ef88ff396ebd821b5cfd6950587095fad69 SHA256 3d36320c8e99a61df991c0f34bc3f915b0c3b28645a52e975140c50c9aef893b +EBUILD openoffice-2.3.1-r1.ebuild 12392 RMD160 a19c9bbd61d2271af28e47f116764da5b4dfd459 SHA1 fe1c880912936791fd36eb6ff7026ed8e10393fc SHA256 806505dfa32bc6c8953fd9f8b7629e31e59f01e01d39029e6a30214b16738bd5 +MISC ChangeLog 77686 RMD160 d3bf3b1a55b4e703448c9c3d61715e1473ec75d1 SHA1 7acb576e73c3525294ffad99708213ef1d6cf43a SHA256 8fb9157dcc4e8e38a6c79248bed58dd173345c10d3c82953f271591e79eaea5e MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 diff --git a/app-office/openoffice/openoffice-2.3.1-r1.ebuild b/app-office/openoffice/openoffice-2.3.1-r1.ebuild index 7629646a3c1e..f649341dfe92 100644 --- a/app-office/openoffice/openoffice-2.3.1-r1.ebuild +++ b/app-office/openoffice/openoffice-2.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1-r1.ebuild,v 1.6 2008/03/05 15:36:01 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1-r1.ebuild,v 1.7 2008/03/17 14:12:28 armin76 Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -67,13 +67,13 @@ COMMON_DEPEND="!app-office/openoffice-bin >=dev-java/xerces-2.7 =dev-java/xml-commons-external-1.3* ) mono? ( >=dev-lang/mono-1.2.3.1 ) - firefox? ( >=www-client/mozilla-firefox-1.5-r9 + firefox? ( =www-client/mozilla-firefox-2* >=dev-libs/nspr-4.6.6 >=dev-libs/nss-3.11-r1 ) - !firefox? ( seamonkey? ( www-client/seamonkey + !firefox? ( seamonkey? ( =www-client/seamonkey-1* >=dev-libs/nspr-4.6.6 >=dev-libs/nss-3.11-r1 ) ) - !firefox? ( !seamonkey? ( xulrunner? ( net-libs/xulrunner + !firefox? ( !seamonkey? ( xulrunner? ( =net-libs/xulrunner-1.8* >=dev-libs/nspr-4.6.6 >=dev-libs/nss-3.11-r1 ) ) ) sound? ( >=media-libs/portaudio-18.1-r5 -- cgit v1.2.3-65-gdbad