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 1S6S20-0001AY-AC for garchives@archives.gentoo.org; Sat, 10 Mar 2012 19:32:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 076DEE068C; Sat, 10 Mar 2012 19:32:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B8DACE068C for ; Sat, 10 Mar 2012 19:32:35 +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 EDA571B4007 for ; Sat, 10 Mar 2012 19:32:34 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2145) id C3A202004B; Sat, 10 Mar 2012 19:32:33 +0000 (UTC) From: "Ryan Hill (dirtyepic)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dirtyepic@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog toolchain.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog toolchain.eclass X-VCS-Directories: eclass X-VCS-Committer: dirtyepic X-VCS-Committer-Name: Ryan Hill Content-Type: text/plain; charset=utf8 Message-Id: <20120310193233.C3A202004B@flycatcher.gentoo.org> Date: Sat, 10 Mar 2012 19:32:33 +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: 8d7bfade-ac14-451f-90c6-196844de63a1 X-Archives-Hash: 559858076e433b5657b47629c59739f7 dirtyepic 12/03/10 19:32:33 Modified: ChangeLog toolchain.eclass Log: Tweak live ebuild bits. Revision Changes Path 1.162 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.162&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.162&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= 1=3D1.161&r2=3D1.162 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.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- ChangeLog 10 Mar 2012 17:49:56 -0000 1.161 +++ ChangeLog 10 Mar 2012 19:32:33 -0000 1.162 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.161 2012/03/10 1= 7:49:56 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.162 2012/03/10 1= 9:32:33 dirtyepic Exp $ + + 10 Mar 2012; Ryan Hill toolchain.eclass: + Tweak live ebuild bits. =20 10 Mar 2012; Ryan Hill toolchain.eclass: Fix unpacking of live git ebuilds. 1.526 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.526&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.526&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?r1=3D1.525&r2=3D1.526 Index: toolchain.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/toolchain.eclass,v retrieving revision 1.525 retrieving revision 1.526 diff -u -r1.525 -r1.526 --- toolchain.eclass 10 Mar 2012 17:49:56 -0000 1.525 +++ toolchain.eclass 10 Mar 2012 19:32:33 -0000 1.526 @@ -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/toolchain.eclass,v 1.525 2012/= 03/10 17:49:56 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.526 2012/= 03/10 19:32:33 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas =20 @@ -15,7 +15,7 @@ EGIT_REPO_URI=3D"git://gcc.gnu.org/git/gcc.git" # naming style: # gcc-9999 -> master - # gcc-4.7_pre9999 -> 4.7 branch + # gcc-4.7_pre9999 -> gcc-4_7-branch if [[ ${PV} =3D=3D *_pre9999* ]] ; then EGIT_BRANCH=3D"${PN}-${PV%_pre9999}-branch" EGIT_BRANCH=3D${EGIT_BRANCH//./_} @@ -189,6 +189,8 @@ echo ${WORKDIR}/gcc-${PRERELEASE} elif [[ -n ${SNAPSHOT} ]] ; then echo ${WORKDIR}/gcc-${SNAPSHOT} + elif [[ ${GCC_PV} =3D=3D *9999* ]] ; then + echo ${WORKDIR}/${P} else echo ${WORKDIR}/gcc-${GCC_RELEASE_VER} fi @@ -714,14 +716,11 @@ done } toolchain_src_unpack() { - [[ ${PV} =3D=3D *9999* ]] && git-2_src_unpack - - export BRANDING_GCC_PKGVERSION=3D"Gentoo ${GCC_PVR}" - [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} =3D=3D *-uclibc* ]] && die "Sor= ry, this version does not support uClibc" =20 - gcc_quick_unpack + [[ ${PV} =3D=3D *9999* ]] && git-2_src_unpack || gcc_quick_unpack =20 + export BRANDING_GCC_PKGVERSION=3D"Gentoo ${GCC_PVR}" cd "${S}" =20 if ! use vanilla ; then @@ -764,7 +763,7 @@ =20 gcc_version_patch if tc_version_is_at_least 4.1 ; then - if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} || -n ${GCC_SVN} ]] ; then + if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then echo ${PV/_/-} > "${S}"/gcc/BASE-VER fi fi