commit: 00b505ef3ec34426f2feb425967ad685471efd6b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 8 01:15:43 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 8 01:16:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b505ef
sys-libs/musl: RDEPEND -> PDEPEND for libxcrypt Anything actually linking against libcrypt should depend on the virtual anyway, and this means we can have libxcrypt properly depend on virtual/libc (which is needed to ensure it can be installed first). Bug: https://bugs.gentoo.org/877567 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/musl/{musl-1.2.3-r4.ebuild => musl-1.2.3-r5.ebuild} | 6 ++---- sys-libs/musl/musl-9999.ebuild | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sys-libs/musl/musl-1.2.3-r4.ebuild b/sys-libs/musl/musl-1.2.3-r5.ebuild similarity index 98% rename from sys-libs/musl/musl-1.2.3-r4.ebuild rename to sys-libs/musl/musl-1.2.3-r5.ebuild index 6f2527e85a39..76f802c610d8 100644 --- a/sys-libs/musl/musl-1.2.3-r4.ebuild +++ b/sys-libs/musl/musl-1.2.3-r5.ebuild @@ -52,10 +52,8 @@ QA_PRESTRIPPED="usr/lib/crtn.o" if [[ ${CATEGORY} == cross-* ]] ; then IUSE="${IUSE/crypt/+crypt}" else - RDEPEND=" - crypt? ( !sys-libs/libxcrypt[system] ) - !crypt? ( sys-libs/libxcrypt[system] ) - " + RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" + PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" fi is_crosscompile() { diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 6f2527e85a39..76f802c610d8 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -52,10 +52,8 @@ QA_PRESTRIPPED="usr/lib/crtn.o" if [[ ${CATEGORY} == cross-* ]] ; then IUSE="${IUSE/crypt/+crypt}" else - RDEPEND=" - crypt? ( !sys-libs/libxcrypt[system] ) - !crypt? ( sys-libs/libxcrypt[system] ) - " + RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" + PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" fi is_crosscompile() {
