saving uncommitted changes in /etc prior to emerge run

diff --git a/conf.d/xdm b/conf.d/xdm
index 164c2c66cfdc7edb81d0c5005a52bfb19e2ee55b..4b410310f12277e9b79639a7038cd8414b0ac77b 100644 (file)
--- a/conf.d/xdm
+++ b/conf.d/xdm
@@ -9,4 +9,5 @@ CHECKVT=7
 # NOTE: If this is set in /etc/rc.conf, that setting will override this one.
 #DISPLAYMANAGER="xdm"
 #DISPLAYMANAGER="gdm"
-DISPLAYMANAGER="kdm"
+#DISPLAYMANAGER="kdm"
+DISPLAYMANAGER="sddm"

diff --git a/group b/group
index f498178e05ff6024f4aa239beec7bfc3687eae94..748d654386ce4eeaa99c5736df6a1060fd0b0014 100644 (file)
--- a/group
+++ b/group
@@ -86,3 +86,4 @@ systemd-journal-upload:x:971:
 docker:x:970:frank
 unbound:x:969:
 libvirt:x:968:frank
+sddm:x:967:

diff --git a/group- b/group-
index 88cb2d36049e353344031199e1f0e6558127c39b..f498178e05ff6024f4aa239beec7bfc3687eae94 100644 (file)
--- a/group-
+++ b/group-
@@ -85,4 +85,4 @@ systemd-journal-remote:x:972:
 systemd-journal-upload:x:971:
 docker:x:970:frank
 unbound:x:969:
-libvirt:x:968:
+libvirt:x:968:frank

diff --git a/gshadow b/gshadow
index 50277305711d2d2465bb8bdc1e14c580dc6ebdf7..74de2e7e13198b3e7529dc924ff66e0e6eb536e4 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -84,3 +84,4 @@ systemd-journal-upload:!::
 docker:!::frank
 unbound:!::
 libvirt:!::frank
+sddm:!::

diff --git a/gshadow- b/gshadow-
index efdbfbbbeddf2ac35c1aa2cdb922f2621e3fed5b..50277305711d2d2465bb8bdc1e14c580dc6ebdf7 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -83,4 +83,4 @@ systemd-journal-remote:!::
 systemd-journal-upload:!::
 docker:!::frank
 unbound:!::
-libvirt:!::
+libvirt:!::frank

diff --git a/passwd b/passwd
index 55976439109a7998d96318e4e3c1b5b3fdcc2ac6..e2433fda671884c233f1dae87abc8084b15428d5 100644 (file)
--- a/passwd
+++ b/passwd
@@ -66,3 +66,4 @@ systemd-journal-gateway:x:128:973:added by portage for systemd:/dev/null:/sbin/n
 systemd-journal-remote:x:129:972:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-journal-upload:x:130:971:added by portage for systemd:/dev/null:/sbin/nologin
 unbound:x:131:969:added by portage for unbound:/etc/unbound:/sbin/nologin
+sddm:x:132:967:added by portage for sddm:/var/lib/sddm:/sbin/nologin

diff --git a/passwd- b/passwd-
index ac806adde5fb98c221de08beb67bee2402402ff8..55976439109a7998d96318e4e3c1b5b3fdcc2ac6 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -65,3 +65,4 @@ systemd-timesync:x:127:974:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-journal-gateway:x:128:973:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-journal-remote:x:129:972:added by portage for systemd:/dev/null:/sbin/nologin
 systemd-journal-upload:x:130:971:added by portage for systemd:/dev/null:/sbin/nologin
+unbound:x:131:969:added by portage for unbound:/etc/unbound:/sbin/nologin

diff --git a/portage/make.conf b/portage/make.conf
index 8f829464ccc30e0785b5db6bc10f84df7bda1dca..cfbb809e2d720df19f96008a14994246c2795277 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -75,15 +75,15 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards
      curlwrappers cvs dane dbase dbi dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples
      encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile flickr fltk fluidsynth fontconfig
      foomaticdb ftp gconf gd gd-external geoip ggi gif gimp git glade glib gmp gnome gnome-keyring 
-     gnustep gost gphoto2 gpm graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea
+     gnustep gost gphoto2 gpm graphviz gsl gsm gstreamer gtk gtk3 gtkhtml hal hscolour html iconv icu id3 id3tag idea
      idn ieee1394 imagemagick imap imlib inifile ithreads java javascript
-     jabber jack java6 jbig jikes jingle jpeg jpeg2k json json-syck json-xs kde kdeenablefinal kdeprefix kerberos
+     jabber jack java6 jbig jikes jingle jpeg jpeg2k json json-syck json-xs kerberos
      keyring kig-scripting kpathsea lame latex lcms ldap libcaca
      libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lxc lz4 lzma lzo mad meanwhile mercurial
      midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp
      musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis
      nptl nsplugin nss numpy odbc ogg openal openexr opengl openssl opus pango par pch pcntl pcre pdf perl
-     perlsuid php plasma plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python quicktime real
+     perlsuid php plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python qt5 quicktime real
      rdesktop rle samba sasl sctp sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp smtp
      sndfile snmp soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh
      subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff

diff --git a/portage/package.keywords b/portage/package.keywords
index 5a52e7f41d1700f7f4f62cbad59b90fea014e5f2..947250b9add4237e4e97f599a47234bb86d1e0f9 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -89,6 +89,7 @@ app-misc/ddate
 ~dev-libs/nss-3.17.4
 ~dev-libs/nss-3.19.1
 ~dev-libs/nss-3.22.2
+~dev-libs/nss-3.23
 ~dev-libs/sgml-data-2.0.8
 ~dev-libs/xml-core-0.13_p2
 
@@ -306,6 +307,7 @@ www-client/google-chrome
 ~x11-plugins/purple-facebook-20150827
 ~x11-plugins/wmcalendar-0.5.2
 ~x11-plugins/wmmixer-1.5       **
+~x11-plugins/wmnetload-1.3
 
 # ~x11-terms/gnome-terminal-3.6.1
 ~x11-terms/mate-terminal-1.6.2

diff --git a/portage/package.use b/portage/package.use
index 68a7b8be3393e749deade1202fe15fcc8df48e4d..22cea374bebd90b96f36ab3fc12a714f2ae2803b 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -218,12 +218,14 @@ media-libs/freetype                       infinality utils
 media-libs/gegl                                -ffmpeg graphviz raw
 media-libs/giflib                      rle
 media-libs/libgphoto2                  -zeroconf
+media-libs/libmediaart                 -qt5
 media-libs/libmp4v2                    utils
 media-libs/libpng                      apng
 media-libs/libquicktime                        lame
 media-libs/libvorbis                   aotuv
 media-libs/libvpx                      postproc
 media-libs/libwmf                      -expat
+media-libs/mlt                         -qt4
 media-libs/mesa                                g3dvl gbm gles gles1 gles2 llvm shared-dricore xa xvmc
 media-libs/netpbm                      rle
 media-libs/openjpeg                    tools
@@ -241,7 +243,8 @@ media-plugins/gst-plugins-meta:1.0  ffmpeg http libvisual
 media-sound/abcde                      normalize replaygain
 # =media-sound/amarok-1.4.5-r1         -daap
 media-sound/amarok                     cdaudio cdda daap ifp ipod mp3tunes mp4 njb visualization
-media-sound/audacious                  gtk -gtk3 chardet
+media-sound/audacious                  -gtk gtk3 -qt5 chardet
+media-plugins/audacious-plugins                -gtk gtk3 -qt5
 # media-sound/easytag                  wavpack
 media-sound/jack-audio-connection-kit  jack-tmpfs netjack
 media-sound/pulseaudio                 asyncns equalizer native-headset ofono-headset
@@ -255,7 +258,7 @@ media-video/mjpegtools                      yv12
 media-video/mplayer                    3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 mpg123 nemesi nut opencore-amr pnm pvr rar rtc srt teletext tga tivo vpx xanim xvmc yuv4mpeg zoran
 media-video/totem                      iplayer -tracker upnp-av
 media-video/transcode                  extrafilters fame lzo mjpeg network nuv postproc
-media-video/vlc                                atmo cdda cddax cdio chromaprint corba daap dc1394 dirac egl faad fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil opencv portaudio postproc -rdp rtsp schroedinger sftp shine shout skins stream switcher taglib twolame vcdinfo vcdx vlm vpx zvbi
+media-video/vlc                                atmo cdda cddax cdio chromaprint corba daap dc1394 dirac egl faad fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil opencv portaudio postproc -qt4 -rdp rtsp schroedinger sftp shine shout skins stream switcher taglib twolame vcdinfo vcdx vlm vpx zvbi
 
 net-analyzer/nagios-nrpe               command-args
 net-analyzer/nagios-plugins            nagios-dns nagios-ntp nagios-ping nagios-ssh
@@ -312,7 +315,7 @@ net-nds/openldap                    cxx experimental -minimal overlays syslog
 net-print/cups                         -usb
 net-print/hplip                                cupsddk fax hpijs new-hpcups parport scanner
 
-net-wireless/wpa_supplicant            wps
+net-wireless/wpa_supplicant            -qt4 wps
 
 sci-libs/cln                           -doc
 sci-libs/hdf5                          -threads

diff --git a/sddm.conf b/sddm.conf
new file mode 100644 (file)
index 0000000..5c31d46
--- /dev/null
+++ b/sddm.conf
@@ -0,0 +1,105 @@
+[Autologin]
+# Autologin again on session exit
+Relogin=false
+
+# Autologin session
+Session=
+
+# Autologin user
+User=
+
+
+[General]
+# Halt command
+HaltCommand=/usr/bin/systemctl poweroff
+
+# Initial NumLock state
+# Valid values: on|off|none
+# If property is set to none, numlock won't be changed
+Numlock=none
+
+# Reboot command
+RebootCommand=/usr/bin/systemctl reboot
+
+
+[Theme]
+# Current theme name
+Current=maui
+
+# Cursor theme
+CursorTheme=
+
+# Face icon directory
+# The files should be in username.face.icon format
+FacesDir=/usr/share/sddm/faces
+
+# Theme directory path
+ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH
+DefaultPath=/bin:/usr/bin:/usr/local/bin
+
+# Hidden shells
+# Users with these shells as their default won't be listed
+HideShells=
+
+# Hidden users
+HideUsers=
+
+# Maximum user id for displayed users
+MaximumUid=60000
+
+# Minimum user id for displayed users
+MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+RememberLastSession=true
+
+# Remember the last successfully logged in user
+RememberLastUser=true
+
+
+[WaylandDisplay]
+# Wayland session script path
+# A script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/wayland-session
+
+# Session description directory
+SessionDir=/usr/share/wayland-sessions
+
+
+[XDisplay]
+# Xsetup script path
+# A script to execute when starting the display server
+DisplayCommand=/usr/share/sddm/scripts/Xsetup
+
+# Xstop script path
+# A script to execute when stopping the display server
+DisplayStopCommand=/usr/share/sddm/scripts/Xstop
+
+# Minimum VT
+# The lowest virtual terminal number that will be used.
+MinimumVT=7
+
+# X server arguments
+ServerArguments=-nolisten tcp
+
+# X server path
+ServerPath=/usr/bin/X
+
+# Xsession script path
+# A script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/Xsession
+
+# Session description directory
+SessionDir=/usr/share/xsessions
+
+# Xauth path
+XauthPath=/usr/bin/xauth
+
+# Xephyr path
+XephyrPath=/usr/bin/Xephyr
+
+# vim: filetype=dosini

diff --git a/shadow b/shadow
index e06a2dd2e4a9af84d4f0eee919ae8b90395afc85..0fc2544a29b28a0a15380607dcda53b045781898 100644 (file)
--- a/shadow
+++ b/shadow
@@ -65,3 +65,4 @@ systemd-journal-gateway:!:16440::::::
 systemd-journal-remote:!:16440::::::
 systemd-journal-upload:!:16440::::::
 unbound:!:16491::::::
+sddm:!:16938::::::

diff --git a/shadow- b/shadow-
index 76c6b409c9b56f5703ff104d751343ba9d9d78a9..e06a2dd2e4a9af84d4f0eee919ae8b90395afc85 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -64,3 +64,4 @@ systemd-timesync:!:16398::::::
 systemd-journal-gateway:!:16440::::::
 systemd-journal-remote:!:16440::::::
 systemd-journal-upload:!:16440::::::
+unbound:!:16491::::::