Have targets set default stage which user can override via --stage.

Package-Manager: portage-2.1.2.9

5 files changed, 64 insertions, 26 deletions

diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index 6f5cef223731..c00211045b03 100644
--- a/sys-devel/crossdev/ChangeLog
+++ b/sys-devel/crossdev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/crossdev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.51 2007/05/23 16:21:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.52 2007/06/09 00:10:25 vapier Exp $
+
+*crossdev-0.9.18-r2 (09 Jun 2007)
+
+  09 Jun 2007; Mike Frysinger <vapier@gentoo.org> files/crossdev,
+  +crossdev-0.9.18-r2.ebuild:
+  Have targets set default stage which user can override via --stage.
 
   23 May 2007; Diego Pettenò <flameeyes@gentoo.org>
   crossdev-0.9.17-r3.ebuild, crossdev-0.9.18-r1.ebuild:
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index d9813e167644..50fa37eac8dc 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,7 +1,10 @@
-AUX crossdev 17772 RMD160 3eeae4f3537d71ae236a0afe395a7f742121431d SHA1 f8875c9f66db98992364df1f990af7c4dc70c89b SHA256 e8d846720c595fd141cf317f9e9f208e935542b0d5b0a7910f66cd874240e172
-MD5 02f4a70fb50dde8f973ced3b46911165 files/crossdev 17772
-RMD160 3eeae4f3537d71ae236a0afe395a7f742121431d files/crossdev 17772
-SHA256 e8d846720c595fd141cf317f9e9f208e935542b0d5b0a7910f66cd874240e172 files/crossdev 17772
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX crossdev 17804 RMD160 e4fcae9c539f9176ab9d93f0c2db80cd4ef41acd SHA1 923e3aa2f05d8ecdd80c060c908d2439915bd1e1 SHA256 0781a6af9668e2ed733a96261df7c1115b7b332264c0c9f3ed51994af65b761b
+MD5 422b08cad3a183eba4cf791d2324b33b files/crossdev 17804
+RMD160 e4fcae9c539f9176ab9d93f0c2db80cd4ef41acd files/crossdev 17804
+SHA256 0781a6af9668e2ed733a96261df7c1115b7b332264c0c9f3ed51994af65b761b files/crossdev 17804
 AUX crossdev-stable 18236 RMD160 8ce4dfcf55a204802c1ccc3439fc192010868ac2 SHA1 66d74f40ab62513db912da56e0b7aea006b8aa27 SHA256 fc59ee6dcb9235cc146228625b4c29ecf85eaf77bbb9b14c89178cebde0225e3
 MD5 b8e07a9c6103a15d684adc9a09c64895 files/crossdev-stable 18236
 RMD160 8ce4dfcf55a204802c1ccc3439fc192010868ac2 files/crossdev-stable 18236
@@ -10,14 +13,14 @@ EBUILD crossdev-0.9.17-r3.ebuild 663 RMD160 145598635b28fd8a481dd4d6da54c7658cf6
 MD5 51c3658daa5d63301cbe26dd605dbcdc crossdev-0.9.17-r3.ebuild 663
 RMD160 145598635b28fd8a481dd4d6da54c7658cf600f1 crossdev-0.9.17-r3.ebuild 663
 SHA256 4104f8515aaa05de4df2fc1be251f7e931421a22c5ea8eb4f1cc2ff6938fcb9f crossdev-0.9.17-r3.ebuild 663
-EBUILD crossdev-0.9.18-r1.ebuild 646 RMD160 1abcd646dabea150c0230719a007fe0d1994ffdf SHA1 c18d0ce8251c17b31ad3119c56bee77c270d1e10 SHA256 82ac3ecb34078127ab28b76db65ed2ad124681d3b56ae03f49f69c6e2e4fc1c3
-MD5 91daa09e3d1c86b4af407e5deb8ea6bd crossdev-0.9.18-r1.ebuild 646
-RMD160 1abcd646dabea150c0230719a007fe0d1994ffdf crossdev-0.9.18-r1.ebuild 646
-SHA256 82ac3ecb34078127ab28b76db65ed2ad124681d3b56ae03f49f69c6e2e4fc1c3 crossdev-0.9.18-r1.ebuild 646
-MISC ChangeLog 10398 RMD160 2ef68060a016711fbc909cce73c83c39af75d82f SHA1 a8095e4efad06159d0c74e1b7741e4260249af9b SHA256 420962a5e18be5ac890aa001700719e04605e0c966ac1ba74a96cac9b54d4992
-MD5 5a212152e8135b0722dc5dcba497fbba ChangeLog 10398
-RMD160 2ef68060a016711fbc909cce73c83c39af75d82f ChangeLog 10398
-SHA256 420962a5e18be5ac890aa001700719e04605e0c966ac1ba74a96cac9b54d4992 ChangeLog 10398
+EBUILD crossdev-0.9.18-r2.ebuild 643 RMD160 b5d6cb3734c2d5e6c6360b488ade9ebd163f9748 SHA1 bc2dd41029a03a1d68e08d4d241f0c72bb90f8bd SHA256 93e1c5bad752e2c4da66def81fed00e180281602b5d3e01fa855900982add40f
+MD5 f4af27dad595953b76bcf30cb759b058 crossdev-0.9.18-r2.ebuild 643
+RMD160 b5d6cb3734c2d5e6c6360b488ade9ebd163f9748 crossdev-0.9.18-r2.ebuild 643
+SHA256 93e1c5bad752e2c4da66def81fed00e180281602b5d3e01fa855900982add40f crossdev-0.9.18-r2.ebuild 643
+MISC ChangeLog 10597 RMD160 e8d306f6d60ddc05cb23e2455c3243ec13b31159 SHA1 a92d2f18ef38011e8276e9cd7ab0cf9a168c5063 SHA256 a39b1c0c4c589ae82cd9e120b12a52787c8e20190c02b69036fc1280aad94172
+MD5 ea38f1f45863461ff11c95f69d2da307 ChangeLog 10597
+RMD160 e8d306f6d60ddc05cb23e2455c3243ec13b31159 ChangeLog 10597
+SHA256 a39b1c0c4c589ae82cd9e120b12a52787c8e20190c02b69036fc1280aad94172 ChangeLog 10597
 MISC metadata.xml 222 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 SHA1 e965b449efbf26435730e93c78602fb5d8cdce0e SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f
 MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222
 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 metadata.xml 222
@@ -25,6 +28,13 @@ SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f metadata
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.17-r3 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.17-r3 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.17-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.18-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.18-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.18-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.18-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.18-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.18-r2 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGafAj8bi6rjpTunYRAljjAJ4n67F4IrIZxa8dIy4me2HqJalDyACggKgD
+vcCtBQrc1FrozVAcsUcil7w=
+=ruIW
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/crossdev/crossdev-0.9.18-r2.ebuild b/sys-devel/crossdev/crossdev-0.9.18-r2.ebuild
new file mode 100644
index 000000000000..ee4d120b3c44
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-0.9.18-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.18-r2.ebuild,v 1.1 2007/06/09 00:10:25 vapier Exp $
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.1
+	app-shells/bash
+	|| ( dev-util/unifdef sys-freebsd/freebsd-ubin )"
+
+src_install() {
+	dosbin "${FILESDIR}"/crossdev || die
+	dosed "s:GENTOO_PV:${PV}:" /usr/sbin/crossdev
+}
diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index 4b845a188ccd..34885c97545d 100755
--- a/sys-devel/crossdev/files/crossdev
+++ b/sys-devel/crossdev/files/crossdev
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.94 2007/05/14 14:56:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.95 2007/06/09 00:10:25 vapier Exp $
 
 cd /
 umask 0022 #159111
@@ -57,6 +57,7 @@ STAGE_C_ONLY=1
 STAGE_C_KERNEL=2
 STAGE_LIBC=3
 STAGE_C_CPP=4
+STAGE_DEFAULT=${STAGE_C_CPP}
 STAGE_DISP=( "binutils" "C compiler only" "kernel headers" "C compiler & libc" "C/C++ compiler" )
 
 parse_target() {
@@ -142,7 +143,7 @@ parse_target() {
 
 	# Now account for all the "special" architectures out there
 	case ${CTARGET} in
-		avr*) KPKG="[none]"; STAGE=${STAGE_LIBC};
+		avr*) KPKG="[none]"; STAGE_DEFAULT=${STAGE_LIBC};
 		      LCAT="dev-embedded"; LPKG="avr-libc";
 		      GVER="3.4.6"; BVER="2.16.1-r3";
 		      GUSE=${GUSE_DISABLE};;
@@ -153,7 +154,7 @@ parse_target() {
 		      LCAT="dev-util"; LPKG="mingw-runtime";;
 
 		msp430)
-		      STAGE=${STAGE_BINUTILS};;
+		      STAGE_DEFAULT=${STAGE_BINUTILS};;
 
 		nios2*)
 		      BPKG="binutils-nios2";
@@ -176,15 +177,15 @@ parse_target() {
 		ee*)  TARCH=mips;
 		      KPKG="[none]"
 		      GVER="3.2.2"; BVER="2.14";
-		      STAGE=${STAGE_C_ONLY};
+		      STAGE_DEFAULT=${STAGE_C_ONLY};
 		      GUSE=${GUSE_DISABLE};;
 		iop*) TARCH=mips;
 		      GVER="3.2.2"; BVER="2.14";
-		      STAGE=${STAGE_C_ONLY};
+		      STAGE_DEFAULT=${STAGE_C_ONLY};
 		      GUSE=${GUSE_DISABLE};;
 		dvp*) TARCH=mips;
 		      GVER="3.2.2"; BVER="2.14";
-		      STAGE=${STAGE_BINUTILS};;
+		      STAGE_DEFAULT=${STAGE_BINUTILS};;
 	esac
 
 	# Tweak packages based upon CTARGET
@@ -200,7 +201,7 @@ parse_target() {
 		*-newlib|*-elf)
 			LPKG="newlib"
 			KPKG="[none]"
-			STAGE=${STAGE_LIBC}
+			STAGE_DEFAULT=${STAGE_LIBC}
 			;;
 
 		# Now for the BSDs ...
@@ -321,7 +322,7 @@ UOPTS=
 TARCH=
 HARCH=$(unset ARCH ; portageq envvar ARCH)
 CTARGET=
-STAGE="COW"
+STAGE=""
 BCAT="sys-devel"  ; BPKG="binutils"      ; BVER="[latest]" ; BUSE=""
 GCAT="sys-devel"  ; GPKG="gcc"           ; GVER="[latest]" ; GUSE=""
 KCAT="sys-kernel" ; KPKG="linux-headers" ; KVER="[latest]" ; KUSE=""
@@ -343,7 +344,7 @@ while [[ $# -gt 0 ]] ; do
 	--k|--kernel)   shift; KVER=$1;;
 	--l|--libc)     shift; LVER=$1;;
 	-C|--clean)     shift; parse_target $1; uninstall;;
-	-s?|--stage?)   [[ ${STAGE} == "COW" ]] && STAGE=${1:0-1};;
+	-s?|--stage?)   STAGE=${1:0-1};;
 	--ex-only)      EX_FAST="yes";;
 	--ex-gcc)       EX_GCC="yes";;
 	--ex-gdb)       EX_GDB="yes";;
@@ -360,8 +361,8 @@ while [[ $# -gt 0 ]] ; do
 done
 [[ ${SET_X} == "yes" ]] && set -x
 
+STAGE=${STAGE:-${STAGE_DEFAULT}}
 [[ -z ${CTARGET} ]] && usage 1
-[[ ${STAGE} == "COW" ]] && STAGE=${STAGE_C_CPP}
 for with in HEADERS ; do
 	var=WITH_${with} defvar=WITH_DEF_${with}
 	[[ ${!var} == "COW" ]] && eval ${var}=${!defvar}
diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.18-r2 b/sys-devel/crossdev/files/digest-crossdev-0.9.18-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/crossdev/files/digest-crossdev-0.9.18-r2