saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 1440d91d82cf6d3980057e4706f1ef3fcecc04c0..411f102daf9857e01f6e5d795f01b9adf1ee4246 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,20 +1,12 @@
 # Subscription configuration file for CUPS v2.1.3
-# Written by cupsd on 2016-08-07 15:15
+# Written by cupsd on 2016-08-08 15:19
 NextSubscriptionId 291
-<Subscription 289>
-Events printer-changed
-Owner root
-LeaseDuration 86400
-Interval 60
-ExpirationTime 1470662118
-NextEventId 1
-</Subscription>
 <Subscription 290>
 Events all
 Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1470662118
+ExpirationTime 1470748459
 NextEventId 1
 </Subscription>

diff --git a/portage/package.keywords b/portage/package.keywords
index 2fcf91f907d5789069c62ed7841a81542e86d912..bdbc1c2697d43337eda3600fe93f8ecda156dc30 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -53,6 +53,7 @@ app-misc/ddate
 
 ~dev-db/sqlite-3.8.5
 ~dev-db/sqlite-3.9.2
+~dev-db/sqlite-3.13.0
 ~dev-db/virtuoso-odbc-6.1.4
 ~dev-db/virtuoso-server-6.1.4
 
@@ -93,6 +94,7 @@ app-misc/ddate
 ~dev-libs/nss-3.19.1
 ~dev-libs/nss-3.22.2
 ~dev-libs/nss-3.23
+~dev-libs/nss-3.25
 ~dev-libs/sgml-data-2.0.8
 ~dev-libs/xml-core-0.13_p2
 

diff --git a/portage/package.mask b/portage/package.mask
index b8a4eaba0f5e93bd00e0d9f9e2920c104c17501f..7e1fc089454b30ab857d83bbf6b37ab38d767606 100644 (file)
--- a/portage/package.mask
+++ b/portage/package.mask
@@ -11,6 +11,9 @@
 
 =media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r3
 
+#=media-libs/phonon-4.9.0
+#=media-libs/phonon-gstreamer-4.9.0
+
 =media-video/mplayer-1.2_pre20150214
 
 =www-client/google-chrome-39.0.2171.99_p1

diff --git a/portage/package.unmask b/portage/package.unmask
index 7076ad178b258d39a8699ece142af58af98a4072..237abaabd7f305ad20156870cb2cd8166083d05d 100644 (file)
--- a/portage/package.unmask
+++ b/portage/package.unmask
@@ -1,15 +1,23 @@
 ~x11-wm/mate-window-manager-1.6.2
 
 <app-admin/mate-system-tools-1.7::mate-overlay
+
 <app-arch/engrampa-1.7::mate-overlay
 <app-arch/mate-file-archiver-1.7::mate-overlay
+
 <app-editors/mate-text-editor-1.7::mate-overlay
 <app-editors/pluma-1.7::mate-overlay
+
 <app-text/atril-1.7::mate-overlay
 <app-text/mate-doc-utils-1.7::mate-overlay
 <app-text/mate-document-viewer-1.7::mate-overlay
+
 <dev-libs/libmateweather-1.7::mate-overlay
+
 <dev-python/python-caja-1.7::mate-overlay
+
+=dev-qt/qtwebkit-4.10.4
+
 <mate-base/caja-1.7::mate-overlay
 <mate-base/libmatekbd-1.7::mate-overlay
 <mate-base/libmatekeyring-1.7::mate-overlay
@@ -24,6 +32,7 @@
 <mate-base/mate-panel-1.7::mate-overlay
 <mate-base/mate-session-manager-1.7::mate-overlay
 <mate-base/mate-settings-daemon-1.7::mate-overlay
+
 mate-extra/caja-dropbox::mate-overlay
 <mate-extra/mate-calc-1.7::mate-overlay
 <mate-extra/mate-character-map-1.7::mate-overlay
@@ -40,17 +49,25 @@ mate-extra/caja-dropbox::mate-overlay
 <mate-extra/mate-system-monitor-1.7::mate-overlay
 <mate-extra/mate-user-share-1.7::mate-overlay
 <mate-extra/mate-utils-1.7::mate-overlay
+
 <media-gfx/eom-1.7::mate-overlay
 <media-gfx/mate-image-viewer-1.7::mate-overlay
+
 <net-analyzer/mate-netspeed-1.7::mate-overlay
+
 <net-wireless/mate-bluetooth-1.7::mate-overlay
+
 virtual/notification-daemon::mate-overlay
+
 x11-apps/fusion-icon::mate-overlay
 <x11-libs/libmatewnck-1.7::mate-overlay
+
 <x11-misc/mate-menu-editor-1.7::mate-overlay
 <x11-misc/mate-notification-daemon-1.7::mate-overlay
 <x11-misc/mozo-1.7::mate-overlay
+
 <x11-terms/mate-terminal-1.7::mate-overlay
+
 <x11-themes/mate-backgrounds-1.7::mate-overlay
 <x11-themes/mate-icon-theme-1.7::mate-overlay
 <x11-themes/mate-icon-theme-faenza-1.7::mate-overlay