commit: 1879cb6bf7e627f3667ab3b7d564cc11c5380e10 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Sep 28 19:14:04 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 28 19:14:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1879cb6b
dev-libs/apr: add libcrypt subslot dependency to force rebuilds Needed to ensure our pkgconfig files we install aren't stale. Closes: https://bugs.gentoo.org/815265 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/apr/{apr-1.6.3-r5.ebuild => apr-1.6.3-r6.ebuild} | 4 +++- dev-libs/apr/{apr-1.6.5-r2.ebuild => apr-1.6.5-r3.ebuild} | 4 +++- dev-libs/apr/{apr-1.7.0-r2.ebuild => apr-1.7.0-r3.ebuild} | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dev-libs/apr/apr-1.6.3-r5.ebuild b/dev-libs/apr/apr-1.6.3-r6.ebuild similarity index 97% rename from dev-libs/apr/apr-1.6.3-r5.ebuild rename to dev-libs/apr/apr-1.6.3-r6.ebuild index 977176aee5c..828c9a2b2e7 100644 --- a/dev-libs/apr/apr-1.6.3-r5.ebuild +++ b/dev-libs/apr/apr-1.6.3-r6.ebuild @@ -14,7 +14,9 @@ SLOT="1/${PV%.*}" 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" IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) +# See bug #815265 for libcrypt dependency +CDEPEND="virtual/libcrypt:= + elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-base-policy )" diff --git a/dev-libs/apr/apr-1.6.5-r2.ebuild b/dev-libs/apr/apr-1.6.5-r3.ebuild similarity index 97% rename from dev-libs/apr/apr-1.6.5-r2.ebuild rename to dev-libs/apr/apr-1.6.5-r3.ebuild index c7f60001d87..725836e7349 100644 --- a/dev-libs/apr/apr-1.6.5-r2.ebuild +++ b/dev-libs/apr/apr-1.6.5-r3.ebuild @@ -14,7 +14,9 @@ SLOT="1/${PV%.*}" 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" IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) +# See bug #815265 for libcrypt dependency +CDEPEND="virtual/libcrypt:= + elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-base-policy )" diff --git a/dev-libs/apr/apr-1.7.0-r2.ebuild b/dev-libs/apr/apr-1.7.0-r3.ebuild similarity index 97% rename from dev-libs/apr/apr-1.7.0-r2.ebuild rename to dev-libs/apr/apr-1.7.0-r3.ebuild index 36cf0552875..70e3bd4db4b 100644 --- a/dev-libs/apr/apr-1.7.0-r2.ebuild +++ b/dev-libs/apr/apr-1.7.0-r3.ebuild @@ -14,7 +14,9 @@ SLOT="1/${PV%.*}" 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" IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) +# See bug #815265 for libcrypt dependency +CDEPEND="virtual/libcrypt:= + elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-base-policy )"