1 |
commit: 00b505ef3ec34426f2feb425967ad685471efd6b |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 8 01:15:43 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 8 01:16:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b505ef |
7 |
|
8 |
sys-libs/musl: RDEPEND -> PDEPEND for libxcrypt |
9 |
|
10 |
Anything actually linking against libcrypt should depend |
11 |
on the virtual anyway, and this means we can have |
12 |
libxcrypt properly depend on virtual/libc (which is needed |
13 |
to ensure it can be installed first). |
14 |
|
15 |
Bug: https://bugs.gentoo.org/877567 |
16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
17 |
|
18 |
sys-libs/musl/{musl-1.2.3-r4.ebuild => musl-1.2.3-r5.ebuild} | 6 ++---- |
19 |
sys-libs/musl/musl-9999.ebuild | 6 ++---- |
20 |
2 files changed, 4 insertions(+), 8 deletions(-) |
21 |
|
22 |
diff --git a/sys-libs/musl/musl-1.2.3-r4.ebuild b/sys-libs/musl/musl-1.2.3-r5.ebuild |
23 |
similarity index 98% |
24 |
rename from sys-libs/musl/musl-1.2.3-r4.ebuild |
25 |
rename to sys-libs/musl/musl-1.2.3-r5.ebuild |
26 |
index 6f2527e85a39..76f802c610d8 100644 |
27 |
--- a/sys-libs/musl/musl-1.2.3-r4.ebuild |
28 |
+++ b/sys-libs/musl/musl-1.2.3-r5.ebuild |
29 |
@@ -52,10 +52,8 @@ QA_PRESTRIPPED="usr/lib/crtn.o" |
30 |
if [[ ${CATEGORY} == cross-* ]] ; then |
31 |
IUSE="${IUSE/crypt/+crypt}" |
32 |
else |
33 |
- RDEPEND=" |
34 |
- crypt? ( !sys-libs/libxcrypt[system] ) |
35 |
- !crypt? ( sys-libs/libxcrypt[system] ) |
36 |
- " |
37 |
+ RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" |
38 |
+ PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" |
39 |
fi |
40 |
|
41 |
is_crosscompile() { |
42 |
|
43 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
44 |
index 6f2527e85a39..76f802c610d8 100644 |
45 |
--- a/sys-libs/musl/musl-9999.ebuild |
46 |
+++ b/sys-libs/musl/musl-9999.ebuild |
47 |
@@ -52,10 +52,8 @@ QA_PRESTRIPPED="usr/lib/crtn.o" |
48 |
if [[ ${CATEGORY} == cross-* ]] ; then |
49 |
IUSE="${IUSE/crypt/+crypt}" |
50 |
else |
51 |
- RDEPEND=" |
52 |
- crypt? ( !sys-libs/libxcrypt[system] ) |
53 |
- !crypt? ( sys-libs/libxcrypt[system] ) |
54 |
- " |
55 |
+ RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" |
56 |
+ PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" |
57 |
fi |
58 |
|
59 |
is_crosscompile() { |