gentoo auto-resync : 24:08:2022 - 20:48:33

4 files changed, 38 insertions, 2 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index e38ebbf9cbef..12069035f08e 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -35,6 +35,7 @@ AUX ceph-17.2.0-pybind-boost-1.74.patch 845 BLAKE2B b862b1abf61c0f5cc17964c86073
 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 456 BLAKE2B 161527aee7f0c9a11e3823771f5452da98b9c557f7322b2e7515e9788151a0848a65cf55111754aee5fe1ee8d23de8c4266bbbd75a3162b56665124f95094812 SHA512 a43c363625c93f805322e7e26c50b760e7c55716fe5b0e360221342fc24b8453d5ac702425cd7854d4ba3870d97a043d3561d6715ddb73d4258a0b2a7c94e053
+AUX ceph-17.2.3-flags.patch 782 BLAKE2B 08cd4fefdce90bc42b9c4e3caff805b1d8c9d011a96d3d2562b2a5cecf25b1b20c65a0cb8e90c0972e6708088feeecd3f829d3fd614b41289bf7f0d2d6d357fe SHA512 65bbdeed0f835a5444bd468dce5e78bb43284f1cb96c3ecdbc63b267213b251c9ad18291f47cb4f604e6817e0bf4aab025b8b67c5c0877cd58f4981d4f65ccec
 AUX ceph-17.2.3-gcc12.patch 924 BLAKE2B 119fccc4caa45e7b62c73d6cc66b9ba0b23598607c18fc621ce86e2ba11bbfd15e432e4c0e528fb8af2cfeedf3e535bfcc8008a39c5c7e3789b96372f2970e53 SHA512 121d8992dab710b5b1721e7fd04e30cb4e2e6b2cd2f6ed30934c6f65b3d9676bc5a1e8dd52c739cff704f900a651ea8729bb3234db033ef23434acd8fb5436fd
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
@@ -54,6 +55,6 @@ DIST ceph-17.2.3.tar.gz 168821857 BLAKE2B 21ec5ac33591ae8b22eae3d88680ae87340e63
 DIST ceph-xsimd-17.2.3.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 EBUILD ceph-15.2.17.ebuild 10899 BLAKE2B 8e226936efc3f65e3903c629ccff9637ee37c94f365d6c636540f22bf68e8450ac254cb1c01e7876342f58b6407e5187956276507119ce6e76f0e2fc12859def SHA512 c63bf1fe0b3162d004ccf82c016089088622ede34609da3707cc9bf0f3f4f507ace5d5c1ac0ceb0c3872706e1c02b9b84b04d65faf661518e26acb25a4b60ebe
 EBUILD ceph-16.2.10-r2.ebuild 12625 BLAKE2B 905f14e8f5b97c88b48201b61cea98e87e59cbaecb05d4027b3c9b9414a06084fe92a23d6d839b1bba070a9dba0c37c3230bff0eec9416e958e4afc363979621 SHA512 bbc24e103b6e08a89754c6e346aaddd5d851fec89b54cb0b8ec38f9621c1d8fd7825e470f50cd78d3c87f858c4d52f7e73ea37b9831ef1b2f28f28eae9d9434a
-EBUILD ceph-16.2.9-r2.ebuild 12578 BLAKE2B bd69561e5888f3390aa725e003c0a55815ec6336ed67b3c78cfc23e6805664a6ae4cc3018741f9f971b2002a49466c0dbc2468586dd127a5584bcffa394e13f3 SHA512 f35d201f56bac94bf765b7ce96bf18225bb4f702207e48d746645e24d7b548694fd1f4b7ddd4319dbaed73721dd778643061f4bce1523c4d9c3e27839c36fee2
-EBUILD ceph-17.2.3-r2.ebuild 12553 BLAKE2B cd5759374f92d617038aecff8c9064fd505fe17e93bdd02e252969301ef4a6016aacba137c78580f56581ec6a32d0a25418a6d3f386b4173aa22ea9e6d41da33 SHA512 bd82de5a3d883917ca8d9afe9d1f50d733914159519baecab5ce2bce10039a59d5a82040a8d97b828c3a915911e3b756a95bc630bca8bab110cf3960102839c4
+EBUILD ceph-16.2.9-r2.ebuild 12733 BLAKE2B 50711dcd407b850c0e6aa4f9be1526c19cfd51ab65bc1f32d66affb6ce3bc038b1e2f37340986a48198a7483771daa5f76396a24f86cb133ab9eb9fa79d9ea0e SHA512 d26383205ea5263fa9eb754b46882b009c6dd2d4b5d5995778524d548e617db88a72d34ba160712f4c05a261c97b3cea8b028526d91edf9757f06275d03311f0
+EBUILD ceph-17.2.3-r3.ebuild 12773 BLAKE2B f55b830186b0a10a5752843abbbefc104b90fd7c01663ae7020a68209436616bd68acd2c0262ae075ef1ee46dfa3809dd38919c5c4f3a10f4fdad41143f92364 SHA512 ef9c960bd16e97038b6de4985e17c15b72de687b234be941a73ae65556745fbc87d7090da775d5f6d2bb0231b2ecdd60edd100fdee71bf604b00add4e9b4ec45
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-16.2.9-r2.ebuild b/sys-cluster/ceph/ceph-16.2.9-r2.ebuild
index 59d566d734d7..b4e567bd5318 100644
--- a/sys-cluster/ceph/ceph-16.2.9-r2.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.9-r2.ebuild
@@ -335,6 +335,8 @@ ceph_src_configure() {
 	else
 		mycmakeargs+=(
 			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
+			# don't want to warn about unused CLI when reconfiguring for python
+			-DCMAKE_WARN_UNUSED_CLI:BOOL=OFF
 		)
 	fi
 
@@ -405,6 +407,7 @@ src_install() {
 
 	python_setup
 	cmake_src_install
+	python_optimize
 
 	find "${ED}" -name '*.la' -type f -delete || die
 
@@ -471,3 +474,7 @@ pkg_postinst() {
 	tmpfiles_process ${PN}.conf
 	udev_reload
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/ceph/ceph-17.2.3-r2.ebuild b/sys-cluster/ceph/ceph-17.2.3-r3.ebuild
index c31770f38434..a604240f1560 100644
--- a/sys-cluster/ceph/ceph-17.2.3-r2.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.3-r3.ebuild
@@ -219,6 +219,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.3-gcc12.patch"
 	"${FILESDIR}/ceph-17.2.0-gcc12-dout.patch"
 	"${FILESDIR}/ceph-17.2.0-gcc12-header.patch"
+	"${FILESDIR}/ceph-17.2.3-flags.patch"
 )
 
 check-reqs_export_vars() {
@@ -330,6 +331,9 @@ ceph_src_configure() {
 	else
 		mycmakeargs+=(
 			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
+			-DWITH_JAEGER:BOOL=OFF
+			# don't want to warn about unused CLI when reconfiguring for python
+			-DCMAKE_WARN_UNUSED_CLI:BOOL=OFF
 		)
 	fi
 
@@ -396,6 +400,7 @@ src_install() {
 
 	python_setup
 	cmake_src_install
+	python_optimize
 
 	find "${ED}" -name '*.la' -type f -delete || die
 
@@ -460,3 +465,7 @@ pkg_postinst() {
 	tmpfiles_process ${PN}.conf
 	udev_reload
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/ceph/files/ceph-17.2.3-flags.patch b/sys-cluster/ceph/files/ceph-17.2.3-flags.patch
new file mode 100644
index 000000000000..236ff5441831
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.3-flags.patch
@@ -0,0 +1,19 @@
+diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
+index 1916363382f..ae460d84542 100644
+--- a/cmake/modules/Distutils.cmake
++++ b/cmake/modules/Distutils.cmake
+@@ -94,12 +94,12 @@ function(distutils_add_cython_module target name src)
+     COMMAND
+     env
+     CC="${PY_CC}"
+-    CFLAGS="${PY_CFLAGS}"
++    CFLAGS="${PY_CFLAGS}"\ ${CMAKE_C_FLAGS}
+     CPPFLAGS="${PY_CPPFLAGS}"
+     CXX="${PY_CXX}"
+     LDSHARED="${PY_LDSHARED}"
+     OPT=\"-DNDEBUG -g -fwrapv -w\"
+-    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
++    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\ ${CMAKE_LINKER_FLAGS}\ ${CMAKE_SHARED_LINKER_FLAGS}
+     CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
+     CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+     ${Python3_EXECUTABLE} ${setup_py}