From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 869DA158086 for ; Thu, 21 Oct 2021 06:44:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2935E087F; Thu, 21 Oct 2021 06:44:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9981E087F for ; Thu, 21 Oct 2021 06:44:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B4AA343771 for ; Thu, 21 Oct 2021 06:44:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E731101 for ; Thu, 21 Oct 2021 06:44:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1634798660.09e05d8e76dac3c6b911a06862783d10080c9095.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild X-VCS-Directories: sys-libs/libxcrypt/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 09e05d8e76dac3c6b911a06862783d10080c9095 X-VCS-Branch: master Date: Thu, 21 Oct 2021 06:44:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f54c63b4-328f-4721-bca0-2e8d637725f6 X-Archives-Hash: 39fb5ee1693dcfd624e803855f2bab2e commit: 09e05d8e76dac3c6b911a06862783d10080c9095 Author: Sam James gentoo org> AuthorDate: Thu Oct 21 06:42:31 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 21 06:44:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e05d8e sys-libs/libxcrypt: backport prefix fixes to 4.4.20 Needed for the relatively-new stable Prefix. Signed-off-by: Sam James gentoo.org> sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild index f31e856bc88..6b7c1ae7612 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.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