saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 809e16e48c8a0d3e4b336b8d4188575a934f0aa8..fb650d951fd3bfc7459a8bca30354f329eadf201 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -8,7 +8,6 @@ mkdir -p './sudoers.d'
 maybe chmod 0755 '.'
 maybe chmod 0700 './.etckeeper'
 maybe chmod 0644 './.gitignore'
-maybe chmod 0644 './.make.conf.swp'
 maybe chmod 0600 './.pwd.lock'
 maybe chmod 0644 './DIR_COLORS'
 maybe chmod 0600 './aiccu.conf'

diff --git a/make.conf b/make.conf
index 019a1827b213741d8365cbe6a0136daf9993794a..c4852d04b356c2a3c8f0a9868c9389766e9592f1 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -70,8 +70,8 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards
      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 odbc ogg openal openexr opengl pango par pch pcntl pcre pdf perl
-     perlsuid php plasma plotutils png policykit posix ppds projectm pulseaudio python qt3 qt4 quicktime real
-     rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp
+     perlsuid plasma plotutils png policykit posix ppds projectm pulseaudio python quicktime real
+     rdesktop rle samba sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp
      sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh
      subversion svg sysvipc tetex theora thumbnail tidy timidity tiff
      tools truetype twolame udev unicode usb v4l v4l2 vcd vidix video vim-syntax vorbis  wav wavpack
@@ -80,7 +80,7 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards
      yaz yv12 zeroconf zlib 
      "
 
-# apache2 avahi darcs doc kate kde kdeenablefinal kdeprefix kerberos skey threads
+# apache2 avahi darcs doc kate kde kdeenablefinal kdeprefix kerberos php qt3 qt4 sasl skey threads
 
 #USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altenburgcards 
 #     amr ao apache2 aqua archive audiofile avahi bash-completion bazaar branding bzip2 cairo