diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2010-01-14 16:15:58 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2010-01-14 16:15:58 +0000 |
| commit | 3b3b96032e62e4193cf6ab079b3ff73366728cb7 (patch) | |
| tree | 4e4531310b84cabbf9d558f5f75083f6ae52604d /app-office/openoffice | |
| parent | Marking nokogiri-1.4.1 ~ppc for bug 297822 (diff) | |
| download | historical-3b3b96032e62e4193cf6ab079b3ff73366728cb7.tar.gz historical-3b3b96032e62e4193cf6ab079b3ff73366728cb7.tar.bz2 historical-3b3b96032e62e4193cf6ab079b3ff73366728cb7.zip | |
Remove seamonkey-1 support for bug #300409
Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.1.1.ebuild | 10 |
3 files changed, 12 insertions, 10 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index affe68115e97..944d262f0d38 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.504 2009/11/28 20:54:32 suka Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.505 2010/01/14 16:15:58 suka Exp $ + + 14 Jan 2010; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.1.1.ebuild: + Remove seamonkey-1 support for bug #300409 28 Nov 2009; Andreas Proschofsky <suka@gentoo.org> openoffice-3.1.1.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 7c58a5ffab5a..980776bcd477 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -39,6 +39,6 @@ DIST ooo310-m19-writer.tar.bz2 9021103 RMD160 47d18795af5e643d4f9eb323b27458ad1f DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a 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 13683 RMD160 a6ed2796c7ad3129216044e142aac5a8b114b0c9 SHA1 b22a16d1fe2407a999c887d6c5b24a1e24147135 SHA256 f731ca82ab033ebd28f817f1238ba22c96ca869ede6b087fa9a602cda132324d -MISC ChangeLog 104424 RMD160 99e2ee046ccbd5f7c879211e329bc77242f4fbf7 SHA1 2fe149bb66f1e687663d331b5f6eefb6bb15aa71 SHA256 db4e4608ddc00821151ae2328af3c2ae61335536882c958a2789dbd5578f1f69 +EBUILD openoffice-3.1.1.ebuild 13576 RMD160 ce8341f91a38040eebf00908b237e9717ea2fc98 SHA1 b5024c9e1d34ab546aa3c0560df37dfde420abcf SHA256 d711c7e766878aa561bdb8a8d76624c9d407637a76cb21f8a0312f7f25bb8026 +MISC ChangeLog 104550 RMD160 79ab1ff8adbfc89b1589a39a13169f89052e456a SHA1 fbc39eab5aeb876919c9408fb79072f62f1a9f47 SHA256 132423ed1281ca7f3fa3d4bf21832aecda4671e4bbf573029299cdeca31137f4 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild index 47b60f7e8394..d0a191469ade 100644 --- a/app-office/openoffice/openoffice-3.1.1.ebuild +++ b/app-office/openoffice/openoffice-3.1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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.1.1.ebuild,v 1.25 2009/11/28 20:54:32 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.26 2010/01/14 16:15:58 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -98,7 +98,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 =www-client/seamonkey-1* ) + nsplugin? ( || ( net-libs/xulrunner:1.9 net-libs/xulrunner:1.8 ) >=dev-libs/nspr-4.6.6 >=dev-libs/nss-3.11-r1 ) opengl? ( virtual/opengl @@ -211,10 +211,8 @@ pkg_setup() { BRWS="libxul" elif pkg-config --exists xulrunner-xpcom; then BRWS="xulrunner" - elif pkg-config --exists seamonkey-xpcom; then - BRWS="seamonkey" else - die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!" + die "USE flag [nsplugin] set but no installed xulrunner found!" fi fi |