diff --git a/dev-util/xmake/Manifest b/dev-util/xmake/Manifest
index 95ed0fd4cf..4b27185959 100644
--- a/dev-util/xmake/Manifest
+++ b/dev-util/xmake/Manifest
@@ -1 +1,2 @@
 DIST xmake-v2.8.6.tar.gz 2792484 BLAKE2B eee06090c260576cff3fca50998f0e912a41786eb65e1a67119194e0eb20956795eeff092dfa59d92989ad9fe8fc190eb6ce2a35653c54582652a3cb2e1202bd SHA512 86808a38dc6e28a44b64f9598b26eadb8d6314dc2ff14929eb7cbcd0c01172240dd8475e1e88f874abff651436536c7391ad2294fd57b261529dd4560b8c563b
+DIST xmake-v2.8.8.tar.gz 2810801 BLAKE2B 79a877ebfbd99e034a5bb5767c1522304261024d96338671215dba0fd368737eca0603051c521859276ab811465e6c54548bb02582e5aea9d7c44387846701ec SHA512 538b33cb54a7aefc52edff1cc77144ba3d3b273f11d3b8cfa1cfac744b868467ff3ad0dc3bc39046648819b73badb7e8c9eb485d98cccf81da048a74470831a0
diff --git a/dev-util/xmake/xmake-2.8.8.ebuild b/dev-util/xmake/xmake-2.8.8.ebuild
new file mode 100644
index 0000000000..25ed5aa18d
--- /dev/null
+++ b/dev-util/xmake/xmake-2.8.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature shell-completion
+
+DESCRIPTION="A cross-platform build utility based on Lua"
+HOMEPAGE="https://xmake.io"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xmake-io/${PN}.git"
+else
+	SRC_URI="https://github.com/xmake-io/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# tarball doesn't provide tests
+RESTRICT="test"
+
+DEPEND="
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+DOCS=(
+	CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md
+	NOTICE.md README.md README_zh.md
+)
+
+src_prepare() {
+	default
+
+	# Don't strip binaries
+	sed -i 's/"-s"/""/' configure || die
+}
+
+src_configure() {
+	econf --prefix="${EPREFIX}"/usr \
+		--plat=linux
+		# --plat=linux is necessary, which enables correct directory:
+		# build/linux/ARCH other than build/ARCH/ARCH
+}
+
+src_install() {
+	default
+
+	doman scripts/man/*
+
+	newbashcomp xmake/scripts/completions/register-completions.bash xmake
+	bashcomp_alias xmake xrepo
+	newzshcomp xmake/scripts/completions/register-completions.zsh _xmake
+	newfishcomp xmake/scripts/completions/register-completions.fish xmake.fish
+}
+
+pkg_postinst() {
+	optfeature "cached compilation for your xmake projects" dev-util/ccache
+}
diff --git a/dev-util/xmake/xmake-9999.ebuild b/dev-util/xmake/xmake-9999.ebuild
index 6c3a300383..25ed5aa18d 100644
--- a/dev-util/xmake/xmake-9999.ebuild
+++ b/dev-util/xmake/xmake-9999.ebuild
@@ -16,10 +16,10 @@ else
 	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
-# tarball doesn't provide tests
-RESTRICT="test"
 LICENSE="Apache-2.0"
 SLOT="0"
+# tarball doesn't provide tests
+RESTRICT="test"
 
 DEPEND="
 	sys-libs/ncurses:=