saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index fbb545eea509f438e5fae7bce4b69185aa753dcd..82b5c4f5a4b2352db795f42a4a802e610d520a44 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,5 +1,5 @@
 # Subscription configuration file for CUPS v2.0.3
-# Written by cupsd on 2016-02-08 19:42
+# Written by cupsd on 2016-02-09 19:42
 NextSubscriptionId 248
 <Subscription 246>
 Events all
@@ -7,14 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1455003990
+ExpirationTime 1455090330
 NextEventId 177
 </Subscription>
-<Subscription 247>
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted printer-modified job-state-changed job-created job-completed job-stopped job-progress
-Owner frank
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1455043342
-NextEventId 171
-</Subscription>

diff --git a/portage/package.mask b/portage/package.mask
index ddbcdc9dfa1749e4e0c6c00ed92695aa0bf9c1c8..b8a4eaba0f5e93bd00e0d9f9e2920c104c17501f 100644 (file)
--- a/portage/package.mask
+++ b/portage/package.mask
@@ -1,6 +1,8 @@
 #=app-emulation/virtualbox-5*
 
 # =gnome-extra/gucharmap-3.4.1.1
+
+=dev-java/oracle-jdk-bin-1.8.0.72-r1
 ~dev-java/sun-jre-bin-1.6.0.39
 ~dev-java/sun-jdk-1.6.0.39
 

diff --git a/portage/package.use b/portage/package.use
index c58d0ba51a2f347e179f57c7d1150bb5165535d0..40ef94f2f4d6f28ee4a9e8953fc368f38f8bc500 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -63,6 +63,7 @@ dev-cpp/gtkmm                         accessibility
 
 dev-db/libdbi                          -doc
 dev-db/libdbi-drivers                  -doc
+dev-db/mariadb                         -server
 dev-db/mysql                           cluster extraengine profiling xtradb
 dev-db/postgresql                      -server uuid xml
 dev-db/sqlite                          extensions fts3 secure-delete soundex unlock-notify
@@ -117,6 +118,7 @@ dev-python/stevedore                        -doc
 
 # move x11-libs/qt-core dev-qt/qtcore
 dev-qt/qtcore                          optimized-qmake
+dev-qt/qtwebkit                                -exceptions
 
 dev-ruby/hoe                           -doc
 dev-ruby/racc                          -doc