[gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/

[Sam James]

commit:     d04534bfb44f8f1cad29c6c54ec6cdbbecede36f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 03:56:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 03:56:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04534bf

sys-libs/libxcrypt: fix installation on prefix in 4.4.23-r1

Closes: https://bugs.gentoo.org/802222
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
index d03062b4d64..59a192d732e 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
@@ -106,8 +106,8 @@ get_xclibdir() {
 multilib_src_configure() {
        local -a myconf=(
                --disable-werror
-               --libdir=$(get_xclibdir)
-               --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+               --libdir="${EPREFIX}"$(get_xclibdir)
+               --with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
                --includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
        )
 
@@ -157,8 +157,8 @@ src_install() {
        ) || die "failglob error"
 
        # Remove useless stuff from installation
-       find "${D}"/usr/share/doc/${PF} -type l -delete || die
-       find "${D}" -name '*.la' -delete || die
+       find "${ED}"/usr/share/doc/${PF} -type l -delete || die
+       find "${ED}" -name '*.la' -delete || die
 }
 
 multilib_src_install() {
@@ -167,7 +167,7 @@ multilib_src_install() {
        # Don't install the libcrypt.so symlink for the "compat" version
        case "${MULTIBUILD_ID}" in
                xcrypt_compat-*)
-                       rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+                       rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \
                                || die "failed to remove extra compat libraries"
                ;;
                xcrypt_nocompat-*)
@@ -181,7 +181,7 @@ multilib_src_install() {
 
                                                if [[ -n ${static_libs[*]} ]]; 
then
                                                        dodir 
"/usr/$(get_xclibdir)"
-                                                       mv "${static_libs[@]}" 
"${D}/usr/$(get_xclibdir)" \
+                                                       mv "${static_libs[@]}" 
"${ED}/usr/$(get_xclibdir)" \
                                                                || die "Moving 
static libs failed"
                                                fi
                                        fi