gentoo auto-resync : 21:10:2024 - 04:04:33

12 files changed, 181 insertions, 130 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 323433604bb5..ba510eb0703a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 68c671f61d29..44cdf17a0f28 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -4,5 +4,6 @@ DIST jsoncpp-1.9.6.tar.gz 212682 BLAKE2B efa5dea68ddc175391200077666204f7ec66cd1
 EBUILD jsoncpp-1.9.5-r1.ebuild 1224 BLAKE2B ec92cfb2bddd3682e93ff592e3822a1cbf8620d25267e906b7829d735f399b76aa71a146b161b67b9821438a975060ccc7d2b12bada47c2ae415e218641d7e30 SHA512 590e8e7049d704c11af84773e7f0efa09d335228ea65bef85a1ac838af30b219fc149fefc36d6058fcc826a6c060152ac38cea46d4a7fca30ac967846aa4a09e
 EBUILD jsoncpp-1.9.5.ebuild 1187 BLAKE2B ee28a0bac674e2df4b78a76c38dfcdc81b49fb13d6381556e24dd3760954598d92b7b0585ca528dfdb6828cbaf282c32a5f94b953aedeeaef196560724a523a8 SHA512 11ebe8f21df756c03d5eafdba0bcd30ae57a6ab1b7b899230feee82c825cc14910792d72fb3646f0c7a243b2515411884a7f28cd3c5e7305981a9849e82e9d00
 EBUILD jsoncpp-1.9.6-r1.ebuild 1336 BLAKE2B 471d77b49966bea4b94a5718d357cdcdbac9917d74a5c5ffd906e6963fb588ec25f45d8a8e17264df50f75a41b0d143db610336bb8d9f0b520a9497149e55956 SHA512 62ec1471e8f86ac8ac85e17482e16b53626f7586925d770653dbb2b405a6ae172b561feb8118a4e99da6f1063b47a709ce1c4483b0d2fc9c071c4da3cfc0c925
+EBUILD jsoncpp-1.9.6-r2.ebuild 1349 BLAKE2B 5985ca63a4ffe4e8164a1a30ba380d24e3748fe219c79a9344cc9637cb424ad6ae65fe87775b6d89b5f89d600d0908044f979204111f1d6ccf90a1b234293977 SHA512 b7b77bcc29812192c99deee1dec1198d1527cb1106fe9eb90d4e9ed35871b1ad99b3c8545bec664465237ef68aca19bf3aa6734a4e85a1ff6772420f5233d3a6
 EBUILD jsoncpp-1.9.6.ebuild 1224 BLAKE2B 2d7c4d725aae32488fe77f25ee7cc1aa554425c47773e85d38829ee52e65cbf0529983e321407c47e09d9d44352cc4d9d2e52f2b1f6b4b62977e259a08f5b35c SHA512 f40cb7817f02d9304b137a4635dcc3f89d564c0ba0b711b51dbf24d78020e7661a928c3b505e29c8a0313c093f547908e1a638ad0853fde4ad093c7c7cb3515f
 MISC metadata.xml 473 BLAKE2B cee9ea6f824489bf51f6c293faff24e62bb8c3457d49638b9547d104bfbed8b5c566e429b4d597dfa9b556955450c758261231ce83ea28216c1386a2d645176b SHA512 f7e2f0a82c5370802072e94a727bcb19d138979ab46670f01bdb17ed19b59f8e79bd28d37a8d939917f108fd4a64f53f67153ceaa9dad393840e9eb0247538e1
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild
new file mode 100644
index 000000000000..6f037fec5a29
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson-multilib python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
+SRC_URI="
+	https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/26"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-text/doxygen )
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		--includedir include/jsoncpp
+		-Dtests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson-multilib_src_compile
+
+	if use doc; then
+		echo "${PV}" > version || die
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
+
+multilib_src_test() {
+	# increase test timeout due to failures on slower hardware
+	meson_src_test -t 2
+}
+
+multilib_src_install() {
+	meson_install
+	# https://bugs.gentoo.org/941642
+	rm -r "${ED}/usr/$(get_libdir)/cmake" || die
+}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index c3d70f045f2c..6975d075fc6d 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -6,19 +6,14 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.1.src.tar.xz 141244648 BLAKE2B 7c9250f99c8e5ae2097e89269ebf5bfdfb0fba8f67ab934377d24030c985013fe5475d0c9bd6d60a679e169772ad1723bc6e44ff9e4c7aed5627b9f1f1a2477a SHA512 84adab40ffb9ec236dbf203d86c08a0c2c651f98278a9d0936490c7901159eb26eabd3db9316013886b549426d4acb43b75d866f7dc670ab299bf93ba35b1891
-DIST llvm-project-19.1.1.src.tar.xz.sig 438 BLAKE2B 6967194abf6939291abc716f862a46ea7c5e195b98eebc26928a57dbd5034f82a8ecb5b7cc1b7c2428168309308b19df1c7db828703e80d3f7bf578e3542874d SHA512 07bb7bffb2b035417d702ca47be9d5759250f1a2cd57606855027d458ceb972a293b45d3d93bcda195588986acbb5eace60524f4aecdc0da7aeb3a8414c37c31
 DIST llvm-project-19.1.2.src.tar.xz 141241032 BLAKE2B 38a3f528ddae7cd738236a317551fdb94acd8fb736a57def15b75e1ed2f6572e1370fb3f1e4ff261d3cfb87df7d50d4db8fa9e70dc5e3dde617af09eb059fdd3 SHA512 e98ee405f5c30004b39f0de0470400dd2965adf4cda4b47a1d3792ae362ed43eb45e96a9b1689f31e1064e0b39252379270bd95bf8081cf9b92ecb9b371bf43b
 DIST llvm-project-19.1.2.src.tar.xz.sig 438 BLAKE2B f5bc0cc43bc10ee2438289d62aa8169cbb9e0ea598381b4c744e6a09daf710650fbec0656a9ac7c0e6f84a0ff3541fe223fa9efc61fb3d4c496cad9df7b9edd4 SHA512 307cd88116e68f901229fc2f6db72bad5f964bacee178e2efad3419cec277b5a7e23fb347386fb4e83e1886551bbc78d187259518193cac7654573ee17e3cb63
 DIST llvm-project-9aef0fd52a0b2bf31cf3bae8a0693d6df8db6e04.tar.gz 219987707 BLAKE2B a3f0acd0fd3b66c3a826ac6760653fa6ea893ffba7587cf4a14f472026a9d9d8bf6b63c26d8bc39e83936afe6b735496bd88ce6c00d16abe1d0ccd1f9a644302 SHA512 5104669d78930363afeba045dc27a4c36ca8bb7537d432c765e023cbd91155b248c3a60d4768e1f8690c88e82d4ff95a44fb73f26d25d6646dddc857992485ba
-DIST llvm-project-fb2960aad93f6c02e0ea8de0568c0aef8896eee8.tar.gz 219704020 BLAKE2B 91f7226d7c6dcfa82c6b892ec0a80b47b5abd435c39996d8a6e0611355d434a86eb42bd5dce849dcc9a2f0ed2ae9844e5672f45283984ad10c7c12c62c82d47b SHA512 f0b56a4ab532aaf4bb841aac4e2faf63f213f3cd71d24555b46805406502805e6cc46cb0aae0fbf5f49ddec99da801ab8e54410a9bd8a7bcb0e9fb13619c30bf
 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1
 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80
 EBUILD libclc-17.0.6.ebuild 1749 BLAKE2B 0b083103fc48654357f621bd3c40002fe9030598a4873519b186b601cd75cc1555a3930f26fe884c1970ddf5728c9a7dffc08e97ebdb151e55b80b204d327a4e SHA512 2509e6ff63a86ba1ceef095fab34b49642b7e6866111c289c124bb7ef9d4bad8f07c4927b45994555386536975c8a4c56401860dca25f2ef2014d9153abb4c8f
 EBUILD libclc-18.1.8.ebuild 1302 BLAKE2B f5c4d9d86b2150a602626d7785bae098edf6ff7dce1a07501bbb5b721959827f446d7e468a85be08eb8a6935ebd59264c582d5ab04321f60d0a0bd19da2653e6 SHA512 840ec8e282d4eaac97039f32eae8b05c03fd95128a4d800f190a9b57e154a73fd2c4eeec8c58e7c892684f24b35d1da5c2b52303ec19559b19d7bd75eebf5c1c
-EBUILD libclc-19.1.1.ebuild 1305 BLAKE2B 1fbb9db126a81d0cea598e600f7d29fd6a717fed77b09d10a475930e59717f36368588db190e1d56f33c81e7e4336b58725e9da910ef4c51c5f39a7d34bc0a90 SHA512 a90b45f9d8a039781f4d740dc8f6c3bc55187d97e59a97121101a7456a152cc287990207b1b3e690f1009cff65becb12348a0b2d36a33a981a72ad63cf64a217
 EBUILD libclc-19.1.2.ebuild 1305 BLAKE2B 1fbb9db126a81d0cea598e600f7d29fd6a717fed77b09d10a475930e59717f36368588db190e1d56f33c81e7e4336b58725e9da910ef4c51c5f39a7d34bc0a90 SHA512 a90b45f9d8a039781f4d740dc8f6c3bc55187d97e59a97121101a7456a152cc287990207b1b3e690f1009cff65becb12348a0b2d36a33a981a72ad63cf64a217
 EBUILD libclc-20.0.0.9999.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
-EBUILD libclc-20.0.0_pre20241009.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
 EBUILD libclc-20.0.0_pre20241015.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-19.1.1.ebuild b/dev-libs/libclc/libclc-19.1.1.ebuild
deleted file mode 100644
index 369d04fb2877..000000000000
--- a/dev-libs/libclc/libclc-19.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-20.0.0_pre20241009.ebuild b/dev-libs/libclc/libclc-20.0.0_pre20241009.ebuild
deleted file mode 100644
index 2b8c5e63c257..000000000000
--- a/dev-libs/libclc/libclc-20.0.0_pre20241009.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index ef9ddeeb98ac..0e9abf8a33b6 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,7 @@
 DIST libgit2-1.7.2.tar.gz 7548186 BLAKE2B c27870124c7e63a37794014a802a6fce46c577313f3b6081580f920fa842a65305b5bc56aa6ab02cf87c533d6052afdc37317f96aa1fd67387b07f52415ccbe3 SHA512 825737e4a1991fba50ea535f15b0e560ebe76ead752e04aeba36925b944d0da77fe9826a70980a1aa3d0bf9afbedfab79dd92e799c9252931384c89ebec9b012
 DIST libgit2-1.8.1.tar.gz 7608949 BLAKE2B 14558400d092dd963becfd3d4966a8d0799811be15fea8c5bc1e91be24f14bb81d33d82b2fb8dd8895e167f634a5d532d62a4609167bcb1d93143275207bbf6d SHA512 7429fbdc46ae44fd359e9260cbe33d9ce9276db810c096f12c43e5d302d01011463cdfd98d604e59780187e020e216e839823a77479dc12f952a37628516af78
+DIST libgit2-1.8.2.tar.gz 7610104 BLAKE2B 5e6c68cd1b364b435130059ee12bcb889db5b00af00dc5e3b62e8b302cf3a81fa351568a5f094bc99041877a3272c98bd65999d6e81cc02ff1a31e0d07ea17ff SHA512 568daa01b254acd07624143c1fd949b131f174a0595e4c6031b1eee38afd59ec3917ffc5ade3310d2a17f22bf5062bc6d03603cb952b25cdefd6c1cec9b8033c
 EBUILD libgit2-1.7.2.ebuild 1649 BLAKE2B 0eae55b662f2f6bf26d51032e67da956b43aa32411ed9ef6fda13bff21f259218625df41482fb52057382280e8f70e4ef93b225db00319b27f0d825ad96cde1d SHA512 8badba9710a974eada587d36a16939e0027bcb6d05435ae1d5fa4336c0955e0c721e39ac0bc40b5e798237535f1446c1c13f272f81ec5b973696a3a3f85efd2a
 EBUILD libgit2-1.8.1.ebuild 1575 BLAKE2B ee289fb92268a9fa7267626df4651552cbb8d0487610aa292cbba5de8afcb54a16f6b68ff4ea2a8c4dc070fea29691359d54fc45e5243bc5c24f1584ddaff420 SHA512 dc7fe7e6dd8844acc2846f4adf55642949fe62c2c7897239a4764ad2284c60bdb14a10c1d87ab1aff615e064755297aa61b1e18ba9c6014a7a784353fd2c8f71
+EBUILD libgit2-1.8.2.ebuild 1582 BLAKE2B 1fe21bf4fefc38f35a3fea69df8bc58852a0164a7d84d7af88b214e042c8d74194e00b9318908b9cf83f59bb19388b6dc5939329b31e2966cb2be4a49cde56e2 SHA512 1863253ed71c8de992db29b203caec74b2f2fdd9d3cb19eaebab6d4201cebec026c4e0437d8d5131bd31b9ba7471c7fdbee8565d61db1f8a33f420d906b35372
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.8.2.ebuild b/dev-libs/libgit2/libgit2-1.8.2.ebuild
new file mode 100644
index 000000000000..106961169ea9
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.8.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre2
+	)
+	# https://bugs.gentoo.org/925207
+	append-lfs-flags
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
index 1eb3e32b03d6..c30893aa115a 100644
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1,7 +1,9 @@
 AUX olm-3.2.15-cmake.patch 1585 BLAKE2B 4de4f3e6e29792fc697f40dbc303ad630222491a4692a05a953b1db7518ae22a557acdc570e3f0bd3dc080bc46aae128ec380963ee5274506e446f678f26472b SHA512 025fd3dbc26d59d3b5db1ac3a77e72dee396acdf1b3c2ee2d3746a6b1e2cf2c6965083707d3fc7df88a6f0c62729601f5df7e262998c806d98d2159fd6dbbfb2
+AUX olm-3.2.16-clang-19-const.patch 501 BLAKE2B a0deafe652091a5600cb046f8bf4dd7a2431dace5779f4ede25f46b93e6db9b54ea4c189d6e7f531775b4e472fe5c31efc625a3c75d43639a3193c505d7ccdd5 SHA512 179ada66d4e2024f30aff1255b6da432c747c0bc743b01e6393fc67f3d18512c3dc1b9857c52f8571dc27288429b9b70420a783ea99cff5317a0e67c97ac3d2c
 AUX olm-3.2.16-cmake.patch 1573 BLAKE2B e7667c692b017060b20f86e69d3e37ddda7bd6642e60fcb7570b58ce4a4523fec5234635431b17ec0e01650d8935aefec3082433992c4928c92fc22b7f2f1b5f SHA512 a191e607f4c6d48a4692f20e2efd09ec1c4e10156bb60a23f859483d46d2ccd0074b210c80ce4543f22e76eeb4799b8e640706010c5ad1b26549dd310ddb0b46
 DIST olm-3.2.15.tar.bz2 2744760 BLAKE2B 44486a63217998010a0bb7e01ff3315c88e139d686b97158e67af29b2f052912412541fb944a17c5d8931df9c641a73e521ef8d0ff352b80fe30bd6fb73b2e7b SHA512 81832766e477fc17908e8d1c49b5403d87b5977fd9102605d95ef2a3907619b7301e32fe0e18ec0f575b1f004ce248633307ff43b0f48bc9bb2313cdfefd6ea7
 DIST olm-3.2.16.tar.bz2 2744360 BLAKE2B 236cd08cb4f014ef4f90377fe30907490dbf6482629ab47a779114c711de1855c44874a45ee92f4f55d7c100abbbde2c427996ce534dd95ce401a7549db351b7 SHA512 504ddc91297e7aef99e9b25f73b33bac29716ca33eb333bf1217b719d8862438e2cdaadd88cef3dc84e9f618bcc9eeeaf7e513f2d6909cc4a3d98a5dd79b0581
 EBUILD olm-3.2.15.ebuild 604 BLAKE2B b3c34c37603490ef1f603d6207fd7edc801c6a42b43ec06f6e48a22690351a657f874c98045ac53b21cbce861a1cb169e9d7e636693a83bf4119dec938005fb3 SHA512 359c1abc4b29c5e14b76044650655ee730d6865ffcaa588082f0b31c3c22d883d79849d185416a144cd450f1924bf5ec65d4bc5ac14c7e39d3a36404cee24365
+EBUILD olm-3.2.16-r1.ebuild 649 BLAKE2B fa77431197c9ff4cc986b23d277e886b5041fe4dba2389d3db5d4297d8f4f1dce1bf8088e888eda7ff9498892041df62da4176e4317ab73a3b280d68e490b04f SHA512 2a69e314b58d84dda0cdff1aa9980e5b0905cde66c69edf375f9bc460ae9b651830d2d719c15b218d693b3be9e0c293ffd5bfd2fad0851c6f993a4f64214d4a1
 EBUILD olm-3.2.16.ebuild 604 BLAKE2B e5904cddaf06bd6f8b77f54e29dbafd7767d1620700c1a05016e15c412867049b32b8c752abddd663e71827d02f400912be0421861f71f2dbe510430ad1ee5a4 SHA512 f1b66e4f7cd86a6034f6ffd04fb9d384aba5f49089adf0cdc9b673aa02ecabce99b8beab4ac4a9d7f307ff5b9d5bd164f2478dadfe465b4ee10abbedbdf760be
-MISC metadata.xml 703 BLAKE2B e15af6cc88087ba2f7ed109a13e31908ab529ad52755403b4272170e7d8a89330539f1b735b03624ec3b45a2ef5d5c4f37ebc1d6f279ed49f852edfa2ae1f2ae SHA512 81c2896d8a489001e0ceffc99e97d20da679aba2fe83f2bea94cc7ddcaa3c09a52bf0c2266d53440fc6cbcecaf607a2b89193f8aa76ec6d50746cb3ab6ced7cb
+MISC metadata.xml 703 BLAKE2B da390f27931e3c95933b24227537294bd33def6b6736b87a6c1accaaa87d354496653ea9dbc08ec17566c99233c89a30a26c6696bd97f8c8e2613ee320705599 SHA512 01845e6fb0f46e1caf04a0bd6025ae339bdbf8bfdb750ded1031917c87f0b8cf220403f49bbfceffd08479bad2ceb1e26b2c81ecbee7d7ab75b35d2195f064be
diff --git a/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch b/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch
new file mode 100644
index 000000000000..688e3290fb37
--- /dev/null
+++ b/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch
@@ -0,0 +1,17 @@
+Fixes compilation on Clang 19.
+Patch by Marco Rebhan <me@dblsaiko.net>
+Fixes https://bugs.gentoo.org/940764
+
+Signed-off-by: Gavin D. Howard <gavin@gavinhoward.com>
+
+--- a/include/olm/list.hh
++++ b/include/olm/list.hh
+@@ -99,7 +99,7 @@ public:
+             return *this;
+         }
+         T * this_pos = _data;
+-        T * const other_pos = other._data;
++        T const * other_pos = other._data;
+         while (other_pos != other._end) {
+             *this_pos = *other;
+             ++this_pos;
diff --git a/dev-libs/olm/metadata.xml b/dev-libs/olm/metadata.xml
index e47db7bbc780..c2404edb3336 100644
--- a/dev-libs/olm/metadata.xml
+++ b/dev-libs/olm/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://gitlab.matrix.org/matrix-org/olm</bugs-to>
-		<remote-id type="gitlab">matrix-org/olm</remote-id>
+		<remote-id type="github">matrix-org/olm</remote-id>
 	</upstream>
 	<longdescription lang="en">
 		Official, audited implementation of the olm and megolm cryptographic
diff --git a/dev-libs/olm/olm-3.2.16-r1.ebuild b/dev-libs/olm/olm-3.2.16-r1.ebuild
new file mode 100644
index 000000000000..7a54cba592ae
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.16-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the Double Ratchet cryptographic ratchet in C++"
+HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
+SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch" # TODO: upstream
+	"${FILESDIR}/${P}-clang-19-const.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}