gentoo auto-resync : 18:03:2023 - 00:29:05

3 files changed, 16 insertions, 2 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 87e0c136e604..709d495ef235 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -37,6 +37,7 @@ AUX ceph-17.2.3-flags.patch 782 BLAKE2B 08cd4fefdce90bc42b9c4e3caff805b1d8c9d011
 AUX ceph-17.2.4-cyclic-deps.patch 562 BLAKE2B 4562e7b6afdb23e2d0c65c5db61aef6ce7d313716ef1e40c5b12a6afcb91ae8a38ead8432fe6ee93eeee12444c5b971d9c2ccb866c20806b8f3a57c9d8668b3c SHA512 5028bda954938a8718be6bc4729e816a178a2f47c3a2eeffdcb6b357d054fe236eba54fb0067dfbf6f6a78b5f6d805fe427f0d2e5b0349a08b2404604083132c
 AUX ceph-17.2.5-boost-1.81.patch 1456 BLAKE2B 0dbff43d17f099242e1bf0d44f6c46c6175a4c9221fdd904a152cab8a1105cb94960b7519471d86a359c35a356a7c793de2a2ac7d3cb7880dcb044ad93ac44e4 SHA512 2dcb4d7e42ab71c97c601a7171075077966c6d3bfea1a0cc7676bcc03bb3bf5a4fca774bca571c908a6450098b48951ac5fc12f6121e015b6ac56deb5d514048
 AUX ceph-17.2.5-gcc13.patch 2917 BLAKE2B 9c41c0490932fc1f28bb647f7911189cf440517673c98b09c50a86467cd4478d11067a14ea57b10113e67e7772525cbee525e2855261322ff9e8cbd47a3268c5 SHA512 a0c720e624cef883c0360d043a4c3d49a4dfca2f0e4b3f73da9318615a3a5ff506baa133a140403b9a90fc87bddb6fbe58691f629f1cb689a21b732855343b44
+AUX ceph-17.2.5-link-boost-context.patch 492 BLAKE2B 828665f353890d92b586928421d6eee837a095c371e458d166cf6c6e9663b5ca9f71f74961c3db8731e042c31153f766457813fbcc50114631bb569a15f683f8 SHA512 b794685a7b6fc36267ea668232e12cd480b307f207dbbeafdbc874147925c24bc5497b7056106f2c1feea197835856aaaaeec399fe53f76fc274dc03c9d69a5d
 AUX ceph-17.2.5-suppress-cmake-warning.patch 370 BLAKE2B 225ee73ddc24e3b398243603292949da09417c4c928daf0328729d8a69a475e6e5cdd2c9911c4c2ff6f3a6fea8b785a210e4beab5dc7bd910e390e84aa8e4b61 SHA512 e71ead89e494ac5639c08764b4d7bc3a96f87bac4ea8f9adb3e29c568f5d970551bc568c55adfd1b21be575db39a6f494de3e9d091d4ae8c04d2d5421be24f4f
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
@@ -60,5 +61,5 @@ EBUILD ceph-15.2.17-r3.ebuild 10745 BLAKE2B 73584d18033bc065702000560ffece68a462
 EBUILD ceph-16.2.10-r5.ebuild 12604 BLAKE2B d957a915facfb2ba4b3cbbdd6d5d73e89c670d4cdc1e103d253d76e7b65295915c7964e9587d1d1da1a9341f19309bb0bf0017f6e4ef554ab7b728ee3dd7cd75 SHA512 0e1d45f51ab863482cb5c91e78abd554fe9a4c5b676c15157fd1e6059ec7fdde23027b77e0e3c403766b895c804b2757fc11a525de7a8e123b6fe52787560190
 EBUILD ceph-16.2.11.ebuild 12513 BLAKE2B 2b4befa85baceca8add05ca29702642f11ed06176b762136f853ccbe5b33f660328768008c9070b1012fa3db3b8902b3b42e2819a4b7e5c11ae569720b1e476d SHA512 142dc905aac6dd3bd1d94a95d2ec8886554841630a872eb30c5c8ac7a5ccceca7197926113d01af328bed780c5ec6ce5f4ee6baf021ec553ac4e6ca16ccc4674
 EBUILD ceph-16.2.9-r3.ebuild 12577 BLAKE2B 2fc89ce85821460a715a605f73d4ebe2ff6626ac65c6e193112af2f12025cbebbe1561a01e3eaa94f02a1fbfca6f5cfb562c90ccc34943ab281fad2a07d4813f SHA512 ff757822896783a6584f352456780396dacc5ae9caf58b2c41b2dc782291d46aeaf217456650a78b63e52c24642bf1d5595b7b642473839f28b5b8ddc3075fa2
-EBUILD ceph-17.2.5-r3.ebuild 12976 BLAKE2B cac7a73b9a6b6c93c3b9326bf6c93fd083dc3724554d3063eac2d22dc76fb644ffb519cb696dda6eba76be27ffa044b51726aa625c768e067f53262a3cedb6b8 SHA512 5478facf409098aed68b9edf68c445741e297fcbad53337d9698d5b254403c19f6b4de3bb86db39fe063958c8a192fb22e6770982fe94ea118720cec0204980b
+EBUILD ceph-17.2.5-r3.ebuild 13089 BLAKE2B a20f6fac1f09520977c9af050ccaeabb20f9ee295a5c473f9eb205e445cb8c2e9b76a1b093fb08b04f973d992208c0b4a2ae2356802e81b3826e4e5552aa94d8 SHA512 91e617a48683190b43d42688f964246acde81987d37f583255a472d62435ebe7dde376131ba92fccb0135640f8b493902d3071cbed1c8f69138ce56ea183bb8f
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
index a99834673e30..2221ccb8e94e 100644
--- a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
@@ -9,9 +9,10 @@ LUA_COMPAT=( lua5-{3..4} )
 inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \
 		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
 
+XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2"
 SRC_URI="
 	https://download.ceph.com/tarballs/${P}.tar.gz
-	parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-${PV}.tar.gz )
+	parquet? ( https://github.com/xtensor-stack/xsimd/archive/${XSIMD_HASH}.tar.gz -> ceph-xsimd-${PV}.tar.gz )
 "
 KEYWORDS="~amd64 ~arm64"
 
@@ -221,6 +222,8 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
 	"${FILESDIR}/ceph-17.2.5-gcc13.patch"
 	"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
+	# https://bugs.gentoo.org/901403
+	"${FILESDIR}/ceph-17.2.5-link-boost-context.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch b/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
new file mode 100644
index 000000000000..9ebc70ecce9e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
@@ -0,0 +1,10 @@
+diff --git a/src/neorados/CMakeLists.txt b/src/neorados/CMakeLists.txt
+index 3c7aee7c6fe..bda666ea95b 100644
+--- a/src/neorados/CMakeLists.txt
++++ b/src/neorados/CMakeLists.txt
+@@ -41,4 +41,4 @@ target_link_libraries(libneorados PRIVATE
+ # install(TARGETS libneorados DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ add_library(neorados_cls_fifo STATIC cls/fifo.cc)
+ target_link_libraries(neorados_cls_fifo PRIVATE
+-	libneorados ceph-common fmt::fmt)
++	libneorados ceph-common fmt::fmt Boost::context)