saving uncommitted changes in /etc prior to emerge run

diff --git a/cups/printers.conf b/cups/printers.conf
index 9901be2ed69c9b1bc0242ad26a09471998beccb5..8304b163ce4046581a0f540476dd71e7a0e6d1db 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-04 19:00
+# Written by cupsd on 2012-02-08 08:32
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 5d8d28a8894de4a24fd69a11b4247ac692e4ddf9..6774f088dadaeece0946e5d7f3d7bc43027eabc7 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-03 04:12
+# Written by cupsd on 2012-02-07 21:52
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/portage/package.keywords b/portage/package.keywords
index 9aff133885e67f12659523f6cd161719b85a50c9..20d75928e0f753701dea5ccd00c6b2e0b83914b4 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -1,4 +1,7 @@
 
+~dev-java/java-sdk-docs-1.7.0.2
+~dev-java/oracle-jdk-bin-1.7.0.2
+~dev-java/oracle-jre-bin-1.7.0.2
 ~dev-java/sun-jdk-1.6.0.30
 ~dev-java/sun-jre-bin-1.6.0.30
 

diff --git a/resolv.conf b/resolv.conf
index 93a7dfadf607aaf4b24cc98f5925edcdb85f8f68..9a19004eeb4283acd8151efac7b1bed74b6488ab 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,6 +1,4 @@
-# Hand made by Frank Brehm
+# Generated by net-scripts for interface eth0
 domain brehm-online.com
-search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de profitbricks.localdomain dc1.de.profitbricks.net
-#nameserver 10.12.11.1
-nameserver 192.168.178.30
-nameserver 192.168.178.85
+search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
+nameserver 10.12.11.1