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 1N0jXr-00021H-AB for garchives@archives.gentoo.org; Wed, 21 Oct 2009 22:20:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8911E090B; Wed, 21 Oct 2009 22:20:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A912DE090B for ; Wed, 21 Oct 2009 22:20:38 +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 AF91D67F1F for ; Wed, 21 Oct 2009 22:20:37 +0000 (UTC) Received: from lack by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1N0jXo-0004S3-VE for gentoo-commits@lists.gentoo.org; Wed, 21 Oct 2009 22:20:37 +0000 From: "Jim Ramsay (lack)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, lack@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: vim.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: vim.eclass X-VCS-Directories: eclass X-VCS-Committer: lack X-VCS-Committer-Name: Jim Ramsay Content-Type: text/plain; charset=utf8 Message-Id: Sender: Jim Ramsay Date: Wed, 21 Oct 2009 22:20:36 +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: eaceb52a-91a7-4821-beab-dac2b7d061db X-Archives-Hash: ffeb6adfb524734cd7a7c1c90402c629 lack 09/10/21 22:20:36 Modified: vim.eclass Log: Took Darkside's advice on preventing a double run of econf for EAPI=3D2= , plus scarabeus' tip on not accepting unknown EAPIs. Revision Changes Path 1.180 eclass/vim.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?= rev=3D1.180&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?= rev=3D1.180&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim.eclass?= r1=3D1.179&r2=3D1.180 Index: vim.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/vim.eclass,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- vim.eclass 17 Oct 2009 18:30:40 -0000 1.179 +++ vim.eclass 21 Oct 2009 22:20:36 -0000 1.180 @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.179 2009/10/17 = 18:30:40 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.180 2009/10/21 = 22:20:36 lack Exp $ =20 # Authors: # Jim Ramsay @@ -30,11 +30,15 @@ =20 # Check for EAPI functions we need: case "${EAPI:-0}" in + 0|1) + ;; 2) HAS_SRC_PREPARE=3D1 HAS_USE_DEP=3D1 ;; - *) ;; + *) + die "Unknown EAPI ${EAPI}" + ;; esac =20 if [[ ${PN##*-} =3D=3D "cvs" ]] ; then @@ -48,7 +52,7 @@ =20 TO_EXPORT=3D"pkg_setup src_compile src_install src_test pkg_postinst pkg= _postrm" if [[ $HAS_SRC_PREPARE ]]; then - TO_EXPORT=3D"${TO_EXPORT} src_prepare" + TO_EXPORT=3D"${TO_EXPORT} src_prepare src_configure" else TO_EXPORT=3D"${TO_EXPORT} src_unpack" fi @@ -344,7 +348,7 @@ vim_src_prepare } =20 -vim_src_compile() { +vim_src_configure() { local myconf =20 # Fix bug 37354: Disallow -funroll-all-loops on amd64 @@ -467,6 +471,10 @@ =20 myconf=3D"${myconf} --with-modified-by=3DGentoo-${PVR}" econf ${myconf} || die "vim configure failed" +} + +vim_src_compile() { + has src_configure ${TO_EXPORT} || vim_src_configure =20 # The following allows emake to be used make -j1 -C src auto/osdef.h objects || die "make failed"