summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2011-07-14 10:59:40 +0000
committerAndreas Proschofsky <suka@gentoo.org>2011-07-14 10:59:40 +0000
commit771db1b4263b15a6f7b65d9998620c5bfc47776e (patch)
treeac1cbacca7efb8326d26535a1ab83c2c1a679f8f /app-office
parentx86 stable per bug 369909 (diff)
downloadhistorical-771db1b4263b15a6f7b65d9998620c5bfc47776e.tar.gz
historical-771db1b4263b15a6f7b65d9998620c5bfc47776e.tar.bz2
historical-771db1b4263b15a6f7b65d9998620c5bfc47776e.zip
Fix env problem that messed up some peoples builds, see bug #374243
Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/Manifest4
-rw-r--r--app-office/libreoffice/libreoffice-3.4.1.ebuild6
3 files changed, 9 insertions, 6 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 3303a9d3681e..f6cd8b5aa3f4 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.35 2011/07/06 22:05:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.36 2011/07/14 10:59:40 suka Exp $
+
+ 14 Jul 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.4.1.ebuild:
+ Fix env problem that messed up some peoples builds, see bug #374243
06 Jul 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.4.1.ebuild,
metadata.xml:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a71b51dd7249..b6c68e101828 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -173,6 +173,6 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
-EBUILD libreoffice-3.4.1.ebuild 18816 RMD160 ef2812201eea81f0860a5a3eeca0296efd7dc9c9 SHA1 25198dff9f241b1c10cf885f3fa4b6463abe95fc SHA256 174c645abbc47ebe9b2efaeb0343397f5a1368d12a540782293d14548893c0b2
-MISC ChangeLog 7254 RMD160 29464d00b2b64405195887e2719fa62a2d398c06 SHA1 064747bb16858aecb68d2b327aa62c5a88b68bbc SHA256 58aa034975cb5560aa0505bd90fb5268911e63255f0fc27e7f78ebb72c781847
+EBUILD libreoffice-3.4.1.ebuild 18798 RMD160 81dd4529c2a56a23bfb8e1a5870fe70b50d4b326 SHA1 472088c448bbbaee66dc6792ee53105d5a2b6b33 SHA256 c00e95df78fcb0d8ec76ba7ac7d02c32091c3b13985acd83440bcdb71f9c56fe
+MISC ChangeLog 7404 RMD160 2e75922a3554cf2d066b1da0e1e002e3a3f2d36f SHA1 7c022fea37bb0c0c8142f85f529e3609ca56b66e SHA256 2804d373067d6c87308a5551fd308476b96118110018af49e56e70c2c170bbd6
MISC metadata.xml 796 RMD160 7306d61c906193b7f73fceeae0d333935c2998bb SHA1 40b3009cb0e11369e9e1a969018860ce21d9244e SHA256 0e6786c5227554b4c8848c2b7711f0ed40faa26c90afcfc72581a2adcddaba12
diff --git a/app-office/libreoffice/libreoffice-3.4.1.ebuild b/app-office/libreoffice/libreoffice-3.4.1.ebuild
index 765391a7367b..70acd0de574d 100644
--- a/app-office/libreoffice/libreoffice-3.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.1.ebuild,v 1.3 2011/07/06 22:05:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.1.ebuild,v 1.4 2011/07/14 10:59:40 suka Exp $
EAPI="3"
@@ -304,7 +304,7 @@ src_prepare() {
echo $(use_with ldap openldap) >> ${CONFFILE}
echo $(use_with offlinehelp helppack-integration) >> ${CONFFILE}
echo $(use_with java) >> ${CONFFILE}
- echo $(use_with templates sun-templates) >> ${CONFFILE}
+ echo "--without-sun-templates" >> ${CONFFILE}
echo $(use_enable debug crashdump) >> ${CONFFILE}
echo $(use_enable !debug strip-solver) >> ${CONFFILE}
echo $(use_enable odk) >> ${CONFFILE}
@@ -354,7 +354,7 @@ src_prepare() {
echo "--with-system-xrender-headers" >> ${CONFFILE}
echo "--with-system-zlib" >> ${CONFFILE}
echo "--with-unix-wrapper=libreoffice" >> ${CONFFILE}
- echo "--with-vendor=\\\"Gentoo Foundation\\\"" >> ${CONFFILE}
+ echo "--with-vendor=Gentoo Foundation" >> ${CONFFILE}
echo "--without-afms" >> ${CONFFILE}
echo "--without-fonts" >> ${CONFFILE}
echo "--without-junit" >> ${CONFFILE}