8 files changed, 50 insertions, 120 deletions
diff --git a/dev-cpp/cpp-utilities/Manifest b/dev-cpp/cpp-utilities/Manifest
index d62ed5cbf2e6..5ad20036e8db 100644
--- a/dev-cpp/cpp-utilities/Manifest
+++ b/dev-cpp/cpp-utilities/Manifest
@@ -1 +1,2 @@
 DIST cpp-utilities-5.31.0.tar.gz 213089 BLAKE2B 3b35ed559ae8e15ec9a92719bdbdb0affb6d7b4bd01b9558042f51e2e5dce757fb819d08ae5ae7b38783a6461c08da249c9bc0daecd393da84d8a598f6df380e SHA512 1d1b294e9df060fa2332f877378d8865e8f84467901783f0e3839ae37578426c71a00ebcd42b9b628e38c46dbb20a99f04d9c3304a8f0cb627264a479a9b22e7
+DIST cpp-utilities-5.31.1.tar.gz 214034 BLAKE2B 6343d53fdae2580a8262e7cd9d4748897a3fe6e64b944374d7294e98d91c31532b02f84bc20d68531eed984d074169644091f7ef5d873b5379539b4b810f29e1 SHA512 3de5cb5d959eca225024ce02f194eb4c226ad756a4f56cd2a53df1505e662aa72347d512d8b1126c57f741867f2d0fc0e77a7f32d31de23eed9c0fa189ca9d02
diff --git a/dev-cpp/cpp-utilities/cpp-utilities-5.31.1.ebuild b/dev-cpp/cpp-utilities/cpp-utilities-5.31.1.ebuild
new file mode 100644
index 000000000000..a3cbfbfd427d
--- /dev/null
+++ b/dev-cpp/cpp-utilities/cpp-utilities-5.31.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Useful C++ classes and routines"
+HOMEPAGE="https://github.com/Martchus/cpp-utilities"
+
+SRC_URI="https://github.com/Martchus/cpp-utilities/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DEXCLUDE_TESTS_FROM_ALL=$(usex !test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/cpptrace/Manifest b/dev-cpp/cpptrace/Manifest
index 84649464c90e..cf5fb9c234f6 100644
--- a/dev-cpp/cpptrace/Manifest
+++ b/dev-cpp/cpptrace/Manifest
@@ -1,3 +1 @@
-DIST cpptrace-1.0.2.tar.gz 492768 BLAKE2B 0832e723fff00be4a5ad9b518bdeedd590895e1915808f6fe3d57b6e3c842df39d1b4631da689bea0937a45b1904246f8e376a958dd5a3d3803b97244be36aed SHA512 4ae394fb3c21149bf2441a754eebe639e6a5534927426b6507806c7bee0b1c982e047c972904d472f1c660adb5be3881e7e3a6eddd18e4e9d376ae3855d50a7c
-DIST cpptrace-1.0.3.tar.gz 493306 BLAKE2B 76140fd42829c9626f3469a4bd2f3b746a426947bc8b58e63819f4ebde21ca8149e6204a441d5fe7ef6ac5e6b95767e8263b25ed5d192762a899676e3adf6cb9 SHA512 db1f365478a315d7e69bdadae9a15232fce43eca1b25b3cdafb5757524533781acfa4ab38a1bb933e2396afe898fbba1db3ca8ba3cf531ead6def1993b652465
 DIST cpptrace-1.0.4.tar.gz 494169 BLAKE2B 297bd5680527c01c43c5cbc17efd6dc1e898eb9f708dbc7b8ee714a7dd42283652cca45c66d293f83fdd0c87a1ba743ee1482c077a2804f88b7566e53b3d998e SHA512 e88edddbcdd423d49ed3adb02cf70580ee3a56065db4d81ca69d3f9f6d9b64ac27734842ca3b6d8ff45a548c25900a88f979e39d777af422a153e586d26ac5b5
diff --git a/dev-cpp/cpptrace/cpptrace-1.0.2.ebuild b/dev-cpp/cpptrace/cpptrace-1.0.2.ebuild
deleted file mode 100644
index 6f16e12cb49a..000000000000
--- a/dev-cpp/cpptrace/cpptrace-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Simple, portable, and self-contained stacktrace library for C++"
-HOMEPAGE="https://github.com/jeremy-rifkin/cpptrace"
-SRC_URI="https://github.com/jeremy-rifkin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libdwarf
-	test? ( dev-cpp/gtest )"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="unittest"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On
-		-DCPPTRACE_USE_EXTERNAL_GTEST=On
-		-DCPPTRACE_BUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpptrace/cpptrace-1.0.3.ebuild b/dev-cpp/cpptrace/cpptrace-1.0.3.ebuild
deleted file mode 100644
index 6f16e12cb49a..000000000000
--- a/dev-cpp/cpptrace/cpptrace-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Simple, portable, and self-contained stacktrace library for C++"
-HOMEPAGE="https://github.com/jeremy-rifkin/cpptrace"
-SRC_URI="https://github.com/jeremy-rifkin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libdwarf
-	test? ( dev-cpp/gtest )"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="unittest"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On
-		-DCPPTRACE_USE_EXTERNAL_GTEST=On
-		-DCPPTRACE_BUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpptrace/cpptrace-1.0.4.ebuild b/dev-cpp/cpptrace/cpptrace-1.0.4.ebuild
index 6f16e12cb49a..a3395ccf3a1c 100644
--- a/dev-cpp/cpptrace/cpptrace-1.0.4.ebuild
+++ b/dev-cpp/cpptrace/cpptrace-1.0.4.ebuild
@@ -1,32 +1,43 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake
 
-DESCRIPTION="Simple, portable, and self-contained stacktrace library for C++"
+DESCRIPTION="Simple, portable, and self-contained stacktrace library for C++11 and newer"
 HOMEPAGE="https://github.com/jeremy-rifkin/cpptrace"
 SRC_URI="https://github.com/jeremy-rifkin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="dev-libs/libdwarf
-	test? ( dev-cpp/gtest )"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	app-arch/zstd:=
+	dev-libs/libdwarf:=
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	default
 
-QA_FLAGS_IGNORED="unittest"
+	# Unused CMake files with compatibility issues.
+	rm -v test/*/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
-		-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On
-		-DCPPTRACE_USE_EXTERNAL_GTEST=On
 		-DCPPTRACE_BUILD_TESTING=$(usex test)
+		-DCPPTRACE_USE_EXTERNAL_GTEST=yes
+		-DCPPTRACE_USE_EXTERNAL_LIBDWARF=yes
+		-DCPPTRACE_USE_EXTERNAL_ZSTD=yes
 	)
-
 	cmake_src_configure
 }
diff --git a/dev-cpp/cpptrace/cpptrace-9999.ebuild b/dev-cpp/cpptrace/cpptrace-9999.ebuild
deleted file mode 100644
index 7c1760e24e62..000000000000
--- a/dev-cpp/cpptrace/cpptrace-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Simple, portable, and self-contained stacktrace library for C++"
-HOMEPAGE="https://github.com/jeremy-rifkin/cpptrace"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH=dev
-	EGIT_REPO_URI="https://github.com/jeremy-rifkin/${PN}"
-else
-	SRC_URI="https://github.com/jeremy-rifkin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libdwarf
-	test? ( dev-cpp/gtest )"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="unittest"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On
-		-DCPPTRACE_USE_EXTERNAL_GTEST=On
-		-DCPPTRACE_BUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpptrace/metadata.xml b/dev-cpp/cpptrace/metadata.xml
index 56988650ec34..1b8db8b4c1d6 100644
--- a/dev-cpp/cpptrace/metadata.xml
+++ b/dev-cpp/cpptrace/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>davidroman96@gmail.com</email>
-  <name>David Roman</name>
+ <maintainer type="project">
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
  </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file