From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 959251395E2 for ; Sun, 30 Oct 2016 11:44:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFA94E0C1B; Sun, 30 Oct 2016 11:44:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D81DEE0C1C for ; Sun, 30 Oct 2016 11:44:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6241341640 for ; Sun, 30 Oct 2016 11:44:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8159124AF for ; Sun, 30 Oct 2016 11:44:40 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1477827155.5f5cf8cfd67aecdcb2d6782e2503c2656cdf3efd.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2-live.eclass X-VCS-Directories: eclass/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 5f5cf8cfd67aecdcb2d6782e2503c2656cdf3efd X-VCS-Branch: master Date: Sun, 30 Oct 2016 11:44:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d9ec10e9-1a14-497c-bfbb-86be8f686a21 X-Archives-Hash: 91848b5b392a4fcd4eef7de55ccf1515 commit: 5f5cf8cfd67aecdcb2d6782e2503c2656cdf3efd Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Oct 30 11:25:28 2016 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Oct 30 11:32:35 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5f5cf8cf eclass/gnome2-live: sync src_prepare with gnome2.eclass Use xdg eclass to clean environment, etc eclass/gnome2-live.eclass | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass index 7771c50..0e725d0 100644 --- a/eclass/gnome2-live.eclass +++ b/eclass/gnome2-live.eclass @@ -14,7 +14,7 @@ # Always to be imported *AFTER* gnome2.eclass # -inherit autotools eutils gnome2 gnome2-utils libtool git-r3 +inherit autotools eutils gnome2 gnome2-utils libtool git-r3 xdg EXPORTED_FUNCTIONS=" " case "${EAPI:-0}" in @@ -105,9 +105,7 @@ gnome2-live_src_prepare() { ### Keep this in-sync with gnome2.eclass! - # Don't use the session bus address inherited via the environment - # causes test and introspection-building failures - unset DBUS_SESSION_BUS_ADDRESS + xdg_src_prepare # Prevent assorted access violations and test failures gnome2_environment_reset @@ -115,7 +113,8 @@ gnome2-live_src_prepare() { # Prevent scrollkeeper access violations gnome2_omf_fix - # Libtool patching + # Run libtoolize + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 elibtoolize ${ELTCONF} }