[patch] patch to make ebuild prefix safe

plan9port-20140306-ebuild.patch (text/plain), 2.09 KB, created by Jeremi Piotrowski on 2015-12-01 15:34:15 UTC

diff --git a/dev-util/plan9port/plan9port-20140306.ebuild b/dev-util/plan9port/plan9port-20140306.ebuild
index 5b3ebeb..9fa7e51 100644
--- a/dev-util/plan9port/plan9port-20140306.ebuild
+++ b/dev-util/plan9port/plan9port-20140306.ebuild
@@ -20,7 +20,8 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-PLAN9=/usr/lib/plan9
+PLAN9="/usr/lib/plan9"
+EPLAN9="${EPREFIX%/}${PLAN9}"
 QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
 
 src_prepare() {
@@ -29,7 +30,7 @@ src_prepare() {
 	# Fix paths, done in place of ./INSTALL -c
 	einfo "Fixing hard-coded /usr/local/plan9 paths"
 	grep  --null -l -r '/usr/local/plan9' |
-	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
+	xargs --null sed -i "s!/usr/local/plan9!${EPLAN9}!g"
 }
 
 src_configure() {
@@ -51,31 +52,31 @@ src_install() {
 	dodir "${PLAN9}"
 
 	# P9P's man does not handle compression
-	docompress -x $PLAN9/man
+	docompress -x "${PLAN9}/man"
 
 	# do* plays with the executable bit, and we should not modify them
-	cp -a * "${D}/${PLAN9}"
+	cp -a * "${D}${EPLAN9}"
 
 	# build the environment variables and install them in env.d
 	cat > "${T}/30plan9" <<-EOF
-		PLAN9="${PLAN9}"
-		PATH="${PLAN9}/bin"
-		ROOTPATH="${PLAN9}/bin"
-		MANPATH="${PLAN9}/man"
+		PLAN9="${EPLAN9}"
+		PATH="${EPLAN9}/bin"
+		ROOTPATH="${EPLAN9}/bin"
+		MANPATH="${EPLAN9}/man"
 	EOF
 	doenvd "${T}/30plan9"
 }
 
 pkg_postinst() {
 	elog "Plan 9 from User Space has been successfully installed into"
-	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
+	elog "${EPLAN9}. Your PLAN9 and PATH environment variables have"
 	elog "also been appropriately set, please use env-update and"
 	elog "source /etc/profile to bring that into immediate effect."
 	elog
-	elog "Please note that ${PLAN9}/bin has been appended to the"
+	elog "Please note that ${EPLAN9}/bin has been appended to the"
 	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
 	elog "versions of common UNIX tools, use the absolute path:"
-	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
+	elog "${EPLAN9}/bin or the 9 command (eg: 9 troff)"
 	elog
 	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
 }