diff --git a/dev-lang/wabt/Manifest b/dev-lang/wabt/Manifest
new file mode 100644
index 0000000000..34c549d923
--- /dev/null
+++ b/dev-lang/wabt/Manifest
@@ -0,0 +1 @@
+DIST wabt-1.0.29.tar.xz 1977856 BLAKE2B 08ad2cf96ba743dd094a05f51ab86341fb0403737b35ff8f4e5d5041dfd27994af0215565085f1a1818d847f4587c93e91cebc9f63df6b401f4f295101f6d760 SHA512 fa791c29ecc4e8795d5afa6ffd8fcb0b3e39b89f4b936611e86759aafcb77b91c7b02e899d07c8e9ee871ac66e40f44579ec788e2d18a87d4f48dbf795c6c045
diff --git a/dev-lang/wabt/metadata.xml b/dev-lang/wabt/metadata.xml
new file mode 100644
index 0000000000..c698af2344
--- /dev/null
+++ b/dev-lang/wabt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-lang/wabt/wabt-1.0.29.ebuild b/dev-lang/wabt/wabt-1.0.29.ebuild
new file mode 100644
index 0000000000..18e045454d
--- /dev/null
+++ b/dev-lang/wabt/wabt-1.0.29.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="The WebAssembly Binary Toolkit"
+HOMEPAGE="https://github.com/WebAssembly/wabt"
+SRC_URI="https://github.com/WebAssembly/wabt/releases/download/${PV}/${P}.tar.xz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+BDEPEND="${PYTHON_DEPS}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Submodules kept: third_party/testsuite third_party/wasm-c-api
+	rm -r third_party/gtest third_party/ply third_party/uvwasi || die
+
+	sed -i 's;default_compiler =.*;default_compiler = os.getenv("CC", "cc");' test/run-spec-wasm2c.py || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_GTEST=ON
+		-DBUILD_LIBWASM=ON
+		-DWITH_WASI=OFF # Need to unbundle third_party/uvwasi
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/net-im/go-sendxmpp/Manifest b/net-im/go-sendxmpp/Manifest
index c768c91d8e..ef195ce09a 100644
--- a/net-im/go-sendxmpp/Manifest
+++ b/net-im/go-sendxmpp/Manifest
@@ -1,4 +1,4 @@
 DIST go-sendxmpp-0.5.1-vendor.tar.xz 1237104 BLAKE2B 76896da8365f3213518fc6fee4000216ceebbd56690ccb0234c274df2bba9387d8e4bb7c28213edb71df24efeaf94508a6c965b6891de643bc5207315dad61ac SHA512 91e97e060fc4f139e5c95281e0c32325bea4e52509de26b6cec2b43001143167af67c8661fca43cb81a527f5e6d51ea0474375fd5865518f144d3a19d4cbd0a9
 DIST go-sendxmpp-0.5.1.tar.bz2 26585 BLAKE2B 7a016b867cb5ece929fcab9aa2d828c53e1d113082ca3626637f7d8fedf14df456b01910c815dddaee66f13f3a36fa2c828873d1745af204c08e894754315c0e SHA512 470f54ef32946f22914af23b96327e30cb6f6bb4b7d76a955b8512ac818973d77babba6421b1e55a3fa80c9094734dc7ab612ff36e8bad97afc8c45814b97fa9
-DIST go-sendxmpp-0.5.2-vendor.tar.xz 1353640 BLAKE2B 6b87bf1a46f097c76767127f956d55dccb6a906d1e3fd7767ee24778a497a2c6a3d668b537c912a9707f9d325c8c98b310b4bdde741499ab78925df03c08cfb0 SHA512 6cbe286d93e9daa5b6653e7657eb1ebc5a9a71400928007c1c40505ecf8330c7b2f0cee1d1f0af55c3b93046ca36b1aa150412ca00fcf9b246212cda9c803749
-DIST go-sendxmpp-0.5.2.tar.bz2 28357 BLAKE2B 737d8c78cdb6834abdbf3b923ab694f008a35b9f2abd8156592e82a7e9e6c17930cd6d12f783a3d44b6f107743a1c70cdccb0db7498686d1fc727cea34e8b7e0 SHA512 61f7d879d530da241e4ed0697df5461bc7829017a233d8133ac4545bc48227ea60d451886ef1ae15939eda6bc6948d9aab0d7dfbc26a40ca6e13104e272bab6e
+DIST go-sendxmpp-0.5.4-vendor.tar.xz 1354536 BLAKE2B 198612de41ff68154ad9128134c7491fe6e880fa76b6dc3bea45acdc8b27e48abb5d6b89ac02dab03ed55cf2654c5c2afaa2a88d5b99720acf03244690159ecd SHA512 87fb916ae87d06bcb58964e6b0abbea3548b35a5f399d004026228273fe9ff3b94f77747ecf5bb5564f400c410041ce4079346c161bc0797ebb4185dc74116ee
+DIST go-sendxmpp-0.5.4.tar.bz2 28328 BLAKE2B fabb5ee22f5816c29efb2ab01d064024c4cd3d7dded9498e8f5d856a151723b883cb92ff65994133de220881ca18a1da77b512b2dcd140bcec4f4c47d2523b2e SHA512 270c49a48da12f4f997d83edb6cd71d752a599fef0b1604af57cca12753b890701f028ed1e9e0425ed436d0ee47f6bce00d3e0b5ac8079624dbf5224066b000c
diff --git a/net-im/go-sendxmpp/go-sendxmpp-0.5.2.ebuild b/net-im/go-sendxmpp/go-sendxmpp-0.5.4.ebuild
similarity index 100%
rename from net-im/go-sendxmpp/go-sendxmpp-0.5.2.ebuild
rename to net-im/go-sendxmpp/go-sendxmpp-0.5.4.ebuild