From 66f887501e5620c9340c4a2350fb876dd5bc065f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 3 Aug 2023 18:38:39 +0100
Subject: simplify
this file must stay as it is, for now
---
conf/intel/portage/make.conf/00-abi | 3 +++
conf/intel/portage/make.conf/00-abi.conf | 3 ---
conf/intel/portage/make.conf/00-cflags | 6 ++++++
conf/intel/portage/make.conf/00-cflags.conf | 6 ------
conf/intel/portage/make.conf/00-cpuflags | 3 +++
conf/intel/portage/make.conf/00-cpuflags.conf | 3 ---
conf/intel/portage/make.conf/00-devices | 5 +++++
conf/intel/portage/make.conf/00-devices.conf | 5 -----
conf/intel/portage/make.conf/00-distfiles | 3 +++
conf/intel/portage/make.conf/00-distfiles.conf | 3 ---
conf/intel/portage/make.conf/00-features | 3 +++
conf/intel/portage/make.conf/00-features.conf | 3 ---
conf/intel/portage/make.conf/00-generic | 3 +++
conf/intel/portage/make.conf/00-generic.conf | 3 ---
conf/intel/portage/make.conf/00-grub | 3 +++
conf/intel/portage/make.conf/00-grub.conf | 3 ---
conf/intel/portage/make.conf/00-keywords | 3 +++
conf/intel/portage/make.conf/00-keywords.conf | 3 ---
conf/intel/portage/make.conf/00-languages | 4 ++++
conf/intel/portage/make.conf/00-languages.conf | 4 ----
conf/intel/portage/make.conf/00-layout | 14 +++++++++++++
conf/intel/portage/make.conf/00-layout.conf | 14 -------------
conf/intel/portage/make.conf/00-libreoffice | 3 +++
conf/intel/portage/make.conf/00-libreoffice.conf | 3 ---
conf/intel/portage/make.conf/00-licenses | 3 +++
conf/intel/portage/make.conf/00-licenses.conf | 3 ---
conf/intel/portage/make.conf/00-llvm | 3 +++
conf/intel/portage/make.conf/00-llvm.conf | 3 ---
conf/intel/portage/make.conf/00-mirrors | 3 +++
conf/intel/portage/make.conf/00-mirrors.conf | 3 ---
conf/intel/portage/make.conf/00-python | 5 +++++
conf/intel/portage/make.conf/00-python.conf | 5 -----
conf/intel/portage/make.conf/00-qemu | 4 ++++
conf/intel/portage/make.conf/00-qemu.conf | 4 ----
conf/intel/portage/make.conf/00-ruby | 3 +++
conf/intel/portage/make.conf/00-ruby.conf | 3 ---
conf/intel/portage/make.conf/00-useflags | 13 ++++++++++++
conf/intel/portage/make.conf/00-useflags.conf | 13 ------------
conf/intel/portage/make.conf/10-sisyphus-overrides | 1 +
conf/intel/portage/make.conf/10-sisyphus.make.conf | 1 -
.../portage/package.accept_keywords/00-dev-python | 4 ++++
.../00-dev-python.package.keywords | 4 ----
.../portage/package.accept_keywords/00-dev-util | 3 +++
.../00-dev-util.package.keywords | 3 ---
.../portage/package.accept_keywords/00-media-gfx | 3 +++
.../00-media-gfx.package.keywords | 3 ---
.../portage/package.accept_keywords/00-media-video | 3 +++
.../00-media-video.package.keywords | 3 ---
.../portage/package.accept_keywords/00-net-libs | 3 +++
.../00-net-libs.package.keywords | 3 ---
.../package.accept_keywords/10-sisyphus-overrides | 1 +
.../10-sisyphus.package.keywords | 1 -
conf/intel/portage/package.env/00-app-emulation | 3 +++
.../package.env/00-app-emulation.package.env | 3 ---
conf/intel/portage/package.env/00-app-office | 3 +++
.../portage/package.env/00-app-office.package.env | 3 ---
conf/intel/portage/package.env/00-games-emulation | 3 +++
.../package.env/00-games-emulation.package.env | 3 ---
conf/intel/portage/package.env/00-mail-client | 3 +++
.../portage/package.env/00-mail-client.package.env | 3 ---
conf/intel/portage/package.env/00-media-libs | 4 ++++
.../portage/package.env/00-media-libs.package.env | 4 ----
conf/intel/portage/package.env/00-media-video | 3 +++
.../portage/package.env/00-media-video.package.env | 3 ---
conf/intel/portage/package.env/00-net-dns | 3 +++
.../portage/package.env/00-net-dns.package.env | 3 ---
conf/intel/portage/package.env/00-sys-boot | 4 ++++
.../portage/package.env/00-sys-boot.package.env | 4 ----
conf/intel/portage/package.env/00-sys-fs | 3 +++
.../portage/package.env/00-sys-fs.package.env | 3 ---
conf/intel/portage/package.env/00-sys-kernel | 6 ++++++
.../portage/package.env/00-sys-kernel.package.env | 6 ------
conf/intel/portage/package.env/00-sys-libs | 4 ++++
.../portage/package.env/00-sys-libs.package.env | 4 ----
conf/intel/portage/package.env/00-www-client | 3 +++
.../portage/package.env/00-www-client.package.env | 3 ---
conf/intel/portage/package.env/00-x11-base | 4 ++++
.../portage/package.env/00-x11-base.package.env | 4 ----
conf/intel/portage/package.env/00-x11-drivers | 15 ++++++++++++++
.../portage/package.env/00-x11-drivers.package.env | 15 --------------
.../portage/package.env/10-sisyphus-overrides | 1 +
.../portage/package.env/10-sisyphus.package.env | 1 -
conf/intel/portage/package.license/00-app-arch | 3 +++
.../package.license/00-app-arch.package.license | 3 ---
.../intel/portage/package.license/00-app-emulation | 3 +++
.../00-app-emulation.package.license | 3 ---
conf/intel/portage/package.license/00-games-fps | 4 ++++
.../package.license/00-games-fps.package.license | 4 ----
conf/intel/portage/package.license/00-media-libs | 3 +++
.../package.license/00-media-libs.package.license | 3 ---
conf/intel/portage/package.license/00-net-misc | 4 ++++
.../package.license/00-net-misc.package.license | 4 ----
conf/intel/portage/package.license/00-net-wireless | 3 +++
.../00-net-wireless.package.license | 3 ---
conf/intel/portage/package.license/00-sys-firmware | 3 +++
.../00-sys-firmware.package.license | 3 ---
conf/intel/portage/package.license/00-www-client | 6 ++++++
.../package.license/00-www-client.package.license | 6 ------
conf/intel/portage/package.license/00-www-plugins | 3 +++
.../package.license/00-www-plugins.package.license | 3 ---
.../portage/package.license/10-sisyphus-overrides | 1 +
.../package.license/10-sisyphus.package.license | 1 -
conf/intel/portage/package.mask/00-app-admin | 3 +++
.../portage/package.mask/00-app-admin.package.mask | 3 ---
conf/intel/portage/package.mask/00-app-emulation | 3 +++
.../package.mask/00-app-emulation.package.mask | 3 ---
conf/intel/portage/package.mask/00-dev-java | 3 +++
.../portage/package.mask/00-dev-java.package.mask | 3 ---
conf/intel/portage/package.mask/00-dev-lang | 6 ++++++
.../portage/package.mask/00-dev-lang.package.mask | 6 ------
conf/intel/portage/package.mask/00-dev-libs | 4 ++++
.../portage/package.mask/00-dev-libs.package.mask | 4 ----
conf/intel/portage/package.mask/00-dev-python | 3 +++
.../package.mask/00-dev-python.package.mask | 3 ---
conf/intel/portage/package.mask/00-media-video | 3 +++
.../package.mask/00-media-video.package.mask | 3 ---
conf/intel/portage/package.mask/00-net-libs | 3 +++
.../portage/package.mask/00-net-libs.package.mask | 3 ---
conf/intel/portage/package.mask/00-net-wireless | 3 +++
.../package.mask/00-net-wireless.package.mask | 3 ---
conf/intel/portage/package.mask/00-sys-apps | 4 ++++
.../portage/package.mask/00-sys-apps.package.mask | 4 ----
conf/intel/portage/package.mask/00-sys-auth | 3 +++
.../portage/package.mask/00-sys-auth.package.mask | 3 ---
conf/intel/portage/package.mask/00-sys-boot | 5 +++++
.../portage/package.mask/00-sys-boot.package.mask | 5 -----
conf/intel/portage/package.mask/00-sys-fs | 5 +++++
.../portage/package.mask/00-sys-fs.package.mask | 5 -----
conf/intel/portage/package.mask/00-sys-kernel | 4 ++++
.../package.mask/00-sys-kernel.package.mask | 4 ----
conf/intel/portage/package.mask/00-virtual | 3 +++
.../portage/package.mask/00-virtual.package.mask | 3 ---
conf/intel/portage/package.mask/00-www-client | 3 +++
.../package.mask/00-www-client.package.mask | 3 ---
conf/intel/portage/package.mask/00-www-plugins | 3 +++
.../package.mask/00-www-plugins.package.mask | 3 ---
conf/intel/portage/package.mask/00-x11-apps | 4 ++++
.../portage/package.mask/00-x11-apps.package.mask | 4 ----
conf/intel/portage/package.mask/00-x11-base | 3 +++
.../portage/package.mask/00-x11-base.package.mask | 3 ---
conf/intel/portage/package.mask/00-x11-drivers | 3 +++
.../package.mask/00-x11-drivers.package.mask | 3 ---
conf/intel/portage/package.mask/00-x11-libs | 4 ++++
.../portage/package.mask/00-x11-libs.package.mask | 4 ----
conf/intel/portage/package.mask/00-x11-misc | 3 +++
.../portage/package.mask/00-x11-misc.package.mask | 3 ---
conf/intel/portage/package.mask/000-llvmclang | 14 +++++++++++++
.../package.mask/000-llvmclang.package.mask | 14 -------------
conf/intel/portage/package.mask/000-toolchain | 24 ++++++++++++++++++++++
.../package.mask/000-toolchain.package.mask | 24 ----------------------
.../portage/package.mask/10-sisyphus-overrides | 1 +
.../portage/package.mask/10-sisyphus.package.mask | 1 -
.../portage/package.unmask/10-sisyphus-overrides | 1 +
.../package.unmask/10-sisyphus.package.unmask | 1 -
conf/intel/portage/package.use/00-app-admin | 7 +++++++
.../portage/package.use/00-app-admin.package.use | 7 -------
conf/intel/portage/package.use/00-app-containers | 3 +++
.../package.use/00-app-containers.package.use | 3 ---
conf/intel/portage/package.use/00-app-editors | 5 +++++
.../portage/package.use/00-app-editors.package.use | 5 -----
conf/intel/portage/package.use/00-app-emacs | 3 +++
.../portage/package.use/00-app-emacs.package.use | 3 ---
conf/intel/portage/package.use/00-app-emulation | 11 ++++++++++
.../package.use/00-app-emulation.package.use | 11 ----------
conf/intel/portage/package.use/00-app-office | 3 +++
.../portage/package.use/00-app-office.package.use | 3 ---
conf/intel/portage/package.use/00-app-text | 4 ++++
.../portage/package.use/00-app-text.package.use | 4 ----
conf/intel/portage/package.use/00-dev-db | 3 +++
.../portage/package.use/00-dev-db.package.use | 3 ---
conf/intel/portage/package.use/00-dev-java | 4 ++++
.../portage/package.use/00-dev-java.package.use | 4 ----
conf/intel/portage/package.use/00-dev-lang | 8 ++++++++
.../portage/package.use/00-dev-lang.package.use | 8 --------
conf/intel/portage/package.use/00-dev-libs | 12 +++++++++++
.../portage/package.use/00-dev-libs.package.use | 12 -----------
conf/intel/portage/package.use/00-dev-python | 4 ++++
.../portage/package.use/00-dev-python.package.use | 4 ----
conf/intel/portage/package.use/00-dev-qt | 11 ++++++++++
.../portage/package.use/00-dev-qt.package.use | 11 ----------
conf/intel/portage/package.use/00-dev-scheme | 3 +++
.../portage/package.use/00-dev-scheme.package.use | 3 ---
conf/intel/portage/package.use/00-dev-util | 5 +++++
.../portage/package.use/00-dev-util.package.use | 5 -----
conf/intel/portage/package.use/00-games-fps | 3 +++
.../portage/package.use/00-games-fps.package.use | 3 ---
conf/intel/portage/package.use/00-games-strategy | 3 +++
.../package.use/00-games-strategy.package.use | 3 ---
conf/intel/portage/package.use/00-gnome-base | 3 +++
.../portage/package.use/00-gnome-base.package.use | 3 ---
conf/intel/portage/package.use/00-gui-apps | 3 +++
.../portage/package.use/00-gui-apps.package.use | 3 ---
conf/intel/portage/package.use/00-gui-libs | 3 +++
.../portage/package.use/00-gui-libs.package.use | 3 ---
conf/intel/portage/package.use/00-kde-apps | 10 +++++++++
.../portage/package.use/00-kde-apps.package.use | 10 ---------
conf/intel/portage/package.use/00-kde-frameworks | 3 +++
.../package.use/00-kde-frameworks.package.use | 3 ---
conf/intel/portage/package.use/00-kde-plasma | 9 ++++++++
.../portage/package.use/00-kde-plasma.package.use | 9 --------
conf/intel/portage/package.use/00-lxqt-base | 4 ++++
.../portage/package.use/00-lxqt-base.package.use | 4 ----
conf/intel/portage/package.use/00-mail-client | 3 +++
.../portage/package.use/00-mail-client.package.use | 3 ---
conf/intel/portage/package.use/00-media-gfx | 7 +++++++
.../portage/package.use/00-media-gfx.package.use | 7 -------
conf/intel/portage/package.use/00-media-libs | 14 +++++++++++++
.../portage/package.use/00-media-libs.package.use | 14 -------------
conf/intel/portage/package.use/00-media-plugins | 4 ++++
.../package.use/00-media-plugins.package.use | 4 ----
conf/intel/portage/package.use/00-media-sound | 6 ++++++
.../portage/package.use/00-media-sound.package.use | 6 ------
conf/intel/portage/package.use/00-media-tv | 3 +++
.../portage/package.use/00-media-tv.package.use | 3 ---
conf/intel/portage/package.use/00-media-video | 7 +++++++
.../portage/package.use/00-media-video.package.use | 7 -------
conf/intel/portage/package.use/00-net-dialup | 3 +++
.../portage/package.use/00-net-dialup.package.use | 3 ---
conf/intel/portage/package.use/00-net-dns | 7 +++++++
.../portage/package.use/00-net-dns.package.use | 7 -------
conf/intel/portage/package.use/00-net-firewall | 3 +++
.../package.use/00-net-firewall.package.use | 3 ---
conf/intel/portage/package.use/00-net-fs | 3 +++
.../portage/package.use/00-net-fs.package.use | 3 ---
conf/intel/portage/package.use/00-net-irc | 3 +++
.../portage/package.use/00-net-irc.package.use | 3 ---
conf/intel/portage/package.use/00-net-libs | 5 +++++
.../portage/package.use/00-net-libs.package.use | 5 -----
conf/intel/portage/package.use/00-net-misc | 9 ++++++++
.../portage/package.use/00-net-misc.package.use | 9 --------
conf/intel/portage/package.use/00-net-nds | 3 +++
.../portage/package.use/00-net-nds.package.use | 3 ---
conf/intel/portage/package.use/00-net-p2p | 7 +++++++
.../portage/package.use/00-net-p2p.package.use | 7 -------
conf/intel/portage/package.use/00-net-print | 4 ++++
.../portage/package.use/00-net-print.package.use | 4 ----
conf/intel/portage/package.use/00-net-vpn | 3 +++
.../portage/package.use/00-net-vpn.package.use | 3 ---
conf/intel/portage/package.use/00-net-wireless | 3 +++
.../package.use/00-net-wireless.package.use | 3 ---
conf/intel/portage/package.use/00-sys-apps | 10 +++++++++
.../portage/package.use/00-sys-apps.package.use | 10 ---------
conf/intel/portage/package.use/00-sys-auth | 3 +++
.../portage/package.use/00-sys-auth.package.use | 3 ---
conf/intel/portage/package.use/00-sys-block | 3 +++
.../portage/package.use/00-sys-block.package.use | 3 ---
conf/intel/portage/package.use/00-sys-boot | 4 ++++
.../portage/package.use/00-sys-boot.package.use | 4 ----
conf/intel/portage/package.use/00-sys-devel | 6 ++++++
.../portage/package.use/00-sys-devel.package.use | 6 ------
conf/intel/portage/package.use/00-sys-firmware | 3 +++
.../package.use/00-sys-firmware.package.use | 3 ---
conf/intel/portage/package.use/00-sys-fs | 6 ++++++
.../portage/package.use/00-sys-fs.package.use | 6 ------
conf/intel/portage/package.use/00-sys-libs | 7 +++++++
.../portage/package.use/00-sys-libs.package.use | 7 -------
conf/intel/portage/package.use/00-virtual | 4 ++++
.../portage/package.use/00-virtual.package.use | 4 ----
conf/intel/portage/package.use/00-www-client | 8 ++++++++
.../portage/package.use/00-www-client.package.use | 8 --------
conf/intel/portage/package.use/00-x11-base | 3 +++
.../portage/package.use/00-x11-base.package.use | 3 ---
conf/intel/portage/package.use/00-x11-drivers | 5 +++++
.../portage/package.use/00-x11-drivers.package.use | 5 -----
conf/intel/portage/package.use/00-x11-libs | 5 +++++
.../portage/package.use/00-x11-libs.package.use | 5 -----
conf/intel/portage/package.use/00-x11-misc | 5 +++++
.../portage/package.use/00-x11-misc.package.use | 5 -----
conf/intel/portage/package.use/00-x11-themes | 4 ++++
.../portage/package.use/00-x11-themes.package.use | 4 ----
conf/intel/portage/package.use/00-x11-wm | 4 ++++
.../portage/package.use/00-x11-wm.package.use | 4 ----
.../portage/package.use/10-sisyphus-overrides | 1 +
.../portage/package.use/10-sisyphus.package.use | 1 -
.../portage/profile/package.use.mask/00-dev-lang | 3 +++
.../package.use.mask/00-dev-lang.package.use.mask | 3 ---
.../portage/profile/package.use.mask/00-media-tv | 3 +++
.../package.use.mask/00-media-tv.package.use.mask | 3 ---
conf/intel/portage/profile/use.mask/00-mask | 5 +++++
conf/intel/portage/profile/use.mask/00-mask.conf | 5 -----
conf/intel/portage/profile/use.mask/00-unmask | 7 +++++++
conf/intel/portage/profile/use.mask/00-unmask.conf | 7 -------
282 files changed, 641 insertions(+), 641 deletions(-)
create mode 100644 conf/intel/portage/make.conf/00-abi
delete mode 100644 conf/intel/portage/make.conf/00-abi.conf
create mode 100644 conf/intel/portage/make.conf/00-cflags
delete mode 100644 conf/intel/portage/make.conf/00-cflags.conf
create mode 100644 conf/intel/portage/make.conf/00-cpuflags
delete mode 100644 conf/intel/portage/make.conf/00-cpuflags.conf
create mode 100644 conf/intel/portage/make.conf/00-devices
delete mode 100644 conf/intel/portage/make.conf/00-devices.conf
create mode 100644 conf/intel/portage/make.conf/00-distfiles
delete mode 100644 conf/intel/portage/make.conf/00-distfiles.conf
create mode 100644 conf/intel/portage/make.conf/00-features
delete mode 100644 conf/intel/portage/make.conf/00-features.conf
create mode 100644 conf/intel/portage/make.conf/00-generic
delete mode 100644 conf/intel/portage/make.conf/00-generic.conf
create mode 100644 conf/intel/portage/make.conf/00-grub
delete mode 100644 conf/intel/portage/make.conf/00-grub.conf
create mode 100644 conf/intel/portage/make.conf/00-keywords
delete mode 100644 conf/intel/portage/make.conf/00-keywords.conf
create mode 100644 conf/intel/portage/make.conf/00-languages
delete mode 100644 conf/intel/portage/make.conf/00-languages.conf
create mode 100644 conf/intel/portage/make.conf/00-layout
delete mode 100644 conf/intel/portage/make.conf/00-layout.conf
create mode 100644 conf/intel/portage/make.conf/00-libreoffice
delete mode 100644 conf/intel/portage/make.conf/00-libreoffice.conf
create mode 100644 conf/intel/portage/make.conf/00-licenses
delete mode 100644 conf/intel/portage/make.conf/00-licenses.conf
create mode 100644 conf/intel/portage/make.conf/00-llvm
delete mode 100644 conf/intel/portage/make.conf/00-llvm.conf
create mode 100644 conf/intel/portage/make.conf/00-mirrors
delete mode 100644 conf/intel/portage/make.conf/00-mirrors.conf
create mode 100644 conf/intel/portage/make.conf/00-python
delete mode 100644 conf/intel/portage/make.conf/00-python.conf
create mode 100644 conf/intel/portage/make.conf/00-qemu
delete mode 100644 conf/intel/portage/make.conf/00-qemu.conf
create mode 100644 conf/intel/portage/make.conf/00-ruby
delete mode 100644 conf/intel/portage/make.conf/00-ruby.conf
create mode 100644 conf/intel/portage/make.conf/00-useflags
delete mode 100644 conf/intel/portage/make.conf/00-useflags.conf
create mode 120000 conf/intel/portage/make.conf/10-sisyphus-overrides
delete mode 120000 conf/intel/portage/make.conf/10-sisyphus.make.conf
create mode 100644 conf/intel/portage/package.accept_keywords/00-dev-python
delete mode 100644 conf/intel/portage/package.accept_keywords/00-dev-python.package.keywords
create mode 100644 conf/intel/portage/package.accept_keywords/00-dev-util
delete mode 100644 conf/intel/portage/package.accept_keywords/00-dev-util.package.keywords
create mode 100644 conf/intel/portage/package.accept_keywords/00-media-gfx
delete mode 100644 conf/intel/portage/package.accept_keywords/00-media-gfx.package.keywords
create mode 100644 conf/intel/portage/package.accept_keywords/00-media-video
delete mode 100644 conf/intel/portage/package.accept_keywords/00-media-video.package.keywords
create mode 100644 conf/intel/portage/package.accept_keywords/00-net-libs
delete mode 100644 conf/intel/portage/package.accept_keywords/00-net-libs.package.keywords
create mode 120000 conf/intel/portage/package.accept_keywords/10-sisyphus-overrides
delete mode 120000 conf/intel/portage/package.accept_keywords/10-sisyphus.package.keywords
create mode 100644 conf/intel/portage/package.env/00-app-emulation
delete mode 100644 conf/intel/portage/package.env/00-app-emulation.package.env
create mode 100644 conf/intel/portage/package.env/00-app-office
delete mode 100644 conf/intel/portage/package.env/00-app-office.package.env
create mode 100644 conf/intel/portage/package.env/00-games-emulation
delete mode 100644 conf/intel/portage/package.env/00-games-emulation.package.env
create mode 100644 conf/intel/portage/package.env/00-mail-client
delete mode 100644 conf/intel/portage/package.env/00-mail-client.package.env
create mode 100644 conf/intel/portage/package.env/00-media-libs
delete mode 100644 conf/intel/portage/package.env/00-media-libs.package.env
create mode 100644 conf/intel/portage/package.env/00-media-video
delete mode 100644 conf/intel/portage/package.env/00-media-video.package.env
create mode 100644 conf/intel/portage/package.env/00-net-dns
delete mode 100644 conf/intel/portage/package.env/00-net-dns.package.env
create mode 100644 conf/intel/portage/package.env/00-sys-boot
delete mode 100644 conf/intel/portage/package.env/00-sys-boot.package.env
create mode 100644 conf/intel/portage/package.env/00-sys-fs
delete mode 100644 conf/intel/portage/package.env/00-sys-fs.package.env
create mode 100644 conf/intel/portage/package.env/00-sys-kernel
delete mode 100644 conf/intel/portage/package.env/00-sys-kernel.package.env
create mode 100644 conf/intel/portage/package.env/00-sys-libs
delete mode 100644 conf/intel/portage/package.env/00-sys-libs.package.env
create mode 100644 conf/intel/portage/package.env/00-www-client
delete mode 100644 conf/intel/portage/package.env/00-www-client.package.env
create mode 100644 conf/intel/portage/package.env/00-x11-base
delete mode 100644 conf/intel/portage/package.env/00-x11-base.package.env
create mode 100644 conf/intel/portage/package.env/00-x11-drivers
delete mode 100644 conf/intel/portage/package.env/00-x11-drivers.package.env
create mode 120000 conf/intel/portage/package.env/10-sisyphus-overrides
delete mode 120000 conf/intel/portage/package.env/10-sisyphus.package.env
create mode 100644 conf/intel/portage/package.license/00-app-arch
delete mode 100644 conf/intel/portage/package.license/00-app-arch.package.license
create mode 100644 conf/intel/portage/package.license/00-app-emulation
delete mode 100644 conf/intel/portage/package.license/00-app-emulation.package.license
create mode 100644 conf/intel/portage/package.license/00-games-fps
delete mode 100644 conf/intel/portage/package.license/00-games-fps.package.license
create mode 100644 conf/intel/portage/package.license/00-media-libs
delete mode 100644 conf/intel/portage/package.license/00-media-libs.package.license
create mode 100644 conf/intel/portage/package.license/00-net-misc
delete mode 100644 conf/intel/portage/package.license/00-net-misc.package.license
create mode 100644 conf/intel/portage/package.license/00-net-wireless
delete mode 100644 conf/intel/portage/package.license/00-net-wireless.package.license
create mode 100644 conf/intel/portage/package.license/00-sys-firmware
delete mode 100644 conf/intel/portage/package.license/00-sys-firmware.package.license
create mode 100644 conf/intel/portage/package.license/00-www-client
delete mode 100644 conf/intel/portage/package.license/00-www-client.package.license
create mode 100644 conf/intel/portage/package.license/00-www-plugins
delete mode 100644 conf/intel/portage/package.license/00-www-plugins.package.license
create mode 120000 conf/intel/portage/package.license/10-sisyphus-overrides
delete mode 120000 conf/intel/portage/package.license/10-sisyphus.package.license
create mode 100644 conf/intel/portage/package.mask/00-app-admin
delete mode 100644 conf/intel/portage/package.mask/00-app-admin.package.mask
create mode 100644 conf/intel/portage/package.mask/00-app-emulation
delete mode 100644 conf/intel/portage/package.mask/00-app-emulation.package.mask
create mode 100644 conf/intel/portage/package.mask/00-dev-java
delete mode 100644 conf/intel/portage/package.mask/00-dev-java.package.mask
create mode 100644 conf/intel/portage/package.mask/00-dev-lang
delete mode 100644 conf/intel/portage/package.mask/00-dev-lang.package.mask
create mode 100644 conf/intel/portage/package.mask/00-dev-libs
delete mode 100644 conf/intel/portage/package.mask/00-dev-libs.package.mask
create mode 100644 conf/intel/portage/package.mask/00-dev-python
delete mode 100644 conf/intel/portage/package.mask/00-dev-python.package.mask
create mode 100644 conf/intel/portage/package.mask/00-media-video
delete mode 100644 conf/intel/portage/package.mask/00-media-video.package.mask
create mode 100644 conf/intel/portage/package.mask/00-net-libs
delete mode 100644 conf/intel/portage/package.mask/00-net-libs.package.mask
create mode 100644 conf/intel/portage/package.mask/00-net-wireless
delete mode 100644 conf/intel/portage/package.mask/00-net-wireless.package.mask
create mode 100644 conf/intel/portage/package.mask/00-sys-apps
delete mode 100644 conf/intel/portage/package.mask/00-sys-apps.package.mask
create mode 100644 conf/intel/portage/package.mask/00-sys-auth
delete mode 100644 conf/intel/portage/package.mask/00-sys-auth.package.mask
create mode 100644 conf/intel/portage/package.mask/00-sys-boot
delete mode 100644 conf/intel/portage/package.mask/00-sys-boot.package.mask
create mode 100644 conf/intel/portage/package.mask/00-sys-fs
delete mode 100644 conf/intel/portage/package.mask/00-sys-fs.package.mask
create mode 100644 conf/intel/portage/package.mask/00-sys-kernel
delete mode 100644 conf/intel/portage/package.mask/00-sys-kernel.package.mask
create mode 100644 conf/intel/portage/package.mask/00-virtual
delete mode 100644 conf/intel/portage/package.mask/00-virtual.package.mask
create mode 100644 conf/intel/portage/package.mask/00-www-client
delete mode 100644 conf/intel/portage/package.mask/00-www-client.package.mask
create mode 100644 conf/intel/portage/package.mask/00-www-plugins
delete mode 100644 conf/intel/portage/package.mask/00-www-plugins.package.mask
create mode 100644 conf/intel/portage/package.mask/00-x11-apps
delete mode 100644 conf/intel/portage/package.mask/00-x11-apps.package.mask
create mode 100644 conf/intel/portage/package.mask/00-x11-base
delete mode 100644 conf/intel/portage/package.mask/00-x11-base.package.mask
create mode 100644 conf/intel/portage/package.mask/00-x11-drivers
delete mode 100644 conf/intel/portage/package.mask/00-x11-drivers.package.mask
create mode 100644 conf/intel/portage/package.mask/00-x11-libs
delete mode 100644 conf/intel/portage/package.mask/00-x11-libs.package.mask
create mode 100644 conf/intel/portage/package.mask/00-x11-misc
delete mode 100644 conf/intel/portage/package.mask/00-x11-misc.package.mask
create mode 100644 conf/intel/portage/package.mask/000-llvmclang
delete mode 100644 conf/intel/portage/package.mask/000-llvmclang.package.mask
create mode 100644 conf/intel/portage/package.mask/000-toolchain
delete mode 100644 conf/intel/portage/package.mask/000-toolchain.package.mask
create mode 120000 conf/intel/portage/package.mask/10-sisyphus-overrides
delete mode 120000 conf/intel/portage/package.mask/10-sisyphus.package.mask
create mode 120000 conf/intel/portage/package.unmask/10-sisyphus-overrides
delete mode 120000 conf/intel/portage/package.unmask/10-sisyphus.package.unmask
create mode 100644 conf/intel/portage/package.use/00-app-admin
delete mode 100644 conf/intel/portage/package.use/00-app-admin.package.use
create mode 100644 conf/intel/portage/package.use/00-app-containers
delete mode 100644 conf/intel/portage/package.use/00-app-containers.package.use
create mode 100644 conf/intel/portage/package.use/00-app-editors
delete mode 100644 conf/intel/portage/package.use/00-app-editors.package.use
create mode 100644 conf/intel/portage/package.use/00-app-emacs
delete mode 100644 conf/intel/portage/package.use/00-app-emacs.package.use
create mode 100644 conf/intel/portage/package.use/00-app-emulation
delete mode 100644 conf/intel/portage/package.use/00-app-emulation.package.use
create mode 100644 conf/intel/portage/package.use/00-app-office
delete mode 100644 conf/intel/portage/package.use/00-app-office.package.use
create mode 100644 conf/intel/portage/package.use/00-app-text
delete mode 100644 conf/intel/portage/package.use/00-app-text.package.use
create mode 100644 conf/intel/portage/package.use/00-dev-db
delete mode 100644 conf/intel/portage/package.use/00-dev-db.package.use
create mode 100644 conf/intel/portage/package.use/00-dev-java
delete mode 100644 conf/intel/portage/package.use/00-dev-java.package.use
create mode 100644 conf/intel/portage/package.use/00-dev-lang
delete mode 100644 conf/intel/portage/package.use/00-dev-lang.package.use
create mode 100644 conf/intel/portage/package.use/00-dev-libs
delete mode 100644 conf/intel/portage/package.use/00-dev-libs.package.use
create mode 100644 conf/intel/portage/package.use/00-dev-python
delete mode 100644 conf/intel/portage/package.use/00-dev-python.package.use
create mode 100644 conf/intel/portage/package.use/00-dev-qt
delete mode 100644 conf/intel/portage/package.use/00-dev-qt.package.use
create mode 100644 conf/intel/portage/package.use/00-dev-scheme
delete mode 100644 conf/intel/portage/package.use/00-dev-scheme.package.use
create mode 100644 conf/intel/portage/package.use/00-dev-util
delete mode 100644 conf/intel/portage/package.use/00-dev-util.package.use
create mode 100644 conf/intel/portage/package.use/00-games-fps
delete mode 100644 conf/intel/portage/package.use/00-games-fps.package.use
create mode 100644 conf/intel/portage/package.use/00-games-strategy
delete mode 100644 conf/intel/portage/package.use/00-games-strategy.package.use
create mode 100644 conf/intel/portage/package.use/00-gnome-base
delete mode 100644 conf/intel/portage/package.use/00-gnome-base.package.use
create mode 100644 conf/intel/portage/package.use/00-gui-apps
delete mode 100644 conf/intel/portage/package.use/00-gui-apps.package.use
create mode 100644 conf/intel/portage/package.use/00-gui-libs
delete mode 100644 conf/intel/portage/package.use/00-gui-libs.package.use
create mode 100644 conf/intel/portage/package.use/00-kde-apps
delete mode 100644 conf/intel/portage/package.use/00-kde-apps.package.use
create mode 100644 conf/intel/portage/package.use/00-kde-frameworks
delete mode 100644 conf/intel/portage/package.use/00-kde-frameworks.package.use
create mode 100644 conf/intel/portage/package.use/00-kde-plasma
delete mode 100644 conf/intel/portage/package.use/00-kde-plasma.package.use
create mode 100644 conf/intel/portage/package.use/00-lxqt-base
delete mode 100644 conf/intel/portage/package.use/00-lxqt-base.package.use
create mode 100644 conf/intel/portage/package.use/00-mail-client
delete mode 100644 conf/intel/portage/package.use/00-mail-client.package.use
create mode 100644 conf/intel/portage/package.use/00-media-gfx
delete mode 100644 conf/intel/portage/package.use/00-media-gfx.package.use
create mode 100644 conf/intel/portage/package.use/00-media-libs
delete mode 100644 conf/intel/portage/package.use/00-media-libs.package.use
create mode 100644 conf/intel/portage/package.use/00-media-plugins
delete mode 100644 conf/intel/portage/package.use/00-media-plugins.package.use
create mode 100644 conf/intel/portage/package.use/00-media-sound
delete mode 100644 conf/intel/portage/package.use/00-media-sound.package.use
create mode 100644 conf/intel/portage/package.use/00-media-tv
delete mode 100644 conf/intel/portage/package.use/00-media-tv.package.use
create mode 100644 conf/intel/portage/package.use/00-media-video
delete mode 100644 conf/intel/portage/package.use/00-media-video.package.use
create mode 100644 conf/intel/portage/package.use/00-net-dialup
delete mode 100644 conf/intel/portage/package.use/00-net-dialup.package.use
create mode 100644 conf/intel/portage/package.use/00-net-dns
delete mode 100644 conf/intel/portage/package.use/00-net-dns.package.use
create mode 100644 conf/intel/portage/package.use/00-net-firewall
delete mode 100644 conf/intel/portage/package.use/00-net-firewall.package.use
create mode 100644 conf/intel/portage/package.use/00-net-fs
delete mode 100644 conf/intel/portage/package.use/00-net-fs.package.use
create mode 100644 conf/intel/portage/package.use/00-net-irc
delete mode 100644 conf/intel/portage/package.use/00-net-irc.package.use
create mode 100644 conf/intel/portage/package.use/00-net-libs
delete mode 100644 conf/intel/portage/package.use/00-net-libs.package.use
create mode 100644 conf/intel/portage/package.use/00-net-misc
delete mode 100644 conf/intel/portage/package.use/00-net-misc.package.use
create mode 100644 conf/intel/portage/package.use/00-net-nds
delete mode 100644 conf/intel/portage/package.use/00-net-nds.package.use
create mode 100644 conf/intel/portage/package.use/00-net-p2p
delete mode 100644 conf/intel/portage/package.use/00-net-p2p.package.use
create mode 100644 conf/intel/portage/package.use/00-net-print
delete mode 100644 conf/intel/portage/package.use/00-net-print.package.use
create mode 100644 conf/intel/portage/package.use/00-net-vpn
delete mode 100644 conf/intel/portage/package.use/00-net-vpn.package.use
create mode 100644 conf/intel/portage/package.use/00-net-wireless
delete mode 100644 conf/intel/portage/package.use/00-net-wireless.package.use
create mode 100644 conf/intel/portage/package.use/00-sys-apps
delete mode 100644 conf/intel/portage/package.use/00-sys-apps.package.use
create mode 100644 conf/intel/portage/package.use/00-sys-auth
delete mode 100644 conf/intel/portage/package.use/00-sys-auth.package.use
create mode 100644 conf/intel/portage/package.use/00-sys-block
delete mode 100644 conf/intel/portage/package.use/00-sys-block.package.use
create mode 100644 conf/intel/portage/package.use/00-sys-boot
delete mode 100644 conf/intel/portage/package.use/00-sys-boot.package.use
create mode 100644 conf/intel/portage/package.use/00-sys-devel
delete mode 100644 conf/intel/portage/package.use/00-sys-devel.package.use
create mode 100644 conf/intel/portage/package.use/00-sys-firmware
delete mode 100644 conf/intel/portage/package.use/00-sys-firmware.package.use
create mode 100644 conf/intel/portage/package.use/00-sys-fs
delete mode 100644 conf/intel/portage/package.use/00-sys-fs.package.use
create mode 100644 conf/intel/portage/package.use/00-sys-libs
delete mode 100644 conf/intel/portage/package.use/00-sys-libs.package.use
create mode 100644 conf/intel/portage/package.use/00-virtual
delete mode 100644 conf/intel/portage/package.use/00-virtual.package.use
create mode 100644 conf/intel/portage/package.use/00-www-client
delete mode 100644 conf/intel/portage/package.use/00-www-client.package.use
create mode 100644 conf/intel/portage/package.use/00-x11-base
delete mode 100644 conf/intel/portage/package.use/00-x11-base.package.use
create mode 100644 conf/intel/portage/package.use/00-x11-drivers
delete mode 100644 conf/intel/portage/package.use/00-x11-drivers.package.use
create mode 100644 conf/intel/portage/package.use/00-x11-libs
delete mode 100644 conf/intel/portage/package.use/00-x11-libs.package.use
create mode 100644 conf/intel/portage/package.use/00-x11-misc
delete mode 100644 conf/intel/portage/package.use/00-x11-misc.package.use
create mode 100644 conf/intel/portage/package.use/00-x11-themes
delete mode 100644 conf/intel/portage/package.use/00-x11-themes.package.use
create mode 100644 conf/intel/portage/package.use/00-x11-wm
delete mode 100644 conf/intel/portage/package.use/00-x11-wm.package.use
create mode 120000 conf/intel/portage/package.use/10-sisyphus-overrides
delete mode 120000 conf/intel/portage/package.use/10-sisyphus.package.use
create mode 100644 conf/intel/portage/profile/package.use.mask/00-dev-lang
delete mode 100644 conf/intel/portage/profile/package.use.mask/00-dev-lang.package.use.mask
create mode 100644 conf/intel/portage/profile/package.use.mask/00-media-tv
delete mode 100644 conf/intel/portage/profile/package.use.mask/00-media-tv.package.use.mask
create mode 100644 conf/intel/portage/profile/use.mask/00-mask
delete mode 100644 conf/intel/portage/profile/use.mask/00-mask.conf
create mode 100644 conf/intel/portage/profile/use.mask/00-unmask
delete mode 100644 conf/intel/portage/profile/use.mask/00-unmask.conf
diff --git a/conf/intel/portage/make.conf/00-abi b/conf/intel/portage/make.conf/00-abi
new file mode 100644
index 0000000..8355f78
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-abi
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+ABI_X86="64 32"
diff --git a/conf/intel/portage/make.conf/00-abi.conf b/conf/intel/portage/make.conf/00-abi.conf
deleted file mode 100644
index 8355f78..0000000
--- a/conf/intel/portage/make.conf/00-abi.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-ABI_X86="64 32"
diff --git a/conf/intel/portage/make.conf/00-cflags b/conf/intel/portage/make.conf/00-cflags
new file mode 100644
index 0000000..21bfa2f
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-cflags
@@ -0,0 +1,6 @@
+# This file has been automatically generated, do not edit.
+
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
+CHOST="x86_64-pc-linux-gnu"
diff --git a/conf/intel/portage/make.conf/00-cflags.conf b/conf/intel/portage/make.conf/00-cflags.conf
deleted file mode 100644
index 21bfa2f..0000000
--- a/conf/intel/portage/make.conf/00-cflags.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
-CHOST="x86_64-pc-linux-gnu"
diff --git a/conf/intel/portage/make.conf/00-cpuflags b/conf/intel/portage/make.conf/00-cpuflags
new file mode 100644
index 0000000..aacee7d
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-cpuflags
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+CPU_FLAGS_X86="mmx mmxext sse sse2 sse3"
diff --git a/conf/intel/portage/make.conf/00-cpuflags.conf b/conf/intel/portage/make.conf/00-cpuflags.conf
deleted file mode 100644
index aacee7d..0000000
--- a/conf/intel/portage/make.conf/00-cpuflags.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-CPU_FLAGS_X86="mmx mmxext sse sse2 sse3"
diff --git a/conf/intel/portage/make.conf/00-devices b/conf/intel/portage/make.conf/00-devices
new file mode 100644
index 0000000..8b3a4a2
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-devices
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+INPUT_DEVICES="evdev synaptics libinput"
+VIDEO_CARDS="intel i915 i965 iris nouveau r100 r200 r300 r600 vesa amdgpu radeonsi radeon vmware virgl"
+LIRC_DEVICES="audio audio_alsa serial pctv"
diff --git a/conf/intel/portage/make.conf/00-devices.conf b/conf/intel/portage/make.conf/00-devices.conf
deleted file mode 100644
index 8b3a4a2..0000000
--- a/conf/intel/portage/make.conf/00-devices.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-INPUT_DEVICES="evdev synaptics libinput"
-VIDEO_CARDS="intel i915 i965 iris nouveau r100 r200 r300 r600 vesa amdgpu radeonsi radeon vmware virgl"
-LIRC_DEVICES="audio audio_alsa serial pctv"
diff --git a/conf/intel/portage/make.conf/00-distfiles b/conf/intel/portage/make.conf/00-distfiles
new file mode 100644
index 0000000..d3733f8
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-distfiles
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+GENTOO_MIRRORS="https://www.mirrorservice.org/sites/distfiles.gentoo.org/"
diff --git a/conf/intel/portage/make.conf/00-distfiles.conf b/conf/intel/portage/make.conf/00-distfiles.conf
deleted file mode 100644
index d3733f8..0000000
--- a/conf/intel/portage/make.conf/00-distfiles.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-GENTOO_MIRRORS="https://www.mirrorservice.org/sites/distfiles.gentoo.org/"
diff --git a/conf/intel/portage/make.conf/00-features b/conf/intel/portage/make.conf/00-features
new file mode 100644
index 0000000..470d506
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-features
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+FEATURES="parallel-fetch parallel-install protect-owned candy fakeroot buildpkg compressdebug splitdebug -userpriv"
diff --git a/conf/intel/portage/make.conf/00-features.conf b/conf/intel/portage/make.conf/00-features.conf
deleted file mode 100644
index 470d506..0000000
--- a/conf/intel/portage/make.conf/00-features.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-FEATURES="parallel-fetch parallel-install protect-owned candy fakeroot buildpkg compressdebug splitdebug -userpriv"
diff --git a/conf/intel/portage/make.conf/00-generic b/conf/intel/portage/make.conf/00-generic
new file mode 100644
index 0000000..5cd084f
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-generic
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+CLEAN_DELAY="0"
diff --git a/conf/intel/portage/make.conf/00-generic.conf b/conf/intel/portage/make.conf/00-generic.conf
deleted file mode 100644
index 5cd084f..0000000
--- a/conf/intel/portage/make.conf/00-generic.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-CLEAN_DELAY="0"
diff --git a/conf/intel/portage/make.conf/00-grub b/conf/intel/portage/make.conf/00-grub
new file mode 100644
index 0000000..975d340
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-grub
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+GRUB_PLATFORMS="efi-32 efi-64 pc"
diff --git a/conf/intel/portage/make.conf/00-grub.conf b/conf/intel/portage/make.conf/00-grub.conf
deleted file mode 100644
index 975d340..0000000
--- a/conf/intel/portage/make.conf/00-grub.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-GRUB_PLATFORMS="efi-32 efi-64 pc"
diff --git a/conf/intel/portage/make.conf/00-keywords b/conf/intel/portage/make.conf/00-keywords
new file mode 100644
index 0000000..fe45d0e
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-keywords
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+ACCEPT_KEYWORDS="amd64 ~amd64"
diff --git a/conf/intel/portage/make.conf/00-keywords.conf b/conf/intel/portage/make.conf/00-keywords.conf
deleted file mode 100644
index fe45d0e..0000000
--- a/conf/intel/portage/make.conf/00-keywords.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-ACCEPT_KEYWORDS="amd64 ~amd64"
diff --git a/conf/intel/portage/make.conf/00-languages b/conf/intel/portage/make.conf/00-languages
new file mode 100644
index 0000000..5fa7e10
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-languages
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+L10N="ach af am an ar as ast az be bg bn bn-BD bn-IN bo br brx bs ca ca-valencia cak chr cs csb cy da de de-1901 dgo doi dsb dz el en en-GB en-US en-ZA eo es es-419 es-AR es-CL es-ES es-MX et eu fa ff fi fil fo fr fr-CA fy ga gd gl gn gu gug he hi hne hr hsb hu hy ia id is it ja ka kab kk km kmr-Latn kn ko kok ks ku ky la lb lij lo lt lv mai mi mk ml mn mni mr ms my nb nds ne nl nn no nr nso oc om or pa pl pt pt-BR pt-PT rm ro ru rw sa sat sco sd se si sid sk sl son sq sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sr-ME ss st sv sw sw-TZ syc ta ta-LK te tg th tk tl tn tr ts tt ug uk ur-PK uz uz-Cyrl ve vi wa xh zh zh-CN zh-HK zh-TW zu"
+LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as ast az be be_BY bg bg_BG bn bn_BD bn_IN bo br brx bs byn ca ca_ES ca_XV ckb cmn co crh cs cs_CZ csb cy cy_GB da da_DK de de_CH de_DE dgo doi dz ee el el_GR en en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR frp fur fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN gug haw he he_IL hi hi_IN hne hr hr_HR hsb hu hu_HU hy hy_AM ia id id_ID ii is is_IS it it_IT ja ja_JP jv ka ka_GE kab kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ku_IQ ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk mk_MK ml mn mni mr ms ms_MY mt my nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no no_NO nqo nr nso oc om or pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU rue rw sa sa_IN sah sat sc sco sd se shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr_RS ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te tg tg_TJ th th_TH ti tig tk tl tlh tn tpi tr tr_TR ts tt tt_RU ug uk uk_UA ur ur_PK uz uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu"
diff --git a/conf/intel/portage/make.conf/00-languages.conf b/conf/intel/portage/make.conf/00-languages.conf
deleted file mode 100644
index 5fa7e10..0000000
--- a/conf/intel/portage/make.conf/00-languages.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-L10N="ach af am an ar as ast az be bg bn bn-BD bn-IN bo br brx bs ca ca-valencia cak chr cs csb cy da de de-1901 dgo doi dsb dz el en en-GB en-US en-ZA eo es es-419 es-AR es-CL es-ES es-MX et eu fa ff fi fil fo fr fr-CA fy ga gd gl gn gu gug he hi hne hr hsb hu hy ia id is it ja ka kab kk km kmr-Latn kn ko kok ks ku ky la lb lij lo lt lv mai mi mk ml mn mni mr ms my nb nds ne nl nn no nr nso oc om or pa pl pt pt-BR pt-PT rm ro ru rw sa sat sco sd se si sid sk sl son sq sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sr-ME ss st sv sw sw-TZ syc ta ta-LK te tg th tk tl tn tr ts tt ug uk ur-PK uz uz-Cyrl ve vi wa xh zh zh-CN zh-HK zh-TW zu"
-LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as ast az be be_BY bg bg_BG bn bn_BD bn_IN bo br brx bs byn ca ca_ES ca_XV ckb cmn co crh cs cs_CZ csb cy cy_GB da da_DK de de_CH de_DE dgo doi dz ee el el_GR en en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR frp fur fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN gug haw he he_IL hi hi_IN hne hr hr_HR hsb hu hu_HU hy hy_AM ia id id_ID ii is is_IS it it_IT ja ja_JP jv ka ka_GE kab kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ku_IQ ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk mk_MK ml mn mni mr ms ms_MY mt my nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no no_NO nqo nr nso oc om or pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU rue rw sa sa_IN sah sat sc sco sd se shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr_RS ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te tg tg_TJ th th_TH ti tig tk tl tlh tn tpi tr tr_TR ts tt tt_RU ug uk uk_UA ur ur_PK uz uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu"
diff --git a/conf/intel/portage/make.conf/00-layout b/conf/intel/portage/make.conf/00-layout
new file mode 100644
index 0000000..dc17ed2
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-layout
@@ -0,0 +1,14 @@
+# This file has been automatically generated, do not edit.
+
+PORTDIR="/usr/ports/gentoo"
+PKGDIR="/var/cache/packages"
+DISTDIR="/var/cache/distfiles"
+
+INSTALL_MASK="/etc/systemd
+ /usr/lib/systemd
+ /usr/lib64/systemd
+ /usr/lib/debug
+ /usr/lib64/debug
+ /etc/portage"
+
+UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /etc/portage"
diff --git a/conf/intel/portage/make.conf/00-layout.conf b/conf/intel/portage/make.conf/00-layout.conf
deleted file mode 100644
index dc17ed2..0000000
--- a/conf/intel/portage/make.conf/00-layout.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-PORTDIR="/usr/ports/gentoo"
-PKGDIR="/var/cache/packages"
-DISTDIR="/var/cache/distfiles"
-
-INSTALL_MASK="/etc/systemd
- /usr/lib/systemd
- /usr/lib64/systemd
- /usr/lib/debug
- /usr/lib64/debug
- /etc/portage"
-
-UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /etc/portage"
diff --git a/conf/intel/portage/make.conf/00-libreoffice b/conf/intel/portage/make.conf/00-libreoffice
new file mode 100644
index 0000000..518d0eb
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-libreoffice
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport"
diff --git a/conf/intel/portage/make.conf/00-libreoffice.conf b/conf/intel/portage/make.conf/00-libreoffice.conf
deleted file mode 100644
index 518d0eb..0000000
--- a/conf/intel/portage/make.conf/00-libreoffice.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport"
diff --git a/conf/intel/portage/make.conf/00-licenses b/conf/intel/portage/make.conf/00-licenses
new file mode 100644
index 0000000..1aef712
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-licenses
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+ACCEPT_LICENSE="* -@EULA"
diff --git a/conf/intel/portage/make.conf/00-licenses.conf b/conf/intel/portage/make.conf/00-licenses.conf
deleted file mode 100644
index 1aef712..0000000
--- a/conf/intel/portage/make.conf/00-licenses.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-ACCEPT_LICENSE="* -@EULA"
diff --git a/conf/intel/portage/make.conf/00-llvm b/conf/intel/portage/make.conf/00-llvm
new file mode 100644
index 0000000..b7b6c34
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-llvm
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+LLVM_TARGETS="AMDGPU BPF NVPTX X86 AArch64 ARM WebAssembly"
diff --git a/conf/intel/portage/make.conf/00-llvm.conf b/conf/intel/portage/make.conf/00-llvm.conf
deleted file mode 100644
index b7b6c34..0000000
--- a/conf/intel/portage/make.conf/00-llvm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-LLVM_TARGETS="AMDGPU BPF NVPTX X86 AArch64 ARM WebAssembly"
diff --git a/conf/intel/portage/make.conf/00-mirrors b/conf/intel/portage/make.conf/00-mirrors
new file mode 100644
index 0000000..71f621d
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-mirrors
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+source /etc/sisyphus/mirrors.conf
diff --git a/conf/intel/portage/make.conf/00-mirrors.conf b/conf/intel/portage/make.conf/00-mirrors.conf
deleted file mode 100644
index 71f621d..0000000
--- a/conf/intel/portage/make.conf/00-mirrors.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-source /etc/sisyphus/mirrors.conf
diff --git a/conf/intel/portage/make.conf/00-python b/conf/intel/portage/make.conf/00-python
new file mode 100644
index 0000000..bba1eec
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-python
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+USE_PYTHON="3.10"
+PYTHON_TARGETS="python3_10"
+PYTHON_SINGLE_TARGET="python3_10"
diff --git a/conf/intel/portage/make.conf/00-python.conf b/conf/intel/portage/make.conf/00-python.conf
deleted file mode 100644
index bba1eec..0000000
--- a/conf/intel/portage/make.conf/00-python.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-USE_PYTHON="3.10"
-PYTHON_TARGETS="python3_10"
-PYTHON_SINGLE_TARGET="python3_10"
diff --git a/conf/intel/portage/make.conf/00-qemu b/conf/intel/portage/make.conf/00-qemu
new file mode 100644
index 0000000..9799b7e
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-qemu
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+QEMU_USER_TARGETS="x86_64 i386 aarch64"
+QEMU_SOFTMMU_TARGETS="x86_64 i386 aarch64"
diff --git a/conf/intel/portage/make.conf/00-qemu.conf b/conf/intel/portage/make.conf/00-qemu.conf
deleted file mode 100644
index 9799b7e..0000000
--- a/conf/intel/portage/make.conf/00-qemu.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-QEMU_USER_TARGETS="x86_64 i386 aarch64"
-QEMU_SOFTMMU_TARGETS="x86_64 i386 aarch64"
diff --git a/conf/intel/portage/make.conf/00-ruby b/conf/intel/portage/make.conf/00-ruby
new file mode 100644
index 0000000..8db12eb
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-ruby
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+RUBY_TARGETS="ruby30 ruby31"
diff --git a/conf/intel/portage/make.conf/00-ruby.conf b/conf/intel/portage/make.conf/00-ruby.conf
deleted file mode 100644
index 8db12eb..0000000
--- a/conf/intel/portage/make.conf/00-ruby.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-RUBY_TARGETS="ruby30 ruby31"
diff --git a/conf/intel/portage/make.conf/00-useflags b/conf/intel/portage/make.conf/00-useflags
new file mode 100644
index 0000000..39d3af8
--- /dev/null
+++ b/conf/intel/portage/make.conf/00-useflags
@@ -0,0 +1,13 @@
+# This file has been automatically generated, do not edit.
+
+SYSTEM_USE="X acl btrfs cet cryptsetup dbus elogind gcrypt glamor gudev icu introspection jemalloc json libglvnd lto nettle openrc openssl perl pgo policykit polkit python sysvinit threads udev udisks unwind upower vala vulkan wayland xattr"
+CODECS_USE="a52 aac aacplus dts dv faac fdk flac gsm lame mms modplug mp3 mpeg mpg123 nvenc ogg opus theora vorbis vpx wavpack webp x264 x265 xvid"
+MEDIA_USE="bluetooth bluray cairo dri dri3 drm dvd egl libass matroska mtp opencl opengl rtmp v4l vaapi vdpau xcb xkb xml xvmc"
+IMAGE_USE="apng avif exif gif gphoto2 heif jpeg jpeg2k jpegxl lcms mng mobi openexr pdf png raw svg tiff webp xmp xpm"
+TOOLKIT_USE="gtk gtk3 gui qml qt5 sdl sdl2 tcl tk"
+NETWORK_USE="avahi http ipv6 ldap libproxy modemmanager networkmanager samba sasl sftp teamd zeroconf"
+SOUND_USE="alsa cdda cue ffmpeg gstreamer jack openal pipewire pulseaudio qtmedia sound soxr"
+MISC_USE="apparmor corefonts cups curl designer epub fontconfig gdbm ios ipod kerberos keyring libnotify lz4 lzip lzma postgres screencast sqlite taglib truetype vcd xinerama zstd"
+DONT_USE="-bindist -branding -connman -consolekit -gnome -gtk2 -handbook -kde -libav -mysql -qt3support -qt4 -semantic-desktop -static-libs -systemd -tracker -webkit"
+
+USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${MISC_USE} ${DONT_USE}"
diff --git a/conf/intel/portage/make.conf/00-useflags.conf b/conf/intel/portage/make.conf/00-useflags.conf
deleted file mode 100644
index 39d3af8..0000000
--- a/conf/intel/portage/make.conf/00-useflags.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-SYSTEM_USE="X acl btrfs cet cryptsetup dbus elogind gcrypt glamor gudev icu introspection jemalloc json libglvnd lto nettle openrc openssl perl pgo policykit polkit python sysvinit threads udev udisks unwind upower vala vulkan wayland xattr"
-CODECS_USE="a52 aac aacplus dts dv faac fdk flac gsm lame mms modplug mp3 mpeg mpg123 nvenc ogg opus theora vorbis vpx wavpack webp x264 x265 xvid"
-MEDIA_USE="bluetooth bluray cairo dri dri3 drm dvd egl libass matroska mtp opencl opengl rtmp v4l vaapi vdpau xcb xkb xml xvmc"
-IMAGE_USE="apng avif exif gif gphoto2 heif jpeg jpeg2k jpegxl lcms mng mobi openexr pdf png raw svg tiff webp xmp xpm"
-TOOLKIT_USE="gtk gtk3 gui qml qt5 sdl sdl2 tcl tk"
-NETWORK_USE="avahi http ipv6 ldap libproxy modemmanager networkmanager samba sasl sftp teamd zeroconf"
-SOUND_USE="alsa cdda cue ffmpeg gstreamer jack openal pipewire pulseaudio qtmedia sound soxr"
-MISC_USE="apparmor corefonts cups curl designer epub fontconfig gdbm ios ipod kerberos keyring libnotify lz4 lzip lzma postgres screencast sqlite taglib truetype vcd xinerama zstd"
-DONT_USE="-bindist -branding -connman -consolekit -gnome -gtk2 -handbook -kde -libav -mysql -qt3support -qt4 -semantic-desktop -static-libs -systemd -tracker -webkit"
-
-USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${MISC_USE} ${DONT_USE}"
diff --git a/conf/intel/portage/make.conf/10-sisyphus-overrides b/conf/intel/portage/make.conf/10-sisyphus-overrides
new file mode 120000
index 0000000..53e724c
--- /dev/null
+++ b/conf/intel/portage/make.conf/10-sisyphus-overrides
@@ -0,0 +1 @@
+/etc/sisyphus/sisyphus.make.conf
\ No newline at end of file
diff --git a/conf/intel/portage/make.conf/10-sisyphus.make.conf b/conf/intel/portage/make.conf/10-sisyphus.make.conf
deleted file mode 120000
index 53e724c..0000000
--- a/conf/intel/portage/make.conf/10-sisyphus.make.conf
+++ /dev/null
@@ -1 +0,0 @@
-/etc/sisyphus/sisyphus.make.conf
\ No newline at end of file
diff --git a/conf/intel/portage/package.accept_keywords/00-dev-python b/conf/intel/portage/package.accept_keywords/00-dev-python
new file mode 100644
index 0000000..653aeb1
--- /dev/null
+++ b/conf/intel/portage/package.accept_keywords/00-dev-python
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+dev-python/cython -~amd64
+dev-python/zeroconf -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-dev-python.package.keywords b/conf/intel/portage/package.accept_keywords/00-dev-python.package.keywords
deleted file mode 100644
index 653aeb1..0000000
--- a/conf/intel/portage/package.accept_keywords/00-dev-python.package.keywords
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-python/cython -~amd64
-dev-python/zeroconf -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-dev-util b/conf/intel/portage/package.accept_keywords/00-dev-util
new file mode 100644
index 0000000..c861430
--- /dev/null
+++ b/conf/intel/portage/package.accept_keywords/00-dev-util
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+dev-util/astyle -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-dev-util.package.keywords b/conf/intel/portage/package.accept_keywords/00-dev-util.package.keywords
deleted file mode 100644
index c861430..0000000
--- a/conf/intel/portage/package.accept_keywords/00-dev-util.package.keywords
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-util/astyle -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-media-gfx b/conf/intel/portage/package.accept_keywords/00-media-gfx
new file mode 100644
index 0000000..852af6a
--- /dev/null
+++ b/conf/intel/portage/package.accept_keywords/00-media-gfx
@@ -0,0 +1,3 @@
+#This file has been automatically generated, do not edit.
+
+media-gfx/blender:3.3 -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-media-gfx.package.keywords b/conf/intel/portage/package.accept_keywords/00-media-gfx.package.keywords
deleted file mode 100644
index 852af6a..0000000
--- a/conf/intel/portage/package.accept_keywords/00-media-gfx.package.keywords
+++ /dev/null
@@ -1,3 +0,0 @@
-#This file has been automatically generated, do not edit.
-
-media-gfx/blender:3.3 -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-media-video b/conf/intel/portage/package.accept_keywords/00-media-video
new file mode 100644
index 0000000..21cd393
--- /dev/null
+++ b/conf/intel/portage/package.accept_keywords/00-media-video
@@ -0,0 +1,3 @@
+#This file has been automatically generated, do not edit.
+
+media-video/handbrake -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-media-video.package.keywords b/conf/intel/portage/package.accept_keywords/00-media-video.package.keywords
deleted file mode 100644
index 21cd393..0000000
--- a/conf/intel/portage/package.accept_keywords/00-media-video.package.keywords
+++ /dev/null
@@ -1,3 +0,0 @@
-#This file has been automatically generated, do not edit.
-
-media-video/handbrake -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-net-libs b/conf/intel/portage/package.accept_keywords/00-net-libs
new file mode 100644
index 0000000..0b75d47
--- /dev/null
+++ b/conf/intel/portage/package.accept_keywords/00-net-libs
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-libs/libproxy -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/00-net-libs.package.keywords b/conf/intel/portage/package.accept_keywords/00-net-libs.package.keywords
deleted file mode 100644
index 0b75d47..0000000
--- a/conf/intel/portage/package.accept_keywords/00-net-libs.package.keywords
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-libs/libproxy -~amd64
diff --git a/conf/intel/portage/package.accept_keywords/10-sisyphus-overrides b/conf/intel/portage/package.accept_keywords/10-sisyphus-overrides
new file mode 120000
index 0000000..a97d462
--- /dev/null
+++ b/conf/intel/portage/package.accept_keywords/10-sisyphus-overrides
@@ -0,0 +1 @@
+/etc/sisyphus/sisyphus.package.keywords
\ No newline at end of file
diff --git a/conf/intel/portage/package.accept_keywords/10-sisyphus.package.keywords b/conf/intel/portage/package.accept_keywords/10-sisyphus.package.keywords
deleted file mode 120000
index a97d462..0000000
--- a/conf/intel/portage/package.accept_keywords/10-sisyphus.package.keywords
+++ /dev/null
@@ -1 +0,0 @@
-/etc/sisyphus/sisyphus.package.keywords
\ No newline at end of file
diff --git a/conf/intel/portage/package.env/00-app-emulation b/conf/intel/portage/package.env/00-app-emulation
new file mode 100644
index 0000000..e1c26b4
--- /dev/null
+++ b/conf/intel/portage/package.env/00-app-emulation
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-emulation/virtualbox basic.conf
diff --git a/conf/intel/portage/package.env/00-app-emulation.package.env b/conf/intel/portage/package.env/00-app-emulation.package.env
deleted file mode 100644
index e1c26b4..0000000
--- a/conf/intel/portage/package.env/00-app-emulation.package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-emulation/virtualbox basic.conf
diff --git a/conf/intel/portage/package.env/00-app-office b/conf/intel/portage/package.env/00-app-office
new file mode 100644
index 0000000..cb5b821
--- /dev/null
+++ b/conf/intel/portage/package.env/00-app-office
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-office/libreoffice userpriv.conf
diff --git a/conf/intel/portage/package.env/00-app-office.package.env b/conf/intel/portage/package.env/00-app-office.package.env
deleted file mode 100644
index cb5b821..0000000
--- a/conf/intel/portage/package.env/00-app-office.package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-office/libreoffice userpriv.conf
diff --git a/conf/intel/portage/package.env/00-games-emulation b/conf/intel/portage/package.env/00-games-emulation
new file mode 100644
index 0000000..0ecb721
--- /dev/null
+++ b/conf/intel/portage/package.env/00-games-emulation
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+games-emulation/zsnes nofcfprotection.conf
diff --git a/conf/intel/portage/package.env/00-games-emulation.package.env b/conf/intel/portage/package.env/00-games-emulation.package.env
deleted file mode 100644
index 0ecb721..0000000
--- a/conf/intel/portage/package.env/00-games-emulation.package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-games-emulation/zsnes nofcfprotection.conf
diff --git a/conf/intel/portage/package.env/00-mail-client b/conf/intel/portage/package.env/00-mail-client
new file mode 100644
index 0000000..926e68c
--- /dev/null
+++ b/conf/intel/portage/package.env/00-mail-client
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+mail-client/thunderbird userpriv.conf
diff --git a/conf/intel/portage/package.env/00-mail-client.package.env b/conf/intel/portage/package.env/00-mail-client.package.env
deleted file mode 100644
index 926e68c..0000000
--- a/conf/intel/portage/package.env/00-mail-client.package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-mail-client/thunderbird userpriv.conf
diff --git a/conf/intel/portage/package.env/00-media-libs b/conf/intel/portage/package.env/00-media-libs
new file mode 100644
index 0000000..a048701
--- /dev/null
+++ b/conf/intel/portage/package.env/00-media-libs
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+media-libs/libaom nosseavx.conf
+media-libs/x264 noframepointer.conf
diff --git a/conf/intel/portage/package.env/00-media-libs.package.env b/conf/intel/portage/package.env/00-media-libs.package.env
deleted file mode 100644
index a048701..0000000
--- a/conf/intel/portage/package.env/00-media-libs.package.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-libs/libaom nosseavx.conf
-media-libs/x264 noframepointer.conf
diff --git a/conf/intel/portage/package.env/00-media-video b/conf/intel/portage/package.env/00-media-video
new file mode 100644
index 0000000..afe64ae
--- /dev/null
+++ b/conf/intel/portage/package.env/00-media-video
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+media-video/handbrake copydtentries.conf
diff --git a/conf/intel/portage/package.env/00-media-video.package.env b/conf/intel/portage/package.env/00-media-video.package.env
deleted file mode 100644
index afe64ae..0000000
--- a/conf/intel/portage/package.env/00-media-video.package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-video/handbrake copydtentries.conf
diff --git a/conf/intel/portage/package.env/00-net-dns b/conf/intel/portage/package.env/00-net-dns
new file mode 100644
index 0000000..0234be8
--- /dev/null
+++ b/conf/intel/portage/package.env/00-net-dns
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-dns/getdns nostrict.conf
diff --git a/conf/intel/portage/package.env/00-net-dns.package.env b/conf/intel/portage/package.env/00-net-dns.package.env
deleted file mode 100644
index 0234be8..0000000
--- a/conf/intel/portage/package.env/00-net-dns.package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-dns/getdns nostrict.conf
diff --git a/conf/intel/portage/package.env/00-sys-boot b/conf/intel/portage/package.env/00-sys-boot
new file mode 100644
index 0000000..d111417
--- /dev/null
+++ b/conf/intel/portage/package.env/00-sys-boot
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+sys-boot/plymouth nostackclashprotection.conf
+sys-boot/syslinux nofcfprotection.conf
diff --git a/conf/intel/portage/package.env/00-sys-boot.package.env b/conf/intel/portage/package.env/00-sys-boot.package.env
deleted file mode 100644
index d111417..0000000
--- a/conf/intel/portage/package.env/00-sys-boot.package.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-boot/plymouth nostackclashprotection.conf
-sys-boot/syslinux nofcfprotection.conf
diff --git a/conf/intel/portage/package.env/00-sys-fs b/conf/intel/portage/package.env/00-sys-fs
new file mode 100644
index 0000000..0486099
--- /dev/null
+++ b/conf/intel/portage/package.env/00-sys-fs
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+sys-fs/dmraid noparallelmake.conf
diff --git a/conf/intel/portage/package.env/00-sys-fs.package.env b/conf/intel/portage/package.env/00-sys-fs.package.env
deleted file mode 100644
index 0486099..0000000
--- a/conf/intel/portage/package.env/00-sys-fs.package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-fs/dmraid noparallelmake.conf
diff --git a/conf/intel/portage/package.env/00-sys-kernel b/conf/intel/portage/package.env/00-sys-kernel
new file mode 100644
index 0000000..b983d1d
--- /dev/null
+++ b/conf/intel/portage/package.env/00-sys-kernel
@@ -0,0 +1,6 @@
+# This file has been automatically generated, do not edit.
+
+sys-kernel/linux-image-redcore-lts makenoise.conf
+sys-kernel/linux-sources-redcore-lts makenoise.conf
+sys-kernel/linux-image-redcore makenoise.conf
+sys-kernel/linux-sources-redcore makenoise.conf
diff --git a/conf/intel/portage/package.env/00-sys-kernel.package.env b/conf/intel/portage/package.env/00-sys-kernel.package.env
deleted file mode 100644
index b983d1d..0000000
--- a/conf/intel/portage/package.env/00-sys-kernel.package.env
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-kernel/linux-image-redcore-lts makenoise.conf
-sys-kernel/linux-sources-redcore-lts makenoise.conf
-sys-kernel/linux-image-redcore makenoise.conf
-sys-kernel/linux-sources-redcore makenoise.conf
diff --git a/conf/intel/portage/package.env/00-sys-libs b/conf/intel/portage/package.env/00-sys-libs
new file mode 100644
index 0000000..398a48a
--- /dev/null
+++ b/conf/intel/portage/package.env/00-sys-libs
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+sys-libs/glibc noparallelmake.conf
+sys-libs/libstdc++-v3 nostackprotector.conf
diff --git a/conf/intel/portage/package.env/00-sys-libs.package.env b/conf/intel/portage/package.env/00-sys-libs.package.env
deleted file mode 100644
index 398a48a..0000000
--- a/conf/intel/portage/package.env/00-sys-libs.package.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-libs/glibc noparallelmake.conf
-sys-libs/libstdc++-v3 nostackprotector.conf
diff --git a/conf/intel/portage/package.env/00-www-client b/conf/intel/portage/package.env/00-www-client
new file mode 100644
index 0000000..645590b
--- /dev/null
+++ b/conf/intel/portage/package.env/00-www-client
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+www-client/firefox userpriv.conf
diff --git a/conf/intel/portage/package.env/00-www-client.package.env b/conf/intel/portage/package.env/00-www-client.package.env
deleted file mode 100644
index 645590b..0000000
--- a/conf/intel/portage/package.env/00-www-client.package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-www-client/firefox userpriv.conf
diff --git a/conf/intel/portage/package.env/00-x11-base b/conf/intel/portage/package.env/00-x11-base
new file mode 100644
index 0000000..ee3adec
--- /dev/null
+++ b/conf/intel/portage/package.env/00-x11-base
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+x11-base/xorg-server pltnonow.conf
+x11-base/xwayland pltnonow.conf
diff --git a/conf/intel/portage/package.env/00-x11-base.package.env b/conf/intel/portage/package.env/00-x11-base.package.env
deleted file mode 100644
index ee3adec..0000000
--- a/conf/intel/portage/package.env/00-x11-base.package.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-base/xorg-server pltnonow.conf
-x11-base/xwayland pltnonow.conf
diff --git a/conf/intel/portage/package.env/00-x11-drivers b/conf/intel/portage/package.env/00-x11-drivers
new file mode 100644
index 0000000..9393188
--- /dev/null
+++ b/conf/intel/portage/package.env/00-x11-drivers
@@ -0,0 +1,15 @@
+# This file has been automatically generated, do not edit.
+
+x11-drivers/xf86-input-evdev pltnonow.conf
+x11-drivers/xf86-input-joystick pltnonow.conf
+x11-drivers/xf86-input-libinput pltnonow.conf
+x11-drivers/xf86-input-synaptics pltnonow.conf
+x11-drivers/xf86-input-wacom pltnonow.conf
+x11-drivers/xf86-video-amdgpu pltnonow.conf
+x11-drivers/xf86-video-ati pltnonow.conf
+x11-drivers/xf86-video-intel pltnonow.conf
+x11-drivers/xf86-video-nouveau pltnonow.conf
+x11-drivers/xf86-video-qxl pltnonow.conf
+x11-drivers/xf86-video-vboxvideo pltnonow.conf
+x11-drivers/xf86-video-vesa pltnonow.conf
+x11-drivers/xf86-video-vmware pltnonow.conf
diff --git a/conf/intel/portage/package.env/00-x11-drivers.package.env b/conf/intel/portage/package.env/00-x11-drivers.package.env
deleted file mode 100644
index 9393188..0000000
--- a/conf/intel/portage/package.env/00-x11-drivers.package.env
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-drivers/xf86-input-evdev pltnonow.conf
-x11-drivers/xf86-input-joystick pltnonow.conf
-x11-drivers/xf86-input-libinput pltnonow.conf
-x11-drivers/xf86-input-synaptics pltnonow.conf
-x11-drivers/xf86-input-wacom pltnonow.conf
-x11-drivers/xf86-video-amdgpu pltnonow.conf
-x11-drivers/xf86-video-ati pltnonow.conf
-x11-drivers/xf86-video-intel pltnonow.conf
-x11-drivers/xf86-video-nouveau pltnonow.conf
-x11-drivers/xf86-video-qxl pltnonow.conf
-x11-drivers/xf86-video-vboxvideo pltnonow.conf
-x11-drivers/xf86-video-vesa pltnonow.conf
-x11-drivers/xf86-video-vmware pltnonow.conf
diff --git a/conf/intel/portage/package.env/10-sisyphus-overrides b/conf/intel/portage/package.env/10-sisyphus-overrides
new file mode 120000
index 0000000..e174a8b
--- /dev/null
+++ b/conf/intel/portage/package.env/10-sisyphus-overrides
@@ -0,0 +1 @@
+/etc/sisyphus/sisyphus.package.env
\ No newline at end of file
diff --git a/conf/intel/portage/package.env/10-sisyphus.package.env b/conf/intel/portage/package.env/10-sisyphus.package.env
deleted file mode 120000
index e174a8b..0000000
--- a/conf/intel/portage/package.env/10-sisyphus.package.env
+++ /dev/null
@@ -1 +0,0 @@
-/etc/sisyphus/sisyphus.package.env
\ No newline at end of file
diff --git a/conf/intel/portage/package.license/00-app-arch b/conf/intel/portage/package.license/00-app-arch
new file mode 100644
index 0000000..fbebd20
--- /dev/null
+++ b/conf/intel/portage/package.license/00-app-arch
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-arch/rar RAR
diff --git a/conf/intel/portage/package.license/00-app-arch.package.license b/conf/intel/portage/package.license/00-app-arch.package.license
deleted file mode 100644
index fbebd20..0000000
--- a/conf/intel/portage/package.license/00-app-arch.package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-arch/rar RAR
diff --git a/conf/intel/portage/package.license/00-app-emulation b/conf/intel/portage/package.license/00-app-emulation
new file mode 100644
index 0000000..3b77305
--- /dev/null
+++ b/conf/intel/portage/package.license/00-app-emulation
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-emulation/virtualbox-extpack-oracle PUEL-11
diff --git a/conf/intel/portage/package.license/00-app-emulation.package.license b/conf/intel/portage/package.license/00-app-emulation.package.license
deleted file mode 100644
index 3b77305..0000000
--- a/conf/intel/portage/package.license/00-app-emulation.package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-emulation/virtualbox-extpack-oracle PUEL-11
diff --git a/conf/intel/portage/package.license/00-games-fps b/conf/intel/portage/package.license/00-games-fps
new file mode 100644
index 0000000..bbbbac2
--- /dev/null
+++ b/conf/intel/portage/package.license/00-games-fps
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+games-fps/urbanterror Q3AEULA Q3AEULA-20000111
+games-fps/urbanterror-data Q3AEULA-20000111
diff --git a/conf/intel/portage/package.license/00-games-fps.package.license b/conf/intel/portage/package.license/00-games-fps.package.license
deleted file mode 100644
index bbbbac2..0000000
--- a/conf/intel/portage/package.license/00-games-fps.package.license
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-games-fps/urbanterror Q3AEULA Q3AEULA-20000111
-games-fps/urbanterror-data Q3AEULA-20000111
diff --git a/conf/intel/portage/package.license/00-media-libs b/conf/intel/portage/package.license/00-media-libs
new file mode 100644
index 0000000..f252a2e
--- /dev/null
+++ b/conf/intel/portage/package.license/00-media-libs
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+media-libs/fdk-aac FraunhoferFDK
diff --git a/conf/intel/portage/package.license/00-media-libs.package.license b/conf/intel/portage/package.license/00-media-libs.package.license
deleted file mode 100644
index f252a2e..0000000
--- a/conf/intel/portage/package.license/00-media-libs.package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-libs/fdk-aac FraunhoferFDK
diff --git a/conf/intel/portage/package.license/00-net-misc b/conf/intel/portage/package.license/00-net-misc
new file mode 100644
index 0000000..1c51acd
--- /dev/null
+++ b/conf/intel/portage/package.license/00-net-misc
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+net-misc/anydesk AnyDesk-TOS
+net-misc/teamviewer TeamViewer
diff --git a/conf/intel/portage/package.license/00-net-misc.package.license b/conf/intel/portage/package.license/00-net-misc.package.license
deleted file mode 100644
index 1c51acd..0000000
--- a/conf/intel/portage/package.license/00-net-misc.package.license
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-misc/anydesk AnyDesk-TOS
-net-misc/teamviewer TeamViewer
diff --git a/conf/intel/portage/package.license/00-net-wireless b/conf/intel/portage/package.license/00-net-wireless
new file mode 100644
index 0000000..8d2ec7d
--- /dev/null
+++ b/conf/intel/portage/package.license/00-net-wireless
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-wireless/broadcom-sta Broadcom
diff --git a/conf/intel/portage/package.license/00-net-wireless.package.license b/conf/intel/portage/package.license/00-net-wireless.package.license
deleted file mode 100644
index 8d2ec7d..0000000
--- a/conf/intel/portage/package.license/00-net-wireless.package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-wireless/broadcom-sta Broadcom
diff --git a/conf/intel/portage/package.license/00-sys-firmware b/conf/intel/portage/package.license/00-sys-firmware
new file mode 100644
index 0000000..c32e28b
--- /dev/null
+++ b/conf/intel/portage/package.license/00-sys-firmware
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+sys-firmware/b43-firmware Broadcom
diff --git a/conf/intel/portage/package.license/00-sys-firmware.package.license b/conf/intel/portage/package.license/00-sys-firmware.package.license
deleted file mode 100644
index c32e28b..0000000
--- a/conf/intel/portage/package.license/00-sys-firmware.package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-firmware/b43-firmware Broadcom
diff --git a/conf/intel/portage/package.license/00-www-client b/conf/intel/portage/package.license/00-www-client
new file mode 100644
index 0000000..d04222f
--- /dev/null
+++ b/conf/intel/portage/package.license/00-www-client
@@ -0,0 +1,6 @@
+# This file has been automatically generated, do not edit.
+
+www-client/google-chrome google-chrome
+www-client/microsoft-edge microsoft-edge
+www-client/opera OPERA-2018
+www-client/vivaldi Vivaldi
diff --git a/conf/intel/portage/package.license/00-www-client.package.license b/conf/intel/portage/package.license/00-www-client.package.license
deleted file mode 100644
index d04222f..0000000
--- a/conf/intel/portage/package.license/00-www-client.package.license
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-www-client/google-chrome google-chrome
-www-client/microsoft-edge microsoft-edge
-www-client/opera OPERA-2018
-www-client/vivaldi Vivaldi
diff --git a/conf/intel/portage/package.license/00-www-plugins b/conf/intel/portage/package.license/00-www-plugins
new file mode 100644
index 0000000..3c402c9
--- /dev/null
+++ b/conf/intel/portage/package.license/00-www-plugins
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+www-plugins/chrome-binary-plugins google-chrome
diff --git a/conf/intel/portage/package.license/00-www-plugins.package.license b/conf/intel/portage/package.license/00-www-plugins.package.license
deleted file mode 100644
index 3c402c9..0000000
--- a/conf/intel/portage/package.license/00-www-plugins.package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-www-plugins/chrome-binary-plugins google-chrome
diff --git a/conf/intel/portage/package.license/10-sisyphus-overrides b/conf/intel/portage/package.license/10-sisyphus-overrides
new file mode 120000
index 0000000..f8112c0
--- /dev/null
+++ b/conf/intel/portage/package.license/10-sisyphus-overrides
@@ -0,0 +1 @@
+/etc/sisyphus/sisyphus.package.license
\ No newline at end of file
diff --git a/conf/intel/portage/package.license/10-sisyphus.package.license b/conf/intel/portage/package.license/10-sisyphus.package.license
deleted file mode 120000
index f8112c0..0000000
--- a/conf/intel/portage/package.license/10-sisyphus.package.license
+++ /dev/null
@@ -1 +0,0 @@
-/etc/sisyphus/sisyphus.package.license
\ No newline at end of file
diff --git a/conf/intel/portage/package.mask/00-app-admin b/conf/intel/portage/package.mask/00-app-admin
new file mode 100644
index 0000000..53d15dc
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-app-admin
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-admin/calamares::gentoo
diff --git a/conf/intel/portage/package.mask/00-app-admin.package.mask b/conf/intel/portage/package.mask/00-app-admin.package.mask
deleted file mode 100644
index 53d15dc..0000000
--- a/conf/intel/portage/package.mask/00-app-admin.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-admin/calamares::gentoo
diff --git a/conf/intel/portage/package.mask/00-app-emulation b/conf/intel/portage/package.mask/00-app-emulation
new file mode 100644
index 0000000..0865089
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-app-emulation
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-emulation/virtualbox-modules::gentoo
diff --git a/conf/intel/portage/package.mask/00-app-emulation.package.mask b/conf/intel/portage/package.mask/00-app-emulation.package.mask
deleted file mode 100644
index 0865089..0000000
--- a/conf/intel/portage/package.mask/00-app-emulation.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-emulation/virtualbox-modules::gentoo
diff --git a/conf/intel/portage/package.mask/00-dev-java b/conf/intel/portage/package.mask/00-dev-java
new file mode 100644
index 0000000..a0b18f3
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-dev-java
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+dev-java/openjdk::gentoo
diff --git a/conf/intel/portage/package.mask/00-dev-java.package.mask b/conf/intel/portage/package.mask/00-dev-java.package.mask
deleted file mode 100644
index a0b18f3..0000000
--- a/conf/intel/portage/package.mask/00-dev-java.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-java/openjdk::gentoo
diff --git a/conf/intel/portage/package.mask/00-dev-lang b/conf/intel/portage/package.mask/00-dev-lang
new file mode 100644
index 0000000..613d060
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-dev-lang
@@ -0,0 +1,6 @@
+# This file has been automatically generated, do not edit.
+
+dev-lang/python:3.11::gentoo
+dev-lang/python:3.12::gentoo
+>=dev-lang/rust-1.75.99::gentoo
+>=dev-lang/rust-bin-1.75.99::gentoo
diff --git a/conf/intel/portage/package.mask/00-dev-lang.package.mask b/conf/intel/portage/package.mask/00-dev-lang.package.mask
deleted file mode 100644
index 613d060..0000000
--- a/conf/intel/portage/package.mask/00-dev-lang.package.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-lang/python:3.11::gentoo
-dev-lang/python:3.12::gentoo
->=dev-lang/rust-1.75.99::gentoo
->=dev-lang/rust-bin-1.75.99::gentoo
diff --git a/conf/intel/portage/package.mask/00-dev-libs b/conf/intel/portage/package.mask/00-dev-libs
new file mode 100644
index 0000000..04c8248
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-dev-libs
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+dev-libs/libdbusmenu-qt::gentoo
+dev-libs/openssl:0/3::gentoo
diff --git a/conf/intel/portage/package.mask/00-dev-libs.package.mask b/conf/intel/portage/package.mask/00-dev-libs.package.mask
deleted file mode 100644
index 04c8248..0000000
--- a/conf/intel/portage/package.mask/00-dev-libs.package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-libs/libdbusmenu-qt::gentoo
-dev-libs/openssl:0/3::gentoo
diff --git a/conf/intel/portage/package.mask/00-dev-python b/conf/intel/portage/package.mask/00-dev-python
new file mode 100644
index 0000000..a15e6d0
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-dev-python
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+dev-python/click::gentoo
diff --git a/conf/intel/portage/package.mask/00-dev-python.package.mask b/conf/intel/portage/package.mask/00-dev-python.package.mask
deleted file mode 100644
index a15e6d0..0000000
--- a/conf/intel/portage/package.mask/00-dev-python.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-python/click::gentoo
diff --git a/conf/intel/portage/package.mask/00-media-video b/conf/intel/portage/package.mask/00-media-video
new file mode 100644
index 0000000..e194e01
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-media-video
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+>=media-video/ffmpeg-5.0.0::gentoo
diff --git a/conf/intel/portage/package.mask/00-media-video.package.mask b/conf/intel/portage/package.mask/00-media-video.package.mask
deleted file mode 100644
index e194e01..0000000
--- a/conf/intel/portage/package.mask/00-media-video.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
->=media-video/ffmpeg-5.0.0::gentoo
diff --git a/conf/intel/portage/package.mask/00-net-libs b/conf/intel/portage/package.mask/00-net-libs
new file mode 100644
index 0000000..c32b400
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-net-libs
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-libs/libtorrent-rasterbar:0/2.0::gentoo
diff --git a/conf/intel/portage/package.mask/00-net-libs.package.mask b/conf/intel/portage/package.mask/00-net-libs.package.mask
deleted file mode 100644
index c32b400..0000000
--- a/conf/intel/portage/package.mask/00-net-libs.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-libs/libtorrent-rasterbar:0/2.0::gentoo
diff --git a/conf/intel/portage/package.mask/00-net-wireless b/conf/intel/portage/package.mask/00-net-wireless
new file mode 100644
index 0000000..0870d9a
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-net-wireless
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-wireless/broadcom-sta::gentoo
diff --git a/conf/intel/portage/package.mask/00-net-wireless.package.mask b/conf/intel/portage/package.mask/00-net-wireless.package.mask
deleted file mode 100644
index 0870d9a..0000000
--- a/conf/intel/portage/package.mask/00-net-wireless.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-wireless/broadcom-sta::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-apps b/conf/intel/portage/package.mask/00-sys-apps
new file mode 100644
index 0000000..5a6adb9
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-sys-apps
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+sys-apps/baselayout::gentoo
+sys-apps/openrc::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-apps.package.mask b/conf/intel/portage/package.mask/00-sys-apps.package.mask
deleted file mode 100644
index 5a6adb9..0000000
--- a/conf/intel/portage/package.mask/00-sys-apps.package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-apps/baselayout::gentoo
-sys-apps/openrc::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-auth b/conf/intel/portage/package.mask/00-sys-auth
new file mode 100644
index 0000000..c5bf204
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-sys-auth
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+sys-auth/polkit-qt::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-auth.package.mask b/conf/intel/portage/package.mask/00-sys-auth.package.mask
deleted file mode 100644
index c5bf204..0000000
--- a/conf/intel/portage/package.mask/00-sys-auth.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-auth/polkit-qt::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-boot b/conf/intel/portage/package.mask/00-sys-boot
new file mode 100644
index 0000000..316e7d4
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-sys-boot
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+sys-boot/grub::gentoo
+sys-boot/os-prober::gentoo
+sys-boot/plymouth::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-boot.package.mask b/conf/intel/portage/package.mask/00-sys-boot.package.mask
deleted file mode 100644
index 316e7d4..0000000
--- a/conf/intel/portage/package.mask/00-sys-boot.package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-boot/grub::gentoo
-sys-boot/os-prober::gentoo
-sys-boot/plymouth::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-fs b/conf/intel/portage/package.mask/00-sys-fs
new file mode 100644
index 0000000..e3a3513
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-sys-fs
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+sys-fs/cryptsetup::gentoo
+sys-fs/vhba::gentoo
+sys-fs/zfs::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-fs.package.mask b/conf/intel/portage/package.mask/00-sys-fs.package.mask
deleted file mode 100644
index e3a3513..0000000
--- a/conf/intel/portage/package.mask/00-sys-fs.package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-fs/cryptsetup::gentoo
-sys-fs/vhba::gentoo
-sys-fs/zfs::gentoo
diff --git a/conf/intel/portage/package.mask/00-sys-kernel b/conf/intel/portage/package.mask/00-sys-kernel
new file mode 100644
index 0000000..9f7488f
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-sys-kernel
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+sys-kernel/dracut::gentoo
+sys-kernel/dkms::guru
diff --git a/conf/intel/portage/package.mask/00-sys-kernel.package.mask b/conf/intel/portage/package.mask/00-sys-kernel.package.mask
deleted file mode 100644
index 9f7488f..0000000
--- a/conf/intel/portage/package.mask/00-sys-kernel.package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-kernel/dracut::gentoo
-sys-kernel/dkms::guru
diff --git a/conf/intel/portage/package.mask/00-virtual b/conf/intel/portage/package.mask/00-virtual
new file mode 100644
index 0000000..f61544a
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-virtual
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+virtual/rust:0/llvm-17::gentoo
diff --git a/conf/intel/portage/package.mask/00-virtual.package.mask b/conf/intel/portage/package.mask/00-virtual.package.mask
deleted file mode 100644
index f61544a..0000000
--- a/conf/intel/portage/package.mask/00-virtual.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-virtual/rust:0/llvm-17::gentoo
diff --git a/conf/intel/portage/package.mask/00-www-client b/conf/intel/portage/package.mask/00-www-client
new file mode 100644
index 0000000..7304df2
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-www-client
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+www-client/chromium:0/beta::gentoo
diff --git a/conf/intel/portage/package.mask/00-www-client.package.mask b/conf/intel/portage/package.mask/00-www-client.package.mask
deleted file mode 100644
index 7304df2..0000000
--- a/conf/intel/portage/package.mask/00-www-client.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-www-client/chromium:0/beta::gentoo
diff --git a/conf/intel/portage/package.mask/00-www-plugins b/conf/intel/portage/package.mask/00-www-plugins
new file mode 100644
index 0000000..52cfdd3
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-www-plugins
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+www-plugins/chrome-binary-plugins:beta::gentoo
diff --git a/conf/intel/portage/package.mask/00-www-plugins.package.mask b/conf/intel/portage/package.mask/00-www-plugins.package.mask
deleted file mode 100644
index 52cfdd3..0000000
--- a/conf/intel/portage/package.mask/00-www-plugins.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-www-plugins/chrome-binary-plugins:beta::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-apps b/conf/intel/portage/package.mask/00-x11-apps
new file mode 100644
index 0000000..d9f1acc
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-x11-apps
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+x11-apps/radeon-profile::gentoo
+x11-apps/radeon-profile-daemon::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-apps.package.mask b/conf/intel/portage/package.mask/00-x11-apps.package.mask
deleted file mode 100644
index d9f1acc..0000000
--- a/conf/intel/portage/package.mask/00-x11-apps.package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-apps/radeon-profile::gentoo
-x11-apps/radeon-profile-daemon::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-base b/conf/intel/portage/package.mask/00-x11-base
new file mode 100644
index 0000000..33497c3
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-x11-base
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+x11-base/xorg-drivers::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-base.package.mask b/conf/intel/portage/package.mask/00-x11-base.package.mask
deleted file mode 100644
index 33497c3..0000000
--- a/conf/intel/portage/package.mask/00-x11-base.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-base/xorg-drivers::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-drivers b/conf/intel/portage/package.mask/00-x11-drivers
new file mode 100644
index 0000000..6b46821
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-x11-drivers
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+x11-drivers/nvidia-drivers::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-drivers.package.mask b/conf/intel/portage/package.mask/00-x11-drivers.package.mask
deleted file mode 100644
index 6b46821..0000000
--- a/conf/intel/portage/package.mask/00-x11-drivers.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-drivers/nvidia-drivers::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-libs b/conf/intel/portage/package.mask/00-x11-libs
new file mode 100644
index 0000000..c985185
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-x11-libs
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+x11-libs/gtk+:2::gentoo
+x11-libs/gtk+:3::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-libs.package.mask b/conf/intel/portage/package.mask/00-x11-libs.package.mask
deleted file mode 100644
index c985185..0000000
--- a/conf/intel/portage/package.mask/00-x11-libs.package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-libs/gtk+:2::gentoo
-x11-libs/gtk+:3::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-misc b/conf/intel/portage/package.mask/00-x11-misc
new file mode 100644
index 0000000..445492d
--- /dev/null
+++ b/conf/intel/portage/package.mask/00-x11-misc
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+x11-misc/sddm::gentoo
diff --git a/conf/intel/portage/package.mask/00-x11-misc.package.mask b/conf/intel/portage/package.mask/00-x11-misc.package.mask
deleted file mode 100644
index 445492d..0000000
--- a/conf/intel/portage/package.mask/00-x11-misc.package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-misc/sddm::gentoo
diff --git a/conf/intel/portage/package.mask/000-llvmclang b/conf/intel/portage/package.mask/000-llvmclang
new file mode 100644
index 0000000..257d73d
--- /dev/null
+++ b/conf/intel/portage/package.mask/000-llvmclang
@@ -0,0 +1,14 @@
+# This file has been automatically generated, do not edit.
+
+>=dev-libs/libclc-16.99.99
+>=sys-devel/clang-16.99.99
+>=sys-devel/clang-common-16.99.99
+>=sys-devel/clang-runtime-16.99.99
+>=sys-devel/clang-toolchain-symlinks-16.99.99
+>=sys-devel/lld-16.99.99
+>=sys-devel/lld-toolchain-symlinks-16.99.99
+>=sys-devel/llvm-16.99.99
+>=sys-devel/llvm-common-16.99.99
+>=sys-devel/llvm-toolchain-symlinks-16.99.99
+>=sys-devel/llvmgold-16.99.99
+>=sys-libs/compiler-rt-sanitizers-16.99.99
diff --git a/conf/intel/portage/package.mask/000-llvmclang.package.mask b/conf/intel/portage/package.mask/000-llvmclang.package.mask
deleted file mode 100644
index 257d73d..0000000
--- a/conf/intel/portage/package.mask/000-llvmclang.package.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file has been automatically generated, do not edit.
-
->=dev-libs/libclc-16.99.99
->=sys-devel/clang-16.99.99
->=sys-devel/clang-common-16.99.99
->=sys-devel/clang-runtime-16.99.99
->=sys-devel/clang-toolchain-symlinks-16.99.99
->=sys-devel/lld-16.99.99
->=sys-devel/lld-toolchain-symlinks-16.99.99
->=sys-devel/llvm-16.99.99
->=sys-devel/llvm-common-16.99.99
->=sys-devel/llvm-toolchain-symlinks-16.99.99
->=sys-devel/llvmgold-16.99.99
->=sys-libs/compiler-rt-sanitizers-16.99.99
diff --git a/conf/intel/portage/package.mask/000-toolchain b/conf/intel/portage/package.mask/000-toolchain
new file mode 100644
index 0000000..abda7d3
--- /dev/null
+++ b/conf/intel/portage/package.mask/000-toolchain
@@ -0,0 +1,24 @@
+# This file has been automatically generated, do not edit.
+
+sys-devel/binutils:2.38
+sys-devel/binutils:2.40
+<=sys-devel/binutils-2.38.9999
+>=sys-devel/binutils-2.40
+sys-devel/gcc:10
+sys-devel/gcc:11
+sys-devel/gcc:13
+sys-devel/gcc:14
+<=sys-devel/gcc-11.4.9999
+>=sys-devel/gcc-12.2.9999
+<=sys-kernel/linux-headers-6.0
+>=sys-kernel/linux-headers-6.2
+sys-libs/binutils-libs:0/2.34
+sys-libs/binutils-libs:0/2.35.2
+sys-libs/binutils-libs:0/2.36.1
+sys-libs/binutils-libs:0/2.37
+sys-libs/binutils-libs:0/2.38
+sys-libs/binutils-libs:0/2.40
+<=sys-libs/binutils-libs-2.38.9999
+>=sys-libs/binutils-libs-2.40
+<=sys-libs/glibc-2.35
+>=sys-libs/glibc-2.37
diff --git a/conf/intel/portage/package.mask/000-toolchain.package.mask b/conf/intel/portage/package.mask/000-toolchain.package.mask
deleted file mode 100644
index abda7d3..0000000
--- a/conf/intel/portage/package.mask/000-toolchain.package.mask
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-devel/binutils:2.38
-sys-devel/binutils:2.40
-<=sys-devel/binutils-2.38.9999
->=sys-devel/binutils-2.40
-sys-devel/gcc:10
-sys-devel/gcc:11
-sys-devel/gcc:13
-sys-devel/gcc:14
-<=sys-devel/gcc-11.4.9999
->=sys-devel/gcc-12.2.9999
-<=sys-kernel/linux-headers-6.0
->=sys-kernel/linux-headers-6.2
-sys-libs/binutils-libs:0/2.34
-sys-libs/binutils-libs:0/2.35.2
-sys-libs/binutils-libs:0/2.36.1
-sys-libs/binutils-libs:0/2.37
-sys-libs/binutils-libs:0/2.38
-sys-libs/binutils-libs:0/2.40
-<=sys-libs/binutils-libs-2.38.9999
->=sys-libs/binutils-libs-2.40
-<=sys-libs/glibc-2.35
->=sys-libs/glibc-2.37
diff --git a/conf/intel/portage/package.mask/10-sisyphus-overrides b/conf/intel/portage/package.mask/10-sisyphus-overrides
new file mode 120000
index 0000000..fa5653a
--- /dev/null
+++ b/conf/intel/portage/package.mask/10-sisyphus-overrides
@@ -0,0 +1 @@
+/etc/sisyphus/sisyphus.package.mask
\ No newline at end of file
diff --git a/conf/intel/portage/package.mask/10-sisyphus.package.mask b/conf/intel/portage/package.mask/10-sisyphus.package.mask
deleted file mode 120000
index fa5653a..0000000
--- a/conf/intel/portage/package.mask/10-sisyphus.package.mask
+++ /dev/null
@@ -1 +0,0 @@
-/etc/sisyphus/sisyphus.package.mask
\ No newline at end of file
diff --git a/conf/intel/portage/package.unmask/10-sisyphus-overrides b/conf/intel/portage/package.unmask/10-sisyphus-overrides
new file mode 120000
index 0000000..4d2c6e0
--- /dev/null
+++ b/conf/intel/portage/package.unmask/10-sisyphus-overrides
@@ -0,0 +1 @@
+/etc/sisyphus/sisyphus.package.unmask
\ No newline at end of file
diff --git a/conf/intel/portage/package.unmask/10-sisyphus.package.unmask b/conf/intel/portage/package.unmask/10-sisyphus.package.unmask
deleted file mode 120000
index 4d2c6e0..0000000
--- a/conf/intel/portage/package.unmask/10-sisyphus.package.unmask
+++ /dev/null
@@ -1 +0,0 @@
-/etc/sisyphus/sisyphus.package.unmask
\ No newline at end of file
diff --git a/conf/intel/portage/package.use/00-app-admin b/conf/intel/portage/package.use/00-app-admin
new file mode 100644
index 0000000..2d79b45
--- /dev/null
+++ b/conf/intel/portage/package.use/00-app-admin
@@ -0,0 +1,7 @@
+# This file has been automatically generated, do not edit.
+
+app-admin/calamares branding config
+app-admin/conky hddtemp bundled-toluapp imlib iostats irc lua-cairo lua-imlib lua-rsvg math mpd rss thinkpad weather-metar weather-xoap wifi
+app-admin/keepassxc autotype http -yubikey
+app-admin/sudo -sendmail -gcrypt
+app-admin/testdisk ntfs -ewf
diff --git a/conf/intel/portage/package.use/00-app-admin.package.use b/conf/intel/portage/package.use/00-app-admin.package.use
deleted file mode 100644
index 2d79b45..0000000
--- a/conf/intel/portage/package.use/00-app-admin.package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-admin/calamares branding config
-app-admin/conky hddtemp bundled-toluapp imlib iostats irc lua-cairo lua-imlib lua-rsvg math mpd rss thinkpad weather-metar weather-xoap wifi
-app-admin/keepassxc autotype http -yubikey
-app-admin/sudo -sendmail -gcrypt
-app-admin/testdisk ntfs -ewf
diff --git a/conf/intel/portage/package.use/00-app-containers b/conf/intel/portage/package.use/00-app-containers
new file mode 100644
index 0000000..b795d4e
--- /dev/null
+++ b/conf/intel/portage/package.use/00-app-containers
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-containers/podman cgroup-hybrid
diff --git a/conf/intel/portage/package.use/00-app-containers.package.use b/conf/intel/portage/package.use/00-app-containers.package.use
deleted file mode 100644
index b795d4e..0000000
--- a/conf/intel/portage/package.use/00-app-containers.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-containers/podman cgroup-hybrid
diff --git a/conf/intel/portage/package.use/00-app-editors b/conf/intel/portage/package.use/00-app-editors
new file mode 100644
index 0000000..9d5ab7c
--- /dev/null
+++ b/conf/intel/portage/package.use/00-app-editors
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+app-editors/emacs gfile gsettings gui harfbuzz imagemagick libxml2 xft
+app-editors/qhexedit2 -python
+app-editors/vim vim-pager
diff --git a/conf/intel/portage/package.use/00-app-editors.package.use b/conf/intel/portage/package.use/00-app-editors.package.use
deleted file mode 100644
index 9d5ab7c..0000000
--- a/conf/intel/portage/package.use/00-app-editors.package.use
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-editors/emacs gfile gsettings gui harfbuzz imagemagick libxml2 xft
-app-editors/qhexedit2 -python
-app-editors/vim vim-pager
diff --git a/conf/intel/portage/package.use/00-app-emacs b/conf/intel/portage/package.use/00-app-emacs
new file mode 100644
index 0000000..f86ca60
--- /dev/null
+++ b/conf/intel/portage/package.use/00-app-emacs
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-emacs/emacs-common gsettings gui
diff --git a/conf/intel/portage/package.use/00-app-emacs.package.use b/conf/intel/portage/package.use/00-app-emacs.package.use
deleted file mode 100644
index f86ca60..0000000
--- a/conf/intel/portage/package.use/00-app-emacs.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-emacs/emacs-common gsettings gui
diff --git a/conf/intel/portage/package.use/00-app-emulation b/conf/intel/portage/package.use/00-app-emulation
new file mode 100644
index 0000000..23670b8
--- /dev/null
+++ b/conf/intel/portage/package.use/00-app-emulation
@@ -0,0 +1,11 @@
+# This file has been automatically generated, do not edit.
+
+app-emulation/libvirt libssh lvm numa parted virt-network
+app-emulation/open-vm-tools gtkmm multimon
+app-emulation/qemu io-uring iscsi lzo numa usb usbredir vde virtfs vte virgl snappy spice ssh static-user -doc -pam -sdl -sdl2
+app-emulation/virt-manager gui
+app-emulation/virtualbox lvm vnc
+app-emulation/wine-proton osmesa -realtime -prelink -ffmpeg
+app-emulation/wine-staging osmesa mingw -realtime -prelink -ffmpeg
+app-emulation/wine-vanilla osmesa mingw -realtime -prelink -ffmpeg
+app-emulation/winetricks kde rar -gtk
diff --git a/conf/intel/portage/package.use/00-app-emulation.package.use b/conf/intel/portage/package.use/00-app-emulation.package.use
deleted file mode 100644
index 23670b8..0000000
--- a/conf/intel/portage/package.use/00-app-emulation.package.use
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-emulation/libvirt libssh lvm numa parted virt-network
-app-emulation/open-vm-tools gtkmm multimon
-app-emulation/qemu io-uring iscsi lzo numa usb usbredir vde virtfs vte virgl snappy spice ssh static-user -doc -pam -sdl -sdl2
-app-emulation/virt-manager gui
-app-emulation/virtualbox lvm vnc
-app-emulation/wine-proton osmesa -realtime -prelink -ffmpeg
-app-emulation/wine-staging osmesa mingw -realtime -prelink -ffmpeg
-app-emulation/wine-vanilla osmesa mingw -realtime -prelink -ffmpeg
-app-emulation/winetricks kde rar -gtk
diff --git a/conf/intel/portage/package.use/00-app-office b/conf/intel/portage/package.use/00-app-office
new file mode 100644
index 0000000..dbc0340
--- /dev/null
+++ b/conf/intel/portage/package.use/00-app-office
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+app-office/libreoffice base clang firebird googledrive kde java pdfimport
diff --git a/conf/intel/portage/package.use/00-app-office.package.use b/conf/intel/portage/package.use/00-app-office.package.use
deleted file mode 100644
index dbc0340..0000000
--- a/conf/intel/portage/package.use/00-app-office.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-office/libreoffice base clang firebird googledrive kde java pdfimport
diff --git a/conf/intel/portage/package.use/00-app-text b/conf/intel/portage/package.use/00-app-text
new file mode 100644
index 0000000..b661949
--- /dev/null
+++ b/conf/intel/portage/package.use/00-app-text
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+app-text/poppler nss
+app-text/xmlto text
diff --git a/conf/intel/portage/package.use/00-app-text.package.use b/conf/intel/portage/package.use/00-app-text.package.use
deleted file mode 100644
index b661949..0000000
--- a/conf/intel/portage/package.use/00-app-text.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-app-text/poppler nss
-app-text/xmlto text
diff --git a/conf/intel/portage/package.use/00-dev-db b/conf/intel/portage/package.use/00-dev-db
new file mode 100644
index 0000000..33644fe
--- /dev/null
+++ b/conf/intel/portage/package.use/00-dev-db
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+dev-db/sqlite tools secure-delete
diff --git a/conf/intel/portage/package.use/00-dev-db.package.use b/conf/intel/portage/package.use/00-dev-db.package.use
deleted file mode 100644
index 33644fe..0000000
--- a/conf/intel/portage/package.use/00-dev-db.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-db/sqlite tools secure-delete
diff --git a/conf/intel/portage/package.use/00-dev-java b/conf/intel/portage/package.use/00-dev-java
new file mode 100644
index 0000000..6812948
--- /dev/null
+++ b/conf/intel/portage/package.use/00-dev-java
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+dev-java/openjdk-bin gentoo-vm -webstart
+dev-java/openjdk-jre-bin gentoo-vm -webstart
diff --git a/conf/intel/portage/package.use/00-dev-java.package.use b/conf/intel/portage/package.use/00-dev-java.package.use
deleted file mode 100644
index 6812948..0000000
--- a/conf/intel/portage/package.use/00-dev-java.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-java/openjdk-bin gentoo-vm -webstart
-dev-java/openjdk-jre-bin gentoo-vm -webstart
diff --git a/conf/intel/portage/package.use/00-dev-lang b/conf/intel/portage/package.use/00-dev-lang
new file mode 100644
index 0000000..9696a5a
--- /dev/null
+++ b/conf/intel/portage/package.use/00-dev-lang
@@ -0,0 +1,8 @@
+# This file has been automatically generated, do not edit.
+
+dev-lang/fpc source
+dev-lang/ghc binary elfutils ghcmakebinary numa
+dev-lang/perl gdbm ithreads
+dev-lang/rust clippy rls rustfmt rust-src system-llvm
+dev-lang/rust-bin clippy rustfmt rust-src
+dev-lang/spidermonkey clang
diff --git a/conf/intel/portage/package.use/00-dev-lang.package.use b/conf/intel/portage/package.use/00-dev-lang.package.use
deleted file mode 100644
index 9696a5a..0000000
--- a/conf/intel/portage/package.use/00-dev-lang.package.use
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-lang/fpc source
-dev-lang/ghc binary elfutils ghcmakebinary numa
-dev-lang/perl gdbm ithreads
-dev-lang/rust clippy rls rustfmt rust-src system-llvm
-dev-lang/rust-bin clippy rustfmt rust-src
-dev-lang/spidermonkey clang
diff --git a/conf/intel/portage/package.use/00-dev-libs b/conf/intel/portage/package.use/00-dev-libs
new file mode 100644
index 0000000..11a4a1e
--- /dev/null
+++ b/conf/intel/portage/package.use/00-dev-libs
@@ -0,0 +1,12 @@
+# This file has been automatically generated, do not edit.
+
+dev-libs/boost context
+dev-libs/glib utils static-libs
+dev-libs/libclc spirv
+dev-libs/libjcat gpg pkcs7
+dev-libs/libnl utils
+dev-libs/libpcre pcre16 pcre32 static-libs
+dev-libs/libpcre2 pcre16 pcre32 static-libs
+dev-libs/newt gpm
+dev-libs/nss utils
+dev-libs/xmlsec nss
diff --git a/conf/intel/portage/package.use/00-dev-libs.package.use b/conf/intel/portage/package.use/00-dev-libs.package.use
deleted file mode 100644
index 11a4a1e..0000000
--- a/conf/intel/portage/package.use/00-dev-libs.package.use
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-libs/boost context
-dev-libs/glib utils static-libs
-dev-libs/libclc spirv
-dev-libs/libjcat gpg pkcs7
-dev-libs/libnl utils
-dev-libs/libpcre pcre16 pcre32 static-libs
-dev-libs/libpcre2 pcre16 pcre32 static-libs
-dev-libs/newt gpm
-dev-libs/nss utils
-dev-libs/xmlsec nss
diff --git a/conf/intel/portage/package.use/00-dev-python b/conf/intel/portage/package.use/00-dev-python
new file mode 100644
index 0000000..85afcd7
--- /dev/null
+++ b/conf/intel/portage/package.use/00-dev-python
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+dev-python/PyQt5 bluetooth declarative designer gui multimedia network positioning printsupport sensors sql webchannel webengine websockets x11extras xmlpatterns widgets
+dev-python/pyside2 designer gui location multimedia network positioning printsupport quick sensors sql webchannel webengine websockets x11extras xmlpatterns widgets
diff --git a/conf/intel/portage/package.use/00-dev-python.package.use b/conf/intel/portage/package.use/00-dev-python.package.use
deleted file mode 100644
index 85afcd7..0000000
--- a/conf/intel/portage/package.use/00-dev-python.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-python/PyQt5 bluetooth declarative designer gui multimedia network positioning printsupport sensors sql webchannel webengine websockets x11extras xmlpatterns widgets
-dev-python/pyside2 designer gui location multimedia network positioning printsupport quick sensors sql webchannel webengine websockets x11extras xmlpatterns widgets
diff --git a/conf/intel/portage/package.use/00-dev-qt b/conf/intel/portage/package.use/00-dev-qt
new file mode 100644
index 0000000..98cd9f2
--- /dev/null
+++ b/conf/intel/portage/package.use/00-dev-qt
@@ -0,0 +1,11 @@
+# This file has been automatically generated, do not edit.
+
+dev-qt/qt-creator autotools android baremetal bazaar cmake cvs git ios lsp mercurial subversion winrt -clang -qmldesigner
+dev-qt/qtdeclarative localstorage
+dev-qt/qtgui:5 accessibility evdev
+dev-qt/qtmultimedia:5 widgets qml
+dev-qt/qtpositioning geoclue
+dev-qt/qtquickcontrols2:5 widgets
+dev-qt/qtscript:5 scripttools
+dev-qt/qtwebchannel:5 qml
+dev-qt/qtwebengine:5 widgets -system-ffmpeg
diff --git a/conf/intel/portage/package.use/00-dev-qt.package.use b/conf/intel/portage/package.use/00-dev-qt.package.use
deleted file mode 100644
index 98cd9f2..0000000
--- a/conf/intel/portage/package.use/00-dev-qt.package.use
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-qt/qt-creator autotools android baremetal bazaar cmake cvs git ios lsp mercurial subversion winrt -clang -qmldesigner
-dev-qt/qtdeclarative localstorage
-dev-qt/qtgui:5 accessibility evdev
-dev-qt/qtmultimedia:5 widgets qml
-dev-qt/qtpositioning geoclue
-dev-qt/qtquickcontrols2:5 widgets
-dev-qt/qtscript:5 scripttools
-dev-qt/qtwebchannel:5 qml
-dev-qt/qtwebengine:5 widgets -system-ffmpeg
diff --git a/conf/intel/portage/package.use/00-dev-scheme b/conf/intel/portage/package.use/00-dev-scheme
new file mode 100644
index 0000000..dfdae87
--- /dev/null
+++ b/conf/intel/portage/package.use/00-dev-scheme
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+dev-scheme/guile -deprecated
diff --git a/conf/intel/portage/package.use/00-dev-scheme.package.use b/conf/intel/portage/package.use/00-dev-scheme.package.use
deleted file mode 100644
index dfdae87..0000000
--- a/conf/intel/portage/package.use/00-dev-scheme.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-scheme/guile -deprecated
diff --git a/conf/intel/portage/package.use/00-dev-util b/conf/intel/portage/package.use/00-dev-util
new file mode 100644
index 0000000..87d5e70
--- /dev/null
+++ b/conf/intel/portage/package.use/00-dev-util
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+dev-util/cmake server -qt5
+dev-util/diffoscope R binutils colord cpio docx dtc e2fsprogs file find gettext gpg haskell hex imagemagick iso java libcaca llvm mono opendocument pascal postscript rpm squashfs ssh tar tcpdump zip
+dev-util/ostree archive http2 httpd libmount sodium soup
diff --git a/conf/intel/portage/package.use/00-dev-util.package.use b/conf/intel/portage/package.use/00-dev-util.package.use
deleted file mode 100644
index 87d5e70..0000000
--- a/conf/intel/portage/package.use/00-dev-util.package.use
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-util/cmake server -qt5
-dev-util/diffoscope R binutils colord cpio docx dtc e2fsprogs file find gettext gpg haskell hex imagemagick iso java libcaca llvm mono opendocument pascal postscript rpm squashfs ssh tar tcpdump zip
-dev-util/ostree archive http2 httpd libmount sodium soup
diff --git a/conf/intel/portage/package.use/00-games-fps b/conf/intel/portage/package.use/00-games-fps
new file mode 100644
index 0000000..ff16e59
--- /dev/null
+++ b/conf/intel/portage/package.use/00-games-fps
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+games-fps/urbanterror smp
diff --git a/conf/intel/portage/package.use/00-games-fps.package.use b/conf/intel/portage/package.use/00-games-fps.package.use
deleted file mode 100644
index ff16e59..0000000
--- a/conf/intel/portage/package.use/00-games-fps.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-games-fps/urbanterror smp
diff --git a/conf/intel/portage/package.use/00-games-strategy b/conf/intel/portage/package.use/00-games-strategy
new file mode 100644
index 0000000..42b112e
--- /dev/null
+++ b/conf/intel/portage/package.use/00-games-strategy
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+games-strategy/warzone2100 videos
diff --git a/conf/intel/portage/package.use/00-games-strategy.package.use b/conf/intel/portage/package.use/00-games-strategy.package.use
deleted file mode 100644
index 42b112e..0000000
--- a/conf/intel/portage/package.use/00-games-strategy.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-games-strategy/warzone2100 videos
diff --git a/conf/intel/portage/package.use/00-gnome-base b/conf/intel/portage/package.use/00-gnome-base
new file mode 100644
index 0000000..db0ea09
--- /dev/null
+++ b/conf/intel/portage/package.use/00-gnome-base
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+gnome-base/gvfs afp archive fuse
diff --git a/conf/intel/portage/package.use/00-gnome-base.package.use b/conf/intel/portage/package.use/00-gnome-base.package.use
deleted file mode 100644
index db0ea09..0000000
--- a/conf/intel/portage/package.use/00-gnome-base.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-gnome-base/gvfs afp archive fuse
diff --git a/conf/intel/portage/package.use/00-gui-apps b/conf/intel/portage/package.use/00-gui-apps
new file mode 100644
index 0000000..c30843b
--- /dev/null
+++ b/conf/intel/portage/package.use/00-gui-apps
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+gui-apps/waybar evdev mpd mpris network sndio tray wifi
diff --git a/conf/intel/portage/package.use/00-gui-apps.package.use b/conf/intel/portage/package.use/00-gui-apps.package.use
deleted file mode 100644
index c30843b..0000000
--- a/conf/intel/portage/package.use/00-gui-apps.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-gui-apps/waybar evdev mpd mpris network sndio tray wifi
diff --git a/conf/intel/portage/package.use/00-gui-libs b/conf/intel/portage/package.use/00-gui-libs
new file mode 100644
index 0000000..440ba2b
--- /dev/null
+++ b/conf/intel/portage/package.use/00-gui-libs
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+gui-libs/wlroots tinywl x11-backend
diff --git a/conf/intel/portage/package.use/00-gui-libs.package.use b/conf/intel/portage/package.use/00-gui-libs.package.use
deleted file mode 100644
index 440ba2b..0000000
--- a/conf/intel/portage/package.use/00-gui-libs.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-gui-libs/wlroots tinywl x11-backend
diff --git a/conf/intel/portage/package.use/00-kde-apps b/conf/intel/portage/package.use/00-kde-apps
new file mode 100644
index 0000000..6065e86
--- /dev/null
+++ b/conf/intel/portage/package.use/00-kde-apps
@@ -0,0 +1,10 @@
+# This file has been automatically generated, do not edit.
+
+kde-apps/akonadi -mariadb
+kde-apps/ark zip
+kde-apps/dolphin thumbnail
+kde-apps/k3b encode mad taglib
+kde-apps/kdecore-meta -webengine -webkit
+kde-apps/kdenetwork-meta dropbox -webengine
+kde-apps/kdesdk-meta -python
+kde-apps/okular epub
diff --git a/conf/intel/portage/package.use/00-kde-apps.package.use b/conf/intel/portage/package.use/00-kde-apps.package.use
deleted file mode 100644
index 6065e86..0000000
--- a/conf/intel/portage/package.use/00-kde-apps.package.use
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-kde-apps/akonadi -mariadb
-kde-apps/ark zip
-kde-apps/dolphin thumbnail
-kde-apps/k3b encode mad taglib
-kde-apps/kdecore-meta -webengine -webkit
-kde-apps/kdenetwork-meta dropbox -webengine
-kde-apps/kdesdk-meta -python
-kde-apps/okular epub
diff --git a/conf/intel/portage/package.use/00-kde-frameworks b/conf/intel/portage/package.use/00-kde-frameworks
new file mode 100644
index 0000000..5d682bb
--- /dev/null
+++ b/conf/intel/portage/package.use/00-kde-frameworks
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+kde-frameworks/kfilemetadata taglib
diff --git a/conf/intel/portage/package.use/00-kde-frameworks.package.use b/conf/intel/portage/package.use/00-kde-frameworks.package.use
deleted file mode 100644
index 5d682bb..0000000
--- a/conf/intel/portage/package.use/00-kde-frameworks.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-kde-frameworks/kfilemetadata taglib
diff --git a/conf/intel/portage/package.use/00-kde-plasma b/conf/intel/portage/package.use/00-kde-plasma
new file mode 100644
index 0000000..572dc8e
--- /dev/null
+++ b/conf/intel/portage/package.use/00-kde-plasma
@@ -0,0 +1,9 @@
+# This file has been automatically generated, do not edit.
+
+kde-plasma/discover flatpak
+kde-plasma/kde-cli-tools kdesu
+kde-plasma/kwin lock
+kde-plasma/plasma-desktop emoji ibus scim touchpad
+kde-plasma/plasma-meta colord discover flatpak qrcode thunderbolt
+kde-plasma/plasma-nm openconnect
+kde-plasma/plasma-workspace appstream
diff --git a/conf/intel/portage/package.use/00-kde-plasma.package.use b/conf/intel/portage/package.use/00-kde-plasma.package.use
deleted file mode 100644
index 572dc8e..0000000
--- a/conf/intel/portage/package.use/00-kde-plasma.package.use
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-kde-plasma/discover flatpak
-kde-plasma/kde-cli-tools kdesu
-kde-plasma/kwin lock
-kde-plasma/plasma-desktop emoji ibus scim touchpad
-kde-plasma/plasma-meta colord discover flatpak qrcode thunderbolt
-kde-plasma/plasma-nm openconnect
-kde-plasma/plasma-workspace appstream
diff --git a/conf/intel/portage/package.use/00-lxqt-base b/conf/intel/portage/package.use/00-lxqt-base
new file mode 100644
index 0000000..58845e8
--- /dev/null
+++ b/conf/intel/portage/package.use/00-lxqt-base
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+lxqt-base/lxqt-meta about admin archiver desktop-portal discover display-manager filemanager lximage nls policykit powermanagement processviewer screenshot sddm ssh-askpass terminal trash -minimal -sudo
+lxqt-base/lxqt-panel colorpicker cpuload lm-sensors networkmonitor sysstat tray
diff --git a/conf/intel/portage/package.use/00-lxqt-base.package.use b/conf/intel/portage/package.use/00-lxqt-base.package.use
deleted file mode 100644
index 58845e8..0000000
--- a/conf/intel/portage/package.use/00-lxqt-base.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-lxqt-base/lxqt-meta about admin archiver desktop-portal discover display-manager filemanager lximage nls policykit powermanagement processviewer screenshot sddm ssh-askpass terminal trash -minimal -sudo
-lxqt-base/lxqt-panel colorpicker cpuload lm-sensors networkmonitor sysstat tray
diff --git a/conf/intel/portage/package.use/00-mail-client b/conf/intel/portage/package.use/00-mail-client
new file mode 100644
index 0000000..41e6ace
--- /dev/null
+++ b/conf/intel/portage/package.use/00-mail-client
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+mail-client/thunderbird clang hwaccel sndio system-av1 system-harfbuzz system-icu system-jpeg system-png system-libevent system-libvpx system-sqlite wifi -pgo -system-librnp
diff --git a/conf/intel/portage/package.use/00-mail-client.package.use b/conf/intel/portage/package.use/00-mail-client.package.use
deleted file mode 100644
index 41e6ace..0000000
--- a/conf/intel/portage/package.use/00-mail-client.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-mail-client/thunderbird clang hwaccel sndio system-av1 system-harfbuzz system-icu system-jpeg system-png system-libevent system-libvpx system-sqlite wifi -pgo -system-librnp
diff --git a/conf/intel/portage/package.use/00-media-gfx b/conf/intel/portage/package.use/00-media-gfx
new file mode 100644
index 0000000..f5ea634
--- /dev/null
+++ b/conf/intel/portage/package.use/00-media-gfx
@@ -0,0 +1,7 @@
+# This file has been automatically generated, do not edit.
+
+media-gfx/blender player cycles openimageio -osl -oidn -openvdb -openpgl
+media-gfx/gimp -xpm
+media-gfx/krita vc
+media-gfx/sane-backends usb snmp
+media-gfx/xsane lcms ocr -gimp
diff --git a/conf/intel/portage/package.use/00-media-gfx.package.use b/conf/intel/portage/package.use/00-media-gfx.package.use
deleted file mode 100644
index f5ea634..0000000
--- a/conf/intel/portage/package.use/00-media-gfx.package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-gfx/blender player cycles openimageio -osl -oidn -openvdb -openpgl
-media-gfx/gimp -xpm
-media-gfx/krita vc
-media-gfx/sane-backends usb snmp
-media-gfx/xsane lcms ocr -gimp
diff --git a/conf/intel/portage/package.use/00-media-libs b/conf/intel/portage/package.use/00-media-libs
new file mode 100644
index 0000000..c7bc24e
--- /dev/null
+++ b/conf/intel/portage/package.use/00-media-libs
@@ -0,0 +1,14 @@
+# This file has been automatically generated, do not edit.
+
+media-libs/cogl gles2
+media-libs/freetype brotli harfbuzz
+media-libs/libsdl2 haptic gles2
+media-libs/libvpx postproc svc
+media-libs/mesa d3d9 gles1 gles2 osmesa vulkan xa zink -xvmc
+media-libs/mlt frei0r lua melt kdenlive fftw
+media-libs/openh264 utils
+media-libs/opus custom-modes
+media-libs/sdl-mixer mad mod
+media-libs/sdl2-mixer mad mod
+media-libs/sdl-sound -mpeg
+media-libs/vulkan-loader layers
diff --git a/conf/intel/portage/package.use/00-media-libs.package.use b/conf/intel/portage/package.use/00-media-libs.package.use
deleted file mode 100644
index c7bc24e..0000000
--- a/conf/intel/portage/package.use/00-media-libs.package.use
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-libs/cogl gles2
-media-libs/freetype brotli harfbuzz
-media-libs/libsdl2 haptic gles2
-media-libs/libvpx postproc svc
-media-libs/mesa d3d9 gles1 gles2 osmesa vulkan xa zink -xvmc
-media-libs/mlt frei0r lua melt kdenlive fftw
-media-libs/openh264 utils
-media-libs/opus custom-modes
-media-libs/sdl-mixer mad mod
-media-libs/sdl2-mixer mad mod
-media-libs/sdl-sound -mpeg
-media-libs/vulkan-loader layers
diff --git a/conf/intel/portage/package.use/00-media-plugins b/conf/intel/portage/package.use/00-media-plugins
new file mode 100644
index 0000000..8f336de
--- /dev/null
+++ b/conf/intel/portage/package.use/00-media-plugins
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+media-plugins/audacious-plugins -libnotify
+media-plugins/frei0r-plugins -facedetect
diff --git a/conf/intel/portage/package.use/00-media-plugins.package.use b/conf/intel/portage/package.use/00-media-plugins.package.use
deleted file mode 100644
index 8f336de..0000000
--- a/conf/intel/portage/package.use/00-media-plugins.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-plugins/audacious-plugins -libnotify
-media-plugins/frei0r-plugins -facedetect
diff --git a/conf/intel/portage/package.use/00-media-sound b/conf/intel/portage/package.use/00-media-sound
new file mode 100644
index 0000000..bbde123
--- /dev/null
+++ b/conf/intel/portage/package.use/00-media-sound
@@ -0,0 +1,6 @@
+# This file has been automatically generated, do not edit.
+
+media-sound/cantata cddb taglib replaygain
+media-sound/pulseaudio ofono-headset -daemon
+media-sound/pulseaudio-daemon aptx equalizer fftw ldac lirc orc ofono-headset sox
+media-sound/qmmp qsui
diff --git a/conf/intel/portage/package.use/00-media-sound.package.use b/conf/intel/portage/package.use/00-media-sound.package.use
deleted file mode 100644
index bbde123..0000000
--- a/conf/intel/portage/package.use/00-media-sound.package.use
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-sound/cantata cddb taglib replaygain
-media-sound/pulseaudio ofono-headset -daemon
-media-sound/pulseaudio-daemon aptx equalizer fftw ldac lirc orc ofono-headset sox
-media-sound/qmmp qsui
diff --git a/conf/intel/portage/package.use/00-media-tv b/conf/intel/portage/package.use/00-media-tv
new file mode 100644
index 0000000..32898b3
--- /dev/null
+++ b/conf/intel/portage/package.use/00-media-tv
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+media-tv/kodi airplay css caps dav1d lirc nonfree upnp udf wayland webserver
diff --git a/conf/intel/portage/package.use/00-media-tv.package.use b/conf/intel/portage/package.use/00-media-tv.package.use
deleted file mode 100644
index 32898b3..0000000
--- a/conf/intel/portage/package.use/00-media-tv.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-tv/kodi airplay css caps dav1d lirc nonfree upnp udf wayland webserver
diff --git a/conf/intel/portage/package.use/00-media-video b/conf/intel/portage/package.use/00-media-video
new file mode 100644
index 0000000..90f4dcf
--- /dev/null
+++ b/conf/intel/portage/package.use/00-media-video
@@ -0,0 +1,7 @@
+# This file has been automatically generated, do not edit.
+
+media-video/ffmpeg amr amrenc frei0r libdrm librtmp libv4l openh264 snappy twolame -chromium
+media-video/mpv cdda cli libmpv -sdl
+media-video/obs-studio imagemagick -python
+media-video/pipewire echo-cancel extra flatpak gsettings jack-sdk lv2 pipewire-alsa sound-server
+media-video/vlc aom archive aribsub bidi cdda cddb chromaprint chromecast dav1d dc1394 dts faad fluidsynth gme gnutls ieee1394 kate libcaca libtar libtiger linsys lirc live lua lynsis mad modplug musepack nfs omxil rdp schroedinger sdl-image shout sid skins speex srt taglib tremor twolame upnp vlm vnc zvbi
diff --git a/conf/intel/portage/package.use/00-media-video.package.use b/conf/intel/portage/package.use/00-media-video.package.use
deleted file mode 100644
index 90f4dcf..0000000
--- a/conf/intel/portage/package.use/00-media-video.package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-video/ffmpeg amr amrenc frei0r libdrm librtmp libv4l openh264 snappy twolame -chromium
-media-video/mpv cdda cli libmpv -sdl
-media-video/obs-studio imagemagick -python
-media-video/pipewire echo-cancel extra flatpak gsettings jack-sdk lv2 pipewire-alsa sound-server
-media-video/vlc aom archive aribsub bidi cdda cddb chromaprint chromecast dav1d dc1394 dts faad fluidsynth gme gnutls ieee1394 kate libcaca libtar libtiger linsys lirc live lua lynsis mad modplug musepack nfs omxil rdp schroedinger sdl-image shout sid skins speex srt taglib tremor twolame upnp vlm vnc zvbi
diff --git a/conf/intel/portage/package.use/00-net-dialup b/conf/intel/portage/package.use/00-net-dialup
new file mode 100644
index 0000000..492aefe
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-dialup
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-dialup/ppp atm dhcp eap-tls
diff --git a/conf/intel/portage/package.use/00-net-dialup.package.use b/conf/intel/portage/package.use/00-net-dialup.package.use
deleted file mode 100644
index 492aefe..0000000
--- a/conf/intel/portage/package.use/00-net-dialup.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-dialup/ppp atm dhcp eap-tls
diff --git a/conf/intel/portage/package.use/00-net-dns b/conf/intel/portage/package.use/00-net-dns
new file mode 100644
index 0000000..c3c88b1
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-dns
@@ -0,0 +1,7 @@
+# This file has been automatically generated, do not edit.
+
+net-dns/avahi mdnsresponder-compat -gtk -utils
+net-dns/bind-tools gssapi
+net-dns/dnsmasq script
+net-dns/resolvconf-symlink -symlink
+net-dns/unbound dnscrypt dnstap ecs gost redis
diff --git a/conf/intel/portage/package.use/00-net-dns.package.use b/conf/intel/portage/package.use/00-net-dns.package.use
deleted file mode 100644
index c3c88b1..0000000
--- a/conf/intel/portage/package.use/00-net-dns.package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-dns/avahi mdnsresponder-compat -gtk -utils
-net-dns/bind-tools gssapi
-net-dns/dnsmasq script
-net-dns/resolvconf-symlink -symlink
-net-dns/unbound dnscrypt dnstap ecs gost redis
diff --git a/conf/intel/portage/package.use/00-net-firewall b/conf/intel/portage/package.use/00-net-firewall
new file mode 100644
index 0000000..8bd7bde
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-firewall
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-firewall/firewalld gui -nftables
diff --git a/conf/intel/portage/package.use/00-net-firewall.package.use b/conf/intel/portage/package.use/00-net-firewall.package.use
deleted file mode 100644
index 8bd7bde..0000000
--- a/conf/intel/portage/package.use/00-net-firewall.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-firewall/firewalld gui -nftables
diff --git a/conf/intel/portage/package.use/00-net-fs b/conf/intel/portage/package.use/00-net-fs
new file mode 100644
index 0000000..ea239cf
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-fs
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-fs/samba ads client fam gnutls syslog winbind system-mitkrb5
diff --git a/conf/intel/portage/package.use/00-net-fs.package.use b/conf/intel/portage/package.use/00-net-fs.package.use
deleted file mode 100644
index ea239cf..0000000
--- a/conf/intel/portage/package.use/00-net-fs.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-fs/samba ads client fam gnutls syslog winbind system-mitkrb5
diff --git a/conf/intel/portage/package.use/00-net-irc b/conf/intel/portage/package.use/00-net-irc
new file mode 100644
index 0000000..24047e9
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-irc
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-irc/quassel gui phonon urlpreview -ldap -server -crypt -postgres
diff --git a/conf/intel/portage/package.use/00-net-irc.package.use b/conf/intel/portage/package.use/00-net-irc.package.use
deleted file mode 100644
index 24047e9..0000000
--- a/conf/intel/portage/package.use/00-net-irc.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-irc/quassel gui phonon urlpreview -ldap -server -crypt -postgres
diff --git a/conf/intel/portage/package.use/00-net-libs b/conf/intel/portage/package.use/00-net-libs
new file mode 100644
index 0000000..d28b204
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-libs
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+net-libs/gnutls dane tools pkcs11
+net-libs/libpsl -idn
+net-libs/nodejs inspector
diff --git a/conf/intel/portage/package.use/00-net-libs.package.use b/conf/intel/portage/package.use/00-net-libs.package.use
deleted file mode 100644
index d28b204..0000000
--- a/conf/intel/portage/package.use/00-net-libs.package.use
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-libs/gnutls dane tools pkcs11
-net-libs/libpsl -idn
-net-libs/nodejs inspector
diff --git a/conf/intel/portage/package.use/00-net-misc b/conf/intel/portage/package.use/00-net-misc
new file mode 100644
index 0000000..cc9d15a
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-misc
@@ -0,0 +1,9 @@
+# This file has been automatically generated, do not edit.
+
+net-misc/curl http2 -adns
+net-misc/dhcp -server
+net-misc/iputils -gcrypt -nettle
+net-misc/modemmanager mbim
+net-misc/networkmanager connection-sharing dhclient iptables ofono psl resolvconf syslog -iwd
+net-misc/openssh -ldap
+net-misc/spice-gtk usbredir
diff --git a/conf/intel/portage/package.use/00-net-misc.package.use b/conf/intel/portage/package.use/00-net-misc.package.use
deleted file mode 100644
index cc9d15a..0000000
--- a/conf/intel/portage/package.use/00-net-misc.package.use
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-misc/curl http2 -adns
-net-misc/dhcp -server
-net-misc/iputils -gcrypt -nettle
-net-misc/modemmanager mbim
-net-misc/networkmanager connection-sharing dhclient iptables ofono psl resolvconf syslog -iwd
-net-misc/openssh -ldap
-net-misc/spice-gtk usbredir
diff --git a/conf/intel/portage/package.use/00-net-nds b/conf/intel/portage/package.use/00-net-nds
new file mode 100644
index 0000000..a05b273
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-nds
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-nds/openldap minimal
diff --git a/conf/intel/portage/package.use/00-net-nds.package.use b/conf/intel/portage/package.use/00-net-nds.package.use
deleted file mode 100644
index a05b273..0000000
--- a/conf/intel/portage/package.use/00-net-nds.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-nds/openldap minimal
diff --git a/conf/intel/portage/package.use/00-net-p2p b/conf/intel/portage/package.use/00-net-p2p
new file mode 100644
index 0000000..a4f4501
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-p2p
@@ -0,0 +1,7 @@
+# This file has been automatically generated, do not edit.
+
+net-p2p/deluge console gui webinterface
+net-p2p/eiskaltdcpp idn upnp -cli -gtk -libnotify
+net-p2p/qbittorrent webui
+net-p2p/syncthing tools
+net-p2p/transmission -gtk
diff --git a/conf/intel/portage/package.use/00-net-p2p.package.use b/conf/intel/portage/package.use/00-net-p2p.package.use
deleted file mode 100644
index a4f4501..0000000
--- a/conf/intel/portage/package.use/00-net-p2p.package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-p2p/deluge console gui webinterface
-net-p2p/eiskaltdcpp idn upnp -cli -gtk -libnotify
-net-p2p/qbittorrent webui
-net-p2p/syncthing tools
-net-p2p/transmission -gtk
diff --git a/conf/intel/portage/package.use/00-net-print b/conf/intel/portage/package.use/00-net-print
new file mode 100644
index 0000000..d180ff3
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-print
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+net-print/gutenprint ppds
+net-print/hplip fax scanner snmp
diff --git a/conf/intel/portage/package.use/00-net-print.package.use b/conf/intel/portage/package.use/00-net-print.package.use
deleted file mode 100644
index d180ff3..0000000
--- a/conf/intel/portage/package.use/00-net-print.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-print/gutenprint ppds
-net-print/hplip fax scanner snmp
diff --git a/conf/intel/portage/package.use/00-net-vpn b/conf/intel/portage/package.use/00-net-vpn
new file mode 100644
index 0000000..6889232
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-vpn
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-vpn/networkmanager-libreswan -gtk
diff --git a/conf/intel/portage/package.use/00-net-vpn.package.use b/conf/intel/portage/package.use/00-net-vpn.package.use
deleted file mode 100644
index 6889232..0000000
--- a/conf/intel/portage/package.use/00-net-vpn.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-vpn/networkmanager-libreswan -gtk
diff --git a/conf/intel/portage/package.use/00-net-wireless b/conf/intel/portage/package.use/00-net-wireless
new file mode 100644
index 0000000..db39333
--- /dev/null
+++ b/conf/intel/portage/package.use/00-net-wireless
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+net-wireless/wpa_supplicant eap-sim fasteap macsec p2p smartcard tdls tkip uncommon-eap-types wep wps -qt5
diff --git a/conf/intel/portage/package.use/00-net-wireless.package.use b/conf/intel/portage/package.use/00-net-wireless.package.use
deleted file mode 100644
index db39333..0000000
--- a/conf/intel/portage/package.use/00-net-wireless.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-net-wireless/wpa_supplicant eap-sim fasteap macsec p2p smartcard tdls tkip uncommon-eap-types wep wps -qt5
diff --git a/conf/intel/portage/package.use/00-sys-apps b/conf/intel/portage/package.use/00-sys-apps
new file mode 100644
index 0000000..b4b51de
--- /dev/null
+++ b/conf/intel/portage/package.use/00-sys-apps
@@ -0,0 +1,10 @@
+# This file has been automatically generated, do not edit.
+
+sys-apps/attr static-libs
+sys-apps/busybox mdev
+sys-apps/file -python
+sys-apps/firejail suid
+sys-apps/flatpak kde -gtk
+sys-apps/fwupd amt dell flashrom gnutls gusb modemmanager nvme synaptics thunderbolt tpm uefi
+sys-apps/openrc sysv-utils -ncurses -netifrc
+sys-apps/util-linux -cryptsetup
diff --git a/conf/intel/portage/package.use/00-sys-apps.package.use b/conf/intel/portage/package.use/00-sys-apps.package.use
deleted file mode 100644
index b4b51de..0000000
--- a/conf/intel/portage/package.use/00-sys-apps.package.use
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-apps/attr static-libs
-sys-apps/busybox mdev
-sys-apps/file -python
-sys-apps/firejail suid
-sys-apps/flatpak kde -gtk
-sys-apps/fwupd amt dell flashrom gnutls gusb modemmanager nvme synaptics thunderbolt tpm uefi
-sys-apps/openrc sysv-utils -ncurses -netifrc
-sys-apps/util-linux -cryptsetup
diff --git a/conf/intel/portage/package.use/00-sys-auth b/conf/intel/portage/package.use/00-sys-auth
new file mode 100644
index 0000000..f54c98c
--- /dev/null
+++ b/conf/intel/portage/package.use/00-sys-auth
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+sys-auth/polkit -gtk
diff --git a/conf/intel/portage/package.use/00-sys-auth.package.use b/conf/intel/portage/package.use/00-sys-auth.package.use
deleted file mode 100644
index f54c98c..0000000
--- a/conf/intel/portage/package.use/00-sys-auth.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-auth/polkit -gtk
diff --git a/conf/intel/portage/package.use/00-sys-block b/conf/intel/portage/package.use/00-sys-block
new file mode 100644
index 0000000..73a6a8f
--- /dev/null
+++ b/conf/intel/portage/package.use/00-sys-block
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+sys-block/parted device-mapper
diff --git a/conf/intel/portage/package.use/00-sys-block.package.use b/conf/intel/portage/package.use/00-sys-block.package.use
deleted file mode 100644
index 73a6a8f..0000000
--- a/conf/intel/portage/package.use/00-sys-block.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-block/parted device-mapper
diff --git a/conf/intel/portage/package.use/00-sys-boot b/conf/intel/portage/package.use/00-sys-boot
new file mode 100644
index 0000000..1c1e28d
--- /dev/null
+++ b/conf/intel/portage/package.use/00-sys-boot
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+sys-boot/grub device-mapper mount truetype multislot
+sys-boot/plymouth -gtk
diff --git a/conf/intel/portage/package.use/00-sys-boot.package.use b/conf/intel/portage/package.use/00-sys-boot.package.use
deleted file mode 100644
index 1c1e28d..0000000
--- a/conf/intel/portage/package.use/00-sys-boot.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-boot/grub device-mapper mount truetype multislot
-sys-boot/plymouth -gtk
diff --git a/conf/intel/portage/package.use/00-sys-devel b/conf/intel/portage/package.use/00-sys-devel
new file mode 100644
index 0000000..b882fda
--- /dev/null
+++ b/conf/intel/portage/package.use/00-sys-devel
@@ -0,0 +1,6 @@
+# This file has been automatically generated, do not edit.
+
+sys-devel/clang-runtime -compiler-rt -openmp -sanitize -libcxx
+sys-devel/clang -static-analyzer
+sys-devel/gcc go
+sys-devel/llvm libedit
diff --git a/conf/intel/portage/package.use/00-sys-devel.package.use b/conf/intel/portage/package.use/00-sys-devel.package.use
deleted file mode 100644
index b882fda..0000000
--- a/conf/intel/portage/package.use/00-sys-devel.package.use
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-devel/clang-runtime -compiler-rt -openmp -sanitize -libcxx
-sys-devel/clang -static-analyzer
-sys-devel/gcc go
-sys-devel/llvm libedit
diff --git a/conf/intel/portage/package.use/00-sys-firmware b/conf/intel/portage/package.use/00-sys-firmware
new file mode 100644
index 0000000..102320a
--- /dev/null
+++ b/conf/intel/portage/package.use/00-sys-firmware
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+sys-firmware/intel-microcode monolithic
diff --git a/conf/intel/portage/package.use/00-sys-firmware.package.use b/conf/intel/portage/package.use/00-sys-firmware.package.use
deleted file mode 100644
index 102320a..0000000
--- a/conf/intel/portage/package.use/00-sys-firmware.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-firmware/intel-microcode monolithic
diff --git a/conf/intel/portage/package.use/00-sys-fs b/conf/intel/portage/package.use/00-sys-fs
new file mode 100644
index 0000000..f1eb7f3
--- /dev/null
+++ b/conf/intel/portage/package.use/00-sys-fs
@@ -0,0 +1,6 @@
+# This file has been automatically generated, do not edit.
+
+sys-fs/cryptsetup -gcrypt -nettle
+sys-fs/dosfstools compat
+sys-fs/lvm2 lvm thin
+sys-fs/squashfs-tools lzma lzo
diff --git a/conf/intel/portage/package.use/00-sys-fs.package.use b/conf/intel/portage/package.use/00-sys-fs.package.use
deleted file mode 100644
index f1eb7f3..0000000
--- a/conf/intel/portage/package.use/00-sys-fs.package.use
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-fs/cryptsetup -gcrypt -nettle
-sys-fs/dosfstools compat
-sys-fs/lvm2 lvm thin
-sys-fs/squashfs-tools lzma lzo
diff --git a/conf/intel/portage/package.use/00-sys-libs b/conf/intel/portage/package.use/00-sys-libs
new file mode 100644
index 0000000..587e029
--- /dev/null
+++ b/conf/intel/portage/package.use/00-sys-libs
@@ -0,0 +1,7 @@
+# This file has been automatically generated, do not edit.
+
+sys-libs/glibc hash-sysv-compat
+sys-libs/libblockdev device-mapper dmraid lvm
+sys-libs/libseccomp -python
+sys-libs/libxcrypt static-libs
+sys-libs/zlib minizip static-libs
diff --git a/conf/intel/portage/package.use/00-sys-libs.package.use b/conf/intel/portage/package.use/00-sys-libs.package.use
deleted file mode 100644
index 587e029..0000000
--- a/conf/intel/portage/package.use/00-sys-libs.package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-sys-libs/glibc hash-sysv-compat
-sys-libs/libblockdev device-mapper dmraid lvm
-sys-libs/libseccomp -python
-sys-libs/libxcrypt static-libs
-sys-libs/zlib minizip static-libs
diff --git a/conf/intel/portage/package.use/00-virtual b/conf/intel/portage/package.use/00-virtual
new file mode 100644
index 0000000..4d197cd
--- /dev/null
+++ b/conf/intel/portage/package.use/00-virtual
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+virtual/libcrypt static-libs
+virtual/rust rustfmt
diff --git a/conf/intel/portage/package.use/00-virtual.package.use b/conf/intel/portage/package.use/00-virtual.package.use
deleted file mode 100644
index 4d197cd..0000000
--- a/conf/intel/portage/package.use/00-virtual.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-virtual/libcrypt static-libs
-virtual/rust rustfmt
diff --git a/conf/intel/portage/package.use/00-www-client b/conf/intel/portage/package.use/00-www-client
new file mode 100644
index 0000000..d6902f8
--- /dev/null
+++ b/conf/intel/portage/package.use/00-www-client
@@ -0,0 +1,8 @@
+# This file has been automatically generated, do not edit.
+
+www-client/chromium libcxx proprietary-codecs widevine -pgo -js-type-check -system-ffmpeg -system-png
+www-client/falkon -python
+www-client/firefox clang hwaccel sndio system-av1 system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-png system-sqlite wifi
+www-client/opera proprietary-codecs suid widevine
+www-client/vivaldi proprietary-codecs widevine
+www-client/w3m imlib
diff --git a/conf/intel/portage/package.use/00-www-client.package.use b/conf/intel/portage/package.use/00-www-client.package.use
deleted file mode 100644
index d6902f8..0000000
--- a/conf/intel/portage/package.use/00-www-client.package.use
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-www-client/chromium libcxx proprietary-codecs widevine -pgo -js-type-check -system-ffmpeg -system-png
-www-client/falkon -python
-www-client/firefox clang hwaccel sndio system-av1 system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-png system-sqlite wifi
-www-client/opera proprietary-codecs suid widevine
-www-client/vivaldi proprietary-codecs widevine
-www-client/w3m imlib
diff --git a/conf/intel/portage/package.use/00-x11-base b/conf/intel/portage/package.use/00-x11-base
new file mode 100644
index 0000000..549e358
--- /dev/null
+++ b/conf/intel/portage/package.use/00-x11-base
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+x11-base/xorg-server xvfb
diff --git a/conf/intel/portage/package.use/00-x11-base.package.use b/conf/intel/portage/package.use/00-x11-base.package.use
deleted file mode 100644
index 549e358..0000000
--- a/conf/intel/portage/package.use/00-x11-base.package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-base/xorg-server xvfb
diff --git a/conf/intel/portage/package.use/00-x11-drivers b/conf/intel/portage/package.use/00-x11-drivers
new file mode 100644
index 0000000..b076e63
--- /dev/null
+++ b/conf/intel/portage/package.use/00-x11-drivers
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+x11-drivers/nvidia-drivers acpi
+x11-drivers/xf86-video-intel uxa -xvmc
+x11-drivers/xf86-video-qxl xspice
diff --git a/conf/intel/portage/package.use/00-x11-drivers.package.use b/conf/intel/portage/package.use/00-x11-drivers.package.use
deleted file mode 100644
index b076e63..0000000
--- a/conf/intel/portage/package.use/00-x11-drivers.package.use
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-drivers/nvidia-drivers acpi
-x11-drivers/xf86-video-intel uxa -xvmc
-x11-drivers/xf86-video-qxl xspice
diff --git a/conf/intel/portage/package.use/00-x11-libs b/conf/intel/portage/package.use/00-x11-libs
new file mode 100644
index 0000000..68c8716
--- /dev/null
+++ b/conf/intel/portage/package.use/00-x11-libs
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+x11-libs/libdrm libkms
+x11-libs/motif xft
+x11-libs/wxGTK:3.0 -gstreamer
diff --git a/conf/intel/portage/package.use/00-x11-libs.package.use b/conf/intel/portage/package.use/00-x11-libs.package.use
deleted file mode 100644
index 68c8716..0000000
--- a/conf/intel/portage/package.use/00-x11-libs.package.use
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-libs/libdrm libkms
-x11-libs/motif xft
-x11-libs/wxGTK:3.0 -gstreamer
diff --git a/conf/intel/portage/package.use/00-x11-misc b/conf/intel/portage/package.use/00-x11-misc
new file mode 100644
index 0000000..95a1d42
--- /dev/null
+++ b/conf/intel/portage/package.use/00-x11-misc
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+x11-misc/polybar i3wm ipc mpd network
+x11-misc/sddm branding
+x11-misc/xmobar mpd mpris timezone wifi xft
diff --git a/conf/intel/portage/package.use/00-x11-misc.package.use b/conf/intel/portage/package.use/00-x11-misc.package.use
deleted file mode 100644
index 95a1d42..0000000
--- a/conf/intel/portage/package.use/00-x11-misc.package.use
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-misc/polybar i3wm ipc mpd network
-x11-misc/sddm branding
-x11-misc/xmobar mpd mpris timezone wifi xft
diff --git a/conf/intel/portage/package.use/00-x11-themes b/conf/intel/portage/package.use/00-x11-themes
new file mode 100644
index 0000000..677a672
--- /dev/null
+++ b/conf/intel/portage/package.use/00-x11-themes
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+x11-themes/fluent-icon-theme round
+x11-themes/gtk-engines-murrine -themes
diff --git a/conf/intel/portage/package.use/00-x11-themes.package.use b/conf/intel/portage/package.use/00-x11-themes.package.use
deleted file mode 100644
index 677a672..0000000
--- a/conf/intel/portage/package.use/00-x11-themes.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-themes/fluent-icon-theme round
-x11-themes/gtk-engines-murrine -themes
diff --git a/conf/intel/portage/package.use/00-x11-wm b/conf/intel/portage/package.use/00-x11-wm
new file mode 100644
index 0000000..80d2571
--- /dev/null
+++ b/conf/intel/portage/package.use/00-x11-wm
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+x11-wm/openbox imlib session xdg
+x11-wm/qtile -wayland # incompatible with wlroots v0.16
diff --git a/conf/intel/portage/package.use/00-x11-wm.package.use b/conf/intel/portage/package.use/00-x11-wm.package.use
deleted file mode 100644
index 80d2571..0000000
--- a/conf/intel/portage/package.use/00-x11-wm.package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-x11-wm/openbox imlib session xdg
-x11-wm/qtile -wayland # incompatible with wlroots v0.16
diff --git a/conf/intel/portage/package.use/10-sisyphus-overrides b/conf/intel/portage/package.use/10-sisyphus-overrides
new file mode 120000
index 0000000..22ab58c
--- /dev/null
+++ b/conf/intel/portage/package.use/10-sisyphus-overrides
@@ -0,0 +1 @@
+/etc/sisyphus/sisyphus.package.use
\ No newline at end of file
diff --git a/conf/intel/portage/package.use/10-sisyphus.package.use b/conf/intel/portage/package.use/10-sisyphus.package.use
deleted file mode 120000
index 22ab58c..0000000
--- a/conf/intel/portage/package.use/10-sisyphus.package.use
+++ /dev/null
@@ -1 +0,0 @@
-/etc/sisyphus/sisyphus.package.use
\ No newline at end of file
diff --git a/conf/intel/portage/profile/package.use.mask/00-dev-lang b/conf/intel/portage/profile/package.use.mask/00-dev-lang
new file mode 100644
index 0000000..a6c70b0
--- /dev/null
+++ b/conf/intel/portage/profile/package.use.mask/00-dev-lang
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+dev-lang/lazarus python
diff --git a/conf/intel/portage/profile/package.use.mask/00-dev-lang.package.use.mask b/conf/intel/portage/profile/package.use.mask/00-dev-lang.package.use.mask
deleted file mode 100644
index a6c70b0..0000000
--- a/conf/intel/portage/profile/package.use.mask/00-dev-lang.package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-dev-lang/lazarus python
diff --git a/conf/intel/portage/profile/package.use.mask/00-media-tv b/conf/intel/portage/profile/package.use.mask/00-media-tv
new file mode 100644
index 0000000..4a4f313
--- /dev/null
+++ b/conf/intel/portage/profile/package.use.mask/00-media-tv
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+media-tv/kodi system-ffmpeg
diff --git a/conf/intel/portage/profile/package.use.mask/00-media-tv.package.use.mask b/conf/intel/portage/profile/package.use.mask/00-media-tv.package.use.mask
deleted file mode 100644
index 4a4f313..0000000
--- a/conf/intel/portage/profile/package.use.mask/00-media-tv.package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-media-tv/kodi system-ffmpeg
diff --git a/conf/intel/portage/profile/use.mask/00-mask b/conf/intel/portage/profile/use.mask/00-mask
new file mode 100644
index 0000000..c549f50
--- /dev/null
+++ b/conf/intel/portage/profile/use.mask/00-mask
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+qt4
+plymouth
+systemd
diff --git a/conf/intel/portage/profile/use.mask/00-mask.conf b/conf/intel/portage/profile/use.mask/00-mask.conf
deleted file mode 100644
index c549f50..0000000
--- a/conf/intel/portage/profile/use.mask/00-mask.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-qt4
-plymouth
-systemd
diff --git a/conf/intel/portage/profile/use.mask/00-unmask b/conf/intel/portage/profile/use.mask/00-unmask
new file mode 100644
index 0000000..252a4a7
--- /dev/null
+++ b/conf/intel/portage/profile/use.mask/00-unmask
@@ -0,0 +1,7 @@
+# This file has been automatically generated, do not edit.
+
+-elogind
+-gtk3
+-introspection
+-pgo
+-opus
diff --git a/conf/intel/portage/profile/use.mask/00-unmask.conf b/conf/intel/portage/profile/use.mask/00-unmask.conf
deleted file mode 100644
index 252a4a7..0000000
--- a/conf/intel/portage/profile/use.mask/00-unmask.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file has been automatically generated, do not edit.
-
--elogind
--gtk3
--introspection
--pgo
--opus
--
cgit v1.2.3