saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/make.conf b/portage/make.conf
index fc97eda54eadf8b1eaa6be51908f9bb1be5f7c23..7d3a12a39aff4b13cc5f3211724b2d369d62c52f 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -139,8 +139,9 @@ PHP_TARGETS="php5-6 php7-0"
 
 #USE_PYTHON='2.7 3.4 3.5'
 #PYTHON_TARGETS="python2_7 python3_4"
-#PYTHON_TARGETS="python2_7 python3_4 python3_5"
-PYTHON_SINGLE_TARGET="python3_4"
+PYTHON_TARGETS="python2_7 python3_4 python3_5"
+#PYTHON_SINGLE_TARGET="python3_4"
+PYTHON_SINGLE_TARGET="python3_5"
 
 CURL_SSL="nss"
 

diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common
index 1b130a0e41cc5c0be4d818cb426f406cc52b6141..8772b8664b2f9675df4a68376e1cb6b229ebb2b7 100644 (file)
--- a/portage/package.accept_keywords/common
+++ b/portage/package.accept_keywords/common
@@ -56,6 +56,7 @@ mail-client/thunderbird
 ~media-libs/avidemux-core-2.6.20
 ~media-libs/avidemux-plugins-2.6.8
 ~media-libs/avidemux-plugins-2.6.20
+~media-libs/faac-1.29.9.2
 ~media-libs/libpng-1.6.29
 ~media-libs/libpng-1.6.34
 ~media-libs/libsidplayfp-1.1.0

diff --git a/portage/package.accept_keywords/firefox b/portage/package.accept_keywords/firefox
index 79391950561d242d0a706260f26cd7db083d7c5b..0cc204e33895e48a1ba69d39e4f95562d1d6ebb0 100644 (file)
--- a/portage/package.accept_keywords/firefox
+++ b/portage/package.accept_keywords/firefox
@@ -4,6 +4,7 @@
 
 ~dev-libs/nspr-4.15
 ~dev-libs/nspr-4.16
+~dev-libs/nspr-4.17
 ~dev-libs/nss-3.30
 ~dev-libs/nss-3.30.2
 ~dev-libs/nss-3.32

diff --git a/portage/package.mask b/portage/package.mask
index a5414e9dcc7948e6cb59a672e97d2bdb1cd358e3..2395735eaa11aa9949c95448de6d76db81c98c8b 100644 (file)
--- a/portage/package.mask
+++ b/portage/package.mask
@@ -17,6 +17,7 @@
 
 =media-video/mplayer-1.2_pre20150214
 
+=www-client/firefox-57*
 =www-client/google-chrome-39.0.2171.99_p1
 
 ~www-plugins/adobe-flash-27.0.0.130

diff --git a/portage/package.use b/portage/package.use
index a5b52ac829fe1fa5f583c863b08bb7570be92eb9..ae2499891b8ab46a55a62fdc52d0a92810b21deb 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -16,7 +16,7 @@ app-arch/zip                          natspec
 app-cdr/brasero                                playlist
 app-cdr/cdrdao                         gcdmaster
 
-app-crypt/gpgme                                -cxx -qt5
+app-crypt/gpgme                                cxx -qt5
 app-crypt/johntheripper                        custom-cflags
 app-crypt/mit-krb5                     -pkinit
 app-crypt/pinentry                     clipboard -qt4
@@ -148,7 +148,7 @@ dev-qt/qtscript                             scripttools
 dev-qt/qtwayland                       egl
 dev-qt/qtwebchannel                    qml
 dev-qt/qtwebengine                     widgets
-dev-qt/qtwebkit                                -exceptions
+dev-qt/qtwebkit                                -exceptions printsupport
 
 dev-ruby/bluecloth                     -doc
 dev-ruby/builder                       -doc
@@ -416,7 +416,7 @@ sys-apps/paludis                    glsa inquisitio qa visibility
 sys-apps/pciutils                      dns network-cron -zlib
 sys-apps/portage                       epydoc native-extensions python3
 sys-apps/usbutils                      network-cron
-sys-apps/util-linux                    ddate loop-aes tty-helpers
+sys-apps/util-linux                    ddate loop-aes python_single_target_python3_5 tty-helpers
 
 sys-auth/consolekit                    evdev policykit
 sys-auth/pambase                       mktemp pam_krb5 pam_ssh
@@ -430,6 +430,7 @@ sys-devel/qconf                             -qt4
 
 sys-firmware/ipxe                      lkrn
 
+sys-fs/cryptsetup                      -gcrypt
 sys-fs/e2fsprogs                       fuse
 sys-fs/ecryptfs-utils                  gpg suid tpm
 sys-fs/udev                            devfs-compat edd extras hwdb