11 files changed, 33 insertions, 61 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 62175e00f295..33f591f381c3 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index c97ab027f28d..a370355c9fda 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -165,7 +165,6 @@ gnome-extra/gnome-shell-extension-pop-shell
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2020-09-20)
 # Binary-only with no x32 support
 app-office/libreoffice-bin
-app-office/libreoffice-bin-debug
 
 # Hasan ÇALIŞIR <hasan.calisir@psauxit.com> (2019-10-28)
 # requires net-libs/nodejs | sys-apps/yarn
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index a1bf2726fc8c..5783d4f0fa0a 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -51,7 +51,7 @@ dev-python/qtpy remoteobjects
 >=sys-devel/gcc-11 -ada
 
 # Alexey Shvetsov <alexxy@gentoo.org> (2024-11-21)
-# sci-libs/caffe2 is not keyworded on arm64
+# sci-ml/caffe2 is not keyworded on arm64
 sci-chemistry/gromacs nnpot
 
 # Joonas Niilola <juippis@gentoo.org> (2024-11-16)
diff --git a/profiles/arch/mips/package.mask b/profiles/arch/mips/package.mask
index f96d719f45e3..c69b9dad143b 100644
--- a/profiles/arch/mips/package.mask
+++ b/profiles/arch/mips/package.mask
@@ -1,10 +1,9 @@
-# Copyright 2006-2024 Gentoo Authors
+# Copyright 2006-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Arthur Zamarin <arthurzam@gentoo.org> (2024-09-08)
 # requires <llvm-18
 dev-lang/spidermonkey:102
-=sys-auth/polkit-123
 =dev-lang/rust-1.71.1
 =virtual/rust-1.71.1-r2
 
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 8b7df2363a59..46bdf7ed2671 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Alexey Shvetsov <alexxy@gentoo.org> (2024-11-21)
-# sci-libs/caffe2 is not keyworded on riscv
+# sci-ml/caffe2 is not keyworded on riscv
 sci-chemistry/gromacs nnpot
 
 # Benda Xu <heroxbd@gentoo.org> (2024-10-10)
diff --git a/profiles/categories b/profiles/categories
index eb23eea4aeee..40dc2fa551fe 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -135,6 +135,7 @@ sci-geosciences
 sci-libs
 sci-mathematics
 sci-misc
+sci-ml
 sci-physics
 sci-visualization
 sec-keys
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 5ad7199cadf8..7b377e823850 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# NHOrus <jy6x2b32pie9@yahoo.com> (2025-03-13)
+# uses functions musl will not implement, bug #942215
+app-admin/sud
+
 # NHOrus <jy6x2b32pie9@yahoo.com> (2025-02-01)
 # not ported to musl, bug #713434
 app-crypt/mit-krb5-appl
@@ -267,7 +271,6 @@ app-misc/kryoflux-dtc
 app-office/drawio-desktop-bin
 app-office/joplin-desktop
 app-office/libreoffice-bin
-app-office/libreoffice-bin-debug
 app-office/onlyoffice-bin
 app-shells/pwsh-bin
 app-text/master-pdf-editor
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index c2180ac3bcb0..1e3453caa9a0 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -187,7 +187,7 @@ net-analyzer/nagios-plugin-check_raid megaraid-sas
 sys-apps/hwloc gl
 sci-chemistry/gromacs mkl
 sci-libs/armadillo mkl
-sci-libs/caffe2 mkl
+sci-ml/caffe2 mkl
 sci-libs/dlib mkl
 sci-libs/trilinos mkl
 www-client/qutebrowser widevine
diff --git a/profiles/package.mask b/profiles/package.mask
index 9d0c5f7f0def..2ba2dfac0ced 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -251,42 +251,10 @@ app-text/fictionup
 # Removal on 2025-03-16.
 app-emulation/vkd3d
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2025-02-13)
-# Last release 10 years ago, dead upstream, depends on Qt5, no one else
-# packages this. Removal on 2025-03-14.
-x11-misc/kaqaz
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2025-02-12)
-# Depends on deprecated Qt5Script, gone closed-source upstream, multiple
-# open bugs #912829, #913106, #922304, #922306, #926039, #935772, #935887,
-# no response from maintainer. Removal on 2025-03-14.
-net-analyzer/ostinato
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2025-02-12)
-# Last release from 2021 even if not yet dead upstream; however completely
-# unmaintained in Gentoo, with the ensuing multiple longstanding bugs
-# #832614, #866935, #895806, #915790, #944379, #945060; ebuild still based
-# on EAPI-7, USE=javascript depending on deprecated Qt5Script, USE=qt5
-# blocking qt5-removal, etc. This package was already problematic during
-# transition from Qt4 to Qt5, I will not deal with it this time.
-# Removal on 2025-03-14.
-net-p2p/eiskaltdcpp
-
 # Maciej Barć <xgqt@gentoo.org> (2025-02-12)
 # Masked for testing. Fails to update from previous version. See bug #949626.
 >=x11-themes/fluent-icon-theme-2025.02.10
 
-# Ionen Wolkens <ionen@gentoo.org> (2025-02-11)
-# Fails to build with >=gcc14 and >=clang16 (Modern C) and tests fail
-# among several other accumulating issues.  Hasn't received a release
-# since 2013 and snapshots been difficult due to upstream often doing
-# refactoring leading to various runtime regressions, and testing the
-# state downstream is not obvious (current snapshot has some runtime
-# issues too).  Re-adding could be considered if there is ever a proper
-# release.  Recommend using games-fps/darkplaces instead.
-# Removal on 2025-03-13. Bugs #931506, #926463, #919237, #908709, ...
-games-fps/quakeforge
-
 # Matt Jolly <kangie@gentoo.org> (2025-02-10)
 # Rust ebuilds are migrating to use RPATH/RUNPATH to find their libraries.
 # New revisions for each Slot are already in-tree and should be used instead.
diff --git a/profiles/updates/1Q-2025 b/profiles/updates/1Q-2025
index 85bc04dad989..9437606e9a55 100644
--- a/profiles/updates/1Q-2025
+++ b/profiles/updates/1Q-2025
@@ -2,3 +2,12 @@ move dev-python/pyside6 dev-python/pyside
 slotmove dev-php/pecl-ssh2 0 7
 slotmove dev-php/pecl-stomp 0 7
 move dev-util/rr dev-debug/rr
+move sci-libs/evaluate sci-ml/evaluate
+move sci-libs/transformers sci-ml/transformers
+move sci-libs/tokenizers sci-ml/tokenizers
+move sci-libs/datasets sci-ml/datasets
+move sci-libs/huggingface_hub sci-ml/huggingface_hub
+move sci-libs/safetensors sci-ml/safetensors
+move sci-libs/torchvision sci-ml/torchvision
+move sci-libs/pytorch sci-ml/pytorch
+move sci-libs/caffe2 sci-ml/caffe2
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e995ca675105..e0ed803a7fcd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -97,7 +97,6 @@ app-admin/pass:X - Use x11-misc/xclip to copy passwords to the clipboard.
 app-admin/pass:dmenu - Add support for x11-misc/dmenu with the 'passmenu' program.
 app-admin/pass:git - Use dev-vcs/git for password revisions.
 app-admin/pass:importers - Allow importing passwords from other password managers using various contributed scripts.
-app-admin/pass-otp:qrcode - Add support for qrcodes using media-gfx/qrencode
 app-admin/passwordsafe:qr - Enable QR code password display
 app-admin/passwordsafe:xml - Enable XML import support
 app-admin/passwordsafe:yubikey - Enable support for Yubikey
@@ -3229,8 +3228,6 @@ games-fps/quake2-icculus:demo - Install the demo files (quake2-demodata) and con
 games-fps/quake2-icculus:qmax - Build the pretty version (quake max)
 games-fps/quake2-icculus:rogue - Build support for the 'Ground Zero' Mission Pack (rogue)
 games-fps/quake2-icculus:xatrix - Build support for the 'The Reckoning' Mission Pack (xatrix)
-games-fps/quakeforge:client - Build Normal and QuakeWorld clients alongside the servers
-games-fps/quakeforge:wildmidi - Use media-sound/wildmidi for midi support
 games-fps/redeclipse:dedicated - Install only as a dedicated game server
 games-fps/rott:demo - Install the shareware version
 games-fps/sauerbraten:server - Compile server support
@@ -4586,6 +4583,7 @@ media-libs/xine-lib:xvmc - Enable support for XVideo Motion Compensation (accele
 media-libs/zita-resampler:tools - Install zresample and zretune tools
 media-libs/zmusic:fluidsynth - Enable support for MIDI via media-sound/fluidsynth
 media-libs/zmusic:mpg123 - Enable support for MPEG audio playback via media-sound/mpg123
+media-libs/zvbi:proxy - Share V4L and V4L2 VBI devices between multiple applications
 media-libs/zxing-cpp:experimental - Enable experimental features via media-libs/zint
 media-plugins/alsa-plugins:arcam_av - Enables Arcam AV control plugin
 media-plugins/alsa-plugins:mix - Enables upmix and vdownmix plugin
@@ -6808,11 +6806,6 @@ net-p2p/bitcoin-core:zeromq - Report blocks and transactions via zeromq
 net-p2p/dbhub:switch-user - Enable support for switching user
 net-p2p/deluge:console - Enable default console UI
 net-p2p/deluge:webinterface - Install dependencies needed for the web interface
-net-p2p/eiskaltdcpp:cli - Enable sample cli based on readline
-net-p2p/eiskaltdcpp:daemon - Enable eiskaltdcpp-daemon
-net-p2p/eiskaltdcpp:dht - Enable DHT (distributed hash table) support for libeiskaltdcpp
-net-p2p/eiskaltdcpp:libcanberra - Enable sound notifications support over libcanberra in EiskaltDC++ Gtk
-net-p2p/eiskaltdcpp:minimal - Don't install headers
 net-p2p/fms:frost - Add support for frost boards
 net-p2p/fms:ssl - Add support for FCP connection over SSL
 net-p2p/freenet:nss - Use nss for crypto operations, if it is the fastest way
@@ -7230,7 +7223,7 @@ sci-chemistry/gromacs:gmxapi - Add support for gmxapi library
 sci-chemistry/gromacs:gmxapi-legacy - Enable installing lagacy headers
 sci-chemistry/gromacs:hwloc - Enable HWLoc lib support
 sci-chemistry/gromacs:mkl - Use sci-libs/mkl for fft, blas, lapack routines
-sci-chemistry/gromacs:nnpot - Allow to use sci-libs/caffe2 for NN Potentials
+sci-chemistry/gromacs:nnpot - Allow to use sci-ml/caffe2 for NN Potentials
 sci-chemistry/gromacs:offensive - Enable gromacs partly offensive quotes
 sci-chemistry/gromacs:opencl - Enable opencl non-bonded kernels
 sci-chemistry/gromacs:single-precision - Single precision version of gromacs (default)
@@ -7336,19 +7329,6 @@ sci-libs/blis:eselect-ldso - Enable runtime library switching by eselect and ld.
 sci-libs/blis:openmp - Use openmp threadding model
 sci-libs/blis:pthread - Use pthread threadding model
 sci-libs/blis:serial - Use no threadding model
-sci-libs/caffe2:distributed - Support distributed applications
-sci-libs/caffe2:fbgemm - Use FBGEMM
-sci-libs/caffe2:flash - Enable flash attention
-sci-libs/caffe2:gloo - Use sci-libs/gloo
-sci-libs/caffe2:mkl - Use sci-libs/mkl for blas, lapack and sparse blas routines
-sci-libs/caffe2:nnpack - Use NNPACK
-sci-libs/caffe2:numpy - Add support for math operations through numpy
-sci-libs/caffe2:onednn - Use oneDNN
-sci-libs/caffe2:openblas - Use sci-libs/openblas for blas routines
-sci-libs/caffe2:openmp - Use OpenMP for parallel code
-sci-libs/caffe2:qnnpack - Use QNNPACK
-sci-libs/caffe2:rocm - Enable ROCm gpu computing support
-sci-libs/caffe2:xnnpack - Use XNNPACK
 sci-libs/cantera:hdf5 - Add HDF5 container files support
 sci-libs/cantera:python - Install Python bindings and conversion tools from Chemkin to Cantera format
 sci-libs/cddlib:tools - Add a few executables and tests for cddlib
@@ -7712,6 +7692,19 @@ sci-misc/h5utils:octave - Build Octave plugins
 sci-misc/nco:dap - Support for remote data access with the NETCDF DAP client
 sci-misc/nco:ncap2 - Build next generation netcdf arithmetic processor (needs dev-java/antlr)
 sci-misc/nco:udunits - Add sci-libs/udunits files support
+sci-ml/caffe2:distributed - Support distributed applications
+sci-ml/caffe2:fbgemm - Use FBGEMM
+sci-ml/caffe2:flash - Enable flash attention
+sci-ml/caffe2:gloo - Use sci-libs/gloo
+sci-ml/caffe2:mkl - Use sci-libs/mkl for blas, lapack and sparse blas routines
+sci-ml/caffe2:nnpack - Use NNPACK
+sci-ml/caffe2:numpy - Add support for math operations through numpy
+sci-ml/caffe2:onednn - Use oneDNN
+sci-ml/caffe2:openblas - Use sci-libs/openblas for blas routines
+sci-ml/caffe2:openmp - Use OpenMP for parallel code
+sci-ml/caffe2:qnnpack - Use QNNPACK
+sci-ml/caffe2:rocm - Enable ROCm gpu computing support
+sci-ml/caffe2:xnnpack - Use XNNPACK
 sci-physics/bullet:double-precision - Build libraries in double precision
 sci-physics/bullet:extras - Build the extras
 sci-physics/bullet:tbb - Enable multithreading with the Intel Threads Building Block dev-cpp/tbb