Only preserve the /bin/sh symlink if it's bash.

Package-Manager: portage-2.1.2.2

3 files changed, 19 insertions, 12 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index db1495a6f0fe..9962c84a79a7 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.137 2007/03/23 06:22:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.138 2007/03/23 15:57:24 uberlord Exp $
+
+  23 Mar 2007; Roy Marples <uberlord@gentoo.org> bash-3.2_p15.ebuild:
+  Only preserve the /bin/sh symlink if it's bash.
 
 *bash-3.2_p10-r1 (23 Mar 2007)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 832acb7470f1..c4392b62192e 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -299,18 +299,18 @@ EBUILD bash-3.2_p10.ebuild 4402 RMD160 fbe2b604872008bf523266b50ab4f159971124ea
 MD5 8708824c2262f4484f893ca481ac83c4 bash-3.2_p10.ebuild 4402
 RMD160 fbe2b604872008bf523266b50ab4f159971124ea bash-3.2_p10.ebuild 4402
 SHA256 9acdc3471174bae2f03787d2789ae39295595bb3df2632b2d2e56bd1cec9a2e8 bash-3.2_p10.ebuild 4402
-EBUILD bash-3.2_p15.ebuild 4460 RMD160 63c692f011bab5a264c7bcc3708bfd18398597e4 SHA1 fd520823b989df7db91f7e4bf0a645b8cc81a5c5 SHA256 65894ad2e9be00315ccf2afd6d3fb0ac53b05cc32f3eb724ca112dade347addf
-MD5 c76f87217f1490764d2aba30cfe5250e bash-3.2_p15.ebuild 4460
-RMD160 63c692f011bab5a264c7bcc3708bfd18398597e4 bash-3.2_p15.ebuild 4460
-SHA256 65894ad2e9be00315ccf2afd6d3fb0ac53b05cc32f3eb724ca112dade347addf bash-3.2_p15.ebuild 4460
+EBUILD bash-3.2_p15.ebuild 4648 RMD160 6254f2c42bda83909dd33625d60bae49afd89b11 SHA1 7ce2208ae73421e62379a3cb71993463713e2696 SHA256 2b407f4cf3e4ddc40c40bc1b62af69bd998225199c264bba0537b6b01c3bc615
+MD5 3f5f621c56e20b96b88d54fc845c86a2 bash-3.2_p15.ebuild 4648
+RMD160 6254f2c42bda83909dd33625d60bae49afd89b11 bash-3.2_p15.ebuild 4648
+SHA256 2b407f4cf3e4ddc40c40bc1b62af69bd998225199c264bba0537b6b01c3bc615 bash-3.2_p15.ebuild 4648
 EBUILD bash-3.2_p9-r1.ebuild 4340 RMD160 d663e053149393248d9ae8a194c5b4bf6d04f794 SHA1 db7f1abd2839e01d542d44f795b934b57db86c2d SHA256 21e4785d3630607b051feed27c8f2c8fd0e8dc62305a66938bcee52979c370aa
 MD5 2ddfec75db6f094863e533d055719767 bash-3.2_p9-r1.ebuild 4340
 RMD160 d663e053149393248d9ae8a194c5b4bf6d04f794 bash-3.2_p9-r1.ebuild 4340
 SHA256 21e4785d3630607b051feed27c8f2c8fd0e8dc62305a66938bcee52979c370aa bash-3.2_p9-r1.ebuild 4340
-MISC ChangeLog 24174 RMD160 506f7512a48ff8b89af638224fbb082c463fa7b1 SHA1 3abcc58f25fac8a9cdf5f7116fcb5e773be10c4f SHA256 8f4e202757c51efd29871bd64b0272e7d1e1631789440e7582cd904c344a3601
-MD5 563ec3c15fef432f5faffdff0605bcdf ChangeLog 24174
-RMD160 506f7512a48ff8b89af638224fbb082c463fa7b1 ChangeLog 24174
-SHA256 8f4e202757c51efd29871bd64b0272e7d1e1631789440e7582cd904c344a3601 ChangeLog 24174
+MISC ChangeLog 24300 RMD160 dad07de861282e6509e685706e733aac79eb3d49 SHA1 d035ba9fdb8517d7fd25c0f4645e34c927d50ab0 SHA256 9244dec6bf773f32a83c7a8a82256fc034687cac5afc2885f729ecffa7c5a8d6
+MD5 7c463e13a73438f5271db2bf90210c18 ChangeLog 24300
+RMD160 dad07de861282e6509e685706e733aac79eb3d49 ChangeLog 24300
+SHA256 9244dec6bf773f32a83c7a8a82256fc034687cac5afc2885f729ecffa7c5a8d6 ChangeLog 24300
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
diff --git a/app-shells/bash/bash-3.2_p15.ebuild b/app-shells/bash/bash-3.2_p15.ebuild
index 1f3179e2bd45..9e4aff66239b 100644
--- a/app-shells/bash/bash-3.2_p15.ebuild
+++ b/app-shells/bash/bash-3.2_p15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p15.ebuild,v 1.1 2007/03/22 06:41:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p15.ebuild,v 1.2 2007/03/23 15:57:24 uberlord Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -141,9 +141,13 @@ pkg_preinst() {
 		rm -f "${D}"/etc/bash/bash_logout
 	fi
 
+	# If /bin/sh does not exist or is bash, then provide it
+	# Otherwise leave it alone
 	if [[ ! -e ${ROOT}/bin/sh ]] ; then
 		ln -s bash "${ROOT}"/bin/sh
-	else
-		cp -a "${ROOT}"/bin/sh "${D}"/bin/
+	elif [[ -L ${ROOT}/bin/sh ]] ; then
+		case "$(readlink "${ROOT}"/bin/sh)" in
+			bash|/bin/bash) cp -pPR "${ROOT}"/bin/sh "${D}"/bin/ ;;
+		esac
 	fi
 }