6 files changed, 77 insertions, 6 deletions
diff --git a/dev-cpp/cppdap/Manifest b/dev-cpp/cppdap/Manifest
index 7d1fa79cedcd..a52c87c660b9 100644
--- a/dev-cpp/cppdap/Manifest
+++ b/dev-cpp/cppdap/Manifest
@@ -1,2 +1,3 @@
 DIST cppdap-0_pre20230605.tar.gz 100715 BLAKE2B a7b6f745b7445242544deb2cd5b93bb13ee0faefe083a5e435d9a608fb453aceef1746738beb35678833f69521e637f2b8ca47fccd3e292a56e8a74c6435df86 SHA512 034f6282e992ec346715f84da1817a699937be174ab0ea09f750a693bed158b87ec6920e0ed1f7340ef5232e9634c5aebccd78527adde34b8abc4ff00c5f617e
+DIST cppdap-0_pre20240802.tar.gz 101733 BLAKE2B 18302d37493ab38b579b0a00756e18efbaa1620e705e2bb54b24ccb3388837ea8aed28c880b358b670006f84ccb7df036125d1c2f7bb210ba51fa0caebef0759 SHA512 2432c2b413d956661342555a50ab2ed4cdf86de5e7bbda0822a2e7359ad034a0b0150bb6b98dff0d1a3d64e89cd8de67a7a620dd4c9e220a7ed1f9f80e5a36e6
 DIST cppdap-gtest-0a03480824b4fc7883255dbd2fd8940c9f81e22e.tar.gz 874709 BLAKE2B 706e6d168e080494ac63cf607c189f55f5e98100fd744dd184a8217173f66891aedb8779a9c8b0aa289889d1f73e18c50ef65d8c70228e2a795a5e5081f66894 SHA512 55867a2e39647a7846506446d642dcd740711dee8c0dfe25887fd6ad361161617f3d462bdb415dfba20693849949c022e97e2de65dd731cc63b9466edd1c8b87
diff --git a/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
new file mode 100644
index 000000000000..a590a1f1bc61
--- /dev/null
+++ b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# See https://github.com/google/cppdap/issues/113 re no release
+CPPDAP_COMMIT="c69444ed76f7468b232ac4f989cb8f2bdc100185"
+
+DESCRIPTION="C++ library for the Debug Adapter Protocol"
+HOMEPAGE="https://github.com/google/cppdap"
+SRC_URI="https://github.com/google/cppdap/archive/${CPPDAP_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${CPPDAP_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-cpp/nlohmann_json"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		# Per README, could use rapidjson or jsoncpp instead.
+		-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON
+		-DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=OFF
+		-DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=OFF
+
+		-DCPPDAP_BUILD_TESTS=$(usex test)
+		-DCPPDAP_USE_EXTERNAL_GTEST_PACKAGE=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./cppdap-unittests || die
+}
diff --git a/dev-cpp/magic_enum/Manifest b/dev-cpp/magic_enum/Manifest
index 8e0a5a0188ca..44ea6643f9fa 100644
--- a/dev-cpp/magic_enum/Manifest
+++ b/dev-cpp/magic_enum/Manifest
@@ -1,2 +1,2 @@
-DIST magic_enum-0.8.2.tar.gz 171915 BLAKE2B e8915aa7cafa9407d5d4ab3b6837fafde6b1cb75877c8b56f82568e6291ca317720950947b2dfc7e12ca459279ba4e809a8c5782fc04adc2d7636eddcb80122d SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a
 DIST magic_enum-0.9.5.tar.gz 198269 BLAKE2B c3c6bbf6c5d366813dac7df5fbfc48f414cf4235d842ef3a5a2fd8f2c2857e55243b7fbf7000d598e778fc8d2d54c7d6e34f8a97fa2eaf510572bf53f17500a6 SHA512 f1b412d15e0ef624b4588adba00a18ed12eeb1f0dabc021d53a7c047b8976ecb07701b76040f47c77c75e00151619dbce1f9a75f471db04340156a39044768f3
+DIST magic_enum-0.9.6.tar.gz 199883 BLAKE2B 32909c5ea0cff32b14fb4fd5507f1f99cd45f572d56fd14f76aea3ca3c1fa16d08573568a7c7f9a3efbc9396450b2e897aa64de414b34a4c19b6c49f63aed506 SHA512 6154c816446e115f3b164df79ab8d8088eb76b632ee3fdc82ea17cc7ae8d04652c83e5cc587c2c4b334889904b101ba08a04c5837103af260768e93df17cc263
diff --git a/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch b/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch
new file mode 100644
index 000000000000..581df69ff82b
--- /dev/null
+++ b/dev-cpp/magic_enum/files/magic_enum-0.9.6-werror.patch
@@ -0,0 +1,22 @@
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -12,7 +12,7 @@
+     check_cxx_compiler_flag(/std:c++latest HAS_CPPLATEST_FLAG)
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+     set(CMAKE_VERBOSE_MAKEFILE ON)
+-    set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror)
++    set(OPTIONS -Wall -Wextra)
+ 
+     check_cxx_compiler_flag(-std=c++20 HAS_CPP20_FLAG)
+     check_cxx_compiler_flag(-std=c++23 HAS_CPP23_FLAG)
+--- a/example/CMakeLists.txt
++++ b/example/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+-    set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror)
++    set(OPTIONS -Wall -Wextra)
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+     set(OPTIONS /W4 /WX)
+     if(HAS_PERMISSIVE_FLAG)
diff --git a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
index 4b3b1362dd0a..5a4a0dda0b76 100644
--- a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild
+++ b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,10 +13,13 @@ SRC_URI="https://github.com/Neargye/magic_enum/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
-# Tests fail to compile
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-werror.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-cpp/robin-map/robin-map-1.3.0.ebuild b/dev-cpp/robin-map/robin-map-1.3.0.ebuild
index 5ebd0b902e42..df97543a2226 100644
--- a/dev-cpp/robin-map/robin-map-1.3.0.ebuild
+++ b/dev-cpp/robin-map/robin-map-1.3.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
 else
 	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"