summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-05-12 20:36:22 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-05-12 20:36:22 +0000
commit7e8a4474017e88b893c0ad66815354fc92257185 (patch)
tree066cf18ed1ea2cdc31edcefa2ca3453159c8a14a /app-office
parentRevbump with fix for bug 257313, OOM bug when compiling openoffice. (diff)
downloadhistorical-7e8a4474017e88b893c0ad66815354fc92257185.tar.gz
historical-7e8a4474017e88b893c0ad66815354fc92257185.tar.bz2
historical-7e8a4474017e88b893c0ad66815354fc92257185.zip
Bug 257313 is fixed. Update mono deps to match.
Package-Manager: portage-2.2_rc28/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog7
-rw-r--r--app-office/openoffice/Manifest8
-rw-r--r--app-office/openoffice/openoffice-3.0.0.ebuild4
-rw-r--r--app-office/openoffice/openoffice-3.0.1.ebuild4
-rw-r--r--app-office/openoffice/openoffice-3.1.0_beta7.ebuild4
5 files changed, 16 insertions, 11 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5ff39c44e7ee..7d1e50dbbd29 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
# 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.460 2009/05/03 20:15:36 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.461 2009/05/12 20:36:22 loki_val Exp $
+
+ 12 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+ openoffice-3.0.0.ebuild, openoffice-3.0.1.ebuild,
+ openoffice-3.1.0_beta7.ebuild:
+ Bug 257313 is fixed. Update mono deps to match.
03 May 2009; Peter Alfredsen <loki_val@gentoo.org>
openoffice-3.0.0.ebuild, openoffice-3.0.1.ebuild,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index b5bc7907d726..1ce2d80107a0 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -78,8 +78,8 @@ DIST ooo310-m11-ure.tar.bz2 5160732 RMD160 fd419b3a6a77dac2d95bc55afba5591bed093
DIST ooo310-m11-writer.tar.bz2 8955758 RMD160 876e1ecbd0bf8e6dbf9eaa95155868e44c33823f SHA1 fc37627f0a8aab578a64818f713ac87a838c4709 SHA256 093f42b6f102f3f9c7f934bdc071680fa50487628b8107aa335f623f8a770694
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.0.0.ebuild 12683 RMD160 dc3d3b2bba0922fe991d3905bce30aadaab08950 SHA1 f3a7f94bcd2dfa4faccf96e728a008ddd1d9a0fc SHA256 dd641dc1dd49ec778a72c3ac43b62ec169bd40bf89ecc93a2b557f5f1f59fec1
-EBUILD openoffice-3.0.1.ebuild 12213 RMD160 c7d8e43cd7f54269a5330421cd41c9629970ac86 SHA1 cef0d1bed41e27866d648c5a022d4bf6567761ec SHA256 ca7e4899c4dc54f5c515592e0ddffe5ffe96d3e8dae2dce9c8d9ffb6a87af741
-EBUILD openoffice-3.1.0_beta7.ebuild 12705 RMD160 b7f332ceee8af446d86ec79669b439e3b8428e7d SHA1 53635da1f694990e5720ccf83dbca1a6e302d5fb SHA256 4e8fc96c7920449a1466cb5ea6b97076753d0ba57d8a3c5a5f26353ea90f6987
-MISC ChangeLog 96166 RMD160 ba76b7ee231d1b8bf58dd5df98f3f1811b47f08f SHA1 2c8ad9484ab599f97451848223290eea01348403 SHA256 42427af6c71fcfa58c985ba83174971c6956526fc4a7e723fee071844eef1ee7
+EBUILD openoffice-3.0.0.ebuild 12712 RMD160 1f067c7899c55dad47cf2717474bb514c295bc8f SHA1 75e4bcc0ee1f7d67383abaef7cae785deda75a6e SHA256 173a0723104e6be35af7c0ffc80523961607e16fa484bf3c67a0d906c5b711f4
+EBUILD openoffice-3.0.1.ebuild 12242 RMD160 7ddb204426769993d93beb708ed536e91116659c SHA1 219dda129b89e472cdea0447a8a62dc2cf9bb051 SHA256 1a7d69c6e8aaafb64796025900044c97bd1e851a2d1e488b121dd6d515c8483e
+EBUILD openoffice-3.1.0_beta7.ebuild 12734 RMD160 1d0815bd33987c4c02fd3aab6144b2581b4fb6b0 SHA1 750300848f459470b87df54022e64ab99abaef5b SHA256 eacb705dfa99fc7f0319afdf28c4959bff4d3c3c23b7f4aeb671933f196d466f
+MISC ChangeLog 96355 RMD160 70e24f420e3a64192bb2038616e53d2e94ea7874 SHA1 7a3c50056fe5829f504d940a9f6ae5556bc8e8d4 SHA256 d679f4af017a6333e40cc9a96f3e54ac881dc495073a6720a65db0dd23c4974b
MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index 2d98badb1b3d..49f9669d175b 100644
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.24 2009/05/03 20:15:36 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.25 2009/05/12 20:36:22 loki_val Exp $
WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.9"
@@ -83,7 +83,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
kde? ( kde-base/kdelibs:3.5 )
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
- mono? ( <dev-lang/mono-2.4 )
+ mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
diff --git a/app-office/openoffice/openoffice-3.0.1.ebuild b/app-office/openoffice/openoffice-3.0.1.ebuild
index 577be63c324d..804e0b07a6ad 100644
--- a/app-office/openoffice/openoffice-3.0.1.ebuild
+++ b/app-office/openoffice/openoffice-3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.10 2009/05/03 20:15:36 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.11 2009/05/12 20:36:22 loki_val Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -82,7 +82,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
kde? ( kde-base/kdelibs:3.5 )
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
- mono? ( <dev-lang/mono-2.4 )
+ mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
diff --git a/app-office/openoffice/openoffice-3.1.0_beta7.ebuild b/app-office/openoffice/openoffice-3.1.0_beta7.ebuild
index 67b4aae0d05f..1123c986947f 100644
--- a/app-office/openoffice/openoffice-3.1.0_beta7.ebuild
+++ b/app-office/openoffice/openoffice-3.1.0_beta7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0_beta7.ebuild,v 1.2 2009/05/03 20:15:36 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0_beta7.ebuild,v 1.3 2009/05/12 20:36:22 loki_val Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -84,7 +84,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
kde? ( kde-base/kdelibs:3.5 )
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
- mono? ( <dev-lang/mono-2.4 )
+ mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )