commit: 5f5cf8cfd67aecdcb2d6782e2503c2656cdf3efd
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:25:28 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> 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}
}
