gentoo auto-resync : 23:11:2022 - 01:07:24

16 files changed, 121 insertions, 169 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0950af5b169a..e3c3200b8357 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index 39676d69151e..55ef68de2b29 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -1,8 +1,6 @@
 DIST gnulib-5293ada82e1ea38e9e5cdd3724c73204d703f07b.tar.xz 4721720 BLAKE2B d0c70f4f33cbc3b7fcbef6ebe67d4ebac2a89fe8e9b1598fa00f0292ce2bc528ed6f5be123072c43c52f1234266bb6fb96b7881839ff884a39d2bce58a9f3ad7 SHA512 0f1822fb579649c3cd09ca8e69334d425f2024d780a98d7bbf38d26f36f174036fa066635513485ddd6e2ad485c7060ae9b101c1595891307a382e6aa9bc4226
 DIST gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.xz 4711472 BLAKE2B 901fd3b3388210f090825829d1de43395819ee907574e2cf7c6586c93ef72afd26e68abc7ae27d1e462a703f1d3bedf37ffcf4d8924fed32a95bc94ae83399d5 SHA512 04ab346648a23a4f58dc2d818955ae145bc9c21c3b24a1719cdf48bb8116e3765de675bcf19747d64d43432db1bb406f403168f973f24811f9d126deadea7e7f
-DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.xz 4104308 BLAKE2B 099ebb4f4a7745e5b7367f48d8d9cc11d3ac1c03b59aed2801f684fb6433e3dc1efd6b801a864308f440edd6068c7d1bb1763887bcabe2da4f927f5507fa7f89 SHA512 ed97c589b8a39b1d41c0e2e6c0bafda4df99191b8aaae3feb5f46dffee5787d16ad2c4ca62bf50e2964f36691ef446f67540657b1b0cfc5c775acb88816fffb5
-EBUILD gnulib-2019.03.17.09.24.57.ebuild 920 BLAKE2B 6a362c257853e60109ea1c5e5ead6f9132551f066862fc6fa74e27f8c284ef51581894ac9ea7afb0389d40c8b5dfee70708e501fe238f6b9bae64d635e63f204 SHA512 9f6e29ad602bda13257304435c78d32bc9d412648fadcab689838105ac7161d050022fcec292979a199c5639dbdd69aa5a76d1369109f578879d16907ea9bc2d
 EBUILD gnulib-2022.02.12.16.27.05.ebuild 920 BLAKE2B aaf9cbf56b57e3829844a2a650a0af3c920f3564876a9d0b9b4c7cb32615063a1c8ab3eaf4cf19a81b4a4c4a1219f5cda9f222457ea04cc5ef83ef1894d290da SHA512 dbede04293836c00551e8db17baf92a1e27de6493879e7ca8fe4cc76dd0522eb6dd511b33a00a7c29bdb16c033768b00806c227ed3423f35528ca0db08ec7432
 EBUILD gnulib-2022.05.26.07.24.56.ebuild 920 BLAKE2B 64215015f09458a9b9978c3acb3cfbc1f3e82d4db2fe63831c5a387f8d08df16920a11b3e70745c9dca1810377a8a17863f82e6fbcbe06a28c7a03f692d6d2d3 SHA512 34d9da119f9cbb48b424243b199547037b9d921361f7f0a334e80c3c45f281146ba4c714460d4452e7fcc1952ac0747706e8fa143222c2d3767bfaf437b0b827
-EBUILD gnulib-9999-r1.ebuild 788 BLAKE2B 58e59d347b87cc6a6e1f4e04b6723d1e6dccc7adb7d8c5fac2d4df749bb059da9cd38df28139046281cb5e3c0eee5a62949c47fab8b6976cb37f99fa300fcc33 SHA512 f6042419262d62e10dfb62c2770e821157672040bd86ac3e92da9b5fd008a6ceda1486f331ead8716195cb8c9c3966531ecfe1d47bb6cc09e313a7f4492b269a
+EBUILD gnulib-9999-r1.ebuild 785 BLAKE2B 1a64de72d7f47eb7055fb050a298592efb95740bfdd709e891767abdb1e06b8b89ee5ff55df956a76835bde76451ed8e4d35244d27de65c79eeb9e80bfaa6d1f SHA512 2c41dc1e6f231008143f553387692a5fd5f18fb81400b707938da8a962f31634c28047d21abacd2ba1b48608bdac51daa64eb119a3299d794c0ad323a74ff66d
 MISC metadata.xml 244 BLAKE2B f599747a5c4b523305b9895669bb3171446bd4edf7339753b21ca14524c010a83bdb41e83851df393240077c31891fefa1a9bd876bda37cf2ef77731a76eca80 SHA512 7db5efa0f85d76e9ff76fd6a0e83908ccb9d5486b2994277166976ff531b9eb88806ca80cd3cb070bac89f383872733c8470d04f86a67854d1b023eb24b4e2b5
diff --git a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
deleted file mode 100644
index b703f1d17da7..000000000000
--- a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GIT_TAG="b451121ab45497e78cb6f612c8673a9705193391"
-
-DESCRIPTION="Library of common routines intended to be shared"
-HOMEPAGE="https://www.gnu.org/software/gnulib"
-SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-S="${WORKDIR}/${PN}-${GIT_TAG}"
-
-src_compile() {
-	if use doc; then
-		emake -C doc info html
-	fi
-}
-
-src_install() {
-	dodoc README ChangeLog
-
-	insinto /usr/share/${PN}
-	doins -r build-aux
-	doins -r doc
-	doins -r lib
-	doins -r m4
-	doins -r modules
-	doins -r tests
-	doins -r top
-
-	# install the real script
-	exeinto /usr/share/${PN}
-	doexe gnulib-tool
-
-	# create and install the wrapper
-	dosym ../share/${PN}/gnulib-tool /usr/bin/gnulib-tool
-}
diff --git a/dev-libs/gnulib/gnulib-9999-r1.ebuild b/dev-libs/gnulib/gnulib-9999-r1.ebuild
index 394e16ee666b..7305188a7c64 100644
--- a/dev-libs/gnulib/gnulib-9999-r1.ebuild
+++ b/dev-libs/gnulib/gnulib-9999-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit git-r3
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 2c3b079d7c1d..5290fd9b4c2f 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,5 @@
 DIST libgit2-1.3.2.tar.gz 5824473 BLAKE2B 521512721d5959274898046e4341e000c3d0bb28cffde9c1c5f9640f73c74fb3b5330a2329b57a92490acd93f6b59f9b53d9940b50a1056c15f52632db9fdfe6 SHA512 580ad6f3e2cb992014d7fecef4d834dd0fda169c4439ec5d566322edb457b2173910b25a49ba50d5bd05518ad771ee2f42e47ab48ce417c297b6a93dd0cb502d
 DIST libgit2-1.5.0.tar.gz 5893437 BLAKE2B 4108de0e8fc6a02e4172f47cb69cdfe8c85a0a72235432ca58b02d94e0bcb8390caf0c710060772551cc3a392291778ae14b561256c6d88058d0ae5a277f2fbf SHA512 7a32b27cd32bd03ce7be6c127317f82a4ac6f16615c3234699676781f4858d057edb0410b2fe36fd2e634b00748a8b0be17f23809e09a7602ba48185134300f7
 EBUILD libgit2-1.3.2.ebuild 1698 BLAKE2B 2dc3632795ce43e35c4f8f0d8b0a9e6eece80299c6c6cae21f7a6c8fedfc9c2da3021b97495968a17b966f90bbf48072a79c39757e4adf37aa25999a9f2aad7d SHA512 0ac8c62508780fecccf0052c8545afa9fd49dc8ec908cf83ebb064f1257330009fb728c11d7f7bb19b6c59d457b526ed919dd9b1375f8b33e1945d8d8d4d7989
-EBUILD libgit2-1.5.0.ebuild 1674 BLAKE2B 1beb8b7ceb7da11da74861cff0a1d7ab89d9e2bfa9b25ea73ee85f845f0a9c8c856cd919241c75054aab62b3e98b1e5bfde2f2f410d6188fc845f0597663c470 SHA512 93108b13ab6dfc7ad9e0b1f3e9808dd0ae1c0e6d9ba302c111e4ea0b38074317a2d80dcc6735674594ec233d7b68722454b7fed4d0a145a12d8f264a32fca992
+EBUILD libgit2-1.5.0.ebuild 1680 BLAKE2B d34ea8d31dbe11ba71e5c7c53d6a9ec4878a9c31219ed48590a414163b0a5c28cd59e2c1d737c734301543994a3d0fa056f300bfa621650cc7c7b981ba29f4d7 SHA512 fd594dacec7a5d1d5717dd6248b81472a019f439e447c68a602fedc0c20d3d86ec9069f8cb18b80069424d1bc3e8881530b60cff424fac52aa2c6e8a016a2d5c
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.5.0.ebuild b/dev-libs/libgit2/libgit2-1.5.0.ebuild
index 34538c13429a..db3d7113bb3c 100644
--- a/dev-libs/libgit2/libgit2-1.5.0.ebuild
+++ b/dev-libs/libgit2/libgit2-1.5.0.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index eed78e8fccb9..543650dc0ae7 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,4 +1,5 @@
+AUX liblognorm-2.0.6-configure-clang16.patch 557 BLAKE2B 8a36b1861d027bcab6fc5311216b8842f4921142a8cc905389a3185b30d2b503e858dc1da942a2b51490223157a5a7e9464203d44380fb28ba92477cfd5f68e1 SHA512 191103fbe112e49011ae627c4f050b5ea62ba1abf7eb3ac3bc1eedf325092e170fc24e9ae7c8fdb56e069e6a6e3930ded8ad5e2dbc53e079edccdcf81893ab3c
 AUX liblognorm-2.0.6-sphinx-5.patch 360 BLAKE2B c1435fe1799647785360d361fce735fd35f68e215784679cda9af6f39bde5ab4e3bfb721d7a77316c181c9ea60c59e5d76fddd7a2d61f7e471a212505fff914b SHA512 aae3e3d22310279ad7ed985725cefca23e9e36707ffe64f6173927f54fcb37228ec80373f072957026683cafed6d0a154f16cb23bfd2a09e5d72d94d96a33fb9
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
-EBUILD liblognorm-2.0.6.ebuild 1595 BLAKE2B b152a7f7f70423e02c92fb49891e5535b7fa7564b55128634232283e7f7ec91489fd4a4658530924f2fd2a2fd5f5f2f3b8539aefe0006667f38fe87ce8e16608 SHA512 80c5511046383b1c7c8e5d2e94c745757567be8f94c83da718f803a47e4215669ed27b69ed4e7b1ad9765cf6ecd1e4053f7d5fe08508bf017bef15452d2b511e
+EBUILD liblognorm-2.0.6-r1.ebuild 1630 BLAKE2B 98f5e351249c30fd415926c8a7d952b946ec5ab13e052d0b7da8b1dbc8fc431c4baa00ab9671c2f0fe608e5e35d51e99065eab029deda5443f8cbe64000d19ed SHA512 ec0fa9dc078d35f67ce2ab978e1fa6334eab917278f3559a255b9d4863b44ce2bd3c7648ff4785cd8a205830af4f1b643c4a79c6139c7247e73be8a4be20452b
 MISC metadata.xml 389 BLAKE2B 70d3d2a02b694e0a38c9e8f530c41a2f59e471067702c7edffced0d09ad7f4f15e8545541a29b86ddd4acf6d93d841a49f068134a25242f3cbbde01a3b9303d6 SHA512 26ca562d9885ce147feb94b831b2b70da5d4e04ec554356bc2e5b7293c7eb8edfdb9ed86b57ad02fd93b384053c1f6d038b496aebc68ed7771ec14ab90b34a6c
diff --git a/dev-libs/liblognorm/files/liblognorm-2.0.6-configure-clang16.patch b/dev-libs/liblognorm/files/liblognorm-2.0.6-configure-clang16.patch
new file mode 100644
index 000000000000..3ba63017e18a
--- /dev/null
+++ b/dev-libs/liblognorm/files/liblognorm-2.0.6-configure-clang16.patch
@@ -0,0 +1,21 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=2141801
+https://src.fedoraproject.org/rpms/liblognorm/c/cdaf4de866002343f4011bb05c71f764258948a7?branch=rawhide
+
+"""
+Submitted to Adiscon via ticket system. See:
+
+  <https://bugzilla.redhat.com/show_bug.cgi?id=2141801>
+"""
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,7 +38,7 @@ m4_ifdef([AX_IS_RELEASE], [
+ # Checks for libraries.
+ save_LIBS=$LIBS
+ LIBS=
+-AC_SEARCH_LIBS(clock_getm4_defn([AC_AUTOCONF_VERSION]), [2.68]time, rt)
++AC_SEARCH_LIBS(clock_gettime, rt)
+ LIBS=$save_LIBS
+ 
+ # Checks for header files.
+
+
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild
index 63346c79252e..f3648a4f4e3d 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Fast samples-based log normalization library"
 HOMEPAGE="https://www.liblognorm.com"
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
 
 	inherit git-r3
@@ -26,9 +26,8 @@ RDEPEND="
 	>=dev-libs/libestr-0.1.3
 	>=dev-libs/libfastjson-0.99.2:=
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/autoconf-archive-2015.02.04
 	virtual/pkgconfig
 	doc? ( >=dev-python/sphinx-1.2.2 )
@@ -38,6 +37,7 @@ DOCS=( ChangeLog )
 
 PATCHES=(
 	"${FILESDIR}/${P}-sphinx-5.patch"
+	"${FILESDIR}/${P}-configure-clang16.patch"
 )
 
 src_prepare() {
@@ -67,11 +67,11 @@ src_test() {
 	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
 		die "Failed to adjust test scripts permission"
 
-	emake --jobs 1 check
+	emake -j1 check
 }
 
 src_install() {
 	default
 
-	find "${ED}"usr/lib* -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 7f0335c23961..50bebcf49452 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,3 +1,4 @@
+AUX mpfr-4.1.1-fix-mpfr_custom_get_kind.patch 2902 BLAKE2B b925ae960251382527f0185c91b792f97f65cfbfb511c74996370b722c1539cb8376106d4e26e14188af02546bcf5d39e493572e02c227e457a783e7fbe739b1 SHA512 79081c8b1a957656687725c3f6e1eecdb6e76569a74cfdd4a832ff3fb3eed85f061d64c354f7ca9cbb7f0f412e931095dcb09301019ee14cb17f1b11e2f68dda
 DIST mpfr-4.1.0-patch01.patch 2061 BLAKE2B 55b34d7e8d94d22a1c188d5f5c7b73523c080ac9b44ba4055894ab40a43e3b17b2fcc74bb3b8af93952929c073946bb143486e5963a160a1c456a62d0d73cf8f SHA512 f401d2a3b1e2e7e95177e5bf98d023be323c7e2152e9aab7133bad44c5924bed644ecb94477dc7ca975a29e1cc156001897966293130ac56d2ee5d96ade18ad3
 DIST mpfr-4.1.0-patch02.patch 2543 BLAKE2B ab36c68523132702a7be6b072e9a96054d8471b61d0b79d1f82a622a278f445fd43d2ebf3ae42fa915bf10d9d643f735146f3b2dd6026134f72e3ca9de1e29da SHA512 cb896e0b648225aa4eaa5959f79d7d5bd830ed464c6e00ee780ad6ac366054ac573985092c576ffb40ca4f7a9eb976f1c5a039895ca6fdb4fa72677fbd1cb831
 DIST mpfr-4.1.0-patch03.patch 9973 BLAKE2B 3db98472e3c94d8e7734db59f9854276884d3456d5d113be364802f6da08f07e31d30388d393524e0df8cb470ff6b94d763ca3c43be6507bb23628feee0b5d8d SHA512 c6893d67721d6bfd76efc639c84f7e6d60ae1bea09f32247d30cfc8011b5450fa8d1cd23956df1e4fe58fd4ec2d905502976f3bd2a5601af31bdb898275e429d
@@ -14,5 +15,5 @@ DIST mpfr-4.1.0-patch13.patch 3344 BLAKE2B 1239cf16dfe32a71bb6fc7b156978cd451bcb
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
 DIST mpfr-4.1.1.tar.xz 1429836 BLAKE2B ce20baee2f060acb28b877ffe6fc40c5619cf6af231bd54ca6cfb3e42ef2d74a4ffbab96cf0b5dd6a162e558099a54701d42f34f5bf2256f256fe6f5ae2505d0 SHA512 be468749bd88870dec37be35e544983a8fb7bda638eb9414c37334b9d553099ea2aa067045f51ae2c8ab86d852ef833e18161d173e414af0928e9a438c9b91f1
 EBUILD mpfr-4.1.0_p13-r1.ebuild 2700 BLAKE2B 46afea4da633c055ece8404cfabe6171abb568061a33445a58a961b55a3eb23ed28f08011efc001de2fdccc79c3ab34cc2d798be48928b74d2d1a302b8273cf2 SHA512 2e088ffc2e2343d8ce54b62ff625df579ea9236e31981f893c478f1e2b14e19d3bfa332d98fe9c486793a23acf76b231abf8ada2c1f4e7319bafa9ace3daf2fa
-EBUILD mpfr-4.1.1.ebuild 2708 BLAKE2B ad21498526dd91dcc6d03b35153cbd284d85d1ee90515ab3e323a3e9c44a16ce4b8bdc59c590b5b0b7166d1a3f8fc86f42fa5b72bab7fa7e3df72e7bba3586a5 SHA512 d08c80ed13fad11c6469812d1ba9aa1074ecb27707469c1ea368e77fc9d9d5d09511c205490f97450f0c4114ac09fed53a9170259ba66f82eea949c10b0ae42f
+EBUILD mpfr-4.1.1-r1.ebuild 2759 BLAKE2B 5785034a2f583d59ce126b9746043061d7b8e3cf3d3b02a541b62b04644b193682c7cade1d7a99d2a3ef11a8c5b6bcee34084b36d80d72f9485a456b8320e594 SHA512 80b464257128328b3abac0ee293730705b3d7ed2b2efa6557938ed79c5b9b717643b937b4765212c6c216f9ad93ffe3592525821320b8f528e6d2884bf19abd7
 MISC metadata.xml 344 BLAKE2B b7a0bcfbcf945ce2b6d58a9a2078c823c12de5ef8261ec009612b58a833deecb7caaf864f0b55e0c46aac004c58feb7a1f88f6d78b584c2e25c403cfb1de96a0 SHA512 8b8b5ae00a4f9ba76c193c5d84f27cce973963f4db109219394efccba3a8e8bebb7f241658a0b682331e34c66ee99332f871d826abf6ec5a4ced4f3dce381fe9
diff --git a/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch b/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch
new file mode 100644
index 000000000000..d2521f2fa632
--- /dev/null
+++ b/dev-libs/mpfr/files/mpfr-4.1.1-fix-mpfr_custom_get_kind.patch
@@ -0,0 +1,79 @@
+https://bugs.gentoo.org/881995
+https://gitlab.inria.fr/mpfr/mpfr/-/commit/3cd39bc0b71ad2fb2ab5252ad9268b14603e3ce6
+https://gitlab.inria.fr/mpfr/mpfr/-/issues/1
+https://github.com/CGAL/cgal/issues/7064
+
+From 3cd39bc0b71ad2fb2ab5252ad9268b14603e3ce6 Mon Sep 17 00:00:00 2001
+From: Vincent Lefevre <vincent@vinc17.net>
+Date: Tue, 22 Nov 2022 16:33:00 +0100
+Subject: [PATCH] Fix mpfr_custom_get_kind() macro bug.
+
+* src/mpfr.h: in the mpfr_custom_get_kind() macro, changed mpfr_ptr to
+  mpfr_srcptr for _x to agree with the function prototype, in order to
+  avoid a compilation failure of user code in some cases. This bug was
+  introduced by commit 9f94e0311ed53d0c64d4fbca249d19cc4888027e, which
+  introduced the temporary variable _x to avoid an incorrect number of
+  evaluations of the x argument.
+* tests/tstckintc.c: improved the tests to detect this bug.
+
+This should fix mpfr bug #1.
+
+Bug initially reported by FX Coudert:
+  https://github.com/CGAL/cgal/issues/7064
+
+It affects Fedora Linux:
+  https://bugzilla.redhat.com/show_bug.cgi?id=2144197
+
+(cherry picked from commit 0ce17bae34a6c54de31b126f969d3ddd72c6bc37)
+--- a/src/mpfr.h
++++ b/src/mpfr.h
+@@ -1027,7 +1027,7 @@ __MPFR_DECLSPEC int mpfr_total_order_p (mpfr_srcptr, mpfr_srcptr);
+ #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
+ #define mpfr_custom_get_kind(x)                                         \
+   __extension__ ({                                                      \
+-    mpfr_ptr _x = (x);                                                  \
++    mpfr_srcptr _x = (x);                                               \
+     _x->_mpfr_exp >  __MPFR_EXP_INF ?                                   \
+       (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x)                     \
+       : _x->_mpfr_exp == __MPFR_EXP_INF ?                               \
+--- a/tests/tstckintc.c
++++ b/tests/tstckintc.c
+@@ -295,14 +295,16 @@ static void
+ test_nan_inf_zero (void)
+ {
+   mpfr_ptr val;
++  mpfr_srcptr sval;  /* for compilation error checking */
+   int sign;
+   int kind;
+ 
+   reset_stack ();
+ 
+   val = new_mpfr (MPFR_PREC_MIN);
++  sval = val;
+   mpfr_set_nan (val);
+-  kind = (mpfr_custom_get_kind) (val);
++  kind = (mpfr_custom_get_kind) (sval);
+   if (kind != MPFR_NAN_KIND)
+     {
+       printf ("mpfr_custom_get_kind error: ");
+@@ -380,7 +382,8 @@ static long *
+ dummy_set_si (long si)
+ {
+   mpfr_t x;
+-  long * r = dummy_new ();
++  mpfr_srcptr px;  /* for compilation error checking */
++  long *r = dummy_new ();
+   int i1, i2, i3, i4, i5;
+ 
+   /* Check that the type "void *" can be used, like with the function.
+@@ -405,7 +408,8 @@ dummy_set_si (long si)
+   MPFR_ASSERTN (i5 == 1);
+ 
+   mpfr_set_si (x, si, MPFR_RNDN);
+-  r[0] = mpfr_custom_get_kind (x);
++  px = x;
++  r[0] = mpfr_custom_get_kind (px);
+ 
+   /* Check that the type "void *" can be used in C, like with the function
+      (forbidden in C++). Also check side effects. */
+GitLab
diff --git a/dev-libs/mpfr/mpfr-4.1.1.ebuild b/dev-libs/mpfr/mpfr-4.1.1-r1.ebuild
index 13392ae4cf60..e34c78ab5b44 100644
--- a/dev-libs/mpfr/mpfr-4.1.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.1-r1.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${MY_PATCHES[@]}"
 
 	# Additional patches
+	"${FILESDIR}"/${P}-fix-mpfr_custom_get_kind.patch
 )
 
 HTML_DOCS=( doc/FAQ.html )
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index c3e2f2172b9e..0e593156fcae 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,10 +1,9 @@
-AUX rocksdb-6.14.6-libatomic.patch 2994 BLAKE2B cac08dfa6fd490645e341148701ba0372aa97f76c84010e3ed94e3aa3a501762c7b2ea09cccc9e895912204e79d7430694b5ab7302fccb7b25f1c7f2ebba4afc SHA512 9f3814133699d7069ebff35b0513ad113a744d7adf21d7ec1d7975fc4fbd114430618760fd38dea69c6948dbf1dc4f5a994f7b347b40423c0244d2867276e448
 AUX rocksdb-6.17.3-add_timer_for_riscv.patch 1647 BLAKE2B d1e78c98149f534ce8d02754f5e15b5aeccadb99cf82586bd24c44c68aef5134bdd5d00f5f81699bae59f27ae9f565f40069afedba081f7a76ec54d90a37462b SHA512 ebcf6c5df091860bf53edf54af47678e90da251f28d0ed46be7ac1cf32f50528f8185e94d82ec770c97aa23d24dfcbba634ffcf2671a5dad5fcfd6104115bb69
 AUX rocksdb-6.17.3-libatomic.patch 2131 BLAKE2B 2f12fee9b062cf4bf633d784bd4234a1076d0b763f85b9ab0332c828661674944251098e7784b07118e95aa2f4729360cfe3b7b0c95afe58772ea0d3579afd96 SHA512 4717fb67b322f34a2fa351eac1d8fdcbf239acedefd8bcb69c07f11f472f0adc8579e7ddf01be6ba9239009f81d8df4b1cbfb1b88e996ad63fc1d3ff8b801526
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0
 DIST rocksdb-6.17.3.tar.gz 6651009 BLAKE2B c032bdf61d93a35e84c65146ad6d1f8639e9f36a323c142fe4131b501051bfb9c4c4edb13b69c86e35740117029996bb4c94887ea690d1957926bdfd347c744a SHA512 085adab94b7eb22859b4119b0356f148231800413571e932a7248967b1866d40a0be4b8265f2a9c6c21c600d3b2254c36e64ce7851171ff7c439a17306a84981
-EBUILD rocksdb-6.14.6-r1.ebuild 1167 BLAKE2B 689f94d975baa644daafcd5b004f283a662d0f2b277b4564795a78655e3ba3b58ebc0fc32e5f75970759540bbaaa951e4ac7e7c322c027985fe9dc38294048f7 SHA512 58c533f43c56a5a72d6eb6b8232acf57b480b6f96abfbeb05dd3101564efcfe003c4421a9c84b9079a5c6a042193849aba59369e6764f321c08d75d13a36bdd3
-EBUILD rocksdb-6.15.5.ebuild 1159 BLAKE2B 310b58288ce4cb2aafca99d6f332b7edea4857830709d7aac0286aefc6d5855247edfa244e7dff1f89dea8835ff6b4ebb9d6eca79efe51344225cef6f2f4fe25 SHA512 fec43421218ae9233371703311adcef6920bd43715b573443cd01ab4f1f1766ab907b332aa84b8d729cae35e9f352b79813172d9750be337ee6b85b079a7bc22
+EBUILD rocksdb-6.14.6-r1.ebuild 1167 BLAKE2B 5a363861d7ee4bd6288b5720d4742a9acf65b0935a3fd96caadf70832e9a1659678bd2b3adf7098c9b291dca5122e67fdb05977e4b6334dd4bd94871c4b020d4 SHA512 3b3f8595b2a376a2c09c6595c38c7f53ee0011b8535ab7b4cfafabe270ff830c98d390dde7d1e8c5a54a615ba2e298b66fd69aad2e7036ff705f12e91b80c00c
+EBUILD rocksdb-6.15.5.ebuild 1159 BLAKE2B 044f63cea6a65d2e4edd7a16eea61c8bb77faf346443ecc1b7d9e41747a7fe52a1bd45d3663acde188fde63405be75927c550b471dbf05f5ed1a29c39d529bb3 SHA512 9d4a7374293868883600b82ab4ddd0e0928aa7eeb6bda56845376f4fb93cad80e7d2a44c45297a13110756e48409a67e85ae7a6b49d813b0e0e34ccf2e0bd065
 EBUILD rocksdb-6.17.3.ebuild 1220 BLAKE2B 75e7df60533eb9793f8c5a95f795a2b7c47097624ce7f8bf7b5c3648f3cd71a09625a6ab25ebdcd38e7152c00fc174eafe25af982cff30c8b8b96da555977e29 SHA512 2d739631429ad720c697082b45ed6fa4e622fc1ac20c975a93a19142a9eca0db2a39bb786a81906177c3063096baceed23efb1570b7192cf5324ed28823d3990
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
deleted file mode 100644
index 27f17aab8933..000000000000
--- a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 38d79de10da65d234c70cbb36c24c58d189f76db Mon Sep 17 00:00:00 2001
-From: mrambacher <mrambach@gmail.com>
-Date: Mon, 12 Apr 2021 20:06:57 -0400
-Subject: [PATCH 1/3] Add check to cmake to see if we need to link against
- -latomic
-
-For some compilers/environments (e.g. Clang, riscv64), we need to link against -latomic.  Check if this is a requirement and add the library to the third-party libs if it is.
----
- CMakeLists.txt | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 984c6197cb..460d350054 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,7 +312,6 @@ int main() {
-   auto d = _mm_cvtsi128_si64(c);
- }
- " HAVE_SSE42)
--unset(CMAKE_REQUIRED_FLAGS)
- if(HAVE_SSE42)
-   add_definitions(-DHAVE_SSE42)
-   add_definitions(-DHAVE_PCLMUL)
-@@ -320,6 +319,26 @@ elseif(FORCE_SSE42)
-   message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
- endif()
- 
-+# Check if -latomic is required or not
-+if (NOT MSVC)
-+  set(CMAKE_REQUIRED_FLAGS "--std=c++11")
-+  CHECK_CXX_SOURCE_COMPILES("
-+#include <atomic>
-+std::atomic<uint64_t> x(0);
-+int main() {
-+  uint64_t i = x.load(std::memory_order_relaxed);
-+  bool b = x.is_lock_free();
-+  return 0;
-+}
-+" BUILTIN_ATOMIC)
-+if (NOT BUILTIN_ATOMIC)
-+  #TODO: Check if -latomic exists 
-+  list(APPEND THIRDPARTY_LIBS atomic)
-+endif()
-+endif()
-+
-+unset(CMAKE_REQUIRED_FLAGS)
-+
- CHECK_CXX_SOURCE_COMPILES("
- #if defined(_MSC_VER) && !defined(__thread)
- #define __thread __declspec(thread)
-
-From df7fdd69ac19f26601a80e35f70ec51913838a6e Mon Sep 17 00:00:00 2001
-From: mrambacher <mrambach@gmail.com>
-Date: Wed, 14 Apr 2021 10:33:47 -0400
-Subject: [PATCH 2/3] Reset CMAKE_REQUIRED_FLAGS after compilation checks
-
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 460d350054..5d167855a7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -296,6 +296,7 @@ else()
- endif()
- 
- include(CheckCXXSourceCompiles)
-+set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
- if(NOT MSVC)
-   set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
- endif()
-@@ -337,7 +338,8 @@ if (NOT BUILTIN_ATOMIC)
- endif()
- endif()
- 
--unset(CMAKE_REQUIRED_FLAGS)
-+# Reset the required flags
-+set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
- 
- CHECK_CXX_SOURCE_COMPILES("
- #if defined(_MSC_VER) && !defined(__thread)
-
-From 4793c5c75351d5d7c609c27d0243c2138729c7b0 Mon Sep 17 00:00:00 2001
-From: mrambacher <mrambach@gmail.com>
-Date: Fri, 16 Apr 2021 08:53:48 -0400
-Subject: [PATCH 3/3] Fix lint warning
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5d167855a7..558b985073 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -333,7 +333,7 @@ int main() {
- }
- " BUILTIN_ATOMIC)
- if (NOT BUILTIN_ATOMIC)
--  #TODO: Check if -latomic exists 
-+  #TODO: Check if -latomic exists
-   list(APPEND THIRDPARTY_LIBS atomic)
- endif()
- endif()
diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
index e35631d5477c..3ec9e9aee852 100644
--- a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+	"${FILESDIR}"/${PN}-6.17.3-libatomic.patch
 )
 
 src_configure() {
diff --git a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
index f583da0da773..cb835069c451 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+	"${FILESDIR}"/${PN}-6.17.3-libatomic.patch
 )
 
 src_configure() {