diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2012-03-10 17:49:56 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2012-03-10 17:49:56 +0000 |
| commit | dc32f0e290f9dd9cb9cf662a215dc184dbd71530 (patch) | |
| tree | 9ab210d8070a3fe4500b01308d90f3d615f328b7 /eclass | |
| parent | Move to EAPI=4 and import pypy fixes from progress overlay, thanks Arfrever f... (diff) | |
| download | gentoo-2-dc32f0e290f9dd9cb9cf662a215dc184dbd71530.tar.gz gentoo-2-dc32f0e290f9dd9cb9cf662a215dc184dbd71530.tar.bz2 gentoo-2-dc32f0e290f9dd9cb9cf662a215dc184dbd71530.zip | |
Fix unpacking of live git ebuilds.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d5a3ba856945..9dcd09d82f7e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.160 2012/03/09 23:14:46 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.161 2012/03/10 17:49:56 dirtyepic Exp $ + + 10 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + Fix unpacking of live git ebuilds. 09 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin.eclass: readded vdr-plugin_pkg_config dummy function diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index cc0375f70195..f8e0e7cf5c0c 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -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.524 2012/03/04 18:46:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.525 2012/03/10 17:49:56 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then # gcc-9999 -> master # gcc-4.7_pre9999 -> 4.7 branch if [[ ${PV} == *_pre9999* ]] ; then - EGIT_BRANCH="${PN}_${PV%_pre9999}_branch" + EGIT_BRANCH="${PN}-${PV%_pre9999}-branch" EGIT_BRANCH=${EGIT_BRANCH//./_} fi inherit git-2 @@ -58,7 +58,7 @@ GCCMICRO=$(get_version_component_range 3 ${GCC_PV}) GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV})} # Pre-release support -if [[ ${GCC_PV} != ${GCC_PV/_pre/-} ]] ; then +if [[ ${GCC_PV} != ${GCC_PV/_pre/-} && ${GCC_PV} != *9999* ]] ; then PRERELEASE=${GCC_PV/_pre/-} fi # make _alpha and _beta ebuilds automatically use a snapshot |