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 1SAP57-0005qX-OH for garchives@archives.gentoo.org; Wed, 21 Mar 2012 17:12:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B356EE0B9D; Wed, 21 Mar 2012 17:12:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 73616E0B9D for ; Wed, 21 Mar 2012 17:12:03 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC27F1B4053 for ; Wed, 21 Mar 2012 17:12:02 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 948) id 84C422004B; Wed, 21 Mar 2012 17:12:01 +0000 (UTC) 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: ChangeLog autotools.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog autotools.eclass X-VCS-Directories: eclass X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Petteno Content-Type: text/plain; charset=utf8 Message-Id: <20120321171201.84C422004B@flycatcher.gentoo.org> Date: Wed, 21 Mar 2012 17:12:01 +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: b07fb746-83e3-4868-8d2a-4e96ae1b656f X-Archives-Hash: 9135c4283b048e19c3f76aac7edc94d7 flameeyes 12/03/21 17:12:01 Modified: ChangeLog autotools.eclass Log: Go back to use a variable rather than an array for _LATEST_AUTOMAKE, us= e versionator eclass to go back to the full version instead, so that it's= clear what's going on and other developers don't misread the code. It's = only perfect for EAPI >=3D 0 but it's not broken on EAPI=3D0 anyway. Revision Changes Path 1.177 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.177&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.177&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= 1=3D1.176&r2=3D1.177 Index: ChangeLog =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/ChangeLog,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- ChangeLog 20 Mar 2012 20:37:21 -0000 1.176 +++ ChangeLog 21 Mar 2012 17:12:01 -0000 1.177 @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.176 2012/03/20 2= 0:37:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.177 2012/03/21 1= 7:12:01 flameeyes Exp $ + + 21 Mar 2012; Diego E. Petten=C3=B2 autotools.ec= lass: + Go back to use a variable rather than an array for _LATEST_AUTOMAKE, u= se + versionator eclass to go back to the full version instead, so that it'= s clear + what's going on and other developers don't misread the code. It's only + perfect for EAPI >=3D 0 but it's not broken on EAPI=3D0 anyway. =20 20 Mar 2012; Mike Gilbert python.eclass: Define _python_implementation() earlier. 1.127 eclass/autotools.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?rev=3D1.127&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?rev=3D1.127&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?r1=3D1.126&r2=3D1.127 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.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- autotools.eclass 21 Mar 2012 08:19:22 -0000 1.126 +++ autotools.eclass 21 Mar 2012 17:12:01 -0000 1.127 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.126 2012/= 03/21 08:19:22 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.127 2012/= 03/21 17:12:01 flameeyes Exp $ =20 # @ECLASS: autotools.eclass # @MAINTAINER: @@ -16,7 +16,7 @@ if [[ ${___ECLASS_ONCE_AUTOTOOLS} !=3D "recur -_+^+_- spank" ]] ; then ___ECLASS_ONCE_AUTOTOOLS=3D"recur -_+^+_- spank" =20 -inherit eutils libtool +inherit eutils libtool versionator =20 # @ECLASS-VARIABLE: WANT_AUTOCONF # @DESCRIPTION: @@ -37,13 +37,11 @@ # @INTERNAL # @DESCRIPTION: # CONSTANT! -# The latest major version/slot of automake available on each arch. #31= 2315 -# If a newer version is stable on any arch, and is NOT reflected in this= list, +# The latest major-minor version/slot of automake available on each arch= . #312315 +# If a newer slot is stable on any arch, and is NOT reflected in this li= st, # then circular dependencies may arise during emerge @system bootstraps. -# If you want to force a newer minor version, you can specify the correc= t -# WANT value by using a colon: [:] # Do NOT change this variable in your ebuilds! -_LATEST_AUTOMAKE=3D( 1.11.1:1.11 ) +_LATEST_AUTOMAKE=3D1.11.1 =20 _automake_atom=3D"sys-devel/automake" _autoconf_atom=3D"sys-devel/autoconf" @@ -52,8 +50,15 @@ none) _automake_atom=3D"" ;; # some packages don't require automake = at all # if you change the "latest" version here, change also autotools_run_t= ool # this MUST reflect the latest stable major version for each arch! - latest) _automake_atom=3D"|| ( `printf '>=3Dsys-devel/automake-%s ' ${= _LATEST_AUTOMAKE[@]/%:*}` )" ;; - *) _automake_atom=3D"=3Dsys-devel/automake-${WANT_AUTOMAKE}*" ;; + latest) + if [[ ${EAPI:-0} !=3D 0 ]]; then + _automake_atom=3D">=3Dsys-devel/automake-${_LATEST_AUTOMAKE}:$(get_v= ersion_component_range 1-2 ${_LATEST_AUTOMAKE})" + else + _automake_atom=3D">=3Dsys-devel/automake-${_LATEST_AUTOMAKE} =3Dsys-= devel/automake-$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})*" + fi + ;; + *) + _automake_atom=3D"=3Dsys-devel/automake-${WANT_AUTOMAKE}*" ;; esac export WANT_AUTOMAKE fi @@ -346,12 +351,10 @@ # We do the "latest" =E2=86=92 version switch here because it solves # possible order problems, see bug #270010 as an example. if [[ ${WANT_AUTOMAKE} =3D=3D "latest" ]]; then - local pv - for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do - # has_version respects ROOT, but in this case, we don't want it to, - # thus "ROOT=3D/" prefix: - ROOT=3D/ has_version "=3Dsys-devel/automake-${pv}*" && export WANT_AU= TOMAKE=3D"${pv}" - done + # has_version respects ROOT, but in this case, we don't want it to, + # thus "ROOT=3D/" prefix: + ROOT=3D/ has_version "=3Dsys-devel/automake-$(get_version_component_ra= nge 1-2 ${_LATEST_AUTOMAKE})*" && export WANT_AUTOMAKE=3D"$(get_version_c= omponent_range 1-2 ${_LATEST_AUTOMAKE})" + [[ ${WANT_AUTOMAKE} =3D=3D "latest" ]] && \ die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}" fi