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 1NxHOA-0007HU-CR for garchives@archives.gentoo.org; Thu, 01 Apr 2010 10:12:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75211E0AC2; Thu, 1 Apr 2010 10:12:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 410E3E0AC2 for ; Thu, 1 Apr 2010 10:12:37 +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 C75361B40FA for ; Thu, 1 Apr 2010 10:12:36 +0000 (UTC) Received: from flameeyes by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NxHO8-0001zs-E8 for gentoo-commits@lists.gentoo.org; Thu, 01 Apr 2010 10:12:36 +0000 From: "Diego Petteno (flameeyes)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, flameeyes@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: autotools.eclass X-VCS-Directories: eclass X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Petteno Content-Type: text/plain; charset=utf8 Message-Id: Sender: Diego Petteno Date: Thu, 01 Apr 2010 10:12: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: 7adb9b56-72b2-4ef9-9523-b9536df32f29 X-Archives-Hash: 1a97584fd083d4a99faa8d802e9a8085 flameeyes 10/04/01 10:12:36 Modified: autotools.eclass Log: Try to unbreak revision 1.95, at least guessing what Robin tried to do. Revision Changes Path 1.96 eclass/autotools.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?rev=3D1.96&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?rev=3D1.96&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?r1=3D1.95&r2=3D1.96 Index: autotools.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/autotools.eclass,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- autotools.eclass 31 Mar 2010 02:11:55 -0000 1.95 +++ autotools.eclass 1 Apr 2010 10:12:36 -0000 1.96 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.95 2010/0= 3/31 02:11:55 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.96 2010/0= 4/01 10:12:36 flameeyes Exp $ =20 # @ECLASS: autotools.eclass # @MAINTAINER: @@ -27,7 +27,7 @@ # @ECLASS-VARIABLE: _LATEST_AUTOMAKE # @DESCRIPTION: # CONSTANT! -# The latest major version/slot of automake available on each arch.=20 +# The latest major version/slot of automake available on each arch. # If a newer version is stable on any arch, and is NOT reflected in this= list, # then circular dependencies may arise during emerge @system bootstraps. # Do NOT change this variable in your ebuilds! @@ -40,12 +40,13 @@ none) _automake_atom=3D"" ;; # some packages don't require automake = at all # if you change the =E2=80=9Clatest=E2=80=9D version here, change also= autotools_run_tool # this MUST reflect the latest stable major version for each arch! - latest)=20 - t=3D"" ; for v in ${_LATEST_AUTOMAKE} ; do + latest) + t=3D"" + for v in ${_LATEST_AUTOMAKE} ; do t=3D"${t} =3Dsys-devel/automake-${v}*" done + _automake_atom=3D"|| ( ${t} )" unset t v - _automake_atom=3D"|| ( ${_automake_atom} )"=20 ;; *) _automake_atom=3D"=3Dsys-devel/automake-${WANT_AUTOMAKE}*" ;; esac @@ -277,12 +278,14 @@ =20 # We do the =E2=80=9Clatest=E2=80=9D =E2=86=92 version switch here beca= use it solves # possible order problems, see bug #270010 as an example. - for pv in ${_LATEST_AUTOMAKE} ; do - has_version "=3Dsys-devel/automake-${pv}*" && export WANT_AUTOMAKE=3D"= $pv" - done - unset pv - [[ ${WANT_AUTOMAKE} =3D=3D "latest" ]] && \ - die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}" + if [[ ${WANT_AUTOMAKE} =3D=3D "latest" ]]; then + for pv in ${_LATEST_AUTOMAKE} ; do + has_version "=3Dsys-devel/automake-${pv}*" && export WANT_AUTOMAKE=3D= "$pv" + done + unset pv + [[ ${WANT_AUTOMAKE} =3D=3D "latest" ]] && \ + die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}" + fi [[ ${WANT_AUTOCONF} =3D=3D "latest" ]] && export WANT_AUTOCONF=3D2.5 =20 local STDERR_TARGET=3D"${T}/$1.out"