saving uncommitted changes in /etc prior to emerge run

paludis/sets/desktop.conf

@@ -28,6 +28,7 @@
 * media-video/guvcview
 * media-video/mediainfo
 * media-video/mpv
+* media-plugins/gst-plugins-meta
  
 * net-ftp/filezilla
  

paludis/sets/development.conf

@@ -112,6 +112,7 @@
 * dev-util/strace
 * dev-util/checkbashisms
 * dev-util/meld
+* sys-devel/gdb
 
 
 # languages

paludis/sets/mysystem.conf

@@ -13,7 +13,6 @@
 * app-portage/pfl
 * app-portage/smart-live-rebuild
  
-* media-video/nvidia-settings
 * app-admin/sudo
 * sys-fs/eudev
  
@@ -23,11 +22,9 @@
 * sys-boot/os-prober
 * sys-devel/bmake
 * sys-devel/clang
-* sys-devel/crossdev
 * sys-devel/distcc
 * sys-devel/gcc:4.7
 * sys-devel/gcc:4.8
-* sys-devel/gdb
 * sys-devel/llvm
 * sys-devel/pmake
 * sys-fs/hfsutils
@@ -99,24 +96,6 @@
 * dev-util/debugedit
 * dev-util/regexxer
  
-# mesa/X11/graphics-driver
-* x11-apps/mesa-progs
-* x11-apps/setxkbmap
-* x11-apps/xdpyinfo
-* x11-apps/xev
-* x11-apps/xhost
-* x11-apps/xkill
-* x11-apps/xmodmap
-* x11-apps/xrandr
-* x11-apps/xsetroot
-* x11-base/xorg-server
-* x11-drivers/nvidia-drivers
-* x11-misc/wmctrl
-* x11-misc/xclip
-* x11-misc/xdotool
-* x11-misc/xvkbd
-* x11-terms/xterm
- 
 * net-analyzer/wireshark
 * net-analyzer/netcat
 * net-analyzer/nmap
@@ -136,7 +115,5 @@
 * media-fonts/font-bitstream-100dpi
 * media-fonts/font-bitstream-75dpi
 * media-gfx/pngcrush
-* media-plugins/gst-plugins-meta
 
 * www-client/links
-

paludis/sets/x11.conf

@@ -0,0 +1,18 @@
+# mesa/X11/graphics-driver
+* x11-apps/mesa-progs
+* x11-apps/setxkbmap
+* x11-apps/xdpyinfo
+* x11-apps/xev
+* x11-apps/xhost
+* x11-apps/xkill
+* x11-apps/xmodmap
+* x11-apps/xrandr
+* x11-apps/xsetroot
+* x11-base/xorg-server
+* x11-drivers/nvidia-drivers
+* x11-misc/wmctrl
+* x11-misc/xclip
+* x11-misc/xdotool
+* x11-misc/xvkbd
+* x11-terms/xterm
+* media-video/nvidia-settings

paludis/use.conf.d/desktop.conf

@@ -1,15 +1,5 @@
-x11-base/xorg-server xvfb  
-
-
-# because of wayland
-media-libs/cogl gles2
-media-libs/gst-plugins-bad egl -gles2
-media-libs/clutter egl
-
-
 gnome-extra/zenity -webkit
 
-
 www-client/netsurf gtk
 # required by media-libs/libsvgtiny-0.1.0
 # required by www-client/netsurf-3.0-r1[svg,svgtiny]
@@ -97,11 +87,5 @@ media-libs/phonon -vlc
 # inox
 media-libs/libvpx postproc
 
-# by qtgui:5
-x11-libs/libxcb xkb
 
 app-text/ghostscript-gpl gtk
-
-
-x11-libs/cairo xcb
-

paludis/use.conf.d/system.conf

@@ -49,8 +49,6 @@ dev-libs/libgpg-error static-libs
 
 sys-apps/busybox static -pam
 
-x11-drivers/nvidia-drivers acpi gtk3 uvm
-
 net-misc/rsync xattr
 
 sys-apps/man-pages LINGUAS: -de

paludis/use.conf.d/x11.conf

@@ -0,0 +1,14 @@
+x11-drivers/nvidia-drivers acpi gtk3 uvm
+
+# by qtgui:5
+x11-libs/libxcb xkb
+
+x11-libs/cairo xcb
+
+x11-base/xorg-server xvfb
+
+
+# because of wayland
+media-libs/cogl gles2
+media-libs/gst-plugins-bad egl -gles2
+media-libs/clutter egl