summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-05-20 17:12:34 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-05-20 17:12:34 +0000
commit553214d307d249153403170e29b20e5df5fe3674 (patch)
treebd3e2419663a22d497ef3e2047d69ee14d00520b
parentfix typo in ChangeLog (diff)
downloadgentoo-2-553214d307d249153403170e29b20e5df5fe3674.tar.gz
gentoo-2-553214d307d249153403170e29b20e5df5fe3674.tar.bz2
gentoo-2-553214d307d249153403170e29b20e5df5fe3674.zip
Try to avoid sandbox violation when running qhelpgenerator, bug 415517.
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/qt4-build.eclass5
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 605e829d8937..ccd76e986e83 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.254 2012/05/19 16:26:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.255 2012/05/20 17:12:34 pesa Exp $
+
+ 20 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+ Try to avoid sandbox violation when running qhelpgenerator, bug 415517.
19 May 2012; Ulrich Müller <ulm@gentoo.org> xemacs-elisp-common.eclass:
Fix name space collision with elisp-common.eclass, bug 406053.
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index be72e71689fb..73b4f9439ff8 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.128 2012/05/07 21:28:01 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.129 2012/05/20 17:12:34 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -580,8 +580,9 @@ setqtenv() {
QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
PLATFORM=$(qt_mkspecs_dir)
-
unset QMAKESPEC
+
+ export XDG_CONFIG_HOME="${T}"
}
# @FUNCTION: prepare_directories