Fixup previous cross-compile commit and fix handling of /etc/portage files when dealing with subdirs.

(Portage version: 2.1.1_rc1-r6)

4 files changed, 34 insertions, 6 deletions

diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index c8910a06ffb1..d9c1bf5c54f3 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.38 2006/09/03 11:31:45 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.39 2006/09/07 17:03:22 vapier Exp $
+
+*crossdev-0.9.16-r2 (07 Sep 2006)
+
+  07 Sep 2006; Mike Frysinger <vapier@gentoo.org> files/crossdev,
+  +crossdev-0.9.16-r2.ebuild:
+  Fixup previous cross-compile commit and fix handling of /etc/portage files
+  when dealing with subdirs.
 
 *crossdev-0.9.16-r1 (03 Sep 2006)
 
diff --git a/sys-devel/crossdev/crossdev-0.9.16-r2.ebuild b/sys-devel/crossdev/crossdev-0.9.16-r2.ebuild
new file mode 100644
index 000000000000..483cedc9b24c
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-0.9.16-r2.ebuild
@@ -0,0 +1,20 @@
+# 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.16-r2.ebuild,v 1.1 2006/09/07 17:03:22 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"
+
+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 a39e3472b433..b18a2e2895a5 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.72 2006/09/03 11:31:45 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.73 2006/09/07 17:03:22 vapier Exp $
 
 cd /
 
@@ -464,7 +464,6 @@ set_keywords() {
 		sed -i -e "/^cross-${CTARGET}\/${pkg} /d" ${output}
 	else
 		output="package.keywords/cross-${CTARGET}"
-		rm -f ${output}
 	fi
 	if [[ ${ver} == "[latest]" ]] || [[ -z ${ver} ]] ; then
 		echo "cross-${CTARGET}/${pkg} $TARCH ~$TARCH" >> ${output}
@@ -475,7 +474,6 @@ set_keywords() {
 			sed -i -e "/cross-${CTARGET}\/${pkg}/d" ${output}
 		else
 			output="package.mask/cross-${CTARGET}"
-			rm -f ${output}
 		fi
 		echo ">cross-${CTARGET}/${pkg}-${ver}" >> ${output}
 	fi
@@ -524,7 +522,9 @@ grep -qs "^cross-${CTARGET}$" /etc/portage/categories \
 mkdir -p "${PORTDIR_OVERLAY}"/cross-${CTARGET}
 cd /etc/portage
 for f in package.{keywords,mask,use} ; do
-	[[ ! -e ${f} ]] && mkdir ${f}
+	[[ -f ${f} ]] && continue
+	mkdir -p ${f}
+	rm -f ${f}/cross-${CTARGET}
 done
 
 set_portage ${BCAT} ${BPKG} ${BVER}
@@ -608,7 +608,7 @@ USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="" \
 	doemerge ${LPKG}
 
 is_s4 || exit 0
-set_eopts_on_pkg_status ${GPKG} crosscompile_opts_headers-only
+set_eopts_on_pkg_status ${GPKG} crosscompile_opts_bootstrap
 USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \
 	doemerge ${GPKG} ${GPKG}-stage2
 
diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.16-r2 b/sys-devel/crossdev/files/digest-crossdev-0.9.16-r2
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/sys-devel/crossdev/files/digest-crossdev-0.9.16-r2
@@ -0,0 +1 @@
+