Ignore directores in /etc/env.d/gcc #118246 by Mark Purtill.

Package-Manager: portage-2.1_pre3-r1

8 files changed, 27 insertions, 16 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 0a398c99f587..c69fda77a917 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.114 2006/01/05 03:05:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.115 2006/01/08 09:52:45 vapier Exp $
+
+*gcc-config-1.3.13-r1 (08 Jan 2006)
+*gcc-config-1.3.12-r6 (08 Jan 2006)
+
+  08 Jan 2006; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.12,
+  files/gcc-config-1.3.13, -gcc-config-1.3.12-r5.ebuild,
+  +gcc-config-1.3.12-r6.ebuild, -gcc-config-1.3.13.ebuild,
+  +gcc-config-1.3.13-r1.ebuild:
+  Ignore directores in /etc/env.d/gcc #118246 by Mark Purtill.
 
 *gcc-config-1.3.12-r5 (05 Jan 2006)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 4cead40bb0a6..d4338d2d0e0a 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3ffe4a67450e1c382b4cdd6ec5152c3e ChangeLog 22978
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r5 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.13 0
+MD5 0d27bbe99f8a034ab004ecf8fcafe7f0 ChangeLog 23338
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r6 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.13-r1 0
 MD5 c7cf3a3617d90adfaacc7c2c012ddfb0 files/digest-gcc-config-2.0.0_beta2 79
-MD5 2b8205d9fde699e089891d8a4d345ded files/gcc-config-1.3.12 17606
-MD5 fcb6888f1f57de7560e4bd6fb16a6c6d files/gcc-config-1.3.13 17909
+MD5 6ca78d8db840ae4aa3acdd0d91b649ba files/gcc-config-1.3.12 17638
+MD5 235bdfabb33bcbaf51cf1adc6fe21df2 files/gcc-config-1.3.13 17941
 MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
-MD5 63e27aa76e788bb004681de123fe56d8 gcc-config-1.3.12-r5.ebuild 1458
-MD5 7f9885dad4dc0c03271e92bc65ad8ec6 gcc-config-1.3.13.ebuild 1468
+MD5 15eb934411212481076e228d609466d9 gcc-config-1.3.12-r6.ebuild 1458
+MD5 5de34d048ceeeb2ddbbd3f2f0549063a gcc-config-1.3.13-r1.ebuild 1471
 MD5 35fee17d74ce037258c00f8d9e9dd820 gcc-config-2.0.0_beta2.ebuild 781
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDvI1F2+ySkm8kpY0RAhlrAJ0enC54sNGCo1PVHEgkYegklJIvVwCgptpV
-ixZmRhM07ziD3g241JtL5mg=
-=4yCh
+iD8DBQFDwOFA2+ySkm8kpY0RAq7GAKCbTYQSNJSioq2DRRlI97JFM7lhCgCgj7ph
+vG5xTQsMNyg9AmWb+MtkMq0=
+=Q8OU
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r5 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r6
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r5
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.12-r6
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r1
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.12 b/sys-devel/gcc-config/files/gcc-config-1.3.12
index 8366a2678f7c..ebce2f0a711b 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.12
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.12
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.13 2006/01/05 03:05:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.14 2006/01/08 09:52:45 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -595,6 +595,7 @@ for x in "$@" ; do
 					# User gave us a # representing the profile
 					i=1
 					for y in "${GCC_ENV_D}"/* ; do
+						[[ -f ${y} ]] || continue
 						[[ ${y/\/config} != ${y} ]] && continue
 
 						if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.13 b/sys-devel/gcc-config/files/gcc-config-1.3.13
index 2a82308a947b..e2c8debd3bf2 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.13
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.13
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v 1.2 2006/01/05 03:05:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v 1.3 2006/01/08 09:52:45 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -601,6 +601,7 @@ for x in "$@" ; do
 					# User gave us a # representing the profile
 					i=1
 					for y in "${GCC_ENV_D}"/* ; do
+						[[ -f ${y} ]] || continue
 						[[ ${y/\/config} != ${y} ]] && continue
 
 						if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then
diff --git a/sys-devel/gcc-config/gcc-config-1.3.12-r5.ebuild b/sys-devel/gcc-config/gcc-config-1.3.12-r6.ebuild
index a04e9726b036..eb3a252ddb8c 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.12-r5.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.12-r6.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/gcc-config/gcc-config-1.3.12-r5.ebuild,v 1.1 2006/01/05 03:05:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.12-r6.ebuild,v 1.1 2006/01/08 09:52:45 vapier Exp $
 
 inherit toolchain-funcs multilib
 
diff --git a/sys-devel/gcc-config/gcc-config-1.3.13.ebuild b/sys-devel/gcc-config/gcc-config-1.3.13-r1.ebuild
index e1dc88e8ed7d..f6dfdfa8d70b 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.13.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.13.ebuild,v 1.1 2005/12/30 11:04:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.13-r1.ebuild,v 1.1 2006/01/08 09:52:45 vapier Exp $
 
 inherit toolchain-funcs multilib