app-arch/tar: fix USE=static

Closes: https://bugs.gentoo.org/674506
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/app-arch/tar/tar-1.31.ebuild b/app-arch/tar/tar-1.31.ebuild
index 71881369353d731c9784f7f7aa6c67b352c71859..e26707c8e5db202397fef7daf5bf25ebcdfdd894 100644 (file)
--- a/app-arch/tar/tar-1.31.ebuild
+++ b/app-arch/tar/tar-1.31.ebuild
@@ -15,10 +15,13 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
-RDEPEND="acl? ( virtual/acl )
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
        selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
        nls? ( >=sys-devel/gettext-0.10.35 )
+       static? ( ${LIB_DEPEND} )
        xattr? ( elibc_glibc? ( sys-apps/attr ) )"
 
 src_prepare() {
@@ -35,9 +38,9 @@ src_prepare() {
 src_configure() {
        use static && append-ldflags -static
        local myeconfargs=(
-               --bindir="${EPREFIX}"/bin
+               --bindir="${EPREFIX%/}"/bin
                --enable-backup-scripts
-               --libexecdir="${EPREFIX}"/usr/sbin
+               --libexecdir="${EPREFIX%/}"/usr/sbin
                $(usex userland_GNU "" "--program-prefix=g")
                $(use_with acl posix-acls)
                $(use_enable nls)
@@ -69,7 +72,7 @@ src_install() {
        mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
 
        if use minimal ; then
-               find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+               find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \
                        -type f -a '!' '(' -name tar -o -name ${p}tar ')' \
                        -delete || die
        fi