gentoo resync : 15.06.2021

5 files changed, 5 insertions, 14 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 1e86ee878ab4..73d7af5da216 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -48,8 +48,8 @@ DIST ceph-14.2.21.tar.gz 129272778 BLAKE2B f82f452e0f0c40a95ea1bdb3654c2d322caa3
 DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 4962e7d574b38592a874a1b3fa8610bb2d0afc8713d995d67a790c025bb086cb619cbbaec76482ec096b4c55b9f1df383f5bd4806a231bc88e70ac3efbac24b5 SHA512 08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f
 DIST ceph-15.2.13.tar.gz 148542333 BLAKE2B 2e9668bcb0fd283ec4ab51b0c6142fc9a3b6310eb5d34e07da5e6b73b55dd7976db5ab9c78a93684ddc2f51873b1a17c4d31c5f5647b2d43a2826ee5362f7e5d SHA512 bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da
 DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae SHA512 8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6
-EBUILD ceph-14.2.21.ebuild 10514 BLAKE2B d4f43c7ccba4ea386f6ca7f68b143ec55115c1c21a6cc170b8925de8a314d4a5529581727b873ca5507e037033688d6d25506f9ebae9700dff710160ee82fca6 SHA512 d15fcdecd4e79c990edb1a04df8330282b3b861fe525f8620e7a48fdaeb411649deabfaab4d8c4fa874a2614aa24b10b98251b14071462baf1e502ccb3d58331
-EBUILD ceph-15.2.12.ebuild 10863 BLAKE2B 5c0396ea965b1b642989d6c1d311ac87ebdb66a75f17d1c462ebd8df41b2d135009cbd25a7a95dba248811fd1bb04f80feca25aa719ffc05498aac7395c39c54 SHA512 63b2d038a3d274a7c2aeec8322898f2aeacd76a95ef2d848aec84161ba2e1ab5dbe23ee9a6677eba41065f210333100d1aed437ceef6fad6af4e32e5d84895d6
-EBUILD ceph-15.2.13.ebuild 10759 BLAKE2B 38a9753f4d0e7afa73f5f0833fbb0773c5c99d9109e1ace88dad7db84b25a44b7155019713bb46ed136fa85da204b6aeabdb6f539bcb8681ca896529d518190f SHA512 cd34e35f43eefb64c41bba52dffd94f0b172a3d13aab55173187e671a5c77f0e2476de75472fe29dfb7b7380f197332bc2d245e4e23f842710e0bba4efe3976b
-EBUILD ceph-16.2.4.ebuild 11959 BLAKE2B ae99609c4f5f303c42f23b8941a4acea81696ca47a00bb0f0cf1e39edab32b3ac2b1dd20e0493deccee71bde402bacce390656af5ad536b736d95cd6a1abcbf2 SHA512 0cca6494dd99fa508ea61b3f08aee6bb0d205860aa8b410ee773f9855edbc823655c58a2ac51edeb2c1199c1158adf526ddd11237d8cda29d3ac4568e99476dc
+EBUILD ceph-14.2.21.ebuild 10406 BLAKE2B 3ea1503e4422a185a0fe7bcfd09a377a7443e13d573353a058b3695b6f19792b076f264dd7af5b09fa6c9423f267995838bf39553b41de1f31a6f6863547c896 SHA512 18f4fb7bce7380d2d85538a6c1f2665a16819024b99adc523b72992d9b06739e6b66211b9a15968a4840c2766e0a5bcef90aef559c562f2f2338a81562d8756d
+EBUILD ceph-15.2.12.ebuild 10755 BLAKE2B 54de38a70b8b89ad49a64da1806da59f76c5846a9f58453e4b2a598ae4a0317ade733b5105cac17e37334cf4271c7afeaec2810cbc48e349ad98e97dd82ffedf SHA512 6507708f5faa8cd04ca4d1b86350eeebb15a46bccdca24957cde01c20938cbf3462c9ff11252fda2b0a96285b3a26ab0347d39dc4e77e040aab0426e077c3982
+EBUILD ceph-15.2.13.ebuild 10651 BLAKE2B 2817fc528d3444b8ac0458dc609232241e2801700ac08f3c62d68ccc7fbce8b28c93340c7063a7ae216b120d5c9e155ac3fbb8069f053ac7273648f18c7b7296 SHA512 00cf781d8c1b246d03719131d6716e6ffde1d8d622d79a0766e05e87cf78380a121d1f2a152b9c6c4a8130fa6a70c396beff66ef2fe9bd2730e376385562a4bf
+EBUILD ceph-16.2.4-r1.ebuild 11966 BLAKE2B 9fe89eeb9341f1a12885296c25576a365461f30eca5d41b96dc46ca72ef2c12e7ef0040f5389322f61c4ce54ad2a65bdac8147b702db0735a45fe987cd12535b SHA512 86df6d02b9d60e4c44e13f8997e28ad51ee50bc16c48257bdae02546bd65f89db7ab9f9ef296d7a398ac640cb94c95184df97e45c7f4469049615d67227ee609
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-14.2.21.ebuild b/sys-cluster/ceph/ceph-14.2.21.ebuild
index dd17dadcdbb7..39e5b14a1c87 100644
--- a/sys-cluster/ceph/ceph-14.2.21.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.21.ebuild
@@ -140,9 +140,6 @@ RDEPEND="${DEPEND}
 		<dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
-		)
 		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
diff --git a/sys-cluster/ceph/ceph-15.2.12.ebuild b/sys-cluster/ceph/ceph-15.2.12.ebuild
index d90c82927bc0..c342da2cf406 100644
--- a/sys-cluster/ceph/ceph-15.2.12.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.12.ebuild
@@ -148,9 +148,6 @@ RDEPEND="${DEPEND}
 		dev-python/pyjwt[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
-		)
 		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
diff --git a/sys-cluster/ceph/ceph-15.2.13.ebuild b/sys-cluster/ceph/ceph-15.2.13.ebuild
index 6eee7a8e23ee..be518dbedbaa 100644
--- a/sys-cluster/ceph/ceph-15.2.13.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.13.ebuild
@@ -148,9 +148,6 @@ RDEPEND="${DEPEND}
 		dev-python/pyjwt[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
-		)
 		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
diff --git a/sys-cluster/ceph/ceph-16.2.4.ebuild b/sys-cluster/ceph/ceph-16.2.4-r1.ebuild
index 8775e532d158..99d57305e48a 100644
--- a/sys-cluster/ceph/ceph-16.2.4.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.4-r1.ebuild
@@ -44,7 +44,7 @@ DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=
 	app-arch/lz4:=
-	app-arch/snappy:=
+	<app-arch/snappy-1.1.9:=
 	app-arch/zstd:=
 	app-shells/bash:0
 	app-misc/jq:=