From 06ac51cf5bdb3220d427819cdfafdab231e4a4f8 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 8 May 2018 10:38:31 -0400
Subject: [PATCH] fcaps.eclass: don't assume D and ROOT end with a slash

Closes: https://bugs.gentoo.org/655244
---
 eclass/fcaps.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 7b388849df60..467f955f5e9a 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -110,11 +110,12 @@ fcaps() {
 		root=${EROOT:-${ROOT}}
 		;;
 	esac
+	root=${root%/}
 
 	# Process every file!
 	local file
 	for file ; do
-		[[ ${file} != /* ]] && file="${root}${file}"
+		[[ ${file} != /* ]] && file="${root}/${file}"
 
 		if use filecaps ; then
 			# Try to set capabilities.  Ignore errors when the
-- 
2.26.2