saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/printers.conf b/cups/printers.conf
index 81145251d003dab7c18a972978320cdedcd135a8..1b5c3ead6f1915c2e12f45eb10687e33b46efc7d 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v2.0.3
-# Written by cupsd on 2016-05-06 13:40
+# Written by cupsd on 2016-05-09 10:22
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dcops_printer_Dell>
 UUID urn:uuid:c6594846-31d0-3260-51cb-c02cd7a18ef8
@@ -50,12 +50,15 @@ Attribute marker-change-time 1371800841
 </Printer>
 <Printer QA_printer>
 UUID urn:uuid:7b432b23-818f-3dbc-4746-b4890a0faec2
+AuthInfoRequired none
 Info 
 Location 
 MakeModel Generic PCL 6/PCL XL Printer - CUPS+Gutenprint v5.2.9
-DeviceURI ipp://192.168.87.73/ipp/
+DeviceURI ipp://192.168.91.81/ipp/
 State Idle
-StateTime 1462534837
+StateTime 1462782154
+Reason cups-ipp-conformance-failure-report
+Reason cups-ipp-missing-send-document
 Type 4116
 Accepting Yes
 Shared No
@@ -65,6 +68,13 @@ PageLimit 0
 KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
+Attribute marker-colors \#000000
+Attribute marker-levels 89
+Attribute marker-low-levels 10
+Attribute marker-high-levels 100
+Attribute marker-names Black Cartridge HP CE278A
+Attribute marker-types toner
+Attribute marker-change-time 1462782154
 </Printer>
 <Printer Support>
 UUID urn:uuid:db2c7a55-9b98-3d65-616b-231c535768da

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index aca316aaf2198a9be1242bb73c18591ff375ea26..81145251d003dab7c18a972978320cdedcd135a8 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,5 +1,5 @@
-# Printer configuration file for CUPS v2.0.1
-# Written by cupsd on 2015-04-01 10:16
+# Printer configuration file for CUPS v2.0.3
+# Written by cupsd on 2016-05-06 13:40
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dcops_printer_Dell>
 UUID urn:uuid:c6594846-31d0-3260-51cb-c02cd7a18ef8
@@ -22,7 +22,7 @@ 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-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
 </DefaultPrinter>
@@ -48,6 +48,24 @@ Attribute marker-names Black Toner,Fuser,Maintenance Kit
 Attribute marker-types toner,other,other
 Attribute marker-change-time 1371800841
 </Printer>
+<Printer QA_printer>
+UUID urn:uuid:7b432b23-818f-3dbc-4746-b4890a0faec2
+Info 
+Location 
+MakeModel Generic PCL 6/PCL XL Printer - CUPS+Gutenprint v5.2.9
+DeviceURI ipp://192.168.87.73/ipp/
+State Idle
+StateTime 1462534837
+Type 4116
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy stop-printer
+</Printer>
 <Printer Support>
 UUID urn:uuid:db2c7a55-9b98-3d65-616b-231c535768da
 AuthInfoRequired none

diff --git a/portage/package.keywords/common b/portage/package.keywords/common
index 930142d38ab72b1537ed94dd6629d3fbed3f5b51..f87322bccff8a5ad6e7bc1695d765f7541b27519 100644 (file)
--- a/portage/package.keywords/common
+++ b/portage/package.keywords/common
@@ -168,6 +168,11 @@ mail-client/thunderbird
 ~net-libs/webkit-gtk-2.6.6
 
 #~net-print/hplip-3.13.8
+# required by net-print/hplip-plugin-3.16.3::gentoo
+# required by net-print/hplip-plugin (argument)
+~net-print/hplip-3.16.3
+# required by net-print/hplip-plugin (argument)
+~net-print/hplip-plugin-3.16.3
 
 #~perl-core/Perl-OSType-1.3.0