saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index f1de75a9b652b5c650fec2f097bfd6ec52b08642..676ec31ca3ddc2e92ac3e2755fc3d24a88c0480c 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,5 +1,5 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-02-15 10:37
+# Written by cupsd on 2017-02-16 10:36
 NextSubscriptionId 345
 <Subscription 344>
 Events all
@@ -7,6 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1487237824
+ExpirationTime 1487324164
 NextEventId 1
 </Subscription>

diff --git a/env.d/65python-docs b/env.d/65python-docs
deleted file mode 100644 (file)
index 6dd8002..0000000
--- a/env.d/65python-docs
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONDOCS="/usr/share/doc/python-docs-2.7.10/html/library"

diff --git a/portage/package.keywords b/portage/package.keywords
index 3ebbcba5e44f49909154bcca88f558b5583ef798..037f4c9269eeeb6669729b206226c28276f342d4 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -113,6 +113,7 @@ app-misc/ddate
 ~dev-python/cffi-1.8.3
 ~dev-python/dnspython-1.15.0
 dev-python/fbrehm-libs
+~dev-python/flake8-3.2.1
 ~dev-python/gdata-2.0.18
 # ~dev-python/iniparse-0.4
 # ~dev-python/isodate-0.4.9
@@ -121,6 +122,7 @@ dev-python/fbrehm-libs
 ~dev-python/logilab-common-0.59.1
 ~dev-python/m2crypto-0.22.3
 ~dev-python/markupsafe-0.23
+~dev-python/mccabe-0.5.3
 dev-python/passlib
 ~dev-python/pathlib-1.0
 dev-python/pb-logging
@@ -132,6 +134,7 @@ dev-python/pb-logging
 ~dev-python/pillow-2.3.0
 ~dev-python/ply-3.9
 ~dev-python/pycairo-1.10.0
+~dev-python/pycodestyle-2.2.0
 ~dev-python/pycparser-2.17
 ~dev-python/pygments-1.6
 ~dev-python/pygobject-3.22.0

diff --git a/python-exec/python-exec.conf b/python-exec/python-exec.conf
index 12d6d3f9dcedcbefed65ac6a8801a00abefc9c38..7e4111b20db367815be6b3c63c9217e2de5ab3a3 100644 (file)
--- a/python-exec/python-exec.conf
+++ b/python-exec/python-exec.conf
@@ -25,5 +25,5 @@
 # to start.
 #
 # Note: this file can be modified by calls to 'eselect python'.
-python2.7
 python3.4
+python2.7