Merge updates from master

7 files changed, 7 insertions, 119 deletions

diff --git a/app-forensics/libewf/libewf-20171104-r2.ebuild b/app-forensics/libewf/libewf-20171104-r2.ebuild
index 8ee0ba9eb248..bd03eb22a9e3 100644
--- a/app-forensics/libewf/libewf-20171104-r2.ebuild
+++ b/app-forensics/libewf/libewf-20171104-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experime
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 ~riscv x86"
 # Upstream bug #2597171, pyewf has implicit declarations
 #IUSE="debug python unicode"
 IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
diff --git a/dev-lang/orc/orc-0.4.32.ebuild b/dev-lang/orc/orc-0.4.32.ebuild
index 235a03aab3b5..339391c2024e 100644
--- a/dev-lang/orc/orc-0.4.32.ebuild
+++ b/dev-lang/orc/orc-0.4.32.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-util/cunit/cunit-2.1_p3-r1.ebuild b/dev-util/cunit/cunit-2.1_p3-r1.ebuild
index 9442f7e777fc..e66fee1830aa 100644
--- a/dev-util/cunit/cunit-2.1_p3-r1.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/cunit/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 3d18401172ef..b007f38e6f17 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -23,8 +23,9 @@ dev-lang/python-exec -python_targets_python3_11
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2022-09-14)
 # sci-libs/vtk is not stable on x86 and we don't want to complicate
-# newer maxima stabilisation, bug #867547
+# newer maxima and geant stabilisation, bug #867547, #886975
 sci-mathematics/maxima vtk
+sci-physics/geant vtk
 
 # Sam James <sam@gentoo.org> (2022-07-06)
 # sci-libs/sundials is not marked stable on x86
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
deleted file mode 100644
index 00f32e5f7b4b..000000000000
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit desktop flag-o-matic lua-single xdg cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		COMMIT_ID="df508a0c597a3d96c1c039fa4a973e294021cfba"
-		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN^}-${COMMIT_ID}"
-		KEYWORDS="~amd64 ~x86"
-	else
-		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	fi
-fi
-
-DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ffmpeg glut lua nls +qt5"
-REQUIRED_USE="|| ( glut qt5 )
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-	dev-cpp/eigen
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-"
-DEPEND="
-	<dev-libs/libfmt-9.0.0:=
-	media-libs/freetype
-	media-libs/glew:0=
-	media-libs/libepoxy
-	media-libs/libglvnd
-	media-libs/libjpeg-turbo:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg )
-	glut? ( media-libs/freeglut )
-	lua? ( ${LUA_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# add a ~/.celestia for extra directories
-	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
-	# allow forcing CMake to look for a specific Lua version instead of the newest branch installed
-	"${FILESDIR}"/${PN}-1.7.0-cmake_lua_version.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	### This version of Celestia has a bug in the font rendering and
-	### requires -fsigned-char. We should be able to force this flag
-	### on all architectures. See bug #316573.
-	append-flags "-fsigned-char"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CELX="$(usex lua)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK=OFF
-		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WIN=OFF
-		-DENABLE_FFMPEG="$(usex ffmpeg)"
-	)
-	# Upstream always looks for LuaJIT first unless stopped, and we only need
-	# the version specification when linking against PUC Lua
-	if use lua && ! use lua_single_target_luajit ; then
-		mycmakeargs+=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=ON
-			-DLUA_VERSION=$(lua_get_version)
-		)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
-	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
-
-	local backend
-	for backend in glut qt5 ; do
-		use ${backend} && domenu debian/celestia-${backend/qt5/qt}.desktop
-	done
-
-	dodoc AUTHORS README TRANSLATORS *.txt
-}
diff --git a/x11-apps/luit/luit-20221028.ebuild b/x11-apps/luit/luit-20221028.ebuild
index b8a410a16f2d..e618a6926e74 100644
--- a/x11-apps/luit/luit-20221028.ebuild
+++ b/x11-apps/luit/luit-20221028.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	sys-libs/zlib
diff --git a/x11-terms/xterm/xterm-376.ebuild b/x11-terms/xterm/xterm-376.ebuild
index b6e762538ddf..c28b148dfc7c 100644
--- a/x11-terms/xterm/xterm-376.ebuild
+++ b/x11-terms/xterm/xterm-376.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="