gentoo auto-resync : 14:09:2023 - 04:46:01

5 files changed, 39 insertions, 7 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index d88fa87668ac..c2a1a1a78096 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -34,6 +34,7 @@ AUX ceph-17.2.6-arrow-flatbuffers-c++14.patch 3905 BLAKE2B 89e1860ff9be4ae899d99
 AUX ceph-17.2.6-cmake.patch 3014 BLAKE2B bfe19b9667c6b2952b8d09978404d6c1600572ab8adfdd4533a6dd6249d87cefef7da605260612f78a35d9f6af177487bb0a5db88a42e5a8660fc54b0c12ee5b SHA512 b007de53dd0e1e1cc972c9c98205d0957e0d568fadc2d9e4588b5c13e80e4f24915c0e48b347093c7039b3a7e43ca6e9c51a0ebf51a016270ff40e634857ba68
 AUX ceph-17.2.6-link-boost-context.patch 522 BLAKE2B 7f50f179324d74a372a038cb183297f9ecac7095a71a810d0d8063d2f80c31013db029e0067ab3b689faa1d4967ed04e077f279a203414e3ce49ddbc6b552e2c SHA512 3b15869a5e9bddbec752f3f612c4c53bf95c8da21a573b92af90f0f9823dddcdeaffef850c2d84bb4ee8bde8ce30a92e0f911c0e9e9007fb44aa8279b5cbec5e
 AUX ceph-18.2.0-cyclic-deps.patch 513 BLAKE2B ac3614a17fe03a1b1d1fb1818bfee058158a9df2fb96180e9071f1f6adda9dc784da1028bd0798d3502494a5a0ceb1b9dbb82049719bf0afb514e4a501059b2c SHA512 ba4cee763adae237a26dc766a7164031fcb12a2c5d7924a668bc1b70b3055ce1548f08611f87ef8d1bebafdc4c396a018f6d69f7e8b1a14a76df5f4b7968a577
+AUX ceph-18.2.0-cython3.patch 1130 BLAKE2B 9ec4d3f2a5581577c7631fedf697782cc214d6c11ad849a432113e8243d5d4d79d2824f49c525ac3f23d95e33c7fd2b5f7c67abf9f33817cfaa15dcd49bd98b7 SHA512 b5a3b9df9dcfc141c636db4981290595c39969850f0d55d42803710183a58333c3cd1a5bf1e686021c87b9f3f4b7de6076bd2aa2cd56053c019c1369ff94ccc8
 AUX ceph-18.2.0-system-opentelemetry.patch 660 BLAKE2B f9abe4bade9675c3adb8d0f984603395a3ca24b8adf862cacf10510dd0db29e730e282d2f7936bb987f58935793d790011a61e52b737bb184b948176aa264d23 SHA512 0ae4455be748bcd9f859e44042b19746c3e931cf12dc664346cf5951c2b414b1c4806174298be8ca9f234b3a09868648e8d2b952af8e1e8668016600c5386726
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
@@ -52,7 +53,7 @@ DIST ceph-17.2.6.tar.gz 168093221 BLAKE2B f79efce9bd7f485b43ae1b4da94a1d9fb37530
 DIST ceph-18.2.0.tar.gz 197353856 BLAKE2B 0f2217d9ec4105f72b7b48f7981c5cc098e8f6d46b029acaae1aa91d71486e7dc5726cad0763b5bb0f79d006e289a9f590c95f2494c17f2f09fb492c06db455a SHA512 fe6a3ca4227cc05b5effc33a02670c466583ec9e4c7c025241248223992254e6e6551d7db486d5ead36bf0ba922d54e0aabc2aaf456d4593679376ec88bd971a
 DIST ceph-xsimd-17.2.6.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 DIST ceph-xsimd-18.2.0.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-16.2.14.ebuild 12743 BLAKE2B f203caf2aca2cee3422c4d9a84d27f45a7b4952e4433e9a441e90a6512368d92a0f51581c9e59e4c1ef0272a283385ea7ad73bdac839dd0dafb59bbf8aadd548 SHA512 c43d338432284cb680bade828cbe8529ce408008e17acc3641b10cca54e9fd55a8e071ad65d45be73a794447c4db9cccf3edd4ca0924f4f529d6ce6c6f831ef2
-EBUILD ceph-17.2.6-r7.ebuild 13450 BLAKE2B fe24d65e294ce5884c703fcb9cc80130e0df6f37c82e41d9c86d39d81255ef70f58a0133ce0a366fd674719549f374164b184a28657c6c92b4db8fb6bfbdbf1d SHA512 3058d679e2a9b841767666e91b9df1c71ade401cf1a9808a79c34eae5ead35ddcf786b3c2d0f542e0f3956d7d65a4e66c621ed2fac8c08188821fe3d8fc0a304
-EBUILD ceph-18.2.0-r1.ebuild 13205 BLAKE2B 0c523c6e773c607fdebc309d62658862ca8e256ffcaeb7efba723018dedd406469affcaddb3fd0e365422d688c2e268e3399c2cf2196f33058d1b58e5125258f SHA512 541fc85695c8dc7e2f8454266c317c74eac0817edf6fffaa5546ade1cfb3fe4d3f6bfe921c852aacd67dfc31f14fc4ef314ef576c0900c0dc50e5936c138120d
+EBUILD ceph-16.2.14-r1.ebuild 12815 BLAKE2B 3a2215b88b3fc7556e8b9bb4e3dd91c716f8d519292a9713de0e81c4fc55ffcd0047bea54ba795477539014835f6a19f9bf05142cb310b32096b8ed5065c4417 SHA512 20d81f09c7aeb885a2407d9286eb8c6f1b3522fa711e267dcb085dc50f3f0e215e10aba8f29a5fe7a8ae08b550770469508ed4adf1b1606e666e1ed0df83d53f
+EBUILD ceph-17.2.6-r8.ebuild 13522 BLAKE2B 1c71db2ccd99bb74dc80fb7d04a43d3dcbc5ba7936739e69b9fb07fa98ac8d150991c518cf3ce51fdc66b5791c3b9f968af4bfd53b926be9d8b4bf97952970d4 SHA512 808944ba076895730412117d70899ae364aec2ceaf1805030144d0b19cb453b605510a599348350956c2ea000be24f0e8d8228f13ac360e9a2a6651786ba59da
+EBUILD ceph-18.2.0-r2.ebuild 13252 BLAKE2B dd4237b1d5888d2fcb0c105e1b51e74ed4d07bdf1053961fc54ff558a1489aff8531d6e86628c2515f190062d6176691e755bd440eb8990de3e15ee439186b75 SHA512 debce8ecc34fd20079a3209ff3a43129f30df613cd5fa5152d889e8b21227c2c341050f9971220d3cd3381b9f834ffce2eec66aff1ae25204d1b04ed5206cab6
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-16.2.14.ebuild b/sys-cluster/ceph/ceph-16.2.14-r1.ebuild
index c62e195e159e..40f04bb1347a 100644
--- a/sys-cluster/ceph/ceph-16.2.14.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.14-r1.ebuild
@@ -103,7 +103,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 	app-arch/cpio
 	>=dev-util/cmake-3.5.0
-	<dev-python/cython-3[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx
 	dev-util/gperf
@@ -213,6 +213,8 @@ PATCHES=(
 	"${FILESDIR}/ceph-16.2.10-flags.patch"
 	"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
 	"${FILESDIR}/ceph-16.2.14-gcc13.patch"
+	# https://bugs.gentoo.org/907739
+	"${FILESDIR}/ceph-18.2.0-cython3.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/ceph-17.2.6-r7.ebuild b/sys-cluster/ceph/ceph-17.2.6-r8.ebuild
index 2a2b757517dd..3f4382b4cbef 100644
--- a/sys-cluster/ceph/ceph-17.2.6-r7.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.6-r8.ebuild
@@ -110,7 +110,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 	app-arch/cpio
 	>=dev-util/cmake-3.5.0
-	<dev-python/cython-3[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx
 	dev-util/gperf
@@ -226,6 +226,8 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.6-arrow-flatbuffers-c++14.patch"
 	# https://bugs.gentoo.org/868891
 	"${FILESDIR}/ceph-17.2.6-cmake.patch"
+	# https://bugs.gentoo.org/907739
+	"${FILESDIR}/ceph-18.2.0-cython3.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/ceph-18.2.0-r1.ebuild b/sys-cluster/ceph/ceph-18.2.0-r2.ebuild
index c24704db3311..72743d105137 100644
--- a/sys-cluster/ceph/ceph-18.2.0-r1.ebuild
+++ b/sys-cluster/ceph/ceph-18.2.0-r2.ebuild
@@ -107,13 +107,12 @@ DEPEND="
 	zbd? ( sys-block/libzbd:= )
 	zfs? ( sys-fs/zfs:= )
 "
-# <cython-3: bug #907739
 BDEPEND="
 	amd64? ( dev-lang/nasm )
 	x86? ( dev-lang/yasm )
 	app-arch/cpio
 	>=dev-util/cmake-3.5.0
-	<dev-python/cython-3[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx
 	dev-util/gperf
@@ -224,6 +223,8 @@ PATCHES=(
 	# https://bugs.gentoo.org/868891
 	"${FILESDIR}/ceph-17.2.6-cmake.patch"
 	"${FILESDIR}/ceph-18.2.0-cyclic-deps.patch"
+	# https://bugs.gentoo.org/907739
+	"${FILESDIR}/ceph-18.2.0-cython3.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-18.2.0-cython3.patch b/sys-cluster/ceph/files/ceph-18.2.0-cython3.patch
new file mode 100644
index 000000000000..bfaeacea4f26
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-18.2.0-cython3.patch
@@ -0,0 +1,26 @@
+diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
+index 5e14e38c919..d10dce62262 100644
+--- a/src/pybind/rbd/rbd.pyx
++++ b/src/pybind/rbd/rbd.pyx
+@@ -371,10 +371,10 @@ ELSE:
+     cdef rados_ioctx_t convert_ioctx(rados.Ioctx ioctx) except? NULL:
+         return <rados_ioctx_t>ioctx.io
+ 
+-cdef int progress_callback(uint64_t offset, uint64_t total, void* ptr) with gil:
++cdef int progress_callback(uint64_t offset, uint64_t total, void* ptr) noexcept with gil:
+     return (<object>ptr)(offset, total)
+ 
+-cdef int no_op_progress_callback(uint64_t offset, uint64_t total, void* ptr):
++cdef int no_op_progress_callback(uint64_t offset, uint64_t total, void* ptr) noexcept with gil:
+     return 0
+ 
+ def cstr(val, name, encoding="utf-8", opt=False):
+@@ -426,7 +426,7 @@ RBD_MIRROR_PEER_ATTRIBUTE_NAME_KEY = decode_cstr(_RBD_MIRROR_PEER_ATTRIBUTE_NAME
+ 
+ cdef class Completion
+ 
+-cdef void __aio_complete_cb(rbd_completion_t completion, void *args) with gil:
++cdef void __aio_complete_cb(rbd_completion_t completion, void *args) noexcept with gil:
+     """
+     Callback to oncomplete() for asynchronous operations
+     """