From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 26 Feb 2018 16:19:36 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=ca063716416c7ec08f1b27c7511188a039f5ce1d;p=config%2Fbruni%2Fetc.git

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

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index f0e4ba30..e72ea857 100644
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,20 +1,12 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2018-02-25 11:17
+# Written by cupsd on 2018-02-26 11:21
 NextSubscriptionId 628
-<Subscription 626>
-Events printer-changed
-Owner root
-LeaseDuration 86400
-Interval 60
-ExpirationTime 1519640236
-NextEventId 1
-</Subscription>
 <Subscription 627>
 Events all
 Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1519640238
+ExpirationTime 1519726578
 NextEventId 1
 </Subscription>
diff --git a/portage/make.conf b/portage/make.conf
index 3a880c23..a03b3ee1 100644
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -73,7 +73,7 @@ L10N="de de-1901 en en-GB en-US ru vi"
 # These are the USE flags that were used in addition to what is provided by the
 # profile used for building.
 USE="3dnow 3dnowext X Xaw3d a52 aac aacs aalib acl acpi ads aim alsa altnburgcards 
-     amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cacert cairo caja
+     amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding brotli bzip2 cacert cairo caja
      calendar caps cdda cddb cdparanoia cdr cgi consolekit cpudetection cscope css ctype cups curl
      curlwrappers cvs dane dbase dbi dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples
      encode epub exif expat fam fastcgi ffmpeg fftw fits flac flatfile flickr fltk fluidsynth fontconfig
diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common
index 946c5bb7..8140ba25 100644
--- a/portage/package.accept_keywords/common
+++ b/portage/package.accept_keywords/common
@@ -106,6 +106,7 @@ net-im/skype
 ~net-libs/telepathy-accounts-signon-1.0
 ~net-libs/telepathy-logger-qt-15.04.0
 
+~net-misc/dropbox-43.3.47
 ~net-misc/ike-2.2.1
 
 # move net-misc/openfortivpn net-vpn/openfortivpn
diff --git a/portage/package.accept_keywords/firefox b/portage/package.accept_keywords/firefox
index 0605295d..d7d65163 100644
--- a/portage/package.accept_keywords/firefox
+++ b/portage/package.accept_keywords/firefox
@@ -1,6 +1,7 @@
 
 ~dev-lang/rust-1.16.0
 ~dev-lang/rust-1.19.0
+~dev-lang/rust-1.23.0
 
 ~dev-libs/nspr-4.15
 ~dev-libs/nspr-4.16
@@ -11,8 +12,10 @@
 ~dev-libs/nss-3.33
 ~dev-libs/nss-3.34.1
 
+
 ~dev-util/cargo-0.17.0
 ~dev-util/cargo-0.20.0
+~dev-util/cargo-0.24.0
 
 ~virtual/rust-1.19.0
 
diff --git a/portage/package.accept_keywords/mate b/portage/package.accept_keywords/mate
index 793f49ef..00723673 100644
--- a/portage/package.accept_keywords/mate
+++ b/portage/package.accept_keywords/mate
@@ -21,6 +21,7 @@
 # ~dev-libs/libmateweather-1.6.2
 # ~dev-libs/libmateweather-1.8.0
 ~dev-libs/libmateweather-1.18.0
+~dev-libs/libmateweather-1.18.2
 
 ~mate-base/caja-1.16.1
 ~mate-base/caja-1.18.3
@@ -61,6 +62,7 @@
 # ~mate-base/mate-panel-1.8.0
 ~mate-base/mate-panel-1.16.0
 ~mate-base/mate-panel-1.18.2
+~mate-base/mate-panel-1.18.7
 # ~mate-base/mate-session-manager-1.6.1
 # ~mate-base/mate-session-manager-1.8.1
 ~mate-base/mate-session-manager-1.16.0
@@ -105,6 +107,7 @@
 # ~mate-extra/mate-sensors-applet-1.6.1
 # ~mate-extra/mate-sensors-applet-1.8.0
 ~mate-extra/mate-sensors-applet-1.18.2
+~mate-extra/mate-sensors-applet-1.18.3
 # ~mate-extra/mate-system-monitor-1.6.1
 # ~mate-extra/mate-system-monitor-1.8.0
 ~mate-extra/mate-system-monitor-1.16.0
diff --git a/portage/package.mask b/portage/package.mask
index 9ff5ef91..cbfac6f9 100644
--- a/portage/package.mask
+++ b/portage/package.mask
@@ -20,6 +20,7 @@
 #=sys-libs/readline-7.0*
 
 =www-client/firefox-57*
+=www-client/firefox-58*
 =www-client/google-chrome-39.0.2171.99_p1
 
 ~www-plugins/adobe-flash-27.0.0.130
diff --git a/portage/package.unmask b/portage/package.unmask
index a0b6615c..5c5ebbe4 100644
--- a/portage/package.unmask
+++ b/portage/package.unmask
@@ -59,6 +59,8 @@ mate-extra/caja-dropbox::mate-overlay
 
 <net-analyzer/mate-netspeed-1.7::mate-overlay
 
+=net-libs/webkit-gtk-2.4.11-r1
+
 <net-wireless/mate-bluetooth-1.7::mate-overlay
 
 ~sys-kernel/gentoo-sources-4.14.8
diff --git a/portage/package.use b/portage/package.use
index 87aa02eb..25f16e4a 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -393,11 +393,12 @@ net-misc/vpnc				hybrid-auth
 
 net-nds/openldap			cxx experimental -minimal overlays syslog
 
-net-print/cups				-usb
+net-print/cups				pclm -usb
 net-print/hplip				cupsddk fax hpijs new-hpcups parport scanner
 
 net-vpn/openvpn				inotify
 
+net-wireless/bluez			user-session
 net-wireless/wpa_supplicant		-qt4 wps
 
 #dev-qt/designer				phonon
@@ -413,6 +414,7 @@ sys-apps/acl				nfs
 sys-apps/apt				apt-pkg largefile latex rpath utils
 sys-apps/busybox			math -pam savedconfig static
 # sys-apps/coreutils			xattr
+sys-apps/dbus				user-session
 sys-apps/etckeeper			cron
 sys-apps/gawk				mpfr
 sys-apps/net-tools			hostname
@@ -420,6 +422,7 @@ sys-apps/openrc				audit
 sys-apps/paludis			glsa inquisitio qa visibility
 sys-apps/pciutils			dns network-cron -zlib
 sys-apps/portage			epydoc native-extensions python3
+sys-apps/systemd			libidn2 -sysv-utils
 sys-apps/usbutils			network-cron
 sys-apps/util-linux			ddate loop-aes python_single_target_python3_5 tty-helpers