From: Frank Brehm Date: Tue, 9 Feb 2016 23:06:03 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1ace8631cf2c86a8311df3d34bc2171f08c35fa2;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 fbb545ee..82b5c4f5 100644 --- 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 Events all @@ -7,14 +7,6 @@ Owner anonymous Recipient dbus:// LeaseDuration 86400 Interval 0 -ExpirationTime 1455003990 +ExpirationTime 1455090330 NextEventId 177 - -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 - diff --git a/portage/package.mask b/portage/package.mask index ddbcdc9d..b8a4eaba 100644 --- 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 c58d0ba5..40ef94f2 100644 --- 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