Adding metadata

63 files changed, 67 insertions, 86 deletions

diff --git a/dev-cpp/atkmm/atkmm-2.28.4.ebuild b/dev-cpp/atkmm/atkmm-2.28.4.ebuild
index 275f8327888a..b38f476a1d49 100644
--- a/dev-cpp/atkmm/atkmm-2.28.4.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc"
 
 DEPEND="
diff --git a/dev-cpp/atkmm/atkmm-2.36.3.ebuild b/dev-cpp/atkmm/atkmm-2.36.3.ebuild
index 714e7f358d8b..3ffd062a328c 100644
--- a/dev-cpp/atkmm/atkmm-2.36.3.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org https://gitlab.gnome.org/GNOME/atkmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc"
 
 DEPEND="
diff --git a/dev-cpp/cairomm/cairomm-1.14.4.ebuild b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
index 5a3c2cc9799f..99303fbb325c 100644
--- a/dev-cpp/cairomm/cairomm-1.14.4.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/cairomm/cairomm-1.14.5.ebuild b/dev-cpp/cairomm/cairomm-1.14.5.ebuild
index 5a3c2cc9799f..99303fbb325c 100644
--- a/dev-cpp/cairomm/cairomm-1.14.5.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/cairomm/cairomm-1.18.0.ebuild b/dev-cpp/cairomm/cairomm-1.18.0.ebuild
index fd01e3d152da..2f60e6e07f46 100644
--- a/dev-cpp/cairomm/cairomm-1.18.0.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
index 0918f508d3ef..5066acaafa71 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug doc static-libs"
 RESTRICT="test"
 
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r11.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r11.ebuild
index e228968dd31a..a8ab0d6b1534 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r11.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug doc static-libs"
 RESTRICT="test"
 
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
index 2414fa893b54..5c9fd42d9b1c 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug doc static-libs"
 RESTRICT="test"
 
diff --git a/dev-cpp/ctemplate/ctemplate-2.4.ebuild b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
index b93b187211c7..0cdf3f224805 100644
--- a/dev-cpp/ctemplate/ctemplate-2.4.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/ctemplate-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="doc emacs vim-syntax static-libs test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
index e2b24e2292dd..a5a1b947ff72 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
@@ -20,7 +20,7 @@ else
 		https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 		test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild
index 2e9953fb7c2f..a1abfd74c566 100644
--- a/dev-cpp/eigen/eigen-9999.ebuild
+++ b/dev-cpp/eigen/eigen-9999.ebuild
@@ -20,7 +20,7 @@ else
 		https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 		test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-cpp/gflags/gflags-2.2.2-r1.ebuild b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
index 828e155ac4e1..6beca478a0f5 100644
--- a/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 2dca97cfe29b..9cfbb3ca8e00 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/glibmm/glibmm-2.66.8.ebuild b/dev-cpp/glibmm/glibmm-2.66.8.ebuild
index 71ce6f84908b..d0b2337b2cd8 100644
--- a/dev-cpp/glibmm/glibmm-2.66.8.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glibmm/glibmm-2.84.0.ebuild b/dev-cpp/glibmm/glibmm-2.84.0.ebuild
index b3bd2856821e..ce8cc7a7a383 100644
--- a/dev-cpp/glibmm/glibmm-2.84.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.84.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.68"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index 4a54a63a949a..a77fce16b22e 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/glog-0.6.0-r1.ebuild b/dev-cpp/glog/glog-0.6.0-r1.ebuild
index 7b3f727eaae1..ee9f161d6d89 100644
--- a/dev-cpp/glog/glog-0.6.0-r1.ebuild
+++ b/dev-cpp/glog/glog-0.6.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-cpp/glog/glog-0.6.0.ebuild b/dev-cpp/glog/glog-0.6.0.ebuild
index 1f7acaf083da..259c361ffcf9 100644
--- a/dev-cpp/glog/glog-0.6.0.ebuild
+++ b/dev-cpp/glog/glog-0.6.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/glog-0.7.1.ebuild b/dev-cpp/glog/glog-0.7.1.ebuild
index 478208ff7077..51cde4ee2d29 100644
--- a/dev-cpp/glog/glog-0.7.1.ebuild
+++ b/dev-cpp/glog/glog-0.7.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-cpp/gpgmepp/gpgmepp-2.0.0-r1.ebuild b/dev-cpp/gpgmepp/gpgmepp-2.0.0-r1.ebuild
index f7d8827bb46d..512e86f96f23 100644
--- a/dev-cpp/gpgmepp/gpgmepp-2.0.0-r1.ebuild
+++ b/dev-cpp/gpgmepp/gpgmepp-2.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="LGPL-2+ test? ( GPL-2 GPL-2+ LGPL-2.1+ )"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtest/gtest-1.14.0-r2.ebuild b/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
index df52556d74e1..7cd3ff7e4c83 100644
--- a/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
+++ b/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 	)
 	if use test; then
-		if use x86 || use x86-linux; then
+		if use x86; then
 			append-cxxflags -ffloat-store # bug #905007
 		fi
 		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
diff --git a/dev-cpp/gtest/gtest-1.17.0.ebuild b/dev-cpp/gtest/gtest-1.17.0.ebuild
index c791efe88bca..08ac21f25db1 100644
--- a/dev-cpp/gtest/gtest-1.17.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.17.0.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -65,7 +65,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 	)
 	if use test; then
-		if use x86 || use x86-linux; then
+		if use x86; then
 			append-cxxflags -ffloat-store # bug #905007
 		fi
 		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index c791efe88bca..08ac21f25db1 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -65,7 +65,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 	)
 	if use test; then
-		if use x86 || use x86-linux; then
+		if use x86; then
 			append-cxxflags -ffloat-store # bug #905007
 		fi
 		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
index c3b92de82f9f..c66676038fe6 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.10.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.10.ebuild
index bd1987e6f787..f70329030edd 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.10.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua gtk-doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
index bd1987e6f787..f70329030edd 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua gtk-doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
index f26afd09579f..4971e9f49afe 100644
--- a/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
index 56ac6880698a..6d1c47cb9a99 100644
--- a/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.20.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.20.0.ebuild
index fac375ff0fac..80815ba5bdbe 100644
--- a/dev-cpp/gtkmm/gtkmm-4.20.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.20.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/libcmis/libcmis-0.6.2-r2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2-r2.ebuild
index 69bdcfdaf58e..7b096ee60f1b 100644
--- a/dev-cpp/libcmis/libcmis-0.6.2-r2.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.6.2-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 fi
 inherit autotools flag-o-matic
 
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index ec3f5237a89b..196087c0dff6 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 inherit autotools flag-o-matic
 
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
index 644634db56e4..4ee9b505f993 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~x64-macos"
 
 PATCHES=(
 	# bug #718808
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.42.3.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.42.3.ebuild
index c2a48a8c136e..b15a164bf152 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.42.3.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.42.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/libxmlpp/libxmlpp-5.0.4.ebuild b/dev-cpp/libxmlpp/libxmlpp-5.0.4.ebuild
index e09554845299..1a8baef4fc0d 100644
--- a/dev-cpp/libxmlpp/libxmlpp-5.0.4.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-5.0.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="5.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/libxmlpp/libxmlpp-5.4.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-5.4.0.ebuild
index 55a4b530eede..bca45beea177 100644
--- a/dev-cpp/libxmlpp/libxmlpp-5.4.0.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-5.4.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="5.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
index e5e33b3bb52d..2a9ec41d2ccb 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.t
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 IUSE="+boost doc examples test"
 
 REQUIRED_USE="test? ( boost )"
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
index 41fc11872df3..010a3e7f2563 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.t
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="+boost doc examples test"
 
 REQUIRED_USE="test? ( boost )"
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
index e5e33b3bb52d..2a9ec41d2ccb 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.t
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 IUSE="+boost doc examples test"
 
 REQUIRED_USE="test? ( boost )"
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
index e5e33b3bb52d..2a9ec41d2ccb 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.t
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 IUSE="+boost doc examples test"
 
 REQUIRED_USE="test? ( boost )"
diff --git a/dev-cpp/muParser/muParser-2.3.4-r1.ebuild b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
index fd0c807383f3..4b118c52d79f 100644
--- a/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/muparser-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/muParser/muParser-2.3.5.ebuild b/dev-cpp/muParser/muParser-2.3.5.ebuild
index e931b6d1d585..b232b6f3a524 100644
--- a/dev-cpp/muParser/muParser-2.3.5.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/muparser-${PV}
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/pangomm/pangomm-2.46.4.ebuild b/dev-cpp/pangomm/pangomm-2.46.4.ebuild
index 71abf6f3a534..43a601b9556c 100644
--- a/dev-cpp/pangomm/pangomm-2.46.4.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.46.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/dev-cpp/pangomm/pangomm-2.50.2.ebuild b/dev-cpp/pangomm/pangomm-2.50.2.ebuild
index 789f70295b09..70d3cd94a1f9 100644
--- a/dev-cpp/pangomm/pangomm-2.50.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/dev-cpp/pangomm/pangomm-2.56.1.ebuild b/dev-cpp/pangomm/pangomm-2.56.1.ebuild
index 38e29748a88f..99b44931a266 100644
--- a/dev-cpp/pangomm/pangomm-2.56.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.56.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/dev-cpp/robotraconteur-companion/metadata.xml b/dev-cpp/robotraconteur-companion/metadata.xml
index 3d84de8b6b9b..fd6940b88f8b 100644
--- a/dev-cpp/robotraconteur-companion/metadata.xml
+++ b/dev-cpp/robotraconteur-companion/metadata.xml
@@ -5,10 +5,6 @@
   <email>wason@wasontech.com</email>
   <name>John Wason</name>
  </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
  <longdescription lang="en">
     Robot Raconteur C++ companion library. See http://robotraconteur.com for documentation.
   </longdescription>
diff --git a/dev-cpp/robotraconteur-companion/robotraconteur-companion-0.4.2.ebuild b/dev-cpp/robotraconteur-companion/robotraconteur-companion-0.4.2.ebuild
index 4fd182b0fd3f..07482c031379 100644
--- a/dev-cpp/robotraconteur-companion/robotraconteur-companion-0.4.2.ebuild
+++ b/dev-cpp/robotraconteur-companion/robotraconteur-companion-0.4.2.ebuild
@@ -13,13 +13,11 @@ S="${WORKDIR}/RobotRaconteurCompanion-${PV}-Source"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64"
 
-DEPEND="dev-libs/boost
+DEPEND="dev-libs/boost:=
 	dev-libs/openssl
-	dev-build/cmake
-	dev-cpp/yaml-cpp
+	dev-cpp/yaml-cpp:=
 	dev-cpp/eigen
 	dev-cpp/robotraconteur
 "
@@ -34,11 +32,3 @@ local mycmakeargs=(
 	)
 	cmake_src_configure
 }
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-cpp/robotraconteur/Manifest b/dev-cpp/robotraconteur/Manifest
index 41b905bfb91e..989b83135870 100644
--- a/dev-cpp/robotraconteur/Manifest
+++ b/dev-cpp/robotraconteur/Manifest
@@ -1 +1 @@
-DIST RobotRaconteur-1.2.6-Source.tar.gz 11806135 BLAKE2B 64bf2a49434b307a260e82d937b76a6fbc6353ed3499da44048e75c88c94ba6a96b713c95264c6d4cba3dcdc6745a7237a5526eb95c593ffc6733c63e25feafa SHA512 ff5934182b6e97a1f07c11623d9ec570ab762ac915eb74b38f0e21f9d76cc6e779f8faf7a32fb684ef54738474c89c60c8f7401785262d54bd48dfe805c642b8
+DIST RobotRaconteur-1.2.7-Source.tar.gz 11808734 BLAKE2B cef41066cb557131250d6817658792e4af1b7f5ce8c4ee279823f99232b2da7340a59eec9d37ca29a4763193f531e3a7d12599dff1fdf82745a5015d533bc997 SHA512 9d01d648c4d140206ec794d5c55e237078154ed3419013c8d071d75a664c659fb515482fb4d502a15373e1ae13afcdcf1c53b3458b81b2cc2f522986400ed231
diff --git a/dev-cpp/robotraconteur/metadata.xml b/dev-cpp/robotraconteur/metadata.xml
index 643e865ee088..a136c72e13d1 100644
--- a/dev-cpp/robotraconteur/metadata.xml
+++ b/dev-cpp/robotraconteur/metadata.xml
@@ -5,10 +5,6 @@
   <email>wason@wasontech.com</email>
   <name>John Wason</name>
  </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
  <longdescription lang="en">
     Robot Raconteur C++ library with Python bindings. See http://robotraconteur.com for documentation.
   </longdescription>
diff --git a/dev-cpp/robotraconteur/robotraconteur-1.2.6.ebuild b/dev-cpp/robotraconteur/robotraconteur-1.2.7.ebuild
index a970794f60b3..7f90ef625430 100644
--- a/dev-cpp/robotraconteur/robotraconteur-1.2.6.ebuild
+++ b/dev-cpp/robotraconteur/robotraconteur-1.2.7.ebuild
@@ -15,15 +15,14 @@ S="${WORKDIR}/RobotRaconteur-${PV}-Source"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64"
 IUSE="python"
 
-DEPEND="dev-libs/boost
+DEPEND="dev-libs/boost:=
 	dev-libs/openssl
 	dev-libs/libusb
 	sys-apps/dbus
 	net-wireless/bluez
-	dev-build/cmake
 	python? ( dev-python/numpy[${PYTHON_USEDEP}]
 	          dev-python/setuptools[${PYTHON_USEDEP}]
 	          dev-python/pip[${PYTHON_USEDEP}] )
diff --git a/dev-cpp/simpleini/simpleini-4.25.ebuild b/dev-cpp/simpleini/simpleini-4.25.ebuild
index f0db70eccb7e..8b973d44e614 100644
--- a/dev-cpp/simpleini/simpleini-4.25.ebuild
+++ b/dev-cpp/simpleini/simpleini-4.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brofield/simpleini/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
index eb0a80c4bc0f..acb2560d7dd1 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-buildsystem.patch )
 
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index a4a8523b1c41..aab01a10281a 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/oneapi-src/oneTBB"
 SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug examples"
 
 S="${WORKDIR}/oneTBB-${MY_PV}"
diff --git a/dev-cpp/tbb/tbb-2021.12.0.ebuild b/dev-cpp/tbb/tbb-2021.12.0.ebuild
index c4ce0e2090fb..578a4c67d5d2 100644
--- a/dev-cpp/tbb/tbb-2021.12.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.12.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.13.0.ebuild b/dev-cpp/tbb/tbb-2021.13.0.ebuild
index c4ce0e2090fb..578a4c67d5d2 100644
--- a/dev-cpp/tbb/tbb-2021.13.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.13.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
index 4ce310a4a962..49a6f1bea630 100644
--- a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 50bdf21a1491..daeaf3583eeb 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild b/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild
index 84afb72b85a1..1cf5886f8a39 100644
--- a/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.14-2.14-3.14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2022.1.0.ebuild b/dev-cpp/tbb/tbb-2022.1.0.ebuild
index 13a1bb769145..cfff646ce21b 100644
--- a/dev-cpp/tbb/tbb-2022.1.0.ebuild
+++ b/dev-cpp/tbb/tbb-2022.1.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.15-2.15-3.15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2022.3.0.ebuild b/dev-cpp/tbb/tbb-2022.3.0.ebuild
index e1263b783771..a1e07f99581e 100644
--- a/dev-cpp/tbb/tbb-2022.3.0.ebuild
+++ b/dev-cpp/tbb/tbb-2022.3.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.15-2.15-3.15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tclap/tclap-1.2.5.ebuild b/dev-cpp/tclap/tclap-1.2.5.ebuild
index 00a83fe2b21e..df9c0be4bc31 100644
--- a/dev-cpp/tclap/tclap-1.2.5.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/dev-cpp/tree/tree-3.18.ebuild b/dev-cpp/tree/tree-3.18.ebuild
index 34179375cedd..4696070fe62e 100644
--- a/dev-cpp/tree/tree-3.18.ebuild
+++ b/dev-cpp/tree/tree-3.18.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.hh-${PV}"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86"
 
 src_configure() {
 	tc-export CXX
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
index 21f8f1065c53..9b71a0395c63 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jbeder/yaml-cpp/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/0.8"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r2.ebuild
index 79b960d262b4..19c0b23865bd 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r2.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jbeder/yaml-cpp/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/0.8"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"