From bb3e2a7070d9ec11c6765348bc5282163ef18110 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 24 Jan 2017 21:45:58 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- cups/subscriptions.conf | 4 ++-- portage/make.conf | 2 +- portage/package.use | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 4693a6e2..cb51a704 100644 --- 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 Events all @@ -7,6 +7,6 @@ Owner anonymous Recipient dbus:// LeaseDuration 86400 Interval 0 -ExpirationTime 1485242159 +ExpirationTime 1485328499 NextEventId 1 diff --git a/portage/make.conf b/portage/make.conf index 3ea87497..21940d58 100644 --- 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 4351f362..46e7764f 100644 --- 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 -- 2.39.5