saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/printers.conf b/cups/printers.conf
index 99cd561772020c2771ba8ccef45f9dca75a5bd26..51313fb6ce86b2fcac27bf047f7cd3885f4bad1a 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-06-05 09:10
+# Written by cupsd on 2017-06-08 07:08
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 56dfa6f8120c928028dde19449e2238ef1d970f3..f77e43992cff3a4260186e8052c0f986c286279a 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,12 +1,20 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-06-07 09:08
-NextSubscriptionId 448
-<Subscription 447>
+# Written by cupsd on 2017-06-08 07:08
+NextSubscriptionId 450
+<Subscription 448>
+Events printer-changed
+Owner root
+LeaseDuration 86400
+Interval 60
+ExpirationTime 1496984902
+NextEventId 1
+</Subscription>
+<Subscription 449>
 Events all
 Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1496905680
+ExpirationTime 1496984902
 NextEventId 1
 </Subscription>

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

diff --git a/python-exec/python-exec.conf b/python-exec/python-exec.conf
index 7e4111b20db367815be6b3c63c9217e2de5ab3a3..12d6d3f9dcedcbefed65ac6a8801a00abefc9c38 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'.
-python3.4
 python2.7
+python3.4