net-firewall/shorewall: fix missing slashes

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
index e377930a382cd4891683b33c42f9f1d929d26384..6effdd7a417a0a69b5647b985d1a205b525fa621 100644 (file)
--- a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
@@ -272,13 +272,13 @@ src_compile() {
 src_install() {
        # shorewall-core
        einfo "Installing ${MY_P_CORE} ..."
-       DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+       DESTDIR="${ED}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
        dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
 
        # shorewall
        if use ipv4; then
                einfo "Installing ${MY_P_IPV4} ..."
-               DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+               DESTDIR="${ED}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
                keepdir /var/lib/shorewall
 
                if use doc; then
@@ -289,7 +289,7 @@ src_install() {
        # shorewall6
        if use ipv6; then
                einfo "Installing ${MY_P_IPV6} ..."
-               DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+               DESTDIR="${ED}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
                keepdir /var/lib/shorewall6
 
                if use doc; then
@@ -300,40 +300,40 @@ src_install() {
        # shorewall-lite
        if use lite4; then
                einfo "Installing ${MY_P_LITE4} ..."
-               DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+               DESTDIR="${ED}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
                keepdir /var/lib/shorewall-lite
        fi
 
        # shorewall6-lite
        if use lite6; then
                einfo "Installing ${MY_P_LITE6} ..."
-               DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+               DESTDIR="${ED}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
                keepdir /var/lib/shorewall6-lite
        fi
 
        # shorewall-init
        if use init; then
                einfo "Installing ${MY_P_INIT} ..."
-               DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+               DESTDIR="${ED}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
                dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
 
-               if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+               if [[ -f "${ED}/etc/logrotate.d/shorewall-init" ]]; then
                        # On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
                        # so we don't need a logrotate configuration file for shorewall-init
-                       einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-                       rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+                       einfo "Removing unused \"${ED}/etc/logrotate.d/shorewall-init\" ..."
+                       rm -rf "${ED}"/etc/logrotate.d/shorewall-init || die "Removing \"${ED}/etc/logrotate.d/shorewall-init\" failed"
                fi
 
-               if [[ -d "${D}etc/NetworkManager" ]]; then
+               if [[ -d "${ED}/etc/NetworkManager" ]]; then
                        # On Gentoo, we don't support NetworkManager
                        # so we don't need this folder at all
-                       einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-                       rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+                       einfo "Removing unused \"${ED}/etc/NetworkManager\" ..."
+                       rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed"
                fi
 
-               if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+               if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then
                        # This script isn't supported on Gentoo
-                       rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+                       rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/usr/share/shorewall-init/ifupdown\" failed"
                fi
        fi