From 5d1d9b7b940314df502e31f8a8d3f2e4b80ffffd Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 29 Sep 2007 20:55:38 +0000
Subject: [PATCH] Portage generates ED (and D) with a trailing /, this means
 that at least internally we can do things right and avoid double slashes. 
 This solves at least gtk+-2.12.0 compilation which uses einstall.  libtool
 isn't charmed by the double slashes.

svn path=/main/branches/prefix/; revision=7886
---
 bin/ebuild.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ee70c20b7..644a2d7e0 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -306,10 +306,10 @@ keepdir() {
 	local x
 	if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then
 		shift
-		find "$@" -type d -printf "${ED}/%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" | tr "\n" "\0" | $XARGS -0 -n100 touch || die "Failed to recursively create .keep files"
+		find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" | tr "\n" "\0" | $XARGS -0 -n100 touch || die "Failed to recursively create .keep files"
 	else
 		for x in "$@"; do
-			touch "${ED}/${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || die "Failed to create .keep in ${ED}/${x}"
+			touch "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || die "Failed to create .keep in ${ED}${x}"
 		done
 	fi
 }
@@ -547,21 +547,21 @@ einstall() {
 
 	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
 		if [ "${PORTAGE_DEBUG}" == "1" ]; then
-			${MAKE:-make} -n prefix="${ED}/usr" \
-				datadir="${ED}/usr/share" \
-				infodir="${ED}/usr/share/info" \
-				localstatedir="${ED}/var/lib" \
-				mandir="${ED}/usr/share/man" \
-				sysconfdir="${ED}/etc" \
+			${MAKE:-make} -n prefix="${ED}usr" \
+				datadir="${ED}usr/share" \
+				infodir="${ED}usr/share/info" \
+				localstatedir="${ED}var/lib" \
+				mandir="${ED}usr/share/man" \
+				sysconfdir="${ED}etc" \
 				${LOCAL_EXTRA_EINSTALL} \
 				"$@" install
 		fi
-		${MAKE:-make} prefix="${ED}/usr" \
-			datadir="${ED}/usr/share" \
-			infodir="${ED}/usr/share/info" \
-			localstatedir="${ED}/var/lib" \
-			mandir="${ED}/usr/share/man" \
-			sysconfdir="${ED}/etc" \
+		${MAKE:-make} prefix="${ED}usr" \
+			datadir="${ED}usr/share" \
+			infodir="${ED}usr/share/info" \
+			localstatedir="${ED}var/lib" \
+			mandir="${ED}usr/share/man" \
+			sysconfdir="${ED}etc" \
 			${LOCAL_EXTRA_EINSTALL} \
 			"$@" install || die "einstall failed"
 	else
-- 
2.26.2