saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/package.keywords/common b/portage/package.keywords/common
index e44e1fcfc1f428134ef18c202415cc6a5724c2c0..fe6f01af5d84716b93c0c7dccafb3312e3f71199 100644 (file)
--- a/portage/package.keywords/common
+++ b/portage/package.keywords/common
@@ -181,6 +181,7 @@ mail-client/thunderbird
 #~sys-libs/zlib-1.2.7
 
 ~virtual/ffmpeg-9
+~virtual/jre-1.8.0
 ~virtual/python-pathlib-1.0
 
 #~www-plugins/adobe-flash-11.1.102.63

diff --git a/portage/package.use b/portage/package.use
index 05fdf0d6c3368999e33d6a93a68b1128f9f93b14..5fd14a6973b56ff7b5c3170ad83715ca679a96cf 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -76,6 +76,7 @@ dev-libs/geoip                                city
 dev-libs/libburn                       track-src-odirect
 dev-libs/libgcrypt                     idea static-libs
 dev-libs/liblogging                    rfc3195
+dev-libs/libpcre                       pcre16
 dev-libs/libpeas                       -python_targets_python3_3
 dev-libs/libusb                                -doc
 dev-libs/openssl                       rfc3779
@@ -292,7 +293,7 @@ net-firewall/iptables                   extensions
 
 # =net-fs/nfs-utils-1.0.10              -kerberos
 # =net-fs/nfs-utils-1.0.12               -kerberos
-net-fs/samba                            async automount quotas smbsharemodes swat syslog winbind
+net-fs/samba                            async automount gnutls quotas smbsharemodes swat syslog winbind
 net-fs/samba-libs                       smbsharemodes
 
 net-ftp/proftpd                         authfile ifsession opensslcrypt rewrite shaper sitemisc softquota vroot