gentoo resync : 01.10.2021

4 files changed, 12 insertions, 6 deletions

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index e987f5edb812..236c5868e4ee 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -9,7 +9,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r5.ebuild 4632 BLAKE2B 2fe447be53ffd513c3da12b2408db0ee4c2fbe1075b7d46fccf4eb82bcacdfd94df32ab0f721840cba3a9da6b8349e90c883f06a902532bbeb732268fcd48ac7 SHA512 e248703e1ff52e08288f0f3f04208e99d5b7e4a2cd586a55de18816a39054ad0a9614dd902221ea917f4109bd85bd563f7c3ad1d60ee4ab0502e5c6e88eff718
-EBUILD apr-1.6.5-r2.ebuild 4578 BLAKE2B 9b9a472c369276aabe416d3a36d92b7e1d2e890bbfe70afd1d010f49fa91668ea90ad319ecfcd210927bbe53218f57064ea259bb5c13531f14b1a3e45ba0ff9c SHA512 2a0a1867d03f658c7a1c39c93c26f4cf05b488e14d8c1e9c7ddd981a3493a68311dc69db04fe0ca3194bf1d3a98f990df67e1b1b4fd3c6be0b71965737e3fb56
-EBUILD apr-1.7.0-r2.ebuild 4548 BLAKE2B dd203af3034da46c37ee1b8aca7d708d4e9642d04a3a40a5e52bb94d05f18049d1d2ef5dde3b55030044e4f83ba3e77dc5e75a0d8dfbdfe005356e661c77529a SHA512 60b6c77af2879ff2b9492a8df98b5215399e8da13d9866c621db6075175aa5f2eeda6935d34a8614feb494782d2a2a98f5db47f62ff7534c43a9ebb431b7aaa8
+EBUILD apr-1.6.3-r6.ebuild 4694 BLAKE2B 5d610abd43fd9abc57921c740bf2612f42d735028e4e6d0ce0ef8f1ef38ab63f9ac0315729d8bb647c803c5e24b385173337e10bdef8b3a5ad7985c5d310f097 SHA512 f0d3c7daa05315e19928379236197d57d9b5822227978cd71fa7463801b12c6a7909ca98f65fdfb8daa798651da90fc36f357f0b430f414b78d4230573b6fd07
+EBUILD apr-1.6.5-r3.ebuild 4640 BLAKE2B 72a747721652745cabeb33f66bc83b5af841587a4856e23ea616fa1a281400edb07319b6025756230e32801bd889d3857085abcff7c1451d5526dc0f38030016 SHA512 915917d0010e6c98786c919b82c5332e9553de92ad61f35a1e2638da042021826fdcddbd03c7eee098cd369f8d107ca65704975638acd6d2ef21f9437341f1cc
+EBUILD apr-1.7.0-r3.ebuild 4610 BLAKE2B abb9ba6f854f8603e943e34a562cd608e681195188b51ae0ca5a6d114982cd20be6bf6ac0ba7aedc6b2bd45613cb24cbff26bd3c82e0651e834c026dabcde52a SHA512 f32fb0bc97bd46e5f2bca7e28587e1cc529761e86744629ffdfee8e29a198bcec3c95dfd38cae0745979a346cbf34c05de8e592db99c2033d9f71c8042367a2c
 MISC metadata.xml 434 BLAKE2B b757acb73195bacb3e89e6fefcadd77beb184ecaf6f15471842c5715a2ec15e10157e8916a25580884a570a274047b3e9868ba65393cebbf47c397e6d6474b4a SHA512 d27ba45c40ced6bf6a60bcb74a8ad474ff9048430d9cb8d08573c0f2e1958eda333edfdbf90ecf00f4c33b50502872645457fd11d8f1cb1c5f90f745e08341ca
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 )"