7 files changed, 42 insertions, 1 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7bb75c09a91b..ddf2c7860013 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 471115a6defe..27207c6da3f9 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
+# app-text/pandoc is keyworded on this architecture
+net-libs/gssdp -man
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-10-07)
 # sys-libs/libsmbios is available here.
 app-laptop/pbbuttonsd -macbook
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 86c730432612..d05f85bc365d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
+# app-text/pandoc is not keyworded on most architectures
+net-libs/gssdp man
+
 # Matt Turner <mattst88@gentoo.org> (2022-09-26)
 # Requires nautilus-43.0 which is keyworded everywhere
 >=app-arch/file-roller-43.0 nautilus
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index d1763f389d74..decc363f2408 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
+# app-text/pandoc is not stable
+net-libs/gssdp man
+
 # Matt Turner <mattst88@gentoo.org> (2022-11-16)
 # Depends on libsoup:3.0
 >=gnome-base/gvfs-1.50 http
diff --git a/profiles/features/merged-usr/make.defaults b/profiles/features/merged-usr/make.defaults
index f6b244c0bf14..6df2f8cf94ab 100644
--- a/profiles/features/merged-usr/make.defaults
+++ b/profiles/features/merged-usr/make.defaults
@@ -1,3 +1,4 @@
 # Mike Gilbert <floppym@gentoo.org> (2022-08-31)
 # Avoid removing merged-usr symlinks.
 UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin /usr/sbin"
+UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /usr/lib/modules/*"
diff --git a/profiles/package.mask b/profiles/package.mask
index a411070ed818..577611f5f402 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,32 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-11-23)
+# Packages with no maintainer and major issues reported.
+#
+# app-cdr/xbiso: bug #882089, last release in 2005
+# app-emulation/dlx: bug #874933, last release in 2001
+# app-office/sc: bug #877051, last release in 2002
+# app-text/uudeview: bug #882505, last release in 2004
+# net-libs/ortp: bug #874003, last bumped in 2014
+# net-nntp/brag: revdep of app-text/uudeview
+# net-vpn/vtun: bug #875443, last bumped in 2012, last release in 2016
+# sys-apps/fakeroot-ng: bug #851543, last release in 2013
+# sys-apps/pmount-gui: bug #776397, last bumped in 2013, commit in 2019
+# www-apache/mod_common_redirect: bug #874660, bumped in 2010, repo gone
+#
+# Removal on 2022-12-23.
+app-cdr/xbiso
+app-emulation/dlx
+app-office/sc
+app-text/uudeview
+net-libs/ortp
+net-nntp/brag
+net-vpn/vtun
+sys-apps/fakeroot-ng
+sys-apps/pmount-gui
+www-apache/mod_common_redirect
+
 # David Seifert <soap@gentoo.org> (2022-11-23)
 # EAPI 6, no revdeps in tree, never made it into upstream boost, library
 # only, last release 6 years ago. Removal on 2022-12-23.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 96c9b9e847e4..a640ab80c239 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -416,6 +416,7 @@ app-editors/emacs:mailutils - Retrieve e-mail using net-mail/mailutils instead o
 app-editors/emacs:source - Install C source files and make them available for find-function
 app-editors/emacs:threads - Add elisp threading support
 app-editors/emacs:toolkit-scroll-bars - Use the selected toolkit's scrollbars in preference to Emacs' own scrollbars
+app-editors/emacs:tree-sitter - Support the dev-libs/tree-sitter parsing library
 app-editors/emacs:wide-int - Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.
 app-editors/emacs:xwidgets - Enable use of GTK widgets in Emacs buffers (requires GTK3)
 app-editors/fe:sendmail - Send mail after editor abend
@@ -6035,6 +6036,7 @@ net-libs/gnutls:test-full - Enable full test mode
 net-libs/gnutls:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 net-libs/gnutls:tools - Build extra tools
 net-libs/gnutls:valgrind - Enable usage of dev-util/valgrind in debug
+net-libs/gssdp:man - Generate man page for tools
 net-libs/ldns:dane - Enable DNS-based Authentication of Named Entities (DANE) support
 net-libs/ldns:ecdsa - Enable ECDSA support
 net-libs/ldns:ed25519 - Enable ED25519 support
@@ -8348,7 +8350,7 @@ sys-fs/cryptsetup:pwquality - Use dev-libs/libpwquality for password quality che
 sys-fs/cryptsetup:reencrypt - Build cryptsetup-reencrypt
 sys-fs/cryptsetup:ssh - Build cryptsetup-ssh for experimental support of token via SSH-server
 sys-fs/cryptsetup:urandom - Use /dev/urandom instead of /dev/random
-sys-fs/dmraid:intel_led - Enable Intel LED support
+sys-fs/dmraid:intel-led - Enable Intel LED support
 sys-fs/dmraid:led - Enable LED support
 sys-fs/dmraid:mini - Create a minimal binary suitable for early boot environments
 sys-fs/dosfstools:compat - Install symlinks for legacy names of the tools