Current state

diff --git a/cups/printers.conf b/cups/printers.conf
index 8304b163ce4046581a0f540476dd71e7a0e6d1db..445dfb1ee1c8782a1ce18e547b0b84b13cb2b37d 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-08 08:32
+# Written by cupsd on 2012-02-15 08:16
 # 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 6774f088dadaeece0946e5d7f3d7bc43027eabc7..cc3babb78a02d3b8f65224537f3b81e87274ba4d 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-07 21:52
+# Written by cupsd on 2012-02-14 18:43
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 1925cdc51fbed40a3789989217aec49919deea87..296ddccfff93d8a4218e187eac7adb13b70dc383 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,3 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-03 04:12
-NextSubscriptionId 128
+# Written by cupsd on 2012-02-15 08:16
+NextSubscriptionId 130

diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O
index f2781e2593e50948bf28af2a9f0d09e5d19c9fe5..8fe0f129e94fcae0bf534e0afadd6eb037b18a5f 100644 (file)
--- a/cups/subscriptions.conf.O
+++ b/cups/subscriptions.conf.O
@@ -1,19 +1,11 @@
 # Subscription configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-02-01 21:51
-NextSubscriptionId 128
-<Subscription 126>
+# Written by cupsd on 2012-02-14 00:40
+NextSubscriptionId 130
+<Subscription 129>
 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner doris
+Owner frank
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1328206305
-NextEventId 649
-</Subscription>
-<Subscription 127>
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner doris
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1328214031
-NextEventId 649
+ExpirationTime 1329262791
+NextEventId 627
 </Subscription>

diff --git a/java-config-2/current-system-vm b/java-config-2/current-system-vm
index e98206a231269a24074efb4ba29e674ea0ef5433..ec0803890276c326ee684257cdc8370cb46b34c9 120000 (symlink)
--- a/java-config-2/current-system-vm
+++ b/java-config-2/current-system-vm
@@ -1 +1 @@
-/usr/lib/jvm//sun-jdk-1.6
\ No newline at end of file
+/usr/lib/jvm//oracle-jdk-bin-1.7
\ No newline at end of file

diff --git a/make.conf b/make.conf
index 99e44dc0985991a7bff742ef6dabf96ee35a0316..cd0277c1de4a440ea62dce5036b81eb3eb7b03d3 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -8,7 +8,7 @@ CXXFLAGS="${CFLAGS}"
 # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
 CHOST="x86_64-pc-linux-gnu"
 
-MAKEOPTS="-j7"
+MAKEOPTS="-j5"
 #MAKEOPTS="-j1"
 
 GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
@@ -34,7 +34,7 @@ ACCEPT_LICENSE=" \
        Oracle-BCLA-JavaSE \
 "
 
-EMERGE_DEFAULT_OPTS="--with-bdeps y "
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10"
 
 CONFIG_PROTECT="/usr/share/xsessions \
                 /var/www/localhost/htdocs/phpmyadmin \