9 files changed, 172 insertions, 54 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2cec423139f0..5df402bdc37f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index e94901f2598f..318b9aac39b2 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,4 +1,6 @@
 AUX libjcat-0.1.11-disable_installed_tests.patch 1473 BLAKE2B 5b5705f44fcaf6f74126d4ee62c08966dc1d1816974f8fc82a57fa8f1d44ac32f0b813a669b0f638df0e5d3604864671b0a0cce47f966cce578dc0471489e794 SHA512 4bb721822d3b8965119e30f5d1b0854d5f6ec8caed04dc8fea8811fdce9847d553197ae8042ef9a39de3109a4c12564f7c3f1c56d5c0b64e7924865a58aaafa6
 DIST libjcat-0.1.14.tar.gz 70018 BLAKE2B 71329e6fc04ef37e5af215c88b4a5a03fbd65143604da57b0357d4bd07896a22a98b9028d8529234655adb37e5cefe226d09d987e798bce17b47fef1e1142d1f SHA512 837a50ad31a736a36bd9df26b151c198e18873df0e7444502b7a6e26a86df15f1df970112f2dd22658960389fdfb78a2c601274e2b5c46ec82fceef5aad778c1
+DIST libjcat-0.2.1.tar.gz 76698 BLAKE2B 62f77c993e47843dddacc9a67b9daac9bd29bef7363ce62125ecd22f9649b8a5ce2de07d74ea6900e9a45feb141caa19761bcffd337530d86a31b6ed94cab164 SHA512 e29fdaae38ade2960ffa7ac3cd41224ccab5fdb351d2ae420ffe0cf0ddb948bba37e9e040cc3046c8593be4622bf018779dfa80f173873b79582061f12c02373
 EBUILD libjcat-0.1.14.ebuild 1486 BLAKE2B 902c996330bfeb62812ef9b01a11309df4fa690aebfc669d41daa9ae3cfa13032d068ef56390d0d5e3d60a3c80bf1196366f41d85511115dbdde892cc75bced1 SHA512 9be7709a5414e20df68a24682ecccde966b0695538a791eefb54ea9cd5b37d5e716f7d1096cc7f8901e7a6514c3077e6a705d0146de807fb0c0eeee6fe643a28
-MISC metadata.xml 825 BLAKE2B 156d9e84141c87c747a23ee11241fbcc753e992e511ecd1028fb6ec904ecb1c309a1a062b18b8c6f19ab5b23107c65fc5a6c8e7f2422edf807f6e9344f5a19d5 SHA512 29b60a241062bf9d2671a648eb8d36d58f7717a098e71cbebc49f7291173c30c5de8ab1365fdf1af937d7b7ad8c401c587905de3cf2eb1f886598873fb2fde08
+EBUILD libjcat-0.2.1.ebuild 1785 BLAKE2B 91c7b2175fd6fa4016789bad96412da4ef1e7d37a624f35e192b798f54e3e1ab8eabf71c4f8e8a3ac1b9da4d0fe40ec2338d4cadd75f1ba37ff274125c12f1cc SHA512 207d4c7b5d8c6f22a89b06ca1485c1d753d0dc45f548ed44375532231cb9ad612df89827406ab4148c24c0cefee33d76050356712600c7b28b82c6bd9cebe4e5
+MISC metadata.xml 956 BLAKE2B a5bb346f711961cf3eeaaebcca7d1bf56250ba1a12ecff1e3eed0c46dd89af64e074854a2a7dd2522ce742c7e8a99a8efcf967df34077d58202126d34a9da9bd SHA512 b38e97f016e8388b1ecee2f6cdcd0040ea9893f197e74cda4298c12ce09d388c4ee726b42e3b1a807c388c9259be50fce206f7d83bf939e33d1d5d6e6ac62d8e
diff --git a/dev-libs/libjcat/libjcat-0.2.1.ebuild b/dev-libs/libjcat/libjcat-0.2.1.ebuild
new file mode 100644
index 000000000000..80d7f848471c
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.2.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files"
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+ed25519 +gpg gtk-doc +introspection +man +pkcs7 test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	ed25519? (
+		dev-libs/nettle:=
+		net-libs/gnutls:=
+	)
+	gpg? (
+		app-crypt/gpgme:=
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls:= )
+	vala? ( dev-lang/vala:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use vala && vala_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use ed25519)
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use test; then
+		# Preventing tests from being installed in the first place is a moving target,
+		# just axe them all afterwards.
+		rm -rf \
+			"${ED}"/usr/libexec/installed-tests \
+			"${ED}"/usr/share/installed-tests \
+			|| die
+	fi
+}
diff --git a/dev-libs/libjcat/metadata.xml b/dev-libs/libjcat/metadata.xml
index aa3846c8eacb..01872545896e 100644
--- a/dev-libs/libjcat/metadata.xml
+++ b/dev-libs/libjcat/metadata.xml
@@ -13,6 +13,8 @@
 		in Microsoft Windows.
 	</longdescription>
 	<use>
+		<flag name="ed25519">Enable ED25519 verification support
+			via <pkg>dev-libs/nettle</pkg> and <pkg>net-libs/gnutls</pkg></flag>
 		<flag name="gpg">Enable GPG verification support via <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg></flag>
 	</use>
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index f8ca59321cb4..4bfe324cd206 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,4 +1,6 @@
 AUX libxmlb-0.3.12-no_installed_tests.patch 744 BLAKE2B d3e2a7a3be09049ebe407966a471d3798ee88902bf7c132708c8abb7353761e1c961e9a9d47c87458c87aed1a0f9ed6c294ffebfa0cc7fcb87311e175192bfa8 SHA512 3a8394b18d41a1219c26fa841829037a10293a2682da57c43d0f2932817dd16701cffc2906c84cba2e412712f852f7df8d0230cec6d3a0fb7dfd2e43ef24e217
 DIST libxmlb-0.3.14.tar.gz 127096 BLAKE2B d99ec674385cd8dc31d92b14ac1539138b00c980ba3561fd406099a64afdf2f8b6fa2d808b5a33daafbcbc5ef87e20a02a534f860699f78bc71aa55d4b507d51 SHA512 6c77b9475ca3430270ca29e3d1c5720740c54ff55da76501495da315ea039500e64791689600aa59f3003ff54d030203616ad468169c296bf34434a68e24df50
+DIST libxmlb-0.3.17.tar.gz 131311 BLAKE2B 5f366f94fcafcb7a9ef198a119fa41f2e2b1a162149b8236e6e4cdc0eaa32f6c16a2cb37a3d4f221c150b91275436b5fab287a6c1ba6e67a89fb482a76a03eed SHA512 5b8e8b8b73aa1a99096eef612faca07e2cc7404187d74b065c1ce9e28d13462d9f770cfadec1b659bb1152c79e5f5ab3d33cf153d486d1bc2faba4bd92bf6967
 EBUILD libxmlb-0.3.14.ebuild 1339 BLAKE2B 9126fd9d0734feaa3aceb999696b05d02163e5f36d5e3f2c0e53d737b7d7fb936fcc7daee906a6e0f94391a3d0d202a05c71a88f4f5e3cc07ad6132616a2fe58 SHA512 59c9effd08b6cc2e87cb3810a154a6f20fda5a892101f4871d58bc412bd42591715124a0039c9ee4aeed4d4bc3cabc1ac7ab8981cbf7169cb0c78234acdb772f
+EBUILD libxmlb-0.3.17.ebuild 1600 BLAKE2B cf4c7a5e372e21bf33f12071de12ec487ae0d58a6eb75b268148dc5cd302193447d5058617a82ed58a27aa39d687ef8a23a4c1cba6d0efc353534b07421502d3 SHA512 6d37590e72a150ce0b17e5f897b774b1ead4a037be46f24d3b23214f7c4e64a6044b61a8e351358b4cda651389fc3590268c7a80e4147e02dce9d307f66a3577
 MISC metadata.xml 404 BLAKE2B 5a8abc0540042c1f19d535395eeaac03acc402617660e0419c89700d9142bb0fa96a9c50bb67ead640788d61a165214fa0e3ca3f6c930625f5b119190041da80 SHA512 301a232fd84aeed1efb47d886cd464f31be1148332d59654667a92df7626b2ce4405d5cbc07868c9ae68ec0ee8983a10c8783114ef9ee650d127667d3d7760a7
diff --git a/dev-libs/libxmlb/libxmlb-0.3.17.ebuild b/dev-libs/libxmlb/libxmlb-0.3.17.ebuild
new file mode 100644
index 000000000000..1d407706e7cc
--- /dev/null
+++ b/dev-libs/libxmlb/libxmlb-0.3.17.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # libxmlb.so version
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc introspection +lzma stemmer test +zstd"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	lzma? ( app-arch/xz-utils )
+	stemmer? ( dev-libs/snowball-stemmer:= )
+	zstd? ( app-arch/zstd:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-build/meson-0.47.0
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature lzma)
+		$(meson_feature zstd)
+		$(meson_use doc gtkdoc)
+		$(meson_use introspection)
+		$(meson_use stemmer)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use test; then
+		# Preventing tests from being installed in the first place is a moving target,
+		# just axe them all afterwards.
+		rm -rf \
+			"${ED}"/usr/libexec/installed-tests \
+			"${ED}"/usr/share/installed-tests \
+			|| die
+	fi
+}
diff --git a/dev-libs/sentry-native/Manifest b/dev-libs/sentry-native/Manifest
index 712ee95009b7..83a6cdc49261 100644
--- a/dev-libs/sentry-native/Manifest
+++ b/dev-libs/sentry-native/Manifest
@@ -1,9 +1,7 @@
 AUX sentry-native-0.6.5_cmake-breakpad.patch 462 BLAKE2B 867864d0c3fb519d36cd5cbd4a36d46cd862cca64343d988d43d57e04daee46afabcce711ba1031b75d2c1c825986629110e4158153c5485d3d1c3ea4f51f1c2 SHA512 d3d2d13ddf17092b76ffa25a7621c258dcc7dd3fe62c27cc2b473c32bddf96866d7f04504320c62f6c93fa0136bf42ab3bdf5e95b289d18580002df62b3abcb2
 AUX sentry-native-0.6.5_no-fuzz-test.patch 579 BLAKE2B 3aadc2b7841fd582d4f09ebd469d2897fa8d73c1f50b250a03d2d11c05a393bff4c7907bef9ebca9f6c6374676c55fc31f2817b37629793393628bdaaa83f057 SHA512 06a4bc485214ccaa1f5d95059c9ab604e1544e989d0bcbec14ee9b7cecfdb1a393fa86bec0d41d2e5b01b7d28a9f49d61eebaa7260420855140ce3bcb96b2b1d
-DIST sentry-native-0.6.5.tar.gz 325573 BLAKE2B 6308bef5cc194c3eb8f6f30d1ee894f3d7528d31604f26d6d54cfcc1545ef561346f60c9f35e80662431ad6145cf27a4adac70255b01f230551a541fd4dae709 SHA512 0c0be06f72f53277c9a34ca6514dc96ad14b4239ee92ae65e00d45a515ce13bc314982a651c476ddbb453079ea3fc3fa0bb75cc683dce046f69f0fe1d024f32e
-DIST sentry-native-0.6.6.tar.gz 325897 BLAKE2B 0613e41aa1163c9ceb6d0aff2ad5db36d84fc0c86d3ebe9993b5e1a0ed06bcb811f0f58b20c6abfa3abbc3c2a5db655908372d439ec67412f4d152d82111509c SHA512 ee39641ee3138b92e33b29d8bfbb454f61d5ab5621d71e199be8bcbbfc220a3456372e3757a820a69c5f2ad4be474216a6b816d3e1fb483479f39ebd864a09dd
 DIST sentry-native-0.6.7.tar.gz 326571 BLAKE2B 5678e406573fa1281b995cf897b556c064831a835960819760ce36e79704fdbf363b637c61adaf14446ba394e057cecbc7a940cb61a2d4c9fd97b5c2ff67647a SHA512 8c5ec1fff2f99acddac8964c415b470a8e5a53967de9fa84444d78d49ed05f592a2c5373688cf87a86ec7cb4c2fe076f9d50443b6ddb9f479713655664d330fb
-EBUILD sentry-native-0.6.5-r1.ebuild 1045 BLAKE2B 1666408d822eaa1dd8367820f9f00ac6f9f5ef8e05dfb741195f03efe63b72387d8ea445654bdeb77574971ae2dcc06ba3e40a6db074158cb577f72598e03e9d SHA512 28bafbd1840dae88aa926d4f0dabb1a17a9fe8857f34554d2e670b433ebce8b514e45f08c82837eaae8ecd8f74d1a06b4c3ddcdb4fbfa5793a6c86c2d96841ba
-EBUILD sentry-native-0.6.6.ebuild 1045 BLAKE2B 1666408d822eaa1dd8367820f9f00ac6f9f5ef8e05dfb741195f03efe63b72387d8ea445654bdeb77574971ae2dcc06ba3e40a6db074158cb577f72598e03e9d SHA512 28bafbd1840dae88aa926d4f0dabb1a17a9fe8857f34554d2e670b433ebce8b514e45f08c82837eaae8ecd8f74d1a06b4c3ddcdb4fbfa5793a6c86c2d96841ba
+DIST sentry-native-0.7.2.tar.gz 330431 BLAKE2B f6651d4397075d67cc1069205e38654ba6c98c64adee03c968f45b1ea2441b0954b90543585ae04c75457edbbc05df4ae0aec242e1570e2716bc8505a11f5a67 SHA512 4a086c87dda82a5109681d014f9d33535d43805f4149ad09609b81da001a7e9c9eb6850ea1b0c2c781072d76725a08341dde1e57be20b26a9ff72f4984f51e8a
 EBUILD sentry-native-0.6.7.ebuild 1045 BLAKE2B 1666408d822eaa1dd8367820f9f00ac6f9f5ef8e05dfb741195f03efe63b72387d8ea445654bdeb77574971ae2dcc06ba3e40a6db074158cb577f72598e03e9d SHA512 28bafbd1840dae88aa926d4f0dabb1a17a9fe8857f34554d2e670b433ebce8b514e45f08c82837eaae8ecd8f74d1a06b4c3ddcdb4fbfa5793a6c86c2d96841ba
+EBUILD sentry-native-0.7.2.ebuild 1062 BLAKE2B 2518a1e31873aac195fca046b6fba2a0219789f098c79444aa3225802808e52cee82188b150055d45cecf419fb1c9cb3b45eef659446cfbd27451ad3a0015e6b SHA512 3978f10fa03d963d5c6717dac21b6e77d3e84de2678d097abce278f24547e45d0e48f9e97f3d7e148198f8171aeb93d10bec7d387a9869f1ab47643e56427d91
 MISC metadata.xml 517 BLAKE2B 03f53fc9cc64e473f8b10fa7d37e932d887f6aea218b39dc43f52f7a87c8f36a816df3dced2390808556822fc0bc785a37133ea5824e18af6dcbbde636a83495 SHA512 846ffe6b02e007df0e694986c83c084fc71b64aec38f59976ca36d80b8b78efafb75663211eea6ec22c18a3a18cc9f26ea2fe7cf16b76119183c204055a49c17
diff --git a/dev-libs/sentry-native/sentry-native-0.6.6.ebuild b/dev-libs/sentry-native/sentry-native-0.6.6.ebuild
deleted file mode 100644
index 1e3a691a642a..000000000000
--- a/dev-libs/sentry-native/sentry-native-0.6.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Sentry SDK for C, C++ and native applications"
-HOMEPAGE="https://sentry.io/ https://github.com/getsentry/sentry-native"
-SRC_URI="https://github.com/getsentry/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+breakpad +curl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	breakpad? (
-		dev-util/breakpad
-		virtual/pkgconfig
-	)
-	curl? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.5_cmake-breakpad.patch
-	"${FILESDIR}"/${PN}-0.6.5_no-fuzz-test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSENTRY_BUILD_EXAMPLES=OFF
-		-DSENTRY_BACKEND=$(usex breakpad "breakpad" "inproc")
-		-DSENTRY_BUILD_TESTS=$(usex test)
-		-DSENTRY_TRANSPORT=$(usex curl "curl" "none")
-	)
-	# Avoid "not used by the project" warnings when USE=-breakpad
-	if use breakpad; then
-		mycmakeargs+=( -DSENTRY_BREAKPAD_SYSTEM=ON )
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/sentry-native/sentry-native-0.6.5-r1.ebuild b/dev-libs/sentry-native/sentry-native-0.7.2.ebuild
index 1e3a691a642a..debfa4792b27 100644
--- a/dev-libs/sentry-native/sentry-native-0.6.5-r1.ebuild
+++ b/dev-libs/sentry-native/sentry-native-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,12 +21,14 @@ RDEPEND="
 		dev-util/breakpad
 		virtual/pkgconfig
 	)
-	curl? ( net-misc/curl )
+	curl? (
+		net-misc/curl
+		sys-libs/zlib
+	)
 "
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.5_cmake-breakpad.patch
 	"${FILESDIR}"/${PN}-0.6.5_no-fuzz-test.patch
 )
 
@@ -36,6 +38,7 @@ src_configure() {
 		-DSENTRY_BACKEND=$(usex breakpad "breakpad" "inproc")
 		-DSENTRY_BUILD_TESTS=$(usex test)
 		-DSENTRY_TRANSPORT=$(usex curl "curl" "none")
+		-DSENTRY_TRANSPORT_COMPRESSION=$(usex curl)
 	)
 	# Avoid "not used by the project" warnings when USE=-breakpad
 	if use breakpad; then