Add support for multiple PORTDIR_OVERLAY values; fixes from Joel Martin.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 69 insertions, 39 deletions

diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index 436cbc0bef70..e9f726267e54 100644
--- a/sys-devel/crossdev/ChangeLog
+++ b/sys-devel/crossdev/ChangeLog
@@ -1,11 +1,17 @@
 # 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.32 2006/04/11 00:19:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.33 2006/04/12 00:47:36 vapier Exp $
+
+*crossdev-0.9.15 (12 Apr 2006)
+
+  12 Apr 2006; Mike Frysinger <vapier@gentoo.org> files/crossdev,
+  +crossdev-0.9.15.ebuild:
+  Add support for multiple PORTDIR_OVERLAY values; fixes from Joel Martin.
 
 *crossdev-0.9.14 (11 Apr 2006)
 
   11 Apr 2006; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.13.ebuild, +crossdev-0.9.14.ebuild:
+  +crossdev-0.9.14.ebuild:
   Add support for storing env vars in config files in /etc/portage/crossdev.
 
 *crossdev-0.9.13 (14 Mar 2006)
@@ -18,33 +24,33 @@
 *crossdev-0.9.12-r1 (23 Jan 2006)
 
   23 Jan 2006; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.12.ebuild, +crossdev-0.9.12-r1.ebuild:
+  +crossdev-0.9.12-r1.ebuild:
   Forgot to use the disabled gcc flags for stage1 as pointed out by Kumba.
 
 *crossdev-0.9.12 (22 Jan 2006)
 
   22 Jan 2006; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.11-r1.ebuild, +crossdev-0.9.12.ebuild:
+  +crossdev-0.9.12.ebuild:
   J. Christopher Six says in #119934: make sure objc-gc is disabled for newer
   versions of gcc.
 
 *crossdev-0.9.11-r1 (08 Jan 2006)
 
   08 Jan 2006; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.11.ebuild, +crossdev-0.9.11-r1.ebuild:
+  +crossdev-0.9.11-r1.ebuild:
   Fix typo in avr CPOST logic #118208 by Sandro.
 
 *crossdev-0.9.11 (02 Jan 2006)
 
   02 Jan 2006; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.10.ebuild, +crossdev-0.9.11.ebuild:
+  +crossdev-0.9.11.ebuild:
   Add support for nios2/bfin embedded targets and update help output to
   include information about softfloat toolchains.
 
 *crossdev-0.9.10 (18 Nov 2005)
 
   18 Nov 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.9-r3.ebuild, +crossdev-0.9.10.ebuild:
+  +crossdev-0.9.10.ebuild:
   Add support for building bootstrap gcc with libc/kernel headers
   (--with-headers), fix cleaning of categories/package.keywords files, add
   generic support for future --with-/--without- options, better detect when a
@@ -54,7 +60,7 @@
 *crossdev-0.9.9-r3 (08 Oct 2005)
 
   08 Oct 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.9-r2.ebuild, +crossdev-0.9.9-r3.ebuild:
+  +crossdev-0.9.9-r3.ebuild:
   Add support for passing -d to portage #108383 by Jan Kobler and allow env
   USE/ABI to be passed in.
 
@@ -67,7 +73,7 @@
 *crossdev-0.9.9-r1 (23 Aug 2005)
 
   23 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.9.ebuild, +crossdev-0.9.9-r1.ebuild:
+  +crossdev-0.9.9-r1.ebuild:
   Touchup help output, add more error checking, clean more directories when
   uninstalling, be a bit more user friendly with cmdline options, add untested
   support for klibc, touchup internal syntax, and improve ABI faking out.
@@ -107,7 +113,7 @@
 
   18 Apr 2005; Mike Frysinger <vapier@gentoo.org>
   -files/crossdev-0.4-fixes-one.patch, files/crossdev,
-  -crossdev-0.9.5-r1.ebuild, +crossdev-0.9.6.ebuild:
+  +crossdev-0.9.6.ebuild:
   Add some initial support for ps2 targets (ee/iop/dvp).
 
 *crossdev-0.9.5-r1 (25 Mar 2005)
@@ -119,14 +125,14 @@
 *crossdev-0.9.5 (16 Mar 2005)
 
   16 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.1-r2.ebuild, +crossdev-0.9.5.ebuild:
+  +crossdev-0.9.5.ebuild:
   Make binutils/gcc/linux-headers dynamic package names (to support
   mips-headers). Add support for pulling in avr libc (thanks to Scott).
 
 *crossdev-0.9.1-r2 (12 Mar 2005)
 
   12 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9.1-r1.ebuild, +crossdev-0.9.1-r2.ebuild:
+  +crossdev-0.9.1-r2.ebuild:
   Add a --stage0 (for binutils), use a diff PORTAGE_TMPDIR, and make sure that
   the diff PKGDIR is actually used.
 
@@ -140,14 +146,14 @@
 *crossdev-0.9.1 (09 Mar 2005)
 
   09 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9-r3.ebuild, +crossdev-0.9.1.ebuild:
+  +crossdev-0.9.1.ebuild:
   Add sanity checks for host system and add support for avr (fixes from Scott
   L Price).
 
 *crossdev-0.9-r3 (04 Mar 2005)
 
   04 Mar 2005; Mike Frysinger <vapier@gentoo.org> files/crossdev,
-  -crossdev-0.9-r2.ebuild, +crossdev-0.9-r3.ebuild:
+  +crossdev-0.9-r3.ebuild:
   Fix option collsion between internal -b (--binutils) and portages -b (build
   package).
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index ca921fc9944b..c218382ab30e 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 90113815fa96f0be3a9eabc0b1a449e4 ChangeLog 7140
-RMD160 2a36bf05a81303b5c42199b08f8dcd2666ed9598 ChangeLog 7140
-SHA256 ceb6ea8aa2a66b2422ad90a169f707f4fc80231ba10face93bc5ba0246f15af4 ChangeLog 7140
-MD5 f27c48a975bfe022af40975ed6173381 crossdev-0.9.14.ebuild 621
-RMD160 15f690b43d51879c20d68cf623f2d2d17497c1fc crossdev-0.9.14.ebuild 621
-SHA256 3a2c0d222abeb06b882962d8a181ba53913654cd8b00777491c60f1bc296d238 crossdev-0.9.14.ebuild 621
-MD5 9a689ce2dfc7289bbb05fe9bc82f1e1a files/crossdev 16675
-RMD160 06d12e9e82791c02ed73ee20b665e02873b470d8 files/crossdev 16675
-SHA256 a33cc367e4dd054653a3537eaa98bb93494f916f5782d08fec244fb9a01c94ca files/crossdev 16675
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.14 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.14 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.14 0
+MD5 0077eb1ac706b5b550edece026dbb6b5 ChangeLog 7004
+RMD160 0c3b27bd8c5116bb2d5e3858d79d155bbef4e7c2 ChangeLog 7004
+SHA256 28726d6e9696f3da5b933e2f8e9fb8c016350ac8a5284b711200603615154e8c ChangeLog 7004
+MD5 315fa27cd5c38b1a7b6ea9ae96162c47 crossdev-0.9.15.ebuild 621
+RMD160 eddc61d2b60f4ad6811273934ca9cac4b50cec7b crossdev-0.9.15.ebuild 621
+SHA256 44276817db68cd775b6bd52c2f81544da2d80936a8e7567899f74e21a093b8e2 crossdev-0.9.15.ebuild 621
+MD5 0d1422c182df2cb6c218b26a9305aa31 files/crossdev 16632
+RMD160 b9c6866f7b10f25cf619ab6661da338c39f35efa files/crossdev 16632
+SHA256 60fbf03cfc582708c67db07461c8a2af727c3fc077b72de89e5edf62cbbafd29 files/crossdev 16632
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.15 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.15 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.15 0
 MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222
 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 metadata.xml 222
 SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f metadata.xml 222
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD4DBQFEOvYv2+ySkm8kpY0RAkb2AJiEQ4XWwhd0WLjJoJoHgAqCrLB8AJ4ix9mt
-MHOn3lDvxN0S+mAdRN8ysw==
-=14P/
+iD8DBQFEPE4+2+ySkm8kpY0RAhUSAJ0aW2cqzfPsoMjAo0iWb79lDqr8LQCdE821
+WQYnHK/jNC+TzxhmfPGTleo=
+=pgnw
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/crossdev/crossdev-0.9.15.ebuild b/sys-devel/crossdev/crossdev-0.9.15.ebuild
new file mode 100644
index 000000000000..788f67b02072
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-0.9.15.ebuild
@@ -0,0 +1,22 @@
+# 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.15.ebuild,v 1.1 2006/04/12 00:47:36 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"
+IUSE=""
+
+RDEPEND="!>=sys-devel/gcc-config-2
+	sys-apps/portage
+	app-shells/bash
+	sys-apps/coreutils"
+
+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 d61bfbef866e..5e20bd7eafee 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.58 2006/04/11 00:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.59 2006/04/12 00:47:36 vapier Exp $
 
 cd /
 
@@ -204,8 +204,8 @@ parse_target() {
 }
 
 setup_portage_vars() {
-	PORTDIR_OVERLAY=$(portageq envvar PORTDIR_OVERLAY)
-	PORTDIR_OVERLAY=${PORTDIR_OVERLAY%% *}
+	PORTDIR_OVERLAYS=$(portageq envvar PORTDIR_OVERLAY)
+	PORTDIR_OVERLAY=${PORTDIR_OVERLAYS%% *}
 	PORTDIR=$(portageq envvar PORTDIR)
 	PORT_LOGDIR=$(portageq envvar PORT_LOGDIR)
 	PORT_LOGDIR=${PORT_LOGDIR:-/var/log/portage}
@@ -457,13 +457,15 @@ set_use() {
 }
 set_links() {
 	local cat=$1 pkg=$2
-	[[ -e ${PORTDIR_OVERLAY}/cross-${CTARGET}/${pkg} ]] \
-		&& rm -f "${PORTDIR_OVERLAY}"/cross-${CTARGET}/${pkg}
-	local srcdir=${PORTDIR}
-	if [[ -e ${PORTDIR_OVERLAY}/${cat}/${pkg} ]] ; then
-		einfo "Using ${cat}/${pkg} from ${PORTDIR_OVERLAY} instead of ${PORTDIR}"
-		srcdir=${PORTDIR_OVERLAY}
-	fi
+	local s srcdir=${PORTDIR}
+	rm -f "${PORTDIR_OVERLAY}"/cross-${CTARGET}/${pkg}
+	for s in ${PORTDIR_OVERLAYS} ; do
+		if [[ -d ${s}/${cat}/${pkg} ]] ; then
+			einfo "Using ${cat}/${pkg} from ${s} instead of ${PORTDIR}"
+			srcdir=${s}
+			break
+		fi
+	done
 	ln -s "${srcdir}"/${cat}/${pkg} "${PORTDIR_OVERLAY}"/cross-${CTARGET}/${pkg}
 }
 set_portage() {
diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.15 b/sys-devel/crossdev/files/digest-crossdev-0.9.15
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/crossdev/files/digest-crossdev-0.9.15