From be47a62953b3937d04f199f8e1723436ccab2cfe Mon Sep 17 00:00:00 2001
From: Stefan Reimer <it@startux.de>
Date: Sun, 6 Oct 2013 18:21:02 -0700
Subject: [PATCH] Various config cleanups, 1st try to get rid of systemd and
 friends

---
 conf/portage/make.conf        | 12 ++++++------
 conf/portage/package.keywords | 22 ++++++++++++++++------
 conf/portage/package.use      |  9 +++------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/conf/portage/make.conf b/conf/portage/make.conf
index 359b8b9..fb39b26 100644
--- a/conf/portage/make.conf
+++ b/conf/portage/make.conf
@@ -18,7 +18,7 @@ CHOST="x86_64-pc-linux-gnu"
 DO_USE="smp"
 
 # X
-DO_USE="${DO_USE} cairo gtk gtk3 gles2 gstreamer g3dvl imlib libkms nvidia qt4 qt3support vaapi vdpau libkms X xcb opencl opengl s3tc truetype vaapi xcomposite"
+DO_USE="${DO_USE} cairo glamor gtk gtk3 gles2 gstreamer g3dvl imlib libkms nvidia qt4 qt3support vaapi vdpau libkms X xcb opencl opengl s3tc truetype vaapi xcomposite"
 
 # OpenBox
 DO_USE="${DO_USE} thunar"
@@ -31,17 +31,17 @@ DO_USE="${DO_USE} pulseaudio alsa openal"
 DO_USE="${DO_USE} mpd mp3 m3u mpg123 ogg opus vorbis mad aac cdr lame libsamplerate taglib"
 
 # Middleware
-DO_USE="${DO_USE} acpi cryptsetup curl cups git java keymap lm_sensors device-mapper gnutls net threads icu nsplugin lvm nfs libnotify python resolvconf sql sqlite spice syslog system-sqlite unicode udev xfs xml"
+DO_USE="${DO_USE} acpi cryptsetup curl cups dbus git java keymap lm_sensors device-mapper gnutls net threads icu nsplugin lvm nfs libnotify python resolvconf sql sqlite spice syslog system-sqlite unicode udev xfs xml"
 
 # Wireless / Network / Misc
-DO_USE="${DO_USE} bluetooth networkmanager usb wifi"
-
-# SystemD
-DO_USE="${DO_USE} -systemd consolekit dbus policykit"
+DO_USE="${DO_USE} bluetooth usb wifi"
 
 # Disable IPv6 for now
 USE_NOT="-ipv6 -ppp"
 
+# No SystemD and friends
+DO_NOT="${DO_NOT} -systemd -consolekit -policykit -networkmanager -udisks"
+
 # PORTDIR_OVERLAY="/mnt/portage/overlays/layman/pentoo"
 PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/quarks"
 # PORTDIR_OVERLAY="${PORTDIR_OVERLAY} /mnt/portage/overlays/layman/steam"
diff --git a/conf/portage/package.keywords b/conf/portage/package.keywords
index bfc7c81..7e86736 100644
--- a/conf/portage/package.keywords
+++ b/conf/portage/package.keywords
@@ -2,7 +2,6 @@
 sys-boot/grub
 sys-fs/cryptsetup
 <sys-kernel/dracut-033
-<sys-fs/mdadm-3.3
 # sys-boot/efibootmgr
 # sys-boot/os-prober
 # sys-kernel/hardened-sources
@@ -17,12 +16,11 @@ x11-libs/libva
 x11-libs/libva-intel-driver
 =x11-drivers/xf86-video-intel-2.21.9
 =sys-devel/llvm-3.3-r1 ~amd64
-=x11-libs/libdrm-2.4.46 ~amd64
 =dev-libs/libclc-0.0.1_pre20130819 ~amd64
 =sys-devel/clang-3.3-r100 ~amd64
 
 # x11-drivers/ati-drivers 
-x11-drivers/nvidia-drivers 
+=x11-drivers/nvidia-drivers-325.15
 # media-video/nvidia-settings
 # app-admin/eselect-opencl
 
@@ -32,6 +30,7 @@ sys-power/tpc
 
 # Shiny boot
 sys-boot/plymouth
+sys-boot/plymouth-openrc-plugin
 
 app-emulation/wine
 app-emulation/uae
@@ -82,9 +81,20 @@ media-libs/avidemux-plugins
 
 media-video/rtmpdump **
 
-# sci-geosciences/googleearth
-#required by sci-geosciences/googleearth-6.2.2.6613, required by sci-geosciences/googleearth (argument)
-# =dev-util/patchelf-0.6 ~amd64
+# Console calendar
+app-misc/gcalcli
+# required by dev-python/google-api-python-client-1.1
+# required by app-misc/gcalcli-2.4.2
+# required by gcalcli (argument)
+=dev-python/python-gflags-2.0 ~amd64
+# required by app-misc/gcalcli-2.4.2
+# required by gcalcli (argument)
+=dev-python/google-api-python-client-1.1 ~amd64
+# required by dev-python/google-api-python-client-1.1
+# required by app-misc/gcalcli-2.4.2
+# required by gcalcli (argument)
+=dev-python/httplib2-0.8 ~amd64
+
 
 # media-video/mplayer2
 
diff --git a/conf/portage/package.use b/conf/portage/package.use
index cf37087..0a2e5d3 100644
--- a/conf/portage/package.use
+++ b/conf/portage/package.use
@@ -4,11 +4,8 @@ dev-libs/libgpg-error static-libs
 dev-libs/popt static-libs
 sys-apps/util-linux static-libs
 
-sys-fs/udev extras gudev hwdb
-virtual/udev extras gudev hwdb 
-net-fs/nfs-utils nfsv41
-
-sys-boot/plymouth -openrc
+sys-fs/eudev gudev hwdb kmod
+sys-auth/consolekit policykit
 
 app-emulation/wine -win64 -gstreamer
 dev-python/matplotlib wxwidgets
@@ -37,7 +34,7 @@ media-sound/pulseaudio gnome
 dev-lang/php pcntl gd zip
 
 sys-kernel/hardened-sources injection symlink
-media-libs/mesa r600-llvm-compiler
+media-libs/mesa r600-llvm-compiler gbm
 sys-devel/llvm clang
 
 # Don't support ruby1.9 yet