* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2010-04-26 19:37 99% Jonathan Callen (abcd)
0 siblings, 0 replies; 1+ results
From: Jonathan Callen (abcd) @ 2010-04-26 19:37 UTC (permalink / raw
To: gentoo-commits
abcd 10/04/26 19:37:25
Modified: gnome2.eclass
Log:
Add EAPI-3/Prefix support, bug #312531
Revision Changes Path
1.87 eclass/gnome2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?r1=1.86&r2=1.87
Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gnome2.eclass 17 Feb 2009 16:05:33 -0000 1.86
+++ gnome2.eclass 26 Apr 2010 19:37:25 -0000 1.87
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.86 2009/02/17 16:05:33 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.87 2010/04/26 19:37:25 abcd Exp $
#
# gnome2.eclass
@@ -83,6 +83,7 @@
}
gnome2_src_install() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
# if this is not present, scrollkeeper-update may segfault and
# create bogus directories in /var/lib/
local sk_tmp_dir="/var/lib/scrollkeeper"
@@ -93,10 +94,10 @@
if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then
debug-print "Installing with 'make install'"
- emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" install || die "install failed"
+ emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
else
debug-print "Installing with 'einstall'"
- einstall "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" || die "einstall failed"
+ einstall "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" || die "einstall failed"
fi
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -106,15 +107,15 @@
# Do not keep /var/lib/scrollkeeper because:
# 1. The scrollkeeper database is regenerated at pkg_postinst()
- # 2. ${D}/var/lib/scrollkeeper contains only indexes for the current pkg
+ # 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg
# thus it makes no sense if pkg_postinst ISN'T run for some reason.
if [[ -z "$(find "${D}" -name '*.omf')" ]]; then
export SCROLLKEEPER_UPDATE="0"
fi
- rm -rf "${D}${sk_tmp_dir}"
+ rm -rf "${ED}${sk_tmp_dir}"
# Make sure this one doesn't get in the portage db
- rm -fr "${D}/usr/share/applications/mimeinfo.cache"
+ rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
}
gnome2_pkg_preinst() {
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2010-04-26 19:37 99% [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass Jonathan Callen (abcd)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox