gentoo auto-resync : 13:08:2022 - 02:23:08

5 files changed, 20 insertions, 6 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 5de4d8a5865c..fcf0f7725afb 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -29,9 +29,10 @@ AUX ceph-17.2.0-fuse3.patch 301 BLAKE2B 54dd764be7e7d428c6db38d2c8b9d168598c3d41
 AUX ceph-17.2.0-install-dbstore.patch 493 BLAKE2B e54ffbda69e86ba0b869f02b16055c89d93f58d680bc931c73aeccfb7efbc890b25f7d4f081f033531d4356faf55628e21ba81aeeb4acd907e437553d15ea10f SHA512 c13e73d0471a47bbcbc3c1b5ccdbf00eb72efa31530cafc54d15d8d1aa2da32465bf3a4c9a27568a3fcbfa1117e920c6b687cabf714fa9eedfd2a50a4d417613
 AUX ceph-17.2.0-osd_class_dir.patch 486 BLAKE2B 7d9e144ab40e5e2f73a1412a65b27ffda74bf742d8499845a8dd43d42b18294ca5da9feca6f7345be950cf98b9e30f654a7ed40e9b7159a0aa5fe4462d6b0197 SHA512 02b7b685655f7d7b11744fabea2cb342bf6564a7fe068b783769276b9604c1320b83daad7078190fd293b9dadf06e6f657db35125e28dfa9619aac2179150bd7
 AUX ceph-17.2.0-pybind-boost-1.74.patch 845 BLAKE2B b862b1abf61c0f5cc17964c86073a083b217f01ca5ae725bfe07ba13702e2d835bf8ccc4b5fae4b3138230b36722f4de0c8176811d6eefc1523e1fcb4848b744 SHA512 525b5df44f0de71ab0b2024c8bc0ccf98740a0befac4b032ae9a0fb6e2a05926d7171ae4b0af4ba32e71c9e04fe90aa192a2e3ae433242a62fa4e4efdc855321
-AUX ceph-17.2.0-system-opentelemetry.patch 705 BLAKE2B 0036ad8e7d2d8a707db5ea137cb47e9cb18d8e4d8923d3c8dc1306adca24fb30c029e03d76a281219ce34928b5ed6448aba4a98b2286a942eda2cf86fb0e5365 SHA512 d845ae2b9d31604d622dfb2993186ca1b3e37d3a5e88df8b4747c45b0f1913f4e092a5b0a2405ab228a57e6717bdf51c5458c66eab601eabdece4524085840e3
+AUX ceph-17.2.0-system-opentelemetry.patch 699 BLAKE2B 3a8d9f2173227ac457a9d79e2a58f162ddfdcbdabfe76c9d9dd7eec4d89c28158b4e8e566abf8870fe31d8743549bd26144b329347be7ccdf63dbdd774ad862a SHA512 27463ebcafcc3967853328be349f8da6a726e82a9a11c7922d82c26ab8a12954bebbeb5c050b3fe291d5083babe13575f24b3a5346275579e47997d72c52afc5
 AUX ceph-17.2.1-no-virtualenvs.patch 2780 BLAKE2B c1a752893800344a89321c76763268453de3fb275a7e952bdd81c6356d3e5aec48fb8623025c5d4fb7b0281b7d31272c145ef7d921c42c41d858f46105301eec SHA512 53bb81846633e6ff480d46c777b46bf6af2dd07817c84413c772836d7815e5a38c7b61c903af32434896041617175afaaeea6f5618ef5fbec0ad9afd7d7aa8f6
 AUX ceph-17.2.1-python310.patch 1230 BLAKE2B c4a0b66aad00ac1ada6abe3c135c503f97dfbb203633ee0f753d0370bcb8f048c42ff91ccaf6bcde41fb3db6ff0346ff8e99735426c0a65c2dc6effee4019f4d SHA512 f49427d3420574043e18cad517a6f81ee38a48b827195f564fd728fd2f2b32dbf17f9e21842b01bbf3ab40875c70b0db316a478b8cc48dd92c839d2ce5e7fd63
+AUX ceph-17.2.3-gcc12.patch 253 BLAKE2B 5a90ead3610d5dd21e4f453e6a9249428dcfbe916a5e1500b42cc2d591a949e46757141ddc145bf24ed42188d52025523f020e32ad076bb9e90735db8f5728c7 SHA512 86b6cde69e8dc3c77b151c7b370bd322ccd0fdaf00689fbfb56830c6ebb51e3884e4b840edabeb1630a3288f92fe5eff5bc75dea81750a0be2b185d6005e06bc
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -49,8 +50,8 @@ DIST ceph-16.2.10.tar.gz 157176743 BLAKE2B 065b6f1941f87fde150ab22ba45aa9f58069a
 DIST ceph-16.2.9.tar.gz 157168096 BLAKE2B 0a667a9699925cfc920ca0cc535e5331cbcd95997fb0b9816a4d84c8add454b6b17813018bc1d1de07c802167ef50aa528704b10b01f42759189392ccdb5088f SHA512 bf369038ad6383f88abbed267f0239e9d8a1d33b46b34ed260aeeb1fda1b374cb6e658238e1ace013fbbb68e73b8cd2922b7def318d7a110e5f4560eeae8fca3
 DIST ceph-17.2.3.tar.gz 168821857 BLAKE2B 21ec5ac33591ae8b22eae3d88680ae87340e639cc21cb9c79bc4fb2f7b6cc7e93aa6b5af0242a6c094a4af9808a2b6f86b6bd7e3c8f247a513c91defa6d4e4a9 SHA512 fd6e057ba8440f69423e870dddb2705d68015089ff8d97356bdc359c2ab41e19351fb1c914330de6ba05180f48e328e3ea4c877e9dd80be049e2ec5895068595
 DIST ceph-xsimd-17.2.3.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-15.2.17.ebuild 10919 BLAKE2B 693955b7dbcad95d54420e11c0ccd666a0ed85c6bdebf127bf58ca2c7618bd53fac9f9171fe33fd1e2e4b8aaf487e39761dceedd10e6af4e2616fc3d1284c6a6 SHA512 6f234d91f6672e8af1b8a7c133d8be70602f9dd3cce78954b4436e0d9d0908c44782d5e3817f474530ec2249901d2720956180a6d4c3573e3a8262090ee6686e
+EBUILD ceph-15.2.17.ebuild 10899 BLAKE2B 8e226936efc3f65e3903c629ccff9637ee37c94f365d6c636540f22bf68e8450ac254cb1c01e7876342f58b6407e5187956276507119ce6e76f0e2fc12859def SHA512 c63bf1fe0b3162d004ccf82c016089088622ede34609da3707cc9bf0f3f4f507ace5d5c1ac0ceb0c3872706e1c02b9b84b04d65faf661518e26acb25a4b60ebe
 EBUILD ceph-16.2.10.ebuild 12604 BLAKE2B b20b12cbf32cd6051db33cecaee51a8a38913abbc959b689b460bab87e1286ca20e17f405a714c5904ac1cdc08bf4b4c1f23e7ac8c50ebb083b3071cd151dfe8 SHA512 be1054b759be99ff02608f3e5022340d53c5ffeec0a04df6dc7b13262b6be0e65bbc5d3ebf3aa5f10cfbbfbeee975e1f8194eafd496cec5fdc59ca44c5b26390
 EBUILD ceph-16.2.9-r1.ebuild 12603 BLAKE2B bed9f1ffc126209a8ffdb7186eeabfed222e19c6db4ffc2189e4c65338accfb3c86d3134b0adc9350ef186ee0897092b5ffffa4140b785f6dee6de17ab07a91e SHA512 b5efc7e701b0784c4f4299ffabc01ff7a3ddc73ca16f36d1fd16e7e2562d78f89e11b960f9eacec697d9e788841d73e73d17554a7a916ab09cbe1a7cfc20557f
-EBUILD ceph-17.2.3.ebuild 12449 BLAKE2B 73eac41797937b4a255ea299a17b5adcc6d1afdcdfa9a283ad9cc7bf87b65fe503f4dd17595774979d0ff1652bb739493fbc6ebdad8caa07714e4f6665f53632 SHA512 792d0c808cff8b4c1b329a190a44a830b48504387772df0c994380304d1d39fafe479d5181a5168972672ce930725f48b52a5f51803a0b6b495d5b7800184d2f
+EBUILD ceph-17.2.3.ebuild 12488 BLAKE2B 74153d4f86b7b48d97405d07cf0e3d5d7df11b17055fd1129ed1ab1bffbfd12f37f690f5e22bf12afffb22c6679288d81c8f16c53b31ad8ccd864cd6f855e3b2 SHA512 bfef9248d9df9531fbd1e3b96efbc5ec62415dde64d761c7686b28df4d6006de9a85e7d6438a05cc5928fbfe92a93842387d712f018b29221eda8ddf48c12451
 MISC metadata.xml 2453 BLAKE2B 988cbe4fa5176fde46a503932a58555554e577a311180df706021ea67a8c861b82fbc476cc757c090ea4e753b519212a2cca8c0605921c4e121b770fd1cc61ea SHA512 14c25df4749cd86f82782f8e7cda587a0310e4cf28b6d4f8ac1fa4abee532d6d553f35fcfb8ab0393ce876d36a8fe2851408ad5eaaf5cf28834f03cf744ac6c1
diff --git a/sys-cluster/ceph/ceph-15.2.17.ebuild b/sys-cluster/ceph/ceph-15.2.17.ebuild
index d3e65042d29a..ff3607dba293 100644
--- a/sys-cluster/ceph/ceph-15.2.17.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.17.ebuild
@@ -328,7 +328,7 @@ src_compile() {
 
 	# we have to do this here to prevent from building everything multiple times
 	python_copy_sources
-	python_foreach_impl python_compile
+	distutils-r1_src_compile
 }
 
 src_test() {
@@ -346,7 +346,7 @@ python_install() {
 
 src_install() {
 	cmake_src_install
-	python_foreach_impl python_install
+	distutils-r1_src_install
 
 	find "${ED}" -name '*.la' -type f -delete || die
 
diff --git a/sys-cluster/ceph/ceph-17.2.3.ebuild b/sys-cluster/ceph/ceph-17.2.3.ebuild
index 8a67048c3455..49a8857b5c24 100644
--- a/sys-cluster/ceph/ceph-17.2.3.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.3.ebuild
@@ -216,6 +216,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
 	"${FILESDIR}/ceph-17.2.0-osd_class_dir.patch"
 	"${FILESDIR}/ceph-17.2.1-python310.patch"
+	"${FILESDIR}/ceph-17.2.3-gcc12.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch b/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
index 6e0788a093e5..1b4e614bb517 100644
--- a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
+++ b/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
@@ -9,7 +9,7 @@ index 30cf3605468..902e2123d04 100644
 -  include(BuildOpentelemetry)
 -  build_opentelemetry()
 -  set(jaeger_base opentelemetry::libopentelemetry thrift::libthrift)
-+  find_package(opentelemetry-cpp 1.3.0 REQUIRED)
++  find_package(opentelemetry-cpp REQUIRED)
 +  set(jaeger_base
 +	  opentelemetry-cpp::common
 +	  opentelemetry-cpp::trace
diff --git a/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch b/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch
new file mode 100644
index 000000000000..e5e77b4116f6
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch
@@ -0,0 +1,12 @@
+diff --git a/src/include/buffer.h b/src/include/buffer.h
+index 0c89367dd3b..98fcd7c3e08 100644
+--- a/src/include/buffer.h
++++ b/src/include/buffer.h
+@@ -62,6 +62,7 @@
+ #endif
+ 
+ #include "inline_memory.h"
++#include <memory>
+ 
+ #define CEPH_BUFFER_API
+