Make sure our binutils/gcc config scripts are up-to-date and not of the broken variety. Also add support for storing USE flags in package.use.

(Portage version: 2.1_pre6-r2)

4 files changed, 34 insertions, 18 deletions

diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index bb1e060b8302..df882710fa61 100644
--- a/sys-devel/crossdev/ChangeLog
+++ b/sys-devel/crossdev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/crossdev
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.30 2006/01/23 22:35:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.31 2006/03/15 00:00:18 vapier Exp $
+
+*crossdev-0.9.13 (14 Mar 2006)
+
+  14 Mar 2006; Mike Frysinger <vapier@gentoo.org> files/crossdev,
+  +crossdev-0.9.13.ebuild:
+  Make sure our binutils/gcc config scripts are up-to-date and not of the
+  broken variety. Also add support for storing USE flags in package.use.
 
 *crossdev-0.9.12-r1 (23 Jan 2006)
 
diff --git a/sys-devel/crossdev/crossdev-0.9.12-r1.ebuild b/sys-devel/crossdev/crossdev-0.9.13.ebuild
index 5784d1765cc6..8429e22c2cec 100644
--- a/sys-devel/crossdev/crossdev-0.9.12-r1.ebuild
+++ b/sys-devel/crossdev/crossdev-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.12-r1.ebuild,v 1.1 2006/01/23 22:35:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.13.ebuild,v 1.1 2006/03/15 00:00:18 vapier Exp $
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
 HOMEPAGE="http://www.gentoo.org/"
@@ -11,7 +11,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="sys-apps/portage
+RDEPEND="!app-admin/eselect-compiler
+	<sys-devel/gcc-config-2
+	sys-apps/portage
 	app-shells/bash
 	sys-apps/coreutils"
 
diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index 6d84e9eaef2e..8dd6e5406877 100755
--- a/sys-devel/crossdev/files/crossdev
+++ b/sys-devel/crossdev/files/crossdev
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 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.52 2006/03/14 02:10:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.53 2006/03/15 00:00:18 vapier Exp $
 
 cd /
 
@@ -33,7 +33,7 @@ Options:
     ${GOOD}--k, --kernel${NORMAL} ver     Specify version of kernel headers to use
     ${GOOD}--l, --libc${NORMAL} ver       Specify version of libc to use
     ${GOOD}-C, --clean${NORMAL} target    Uninstall specified target
-    ${GOOD}-b, -d, -p, -v${NORMAL}        Options to pass to emerge (see emerge(1))
+    ${GOOD}-b, -d, -p, -v, -q${NORMAL}    Options to pass to emerge (see emerge(1))
 Stage Options:
     ${GOOD}-s0, --stage0${NORMAL}         Build just binutils
     ${GOOD}-s1, --stage1${NORMAL}         Also build a C compiler (no libc/C++)
@@ -336,7 +336,7 @@ while [[ $# -gt 0 ]] ; do
 	--with-*)       eval $(set_withval $1);;
 	--without-*)    eval $(set_withval $1);;
 	-x)             SET_X="yes";;
-	-b|-d|-p|-v)    UOPTS="${UOPTS} $1";;
+	-b|-d|-p|-v|-q) UOPTS="${UOPTS} $1";;
 	-pv|-vp)        UOPTS="${UOPTS} -p -v";;
 	-h|--help)      usage;;
 	-*)             eerror "UNKNOWN OPTION: '$1'" ; usage 1;;
@@ -470,10 +470,10 @@ mkdir -p "${PORTDIR_OVERLAY}"/cross-${CTARGET}
 cd /etc/portage
 touch package.{keywords,mask,use}
 
-set_portage ${BCAT} ${BPKG} ${BVER} ${BUSE}
-set_portage ${GCAT} ${GPKG} ${GVER} ${GUSE}
-set_portage ${KCAT} ${KPKG} ${KVER} ${KUSE}
-set_portage ${LCAT} ${LPKG} ${LVER} ${LUSE}
+set_portage ${BCAT} ${BPKG} ${BVER}
+set_portage ${GCAT} ${GPKG} ${GVER}
+set_portage ${KCAT} ${KPKG} ${KVER}
+set_portage ${LCAT} ${LPKG} ${LVER}
 set_portage sys-devel gdb
 
 #################
@@ -497,6 +497,8 @@ doemerge() {
 	einfo "Log: ${logfile}"
 	ebegin "Emerging cross-${2:-$1}"
 
+	set_use $1 ${USE}
+
 	if [[ ${UOPTS/-v} != ${UOPTS} ]] ; then
 		emerge cross-${CTARGET}/$1 ${EOPTS} \
 			2>&1 | tee ${logfile}
@@ -517,41 +519,46 @@ EOPTS=${EOPTS_UP}
 # make sure multilib crap doesn't screw us over
 export ABI=${ABI:-pos} LIBDIR_pos="lib" CFLAGS_pos="" LDFLAGS_pos=""
 
+# only allow UCLIBC_CPU from env, not from make.conf/profile
+export UCLIBC_CPU=${UCLIBC_CPU}
+
 ex_fast || {
 
 ebegin "Forcing the latest versions of binutils-config/gcc-config"
 emerge {binutils,gcc}-config -qu --nodeps &> /dev/null
-eend $?
+eend $? || exit 1
 
 doemerge ${BPKG}
 
 is_s1 || exit 0
 if with_headers ; then
-USE="${USE} _E_CROSS_HEADERS_ONLY" _E_CROSS_HEADERS_ONLY="yes" \
+USE="${KUSE} ${USE} _E_CROSS_HEADERS_ONLY" \
 	doemerge ${KPKG} ${KPKG}-quick
-USE="${USE} _E_CROSS_HEADERS_ONLY" _E_CROSS_HEADERS_ONLY="yes" \
+USE="${LUSE} ${USE} _E_CROSS_HEADERS_ONLY" \
 	doemerge ${LPKG} ${LPKG}-headers
 fi
-USE="${USE} ${GUSE_DISABLE} nocxx _E_CROSS_BOOTSTRAP" \
+USE="${GUSE} ${USE} ${GUSE_DISABLE} nocxx _E_CROSS_BOOTSTRAP" \
 	doemerge ${GPKG} ${GPKG}-stage1
 
 is_s2 || exit 0
 set_eopts_on_pkg_status ${KPKG} _E_CROSS_HEADERS_ONLY
-doemerge ${KPKG}
+USE="${KUSE} ${USE} -_E_CROSS_HEADERS_ONLY" \
+	doemerge ${KPKG}
 
 is_s3 || exit 0
 set_eopts_on_pkg_status ${LPKG} _E_CROSS_HEADERS_ONLY
-USE="${USE} $TARCH" doemerge ${LPKG}
+USE="${LUSE} ${USE} -_E_CROSS_HEADERS_ONLY" \
+	doemerge ${LPKG}
 
 is_s4 || exit 0
 set_eopts_on_pkg_status ${GPKG} _E_CROSS_BOOTSTRAP
-USE="${USE} ${GUSE_DISABLE}" \
+USE="${GUSE} ${USE} ${GUSE_DISABLE}" \
 	doemerge ${GPKG} ${GPKG}-stage2
 
 }
 
 EOPTS=${EOPTS_UP}
-ex_gcc && doemerge ${GPKG} ${GPKG}-extra
+ex_gcc && USE="${GUSE} ${USE}" doemerge ${GPKG} ${GPKG}-extra
 ex_gdb && doemerge gdb
 
 exit 0
diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.12-r1 b/sys-devel/crossdev/files/digest-crossdev-0.9.13
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/crossdev/files/digest-crossdev-0.9.12-r1
+++ b/sys-devel/crossdev/files/digest-crossdev-0.9.13