9 files changed, 58 insertions, 94 deletions
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 728a3cdb7277..1fc33321e2a3 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -2,3 +2,4 @@ DIST highway-1.0.1.tar.gz 1730746 BLAKE2B 1c6185af91afe32fbb35285d49101d381ade7d
 DIST highway-1.0.3.tar.gz 1770704 BLAKE2B 5454f7e661270f25d1439a2a3d649a0f9970d7e10e0cfe6818c470b00460cc77b044ca83e912c91a3582b4a60af5d8d0f7c0aba01762acd3c98b9692fa0b20c6 SHA512 fc419c862e1686b6278081e8e10da41dc2bdfbd386a29b59e21a57375a47d3eeb5c7297e3078c78007b212121d936640b192a26a16c941e73cf599f24e081021
 DIST highway-1.0.5.tar.gz 2012129 BLAKE2B cd7673bc5e3a32551554c83c4e1beb31f9855d9ad9550f156be2fb9e93b20391bd98d4b3ed4d0edf0a2786e403dcca86f4a50d00c27f0e08242dc66e2e6b2262 SHA512 0886b60147b78807e40c4987438fe664b4fbc012c3c681a45f3043ee4077afa493cb75550bc18ae160d00e527bf15bcf1f14220ea8561a4baacb3317fc25e347
 DIST highway-1.0.7.tar.gz 2055819 BLAKE2B da10291124dfdb5d9fd2b661f4d7e594c1e80e4159c9d704e1b4203facf7a0603e7ba808ffb1d8f1aba13d992df24abdb0ae89807329fffb67dee78b58574c28 SHA512 6ee5007ec13ac20b5d816b38a1b31c31a06678ca6d2ea090dd75e364f04cb2cf7ad8a82d1bdfff51079efa54b9a95fb554d62e6cc1bbf7d7e794cb272032d8f5
+DIST highway-1.2.0.tar.gz 2234665 BLAKE2B b92f699c0f2f15fd9d223cf9546125b68a5c12ba9c84f8a3a990129f40bc56a266858e4f99eebe34e47c9904bd9164a138de1af8d405911d4b03bea67532489a SHA512 e94b9cc51c81157ccd6bf4d6163445b1acc1a2667dc2650d1c4aea0a5021989c08dafcb92564fcbecb9445ab2f1779051260be2f5b29c3932803b8a42ed2f824
diff --git a/dev-cpp/highway/highway-1.2.0.ebuild b/dev-cpp/highway/highway-1.2.0.ebuild
new file mode 100644
index 000000000000..379a4e39f798
--- /dev/null
+++ b/dev-cpp/highway/highway-1.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_arm_neon test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DHWY_CMAKE_ARM7=$(usex cpu_flags_arm_neon)
+		-DBUILD_TESTING=$(usex test)
+		-DHWY_ENABLE_TESTS=$(usex test)
+		-DHWY_WARNINGS_ARE_ERRORS=OFF
+	)
+
+	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/highway/highway-9999.ebuild b/dev-cpp/highway/highway-9999.ebuild
index af752cf34a06..379a4e39f798 100644
--- a/dev-cpp/highway/highway-9999.ebuild
+++ b/dev-cpp/highway/highway-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -28,6 +28,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DHWY_CMAKE_ARM7=$(usex cpu_flags_arm_neon)
 		-DBUILD_TESTING=$(usex test)
+		-DHWY_ENABLE_TESTS=$(usex test)
 		-DHWY_WARNINGS_ARE_ERRORS=OFF
 	)
 
diff --git a/dev-cpp/magic_enum/Manifest b/dev-cpp/magic_enum/Manifest
index 44ea6643f9fa..145a81733d2e 100644
--- a/dev-cpp/magic_enum/Manifest
+++ b/dev-cpp/magic_enum/Manifest
@@ -1,2 +1,2 @@
-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
+DIST magic_enum-0.9.7.tar.gz 202916 BLAKE2B c084df420d66b4920ef028c74056a64e6221d787bbdc958407426442bc14f9a62ec32c56aa7e914a79f4e10a231312fc03230a6d4cbed992f6eae51e14372283 SHA512 8b61c621ff2a6981b4ff89f7df577091ffc9382d443c061db612fb61822dbf6ef8aba69ea35d1c435dcffbd7434cb4ccc5d12bbe2deba1cf0a5316c979ee6a4b
diff --git a/dev-cpp/magic_enum/files/magic_enum-0.9.5-werror.patch b/dev-cpp/magic_enum/files/magic_enum-0.9.7-werror.patch
index 6f28fa7ef704..35c9011844d0 100644
--- a/dev-cpp/magic_enum/files/magic_enum-0.9.5-werror.patch
+++ b/dev-cpp/magic_enum/files/magic_enum-0.9.7-werror.patch
@@ -4,19 +4,19 @@
  
  set(CMAKE_CXX_STANDARD 17)
  if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
--    set(OPTIONS -Wall -Wextra -pedantic-errors -Werror)
+-    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)
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -12,7 +12,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-     check_cxx_compiler_flag(/std:c++latest HAS_CPPLATEST_FLAG)
+@@ -56,7 +56,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+   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 -pedantic-errors -Werror)
-+    set(OPTIONS -Wall -Wextra)
+   set(CMAKE_VERBOSE_MAKEFILE ON)
+-  set(OPTIONS -Wall -Wextra -Wshadow -pedantic-errors -Werror)
++  set(OPTIONS -Wall -Wextra -Wshadow)
  
-     check_cxx_compiler_flag(-std=c++20 HAS_CPP20_FLAG)
-     check_cxx_compiler_flag(-std=c++23 HAS_CPP23_FLAG)
+   check_cxx_compiler_flag(-std=c++20 HAS_CPP20_FLAG)
+   check_cxx_compiler_flag(-std=c++23 HAS_CPP23_FLAG)
diff --git a/dev-cpp/magic_enum/magic_enum-0.9.5.ebuild b/dev-cpp/magic_enum/magic_enum-0.9.7.ebuild
index 1077c351e165..a63522454784 100644
--- a/dev-cpp/magic_enum/magic_enum-0.9.5.ebuild
+++ b/dev-cpp/magic_enum/magic_enum-0.9.7.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # As of 0.8.2, it has meson, but only for subproject use(?)
-# Doesn't install anything.
+# Doesn't install anything. In 0.9.7, the situation looks better, but
+# need to test with reverse dependencies.
 inherit cmake
 
 DESCRIPTION="Static reflection for enums in header-only C++"
@@ -13,16 +14,17 @@ SRC_URI="https://github.com/Neargye/magic_enum/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="test"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.5-werror.patch
+	"${FILESDIR}"/${PN}-0.9.7-werror.patch
 )
 
 src_configure() {
 	local mycmakeargs=(
+		-DMAGIC_ENUM_OPT_BUILD_EXAMPLES=$(usex examples)
 		-DMAGIC_ENUM_OPT_BUILD_TESTS=$(usex test)
 		-DMAGIC_ENUM_OPT_INSTALL=ON
 	)
diff --git a/dev-cpp/string-theory/Manifest b/dev-cpp/string-theory/Manifest
index 2dc8ad7b7d75..ecc07443ec29 100644
--- a/dev-cpp/string-theory/Manifest
+++ b/dev-cpp/string-theory/Manifest
@@ -1,3 +1 @@
-DIST string-theory-3.5.tar.gz 589905 BLAKE2B c2bc926b8568efc1fbe27861619bd8249ad788297dd537cff393d212b3bb12a529847b740fc8ba82dc28501fb05800eb8debf3e4832cf145b5c13882ac45e900 SHA512 30300155e64ace8197ed531baffe4e835c269ac10d6857ac9f29501e0a1f69965994d6f2fa2e64544e7d441de635e2d370be24efcf00a0d24066730d19f022a6
-DIST string-theory-3.6.tar.gz 590461 BLAKE2B e8441ead9b13e8f107c47d0695ca669f40558567590b85310903f550edf2d4cbb8622f36857b9563d33a629398358e33024c97b97a8f151a3899f9cee30ee237 SHA512 2bbd8e6c5c2501cc9616ee6a77b60a7cac5e7c9fa58d6616f6ba39cfdee33dc1b072c5d1b34bd2f88726fb4d65d32032595be7a67854a2e894eb3d81d4a8eea9
 DIST string-theory-3.9.tar.gz 68952 BLAKE2B f18c558b38b346d5cfcaa18ae6ea28c223571c8c016b686f5ed787c17c34cb6bec62e064072adf8a5ebc7d2eab89173d171f02a180f3664f36f05cf8d7845808 SHA512 a36825ab22be64c7c7b54861e88dea0bde5f0b80d32fc86b863e4409c820a25fea17cfbf2d068c1fdf4fb371714337dff390d31c983ea898fbdc37a09c469b4a
diff --git a/dev-cpp/string-theory/string-theory-3.5.ebuild b/dev-cpp/string-theory/string-theory-3.5.ebuild
deleted file mode 100644
index 1e683f2fff92..000000000000
--- a/dev-cpp/string-theory/string-theory-3.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A flexible modern C++ library for string manipulation and storage"
-HOMEPAGE="https://github.com/zrax/string_theory/"
-SRC_URI="https://github.com/zrax/string_theory/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/string_theory-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	# Drop -Werror from bundled gtest
-	# bug #766468
-	sed -i -e "s/-Werror//" test/gtest-1.10.0/cmake/internal_utils.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DST_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}/test" || die
-	./st_gtests || die
-}
diff --git a/dev-cpp/string-theory/string-theory-3.6.ebuild b/dev-cpp/string-theory/string-theory-3.6.ebuild
deleted file mode 100644
index 1e683f2fff92..000000000000
--- a/dev-cpp/string-theory/string-theory-3.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A flexible modern C++ library for string manipulation and storage"
-HOMEPAGE="https://github.com/zrax/string_theory/"
-SRC_URI="https://github.com/zrax/string_theory/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/string_theory-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	# Drop -Werror from bundled gtest
-	# bug #766468
-	sed -i -e "s/-Werror//" test/gtest-1.10.0/cmake/internal_utils.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DST_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}/test" || die
-	./st_gtests || die
-}