17 files changed, 35 insertions, 24 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5ccc9160ff0f..5f7cd3fe5852 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 55d421be337c..7dff65e5cba2 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -19,7 +19,7 @@ dev-perl/DBD-mysql mysql
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-01)
 # Qt 6 not keyworded here.
-app-doc/doxygen gui
+app-text/doxygen gui
 dev-util/cmake gui
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
@@ -95,7 +95,7 @@ net-misc/openvswitch unwind
 net-misc/openntpd constraints
 
 # Matthew Smith <matthew@gentoo.org> (2022-07-10)
-# Needs unkeyworded app-doc/halibut
+# Needs unkeyworded app-text/halibut
 >=net-misc/putty-0.77 doc
 
 # Sam James <sam@gentoo.org> (2022-04-29)
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index b093459c091f..d418fadc5814 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -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
 
 # Eli Schwartz <eschwartz93@gmail.com> (2023-10-19)
@@ -59,7 +59,7 @@ dev-qt/qtwebview
 dev-python/PyQt6-WebEngine
 dev-python/PyQtWebEngine
 app-admin/calamares
-app-doc/zeal
+app-text/zeal
 app-editors/ghostwriter
 app-editors/retext
 app-misc/anki
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 7ed8c817b9a5..fed64262f02f 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -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
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-02-06)
@@ -9,7 +9,7 @@ dev-qt/qtwebview
 dev-python/PyQt6-WebEngine
 dev-python/PyQtWebEngine
 app-admin/calamares
-app-doc/zeal
+app-text/zeal
 app-editors/ghostwriter
 app-editors/retext
 app-misc/anki
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 658ed1841278..db535bdd298b 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -40,7 +40,7 @@ sys-apps/openrc s6
 
 # Sam James <sam@gentoo.org> (2023-09-24)
 # Qt not keyworded here.
-app-doc/doxygen gui
+app-text/doxygen gui
 
 # Sam James <sam@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index a6c413079884..3b44f1b6c94c 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -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
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -153,7 +153,7 @@ dev-libs/check subunit
 
 # Matt Turner <mattst88@gentoo.org> (2020-12-23)
 # dev-libs/xapian is not stable on hppa
-app-doc/doxygen doxysearch
+app-text/doxygen doxysearch
 
 # Matt Turner <mattst88@gentoo.org> (2020-12-23)
 # x11-base/xorg-server not stable.
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 120a1d315ece..601ed1930ae3 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -31,7 +31,7 @@ sys-apps/openrc s6
 
 # Sam James <sam@gentoo.org> (2023-09-24)
 # Qt not keyworded here.
-app-doc/doxygen gui
+app-text/doxygen gui
 
 # Sam James <sam@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index b52d2fc7d881..090a12840d35 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -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
 
 # James Le Cuirot (2023-12-12)
@@ -63,7 +63,7 @@ sys-block/thin-provisioning-tools test
 
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # Requires texlive and friends to be keyworded.
-app-doc/doxygen doc
+app-text/doxygen doc
 app-text/po4a test
 dev-libs/libcbor doc
 media-libs/libcaca doc
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 5b09873be1d4..52eb3ff1932f 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -216,7 +216,7 @@ dev-python/numpydoc test
 
 # Matthias Maier <tamiko@gentoo.org> (2014-12-24)
 # sys-devel/clang is not keyworded
-app-doc/doxygen clang
+app-text/doxygen clang
 
 # Ryan Hill <dirtyepic@gentoo.org> (2014-01-07)
 # req net-libs/webkit-gtk:2
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index fdb185a70ce3..eea643e25034 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -29,7 +29,7 @@ sys-apps/openrc s6
 
 # Sam James <sam@gentoo.org> (2023-09-24)
 # Qt not keyworded here.
-app-doc/doxygen gui
+app-text/doxygen gui
 
 # Sam James <sam@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index e5e59371a746..fe1888ca9b8b 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -1,9 +1,9 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2023-12-30)
 # Qt not marked stable here.
-app-doc/doxygen gui
+app-text/doxygen gui
 
 # Rolf Eike Beer <eike@sf-mail.de> (2023-12-22)
 # media-libs/libavif isn't stable here
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index f6a6e9619706..10f699892e51 100644
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -17,7 +17,7 @@ dev-qt/qtwebview
 dev-python/PyQt6-WebEngine
 dev-python/PyQtWebEngine
 app-admin/calamares
-app-doc/zeal
+app-text/zeal
 app-editors/ghostwriter
 app-editors/retext
 app-misc/anki
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 628183019dce..f3b18e0b0533 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -864,7 +864,7 @@ media-libs/libsdl2 custom-cflags
 
 # Kacper Kowalik <xarthisius@gentoo.org> (2013-05-19)
 # Fails to build, haven't had time to debug
-app-doc/doxygen sqlite
+app-text/doxygen sqlite
 
 # Bernard Cafarelli <voyageur@gentoo.org> (2013-04-04)
 # Broken for now (segmentation fault on play)
diff --git a/profiles/package.mask b/profiles/package.mask
index 546cc8cbb3c6..d10e14d6733e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -410,6 +410,11 @@ dev-python/ruamel-std-pathlib
 ~media-libs/pulseaudio-qt-1.4.0
 ~net-libs/kdsoap-2.2.0
 ~net-libs/kdsoap-ws-discovery-client-0.3.0
+~net-libs/signon-ui-0.15_p20231016
+~net-libs/accounts-qt-1.16_p20220803
+~net-libs/accounts-qml-0.7_p20231028
+~net-libs/signon-oauth2-0.25_p20210102
+=net-libs/signond-8.61-r100
 ~sys-auth/polkit-qt-0.175.0
 
 # Hans de Graaff <graaff@gentoo.org> (2023-12-17)
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index fcace264232f..be24ff596323 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -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
 
 # Fabian Groffen <grobian@gentoo.org> (2022-02-13)
@@ -26,7 +26,7 @@ net-libs/libsoup gssapi samba vala
 net-libs/glib-networking gnome libproxy
 net-misc/wget metalink uuid
 sys-apps/dbus selinux elogind systemd
-app-doc/doxygen clang doxysearch qt5 gui
+app-text/doxygen clang doxysearch qt5 gui
 app-text/ghostscript-gpl cups
 app-text/texlive-core cjk
 
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index 8890ca93d6a4..29de82324a16 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -1,2 +1,8 @@
 move dev-python/pysol_cards dev-python/pysol-cards
 move sys-kernel/installkernel-gentoo sys-kernel/installkernel
+move app-doc/NaturalDocs app-text/NaturalDocs
+move app-doc/doxygen app-text/doxygen
+move app-doc/halibut app-text/halibut
+move app-doc/psmark app-text/psmark
+move app-doc/xmltoman app-text/xmltoman
+move app-doc/zeal app-text/zeal
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6cd3f9c89f11..19cfe619c778 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -406,9 +406,6 @@ app-dicts/gwaei:mecab - Enable app-text/mecab support
 app-dicts/myspell-pt:preao - Use the pre ortographic agreement version of the dictionary
 app-doc/csound-manual:html - Install HTML documentation
 app-doc/devmanual:offline - Use alternative minimal stylesheet instead of Tyrian theme
-app-doc/doxygen:clang - support for sys-devel/clang assisted parsing
-app-doc/doxygen:dot - allow to create dot graphs using media-gfx/graphviz
-app-doc/doxygen:doxysearch - build doxyindexer and doxysearch.cgi
 app-doc/kicad-doc:html - Generate documentation in HTML format
 app-doc/kicad-doc:pdf - Generate documentation in PDF format
 app-doc/linuxfromscratch:htmlsingle - Install all-on-one-page HTML version.
@@ -1137,6 +1134,9 @@ app-text/dictd:minimal - Don't build server but dict client, dictzip and dictfmt
 app-text/docbook-sgml-utils:jadetex - Add support for processing tex files produced by the TeX backend of Jade
 app-text/docbook-xsl-ns-stylesheets:ruby - Install the Ruby-based dbtoepub script; requires an interpreter compatible with app-eselect/eselect-ruby.
 app-text/docbook-xsl-stylesheets:ruby - Install the Ruby-based dbtoepub script; requires an interpreter compatible with app-eselect/eselect-ruby.
+app-text/doxygen:clang - support for sys-devel/clang assisted parsing
+app-text/doxygen:dot - allow to create dot graphs using media-gfx/graphviz
+app-text/doxygen:doxysearch - build doxyindexer and doxysearch.cgi
 app-text/ebook-tools:lit2epub - Install lit2epub script
 app-text/editorconfig-core-c:cli - Install command line interface.
 app-text/enchant:aspell - Adds support for app-text/aspell spell checker
@@ -5635,7 +5635,7 @@ net-fs/nfs-utils:nfsidmap - Enable support for newer nfsidmap helper
 net-fs/nfs-utils:nfsv4 - Enable support for NFSv4
 net-fs/nfs-utils:nfsv41 - Enable support for NFSv4.1
 net-fs/nfs-utils:uuid - Support UUID lookups in rpc.mountd
-net-fs/openafs:apidoc - Build API documentation using app-doc/doxygen. May take a *long* time to build.
+net-fs/openafs:apidoc - Build API documentation using app-text/doxygen. May take a *long* time to build.
 net-fs/openafs:bitmap-later - Enable fast startup of file server by not reading bitmap till needed.
 net-fs/openafs:fuse - Build fuse client.
 net-fs/openafs:kauth - Install the DEPRECATED kauth server, PAM modules, and utilities