[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass

[Mike Frysinger (vapier)]

vapier      12/03/04 05:40:27

  Modified:             toolchain.eclass
  Log:
  initial live git support

Revision  Changes    Path
1.523                eclass/toolchain.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.523&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.523&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.522&r2=1.523

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- toolchain.eclass	3 Mar 2012 22:42:47 -0000	1.522
+++ toolchain.eclass	4 Mar 2012 05:40:27 -0000	1.523
@@ -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.522 2012/03/03 22:42:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.523 2012/03/04 05:40:27 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@g.o>
 
@@ -11,6 +11,18 @@
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils
 
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
+	# naming style:
+	# gcc-9999 -> master
+	# gcc-4.7_pre9999 -> 4.7 branch
+	if [[ ${PV} == *_pre9999* ]] ; then
+		EGIT_BRANCH="${PN}_${PV%_pre9999}_branch"
+		EGIT_BRANCH=${EGIT_BRANCH//./_}
+	fi
+	inherit git-2
+fi
+
 EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm pkg_postrm
 DESCRIPTION="The GNU Compiler Collection"
 
@@ -702,11 +714,13 @@
 	done
 }
 toolchain_src_unpack() {
+	[[ ${PV} == *9999* ]] && git-2_src_unpack
+
 	export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
 
 	[[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc"
 
-	[[ -z ${GCC_SVN} ]] && gcc_quick_unpack
+	gcc_quick_unpack
 
 	cd "${S}"
 
@@ -1691,7 +1705,7 @@
 		unpack gcc-${PRERELEASE}.tar.bz2
 	elif [[ -n ${SNAPSHOT} ]] ; then
 		unpack gcc-${SNAPSHOT}.tar.bz2
-	else
+	elif [[ ${PV} != *9999* ]] ; then
 		unpack gcc-${GCC_RELEASE_VER}.tar.bz2
 		# We want branch updates to be against a release tarball
 		if [[ -n ${BRANCH_UPDATE} ]] ; then