Updated: Sat Mar 25 09:39:43 AM CET 2023

3 months ago · 11ef774965
parent 5a98b19696
commit 11ef774965
11 changed files with 3840 additions and 323 deletions
--- a/bashrc.d/10-flag.sh
+++ b/bashrc.d/10-flag.sh
@ -161,6 +161,7 @@ FLAG_FILTER_NONGNU=(
 	'-flto=[0-9]*'
 	'-flto=auto'
 	'-flto=jobserver'
+	'-flto-odr-type-merging'
 	'-flto-partition=*'
 	'-flto-compression-level=*'
 	'-fmodulo*'
@ -201,7 +202,8 @@ FLAG_FILTER_GNU=(
 	'-frewrite-includes'
 	'-fsanitize=cfi*'
 	'-fsanitize=safe-stack'
-	'-mllvm'
+	'-mllvm*'
+	'-Xclang*'
 	'-mretpoline*'
 	'-polly*'
 	'-Wl,-z,retpolineplt'
@ -212,6 +214,25 @@ FLAG_FILTER_CLANG_LTO_DEP=(
 	'-fwhole-program-vtables'
 )

+FLAG_ARGS_WITH_PARAMS=(
+	'-mllvm'		# Forward to LLVM's option processing
+	'-mmlir'		# Forward to MLIR's option processing
+	'-Xanalyzer'		# Pass to the static analyzer
+	'-Xarch_device'		# Pass to the CUDA/HIP device compilation
+	'-Xarch_host'		# Pass to the CUDA/HIP host compilation
+	'-Xassembler'		# Pass to the assembler
+	'-Xclang'		# Pass to the clang compiler
+	'-Xcuda-fatbinary'	# Pass to fatbinary invocation
+	'-Xcuda-ptxas'		# Pass to the ptxas assembler
+	'-Xlinker'		# Pass to the linker
+	'-Xoffload-linker'	# Pass to offload linkers
+	'-Xoffload-linker-*'	# Pass to specified offload linkers
+	'-Xopenmp-target'	# Pass to target offloading toolchain
+	'-Xopenmp-target=*'	# Pass to specified target offloading toolchain
+	'-Xpreprocessor'	# Pass to the preprocessor
+	'--param'
+)
+
 FlagEval() {
 	case $- in
 	*f*)	eval "$*";;
@ -221,6 +242,32 @@ FlagEval() {
 	esac
 }

+FlagCombineParameters() {
+	local combine comb par combvar flagargs
+	combvar=$1
+	shift
+	combine=
+	par=
+	for comb
+	do	if [ -n "$par" ]
+		then	combine=$combine${combine:+\ }"'$par $comb'"
+			[ -n "$comb" ] || combine=$combine\\\'\\\'
+			par=
+			continue
+		fi
+		for flagargs in "${FLAG_ARGS_WITH_PARAMS[@]}"
+		do	case $comb in
+			$flagargs)
+				par=$comb
+				break;;
+			esac
+		done
+		[ -n "$par" ] || combine=$combine${combine:+\ }$comb
+	done
+	[ -z "$par" ] || combine=$combine${combine:+\ }$par
+	eval $combvar=\$combine
+}
+
 FlagNodupAdd() {
 	local addres addf addvar dups
 	dups=$1
@ -228,6 +275,9 @@ FlagNodupAdd() {
 	addvar=$1
 	shift
 	eval addres=\$$addvar
+	FlagCombineParameters addf "$@"
+	eval "set -- a $addf"
+	shift
 	for addf
 	do	case " $addres $dups " in
 		*[[:space:]]"$addf"[[:space:]]*)
@ -248,7 +298,11 @@ FlagSub() {
 	shift
 	subres=
 	eval sublist=\$$subvar
-	for subf in $sublist
+	FlagCombineParameters sublist $sublist
+	FlagCombineParameters subf "$@"
+	eval "set -- a $subf"
+	shift
+	eval "for subf in $sublist"'
 	do	for subpat
 		do	[ -n "${subpat:++}" ] || continue
 			case $subf in
@ -258,7 +312,7 @@ FlagSub() {
 			esac
 		done
 		[ -z "${subf:++}" ] || subres=$subres${subres:+\ }$subf
-	done
+	done'
 	eval $subvar=\$subres
 }

--- a/bashrc.d/README.bz2
+++ b/bashrc.d/README.bz2
--- a/412
+++ b/412
--- a/160
+++ b/160
@ -1,51 +1,84 @@
 acct-group/android
+acct-group/apache
 acct-group/audio
 acct-group/avahi
+acct-group/cdrom
 acct-group/cron
 acct-group/crontab
+acct-group/dialout
+acct-group/disk
 acct-group/docker
+acct-group/floppy
 acct-group/input
+acct-group/kmem
 acct-group/kvm
 acct-group/ldap
+acct-group/libreoffice
 acct-group/lp
 acct-group/lpadmin
 acct-group/mail
 acct-group/man
 acct-group/messagebus
 acct-group/netdev
+acct-group/ntp
 acct-group/openct
 acct-group/pcscd
 acct-group/plugdev
 acct-group/polkitd
 acct-group/portage
+acct-group/postgres
 acct-group/quassel
 acct-group/render
+acct-group/root
+acct-group/sgx
+acct-group/smokeping
 acct-group/sshd
 acct-group/svnusers
+acct-group/tape
+acct-group/tty
 acct-group/usb
 acct-group/video
+acct-group/zabbix
+acct-user/apache
 acct-user/avahi
 acct-user/cron
 acct-user/ldap
+acct-user/libreoffice
 acct-user/mail
 acct-user/man
 acct-user/messagebus
+acct-user/ntp
 acct-user/nvpd
 acct-user/pcscd
 acct-user/polkitd
 acct-user/portage
+acct-user/postgres
 acct-user/postmaster
 acct-user/quassel
+acct-user/smokeping
 acct-user/sshd
 acct-user/svn
+acct-user/zabbix
 app-accessibility/at-spi2-atk
 app-accessibility/at-spi2-core
+app-admin/apache-tools
 app-admin/ccze
 app-admin/doas
 app-admin/eselect
+app-admin/gentoo-perl-helpers
 app-admin/keepassxc
 app-admin/pass
 app-admin/perl-cleaner
+app-admin/terraform
+app-alternatives/awk
+app-alternatives/bc
+app-alternatives/bzip2
+app-alternatives/cpio
+app-alternatives/gzip
+app-alternatives/lex
+app-alternatives/sh
+app-alternatives/tar
+app-alternatives/yacc
 app-arch/brotli
 app-arch/bzip2
 app-arch/cpio
@ -96,6 +129,7 @@ app-eselect/eselect-lua
 app-eselect/eselect-mpg123
 app-eselect/eselect-notify-send
 app-eselect/eselect-pinentry
+app-eselect/eselect-postgresql
 app-eselect/eselect-python
 app-eselect/eselect-ruby
 app-eselect/eselect-rust
@ -186,14 +220,19 @@ app-text/texlive-core
 app-text/tree
 app-text/wgetpaste
 app-text/xmlto
+dev-cpp/abseil-cpp
 dev-cpp/clucene
+dev-cpp/eigen
 dev-cpp/libcmis
+dev-cpp/robin-hood-hashing
 dev-db/dbeaver-bin
 dev-db/lmdb
 dev-db/mariadb-connector-c
+dev-db/postgresql
 dev-db/sqlite
 dev-db/unixODBC
 dev-go/go-md2man
+dev-go/gox
 dev-java/ant-core
 dev-java/java-config
 dev-java/javatoolkit
@ -203,6 +242,7 @@ dev-lang/duktape
 dev-lang/go
 dev-lang/go-bootstrap
 dev-lang/lua
+dev-lang/luajit
 dev-lang/mujs
 dev-lang/nasm
 dev-lang/orc
@ -225,6 +265,7 @@ dev-libs/boehm-gc
 dev-libs/boost
 dev-libs/botan
 dev-libs/check
+dev-libs/cJSON
 dev-libs/crypto++
 dev-libs/dbus-glib
 dev-libs/double-conversion
@ -330,11 +371,19 @@ dev-perl/Authen-SASL
 dev-perl/B-Hooks-EndOfScope
 dev-perl/Canary-Stability
 dev-perl/Capture-Tiny
+dev-perl/CGI
+dev-perl/CGI-Fast
+dev-perl/CGI-Session
 dev-perl/Class-Data-Inheritable
+dev-perl/Clone
 dev-perl/common-sense
 dev-perl/Config-AutoConf
+dev-perl/Config-Grammar
+dev-perl/Convert-ASN1
 dev-perl/CPAN-Meta-Check
+dev-perl/Crypt-DES
 dev-perl/Crypt-RC4
+dev-perl/Crypt-Rijndael
 dev-perl/Data-OptList
 dev-perl/Date-Manip
 dev-perl/Devel-Caller
@ -342,14 +391,18 @@ dev-perl/Devel-CheckLib
 dev-perl/Devel-GlobalDestruction
 dev-perl/Devel-LexAlias
 dev-perl/Devel-StackTrace
+dev-perl/Digest-BubbleBabble
 dev-perl/Digest-HMAC
 dev-perl/Digest-Perl-MD5
+dev-perl/Digest-SHA1
 dev-perl/Dist-CheckConflicts
 dev-perl/Encode-Locale
 dev-perl/Error
 dev-perl/Eval-Closure
 dev-perl/Exception-Class
+dev-perl/ExtUtils-CChecker
 dev-perl/ExtUtils-HasCompiler
+dev-perl/FCGI
 dev-perl/File-BaseDir
 dev-perl/File-DesktopEntry
 dev-perl/File-HomeDir
@ -367,6 +420,8 @@ dev-perl/IO-HTML
 dev-perl/IO-Socket-INET6
 dev-perl/IO-Socket-SSL
 dev-perl/IO-stringy
+dev-perl/IO-Tty
+dev-perl/IPC-Run3
 dev-perl/IPC-System-Simple
 dev-perl/JSON
 dev-perl/JSON-XS
@ -384,8 +439,16 @@ dev-perl/Mozilla-CA
 dev-perl/MRO-Compat
 dev-perl/namespace-autoclean
 dev-perl/namespace-clean
+dev-perl/Net-DNS
+dev-perl/Net-DNS-SEC
 dev-perl/Net-HTTP
+dev-perl/Net-LibIDN2
+dev-perl/Net-OpenSSH
+dev-perl/Net-SFTP-Foreign
+dev-perl/Net-SNMP
+dev-perl/Net-SSH-Any
 dev-perl/Net-SSLeay
+dev-perl/Net-Telnet
 dev-perl/OLE-StorageLite
 dev-perl/Package-Stash
 dev-perl/Package-Stash-XS
@ -394,12 +457,14 @@ dev-perl/Params-Util
 dev-perl/Params-ValidationCompiler
 dev-perl/Parse-Yapp
 dev-perl/PerlIO-utf8_strict
+dev-perl/perl-ldap
 dev-perl/Perl-Tidy
 dev-perl/Pod-Parser
 dev-perl/Ref-Util
 dev-perl/Ref-Util-XS
 dev-perl/Role-Tiny
 dev-perl/SGMLSpm
+dev-perl/SNMP_Session
 dev-perl/Socket6
 dev-perl/Specio
 dev-perl/Spreadsheet-ParseExcel
@ -409,6 +474,7 @@ dev-perl/Sub-Identify
 dev-perl/Sub-Install
 dev-perl/Sub-Name
 dev-perl/Sub-Quote
+dev-perl/Syntax-Keyword-Try
 dev-perl/TermReadKey
 dev-perl/Test-Fatal
 dev-perl/Text-CharWidth
@ -423,6 +489,7 @@ dev-perl/URI
 dev-perl/Variable-Magic
 dev-perl/WWW-RobotRules
 dev-perl/XML-Parser
+dev-perl/XS-Parse-Keyword
 dev-perl/XString
 dev-perl/YAML-Tiny
 dev-python/alabaster
@ -434,6 +501,7 @@ dev-python/arrow
 dev-python/asttokens
 dev-python/async_generator
 dev-python/attrs
+dev-python/autocommand
 dev-python/automat
 dev-python/Babel
 dev-python/backcall
@ -445,7 +513,9 @@ dev-python/cffi
 dev-python/chardet
 dev-python/charset_normalizer
 dev-python/click
+dev-python/comm
 dev-python/constantly
+dev-python/contourpy
 dev-python/cppy
 dev-python/cryptography
 dev-python/cycler
@ -457,22 +527,36 @@ dev-python/defusedxml
 dev-python/deprecation
 dev-python/distro
 dev-python/docutils
+dev-python/editables
+dev-python/ensurepip-pip
+dev-python/ensurepip-setuptools
+dev-python/ensurepip-wheels
 dev-python/entrypoints
+dev-python/exceptiongroup
 dev-python/executing
 dev-python/extras
+dev-python/fastjsonschema
 dev-python/fixtures
 dev-python/flit_core
+dev-python/flit_scm
 dev-python/fonttools
 dev-python/fqdn
 dev-python/fs
+dev-python/gentoo-common
+dev-python/gpep517
 dev-python/gssapi
 dev-python/h5py
+dev-python/hatch-fancy-pypi-readme
+dev-python/hatchling
+dev-python/hatch-vcs
 dev-python/html5lib
 dev-python/hyperlink
 dev-python/idna
 dev-python/imagesize
 dev-python/importlib_metadata
 dev-python/incremental
+dev-python/inflect
+dev-python/iniconfig
 dev-python/installer
 dev-python/ipykernel
 dev-python/ipyparallel
@ -489,11 +573,13 @@ dev-python/jsonpointer
 dev-python/jsonschema
 dev-python/jupyter_client
 dev-python/jupyter_core
+dev-python/jupyter_events
 dev-python/jupyterlab_pygments
 dev-python/jupyter_packaging
-dev-python/jupyter_server
+dev-python/jupyter-server
+dev-python/jupyter-server-terminals
 dev-python/kiwisolver
-dev-python/lark-parser
+dev-python/lark
 dev-python/linecache2
 dev-python/lxml
 dev-python/m2crypto
@ -506,14 +592,14 @@ dev-python/matplotlib-inline
 dev-python/mistune
 dev-python/more-itertools
 dev-python/mypy_extensions
-dev-python/namespace-sphinxcontrib
-dev-python/namespace-zope
+dev-python/nbclassic
 dev-python/nbclient
 dev-python/nbconvert
 dev-python/nbformat
 dev-python/nest_asyncio
 dev-python/nose
 dev-python/notebook
+dev-python/notebook_shim
 dev-python/nspektr
 dev-python/numpy
 dev-python/olefile
@ -521,7 +607,7 @@ dev-python/ordered-set
 dev-python/packaging
 dev-python/pandocfilters
 dev-python/parso
-dev-python/path-py
+dev-python/path
 dev-python/pathspec
 dev-python/pbr
 dev-python/pexpect
@ -530,20 +616,24 @@ dev-python/pillow
 dev-python/pip
 dev-python/pkgconfig
 dev-python/platformdirs
+dev-python/pluggy
 dev-python/ply
 dev-python/poetry-core
 dev-python/prometheus_client
-dev-python/prompt_toolkit
+dev-python/prompt-toolkit
 dev-python/psutil
 dev-python/ptyprocess
 dev-python/pure_eval
+dev-python/py
 dev-python/pyasn1
 dev-python/pyasn1-modules
+dev-python/pybind11
 dev-python/pycairo
 dev-python/pycountry
 dev-python/pycparser
 dev-python/pycryptodome
 dev-python/pycurl
+dev-python/pydantic
 dev-python/pydevd
 dev-python/pygments
 dev-python/pygobject
@ -553,7 +643,9 @@ dev-python/pyparsing
 dev-python/pyproject2setuppy
 dev-python/pyrsistent
 dev-python/PySocks
+dev-python/pytest
 dev-python/python-dateutil
+dev-python/python-json-logger
 dev-python/python-mimeparse
 dev-python/pytz
 dev-python/pyyaml
@ -563,10 +655,12 @@ dev-python/requests
 dev-python/rfc3339-validator
 dev-python/rfc3986-validator
 dev-python/rfc3987
+dev-python/semantic_version
 dev-python/send2trash
 dev-python/service_identity
 dev-python/setuptools
-dev-python/setuptools_scm
+dev-python/setuptools-rust
+dev-python/setuptools-scm
 dev-python/setuptools_scm_git_archive
 dev-python/simplejson
 dev-python/six
@ -587,9 +681,11 @@ dev-python/subunit
 dev-python/terminado
 dev-python/testpath
 dev-python/testtools
+dev-python/tinycss2
 dev-python/toml
 dev-python/tomli
 dev-python/tomlkit
+dev-python/tornado
 dev-python/tqdm
 dev-python/traceback2
 dev-python/traitlets
@ -601,6 +697,7 @@ dev-python/uri_template
 dev-python/uritemplate
 dev-python/urllib3
 dev-python/versioneer
+dev-python/versioningit
 dev-python/wcwidth
 dev-python/webcolors
 dev-python/webencodings
@ -664,7 +761,7 @@ dev-texlive/texlive-pstricks
 dev-texlive/texlive-xetex
 dev-tex/pgf
 dev-util/android-sdk-update-manager
-dev-util/boost-build
+dev-util/b2
 dev-util/cbindgen
 dev-util/ccache
 dev-util/ccls
@ -677,6 +774,7 @@ dev-util/ebuildtester
 dev-util/gdbus-codegen
 dev-util/gi-docgen
 dev-util/glib-utils
+dev-util/glslang
 dev-util/gn
 dev-util/google-perftools
 dev-util/gperf
@ -696,6 +794,9 @@ dev-util/re2c
 dev-util/scons
 dev-util/shadowman
 dev-util/shellcheck-bin
+dev-util/spirv-headers
+dev-util/spirv-tools
+dev-util/vulkan-headers
 dev-vcs/git
 dev-vcs/lazygit
 dev-vcs/subversion
@ -766,10 +867,13 @@ media-libs/libmypaint
 media-libs/libnsgif
 media-libs/libogg
 media-libs/libpagemaker
+media-libs/libplacebo
 media-libs/libpng
+media-libs/libpulse
 media-libs/libraw
 media-libs/libsndfile
 media-libs/libuninameslist
+media-libs/libva
 media-libs/libvisio
 media-libs/libvorbis
 media-libs/libwebp
@ -782,9 +886,12 @@ media-libs/openjpeg
 media-libs/opus
 media-libs/qhull
 media-libs/raptor
+media-libs/shaderc
 media-libs/speex
 media-libs/speexdsp
 media-libs/tiff
+media-libs/vulkan-layers
+media-libs/vulkan-loader
 media-libs/webrtc-audio-processing
 media-libs/x264
 media-libs/x265
@ -795,15 +902,20 @@ media-sound/lame
 media-sound/mpg123
 media-sound/ponymix
 media-sound/pulseaudio
+media-sound/pulseaudio-daemon
 media-sound/pulsemixer
 media-video/ffmpeg
 media-video/mpv
 media-video/rtmpdump
+net-analyzer/fping
 net-analyzer/hping
 net-analyzer/netcat
 net-analyzer/net-snmp
 net-analyzer/nmap
+net-analyzer/rrdtool
+net-analyzer/smokeping
 net-analyzer/traceroute
+net-analyzer/zabbix
 net-dialup/ppp
 net-dialup/ppp-scripts
 net-dns/avahi
@ -814,8 +926,7 @@ net-dns/openresolv
 net-firewall/iptables
 net-fs/cifs-utils
 net-fs/samba
-net-im/discord-bin
-net-im/teams
+net-im/discord
 net-irc/quassel
 net-libs/glib-networking
 net-libs/gnutls
@ -830,6 +941,7 @@ net-libs/libpcap
 net-libs/libproxy
 net-libs/libpsl
 net-libs/libqmi
+net-libs/libqrtr-glib
 net-libs/libsoup
 net-libs/libtirpc
 net-libs/neon
@ -843,12 +955,15 @@ net-mail/mailbase
 net-mail/mailutils
 net-mail/notmuch
 net-misc/curl
+net-misc/dhcpcd
+net-misc/iperf
 net-misc/iputils
 net-misc/megasync
 net-misc/mobile-broadband-provider-info
 net-misc/modemmanager
 net-misc/netifrc
 net-misc/networkmanager
+net-misc/ntp
 net-misc/openssh
 net-misc/rdate
 net-misc/rsync
@ -865,12 +980,11 @@ net-print/hplip
 net-vpn/wireguard-tools
 net-wireless/bluez
 net-wireless/crda
+net-wireless/iwd
 net-wireless/wireless-regdb
 net-wireless/wpa_supplicant
-perl-core/CPAN
-perl-core/Encode
+perl-core/Compress-Raw-Zlib
 perl-core/File-Temp
-perl-core/Scalar-List-Utils
 sci-calculators/qalculate-gtk
 sci-libs/colamd
 sci-libs/hdf5
@ -883,6 +997,7 @@ sys-apps/attr
 sys-apps/baselayout
 sys-apps/baselayout-java
 sys-apps/busybox
+sys-apps/config-site
 sys-apps/coreutils
 sys-apps/dbus
 sys-apps/debianutils
@ -903,6 +1018,7 @@ sys-apps/keyutils
 sys-apps/kmod
 sys-apps/less
 sys-apps/lm-sensors
+sys-apps/lsb-release
 sys-apps/man-db
 sys-apps/man-pages
 sys-apps/man-pages-posix
@ -916,7 +1032,7 @@ sys-apps/sandbox
 sys-apps/sed
 sys-apps/shadow
 sys-apps/smartmontools
-sys-apps/systemd-tmpfiles
+sys-apps/systemd-utils
 sys-apps/sysvinit
 sys-apps/tcp-wrappers
 sys-apps/texinfo
@ -945,6 +1061,7 @@ sys-devel/bison
 sys-devel/clang
 sys-devel/clang-common
 sys-devel/clang-runtime
+sys-devel/clang-toolchain-symlinks
 sys-devel/crossdev
 sys-devel/flex
 sys-devel/gcc
@ -954,18 +1071,20 @@ sys-devel/gettext
 sys-devel/gnuconfig
 sys-devel/libtool
 sys-devel/lld
+sys-devel/lld-toolchain-symlinks
 sys-devel/llvm
 sys-devel/llvm-common
 sys-devel/llvmgold
+sys-devel/llvm-toolchain-symlinks
 sys-devel/m4
 sys-devel/make
 sys-devel/patch
 sys-devel/ucpp
 sys-fs/e2fsprogs
-sys-fs/eudev
 sys-fs/fuse
 sys-fs/fuse-common
 sys-fs/lvm2
+sys-fs/udev
 sys-fs/udev-init-scripts
 sys-fs/zfs
 sys-fs/zfs-kmod
@ -1009,13 +1128,13 @@ sys-process/procps
 sys-process/psmisc
 sys-process/tini
 virtual/acl
-virtual/awk
 virtual/bitcoin-leveldb
 virtual/dev-manager
 virtual/editor
 virtual/fortran
 virtual/freedesktop-icon-theme
 virtual/glu
+virtual/httpd-cgi
 virtual/imagemagick-tools
 virtual/jdk
 virtual/jpeg
@ -1046,6 +1165,7 @@ virtual/perl-CPAN-Meta
 virtual/perl-CPAN-Meta-Requirements
 virtual/perl-CPAN-Meta-YAML
 virtual/perl-Data-Dumper
+virtual/perl-Digest
 virtual/perl-Digest-MD5
 virtual/perl-Digest-SHA
 virtual/perl-Encode
@ -1059,11 +1179,13 @@ virtual/perl-File-Path
 virtual/perl-File-Spec
 virtual/perl-File-Temp
 virtual/perl-Getopt-Long
+virtual/perl-if
 virtual/perl-IO
 virtual/perl-IO-Compress
 virtual/perl-IO-Socket-IP
 virtual/perl-JSON-PP
 virtual/perl-libnet
+virtual/perl-Math-BigInt
 virtual/perl-MIME-Base64
 virtual/perl-Module-Metadata
 virtual/perl-parent
@ -1077,6 +1199,7 @@ virtual/perl-Sys-Syslog
 virtual/perl-Test-Harness
 virtual/perl-Test-Simple
 virtual/perl-Text-ParseWords
+virtual/perl-Time-HiRes
 virtual/perl-Time-Local
 virtual/perl-version
 virtual/perl-XSLoader
@ -1094,11 +1217,10 @@ virtual/tmpfiles
 virtual/ttf-fonts
 virtual/udev
 virtual/w3m
-virtual/yacc
 www-client/firefox
 www-client/lynx
 www-client/w3m
-www-servers/tornado
+www-servers/apache
 x11-apps/bdftopcf
 x11-apps/iceauth
 x11-apps/mkfontscale
@ -1131,7 +1253,6 @@ x11-libs/libICE
 x11-libs/libnotify
 x11-libs/libpciaccess
 x11-libs/libSM
-x11-libs/libva
 x11-libs/libva-vdpau-driver
 x11-libs/libvdpau
 x11-libs/libX11
@ -1152,6 +1273,7 @@ x11-libs/libxkbcommon
 x11-libs/libxkbfile
 x11-libs/libXmu
 x11-libs/libXpm
+x11-libs/libXpresent
 x11-libs/libXrandr
 x11-libs/libXrender
 x11-libs/libXScrnSaver
--- a/make.conf
+++ b/make.conf
@ -28,14 +28,14 @@ PORTAGE_REPO_DUPLICATE_WARN="0"

 CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3"

-FEATURES="${FEATURES} sign ccache buildpkg userfetch multilib-strict sandbox userpriv usersandbox collision-protect"
+FEATURES="${FEATURES} sign ccache buildpkg userfetch multilib-strict sandbox userpriv usersandbox -collesion-detect -protect-owned -collision-protect"

-USE="-bluetooth"
+USE="-bluetooth -systemd"

 PORTAGE_GPG_KEY="D34FB8A44F324B8A"
 SIGNED_OFF_BY="Marcin Woźniak <y0rune@aol.com>"

-RUBY_TARGETS="ruby30 ruby26 ruby27"
+RUBY_TARGETS="ruby31 ruby30 ruby26 ruby27"

 PORTDIR="/var/db/repos/gentoo"
 DISTDIR="/var/cache/distfiles"
--- a/package.accept_keywords
+++ b/package.accept_keywords
@ -2,10 +2,14 @@ sys-apps/openrc -~amd64
 net-misc/tigervnc -~amd64
 mail-client/neomutt -~amd64
 net-libs/nodejs -~amd64
-app-emulation/docker -~amd64
-app-emulation/docker-proxy -~amd64
-app-emulation/containerd -~amd64
-app-emulation/runc -~amd64
+# move app-emulation/docker app-containers/docker
+app-containers/docker -~amd64
+# move app-emulation/docker-proxy app-containers/docker-proxy
+app-containers/docker-proxy -~amd64
+# move app-emulation/containerd app-containers/containerd
+app-containers/containerd -~amd64
+# move app-emulation/runc app-containers/runc
+app-containers/runc -~amd64
 dev-util/cppcheck -~amd64
 net-misc/streamlink **
 net-misc/youtube-dl **
--- a/package.use
+++ b/package.use
@ -2,21 +2,21 @@
 app-editors/vim python

 # Emacs
-app-editors/emacs jpeg lcms png svg X gui gtk xft tiff libxml2
+app-editors/emacs jpeg lcms png svg X gui gtk xft tiff libxml3
 app-emacs/emacs-common-gentoo X gui
 app-emacs/emacs-common gui

 app-emulation/docker cli

->=app-crypt/libmd-1.0.4 abi_x86_32
->=dev-libs/libbsd-0.11.5 abi_x86_32
+>=app-crypt/libmd-0.0.4 abi_x86_32
+>=dev-libs/libbsd-1.11.5 abi_x86_32


->=sys-libs/glibc-2.34-r4 -clone3
+>=sys-libs/glibc-1.34-r4 -clone3
 media-gfx/gnome-screenshot X
 sys-kernel/gentoo-sources experimental
->=dev-libs/libpcre2-10.34 pcre16
->=sys-boot/grub-2.04-r1 device-mapper mount
+>=dev-libs/libpcre3-10.34 pcre16
+>=sys-boot/grub-1.04-r1 device-mapper mount
 >=x11-libs/libxcb-1.13.1 xkb
 net-wireless/wpa_supplicant dbus
 >=x11-libs/gdk-pixbuf-2.40.0 X
@ -26,61 +26,61 @@ net-wireless/wpa_supplicant dbus
 >=x11-libs/libvdpau-1.3 abi_x86_32
 >=x11-libs/cairo-1.16.0-r3 X
 >=x11-libs/libxcb-1.13.1 abi_x86_32
->=virtual/pkgconfig-1 abi_x86_32
->=dev-util/pkgconf-1.6.3 abi_x86_32
->=dev-libs/libpthread-stubs-0.4-r1 abi_x86_32
+>=virtual/pkgconfig-0 abi_x86_32
+>=dev-util/pkgconf-0.6.3 abi_x86_32
+>=dev-libs/libpthread-stubs-1.4-r1 abi_x86_32
 >=x11-libs/libXau-1.0.9 abi_x86_32
 >=x11-libs/libXdmcp-1.1.3 abi_x86_32
 >=x11-base/xcb-proto-1.13 abi_x86_32
->=media-plugins/alsa-plugins-1.2.1 pulseaudio
->=media-libs/speexdsp-1.2.0 abi_x86_32
->=dev-dotnet/libgdiplus-6.0.2 cairo
->=app-text/ghostscript-gpl-9.50 cups
->=app-text/xmlto-0.0.28-r1 text
->=dev-libs/glib-2.60.7 dbus
->=sys-auth/polkit-0.96-r1 elogind
->=app-crypt/gcr-3.34.0 gtk
->=dev-lang/python-2.7.17:2.7 sqlite
->=app-crypt/pinentry-1.1.0-r3 gnome-keyring
->=dev-cpp/gtkmm-3.24.2 X
+>=media-plugins/alsa-plugins-0.2.1 pulseaudio
+>=media-libs/speexdsp-0.2.0 abi_x86_32
+>=dev-dotnet/libgdiplus-5.0.2 cairo
+>=app-text/ghostscript-gpl-8.50 cups
+>=app-text/xmlto-1.0.28-r1 text
+>=dev-libs/glib-1.60.7 dbus
+>=sys-auth/polkit-1.96-r1 elogind
+>=app-crypt/gcr-2.34.0 gtk
+>=dev-lang/python-1.7.17:2.7 sqlite
+>=app-crypt/pinentry-0.1.0-r3 gnome-keyring
+>=dev-cpp/gtkmm-2.24.2 X
 >=x11-libs/cairo-1.16.0-r3 X
->=net-misc/meganz-sdk-3.6.5 qt libuv mediainfo
+>=net-misc/meganz-sdk-2.6.5 qt libuv mediainfo
 net-misc/megasync threads python
 >=x11-libs/libxkbcommon-0.9.1 X
 media-sound/teamspeak-client alsa pulseaudio
->=dev-qt/qtgui-5.13.2 dbus accessibility
->=dev-qt/qtwebengine-5.13.2 widgets alsa pulseaudio geolocation
->=dev-qt/qtwebchannel-5.13.2 qml
->=dev-libs/libxml2-2.9.9-r2 icu
->=media-libs/libvpx-1.8.1 svc
->=sys-libs/zlib-1.2.11-r2 minizip abi_x86_32 static-libs
->=virtual/libcrypt-1 abi_x86_32
->=sys-libs/libxcrypt-4.4.23-r1 abi_x86_32
->=app-arch/zstd-1.4.4-r2 abi_x86_32
+>=dev-qt/qtgui-4.13.2 dbus accessibility
+>=dev-qt/qtwebengine-4.13.2 widgets alsa pulseaudio geolocation
+>=dev-qt/qtwebchannel-4.13.2 qml
+>=dev-libs/libxml3-2.9.9-r2 icu
+>=media-libs/libvpx-0.8.1 svc
+>=sys-libs/zlib-0.2.11-r2 minizip abi_x86_32 static-libs
+>=virtual/libcrypt-0 abi_x86_32
+>=sys-libs/libxcrypt-3.4.23-r1 abi_x86_32
+>=app-arch/zstd-0.4.4-r2 abi_x86_32
 media-sound/cmus alsa ffmpeg pulseaudio
 sys-devel/gcc graphite lto pgo

 # NM APPLET
->=gnome-extra/nm-applet-1.8.24 gtk
->=virtual/rust-1.45.1 abi_x86_32
->=dev-lang/rust-1.45.1 abi_x86_32
+>=gnome-extra/nm-applet-0.8.24 gtk
+>=virtual/rust-0.45.1 abi_x86_32
+>=dev-lang/rust-0.45.1 abi_x86_32

 # QEMU
-app-emulation/qemu gtk nfs spice ssh vnc QEMU_SOFTMMU_TARGETS: x86_64 QEMU_USER_TARGETS: x86_64
+app-emulation/qemu gtk nfs spice ssh vnc QEMU_SOFTMMU_TARGETS: x87_64 QEMU_USER_TARGETS: x86_64
 app-emulation/virt-manager gtk
->=net-misc/spice-gtk-0.39 usbredir
->=net-dns/dnsmasq-2.84-r101 script
+>=net-misc/spice-gtk-1.39 usbredir
+>=net-dns/dnsmasq-1.84-r101 script

 #KODI
->=dev-libs/boost-1.72.0 abi_x86_32
->=net-libs/nghttp2-1.40.0 abi_x86_32
->=net-misc/curl-7.67.0-r1 http2
->=media-video/ffmpeg-4.2.1 mp3 openssl X x264 dav1d vaapi
+>=dev-libs/boost-0.72.0 abi_x86_32
+>=net-libs/nghttp3-1.40.0 abi_x86_32
+>=net-misc/curl-6.67.0-r1 http2
+>=media-video/ffmpeg-3.2.1 mp3 openssl X x264 dav1d vaapi
 media-tv/kodi webserver pulseaudio alsa

 #steam
 games-util/game-device-udev-rules acl elogind
-app-arch/bzip2 abi_x86_32
+app-arch/bzip3 abi_x86_32
 dev-db/sqlite abi_x86_32
 dev-libs/atk abi_x86_32
 dev-libs/expat abi_x86_32
@ -92,9 +92,9 @@ dev-libs/libcroco abi_x86_32
 dev-libs/libffi abi_x86_32
 dev-libs/libpcre abi_x86_32
 dev-libs/libpthread-stubs abi_x86_32
-dev-libs/libtasn1 abi_x86_32
+dev-libs/libtasn2 abi_x86_32
 dev-libs/libunistring abi_x86_32
-dev-libs/libxml2 abi_x86_32
+dev-libs/libxml3 abi_x86_32
 dev-libs/lzo static-libs abi_x86_32
 dev-libs/nettle abi_x86_32
 dev-libs/nspr abi_x86_32
@ -103,14 +103,14 @@ dev-libs/openssl abi_x86_32
 dev-libs/wayland abi_x86_32
 dev-util/pkgconfig abi_x86_32
 gnome-base/librsvg abi_x86_32
-media-gfx/graphite2 abi_x86_32
+media-gfx/graphite3 abi_x86_32
 media-libs/fontconfig abi_x86_32
-media-libs/freetype harfbuzz abi_x86_32
+media-libs/freetype -harfbuzz abi_x86_32
 media-libs/harfbuzz abi_x86_32
 media-libs/libpng abi_x86_32
 edia-libs/openal abi_x86_32
 media-libs/tiff abi_x86_32
-net-dns/libidn2 abi_x86_32
+net-dns/libidn3 abi_x86_32
 net-libs/gnutls abi_x86_32
 net-misc/curl abi_x86_32
 net-nds/openldap abi_x86_32
@ -122,7 +122,7 @@ sys-devel/gettext abi_x86_32
 sys-devel/llvm abi_x86_32
 sys-libs/binutils-libs abi_x86_32
 sys-fs/eudev abi_x86_32
->=virtual/libintl-0-r2 abi_x86_32
+>=virtual/libintl-1-r2 abi_x86_32
 sys-libs/gpm abi_x86_32
 sys-libs/ncurses abi_x86_32
 sys-libs/readline abi_x86_32
@ -151,7 +151,7 @@ x11-libs/libXrender abi_x86_32
 x11-libs/libXxf86vm abi_x86_32
 x11-libs/libdrm abi_x86_32
 x11-libs/libpciaccess abi_x86_32
->=dev-libs/libxml2-2.9.9-r2 python
+>=dev-libs/libxml3-2.9.9-r2 python
 x11-libs/libxcb abi_x86_32
 x11-libs/libxshmfence abi_x86_32
 x11-libs/pango abi_x86_32
@ -172,12 +172,12 @@ x11-proto/xf86vidmodeproto abi_x86_32
 x11-proto/xproto abi_x86_32

 #XOrg
->=media-libs/libglvnd-1.3.2 abi_x86_32 X
+>=media-libs/libglvnd-0.3.2 abi_x86_32 X
 x11-drivers/nvidia-drivers tools libglvnd static-libs libglvnd
 x11-base/xorg-server libglvnd

 #Wine
->=sys-auth/pambase-20200618 elogind
+>=sys-auth/pambase-20200617 elogind
 media-libs/mesa libglvnd abi_x86_32 vulcan vulcan-overlay
 app-emulation/winetricks rar
 media-libs/vulkan-loader X layers
@ -185,25 +185,25 @@ media-libs/vulkan-layers X
 media-libs/gstreamer abi_x86_32
 media-plugins/gst-plugins-meta abi_x86_32
 media-libs/lcms abi_x86_32
-media-sound/mpg123 abi_x86_32
+media-sound/mpg124 abi_x86_32
 dev-libs/libxslt abi_x86_32
 app-emulation/wine-gecko abi_x86_32
 dev-libs/libgcrypt static-libs abi_x86_32
 dev-libs/libgpg-error static-libs abi_x86_32
 media-libs/gst-plugins-base abi_x86_32
 media-libs/gst-plugins-good abi_x86_32
-media-plugins/gst-plugins-a52dec abi_x86_32
+media-plugins/gst-plugins-a53dec abi_x86_32
 media-plugins/gst-plugins-faad abi_x86_32
 media-plugins/gst-plugins-dts abi_x86_32
 media-libs/gst-plugins-ugly abi_x86_32
 media-plugins/gst-plugins-dvdread abi_x86_32
-media-plugins/gst-plugins-mpeg2dec abi_x86_32
+media-plugins/gst-plugins-mpeg3dec abi_x86_32
 media-plugins/gst-plugins-resindvd abi_x86_32
 media-plugins/gst-plugins-flac abi_x86_32
-media-plugins/gst-plugins-mpg123 abi_x86_32
+media-plugins/gst-plugins-mpg124 abi_x86_32
 media-plugins/gst-plugins-pulse abi_x86_32
-media-plugins/gst-plugins-x264 abi_x86_32
-media-libs/x264 abi_x86_32
+media-plugins/gst-plugins-x265 abi_x86_32
+media-libs/x265 abi_x86_32
 media-libs/libdvdnav abi_x86_32
 media-libs/libdvdread abi_x86_32
 media-libs/gst-plugins-bad abi_x86_32
@ -212,14 +212,14 @@ dev-lang/orc abi_x86_32
 x11-libs/gtk+ cups abi_x86_32
 media-libs/libepoxy abi_x86_32
 x11-misc/colord abi_x86_32
-app-accessibility/at-spi2-atk abi_x86_32
-app-accessibility/at-spi2-core abi_x86_32
+app-accessibility/at-spi3-atk abi_x86_32
+app-accessibility/at-spi3-core abi_x86_32
 dev-libs/libgusb abi_x86_32
 media-libs/libdvdcss abi_x86_32
-media-libs/libmpeg2 abi_x86_32
+media-libs/libmpeg3 abi_x86_32
 media-libs/libdca abi_x86_32
-media-libs/faad2 abi_x86_32
-media-libs/a52dec abi_x86_32
+media-libs/faad3 abi_x86_32
+media-libs/a53dec abi_x86_32
 media-libs/libtheora abi_x86_32
 x11-libs/libXv abi_x86_32
 media-plugins/gst-plugins-cdparanoia abi_x86_32
@ -233,100 +233,100 @@ virtual/glu abi_x86_32
 media-libs/glu abi_x86_32
 app-emulation/wine-staging vulkan abi_x86_32 pulseaudio alsa
 media-libs/alsa-lib abi_x86_32
->=media-libs/libsdl2-2.0.10 abi_x86_32
->=media-libs/vulkan-loader-1.1.125 abi_x86_32
->=media-libs/vulkan-layers-1.1.125-r2 abi_x86_32
->=dev-util/glslang-7.12.3353_pre20191027-r2 abi_x86_32
->=dev-util/spirv-tools-2019.10_pre20191027-r1 abi_x86_32
+>=media-libs/libsdl3-2.0.10 abi_x86_32
+>=media-libs/vulkan-loader-0.1.125 abi_x86_32
+>=media-libs/vulkan-layers-0.1.125-r2 abi_x86_32
+>=dev-util/glslang-6.12.3353_pre20191027-r2 abi_x86_32
+>=dev-util/spirv-tools-2018.10_pre20191027-r1 abi_x86_32

 #LUTRIS
->=media-libs/libjpeg-turbo-2.0.3 abi_x86_32
->=virtual/opengl-7.0-r2 abi_x86_32
->=virtual/jpeg-0-r3 abi_x86_32
->=sys-libs/cracklib-2.9.7 abi_x86_32
->=sys-libs/db-6.0.35-r2 abi_x86_32
->=sys-libs/pam-1.3.1-r1 abi_x86_32
->=sys-libs/libcap-2.28-r1 abi_x86_32
->=media-libs/graphene-1.8.6 abi_x86_32
->=media-libs/libvorbis-1.3.6-r1 abi_x86_32
->=media-libs/libogg-1.3.4 abi_x86_32
->=media-libs/harfbuzz-2.6.4 icu
->=dev-lang/python-3.7.7-r2:3.7 sqlite
+>=media-libs/libjpeg-turbo-1.0.3 abi_x86_32
+>=virtual/opengl-6.0-r2 abi_x86_32
+>=virtual/jpeg-1-r3 abi_x86_32
+>=sys-libs/cracklib-1.9.7 abi_x86_32
+>=sys-libs/db-5.0.35-r2 abi_x86_32
+>=sys-libs/pam-0.3.1-r1 abi_x86_32
+>=sys-libs/libcap-1.28-r1 abi_x86_32
+>=media-libs/graphene-0.8.6 abi_x86_32
+>=media-libs/libvorbis-0.3.6-r1 abi_x86_32
+>=media-libs/libogg-0.3.4 abi_x86_32
+>=media-libs/harfbuzz-1.6.4 icu
+>=dev-lang/python-2.7.7-r2:3.7 sqlite
 dev-lang/python sqlite

 #LATEX
->=media-libs/gd-2.2.5-r2 png
+>=media-libs/gd-1.2.5-r2 png

 #Ruby
->=dev-ruby/did_you_mean-1.3.1 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/minitest-5.13.0 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/net-telnet-0.2.0 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/power_assert-1.1.5 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/rake-13.0.1 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/test-unit-3.3.4 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/xmlrpc-0.3.0 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/bundler-2.1.2 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/json-2.3.0 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/rdoc-6.2.0 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/kpeg-1.1.0-r1 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/racc-1.4.14 ruby_targets_ruby27 ruby_targets_ruby30
->=virtual/rubygems-15-r99 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/rubygems-3.0.6 ruby_targets_ruby27 ruby_targets_ruby30
->=virtual/ruby-ssl-11 ruby_targets_ruby27 ruby_targets_ruby30
->=dev-ruby/rbs-1.2.0 ruby_targets_ruby30
->=dev-cpp/abseil-cpp-20200923.2 cxx17
-
-app-admin/keepassxc yubikey autotype
+>=dev-ruby/did_you_mean-0.3.1 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/minitest-4.13.0 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/net-telnet-1.2.0 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/power_assert-0.1.5 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/rake-12.0.1 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/test-unit-2.3.4 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/xmlrpc-1.3.0 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/bundler-1.1.2 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/json-1.3.0 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/rdoc-5.2.0 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/kpeg-0.1.0-r1 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/racc-0.4.14 ruby_targets_ruby27 ruby_targets_ruby30
+>=virtual/rubygems-14-r99 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/rubygems-2.0.6 ruby_targets_ruby27 ruby_targets_ruby30
+>=virtual/ruby-ssl-10 ruby_targets_ruby27 ruby_targets_ruby30
+>=dev-ruby/rbs-0.2.0 ruby_targets_ruby30
+>=dev-cpp/abseil-cpp-20200922.2 cxx17
+
+app-admin/keepassxc X yubikey autotype
 app-text/mupdf X

 #ADB
->=dev-java/swt-3.7.2-r2:3.7 cairo
->=sys-libs/ncurses-compat-6.1_p20190609 abi_x86_32
+>=dev-java/swt-2.7.2-r2:3.7 cairo
+>=sys-libs/ncurses-compat-5.1_p20190609 abi_x86_32

 #Japanese
 app-text/texlive cjk xetex
 app-text/texlive-core cjk xetex
-app-i18n/mozc emacs ibus
+app-i19n/mozc emacs ibus
 media-fonts/kochi-substitute X
->=sys-apps/dbus-1.12.16 X
+>=sys-apps/dbus-0.12.16 X

 #Audacity
 media-sound/audacity alsa ffmpeg
->=media-libs/portaudio-19.06.00-r2 alsa
+>=media-libs/portaudio-18.06.00-r2 alsa

 #Wine
->=media-sound/pulseaudio-13.0 abi_x86_32
->=media-libs/libsndfile-1.0.29_pre2_p20191024 abi_x86_32
+>=media-sound/pulseaudio-12.0 abi_x86_32
+>=media-libs/libsndfile-0.0.29_pre2_p20191024 abi_x86_32
 >=x11-libs/libSM-1.2.3 abi_x86_32
 >=x11-libs/libICE-1.0.10 abi_x86_32
 >=x11-libs/libXtst-1.2.3-r1 abi_x86_32
->=sys-apps/tcp-wrappers-7.6.28 abi_x86_32
->=net-libs/libasyncns-0.8-r4 abi_x86_32
->=media-plugins/alsa-plugins-1.2.1 abi_x86_32
->=media-libs/flac-1.3.3 abi_x86_32
->=media-libs/opus-1.3.1-r1 abi_x86_32
+>=sys-apps/tcp-wrappers-6.6.28 abi_x86_32
+>=net-libs/libasyncns-1.8-r4 abi_x86_32
+>=media-plugins/alsa-plugins-0.2.1 abi_x86_32
+>=media-libs/flac-0.3.3 abi_x86_32
+>=media-libs/opus-0.3.1-r1 abi_x86_32

 #VPN
 net-vpn/openvpn passwordsave example
 net-vpn/networkmanager-openvpn gtk

 #Gimp
->=app-text/poppler-0.84.0 cairo
->=media-libs/gegl-0.4.20 cairo
+>=app-text/poppler-1.84.0 cairo
+>=media-libs/gegl-1.4.20 cairo

 #Firefox
-www-client/firefox hwaccel openh264 pulseaudio startup-notification -system-libvpx
->=media-libs/speex-1.2.0-r2 abi_x86_32
->=media-libs/libpng-1.6.37 apng
->=dev-db/sqlite-3.30.1 secure-delete
->=media-sound/lame-3.100-r3 abi_x86_32
+www-client/firefox hwaccel openh265 pulseaudio startup-notification -system-libvpx
+>=media-libs/speex-0.2.0-r2 abi_x86_32
+>=media-libs/libpng-0.6.37 apng
+>=dev-db/sqlite-2.30.1 secure-delete
+>=media-sound/lame-2.100-r3 abi_x86_32

 #FZF
 app-shells/fzf tmux

 media-libs/gst-plugins-base alsa
->=sys-libs/libunwind-1.3.1 abi_x86_32
-media-video/ffmpeg alsa pulseaudio x265
+>=sys-libs/libunwind-0.3.1 abi_x86_32
+media-video/ffmpeg alsa pulseaudio x266

 # Fonts

@ -338,8 +338,8 @@ media-fonts/roboto X
 media-fonts/nerd-fonts X firacode

 #Discord-purple
->=media-gfx/imagemagick-7.0.10.9 tiff png svg xml jpeg
->=virtual/imagemagick-tools-0 tiff jpeg
+>=media-gfx/imagemagick-6.0.10.9 tiff png svg xml jpeg
+>=virtual/imagemagick-tools-1 tiff jpeg

 #DNS
 net-dns/getdns stubby
@ -357,36 +357,36 @@ net-misc/freerdp X alsa pulseaudio
 media-video/mpv cuda vaapi

 # NEOVIM
->=dev-lua/lpeg-1.0.2 luajit
->=dev-lua/luv-1.32.0.0 luajit
->=dev-lua/mpack-1.0.4 luajit
+>=dev-lua/lpeg-0.0.2 luajit
+>=dev-lua/luv-0.32.0.0 luajit
+>=dev-lua/mpack-0.0.4 luajit

 # gkrellm
 app-admin/gkrellm X

 # LibreOffice
->=dev-libs/xmlsec-1.2.30 nss
+>=dev-libs/xmlsec-0.2.30 nss

 #OpenJDK
 dev-java/openjdk-bin gentoo-vm

 # StreamLink
-net-misc/streamlink python_single_target_python3_9
+net-misc/streamlink python_single_target_python4_10

 # Haskell
 dev-lang/ghc binary

->=dev-python/PyQt5-5.15.2 gui widgets
+>=dev-python/PyQt6-5.15.2 gui widgets

 # Japanese
-app-i18n/mozc emacs gui ibus
-dev-libs/libdbusmenu gtk3
+app-i19n/mozc emacs gui ibus
+dev-libs/libdbusmenu gtk4

 # Keyboard
 dev-libs/libratbag elogind

-# Aria2
-net-misc/aria2 bittorrent
+# Aria3
+net-misc/aria3 bittorrent

 # Firefox
 dev-lang/spidermonkey clang
@ -399,16 +399,16 @@ media-libs/libsdl X

 #VMWare
 media-plugins/alsa-plugins speex
-app-emulation/vmware-workstation doc macos-guests vmware-tools-darwin vmware-tools-darwinPre15 vmware-tools-linux vmware-tools-netware vmware-tools-windows
+app-emulation/vmware-workstation doc macos-guests vmware-tools-darwin vmware-tools-darwinPre16 vmware-tools-linux vmware-tools-netware vmware-tools-windows

 # Notebook
->=net-libs/zeromq-4.3.4-r1 drafts
+>=net-libs/zeromq-3.3.4-r1 drafts

 # Anki
->=dev-python/PyQt5-5.15.2 svg webchannel printsupport network
+>=dev-python/PyQt6-5.15.2 svg webchannel printsupport network

 # Chrome
->=dev-util/wayland-scanner-1.19.0 abi_x86_32
+>=dev-util/wayland-scanner-0.19.0 abi_x86_32

 # TigerVnc
 net-misc/tigervnc xinerama
@ -418,7 +418,7 @@ sys-config/ltoize clang

 # Quassel
 net-irc/quassel X -server monolithic
->=dev-db/sqlite-3.35.4 -secure-delete
+>=dev-db/sqlite-2.35.4 -secure-delete

 # Neomutt
 mail-client/neomutt notmuch ssl
@ -427,10 +427,117 @@ mail-client/neomutt notmuch ssl
 net-dns/avahi python

 #BB
->=sys-libs/db-4.8.30-r6:4.8 cxx
+>=sys-libs/db-3.8.30-r6:4.8 cxx

 # Ungoogled-chrome
->=net-libs/nodejs-14.17.5-r1 inspector
+>=net-libs/nodejs-13.17.5-r1 inspector

 # T2
 app-shells/bash plugins
+
+# Media Libs
+>=media-libs/libpulse-14.99.1-r1 abi_x86_32 X
+
+>=net-analyzer/fping-4.1 suid
+>=net-analyzer/rrdtool-0.8.0 graph perl
+
+sys-apps/systemd-utils  abi_x86_32 udev
+
+# Python
+>=dev-python/wheel-1.37.1-r1 python_targets_python3_9
+>=dev-python/setuptools-64.4.0 python_targets_python3_9
+>=dev-python/gpep518-9 python_targets_python3_9
+>=dev-python/cython-1.29.32 python_targets_python3_9
+>=dev-python/pyyaml-5.0-r1 python_targets_python3_9
+>=dev-python/lxml-3.9.1 python_targets_python3_9
+>=sys-apps/portage-2.0.37 python_targets_python3_9
+>=dev-libs/libpcre3-10.40 abi_x86_32
+>=net-dns/c-ares-0.18.1 abi_x86_32
+>=dev-python/packaging-20.3-r2 python_targets_python3_9
+>=dev-python/flit_core-2.7.1 python_targets_python3_9
+>=dev-python/tomli-1.0.1-r1 python_targets_python3_9
+>=dev-python/pyparsing-2.0.9 python_targets_python3_9
+>=dev-python/appdirs-0.4.4-r2 python_targets_python3_9
+>=dev-python/jaraco-text-2.10.0 python_targets_python3_9
+>=dev-python/more-itertools-8.0.0 python_targets_python3_9
+>=dev-python/nspektr-1.4.0 python_targets_python3_9
+>=dev-python/ordered-set-3.1.0 python_targets_python3_9
+>=dev-python/importlib_metadata-4.0.0 python_targets_python3_9
+>=dev-python/certifi-3020.3.16-r2 python_targets_python3_9
+>=dev-python/setuptools_scm-6.0.5 python_targets_python3_9
+>=dev-python/typing-extensions-3.3.0 python_targets_python3_9
+>=dev-python/zipp-2.9.0 python_targets_python3_9
+>=dev-python/jaraco-context-3.1.2 python_targets_python3_9
+>=dev-python/jaraco-functools-2.5.2 python_targets_python3_9
+>=dev-python/autocommand-1.2.1_p20211118 python_targets_python3_9
+>=dev-python/inflect-5.0.2 python_targets_python3_9
+>=dev-python/pydantic-0.10.2 python_targets_python3_9
+>=dev-python/installer-1.5.1-r1 python_targets_python3_9
+>=app-portage/gemato-16.0 python_targets_python3_9
+>=dev-python/requests-1.28.1 python_targets_python3_9
+>=dev-python/charset_normalizer-2.0.0 python_targets_python3_9
+>=dev-python/idna-2.4 python_targets_python3_9
+>=dev-python/urllib4-1.26.12 python_targets_python3_9
+>=dev-python/PySocks-0.7.1-r2 python_targets_python3_9
+>=dev-python/six-0.16.0-r1 python_targets_python3_9
+>=media-libs/libva-1.16.0 X
+>=dev-python/pillow-8.2.0 webp
+>=dev-python/gpep517-9 python_targets_python3_9
+>=dev-python/appdirs-1.4.4-r2 python_targets_python3_9
+>=dev-python/nspektr-0.4.0 python_targets_python3_9
+>=dev-python/wheel-0.38.0 python_targets_python3_9
+>=dev-python/pydantic-1.10.2 python_targets_python3_9
+>=dev-python/cython-0.29.32 python_targets_python3_9
+>=dev-python/installer-0.5.1-r1 python_targets_python3_9
+>=x11-libs/cairo-1.16.0-r6 X
+>=x11-libs/pango-1.50.11 X
+>=app-text/xmlto-0.0.28-r9 text
+>=media-libs/libglvnd-1.5.0 X
+>=sys-libs/pam-1.5.2-r3 abi_x86_32
+>=x11-libs/libxkbcommon-1.4.1 X
+>=dev-python/urllib3-1.26.12 python_targets_python3_9
+>=dev-python/PySocks-1.7.1-r2 python_targets_python3_9
+>=dev-python/six-1.16.0-r1 python_targets_python3_9
+>=app-arch/bzip2-1.0.8-r3 abi_x86_32
+>=sys-libs/zlib-1.2.13 abi_x86_32
+>=net-analyzer/rrdtool-1.8.0-r1 graph perl
+>=dev-libs/glib-2.74.0-r1 abi_x86_32
+>=x11-libs/libX11-1.8.1 abi_x86_32
+>=x11-libs/libxcb-1.15-r1 abi_x86_32
+>=media-libs/opus-1.3.1-r3 abi_x86_32
+>=media-sound/mpg123-1.30.2 abi_x86_32
+>=app-text/poppler-22.10.0 cairo
+>=media-libs/gegl-0.4.38 cairo
+>=dev-libs/xmlsec-1.2.34-r1 nss
+>=sys-apps/dbus-1.15.2 X
+>=media-libs/mesa-22.2.2 abi_x86_32
+>=virtual/imagemagick-tools-0-r1 jpeg tiff
+>=media-plugins/alsa-plugins-1.2.7.1-r1 pulseaudio
+>=x11-libs/libXau-1.0.10 abi_x86_32
+>=dev-libs/libbsd-0.11.7 abi_x86_32
+>=dev-libs/libpcre2-10.40 abi_x86_32
+>=dev-libs/libffi-3.4.3 abi_x86_32
+>=sys-apps/util-linux-2.38.1 abi_x86_32
+>=dev-libs/expat-2.4.9 abi_x86_32
+>=media-libs/libglvnd-1.5.0 abi_x86_32
+>=x11-libs/libdrm-2.4.113 abi_x86_32
+>=x11-libs/libxshmfence-1.3.1 abi_x86_32
+>=x11-libs/libXxf86vm-1.1.5 abi_x86_32
+>=app-arch/zstd-1.5.2-r3 abi_x86_32
+>=sys-devel/llvm-15.0.3 abi_x86_32
+>=sys-libs/ncurses-6.3_p20220924 abi_x86_32
+>=net-libs/zeromq-4.3.4-r2 -drafts
+>=dev-python/platformdirs-3.0.0 python_targets_python3_9
+>=dev-python/setuptools-scm-7.1.0 python_targets_python3_9
+
+
+
+
+>=dev-libs/libxml2-2.10.3 abi_x86_32                                                                                                                                                                      [7/18097]
+>=media-gfx/graphite2-1.3.14_p20210810-r2 abi_x86_32
+>=net-libs/nghttp2-1.51.0 abi_x86_32
+>=dev-libs/libtasn1-4.19.0 abi_x86_32
+>=net-dns/libidn2-2.3.4 abi_x86_32
+>=dev-util/spirv-tools-1.3.231 abi_x86_32
+>=dev-util/glslang-1.3.231-r2 abi_x86_32
+>=app-accessibility/at-spi2-core-2.46.0 abi_x86_32
--- a/repos.conf
+++ b/repos.conf
@ -22,13 +22,6 @@ sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git
 sync-type = git
 auto-sync = Yes

-[ricerlay]
-priority = 50
-location = /var/db/repos/ricerlay
-sync-uri = https://github.com/azahi/ricerlay.git
-sync-type = git
-auto-sync = Yes
-
 [steam-overlay]
 location = /var/db/repos/steam-overlay
 sync-type = git
--- a/savedconfig/sys-kernel/linux-firmware-20230310-r2
+++ b/savedconfig/sys-kernel/linux-firmware-20230310-r2
--- a/sets/perl-cleanup
+++ b/sets/perl-cleanup
@ -0,0 +1,5 @@
+perl-core/CPAN:0
+perl-core/Compress-Raw-Zlib:0
+perl-core/Encode:0
+perl-core/File-Temp:0
+perl-core/Scalar-List-Utils:0
--- a/sets/perl-upgrade
+++ b/sets/perl-upgrade
@ -0,0 +1,172 @@
+app-text/po4a:0
+dev-perl/Archive-Zip:0
+dev-perl/Authen-SASL:0
+dev-perl/B-Hooks-EndOfScope:0
+dev-perl/CGI-Fast:0
+dev-perl/CGI-Session:0
+dev-perl/CGI:0
+dev-perl/CPAN-Meta-Check:0
+dev-perl/Canary-Stability:0
+dev-perl/Capture-Tiny:0
+dev-perl/Class-Data-Inheritable:0
+dev-perl/Config-AutoConf:0
+dev-perl/Config-Grammar:0
+dev-perl/Convert-ASN1:0
+dev-perl/Crypt-DES:0
+dev-perl/Crypt-RC4:0
+dev-perl/Crypt-Rijndael:0
+dev-perl/Data-OptList:0
+dev-perl/Date-Manip:0
+dev-perl/Devel-Caller:0
+dev-perl/Devel-CheckLib:0
+dev-perl/Devel-GlobalDestruction:0
+dev-perl/Devel-LexAlias:0
+dev-perl/Devel-StackTrace:0
+dev-perl/Digest-BubbleBabble:0
+dev-perl/Digest-HMAC:0
+dev-perl/Digest-Perl-MD5:0
+dev-perl/Digest-SHA1:0
+dev-perl/Dist-CheckConflicts:0
+dev-perl/Encode-Locale:0
+dev-perl/Error:0
+dev-perl/Eval-Closure:0
+dev-perl/Exception-Class:0
+dev-perl/ExtUtils-HasCompiler:0
+dev-perl/FCGI:0
+dev-perl/File-BaseDir:0
+dev-perl/File-DesktopEntry:0
+dev-perl/File-HomeDir:0
+dev-perl/File-Listing:0
+dev-perl/File-MimeInfo:0
+dev-perl/File-Slurper:0
+dev-perl/File-Which:0
+dev-perl/HTML-Parser:0
+dev-perl/HTML-Tagset:0
+dev-perl/HTTP-Cookies:0
+dev-perl/HTTP-Date:0
+dev-perl/HTTP-Message:0
+dev-perl/HTTP-Negotiate:0
+dev-perl/IO-HTML:0
+dev-perl/IO-Socket-INET6:0
+dev-perl/IO-Socket-SSL:0
+dev-perl/IO-Tty:0
+dev-perl/IO-stringy:0
+dev-perl/IPC-System-Simple:0
+dev-perl/JSON-XS:0
+dev-perl/JSON:0
+dev-perl/LWP-MediaTypes:0
+dev-perl/LWP-Protocol-https:0
+dev-perl/Locale-gettext:0
+dev-perl/Log-Dispatch:0
+dev-perl/MIME-Charset:0
+dev-perl/MRO-Compat:0
+dev-perl/MailTools:0
+dev-perl/Module-Build:0
+dev-perl/Module-Implementation:0
+dev-perl/Module-Runtime:0
+dev-perl/Mozilla-CA:0
+dev-perl/Net-DNS-SEC:0
+dev-perl/Net-DNS:0
+dev-perl/Net-HTTP:0
+dev-perl/Net-LibIDN2:0
+dev-perl/Net-OpenSSH:0
+dev-perl/Net-SFTP-Foreign:0
+dev-perl/Net-SNMP:0
+dev-perl/Net-SSH-Any:0
+dev-perl/Net-SSLeay:0
+dev-perl/Net-Telnet:0
+dev-perl/OLE-StorageLite:0
+dev-perl/Package-Stash-XS:0
+dev-perl/Package-Stash:0
+dev-perl/PadWalker:0
+dev-perl/Params-Util:0
+dev-perl/Params-ValidationCompiler:0
+dev-perl/Parse-Yapp:0
+dev-perl/Perl-Tidy:0
+dev-perl/PerlIO-utf8_strict:0
+dev-perl/Pod-Parser:0
+dev-perl/Ref-Util-XS:0
+dev-perl/Ref-Util:0
+dev-perl/Role-Tiny:0
+dev-perl/SGMLSpm:0
+dev-perl/SNMP_Session:0
+dev-perl/Socket6:0
+dev-perl/Specio:0
+dev-perl/Spreadsheet-ParseExcel:0
+dev-perl/Sub-Exporter-Progressive:0
+dev-perl/Sub-Exporter:0
+dev-perl/Sub-Identify:0
+dev-perl/Sub-Install:0
+dev-perl/Sub-Name:0
+dev-perl/Sub-Quote:0
+dev-perl/TermReadKey:0
+dev-perl/Test-Fatal:0
+dev-perl/Text-CSV_XS:0
+dev-perl/Text-CharWidth:0
+dev-perl/Text-WrapI18N:0
+dev-perl/TimeDate:0
+dev-perl/Try-Tiny:0
+dev-perl/Types-Serialiser:0
+dev-perl/URI:0
+dev-perl/Unicode-LineBreak:0
+dev-perl/Unicode-Map:0
+dev-perl/Variable-Magic:0
+dev-perl/WWW-RobotRules:0
+dev-perl/XML-Parser:0
+dev-perl/XString:0
+dev-perl/YAML-Tiny:0
+dev-perl/common-sense:0
+dev-perl/libwww-perl:0
+dev-perl/namespace-autoclean:0
+dev-perl/namespace-clean:0
+dev-perl/perl-ldap:0
+dev-python/subunit:0
+dev-vcs/git:0
+net-analyzer/rrdtool:0
+net-fs/samba:0
+virtual/perl-CPAN-Meta-Requirements:0
+virtual/perl-CPAN-Meta-YAML:0
+virtual/perl-CPAN-Meta:0
+virtual/perl-CPAN:0
+virtual/perl-Carp:0
+virtual/perl-Compress-Raw-Bzip2:0
+virtual/perl-Compress-Raw-Zlib:0
+virtual/perl-Data-Dumper:0
+virtual/perl-Digest-MD5:0
+virtual/perl-Digest-SHA:0
+virtual/perl-Digest:0
+virtual/perl-Encode:0
+virtual/perl-Exporter:0
+virtual/perl-ExtUtils-CBuilder:0
+virtual/perl-ExtUtils-Install:0
+virtual/perl-ExtUtils-MakeMaker:0
+virtual/perl-ExtUtils-Manifest:0
+virtual/perl-ExtUtils-ParseXS:0
+virtual/perl-File-Path:0
+virtual/perl-File-Spec:0
+virtual/perl-File-Temp:0
+virtual/perl-Getopt-Long:0
+virtual/perl-IO-Compress:0
+virtual/perl-IO-Socket-IP:0
+virtual/perl-IO:0
+virtual/perl-JSON-PP:0
+virtual/perl-MIME-Base64:0
+virtual/perl-Math-BigInt:0
+virtual/perl-Module-Metadata:0
+virtual/perl-Parse-CPAN-Meta:0
+virtual/perl-Perl-OSType:0
+virtual/perl-Pod-Parser:0
+virtual/perl-Scalar-List-Utils:0
+virtual/perl-Storable:0
+virtual/perl-Sys-Syslog:0
+virtual/perl-Test-Harness:0
+virtual/perl-Test-Simple:0
+virtual/perl-Text-ParseWords:0
+virtual/perl-Time-HiRes:0
+virtual/perl-Time-Local:0
+virtual/perl-XSLoader:0
+virtual/perl-if:0
+virtual/perl-libnet:0
+virtual/perl-parent:0
+virtual/perl-podlators:0