From 8dc9d76e5ec4c3ec432b17843f3caf8515b6e423 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 11 Feb 2014 22:00:51 -0800
Subject: [PATCH] fix(app-shells/bash): Update /etc symlinks, use
 /usr/share/skel

Symlinks out of /etc to /usr should generally be relative, that way they
work regardless of whether you are based at / or dealing with a new
chroot you haven't entered yet, or a build root like /build/amd64-usr
Namely the absolute links break cros_sdk which copies skel into home.

Also switch to /usr/share/skel since other packages may need install
things to that directory in the future.
---
 ...2_p20-r1.ebuild => bash-4.2_p20-r2.ebuild} |  0
 .../app-shells/bash/bash-4.2_p20.ebuild       | 21 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/app-shells/bash/{bash-4.2_p20-r1.ebuild => bash-4.2_p20-r2.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20.ebuild b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20.ebuild
index e5850d77df..dd4d1d0a91 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p20.ebuild
@@ -138,18 +138,23 @@ src_install() {
 	mv "${D}"/usr/bin/bash "${D}"/bin/ || die
 	dosym bash /bin/rbash
 
-	insinto /usr/share/bash/defaults/
-	doins "${FILESDIR}"/{bashrc,bash_logout}
-	dosym /usr/share/bash/defaults/bash_logout /etc/bash/bash_logout
-	dosym /usr/share/bash/defaults/bashrc /etc/bash/bashrc
-	insinto /usr/share/bash/skel
+	insinto /usr/share/bash
+	for f in bash{_logout,rc} ; do
+		doins "${FILESDIR}"/${f}
+		dosym ../../usr/share/bash/${f} /etc/bash/${f}
+	done
+	insinto /usr/share/skel
 	for f in bash{_logout,_profile,rc} ; do
 		newins "${FILESDIR}"/dot-${f} .${f}
-		dosym /usr/share/bash/skel/.${f} /etc/skel/.${f}
+		dosym ../../usr/share/skel/.${f} /etc/skel/.${f}
 	done
 
-	sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
-	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+	sed -i -e "s:#${USERLAND}#@::" \
+		"${D}"/usr/share/skel/.bashrc \
+		"${D}"/usr/share/bash/bashrc
+	sed -i -e '/#@/d' \
+		"${D}"/usr/share/skel/.bashrc \
+		"${D}"/usr/share/bash/bashrc
 
 	if use plugins ; then
 		exeinto /usr/$(get_libdir)/bash