From 18b74351ede2fbf3f9d80f1a893ae054bee06a34 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Thu, 24 Sep 2015 12:21:17 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 paludis/sets/desktop.conf       |  1 +
 paludis/sets/development.conf   |  1 +
 paludis/sets/mysystem.conf      | 23 -----------------------
 paludis/sets/x11.conf           | 18 ++++++++++++++++++
 paludis/use.conf.d/desktop.conf | 16 ----------------
 paludis/use.conf.d/system.conf  |  2 --
 paludis/use.conf.d/x11.conf     | 14 ++++++++++++++
 7 files changed, 34 insertions(+), 41 deletions(-)
 create mode 100644 paludis/sets/x11.conf
 create mode 100644 paludis/use.conf.d/x11.conf

diff --git a/paludis/sets/desktop.conf b/paludis/sets/desktop.conf
index 23144ed..7bcf728 100644
--- a/paludis/sets/desktop.conf
+++ b/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
  
diff --git a/paludis/sets/development.conf b/paludis/sets/development.conf
index 077a2a1..6d7de99 100644
--- a/paludis/sets/development.conf
+++ b/paludis/sets/development.conf
@@ -112,6 +112,7 @@
 * dev-util/strace
 * dev-util/checkbashisms
 * dev-util/meld
+* sys-devel/gdb
 
 
 # languages
diff --git a/paludis/sets/mysystem.conf b/paludis/sets/mysystem.conf
index 3678764..4efedd0 100644
--- a/paludis/sets/mysystem.conf
+++ b/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
-
diff --git a/paludis/sets/x11.conf b/paludis/sets/x11.conf
new file mode 100644
index 0000000..00e4aee
--- /dev/null
+++ b/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
diff --git a/paludis/use.conf.d/desktop.conf b/paludis/use.conf.d/desktop.conf
index a2a12e9..a1b815f 100644
--- a/paludis/use.conf.d/desktop.conf
+++ b/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
-
diff --git a/paludis/use.conf.d/system.conf b/paludis/use.conf.d/system.conf
index 111d3a2..a85207b 100644
--- a/paludis/use.conf.d/system.conf
+++ b/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
diff --git a/paludis/use.conf.d/x11.conf b/paludis/use.conf.d/x11.conf
new file mode 100644
index 0000000..a42dead
--- /dev/null
+++ b/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