4 files changed, 70 insertions, 31 deletions
diff --git a/dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r1.ebuild b/dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r2.ebuild
index 6d7a63a60e19..1c7bed54636b 100644
--- a/dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r1.ebuild
+++ b/dev-cpp/aws-crt-cpp/aws-crt-cpp-0.37.4-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="dev-libs/aws-c-common"
 
 PATCHES=(
-	"${FILESDIR}/aws-crt-cpp-0.37.4-warnins_are_errors.patch"
+	"${FILESDIR}/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch"
 )
 
 src_configure()
@@ -47,3 +47,12 @@ src_configure()
 
 	cmake_src_configure
 }
+
+src_install()
+{
+	cmake_src_install
+
+	if use test; then
+		rm -r "${D}/usr/bin" || die "Error removing testbinaries from /usr/bin"
+	fi
+}
diff --git a/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch b/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch
new file mode 100644
index 000000000000..67ce4d11b1dc
--- /dev/null
+++ b/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-r2-warnins_are_errors.patch
@@ -0,0 +1,59 @@
+https://github.com/awslabs/aws-crt-cpp/pull/889
+From dc7b4a22c97cb534e12af25034aff81e25b5f1f5 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Thu, 23 Jul 2026 00:46:43 +0200
+Subject: [PATCH] Use AWS_WARNINGS_ARE_ERRORS to restrict -Werror
+
+This is in some of the sub folders.
+
+Found by Gentoo tinderbox: https://bugs.gentoo.org/977183
+
+Signed-off-by: Jaco Kroon <jaco@uls.co.za>
+---
+ bin/elasticurl_cpp/CMakeLists.txt | 2 +-
+ bin/mqtt5_app/CMakeLists.txt      | 2 +-
+ bin/mqtt5_canary/CMakeLists.txt   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bin/elasticurl_cpp/CMakeLists.txt b/bin/elasticurl_cpp/CMakeLists.txt
+index a96f94e..b0c5482 100644
+--- a/bin/elasticurl_cpp/CMakeLists.txt
++++ b/bin/elasticurl_cpp/CMakeLists.txt
+@@ -20,7 +20,7 @@ if (MSVC)
+         target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
+     endif()
+     target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE /W4 /WX)
+-else ()
++elseif (AWS_WARNINGS_ARE_ERRORS)
+     target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
+ endif ()
+ 
+diff --git a/bin/mqtt5_app/CMakeLists.txt b/bin/mqtt5_app/CMakeLists.txt
+index 931e07e..60358a2 100644
+--- a/bin/mqtt5_app/CMakeLists.txt
++++ b/bin/mqtt5_app/CMakeLists.txt
+@@ -20,7 +20,7 @@ if (MSVC)
+         target_compile_options(${MQTT5_APP_PROJECT_NAME} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
+     endif()
+     target_compile_options(${MQTT5_APP_PROJECT_NAME} PRIVATE /W4 /WX)
+-else ()
++elseif (AWS_WARNINGS_ARE_ERRORS)
+     target_compile_options(${MQTT5_APP_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
+ endif ()
+ 
+diff --git a/bin/mqtt5_canary/CMakeLists.txt b/bin/mqtt5_canary/CMakeLists.txt
+index 4426053..e41ed00 100644
+--- a/bin/mqtt5_canary/CMakeLists.txt
++++ b/bin/mqtt5_canary/CMakeLists.txt
+@@ -21,7 +21,7 @@ if (MSVC)
+         target_compile_options(${MQTT5_CANARY_PROJECT_NAME} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
+     endif()
+     target_compile_options(${MQTT5_CANARY_PROJECT_NAME} PRIVATE /W4 /WX)
+-else ()
++elseif (AWS_WARNINGS_ARE_ERRORS)
+     target_compile_options(${MQTT5_CANARY_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
+ endif ()
+ 
+-- 
+2.54.0
+
diff --git a/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-warnins_are_errors.patch b/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-warnins_are_errors.patch
deleted file mode 100644
index bfd5bf785039..000000000000
--- a/dev-cpp/aws-crt-cpp/files/aws-crt-cpp-0.37.4-warnins_are_errors.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d97699793a71880c70f948faa42d2a03913d5ecd Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@uls.co.za>
-Date: Thu, 23 Jul 2026 00:46:43 +0200
-Subject: [PATCH] Use AWS_WARNINGS_ARE_ERRORS to restrict -Werror in
- elasticurl_cpp.
-
-Found by Gentoo tinderbox: https://bugs.gentoo.org/977183
-
-Signed-off-by: Jaco Kroon <jaco@uls.co.za>
----
- bin/elasticurl_cpp/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/elasticurl_cpp/CMakeLists.txt b/bin/elasticurl_cpp/CMakeLists.txt
-index a96f94e..b0c5482 100644
---- a/bin/elasticurl_cpp/CMakeLists.txt
-+++ b/bin/elasticurl_cpp/CMakeLists.txt
-@@ -20,7 +20,7 @@ if (MSVC)
-         target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
-     endif()
-     target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE /W4 /WX)
--else ()
-+elseif (AWS_WARNINGS_ARE_ERRORS)
-     target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
- endif ()
- 
--- 
-2.54.0
-
diff --git a/dev-cpp/toomanycooks/toomanycooks-1.6.1.ebuild b/dev-cpp/toomanycooks/toomanycooks-1.6.1.ebuild
index 7d308fb8b837..6d3bef2637e2 100644
--- a/dev-cpp/toomanycooks/toomanycooks-1.6.1.ebuild
+++ b/dev-cpp/toomanycooks/toomanycooks-1.6.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # NOTE: Dependents MUST add this package's DEPENDs as RDEPENDs, to ensure SLOT
 #       rebuilds function correctly.