From: David Seifert <soap@gentoo.org>
Date: Sat, 8 Feb 2020 16:22:47 +0000 (+0100)
Subject: net-dialup/rp-pppoe: [QA] Fix UnnecessarySlashStrip
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=68ce593c73021d1fbdc02aeeefd19c2595555f6d;p=gentoo.git

net-dialup/rp-pppoe: [QA] Fix UnnecessarySlashStrip

Signed-off-by: David Seifert <soap@gentoo.org>
---

diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
index 2f775fca64a2..ab0711a3d0de 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
@@ -84,7 +84,7 @@ src_install () {
 	emake DESTDIR="${D}" install #docdir=/usr/share/doc/${PF} install
 
 	#Don't use compiled rp-pppoe plugin - see pkg_preinst below
-	local pppoe_plugin="${ED%/}/etc/ppp/plugins/rp-pppoe.so"
+	local pppoe_plugin="${ED}/etc/ppp/plugins/rp-pppoe.so"
 	if [ -f "${pppoe_plugin}" ] ; then
 		rm "${pppoe_plugin}" || die
 	fi
@@ -105,7 +105,7 @@ src_install () {
 
 pkg_preinst() {
 	# Use the rp-pppoe plugin that comes with net-dialup/pppd
-	if [ -n "${PPPD_VER}" ] && [ -f "${EROOT%/}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then
+	if [ -n "${PPPD_VER}" ] && [ -f "${EROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then
 		dosym ../../../usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so
 	fi
 }