5 files changed, 40 insertions, 48 deletions
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 7521686e4e29..ffc3b6f06ec7 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -53,6 +53,13 @@ dev-java/openjdk:17 system-bootstrap
 >=sys-devel/llvm-14 llvm_targets_VE
 >=sys-devel/llvm-16 llvm_targets_LoongArch
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Upstream plans to drop libcrypt.so.1/crypt.h from glibc
+# distribution and rely on external providers like libxcrypt.
+# Here we are following that path too.
+<sys-libs/glibc-2.33-r2 crypt
+sys-libs/libxcrypt system compat
+
 # Sam James <sam@gentoo.org> (2021-03-08)
 # Broken without USE=unicode
 # Needs to link with libiconv, bug #774507
@@ -131,13 +138,6 @@ sys-libs/libcxx libcxxabi
 # the flag.
 sys-kernel/vanilla-kernel initramfs
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
-# Upstream plans to drop libcrypt.so.1/crypt.h from glibc
-# distribution and rely on external providers like libxcrypt.
-# Here we are following that path too.
-<sys-libs/glibc-2.33-r2 crypt
-sys-libs/libxcrypt system compat
-
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # <dev-scheme/guile-2 is package.mask'd, so force USE=guile2
 media-sound/lilypond guile2
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 158be19da4d4..ad2cc7f835a9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -360,6 +360,11 @@ sys-kernel/dracut test
 # Dependency requires sys-apps/systemd. Will only be unmasked in systemd target.
 kde-plasma/plasma-meta firewall
 
+# Tobias Klausmann <klausman@gentoo.org> (2021-04-16)
+# Newer (>=4.4.0) versions of Quodlibet have a different library structure, so
+# puddletag needs to be updated to handle that.
+media-sound/puddletag quodlibet
+
 # Joonas Niilola <juippis@gentoo.org> (2021-04-12)
 # Creates +130 GB worth of bindings, possibly Gentoo-related.
 # Upstream issue: https://phab.enlightenment.org/T8924
@@ -467,6 +472,10 @@ net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
 # caution!
 dev-libs/efl efl-one
 
+# Ross Charles Campbell <rossbridger.cc@gmail.com> (2020-09-21)
+# Since >=dev-games/ogre-1.11.2 is masked, mask contribovis USE.
+media-libs/opencv contribovis
+
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
 app-metrics/collectd collectd_plugins_onewire
@@ -750,24 +759,16 @@ dev-java/icedtea cacao jamvm
 # dev-lang/python[berkdb] fails with recent multilib sys-libs/db (bug 519584).
 dev-lang/python berkdb
 
-# Lars Wendler <polynomial-c@gentoo.org> (2015-03-19)
-# >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2
-games-strategy/freeciv system-lua
-
 # Andrew Savchenko <bircoph@gentoo.org> (2015-02-11)
 # Cluster code is still under development, only base functionality
 # is implemented. Masking for testing and evaluation.
 app-admin/clsync cluster mhash
 
 # Brian Evans <grknight@gentoo.org> (2014-11-29)
-# Strongly recommened by upstream to disable lzo and zlib due to memory leaks
+# Strongly recommended by upstream to disable lzo and zlib due to memory leaks
 # https://github.com/groonga/groonga/issues/6 (Japanese)
 app-text/groonga lzo zlib
 
-# Jeroen Roovers <jer@gentoo.org> (2014-11-18)
-# Requires dev-lang/lua-5.2 (bug #253269)
-net-analyzer/nmap system-lua
-
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
 # Most targets do not support ASAN/etc... #504200.
 sys-devel/gcc sanitize
@@ -839,6 +840,10 @@ sci-libs/mathgl octave
 # Mask pdnsd's Linux-specific USE flags.
 net-dns/pdnsd urandom
 
+# Alexis Ballier <aballier@gentoo.org> (2011-02-16)
+# Win32 specific useflag for vlc. Can be used for cross-compiling.
+media-video/vlc directx
+
 # Tomas Touceda <chiiph@gentoo.org> (2010-04-13)
 # Masked because libsvm module is broken with this release on every arch.
 dev-lisp/clisp svm
@@ -847,16 +852,3 @@ dev-lisp/clisp svm
 # Don't use system-wide mode unless you *really* know what you're doing.
 # Keep it masked here so that I don't need to manage two versions every time.
 media-sound/pulseaudio-daemon system-wide
-
-# Alexis Ballier <aballier@gentoo.org> (2011-02-16)
-# Win32 specific useflag for vlc. Can be used for cross-compiling.
-media-video/vlc directx
-
-# Ross Charles Campbell <rossbridger.cc@gmail.com> (2020-09-21)
-# Since >=dev-games/ogre-1.11.2 is masked, mask contribovis USE.
-media-libs/opencv contribovis
-
-# Tobias Klausmann <klausman@gentoo.org> (2021-04-16)
-# Newer (>=4.4.0) versions of Quodlibet have a different library structure, so
-# puddletag needs to be updated to handle that.
-media-sound/puddletag quodlibet
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 6d1df4e1afa2..a431476297e3 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -247,6 +247,11 @@ media-libs/opencv vtk
 # dev-libs/opencryptoki will not be stabile any time soon (bug#510204)
 app-crypt/tpm-tools pkcs11
 
+# Samuli Suominen <ssuominen@gentoo.org> (2014-03-19)
+# Some open source OpenCL providers cause sandbox violation while accessing /dev/dri/card*
+# from a command like eg. `/usr/bin/mogrify -version`, see bug #472766
+<media-gfx/imagemagick-7.0.10.34 opencl
+
 # Ian Delaney <idella4@gentoo.org> (2013-12-09)
 # subsequent to the total inaction of the maintainer of
 # ocaml to honour / respond in any way to
@@ -254,11 +259,6 @@ app-crypt/tpm-tools pkcs11
 # become a stabilisable package
 app-emulation/xen-tools ocaml
 
-# Samuli Suominen <ssuominen@gentoo.org> (2014-03-19)
-# Some open source OpenCL providers cause sandbox violation while accessing /dev/dri/card*
-# from a command like eg. `/usr/bin/mogrify -version`, see bug #472766
-<media-gfx/imagemagick-7.0.10.34 opencl
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (2013-03-28)
 # Depends on unstable sci-libs/avogadrolibs
 kde-apps/kalzium editor
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 386046f5ef09..867a8a5c613e 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -71,21 +71,21 @@ kernel_Darwin
 kernel_SunOS
 kernel_Winnt
 
-# Diego Pettenò <flameeyes@gentoo.org> (2006-12-30)
-# These are specific of Mac OS X
-aqua
-coreaudio
-
 # Jeremy Olexa <darkside@gentoo.org>
 # The prefix USE flags should never be used on non prefix profiles
 prefix
 prefix-guest
 prefix-stack
 
+# Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-27)
+# netlink is a Linux-specific interface
+netlink
+
 # Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-18)
 # Prelude is being masked for removal
 prelude
 
-# Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-27)
-# netlink is a Linux-specific interface
-netlink
+# Diego Pettenò <flameeyes@gentoo.org> (2006-12-30)
+# These are specific to Mac OS X
+aqua
+coreaudio
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 4cb6c49e0416..6333d64dce62 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,11 +4,16 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Currently in testing and not ready to go stable yet.
+ruby_targets_ruby31
+ruby_targets_ruby32
+
 # Brian Evans <grknight@gentoo.org> (2022-12-09)
 # PHP 8.2 is in testing
 php_targets_php8-2
 
-# Alfredo Tupone <tupone@gentoo.org> (2022-12-4)
+# Alfredo Tupone <tupone@gentoo.org> (2022-12-04)
 # sys-devel/gcc:12 is not stable yet
 ada_target_gcc_12_2_0
 
@@ -24,8 +29,3 @@ darcs
 # Needs dev-python/pypy* stable
 python_targets_pypy3
 python_single_target_pypy3
-
-# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
-# Currently in testing and not ready to go stable yet.
-ruby_targets_ruby31
-ruby_targets_ruby32