1 |
commit: 1879cb6bf7e627f3667ab3b7d564cc11c5380e10 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 28 19:14:04 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 28 19:14:33 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1879cb6b |
7 |
|
8 |
dev-libs/apr: add libcrypt subslot dependency to force rebuilds |
9 |
|
10 |
Needed to ensure our pkgconfig files we install aren't stale. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/815265 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-libs/apr/{apr-1.6.3-r5.ebuild => apr-1.6.3-r6.ebuild} | 4 +++- |
16 |
dev-libs/apr/{apr-1.6.5-r2.ebuild => apr-1.6.5-r3.ebuild} | 4 +++- |
17 |
dev-libs/apr/{apr-1.7.0-r2.ebuild => apr-1.7.0-r3.ebuild} | 4 +++- |
18 |
3 files changed, 9 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/apr/apr-1.6.3-r5.ebuild b/dev-libs/apr/apr-1.6.3-r6.ebuild |
21 |
similarity index 97% |
22 |
rename from dev-libs/apr/apr-1.6.3-r5.ebuild |
23 |
rename to dev-libs/apr/apr-1.6.3-r6.ebuild |
24 |
index 977176aee5c..828c9a2b2e7 100644 |
25 |
--- a/dev-libs/apr/apr-1.6.3-r5.ebuild |
26 |
+++ b/dev-libs/apr/apr-1.6.3-r6.ebuild |
27 |
@@ -14,7 +14,9 @@ SLOT="1/${PV%.*}" |
28 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
29 |
IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" |
30 |
|
31 |
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
32 |
+# See bug #815265 for libcrypt dependency |
33 |
+CDEPEND="virtual/libcrypt:= |
34 |
+ elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
35 |
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" |
36 |
RDEPEND="${CDEPEND} |
37 |
selinux? ( sec-policy/selinux-base-policy )" |
38 |
|
39 |
diff --git a/dev-libs/apr/apr-1.6.5-r2.ebuild b/dev-libs/apr/apr-1.6.5-r3.ebuild |
40 |
similarity index 97% |
41 |
rename from dev-libs/apr/apr-1.6.5-r2.ebuild |
42 |
rename to dev-libs/apr/apr-1.6.5-r3.ebuild |
43 |
index c7f60001d87..725836e7349 100644 |
44 |
--- a/dev-libs/apr/apr-1.6.5-r2.ebuild |
45 |
+++ b/dev-libs/apr/apr-1.6.5-r3.ebuild |
46 |
@@ -14,7 +14,9 @@ SLOT="1/${PV%.*}" |
47 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
48 |
IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" |
49 |
|
50 |
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
51 |
+# See bug #815265 for libcrypt dependency |
52 |
+CDEPEND="virtual/libcrypt:= |
53 |
+ elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
54 |
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" |
55 |
RDEPEND="${CDEPEND} |
56 |
selinux? ( sec-policy/selinux-base-policy )" |
57 |
|
58 |
diff --git a/dev-libs/apr/apr-1.7.0-r2.ebuild b/dev-libs/apr/apr-1.7.0-r3.ebuild |
59 |
similarity index 97% |
60 |
rename from dev-libs/apr/apr-1.7.0-r2.ebuild |
61 |
rename to dev-libs/apr/apr-1.7.0-r3.ebuild |
62 |
index 36cf0552875..70e3bd4db4b 100644 |
63 |
--- a/dev-libs/apr/apr-1.7.0-r2.ebuild |
64 |
+++ b/dev-libs/apr/apr-1.7.0-r3.ebuild |
65 |
@@ -14,7 +14,9 @@ SLOT="1/${PV%.*}" |
66 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
67 |
IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" |
68 |
|
69 |
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
70 |
+# See bug #815265 for libcrypt dependency |
71 |
+CDEPEND="virtual/libcrypt:= |
72 |
+ elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
73 |
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" |
74 |
RDEPEND="${CDEPEND} |
75 |
selinux? ( sec-policy/selinux-base-policy )" |