summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2010-02-25 17:57:00 +0000
committerAndreas Proschofsky <suka@gentoo.org>2010-02-25 17:57:00 +0000
commit6f0c3fa3e06cc689700d4eca0096f9eaab31485d (patch)
treec27c883003fa9865d0cac1a389f31b481137cbec /app-office
parentRemove useless binchecks, this runs in a chroot (diff)
downloadhistorical-6f0c3fa3e06cc689700d4eca0096f9eaab31485d.tar.gz
historical-6f0c3fa3e06cc689700d4eca0096f9eaab31485d.tar.bz2
historical-6f0c3fa3e06cc689700d4eca0096f9eaab31485d.zip
Disable system-redland for now, causes troubles
Package-Manager: portage-2.2_rc63/cvs/Linux i686
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog7
-rw-r--r--app-office/openoffice/Manifest4
-rw-r--r--app-office/openoffice/openoffice-3.2.0.ebuild7
3 files changed, 11 insertions, 7 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 00d34948e6f3..ec4224bfff99 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/openoffice
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.517 2010/02/25 09:51:29 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.518 2010/02/25 17:57:00 suka Exp $
+
+ 25 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-3.2.0.ebuild:
+ Disable system-redland for now, causes troubles, see
+ http://qa.openoffice.org/issues/show_bug.cgi?id=108911
25 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
openoffice-3.2.0.ebuild, files/gentoo-3.2.0.diff:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index dcb2ca192a22..ff905aa4e90b 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -50,6 +50,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c
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 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c
-EBUILD openoffice-3.2.0.ebuild 13251 RMD160 6089abd87f5bea5ee50b687e676ce36b011d4cd1 SHA1 9a35cc27a68d26b7db1939dd2acc4a06145075d7 SHA256 cbab556885b7dd8d1f5ce382735c2996290c9b7abcbcb94301261a04aa9811d8
-MISC ChangeLog 106495 RMD160 45c2934d3df8b6e423b689848d5b223ad5eb606a SHA1 122a8745cf4e07ac937f713e6b73da9e1098996e SHA256 c91ea1d8d6761f593592738b2f95ef2f518edd066a6811da4da25695c3916d78
+EBUILD openoffice-3.2.0.ebuild 13253 RMD160 243bf4f7c0760608b1b8876fadbf69c36438d593 SHA1 7665308f19767ad3dc1dd0de16cf96460e0e38d9 SHA256 32312004d0908cea698be80ca90fd1828e9b8185fb29b750a8b617f1b469c300
+MISC ChangeLog 106689 RMD160 0beefc31ead512267112f88388487bdf523b8a89 SHA1 c9497be90efddea7f635c018b3f26402d98b6b90 SHA256 8e59df7136b0dea87c71604c49eb21649c8c9fce778788383b86c5196851aa40
MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index 32858a87cdb0..ab102f95b50a 100644
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,6 +1,6 @@
# 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.2.0.ebuild,v 1.11 2010/02/25 09:51:29 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.12 2010/02/25 17:57:00 suka Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -104,7 +104,6 @@ COMMON_DEPEND="!app-office/openoffice-bin
>=dev-libs/icu-4.0
>=sys-libs/db-4.3
>=app-text/libwpd-0.8.8
- >=dev-libs/redland-1.0.8
>=media-libs/vigra-1.4
>=app-text/poppler-0.12.3-r3
>=media-libs/libwpg-0.1.3"
@@ -272,8 +271,8 @@ src_prepare() {
# Use splash screen without Sun logo
echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
- # Upstream this
- echo "--with-system-redland" >> ${CONFFILE}
+ # Upstream this, disabled for now #i108911
+ #echo "--with-system-redland" >> ${CONFFILE}
# needed for sun-templates patch
eautoreconf