7 files changed, 2 insertions, 883 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index c13479aff5f1..d713ad6d8955 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 7c24e058355f..23f7bbeb21dd 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,11 +1,5 @@
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
-DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0
-DIST grass-8.4.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4
 DIST grass-8.4.1.tar.gz 69956380 BLAKE2B 7324ffa2f0031f5fbe8cdfb186d246f8a431b295f1e6a8d2946baafa8009af3d4ee89be494e04faf3083d40e24f714fb40b7e1c9aa8b0eec6434541659daa22e SHA512 b24c017910e83a26566af0f2dd6c6cac86d69027dd209923b049b5e15f5dae96820ac57b4332ebec7254662aa94a4a5a07d376941fb829b6327de0652de35d32
-DIST grass-8.4.1RC1.tar.gz 70287232 BLAKE2B 9fa54d30524372d520fdb9fd99c4e7daff1607d9e3f32ffa1fd3ce6ca37f42d257747b4be5c96a419ac247bf0a7684d6ca0b117e968b1136c47714e1b6c30325 SHA512 71088bbc47d7bc798db7fdf9ab3f25ff9ad04ac2e108cbd3d3d6db77c36f85821579a78a40bdfe1c9ab75b0c6c8f3e2f23b5dcbb233aed4c60526f1d3db79349
-EBUILD grass-8.3.2-r1.ebuild 7414 BLAKE2B 00ffdea572849cfcc9a4d408d0e1186d867cfce32ac71449f7f989eb31aad9ed5aa03b64d1be21c987ce3af8660853b8718eb8217bf2e9a8d051e3b8d269fa55 SHA512 b33a9ddef6e899e5c5b8a9d3aa6fbd72da376d6e3c0d57328b278f5369258a74cff6d8dffaba50bc90d586fbd248ee4597704704cf706fc0977344c655c16d3d
-EBUILD grass-8.4.0.ebuild 7436 BLAKE2B 472eb1862c2b2d62ae7edcf58d65f1b915fbfddccc9ab1a7f10fe7eac67dbd667cf653d3cd3e08c4f2e3a7879fe40eb185a865b4e49292821d81b3b81ac9583c SHA512 6661435844184fc2d57350f1333d994ebadc52ce9a645dec3e828c5af3d71bb5e027a496556d48bbf0f9ccabf251417c50664ec3d130875b031fde5247ff61b3
 EBUILD grass-8.4.1.ebuild 7490 BLAKE2B f28ce9249e4b78e547e430a9a7214d0c162c02b5067a0b154c608d540435a0c5e87959ff1678a3cfaf5368b391a49e8c3f1a1bbbcdf39b97a1293e641614b0dc SHA512 88c49d14f45c10788e66b219153247e1d9af45f71ae6818247a958431a5052bf875eaf1749bb15e7fee15dab2c2eb0be41e679326ce4fc3ac09c848aa86e4e88
-EBUILD grass-8.4.1_rc1.ebuild 7437 BLAKE2B a02efee1d9c44a3c7a4930f958e78ccbb887cc49073e6738a3c3880fae205bf0764e6c005ff57634778c5abc4686916318d6dd8dbb710218163dddc748082209 SHA512 93c7e5091b24be8fd920a52ea059a7ca82ed9ca32823c0394d696098662ef869e40efd6fd78274a368a9aa88bcb427c0b533d26e798a50d1b4901b42c6731bb3
 EBUILD grass-9999.ebuild 7431 BLAKE2B 9fc59e2325744228f295dd88ff2f4f8ea93654c1009339ecc3f21c24c009ca217c87fd30194af7d11ce44080371b25fe327d080ab4ff0a339e3f5a47905591c0 SHA512 fd6291a29646e47796a641a3816f80731739d49d10141b06ac0c74a7ca2f2674719dab18d7c8b3f467a5d69c17fcd2048146c1375c052a43c9e5cf2f40962f70
 MISC metadata.xml 1316 BLAKE2B 508c5fdf769d6563bb585ccd0a7072675f2725fa0702ca9e3f9b3963bd5379312dda36e37ba2fc58c7a85e03c035484abbe95a2e6651d51ea7fa97e013897355 SHA512 1f58db0827750b585c64c8321d47b4277a8472b1073f0216f06cf211aeea6ad53065634b4003269560282b22679b90d34b077d447f8ae07c16a4dbe905cf9b79
diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
deleted file mode 100644
index ecd7091746ae..000000000000
--- a/sci-geosciences/grass/grass-8.3.2-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-
-inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-
-LICENSE="GPL-2"
-
-if [[ ${PV} =~ "9999" ]]; then
-	SLOT="0/8.3"
-else
-	SLOT="0/$(ver_cut 1-2 ${PV})"
-fi
-
-GVERSION=${SLOT#*/}
-MY_PM="${PN}${GVERSION}"
-MY_PM="${MY_PM/.}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
-else
-	MY_P="${P/_rc/RC}"
-	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~ppc ~x86"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )
-	pdal? ( cxx )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:=
-	sci-libs/proj:=
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	bzip2? ( app-arch/bzip2:= )
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	las? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	pdal? ( >=sci-libs/pdal-2.0.0:= )
-	png? ( media-libs/libpng:= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(python_gen_cond_dep '
-			>=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}]
-			dev-python/pillow[${PYTHON_USEDEP}]
-			>=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}]
-		')
-		x11-libs/cairo[X]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*atlas.*/}" ]]; then
-			ewarn "You need to set lapack to atlas or reference. Do:"
-			ewarn "   eselect lapack set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		if [[ -z "${myblas/.*reference.*/}" ]] && \
-			[[ -z "${myblas/.*atlas.*/}" ]]; then
-			ewarn "You need to set blas to atlas or reference. Do:"
-			ewarn "   eselect blas set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-
-	# When patching the build system, avoid running autoheader here. The file
-	# config.in.h is maintained manually upstream. Changes to it may lead to
-	# undefined behavior. See bug #866554.
-	# AT_NOEAUTOHEADER=1 eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card*)
-	for card in ${ati_cards[@]}; do
-		addpredict "${card}"
-	done
-	mesa_cards=$(echo -n /dev/dri/card*)
-	for card in ${mesa_cards[@]}; do
-		addpredict "${card}"
-	done
-	nvidia_cards=$(echo -n /dev/nvidia*)
-	for card in ${nvidia_cards[@]}; do
-		addpredict "${card}"
-	done
-	render_cards=$(echo -n /dev/dri/renderD128*)
-	for card in ${render_cards[@]}; do
-		addpredict "${card}"
-	done
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862579
-	# https://github.com/OSGeo/grass/issues/3506
-	#
-	# Do not trust it with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with bzip2 bzlib)
-		$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
-		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	if use X; then
-		local GUI="--gui"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-8.4.0.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild
deleted file mode 100644
index 9bcb89663a35..000000000000
--- a/sci-geosciences/grass/grass-8.4.0.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-
-inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-
-LICENSE="GPL-2"
-
-if [[ ${PV} =~ "9999" ]]; then
-	SLOT="0/8.4"
-else
-	SLOT="0/$(ver_cut 1-2 ${PV})"
-fi
-
-GVERSION=${SLOT#*/}
-MY_PM="${PN}${GVERSION}"
-MY_PM="${MY_PM/.}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
-else
-	MY_P="${P/_rc/RC}"
-	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~ppc ~x86"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )
-	pdal? ( cxx )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:=
-	sci-libs/proj:=
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	bzip2? ( app-arch/bzip2:= )
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	las? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	pdal? ( >=sci-libs/pdal-2.0.0:= )
-	png? ( media-libs/libpng:= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:= )
-	sqlite? ( dev-db/sqlite:3 )
-	svm? ( sci-libs/libsvm:= )
-	tiff? ( media-libs/tiff:= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(python_gen_cond_dep '
-			>=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}]
-			dev-python/pillow[${PYTHON_USEDEP}]
-			>=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}]
-		')
-		x11-libs/cairo[X]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*atlas.*/}" ]]; then
-			ewarn "You need to set lapack to atlas or reference. Do:"
-			ewarn "   eselect lapack set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		if [[ -z "${myblas/.*reference.*/}" ]] && \
-			[[ -z "${myblas/.*atlas.*/}" ]]; then
-			ewarn "You need to set blas to atlas or reference. Do:"
-			ewarn "   eselect blas set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-
-	# When patching the build system, avoid running autoheader here. The file
-	# config.in.h is maintained manually upstream. Changes to it may lead to
-	# undefined behavior. See bug #866554.
-	# AT_NOEAUTOHEADER=1 eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card*)
-	for card in ${ati_cards[@]}; do
-		addpredict "${card}"
-	done
-	mesa_cards=$(echo -n /dev/dri/card*)
-	for card in ${mesa_cards[@]}; do
-		addpredict "${card}"
-	done
-	nvidia_cards=$(echo -n /dev/nvidia*)
-	for card in ${nvidia_cards[@]}; do
-		addpredict "${card}"
-	done
-	render_cards=$(echo -n /dev/dri/renderD128*)
-	for card in ${render_cards[@]}; do
-		addpredict "${card}"
-	done
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862579
-	# https://github.com/OSGeo/grass/issues/3506
-	#
-	# Do not trust it with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with bzip2 bzlib)
-		$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
-		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with svm libsvm)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	if use X; then
-		local GUI="--gui"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-8.4.1_rc1.ebuild b/sci-geosciences/grass/grass-8.4.1_rc1.ebuild
deleted file mode 100644
index 7da62249a44a..000000000000
--- a/sci-geosciences/grass/grass-8.4.1_rc1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-
-inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-
-LICENSE="GPL-2"
-
-if [[ ${PV} =~ "9999" ]]; then
-	SLOT="0/8.4"
-else
-	SLOT="0/$(ver_cut 1-2 ${PV})"
-fi
-
-GVERSION=${SLOT#*/}
-MY_PM="${PN}${GVERSION}"
-MY_PM="${MY_PM/.}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
-else
-	MY_P="${P/_rc/RC}"
-	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~ppc ~x86"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )
-	pdal? ( cxx )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:=
-	sci-libs/proj:=
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	bzip2? ( app-arch/bzip2:= )
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	las? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	pdal? ( >=sci-libs/pdal-2.0.0:= )
-	png? ( media-libs/libpng:= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:= )
-	sqlite? ( dev-db/sqlite:3 )
-	svm? ( sci-libs/libsvm:= )
-	tiff? ( media-libs/tiff:= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(python_gen_cond_dep '
-			>=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}]
-			dev-python/pillow[${PYTHON_USEDEP}]
-			>=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}]
-		')
-		x11-libs/cairo[X]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*atlas.*/}" ]]; then
-			ewarn "You need to set lapack to atlas or reference. Do:"
-			ewarn "   eselect lapack set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		if [[ -z "${myblas/.*reference.*/}" ]] && \
-			[[ -z "${myblas/.*atlas.*/}" ]]; then
-			ewarn "You need to set blas to atlas or reference. Do:"
-			ewarn "   eselect blas set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-
-	# When patching the build system, avoid running autoheader here. The file
-	# config.in.h is maintained manually upstream. Changes to it may lead to
-	# undefined behavior. See bug #866554.
-	# AT_NOEAUTOHEADER=1 eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card*)
-	for card in ${ati_cards[@]}; do
-		addpredict "${card}"
-	done
-	mesa_cards=$(echo -n /dev/dri/card*)
-	for card in ${mesa_cards[@]}; do
-		addpredict "${card}"
-	done
-	nvidia_cards=$(echo -n /dev/nvidia*)
-	for card in ${nvidia_cards[@]}; do
-		addpredict "${card}"
-	done
-	render_cards=$(echo -n /dev/dri/renderD128*)
-	for card in ${render_cards[@]}; do
-		addpredict "${card}"
-	done
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862579
-	# https://github.com/OSGeo/grass/issues/3506
-	#
-	# Do not trust it with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with bzip2 bzlib)
-		$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
-		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with svm libsvm)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	if use X; then
-		local GUI="--gui"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 040320bb463c..e22abf556b7f 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -8,6 +8,6 @@ DIST josm-snapshot-19307.jar 18720348 BLAKE2B 163bf92d62ac68e227645d31b185131e3a
 DIST josm-snapshot-19342.jar 18755711 BLAKE2B 9798c79bcdaed686cb0994a4457934a3c91c2f0cea018d9753660c828dd3b08ac38bc4b46d548fbcdd7a15cb6b04965027cf492a8a0458976fa11c88a446bda5 SHA512 f7547abc3372b86596888cdb3cd9604385f7552530a0a47c4eee2d1a53c576a611b6ca8b3cc20eac44b4ebc720fdf53117ec34414fb5c186264f4585574d1356
 DIST josm-snapshot-19369.jar 19020297 BLAKE2B e20d5cb2d07de40290e2bbcdc85cf9597f50552a282d57dd7d6612a1a06e5f29b49dd29f8806cf68526085d01b534c9221852da1973fcbc501364fd1cf2940f4 SHA512 1f65081311f5eed04a489816433463072b6e9cebc914ebc39c780ba119a88aaef2ede3c43ffb73e162a9b521e21d6e5c32df4e2c712afac8b3a9e6ad91a0862d
 EBUILD josm-bin-19307.ebuild 1969 BLAKE2B e77958b09896d5af11def7dbf7655857a0de3e0793b3206bd8a477eec421cddd26eeef203d7233ef4ed6a810760b439d935a175d679a3448942d56c3c5f05dbd SHA512 acd4d5fc7689039cf7075ed0b3eebbba4d03e66e2cfd093e0f0be8cb978a9bdc37223e96c39b00c2fe8ffa7623be21b1f4cbcb5c5d3dff727446aa62ef1a11f4
-EBUILD josm-bin-19342.ebuild 1970 BLAKE2B 94ba9f7df00db5943e7a04ee28ea3aeab2e89ba12dcc8843affef89db4c43dfd13605653bd58c06da3f511964b488f676f41704ebd0020269264cef62799a53c SHA512 fb9b975bea737fe86ce098722b5995b736d9f31ed07f34e81f2354f5ddecb4e4d58d76e656971070ed9c2541c405136928059204ae171ee5ba194083eae19965
+EBUILD josm-bin-19342.ebuild 1969 BLAKE2B e77958b09896d5af11def7dbf7655857a0de3e0793b3206bd8a477eec421cddd26eeef203d7233ef4ed6a810760b439d935a175d679a3448942d56c3c5f05dbd SHA512 acd4d5fc7689039cf7075ed0b3eebbba4d03e66e2cfd093e0f0be8cb978a9bdc37223e96c39b00c2fe8ffa7623be21b1f4cbcb5c5d3dff727446aa62ef1a11f4
 EBUILD josm-bin-19369.ebuild 1970 BLAKE2B 94ba9f7df00db5943e7a04ee28ea3aeab2e89ba12dcc8843affef89db4c43dfd13605653bd58c06da3f511964b488f676f41704ebd0020269264cef62799a53c SHA512 fb9b975bea737fe86ce098722b5995b736d9f31ed07f34e81f2354f5ddecb4e4d58d76e656971070ed9c2541c405136928059204ae171ee5ba194083eae19965
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-19342.ebuild b/sci-geosciences/josm-bin/josm-bin-19342.ebuild
index eb0c8cfe550b..23f514e83b7c 100644
--- a/sci-geosciences/josm-bin/josm-bin-19342.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-19342.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0 GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8"
 BDEPEND="app-arch/unzip"