Add support for storing env vars in config files in /etc/portage/crossdev.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 27 insertions, 3 deletions

diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index df882710fa61..436cbc0bef70 100644
--- a/sys-devel/crossdev/ChangeLog
+++ b/sys-devel/crossdev/ChangeLog
@@ -1,6 +1,12 @@
 # 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.31 2006/03/15 00:00:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.32 2006/04/11 00:19:43 vapier Exp $
+
+*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:
+  Add support for storing env vars in config files in /etc/portage/crossdev.
 
 *crossdev-0.9.13 (14 Mar 2006)
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 61b54510e832..ca921fc9944b 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 90113815fa96f0be3a9eabc0b1a449e4 ChangeLog 7140
 RMD160 2a36bf05a81303b5c42199b08f8dcd2666ed9598 ChangeLog 7140
 SHA256 ceb6ea8aa2a66b2422ad90a169f707f4fc80231ba10face93bc5ba0246f15af4 ChangeLog 7140
@@ -13,3 +16,10 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 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/
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/crossdev/crossdev-0.9.13.ebuild b/sys-devel/crossdev/crossdev-0.9.14.ebuild
index 21c8a27b3a30..fd83b0f53977 100644
--- a/sys-devel/crossdev/crossdev-0.9.13.ebuild
+++ b/sys-devel/crossdev/crossdev-0.9.14.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.13.ebuild,v 1.2 2006/03/22 04:23:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.14.ebuild,v 1.1 2006/04/11 00:19:43 vapier Exp $
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index 1ab606f9f3dd..d61bfbef866e 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.57 2006/03/30 00:12:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.58 2006/04/11 00:19:44 vapier Exp $
 
 cd /
 
@@ -384,6 +384,14 @@ if [[ $(env -u CHOST portageq envvar CHOST) == ${CTARGET} ]] ; then
 	exit 1
 fi
 
+# grab user settings
+for v in ABI UCLIBC_CPU USE BVER GVER KVER LVER STAGE ; do
+	if [[ -e /etc/portage/crossdev/${CTARGET}/${v} ]] ; then
+		export ${v}=$(</etc/portage/crossdev/${CTARGET}/${v})
+		einfo "Restoring user setting '${v}' to '${!v}'"
+	fi
+done
+
 #####################
 ### do the emerge ###
 (
diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.13 b/sys-devel/crossdev/files/digest-crossdev-0.9.14
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/crossdev/files/digest-crossdev-0.9.13
+++ b/sys-devel/crossdev/files/digest-crossdev-0.9.14