saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 4693a6e2dc7750ef222d60260e4bf10fb991f91b..cb51a704991a8f7b93282dde16eb6c7c5c550263 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,5 +1,5 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-01-23 08:16
+# Written by cupsd on 2017-01-24 08:15
 NextSubscriptionId 337
 <Subscription 336>
 Events all
@@ -7,6 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1485242159
+ExpirationTime 1485328499
 NextEventId 1
 </Subscription>

diff --git a/portage/make.conf b/portage/make.conf
index 3ea874970f747fca92903b5129deee60bd0fc7c4..21940d580d0ece407f75e98dd3a37baa40fe366c 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -71,7 +71,7 @@ L10N="de 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 aalib acl acpi ads aim alsa altnburgcards 
+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
      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

diff --git a/portage/package.use b/portage/package.use
index 4351f362cacee32ad80a634b2201ff7b436ce66b..46e7764f1e697dbc700c4f4933d4669fa3b14e6c 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -39,6 +39,7 @@ app-eselect/eselect-php                       fpm
 app-i18n/ibus                          dconf
 
 app-misc/beagle                                chm ole thunderbird
+app-misc/ca-certificates               insecure_certs
 app-misc/mc                            sftp
 app-misc/strigi                                hyperestraier inotify
 app-misc/tomboy                                galago
@@ -77,7 +78,7 @@ dev-java/ant-tasks                    javamail
 dev-java/commons-logging               log4j
 #dev-java/jdbc-mysql                   c3p0
 dev-java/log4j                         javamail
-dev-java/oracle-jdk-bin                 -doc -examples javafx
+dev-java/oracle-jdk-bin                 commercial -doc -examples javafx
 dev-java/sun-jdk                       -doc jce
 
 dev-lang/perl                          ithreads perlsuid
@@ -126,7 +127,9 @@ dev-python/stevedore                        -doc
 
 dev-qt/qtmultimedia                    qml
 dev-qt/qtcore                          optimized-qmake
+dev-qt/qtgui                           egl
 dev-qt/qtscript                                scripttools
+dev-qt/qtwayland                       egl
 dev-qt/qtwebkit                                -exceptions
 
 dev-ruby/hoe                           -doc
@@ -245,6 +248,7 @@ media-libs/freetype                 infinality utils
 # media-libs/gd                                fontconfig
 media-libs/gegl                                -ffmpeg graphviz raw
 media-libs/giflib                      rle
+media-libs/libbluray                   bdplus udf
 media-libs/libcaca                     -doc
 media-libs/libgphoto2                  -zeroconf
 media-libs/libmediaart                 -qt5
@@ -301,7 +305,7 @@ net-analyzer/wireshark                      adns doc-pdf gcrypt profile smi
 net-dialup/freeradius                  edirectory frascend frxp
 
 net-dns/avahi                          autoipd howl-compat mdnsresponder-compat
-net-dns/bind                           dlz fetchlimit geoip gssapi -mysql -odbc pkcs11 resolvconf sit urandom
+net-dns/bind                           dlz dnstap fetchlimit geoip gssapi -mysql -odbc pkcs11 resolvconf sit urandom
 net-dns/bind-tools                     gssapi pkcs11 urandom
 net-dns/unbound                                dnstap