From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LZSRz-0003Pj-Ax for garchives@archives.gentoo.org; Tue, 17 Feb 2009 16:05:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 254F8E01EF; Tue, 17 Feb 2009 16:05:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 05CF9E01EF for ; Tue, 17 Feb 2009 16:05:34 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id A0BAEB54F2 for ; Tue, 17 Feb 2009 16:05:33 +0000 (UTC) Received: from dang by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LZSRx-0007T5-9R for gentoo-commits@lists.gentoo.org; Tue, 17 Feb 2009 16:05:33 +0000 From: "Daniel Gryniewicz (dang)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dang@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: dang X-VCS-Committer-Name: Daniel Gryniewicz Content-Type: text/plain; charset=utf8 Message-Id: Sender: Daniel Gryniewicz Date: Tue, 17 Feb 2009 16:05:33 +0000 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: a7f7aae5-97d3-4d3c-a54a-b26bc306471e X-Archives-Hash: fe9d7b458d58bc3d7a459e9d0416a40e dang 09/02/17 16:05:33 Modified: gnome2.eclass Log: Make gnome2.eclass EAPI 2 ready. Bug #239123 Revision Changes Path 1.86 eclass/gnome2.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.ecla= ss?rev=3D1.86&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.ecla= ss?rev=3D1.86&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.ecla= ss?r1=3D1.85&r2=3D1.86 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.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- gnome2.eclass 22 Mar 2008 10:19:05 -0000 1.85 +++ gnome2.eclass 17 Feb 2009 16:05:33 -0000 1.86 @@ -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.85 2008/03/2= 2 10:19:05 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.86 2009/02/1= 7 16:05:33 dang Exp $ =20 # # gnome2.eclass @@ -14,6 +14,14 @@ =20 inherit fdo-mime libtool gnome.org gnome2-utils =20 +case "${EAPI:-0}" in + 0|1) + EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_po= stinst pkg_postrm + ;; + *) + EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_= install pkg_preinst pkg_postinst pkg_postrm + ;; +esac =20 # Extra configure opts passed to econf G2CONF=3D${G2CONF:-""} @@ -38,7 +46,10 @@ gnome2_src_unpack() { unpack ${A} cd "${S}" + has ${EAPI:-0} 0 1 && gnome2_src_prepare +} =20 +gnome2_src_prepare() { # Prevent scrollkeeper access violations gnome2_omf_fix =20 @@ -67,7 +78,7 @@ } =20 gnome2_src_compile() { - gnome2_src_configure "$@" + has ${EAPI:-0} 0 1 && gnome2_src_configure "$@" emake || die "compile failure" } =20 @@ -137,4 +148,3 @@ } =20 # pkg_prerm -EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_post= inst pkg_postrm