saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index ce1e23c033dfb1921bfc07c68df2c8d8e21e0a20..5a2dac127f0ca610966c6e394bb69b6b516df4d4 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,20 +1,12 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-05-14 08:00
+# Written by cupsd on 2017-05-15 08:04
 NextSubscriptionId 419
-<Subscription 417>
-Events printer-changed
-Owner root
-LeaseDuration 86400
-Interval 60
-ExpirationTime 1494827999
-NextEventId 1
-</Subscription>
 <Subscription 418>
 Events all
 Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1494827999
+ExpirationTime 1494914340
 NextEventId 1
 </Subscription>

diff --git a/portage/make.conf b/portage/make.conf
index 7d364b5cef332f17cc02adcc7af63e15a4cbde7c..1cdfbb41adda6a2d1f16e06ebf5100ef8fc254dc 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -138,7 +138,7 @@ PYTHON_TARGETS="python2_7 python3_4"
 PYTHON_SINGLE_TARGET="python3_4"
 CURL_SSL="nss"
 
-RUBY_TARGETS="ruby21"
+RUBY_TARGETS="ruby21 ruby22"
 
 CPU_FLAGS_X86="3dnow 3dnowext mmx mmxext popcnt sse sse2 sse3 sse4a"
 

diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common
index e9ce96f4dda9b81f1712b6a44fd761df33742c8e..fed4ae934472c79287c882788d12bbf33d2fd0b0 100644 (file)
--- a/portage/package.accept_keywords/common
+++ b/portage/package.accept_keywords/common
@@ -17,16 +17,19 @@ app-misc/ddate
 ~dev-libs/libdbusmenu-12.10.2
 ~dev-libs/libindicator-12.10.1
 ~dev-libs/nss-3.30
+~dev-libs/nss-3.30.2
 
 ~dev-python/astroid-1.4.8
 ~dev-python/bcrypt-3.1.1
 ~dev-python/certifi-2016.9.26
 ~dev-python/dnspython-1.15.0
 ~dev-python/flake8-3.2.1
+~dev-python/flake8-3.3.0
 ~dev-python/keepassx-0.1.0
 ~dev-python/lazy-object-proxy-1.2.1
 ~dev-python/markupsafe-0.23
 ~dev-python/mccabe-0.5.3
+~dev-python/mccabe-0.6.1
 dev-python/passlib
 dev-python/pb-logging
 ~dev-python/pep8-1.5.7
@@ -34,6 +37,7 @@ dev-python/pb-logging
 ~dev-python/pycairo-1.10.0
 ~dev-python/pycodestyle-2.2.0
 ~dev-python/pycparser-2.17
+~dev-python/pyflakes-1.5.0
 ~dev-python/pygobject-3.22.0
 ~dev-python/pylint-1.5.6
 ~dev-python/scrypt-0.8.0
@@ -47,6 +51,7 @@ mail-client/thunderbird
 
 ~media-libs/avidemux-core-2.6.8
 ~media-libs/avidemux-plugins-2.6.8
+~media-libs/libpng-1.6.29
 ~media-libs/libsidplayfp-1.1.0
 ~media-libs/xine-lib-1.2.6
 

diff --git a/portage/package.accept_keywords/mariadb b/portage/package.accept_keywords/mariadb
index 03f528e9a8bb183360dec9ffdf80684cede7fde2..6f7fe939e9720f4e133b98273d678dbca1520311 100644 (file)
--- a/portage/package.accept_keywords/mariadb
+++ b/portage/package.accept_keywords/mariadb
@@ -3,6 +3,7 @@
 ~app-text/groonga-normalizer-mysql-1.1.1
 
 ~dev-db/mariadb-10.1.22
+~dev-db/mariadb-10.1.23
 ~dev-db/xtrabackup-bin-2.4.6
 
 ~dev-libs/libgcrypt-1.5.6

diff --git a/portage/package.use b/portage/package.use
index b839f646821c020a69d14eaaedbd157c6c7a6a11..20683bf6e0058968c778e74e0ec660166c242f8a 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -139,6 +139,7 @@ dev-qt/qtwebchannel                 qml
 dev-qt/qtwebengine                     widgets
 dev-qt/qtwebkit                                -exceptions
 
+dev-ruby/json                          -doc
 dev-ruby/hoe                           -doc
 dev-ruby/racc                          -doc
 dev-ruby/rake                          -doc
@@ -354,7 +355,7 @@ net-misc/openssh                    -X509 sftplogging
 # move net-misc/openvpn net-vpn/openvpn
 net-vpn/openvpn                        down-root eurephia iproute2 passwordsave socks
 net-misc/rdesktop                      rdpusb
-net-misc/spice-gtk                     python_single_target_python2_7 -python_single_target_python3_4 -pulseaudio usbredir
+net-misc/spice-gtk                     gstaudio gstvideo mjpeg python_single_target_python2_7 -python_single_target_python3_4 -pulseaudio usbredir
 net-misc/tigervnc                      gnutls
 # net-misc/vnc                         server
 net-misc/vpnc                          hybrid-auth