tweak ROOT handling slightly to work with relative paths

Package-Manager: portage-2.1.2-r9

diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index bfc7acea96537b2cb8a01978445a03f173e6e997..35c570ba854816289f2c541d1c6f91ef5fafa204 100644 (file)
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -5,10 +5,10 @@ AUX binutils-config-1.8 10258 RMD160 fbad5dc6fd7a86793edcd960e90e8fab20d8de31 SH
 MD5 1ee464741f34882a1c46c188af729bc1 files/binutils-config-1.8 10258
 RMD160 fbad5dc6fd7a86793edcd960e90e8fab20d8de31 files/binutils-config-1.8 10258
 SHA256 4b39cd5ca2fce451a2abd13e03ed516db21981bb82d15fe29f6a0cb415f07a25 files/binutils-config-1.8 10258
-AUX binutils-config-1.9 10991 RMD160 31ddec59e7915df0a55e03fd20192ca63dd09a5a SHA1 36b6880d078a49a31ea0265bd5170c9bc35672ac SHA256 b788f7b4faff09e3cf0fb2bd0662299bea125f27b5560fc20dd04a3a350ebd43
-MD5 5665f7fe2048846c811964d579c341e6 files/binutils-config-1.9 10991
-RMD160 31ddec59e7915df0a55e03fd20192ca63dd09a5a files/binutils-config-1.9 10991
-SHA256 b788f7b4faff09e3cf0fb2bd0662299bea125f27b5560fc20dd04a3a350ebd43 files/binutils-config-1.9 10991
+AUX binutils-config-1.9 11031 RMD160 02de22ff70410c266c95d7beca13b5d8d333dff2 SHA1 30b76eb203aa0590d9ff8e3d818a1114f33b7a72 SHA256 a04591bb040cd689ac0c9001f05aecf58214f61103afc496699f00012d296f9c
+MD5 d864bde793dc3080d4b9d87ecbbb9f12 files/binutils-config-1.9 11031
+RMD160 02de22ff70410c266c95d7beca13b5d8d333dff2 files/binutils-config-1.9 11031
+SHA256 a04591bb040cd689ac0c9001f05aecf58214f61103afc496699f00012d296f9c files/binutils-config-1.9 11031
 AUX binutils-config.8 3250 RMD160 901307542b481e9d4ffdca4dd4893a7eefe027fb SHA1 5ed2e6cd13b5b6a83fd26eec570fd02399495a2a SHA256 8e6dd458d03413ca7907db03413cb7002397ed3a853d1728713eebe5b126ea13
 MD5 8b530626d0afc0ca9b0f685a3f640377 files/binutils-config.8 3250
 RMD160 901307542b481e9d4ffdca4dd4893a7eefe027fb files/binutils-config.8 3250
@@ -38,7 +38,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF10QG8bi6rjpTunYRAjm/AJ407cUpT1iRK8vyZiUbp28k8xQX/gCdE/Af
-2UbBIdYkYKvfC10uCj2ldkg=
-=vocc
+iD8DBQFF2xFy8bi6rjpTunYRApsBAKChTP2Z9kGIkFfZWBxE6IDW1ecNsgCdFqLI
+lwjsBXz39k34d6Tm1quU+lM=
+=Unvm
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/binutils-config/files/binutils-config-1.9 b/sys-devel/binutils-config/files/binutils-config-1.9
index a7659d157b5dd243e1e897e3639cbced0158a884..d77e364a97593934119052ee78314d5163a405d7 100755 (executable)
--- a/sys-devel/binutils-config/files/binutils-config-1.9
+++ b/sys-devel/binutils-config/files/binutils-config-1.9
@@ -1,12 +1,16 @@
 #!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.6 2006/11/26 13:40:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.7 2007/02/20 15:18:16 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:      CURRENT=version for TARGET
 #  TARGET-VER:         has a TARGET and VER variable
 
+[[ -z ${ROOT} ]] && ROOT="/"
+[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
+[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
+
 cd /
 
 trap ":" INT QUIT TSTP
@@ -289,8 +293,6 @@ set_HOST() {
        fi
 }
 
-[[ -z ${ROOT} ]] && ROOT="/"
-[[ ${ROOT:0-1} != "/" ]] && ROOT="${ROOT}/"
 ENV_D="${ROOT}etc/env.d/binutils"
 
 DEBUG="no"
@@ -332,7 +334,7 @@ while [[ $# -gt 0 ]] ; do
                        exit 0
                        ;;
                -V|--version)
-                       cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.6 2006/11/26 13:40:14 vapier Exp $"
+                       cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.7 2007/02/20 15:18:16 vapier Exp $"
                        cvsver=${cvsver##*binutils-config-}
                        bver=${cvsver%%,v *}
                        cvsver=${cvsver#* }