If a target w/out a libc is selected, then error out while attempting a step that requires a libc.

Package-Manager: portage-2.1.4_rc11
RepoMan-Options: --force

5 files changed, 56 insertions, 26 deletions

diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index 462404125021..cad9d2ea9ed6 100644
--- a/sys-devel/crossdev/ChangeLog
+++ b/sys-devel/crossdev/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2007/11/04 03:01:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.56 2007/12/30 17:33:48 vapier Exp $
+
+*crossdev-0.9.18-r6 (30 Dec 2007)
+
+  30 Dec 2007; Mike Frysinger <vapier@gentoo.org> files/crossdev,
+  +crossdev-0.9.18-r6.ebuild:
+  If a target w/out a libc is selected, then error out while attempting a step
+  that requires a libc.
 
 *crossdev-0.9.18-r5 (04 Nov 2007)
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index a8396e4852c0..0d28bd92d95d 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX crossdev 18591 RMD160 082aaba9edf07810e2e653913308c61a9c8a0453 SHA1 f28434989ea334298b183efacfd8be691b65dc58 SHA256 537af78721a8cedc7dab129b295647e9710fb5b955387465e7744c253897e51a
-MD5 a0a75235714cae9535b8ccefa07eb092 files/crossdev 18591
-RMD160 082aaba9edf07810e2e653913308c61a9c8a0453 files/crossdev 18591
-SHA256 537af78721a8cedc7dab129b295647e9710fb5b955387465e7744c253897e51a files/crossdev 18591
+AUX crossdev 18723 RMD160 3d96f96e098f7b59a147cfa88e8d944858d8c667 SHA1 3f8a9a6ec1d57239ad20ed7f4ee5eda373f00009 SHA256 f78e29235fe1f3c5cce0a70f196533b1e0fa550730782c65567f09695e37a6bd
+MD5 debe0e97f8e14034fe88027864d09ba0 files/crossdev 18723
+RMD160 3d96f96e098f7b59a147cfa88e8d944858d8c667 files/crossdev 18723
+SHA256 f78e29235fe1f3c5cce0a70f196533b1e0fa550730782c65567f09695e37a6bd files/crossdev 18723
 AUX crossdev-stable 18233 RMD160 064f3a4f7d683a5ee8ff460a916bef475ec76fd1 SHA1 ee345b5d16b7169d99da9db6d6986b804626001a SHA256 091740203aeb1b2f92ab017f658c9448fc563d89b62f4e81fff1373b7dc0d7d5
 MD5 faa9c6cd783ebbb5685e86c467c0a51d files/crossdev-stable 18233
 RMD160 064f3a4f7d683a5ee8ff460a916bef475ec76fd1 files/crossdev-stable 18233
@@ -13,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-r5.ebuild 643 RMD160 4bafeced6cefdc1d7e25bae29f4323fe606ab004 SHA1 2806302c61d9008c2b11651d0676e387f75e037a SHA256 2a82be92e4a9f6b040d2ffcb2ffee2c8dcd63add4633f3a59924f06fbb6592d5
-MD5 f1eaeb672d5756fe4ca96a11be363b9a crossdev-0.9.18-r5.ebuild 643
-RMD160 4bafeced6cefdc1d7e25bae29f4323fe606ab004 crossdev-0.9.18-r5.ebuild 643
-SHA256 2a82be92e4a9f6b040d2ffcb2ffee2c8dcd63add4633f3a59924f06fbb6592d5 crossdev-0.9.18-r5.ebuild 643
-MISC ChangeLog 11240 RMD160 27f79390637c09713c2929ba540df1f90faf3bff SHA1 d182a025fc7a35feabdb8b5e691aa4ea69123b1b SHA256 2b84bda4d6bca8a4e4891a45581bd945eae812f78ed0fbcb522e84a5dc17dfc1
-MD5 f2ad0199dc2d9f788f97109f7f3eecd5 ChangeLog 11240
-RMD160 27f79390637c09713c2929ba540df1f90faf3bff ChangeLog 11240
-SHA256 2b84bda4d6bca8a4e4891a45581bd945eae812f78ed0fbcb522e84a5dc17dfc1 ChangeLog 11240
+EBUILD crossdev-0.9.18-r6.ebuild 643 RMD160 d4f3035da03415a083be0ddf717476c57c7fbc44 SHA1 509757c1af7a20ea22c0d8110d790baca85a31f9 SHA256 5aa78a29031a1b3fd904bbb169b805737b2d96f48ceb3d1ca8b146551159f6cc
+MD5 38f6bbf1257056f585ed16df3e4d8a32 crossdev-0.9.18-r6.ebuild 643
+RMD160 d4f3035da03415a083be0ddf717476c57c7fbc44 crossdev-0.9.18-r6.ebuild 643
+SHA256 5aa78a29031a1b3fd904bbb169b805737b2d96f48ceb3d1ca8b146551159f6cc crossdev-0.9.18-r6.ebuild 643
+MISC ChangeLog 11475 RMD160 30e44b17736c2b8e63027cc7da6f5c468eb95158 SHA1 5d4c0427b24ab2f742d2b08629747b51304e9c96 SHA256 289d0438f8fe25a2f221e0f7e26b191f31cf38c00655b875edec76c5de3c1f45
+MD5 6dc4cbb703f6a8b59a27e9b32c9b1744 ChangeLog 11475
+RMD160 30e44b17736c2b8e63027cc7da6f5c468eb95158 ChangeLog 11475
+SHA256 289d0438f8fe25a2f221e0f7e26b191f31cf38c00655b875edec76c5de3c1f45 ChangeLog 11475
 MISC metadata.xml 222 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 SHA1 e965b449efbf26435730e93c78602fb5d8cdce0e SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f
 MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222
 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 metadata.xml 222
@@ -28,13 +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-r5 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.18-r5 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.18-r5 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.18-r6 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.18-r6 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.18-r6 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHLTYpp/wUKkr7RBoRAuZ/AJ9fIYc1km3n0HpBgvihuFBp4mDhyQCdGrjf
-AikFmuDZe5QsrJNtev19UIY=
-=JSVU
+iEYEARECAAYFAkd31oEACgkQj9hvisErhMJrFACdFHPT5bhjwA6SLoTYrz12946P
+BhIAoIErZTpSuUSj4Q8qfegVaHoOhZGM
+=dTE5
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/crossdev/crossdev-0.9.18-r6.ebuild b/sys-devel/crossdev/crossdev-0.9.18-r6.ebuild
new file mode 100644
index 000000000000..30d023235fd4
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-0.9.18-r6.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-r6.ebuild,v 1.1 2007/12/30 17:33:48 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 23502696c87a..ed6cf122d771 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.100 2007/11/04 03:01:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.101 2007/12/30 17:33:48 vapier Exp $
 
 cd /
 umask 0022 #159111
@@ -308,11 +308,11 @@ hr() {
 			&& c=50 \
 			|| c=${c##* }
 	fi
-	local ext=${1:-  _  -  ~  -} br=""
-	while [[ ${#br} -lt ${c} ]] ; do
-		br=${br}${ext}
-	done
-	echo "${br:0:${c}}"
+	local ext=${1:-  _  -  ~  -}
+	local sext=${ext//?/ }
+	local br=$(printf "%$((c + ${#ext}))s")
+	local banner=${br//${sext}/${ext}}
+	echo "${banner:0:${c}}"
 }
 
 ##################
@@ -612,6 +612,7 @@ is_s1 || exit 0
 if with_headers ; then
 USE="${KUSE} ${USE}" CROSSCOMPILE_OPTS="headers-only" \
 	doemerge ${KPKG} ${KPKG}-quick
+[[ -n ${LPKG} ]] && \
 USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="headers-only" \
 	doemerge ${LPKG} ${LPKG}-headers
 fi
@@ -624,6 +625,7 @@ USE="${KUSE} ${USE}" CROSSCOMPILE_OPTS="" \
 	doemerge ${KPKG}
 
 is_s3 || exit 0
+[[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown libc"
 set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only
 USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="" \
 	doemerge ${LPKG}
diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.18-r6 b/sys-devel/crossdev/files/digest-crossdev-0.9.18-r6
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/crossdev/files/digest-crossdev-0.9.18-r6