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 ) id 1O6U7V-00036i-9S for garchives@archives.gentoo.org; Mon, 26 Apr 2010 19:37:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 863F6E08D4; Mon, 26 Apr 2010 19:37:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6254DE08D4 for ; Mon, 26 Apr 2010 19:37:27 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 0A5411B4020 for ; Mon, 26 Apr 2010 19:37:27 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2253) id 245C52C04C; Mon, 26 Apr 2010 19:37:25 +0000 (UTC) From: "Jonathan Callen (abcd)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, abcd@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: gnome2.eclass X-VCS-Directories: eclass X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen Content-Type: text/plain; charset=utf8 Message-Id: <20100426193726.245C52C04C@corvid.gentoo.org> Date: Mon, 26 Apr 2010 19:37:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 66997230-01b2-4379-8657-6624a23fa0c7 X-Archives-Hash: 48bfa2144e0ee1a13d5530daaca944d0 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.ecla= ss?rev=3D1.87&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.ecla= ss?rev=3D1.87&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.ecla= ss?r1=3D1.86&r2=3D1.87 Index: gnome2.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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/1= 7 16:05:33 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.87 2010/04/2= 6 19:37:25 abcd Exp $ =20 # # gnome2.eclass @@ -83,6 +83,7 @@ } =20 gnome2_src_install() { + has ${EAPI:-0} 0 1 2 && ! use prefix && ED=3D"${D}" # if this is not present, scrollkeeper-update may segfault and # create bogus directories in /var/lib/ local sk_tmp_dir=3D"/var/lib/scrollkeeper" @@ -93,10 +94,10 @@ =20 if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" =3D "0" ]]; then debug-print "Installing with 'make install'" - emake DESTDIR=3D"${D}" "scrollkeeper_localstate_dir=3D${D}${sk_tmp_dir= } " "$@" install || die "install failed" + emake DESTDIR=3D"${D}" "scrollkeeper_localstate_dir=3D${ED}${sk_tmp_di= r} " "$@" install || die "install failed" else debug-print "Installing with 'einstall'" - einstall "scrollkeeper_localstate_dir=3D${D}${sk_tmp_dir} " "$@" || di= e "einstall failed" + einstall "scrollkeeper_localstate_dir=3D${ED}${sk_tmp_dir} " "$@" || d= ie "einstall failed" fi =20 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL @@ -106,15 +107,15 @@ =20 # 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 pk= g + # 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current p= kg # thus it makes no sense if pkg_postinst ISN'T run for some reason. if [[ -z "$(find "${D}" -name '*.omf')" ]]; then export SCROLLKEEPER_UPDATE=3D"0" fi - rm -rf "${D}${sk_tmp_dir}" + rm -rf "${ED}${sk_tmp_dir}" =20 # 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" } =20 gnome2_pkg_preinst() {