diff --git a/dev-libs/cglm/Manifest b/dev-libs/cglm/Manifest
index 78b0abb0ff..5549c097fa 100644
--- a/dev-libs/cglm/Manifest
+++ b/dev-libs/cglm/Manifest
@@ -1,2 +1,3 @@
 DIST cglm-0.8.3.tar.gz 246664 BLAKE2B 70e89d8926b3470c32ef847d2076fb1d8cbce0b0aa726f84c0bcf0207419b3ee7d70f1bfb40b1598827cd74c1b3482d86d0bb4cb3c77c3667ae341829580cca6 SHA512 71062814637e2523b2632980384fa58a639cdc1bbe8b647e7826fe334a53cd880bd5b29baac7d5eaff2bb009a97830c76b239e7273af46908ad7ab52cc8b8173
 DIST cglm-0.8.4.tar.gz 620905 BLAKE2B 9891172bd97c714f81ec931daa82c62d7f2a91008a44b8a49a24cd899bd15b7a5d21c2e7ae322d670336233682435f0f28eab2630891d153b8df5c562478e610 SHA512 507875119eac77cb3f60fe2353cd92b39f50605fdbf68f56d27b7062b7ec6b1cadd868f70c059ebde17adaf4a9167e5082c0151f1af5b0a5e751864a1eca1fa8
+DIST cglm-0.8.5.tar.gz 621734 BLAKE2B 7cde681529a1e43444a431793bbeb09122c636b50650489c44b98f03a01477c5192e2109e6777d5a9c4254dbe6fd91371011762c77f76011a245dbbddf24f359 SHA512 a8f6df415dc482a9b16bb7ff44aba77c32e7297b48d5e7b0fb5b2e0d92fc80cad8e436d0c83fdd7cc0836ba451137d72af2f0f823ce9698000bf257b3019b7c5
diff --git a/dev-libs/cglm/cglm-0.8.5.ebuild b/dev-libs/cglm/cglm-0.8.5.ebuild
new file mode 100644
index 0000000000..4fb50580ed
--- /dev/null
+++ b/dev-libs/cglm/cglm-0.8.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="sphinx"
+DOCS_AUTODOC=0
+DOCS_DIR="${S}/docs/source"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit python-any-r1
+inherit docs meson
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/recp/cglm.git"
+else
+	SRC_URI="https://github.com/recp/cglm/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="OpenGL Mathematics (glm) for C"
+HOMEPAGE="https://github.com/recp/cglm"
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local emesonargs=(
+		"-Dwerror=false"
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	default
+	meson_src_compile
+	docs_compile
+}
diff --git a/dev-libs/cglm/cglm-9999.ebuild b/dev-libs/cglm/cglm-9999.ebuild
index 92e9105c7c..4fb50580ed 100644
--- a/dev-libs/cglm/cglm-9999.ebuild
+++ b/dev-libs/cglm/cglm-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DOCS_BUILDER="sphinx"
 DOCS_AUTODOC=0
 DOCS_DIR="${S}/docs/source"
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-any-r1
 inherit docs meson