12 files changed, 19 insertions, 17 deletions
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.14.1-r1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.14.1-r1.ebuild
index bed9d5ce214e..51e6fb1d6f3e 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.14.1-r1.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild b/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild
index 1e99a9fa6d04..2cd6daaf923f 100644
--- a/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild
+++ b/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,11 +18,13 @@ RDEPEND=">=dev-libs/openssl-1.1.1q
 
 DEPEND="${RDEPEND}"
 
-BDEPEND=">=dev-util/cmake-3.23
-		>=dev-util/ninja-1.11.1-r2
+BDEPEND="
+		app-alternatives/ninja
+		>=dev-util/cmake-3.23
 		>=sys-devel/gcc-11.3.0
 		>=virtual/pkgconfig-2-r1
-		>=dev-cpp/websocketpp-0.8.2"
+		>=dev-cpp/websocketpp-0.8.2
+"
 
 PATCHES=(
 	"${FILESDIR}"/cpprestsdk-${PV}-warnings.patch
diff --git a/dev-cpp/drogon/drogon-1.8.7.ebuild b/dev-cpp/drogon/drogon-1.8.7.ebuild
index 7841c9749ab6..42c21024a552 100644
--- a/dev-cpp/drogon/drogon-1.8.7.ebuild
+++ b/dev-cpp/drogon/drogon-1.8.7.ebuild
@@ -41,7 +41,7 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-text/doxygen )"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.8.4-fix-test-build.patch )
 
diff --git a/dev-cpp/drogon/drogon-1.9.0.ebuild b/dev-cpp/drogon/drogon-1.9.0.ebuild
index 76ff8fa0f578..637e4434b405 100644
--- a/dev-cpp/drogon/drogon-1.9.0.ebuild
+++ b/dev-cpp/drogon/drogon-1.9.0.ebuild
@@ -41,7 +41,7 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-text/doxygen )"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.8.4-fix-test-build.patch )
 
diff --git a/dev-cpp/mastodonpp/mastodonpp-0.5.7-r1.ebuild b/dev-cpp/mastodonpp/mastodonpp-0.5.7-r1.ebuild
index 96ce9cef8b60..b67a47dea423 100644
--- a/dev-cpp/mastodonpp/mastodonpp-0.5.7-r1.ebuild
+++ b/dev-cpp/mastodonpp/mastodonpp-0.5.7-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="doc examples test"
 RDEPEND=">=net-misc/curl-7.56.0[ssl]"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
+	doc? ( app-text/doxygen[dot] )
 	test? ( dev-cpp/catch )
 "
 
diff --git a/dev-cpp/mastodonpp/mastodonpp-9999.ebuild b/dev-cpp/mastodonpp/mastodonpp-9999.ebuild
index 2be3056dc8ec..52f335c63e24 100644
--- a/dev-cpp/mastodonpp/mastodonpp-9999.ebuild
+++ b/dev-cpp/mastodonpp/mastodonpp-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="doc examples test"
 RDEPEND=">=net-misc/curl-7.56.0[ssl]"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
+	doc? ( app-text/doxygen[dot] )
 	test? ( dev-cpp/catch )
 "
 
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.0.ebuild
index 1cf4910aa2c4..a980edb09670 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.0.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/trantor/trantor-1.5.14.ebuild b/dev-cpp/trantor/trantor-1.5.14.ebuild
index 42685e11c9ba..66f441cfb6d7 100644
--- a/dev-cpp/trantor/trantor-1.5.14.ebuild
+++ b/dev-cpp/trantor/trantor-1.5.14.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
+BDEPEND="doc? ( app-text/doxygen[dot] )"
 
 src_prepare() {
 	sed -i 's/ -Werror)$/)/' CMakeLists.txt || die "could not remove -Werror"
diff --git a/dev-cpp/trantor/trantor-1.5.14_p1.ebuild b/dev-cpp/trantor/trantor-1.5.14_p1.ebuild
index 32fe7654b275..4bd5d39b2586 100644
--- a/dev-cpp/trantor/trantor-1.5.14_p1.ebuild
+++ b/dev-cpp/trantor/trantor-1.5.14_p1.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
+BDEPEND="doc? ( app-text/doxygen[dot] )"
 
 src_prepare() {
 	sed -i 's/ -Werror)$/)/' CMakeLists.txt || die "could not remove -Werror"
diff --git a/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild b/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild
index d668864520cd..332339c80ee4 100644
--- a/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild
+++ b/dev-cpp/xsimd/xsimd-11.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/xtensor-stack/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/xtensor/xtensor-0.24.4.ebuild b/dev-cpp/xtensor/xtensor-0.24.4.ebuild
index c7fed94134c4..b89f8fc989b7 100644
--- a/dev-cpp/xtensor/xtensor-0.24.4.ebuild
+++ b/dev-cpp/xtensor/xtensor-0.24.4.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	doc? (
-		app-doc/doxygen
+		app-text/doxygen
 		$(python_gen_any_dep '
 			dev-python/breathe[${PYTHON_USEDEP}]
 			dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-cpp/xtl/xtl-0.7.5.ebuild b/dev-cpp/xtl/xtl-0.7.5.ebuild
index 467d14fd6c77..382eeebbbdef 100644
--- a/dev-cpp/xtl/xtl-0.7.5.ebuild
+++ b/dev-cpp/xtl/xtl-0.7.5.ebuild
@@ -22,7 +22,7 @@ IUSE="doc test"
 
 BDEPEND="
 	doc? (
-		app-doc/doxygen
+		app-text/doxygen
 		$(python_gen_any_dep '
 			dev-python/breathe[${PYTHON_USEDEP}]
 			dev-python/sphinx[${PYTHON_USEDEP}]