net-irc/znc: remove slash strip from EAPI=7 ebuilds

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Louis Sautier <sbraz@gentoo.org>

diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index 60cd7cf8147f1b084875b152a01835761c6e8c16..3bd414de0020d168731bd5d41d258398072d6921 100644 (file)
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -149,19 +149,19 @@ pkg_postinst() {
                readme.gentoo_print_elog
        fi
 
-       if [[ -d "${EROOT%/}"/etc/znc ]]; then
-               ewarn "${EROOT%/}/etc/znc exists on your system."
+       if [[ -d "${EROOT}"/etc/znc ]]; then
+               ewarn "${EROOT}/etc/znc exists on your system."
                ewarn "Due to the nature of the contents of that folder,"
                ewarn "we have changed the default configuration to use"
-               ewarn " ${EROOT%/}/var/lib/znc"
-               ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc"
+               ewarn " ${EROOT}/var/lib/znc"
+               ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
                ewarn "or adjust your service configuration."
        fi
 }
 
 pkg_config() {
-       if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
-               ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
+       if [[ -e "${EROOT}/var/lib/znc" ]]; then
+               ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging"
                ewarn "any existing configuration. If you are sure you want"
                ewarn "to generate a new configuration, remove the folder"
                ewarn "and try again."
@@ -169,11 +169,11 @@ pkg_config() {
                einfo "Press enter to interactively create a new configuration file for znc."
                einfo "To abort, press Control-C"
                read
-               mkdir -p "${EROOT%/}/var/lib/znc" || die
-               chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+               mkdir -p "${EROOT}/var/lib/znc" || die
+               chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
                        die "Setting permissions failed"
                start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
-                       "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" ||
+                       "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" ||
                        die "Config failed"
                einfo
                einfo "You can now start the znc service using the init system of your choice."

diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
index 9e33853571da871677d2f6194c5954ae4a74fb2d..d6e9044033edb6f47696e3ff7bf5db3c1d86b15f 100644 (file)
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ b/net-irc/znc/znc-1.7.4.ebuild
@@ -149,19 +149,19 @@ pkg_postinst() {
                readme.gentoo_print_elog
        fi
 
-       if [[ -d "${EROOT%/}"/etc/znc ]]; then
-               ewarn "${EROOT%/}/etc/znc exists on your system."
+       if [[ -d "${EROOT}"/etc/znc ]]; then
+               ewarn "${EROOT}/etc/znc exists on your system."
                ewarn "Due to the nature of the contents of that folder,"
                ewarn "we have changed the default configuration to use"
-               ewarn " ${EROOT%/}/var/lib/znc"
-               ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc"
+               ewarn " ${EROOT}/var/lib/znc"
+               ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
                ewarn "or adjust your service configuration."
        fi
 }
 
 pkg_config() {
-       if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
-               ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
+       if [[ -e "${EROOT}/var/lib/znc" ]]; then
+               ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging"
                ewarn "any existing configuration. If you are sure you want"
                ewarn "to generate a new configuration, remove the folder"
                ewarn "and try again."
@@ -169,11 +169,11 @@ pkg_config() {
                einfo "Press enter to interactively create a new configuration file for znc."
                einfo "To abort, press Control-C"
                read
-               mkdir -p "${EROOT%/}/var/lib/znc" || die
-               chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+               mkdir -p "${EROOT}/var/lib/znc" || die
+               chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
                        die "Setting permissions failed"
                start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
-                       "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" ||
+                       "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" ||
                        die "Config failed"
                einfo
                einfo "You can now start the znc service using the init system of your choice."

diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index e2a032f9ea5e708b3140e68b85b063472a5b9995..6d5656de499dd3f795c1be11cf4f6855936649dd 100644 (file)
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -149,19 +149,19 @@ pkg_postinst() {
                readme.gentoo_print_elog
        fi
 
-       if [[ -d "${EROOT%/}"/etc/znc ]]; then
-               ewarn "${EROOT%/}/etc/znc exists on your system."
+       if [[ -d "${EROOT}"/etc/znc ]]; then
+               ewarn "${EROOT}/etc/znc exists on your system."
                ewarn "Due to the nature of the contents of that folder,"
                ewarn "we have changed the default configuration to use"
-               ewarn " ${EROOT%/}/var/lib/znc"
-               ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc"
+               ewarn " ${EROOT}/var/lib/znc"
+               ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
                ewarn "or adjust your service configuration."
        fi
 }
 
 pkg_config() {
-       if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
-               ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
+       if [[ -e "${EROOT}/var/lib/znc" ]]; then
+               ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging"
                ewarn "any existing configuration. If you are sure you want"
                ewarn "to generate a new configuration, remove the folder"
                ewarn "and try again."
@@ -169,11 +169,11 @@ pkg_config() {
                einfo "Press enter to interactively create a new configuration file for znc."
                einfo "To abort, press Control-C"
                read
-               mkdir -p "${EROOT%/}/var/lib/znc" || die
-               chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+               mkdir -p "${EROOT}/var/lib/znc" || die
+               chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
                        die "Setting permissions failed"
                start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
-                       "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" ||
+                       "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" ||
                        die "Config failed"
                einfo
                einfo "You can now start the znc service using the init system of your choice."