From 7bf955367d62437422c02f81a8f8e664c68de6d0 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 8 Aug 2016 17:10:14 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- cups/printers.conf | 8 +++--- cups/printers.conf.O | 49 +-------------------------------- portage/make.conf | 6 ++-- portage/package.keywords/common | 2 ++ portage/package.use | 9 ++++-- 5 files changed, 16 insertions(+), 58 deletions(-) diff --git a/cups/printers.conf b/cups/printers.conf index 9a11109..f53f8c2 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,15 +1,15 @@ -# Printer configuration file for CUPS v2.0.3 -# Written by cupsd on 2016-05-09 10:44 +# Printer configuration file for CUPS v2.1.3 +# Written by cupsd on 2016-08-08 13:49 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:7b432b23-818f-3dbc-4746-b4890a0faec2 AuthInfoRequired none -Info -Location +Info QA_printer MakeModel Generic PCL 6/PCL XL Printer - CUPS+Gutenprint v5.2.9 DeviceURI ipp://192.168.91.81/ipp/ State Idle StateTime 1462782154 +ConfigTime 1470656953 Reason cups-ipp-conformance-failure-report Reason cups-ipp-missing-send-document Type 4116 diff --git a/cups/printers.conf.O b/cups/printers.conf.O index cb4f091..9a11109 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,31 +1,6 @@ # Printer configuration file for CUPS v2.0.3 -# Written by cupsd on 2016-05-09 10:43 +# Written by cupsd on 2016-05-09 10:44 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING - -UUID urn:uuid:c6594846-31d0-3260-51cb-c02cd7a18ef8 -AuthInfoRequired none -Info Printer Dcops - Dell B2375dnf Mono MFP -Location Dcops -DeviceURI ipp://192.168.88.100/ipp/print -State Idle -StateTime 1427876134 -Type 8392788 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy stop-printer -Attribute marker-colors \#000000,none,none,none,none,none,none,none,none -Attribute marker-levels 98,99,99,99,99,100,100,100,100 -Attribute marker-low-levels 5 -Attribute marker-high-levels 100 -Attribute marker-names Black Toner Cartridge S/N:CRUM-14042399481,Fuser ,Transfer Roller ,Tray 1 Roller ,Tray 1 Retard Roller ,MP Roller ,MP Retard Roller ,ADF Roller ,ADF Rubber Pad -Attribute marker-types toner,fuser,other,other,other,other,other,other,other -Attribute marker-change-time 1427876131 - UUID urn:uuid:7b432b23-818f-3dbc-4746-b4890a0faec2 AuthInfoRequired none @@ -54,25 +29,3 @@ Attribute marker-names Black Cartridge HP CE278A Attribute marker-types toner Attribute marker-change-time 1462782154 - -UUID urn:uuid:db2c7a55-9b98-3d65-616b-231c535768da -AuthInfoRequired none -Info Support Printer - Dell 2330dn -DeviceURI ipp://192.168.80.4/ipp -State Idle -StateTime 1404458435 -Type 8425692 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy stop-printer -Attribute marker-colors \#000000,none,none -Attribute marker-levels 90,79,-1 -Attribute marker-names Black Toner,Fuser,Maintenance Kit -Attribute marker-types toner,other,other -Attribute marker-change-time 1404458435 - diff --git a/portage/make.conf b/portage/make.conf index 644b931..b45d63c 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -11,7 +11,7 @@ CHOST="x86_64-pc-linux-gnu" # profile used for building. USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \ - bazaar bluray caja calendar caps cddb cdparanoia cgi cpudetection cscope \ + bazaar bluray caja cacert calendar caps cddb cdparanoia cgi cpudetection cscope \ css ctype curl curlwrappers cvs dane dbase dga djvu dv dvb dvdread \ examples expat fastcgi ffmpeg fftw fits flatfile flickr fltk fontconfig \ foomaticdb ftp fuse gconf gd geoip ggi gimp git git glade glib gmp gnustep gost \ @@ -26,10 +26,10 @@ USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \ plotutils posix postgres postscript projectm python qt5 quicktime rdesktop \ rle sasl sctp semantic-desktop sharedmem sid simplexml sip slang slp smtp sndfile \ snmp soap sockets sox speex sqlite sqlite3 srtp \ - sse sse2 ssh subversion sysvipc tetex theora threads thumbnail tidy \ + sse sse2 ssh subversion sysvipc t1lib tetex theora threads thumbnail tidy \ timidity tools twolame v4l v4l2 vcd video vim-syntax wav wavpack \ wddx webdav webkit wma wmf xattr xcomposite xface xft xine xmlrpc \ - xmp xosd xpm xprint xscreensaver xsl xulrunner yahoo yaz yv12 zeroconf" + xmp xosd xpm xprint xps xscreensaver xsl xulrunner yahoo yaz yv12 zeroconf" ABI_X86="64 32" diff --git a/portage/package.keywords/common b/portage/package.keywords/common index 120eecc..bd84da2 100644 --- a/portage/package.keywords/common +++ b/portage/package.keywords/common @@ -38,6 +38,7 @@ app-text/docbook2odf-xsl-stylesheets #~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 @@ -70,6 +71,7 @@ app-text/docbook2odf-xsl-stylesheets ~dev-libs/nss-3.19.1 ~dev-libs/nss-3.22.2 ~dev-libs/nss-3.23 +~dev-libs/nss-3.25 #~dev-perl/Email-Sender-0.110.5 ~dev-perl/Nagios-Plugin-0.360.0 diff --git a/portage/package.use b/portage/package.use index 9d5cedf..d24c524 100644 --- a/portage/package.use +++ b/portage/package.use @@ -3,6 +3,7 @@ app-admin/rsyslog normalize omudpspoof relp rfc3195 rfc5424hmac snmp usertools app-admin/syslog-ng dbi spoof-source sql app-arch/cabextract extra-tools +app-arch/engrampa magic app-arch/unzip natspec app-arch/zip natspec @@ -34,7 +35,7 @@ app-misc/tracker -ffmpeg -xine app-misc/tomboy galago app-office/akonadi-server -postgres soprano -app-office/libreoffice collada gltf nlpsolver vlc +app-office/libreoffice collada gltf google nlpsolver vlc app-portage/eix optimization strong-optimization @@ -42,6 +43,7 @@ app-shells/bash plugins app-shells/tcsh catalogs app-text/asciidoc python_single_target_python2_7 +app-text/atril epub app-text/djvu doc threads app-text/docbook-sgml-utils jadetex app-text/enchant aspell -zemberek @@ -164,7 +166,7 @@ games-misc/fortune-mod-slackware offensive gnome-base/gdm remote gnome-base/gnome-volume-manager consolekit -gnome-base/gvfs gdu +gnome-base/gvfs gdu google gnome-base/libglade python_single_target_python2_7 gnome-base/nautilus -tracker @@ -206,7 +208,8 @@ mail-client/nail net mail-mta/postfix memcached -vda -mate-extra/caja-extensions image-converter pidgin share upnp +mate-extra/caja-extensions gksu image-converter pidgin share upnp +mate-extra/mate-polkit accountsservice appindicator media-fonts/corefonts tahoma media-fonts/terminus-font distinct-l -- 2.39.5