summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-09-28 20:14:04 +0100
committerSam James <sam@gentoo.org>2021-09-28 20:14:33 +0100
commit1879cb6bf7e627f3667ab3b7d564cc11c5380e10 (patch)
tree4106751ca0149c0f63c78b7661d15a50c36f7173
parentgames-rpg/sumwars: drop 0.5.8-r100 (diff)
downloadgentoo-1879cb6bf7e627f3667ab3b7d564cc11c5380e10.tar.gz
gentoo-1879cb6bf7e627f3667ab3b7d564cc11c5380e10.tar.bz2
gentoo-1879cb6bf7e627f3667ab3b7d564cc11c5380e10.zip
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@gentoo.org>
-rw-r--r--dev-libs/apr/apr-1.6.3-r6.ebuild (renamed from dev-libs/apr/apr-1.6.3-r5.ebuild)4
-rw-r--r--dev-libs/apr/apr-1.6.5-r3.ebuild (renamed from dev-libs/apr/apr-1.6.5-r2.ebuild)4
-rw-r--r--dev-libs/apr/apr-1.7.0-r3.ebuild (renamed from dev-libs/apr/apr-1.7.0-r2.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
index 977176aee5c6..828c9a2b2e72 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
index c7f60001d874..725836e73499 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
index 36cf05528757..70e3bd4db4b1 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 )"