From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-363680-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Qiy5R-0005KR-E1
	for garchives@archives.gentoo.org; Tue, 19 Jul 2011 00:22:57 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4277421C04F;
	Tue, 19 Jul 2011 00:22:48 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 0CFF121C04E
	for <gentoo-commits@lists.gentoo.org>; Tue, 19 Jul 2011 00:22:47 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 6F4971BC012
	for <gentoo-commits@lists.gentoo.org>; Tue, 19 Jul 2011 00:22:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id D4B8C8003F
	for <gentoo-commits@lists.gentoo.org>; Tue, 19 Jul 2011 00:22:46 +0000 (UTC)
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" <tetromino@gmail.com>
Message-ID: <245129652c43bf9a52fde33ae303f4cc744018dc.tetromino@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: eclass/
X-VCS-Repository: proj/gnome
X-VCS-Files: eclass/gnome2.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: tetromino
X-VCS-Committer-Name: Alexandre Restovtsev
X-VCS-Revision: 245129652c43bf9a52fde33ae303f4cc744018dc
Date: Tue, 19 Jul 2011 00:22:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 91e35614fedc327db3abb83f9fdee96e

commit:     245129652c43bf9a52fde33ae303f4cc744018dc
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 00:13:33 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 19 00:18:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3D24512965

eclass/gnome2.eclass: fixes from gx86 for hasq, ~/.gnome2

Add the following changes from gentoo-x86 CVS:

 Revision 1.97 Fri Jul 8 11:35:01 2011 UTC by ssuominen

 Convert every instance of hasq to has.

 Revision 1.98 Fri Jul 15 17:31:37 2011 UTC by zmedico

 Bug #345659 - fix hardcoded /root/.gnome2

 This uses a special $(unset HOME; echo ~) trick to query the home
 directory that gnome-vfs uses from the password database, as suggested
 by Jonathan Callen <abcd <AT> gentoo.org> in bug 345659, comment #24.

---
 eclass/gnome2.eclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c127655..c655269 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -133,12 +133,12 @@ gnome2_src_configure() {
 	fi
=20
 	# Prevent a QA warning
-	if hasq doc ${IUSE} ; then
+	if has doc ${IUSE} ; then
 		G2CONF=3D"${G2CONF} $(use_enable doc gtk-doc)"
 	fi
=20
-	# Avoid sandbox violations caused by misbehaving packages (bug #128289)
-	addwrite "/root/.gnome2"
+	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659=
)
+	addwrite "$(unset HOME; echo ~)/.gnome2"
=20
 	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
 	GST_REGISTRY=3D"${S}/registry.xml" econf "$@" ${G2CONF}