From 9fb4c0809c256781b806278f83c1f8f0322937c9 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 13 May 2015 14:54:44 -0700
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.
---
 ...{bash-4.2_p53.ebuild => bash-4.2_p53-r1.ebuild} | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/app-shells/bash/{bash-4.2_p53.ebuild => bash-4.2_p53-r1.ebuild} (95%)

diff --git a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p53.ebuild b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p53-r1.ebuild
similarity index 95%
rename from sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p53.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p53-r1.ebuild
index e94550891f..b00936c5f0 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p53.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-shells/bash/bash-4.2_p53-r1.ebuild
@@ -153,11 +153,15 @@ src_install() {
 	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
-	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
-	insinto /etc/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/skel/.${f} /etc/skel/.${f}
 	done
 
 	local sed_args=(
@@ -172,8 +176,8 @@ src_install() {
 	fi
 	sed -i \
 		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
+		"${ED}"/usr/share/skel/.bashrc \
+		"${ED}"/usr/share/bash/bashrc || die
 
 	if use plugins ; then
 		exeinto /usr/$(get_libdir)/bash