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
commit4ca6404da6507809665af5b707ea06a4d10f9018 (patch)
treeb54a571a806ca46a94c5aba618fb5c5ff9f04660 /app-office
parentx86 stable per bug 369909 (diff)
downloadgentoo-2-4ca6404da6507809665af5b707ea06a4d10f9018.tar.gz
gentoo-2-4ca6404da6507809665af5b707ea06a4d10f9018.tar.bz2
gentoo-2-4ca6404da6507809665af5b707ea06a4d10f9018.zip
Fix env problem that messed up some peoples builds, see bug #374243
(Portage version: 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/libreoffice-3.4.1.ebuild6
2 files changed, 7 insertions, 4 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/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}