From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 20 Apr 2017 17:10:57 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1b727fe928d66d565156337fe2b58767df8fb820;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/cups/printers.conf b/cups/printers.conf
index 796abdec..cb6e5908 100644
--- 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-04-16 07:51
+# Written by cupsd on 2017-04-20 19:03
 # 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 3a099fe8..52d705f0 100644
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,6 +1,6 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-04-20 07:47
-NextSubscriptionId 391
+# Written by cupsd on 2017-04-20 19:03
+NextSubscriptionId 393
 <Subscription 390>
 Events all
 Owner anonymous
@@ -8,5 +8,22 @@ Recipient dbus://
 LeaseDuration 86400
 Interval 0
 ExpirationTime 1492753635
+NextEventId 2
+</Subscription>
+<Subscription 391>
+Events printer-changed
+Owner root
+LeaseDuration 86400
+Interval 60
+ExpirationTime 1492794187
+NextEventId 1
+</Subscription>
+<Subscription 392>
+Events all
+Owner anonymous
+Recipient dbus://
+LeaseDuration 86400
+Interval 0
+ExpirationTime 1492794187
 NextEventId 1
 </Subscription>
diff --git a/portage/make.conf b/portage/make.conf
index 9eb8b981..7d364b5c 100644
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -8,8 +8,8 @@ CXXFLAGS="${CFLAGS}"
 # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
 CHOST="x86_64-pc-linux-gnu"
 
-MAKEOPTS="-j3"
-#MAKEOPTS="-j1"
+#MAKEOPTS="-j3"
+MAKEOPTS="-j1"
 
 GENTOO_MIRRORS="http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
 #GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
@@ -43,8 +43,8 @@ ACCEPT_LICENSE=" \
 "
 
 #EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps y --quiet-build=y --jobs=4 --load-average=8"
-EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps y --quiet-build=y --jobs=4 --load-average=8 --ignore-built-slot-operator-deps=y"
-#EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps y --quiet-build=y --jobs=1 --load-average=5 --ignore-built-slot-operator-deps=y"
+#EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps y --quiet-build=y --jobs=4 --load-average=8 --ignore-built-slot-operator-deps=y"
+EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps y --quiet-build=y --jobs=1 --load-average=5 --ignore-built-slot-operator-deps=y"
 #EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps y --load-average=10 --ignore-built-slot-operator-deps=y"
 #EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps y"