Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
Date: Mon, 26 Apr 2010 19:37:29
Message-Id: 20100426193726.245C52C04C@corvid.gentoo.org
1 abcd 10/04/26 19:37:25
2
3 Modified: gnome2.eclass
4 Log:
5 Add EAPI-3/Prefix support, bug #312531
6
7 Revision Changes Path
8 1.87 eclass/gnome2.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?rev=1.87&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?rev=1.87&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?r1=1.86&r2=1.87
13
14 Index: gnome2.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
17 retrieving revision 1.86
18 retrieving revision 1.87
19 diff -u -r1.86 -r1.87
20 --- gnome2.eclass 17 Feb 2009 16:05:33 -0000 1.86
21 +++ gnome2.eclass 26 Apr 2010 19:37:25 -0000 1.87
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2006 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.86 2009/02/17 16:05:33 dang Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.87 2010/04/26 19:37:25 abcd Exp $
27
28 #
29 # gnome2.eclass
30 @@ -83,6 +83,7 @@
31 }
32
33 gnome2_src_install() {
34 + has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
35 # if this is not present, scrollkeeper-update may segfault and
36 # create bogus directories in /var/lib/
37 local sk_tmp_dir="/var/lib/scrollkeeper"
38 @@ -93,10 +94,10 @@
39
40 if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then
41 debug-print "Installing with 'make install'"
42 - emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" install || die "install failed"
43 + emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
44 else
45 debug-print "Installing with 'einstall'"
46 - einstall "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" || die "einstall failed"
47 + einstall "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" || die "einstall failed"
48 fi
49
50 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
51 @@ -106,15 +107,15 @@
52
53 # Do not keep /var/lib/scrollkeeper because:
54 # 1. The scrollkeeper database is regenerated at pkg_postinst()
55 - # 2. ${D}/var/lib/scrollkeeper contains only indexes for the current pkg
56 + # 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg
57 # thus it makes no sense if pkg_postinst ISN'T run for some reason.
58 if [[ -z "$(find "${D}" -name '*.omf')" ]]; then
59 export SCROLLKEEPER_UPDATE="0"
60 fi
61 - rm -rf "${D}${sk_tmp_dir}"
62 + rm -rf "${ED}${sk_tmp_dir}"
63
64 # Make sure this one doesn't get in the portage db
65 - rm -fr "${D}/usr/share/applications/mimeinfo.cache"
66 + rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
67 }
68
69 gnome2_pkg_preinst() {