net-misc/openssh: [QA] Fix UnnecessarySlashStrip

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

diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
index 7851cc3b95e1f37e445f8c82c42230b1dddf8fff..98bf001c684ef3b18453ba3ee1b0a56677e0578f 100644 (file)
--- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
@@ -98,7 +98,7 @@ pkg_pretend() {
 
 src_prepare() {
        sed -i \
-               -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+               -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
                pathnames.h || die
 
        # don't break .ssh/authorized_keys2 for fun
@@ -255,13 +255,13 @@ src_configure() {
                --with-ldflags="${LDFLAGS}"
                --disable-strip
                --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-               --sysconfdir="${EPREFIX%/}"/etc/ssh
-               --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-               --datadir="${EPREFIX%/}"/usr/share/openssh
-               --with-privsep-path="${EPREFIX%/}"/var/empty
+               --sysconfdir="${EPREFIX}"/etc/ssh
+               --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+               --datadir="${EPREFIX}"/usr/share/openssh
+               --with-privsep-path="${EPREFIX}"/var/empty
                --with-privsep-user=sshd
                $(use_with audit audit linux)
-               $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+               $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
                # We apply the sctp patch conditionally, so can't pass --without-sctp
                # unconditionally else we get unknown flag warnings.
                $(use sctp && use_with sctp)

diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
index 9064d66d9fbdbe5a55c6bb06fa45e01b0f8159c0..828c4a17b8ef663aacc8f8f83f0d6755f27ae9c8 100644 (file)
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
@@ -110,7 +110,7 @@ pkg_pretend() {
 
 src_prepare() {
        sed -i \
-               -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+               -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
                pathnames.h || die
 
        # don't break .ssh/authorized_keys2 for fun
@@ -279,17 +279,17 @@ src_configure() {
                --with-ldflags="${LDFLAGS}"
                --disable-strip
                --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-               --sysconfdir="${EPREFIX%/}"/etc/ssh
-               --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-               --datadir="${EPREFIX%/}"/usr/share/openssh
-               --with-privsep-path="${EPREFIX%/}"/var/empty
+               --sysconfdir="${EPREFIX}"/etc/ssh
+               --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+               --datadir="${EPREFIX}"/usr/share/openssh
+               --with-privsep-path="${EPREFIX}"/var/empty
                --with-privsep-user=sshd
                $(use_with audit audit linux)
-               $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+               $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
                # We apply the sctp patch conditionally, so can't pass --without-sctp
                # unconditionally else we get unknown flag warnings.
                $(use sctp && use_with sctp)
-               $(use_with ldns ldns "${EPREFIX%/}"/usr)
+               $(use_with ldns ldns "${EPREFIX}"/usr)
                $(use_with libedit)
                $(use_with pam)
                $(use_with pie)

diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
index 0b6e431f7e96bcbf65000cef69bf9b9668a3feef..1b1d9363437b197b24ab280a59d15722d61b421a 100644 (file)
--- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
@@ -111,7 +111,7 @@ pkg_pretend() {
 
 src_prepare() {
        sed -i \
-               -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+               -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
                pathnames.h || die
 
        # don't break .ssh/authorized_keys2 for fun
@@ -281,17 +281,17 @@ src_configure() {
                --with-ldflags="${LDFLAGS}"
                --disable-strip
                --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-               --sysconfdir="${EPREFIX%/}"/etc/ssh
-               --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-               --datadir="${EPREFIX%/}"/usr/share/openssh
-               --with-privsep-path="${EPREFIX%/}"/var/empty
+               --sysconfdir="${EPREFIX}"/etc/ssh
+               --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+               --datadir="${EPREFIX}"/usr/share/openssh
+               --with-privsep-path="${EPREFIX}"/var/empty
                --with-privsep-user=sshd
                $(use_with audit audit linux)
-               $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+               $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
                # We apply the sctp patch conditionally, so can't pass --without-sctp
                # unconditionally else we get unknown flag warnings.
                $(use sctp && use_with sctp)
-               $(use_with ldns ldns "${EPREFIX%/}"/usr)
+               $(use_with ldns ldns "${EPREFIX}"/usr)
                $(use_with libedit)
                $(use_with pam)
                $(use_with pie)