Ensure that portage < 2.1.5 upgrade bash with FEATURES=-unmerge-orphans. Rewrite /bin/sh to prevent it from being uninstalled by changing its mtime.

Package-Manager: portage-2.1.4.4

3 files changed, 27 insertions, 9 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index f39ad92363b6..b23412db7004 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.178 2008/05/31 06:57:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.179 2008/06/12 17:38:35 zlin Exp $
+
+  12 Jun 2008; Bo Ørsted Andresen <zlin@gentoo.org> bash-3.2_p39.ebuild:
+  Ensure that portage < 2.1.5 upgrade bash with FEATURES=-unmerge-orphans.
+  Rewrite /bin/sh to prevent it from being uninstalled by changing its mtime.
 
   31 May 2008; Mike Frysinger <vapier@gentoo.org> bash-3.2_p39.ebuild:
   Make sure /bin/sh always exists #222721 by Davide Pesavento.
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 79121ea49881..430ee75b4cb6 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -150,13 +150,13 @@ EBUILD bash-3.0-r14.ebuild 4724 RMD160 8c16b1f563c0eb4d2c752141d9575c24c437a398
 EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e SHA1 c00fd85917ace93b4d1bdaf6db18224e08260834 SHA256 ff12913c0306b1b597fb7da13740af52c2ccd65125695914fcf84cac455681a8
 EBUILD bash-3.2_p17-r1.ebuild 5190 RMD160 9c45f94ce82653ca2d45a322f589ff559c38e6ee SHA1 263691afc042bf469ab864fdf4d78ecfca2ce444 SHA256 339157453d9df410d882e72ea22eac12e62ee176ef013e7570135a3c1b959eab
 EBUILD bash-3.2_p33.ebuild 5653 RMD160 3033b2fd6068ab34362ea14ec90bc173e29343f3 SHA1 07a746960852d88592cee6874d53272cb720e31e SHA256 e8bb4d859e1ab631e9816d646b63ab19fbcce905d12ebceaf419beba5fae77f2
-EBUILD bash-3.2_p39.ebuild 5888 RMD160 45a338a5d99c0ea4e8bcbc6e2407e1a2b5fb467f SHA1 374ff9543f0a8082c0c678f0784f0e9fc3ebcb6d SHA256 e649f2ea09698c725806486b85d6a1bc2b8a1e594e26ba075b9f154be74ae19b
-MISC ChangeLog 28753 RMD160 4e828e115c19cf72de65010db27032b9b18e56c3 SHA1 9a15c298ed1729fd4937fa983270b57c250da05b SHA256 39ce9cd3bad3e038747d258df66a4642e59a022b68f8830eae488c649d1f1440
+EBUILD bash-3.2_p39.ebuild 6415 RMD160 5faed66f4774534bc711403d228d8b5608502daf SHA1 764e59b3a823818c360f144b6ba8adb65527f3fc SHA256 525cbb3434cfe8f7e5ead7834a5137d74aa423e9a34dd0ccba0de058e0cb5fdd
+MISC ChangeLog 28979 RMD160 22d9dd532eecbc764f7d9263b4715f9ad2b621ee SHA1 18de25c4e0a989efc1f95c3cf646c256008b0c0c SHA256 cd63474d29ef4492e6a7872d15d0af955bb32aaecf07155fbc7d4dd41bcf2739
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIQpOrj9hvisErhMIRAnEwAKDXB45T+LtUnRKoNxpnxbgmB55DxQCeK/sm
-QDLGdcPVjwQYVPoWa1BzY7g=
-=wmMl
+iEYEARECAAYFAkhRXx4ACgkQfxJ68Jl1NeG+yACdE2X9s1Iwtdk9ti8yFzWQZ4sA
++4EAoM+s9/ftB7p0qsBvXdvlx+vrXH6I
+=E5FX
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.2_p39.ebuild b/app-shells/bash/bash-3.2_p39.ebuild
index 98756724cf26..e85150035608 100644
--- a/app-shells/bash/bash-3.2_p39.ebuild
+++ b/app-shells/bash/bash-3.2_p39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.4 2008/05/31 06:57:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.5 2008/06/12 17:38:35 zlin Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -47,6 +47,14 @@ pkg_setup() {
 		eerror "as it breaks LFS (struct stat64) on x86."
 		die "remove -malign-double from your CFLAGS mr ricer"
 	fi
+
+	if hasq unmerge-orphans ${FEATURES} && \
+			has_version "<sys-apps/portage-2.1.5" && \
+			has_version "<app-shells/bash-3.2_p39"; then
+		eerror "Please upgrade bash with FEATURES=-unmerge-orphans to prevent /bin/sh"
+		eerror "from being removed. See bug #222721 for further details."
+		die "Upgrade bash with FEATURES=-unmerge-orphans"
+	fi
 }
 
 src_unpack() {
@@ -186,5 +194,11 @@ pkg_preinst() {
 
 pkg_postinst() {
 	# If /bin/sh does not exist, provide it
-	[[ ! -e ${ROOT}/bin/sh ]] && ln -sf bash "${ROOT}"/bin/sh
+	if [[ ! -e ${ROOT}/bin/sh ]]; then
+		ln -sf bash "${ROOT}"/bin/sh
+	elif [[ -L ${ROOT}/bin/sh ]]; then
+		# rewrite the symlink to ensure that its mtime changes
+		local target=$(readlink "${ROOT}"/bin/sh)
+		ln -sf "${target}" "${ROOT}"/bin/sh
+	fi
 }