let's arrange the useflags by category

9 files changed, 56 insertions, 59 deletions

diff --git a/conf/intel/portage/make.conf.amd64-binmode b/conf/intel/portage/make.conf.amd64-binmode
index eb6d1fc..cd288b3 100644
--- a/conf/intel/portage/make.conf.amd64-binmode
+++ b/conf/intel/portage/make.conf.amd64-binmode
@@ -16,12 +16,12 @@ L10N="en en-US en-GB uk ro-RO ro"
 
 ## USE FLAGS ##
 SYSTEM_USE="X wayland glamor systemd udev dbus policykit polkit upower udisks python perl icu xattr acl introspection gudev threads truetype fontconfig curl cups openssl nettle gcrypt libnotify sqlite designer"
-CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
+CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 fdk flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
 MEDIA_USE="cairo drm dri dri3 vaapi vdpau egl opengl opencl xvmc v4l mtp rtmp dvd bluray bluetooth matroska libass xml xcb xkb"
 IMAGE_USE="jpeg jpeg2k png apng mng tiff gif svg pdf gphoto2 xmp"
 TOOLKIT_USE="qt5"
 NETWORK_USE="ipv6 avahi zeroconf http"
-SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal"
+SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal sound"
 DONT_USE="-bindist -kde -qt4 -qt3support -gtk -gtk3 -gnome -gnome-keyring -connman -networkmanager -modemmanager -libav -tracker -mysql -consolekit -openrc -sysvinit -branding -handbook"
 
 USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${DONT_USE}"
diff --git a/conf/intel/portage/make.conf.amd64-mixedmode b/conf/intel/portage/make.conf.amd64-mixedmode
index fe21c40..06d02ec 100644
--- a/conf/intel/portage/make.conf.amd64-mixedmode
+++ b/conf/intel/portage/make.conf.amd64-mixedmode
@@ -16,12 +16,12 @@ L10N="en en-US en-GB uk ro-RO ro"
 
 ## USE FLAGS ##
 SYSTEM_USE="X wayland glamor systemd udev dbus policykit polkit upower udisks python perl icu xattr acl introspection gudev threads truetype fontconfig curl cups openssl nettle gcrypt libnotify sqlite designer"
-CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
+CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 fdk flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
 MEDIA_USE="cairo drm dri dri3 vaapi vdpau egl opengl opencl xvmc v4l mtp rtmp dvd bluray bluetooth matroska libass xml xcb xkb"
 IMAGE_USE="jpeg jpeg2k png apng mng tiff gif svg pdf gphoto2 xmp"
 TOOLKIT_USE="qt5"
 NETWORK_USE="ipv6 avahi zeroconf http"
-SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal"
+SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal sound"
 DONT_USE="-bindist -kde -qt4 -qt3support -gtk -gtk3 -gnome -gnome-keyring -connman -networkmanager -modemmanager -libav -tracker -mysql -consolekit -openrc -sysvinit -branding -handbook"
 
 USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${DONT_USE}"
diff --git a/conf/intel/portage/make.conf.amd64-srcmode b/conf/intel/portage/make.conf.amd64-srcmode
index 8373811..89faabb 100644
--- a/conf/intel/portage/make.conf.amd64-srcmode
+++ b/conf/intel/portage/make.conf.amd64-srcmode
@@ -15,12 +15,12 @@ L10N="en en-US en-GB uk ro-RO ro"
 
 ## USE FLAGS ##
 SYSTEM_USE="X wayland glamor systemd udev dbus policykit polkit upower udisks python perl icu xattr acl introspection gudev threads truetype fontconfig curl cups openssl nettle gcrypt libnotify sqlite designer"
-CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
+CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 fdk flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
 MEDIA_USE="cairo drm dri dri3 vaapi vdpau egl opengl opencl xvmc v4l mtp rtmp dvd bluray bluetooth matroska libass xml xcb xkb"
 IMAGE_USE="jpeg jpeg2k png apng mng tiff gif svg pdf gphoto2 xmp"
 TOOLKIT_USE="qt5"
 NETWORK_USE="ipv6 avahi zeroconf http"
-SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal"
+SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal sound"
 DONT_USE="-bindist -kde -qt4 -qt3support -gtk -gtk3 -gnome -gnome-keyring -connman -networkmanager -modemmanager -libav -tracker -mysql -consolekit -openrc -sysvinit -branding -handbook"
 
 USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${DONT_USE}"
diff --git a/conf/intel/portage/package.use/00-drmstack.package.use b/conf/intel/portage/package.use/00-drmstack.package.use
new file mode 100644
index 0000000..ba73393
--- /dev/null
+++ b/conf/intel/portage/package.use/00-drmstack.package.use
@@ -0,0 +1,11 @@
+media-libs/mesa d3d9 gles1 gles2 vulkan xa
+sys-devel/clang-runtime -openmp
+sys-devel/clang -static-analyzer
+sys-devel/llvm libedit
+x11-base/xorg-server xvfb
+x11-drivers/nvidia-drivers gtk2 -driver -kms -uvm
+x11-drivers/xf86-video-intel uxa
+x11-drivers/xf86-video-qxl xspice
+x11-libs/libdrm libkms
+x11-libs/libva utils
+
diff --git a/conf/intel/portage/package.use/00-games.package.use b/conf/intel/portage/package.use/00-games.package.use
new file mode 100644
index 0000000..8383295
--- /dev/null
+++ b/conf/intel/portage/package.use/00-games.package.use
@@ -0,0 +1,3 @@
+games-fps/urbanterror smp sdl
+games-fps/xonotic sdl
+games-strategy/warzone2100 videos
diff --git a/conf/intel/portage/package.use/00-generic.package.use b/conf/intel/portage/package.use/00-generic.package.use
index 575a95b..7ff0d16 100644
--- a/conf/intel/portage/package.use/00-generic.package.use
+++ b/conf/intel/portage/package.use/00-generic.package.use
@@ -10,59 +10,13 @@ app-misc/calamares-runtime branding
 app-text/xmlto text
 dev-db/sqlite secure-delete
 dev-lang/fpc source
-dev-libs/libgit2 ssh
 dev-libs/libpcre pcre16
 dev-libs/libgusb vala
-dev-python/PyQt5 bluetooth declarative designer gui multimedia network positioning printsupport sensors sql webchannel webengine webkit websockets x11extras xmlpatterns widgets
-dev-qt/qt-creator autotools android baremetal bazaar clang cmake cvs git ios mercurial subversion webkit winrt
-dev-qt/qtgui:5 gtkstyle evdev
-dev-qt/qtmultimedia:5 widgets
-dev-qt/qtpositioning:5 geoclue
-dev-qt/qtwidgets:5 gtkstyle
-dev-qt/qtwebchannel:5 qml
-dev-qt/qtwebengine:5 widgets
-dev-qt/qtwebkit:5 geolocation multimedia orientation printsupport webchannel -gstreamer
-games-action/armagetronad sound
-games-fps/urbanterror smp sdl
-games-fps/xonotic sdl
-games-strategy/0ad sound
-games-strategy/warzone2100 videos
 kde-apps/k3b encode mad
 lxqt-base/lxqt-meta branding
 mail-filter/clamassassin clamd
-media-gfx/blender -ffmpeg
-media-gfx/krita qtmedia vc
-media-gfx/sane-backends usb snmp
-media-gfx/xsane gimp lcms ocr
-media-libs/libsdl sound
-media-libs/libsdl2 gles
-media-libs/libvpx postproc svc
-media-libs/mesa d3d9 gles1 gles2 vulkan xa
-media-libs/phonon -gstreamer -vlc
-media-libs/sdl-mixer smpeg
-media-sound/qmmp qsui
-media-tv/kodi airplay css upnp -samba
-media-video/handbrake gtk
-media-video/ffmpeg fdk
-media-video/mpv libmpv
-media-video/obs-studio imagemagick fdk
-net-dns/avahi mdnsresponder-compat -utils
-net-dns/dnsmasq script
-net-firewall/firewalld gui
-net-print/cnijfilter net servicetools
-net-print/cnijfilter-drivers servicetools e510 ip7200 mg2200 mg3200 mg4200 mg5400 mg6300 mp230
-net-print/hplip fax scanner snmp
-net-fs/samba addc ads client fam gnutls ldap syslog -system-mitkrb5
-net-irc/quassel phonon -server -crypt
-net-misc/connman ofono openconnect openvpn pptp l2tp vpnc
-net-misc/teamviewer -system-wine
-net-misc/youtube-dl offensive
-net-wireless/wpa_supplicant -qt5
 sys-apps/systemd sysv-utils cryptsetup -http
 sys-boot/grub device-mapper mount truetype
-sys-devel/clang-runtime -openmp
-sys-devel/clang -static-analyzer
-sys-devel/llvm libedit
 sys-devel/gcc go
 sys-fs/cryptsetup -gcrypt -nettle
 sys-fs/dosfstools compat
@@ -71,16 +25,9 @@ sys-kernel/redcore-sources symlink
 sys-kernel/linux-redcore dmraid dracut symlink grub iscsi mdadm luks lvm zfs plymouth
 sys-libs/libseccomp static-libs
 sys-libs/zlib minizip
-www-client/firefox hwaccel nsplugin pgo system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-sqlite -wifi
-x11-base/xorg-server xvfb
-x11-drivers/nvidia-drivers gtk2 -driver -kms -uvm
-x11-drivers/xf86-video-intel uxa
-x11-drivers/xf86-video-qxl xspice
 x11-misc/gtkdialog glade vte
 x11-misc/lightdm gtk
 x11-misc/lightdm-gtk-greeter branding
-x11-libs/libdrm libkms
-x11-libs/libva utils
 x11-libs/wxGTK:2.8 -gstreamer
 x11-libs/wxGTK:3.0 -gstreamer
 x11-themes/arc-theme gtk3
diff --git a/conf/intel/portage/package.use/00-internet.package.use b/conf/intel/portage/package.use/00-internet.package.use
new file mode 100644
index 0000000..998de0b
--- /dev/null
+++ b/conf/intel/portage/package.use/00-internet.package.use
@@ -0,0 +1,14 @@
+dev-libs/libgit2 ssh
+net-dns/avahi mdnsresponder-compat -utils
+net-dns/dnsmasq script
+net-firewall/firewalld gui
+net-print/cnijfilter net servicetools
+net-print/cnijfilter-drivers servicetools e510 ip7200 mg2200 mg3200 mg4200 mg5400 mg6300 mp230
+net-print/hplip fax scanner snmp
+net-fs/samba addc ads client fam gnutls ldap syslog -system-mitkrb5
+net-irc/quassel phonon -server -crypt
+net-misc/connman ofono openconnect openvpn pptp l2tp vpnc
+net-misc/teamviewer -system-wine
+net-misc/youtube-dl offensive
+net-wireless/wpa_supplicant -qt5
+www-client/firefox hwaccel nsplugin pgo system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-sqlite -wifi
diff --git a/conf/intel/portage/package.use/00-multimedia.package.use b/conf/intel/portage/package.use/00-multimedia.package.use
new file mode 100644
index 0000000..8c4bb87
--- /dev/null
+++ b/conf/intel/portage/package.use/00-multimedia.package.use
@@ -0,0 +1,13 @@
+media-gfx/blender -ffmpeg
+media-gfx/krita qtmedia vc
+media-gfx/sane-backends usb snmp
+media-gfx/xsane gimp lcms ocr
+media-libs/libsdl2 gles
+media-libs/libvpx postproc svc
+media-libs/phonon -gstreamer -vlc
+media-libs/sdl-mixer smpeg
+media-sound/qmmp qsui
+media-tv/kodi airplay css upnp -samba
+media-video/handbrake gtk
+media-video/mpv libmpv
+media-video/obs-studio imagemagick
diff --git a/conf/intel/portage/package.use/00-qt5.package.use b/conf/intel/portage/package.use/00-qt5.package.use
new file mode 100644
index 0000000..f0c679e
--- /dev/null
+++ b/conf/intel/portage/package.use/00-qt5.package.use
@@ -0,0 +1,9 @@
+dev-python/PyQt5 bluetooth declarative designer gui multimedia network positioning printsupport sensors sql webchannel webengine webkit websockets x11extras xmlpatterns widgets
+dev-qt/qt-creator autotools android baremetal bazaar clang cmake cvs git ios mercurial subversion webkit winrt
+dev-qt/qtgui:5 gtkstyle evdev
+dev-qt/qtmultimedia:5 widgets
+dev-qt/qtpositioning:5 geoclue
+dev-qt/qtwidgets:5 gtkstyle
+dev-qt/qtwebchannel:5 qml
+dev-qt/qtwebengine:5 widgets
+dev-qt/qtwebkit:5 geolocation multimedia orientation printsupport webchannel -gstreamer