From: frank <frank@bruni.home.brehm-online.com>
Date: Mon, 23 Apr 2012 21:36:06 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=80024496c96e7b752aebdaa7ccb8462ed3a11e49;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/apache2/modules.d/._cfg0000_00_apache_manual.conf b/apache2/modules.d/._cfg0000_00_apache_manual.conf
deleted file mode 100644
index c08b2a62..00000000
--- a/apache2/modules.d/._cfg0000_00_apache_manual.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Provide access to the documentation on your server as
-#  http://yourserver.example.com/manual/
-# The documentation is always available at
-#  http://httpd.apache.org/docs/2.2/
-<IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
-
-<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
-	Options Indexes
-	AllowOverride None
-	Order allow,deny
-	Allow from all
-
-	<Files *.html>
-		SetHandler type-map
-	</Files>
-
-	SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
-	RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
-
-	LanguagePriority en de es fr ja ko pt-br
-	ForceLanguagePriority Prefer Fallback
-</Directory>
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index 25de5d12..c08b2a62 100644
--- a/apache2/modules.d/00_apache_manual.conf
+++ b/apache2/modules.d/00_apache_manual.conf
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.22/manual">
+<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
 	Options Indexes
 	AllowOverride None
 	Order allow,deny
diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf b/config-archive/etc/apache2/modules.d/00_apache_manual.conf
index a1bfed25..25de5d12 100644
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.21-r1/manual">
+<Directory "/usr/share/doc/apache-2.2.22/manual">
 	Options Indexes
 	AllowOverride None
 	Order allow,deny
diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1 b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1
new file mode 100644
index 00000000..a1bfed25
--- /dev/null
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.1
@@ -0,0 +1,26 @@
+# Provide access to the documentation on your server as
+#  http://yourserver.example.com/manual/
+# The documentation is always available at
+#  http://httpd.apache.org/docs/2.2/
+<IfDefine MANUAL>
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.21-r1/manual$1"
+
+<Directory "/usr/share/doc/apache-2.2.21-r1/manual">
+	Options Indexes
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+
+	<Files *.html>
+		SetHandler type-map
+	</Files>
+
+	SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
+	RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
+
+	LanguagePriority en de es fr ja ko pt-br
+	ForceLanguagePriority Prefer Fallback
+</Directory>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist
index 25de5d12..c08b2a62 100644
--- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist
+++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist
@@ -3,9 +3,9 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
 
-<Directory "/usr/share/doc/apache-2.2.22/manual">
+<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
 	Options Indexes
 	AllowOverride None
 	Order allow,deny
diff --git a/config-archive/etc/cupshelpers/preferreddrivers.xml b/config-archive/etc/cupshelpers/preferreddrivers.xml
new file mode 100644
index 00000000..e8097feb
--- /dev/null
+++ b/config-archive/etc/cupshelpers/preferreddrivers.xml
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<preferreddrivers>
+  <drivertypes>
+    <!-- GENERIC DRIVERS -->
+    <drivertype name="generic-foomatic-recommended">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+      <deviceid>
+	<field name="DRV" match=".*,?R1"/>
+      </deviceid>
+      <fit>
+	generic
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-escp">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):Generic-ESC_P"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-escp">
+      <ppdname match="drv:///sample.drv/epson(9|24).ppd"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-postscript">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PostScript Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-pcl6">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PCL 6 Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-pcl5e">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PCL 5e Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-pcl5">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PCL 5 Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-pcl">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PCL Laser Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic">
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <!-- END OF GENERIC DRIVERS -->
+    <!-- now fit is either exact-cmd, exact, or close -->
+
+    <drivertype name="cups">
+      <ppdname match="drv:///sample.drv/"/>
+    </drivertype>
+
+    <drivertype name="ghostscript">
+      <attribute name="ppd-product" match=".*Ghostscript"/>
+    </drivertype>
+
+    <drivertype name="gutenprint-simplified">
+      <ppdname match="gutenprint.*:.*/simple|.*-gutenprint.*\.sim"/>
+    </drivertype>
+
+    <drivertype name="gutenprint-expert">
+      <ppdname match="gutenprint.*:|.*-gutenprint"/>
+    </drivertype>
+
+    <drivertype name="foomatic-recommended-hpijs">
+      <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
+      <deviceid>
+	<field name="DRV" match=".*,?R1"/>
+      </deviceid>
+    </drivertype>
+
+    <drivertype name="foomatic-hpijs">
+      <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
+    </drivertype>
+
+    <drivertype name="foomatic-recommended-postscript">
+      <ppdname match="foomatic(-db-compressed-ppds)?:"/>
+      <attribute name="ppd-make-and-model" match=".*Postscript"/>
+      <deviceid>
+	<field name="DRV" match=".*,?R1"/>
+      </deviceid>
+    </drivertype>
+
+    <drivertype name="foomatic-postscript">
+      <ppdname match="foomatic(-db-compressed-ppds)?:.*-Postscript"/>
+    </drivertype>
+
+    <drivertype name="foomatic-pxlmono">
+      <!-- Treat this one specially because of the size of the output
+           it generates (see bug #661814) -->
+      <attribute name="ppd-make-and-model" match=".* Foomatic/pxlmono"/>
+    </drivertype>
+
+    <drivertype name="foomatic-recommended-nonpostscript">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+      <deviceid>
+	<field name="DRV" match=".*,?R1"/>
+      </deviceid>
+    </drivertype>
+
+    <drivertype name="foomatic-gutenprint">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):.*-gutenprint"/>
+    </drivertype>
+
+    <drivertype name="foomatic">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+    </drivertype>
+
+    <drivertype name="hpcups-plugin">
+      <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
+      <attribute name="ppd-make-and-model" match=".* plugin"/>
+    </drivertype>
+
+    <drivertype name="hpcups">
+      <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
+    </drivertype>
+
+    <drivertype name="hpijs-plugin">
+      <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
+      <attribute name="ppd-make-and-model" match=".* plugin"/>
+    </drivertype>
+
+    <drivertype name="hpijs">
+      <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
+    </drivertype>
+
+    <drivertype name="splix">
+      <ppdname match=".*splix"/>
+    </drivertype>
+
+    <drivertype name="turboprint">
+      <ppdname match=".*turboprint"/>
+    </drivertype>
+
+    <drivertype name="manufacturer-ricoh-ps">
+      <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PS/"/>
+    </drivertype>
+
+    <drivertype name="manufacturer-ricoh-pxl">
+      <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PXL/"/>
+    </drivertype>
+
+    <drivertype name="manufacturer-cmd">
+      <fit>
+	exact-cmd
+      </fit>
+    </drivertype>
+
+    <!-- Catch-all -->
+    <drivertype name="manufacturer"/>
+  </drivertypes>
+
+  <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- This is where the types are arranged into the preferred order -->
+  <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+  <preferenceorder>
+    <!-- gutenprint is no good on the Brother HL-2030 (bug #645993) -->
+    <printer>
+      <make-and-model match="Brother HL-2030"/>
+      <deviceid>
+	<field name="MFG" match="Brother"/>
+	<field name="MDL" match="HL-2030"/>
+      </deviceid>
+      <blacklist>
+	<drivertype>gutenprint*</drivertype>
+      </blacklist>
+    </printer>
+
+    <!-- Ricoh family printers should use manufacturer's own PPD
+         files, with PostScript versions in preference to PXL versions
+	 (bug #550315 comment #8)
+         -->
+    <printer>
+      <make-and-model
+	  match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG) "/>
+      <deviceid>
+	<field name="MFG"
+	       match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)"/>
+      </deviceid>
+      <drivers>
+	<drivertype>manufacturer-ricoh-ps</drivertype>
+	<drivertype>manufacturer-ricoh-pxl</drivertype>
+      </drivers>
+    </printer>
+
+    <!-- HP LaserJet 2100 series: avoid using PostScript for these
+         models because they only understand PS level 2 (bug
+         #710231). -->
+    <printer>
+      <make-and-model
+	  match="(Hewlett-Packard|HP) LaserJet 2100 Series"/>
+      <deviceid>
+	<field name="MFG" match="(HP|Hewlett-Packard)"/>
+	<field name="MDL" match="HP LaserJet 2100 Series"/>
+      </deviceid>
+      <avoid>
+	<drivertype>*-postscript</drivertype>
+      </avoid>
+    </printer>
+
+    <!-- The gutenprint driver for the Xerox 6250DP is black and
+         white, so prefer other drivers (LP #669152) -->
+    <printer>
+      <make-and-model match="Xerox 6250DP"/>
+      <deviceid>
+	<field name="MFG" match="Xerox"/>
+	<field name="MDL" match="6250DP"/>
+      </deviceid>
+      <avoid>
+	<drivertype>gutenprint*</drivertype>
+      </avoid>
+    </printer>
+
+    <printer>
+      <!-- For all printers -->
+      <drivers>
+	<drivertype>manufacturer-cmd</drivertype>
+	<drivertype>foomatic-recommended-hpijs</drivertype>
+	<drivertype>foomatic-recommended-nonpostscript</drivertype>
+	<drivertype>manufacturer*</drivertype>
+	<drivertype>foomatic-recommended-postscript</drivertype>
+	<drivertype>foomatic-postscript</drivertype>
+	<drivertype>hpcups</drivertype>
+	<drivertype>hpijs</drivertype>
+      </drivers>
+    </printer>
+
+    <printer>
+      <!-- Use hpijs on HP printers at this point (i.e. in preference
+           to gutenprint) -->
+      <make-and-model match="(HP|Hewlett-Packard) "/>
+      <deviceid>
+	<field name="MFG" match="HP|Hewlett-Packard"/>
+      </deviceid>
+      <drivers>
+	<drivertype>foomatic-hpijs</drivertype>
+      </drivers>
+    </printer>
+
+    <printer>
+      <!-- For all printers (continued) -->
+      <drivers>
+	<drivertype>splix</drivertype>
+	<drivertype>gutenprint-simplified</drivertype>
+	<drivertype>gutenprint-expert</drivertype>
+	<drivertype>foomatic-hpijs</drivertype>
+	<drivertype>foomatic-gutenprint</drivertype>
+	<drivertype>foomatic</drivertype>
+	<drivertype>cups</drivertype>
+
+	<!-- Generic drivers listed last, in this order -->
+	<drivertype>generic-postscript</drivertype>
+	<drivertype>generic-foomatic-recommended</drivertype>
+	<drivertype>generic-pcl6</drivertype>
+	<drivertype>generic-pcl5c</drivertype>
+	<drivertype>generic-pcl5e</drivertype>
+	<drivertype>generic-pcl5</drivertype>
+	<drivertype>generic-pcl</drivertype>
+	<drivertype>foomatic-pxlmono</drivertype>
+	<drivertype>generic-escp</drivertype>
+	<drivertype>ghostscript</drivertype>
+	<drivertype>generic</drivertype>
+
+	<!-- Last of all, 3rd party non-free drivers -->
+	<drivertype>hpcups-plugin</drivertype>
+	<drivertype>hpijs-plugin</drivertype>
+	<drivertype>turboprint</drivertype>
+      </drivers>
+    </printer>
+  </preferenceorder>
+</preferreddrivers>
diff --git a/config-archive/etc/cupshelpers/preferreddrivers.xml.dist b/config-archive/etc/cupshelpers/preferreddrivers.xml.dist
new file mode 100644
index 00000000..31052b9e
--- /dev/null
+++ b/config-archive/etc/cupshelpers/preferreddrivers.xml.dist
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<preferreddrivers>
+  <drivertypes>
+    <!-- GENERIC DRIVERS -->
+    <drivertype name="generic-foomatic-recommended">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+      <deviceid>
+	<field name="DRV" match=".*,?R1"/>
+      </deviceid>
+      <fit>
+	generic
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-escp">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):Generic-ESC_P"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-escp">
+      <ppdname match="drv:///sample.drv/epson(9|24).ppd"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-postscript">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PostScript Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-pcl6">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PCL 6 Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-pcl5e">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PCL 5e Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-pcl5">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PCL 5 Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic-pcl">
+      <attribute name="ppd-make-and-model"
+		 match="Generic PCL Laser Printer"/>
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <drivertype name="generic">
+      <fit>
+	generic
+	none
+      </fit>
+    </drivertype>
+
+    <!-- END OF GENERIC DRIVERS -->
+    <!-- now fit is either exact-cmd, exact, or close -->
+
+    <drivertype name="cups">
+      <ppdname match="drv:///sample.drv/"/>
+    </drivertype>
+
+    <drivertype name="ghostscript">
+      <attribute name="ppd-product" match=".*Ghostscript"/>
+    </drivertype>
+
+    <drivertype name="gutenprint-simplified">
+      <ppdname match="gutenprint.*:.*/simple|.*-gutenprint.*\.sim"/>
+    </drivertype>
+
+    <drivertype name="gutenprint-expert">
+      <ppdname match="gutenprint.*:|.*-gutenprint"/>
+    </drivertype>
+
+    <drivertype name="foomatic-recommended-hpijs">
+      <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
+      <deviceid>
+	<field name="DRV" match=".*,?R1"/>
+      </deviceid>
+    </drivertype>
+
+    <drivertype name="foomatic-hpijs">
+      <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
+    </drivertype>
+
+    <drivertype name="foomatic-recommended-postscript">
+      <ppdname match="foomatic(-db-compressed-ppds)?:"/>
+      <attribute name="ppd-make-and-model" match=".*Postscript"/>
+      <deviceid>
+	<field name="DRV" match=".*,?R1"/>
+      </deviceid>
+    </drivertype>
+
+    <drivertype name="foomatic-postscript">
+      <ppdname match="foomatic(-db-compressed-ppds)?:.*-Postscript"/>
+    </drivertype>
+
+    <drivertype name="foomatic-recommended-nonpostscript">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+      <deviceid>
+	<field name="DRV" match=".*,?R1"/>
+      </deviceid>
+    </drivertype>
+
+    <drivertype name="foomatic-gutenprint">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):.*-gutenprint"/>
+    </drivertype>
+
+    <drivertype name="foomatic">
+      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
+    </drivertype>
+
+    <drivertype name="hpcups-plugin">
+      <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
+      <attribute name="ppd-make-and-model" match=".* plugin"/>
+    </drivertype>
+
+    <drivertype name="hpcups">
+      <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
+    </drivertype>
+
+    <drivertype name="hpijs-plugin">
+      <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
+      <attribute name="ppd-make-and-model" match=".* plugin"/>
+    </drivertype>
+
+    <drivertype name="hpijs">
+      <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
+    </drivertype>
+
+    <drivertype name="splix">
+      <ppdname match=".*splix"/>
+    </drivertype>
+
+    <drivertype name="turboprint">
+      <ppdname match=".*turboprint"/>
+    </drivertype>
+
+    <drivertype name="manufacturer-ricoh-ps">
+      <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PS/"/>
+    </drivertype>
+
+    <drivertype name="manufacturer-ricoh-pxl">
+      <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PXL/"/>
+    </drivertype>
+
+    <drivertype name="manufacturer-cmd">
+      <fit>
+	exact-cmd
+      </fit>
+    </drivertype>
+
+    <!-- Catch-all -->
+    <drivertype name="manufacturer"/>
+  </drivertypes>
+
+  <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- This is where the types are arranged into the preferred order -->
+  <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+  <preferenceorder>
+    <!-- gutenprint is no good on the Brother HL-2030 (bug #645993) -->
+    <printer>
+      <make-and-model match="Brother HL-2030"/>
+      <deviceid>
+	<field name="MFG" match="Brother"/>
+	<field name="MDL" match="HL-2030"/>
+      </deviceid>
+      <blacklist>
+	<drivertype>gutenprint*</drivertype>
+      </blacklist>
+    </printer>
+
+    <!-- Ricoh family printers should use manufacturer's own PPD
+         files, with PostScript versions in preference to PXL versions
+	 (bug #550315 comment #8)
+         -->
+    <printer>
+      <make-and-model
+	  match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG) "/>
+      <deviceid>
+	<field name="MFG"
+	       match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)"/>
+      </deviceid>
+      <drivers>
+	<drivertype>manufacturer-ricoh-ps</drivertype>
+	<drivertype>manufacturer-ricoh-pxl</drivertype>
+      </drivers>
+    </printer>
+
+    <!-- HP LaserJet 2100 series: avoid using PostScript for these
+         models because they only understand PS level 2 (bug
+         #710231). -->
+    <printer>
+      <make-and-model
+	  match="(Hewlett-Packard|HP) LaserJet 2100 Series"/>
+      <deviceid>
+	<field name="MFG" match="(HP|Hewlett-Packard)"/>
+	<field name="MDL" match="HP LaserJet 2100 Series"/>
+      </deviceid>
+      <avoid>
+	<drivertype>*-postscript</drivertype>
+      </avoid>
+    </printer>
+
+    <!-- The gutenprint driver for the Xerox 6250DP is black and
+         white, so prefer other drivers (LP #669152) -->
+    <printer>
+      <make-and-model match="Xerox 6250DP"/>
+      <deviceid>
+	<field name="MFG" match="Xerox"/>
+	<field name="MDL" match="6250DP"/>
+      </deviceid>
+      <avoid>
+	<drivertype>gutenprint*</drivertype>
+      </avoid>
+    </printer>
+
+    <printer>
+      <!-- For all printers -->
+      <drivers>
+	<drivertype>manufacturer-cmd</drivertype>
+	<drivertype>foomatic-recommended-hpijs</drivertype>
+	<drivertype>foomatic-recommended-nonpostscript</drivertype>
+	<drivertype>manufacturer*</drivertype>
+	<drivertype>foomatic-recommended-postscript</drivertype>
+	<drivertype>foomatic-postscript</drivertype>
+	<drivertype>hpcups</drivertype>
+	<drivertype>hpijs</drivertype>
+      </drivers>
+    </printer>
+
+    <printer>
+      <!-- Use hpijs on HP printers at this point (i.e. in preference
+           to gutenprint) -->
+      <make-and-model match="(HP|Hewlett-Packard) "/>
+      <deviceid>
+	<field name="MFG" match="HP|Hewlett-Packard"/>
+      </deviceid>
+      <drivers>
+	<drivertype>foomatic-hpijs</drivertype>
+      </drivers>
+    </printer>
+
+    <printer>
+      <!-- For all printers (continued) -->
+      <drivers>
+	<drivertype>splix</drivertype>
+	<drivertype>gutenprint-simplified</drivertype>
+	<drivertype>gutenprint-expert</drivertype>
+	<drivertype>foomatic-hpijs</drivertype>
+	<drivertype>foomatic-gutenprint</drivertype>
+	<drivertype>foomatic</drivertype>
+	<drivertype>cups</drivertype>
+
+	<!-- Generic drivers listed last, in this order -->
+	<drivertype>generic-postscript</drivertype>
+	<drivertype>generic-foomatic-recommended</drivertype>
+	<drivertype>generic-pcl6</drivertype>
+	<drivertype>generic-pcl5c</drivertype>
+	<drivertype>generic-pcl5e</drivertype>
+	<drivertype>generic-pcl5</drivertype>
+	<drivertype>generic-pcl</drivertype>
+	<drivertype>generic-escp</drivertype>
+	<drivertype>ghostscript</drivertype>
+	<drivertype>generic</drivertype>
+
+	<!-- Last of all, 3rd party non-free drivers -->
+	<drivertype>hpcups-plugin</drivertype>
+	<drivertype>hpijs-plugin</drivertype>
+	<drivertype>turboprint</drivertype>
+      </drivers>
+    </printer>
+  </preferenceorder>
+</preferreddrivers>
diff --git a/config-archive/etc/init.d/nscd b/config-archive/etc/init.d/nscd
new file mode 100755
index 00000000..70fb3ea5
--- /dev/null
+++ b/config-archive/etc/init.d/nscd
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.3 2009/09/18 12:29:46 flameeyes Exp $
+
+depend() {
+	use dns ldap net slapd
+}
+
+checkconfig() {
+	if [ ! -d /var/run/nscd ] ; then
+		mkdir -p /var/run/nscd
+		chmod 755 /var/run/nscd
+	fi
+	if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
+		echo ""
+		ewarn "nscd run dir is not world readable, you should reset the perms:"
+		ewarn "chmod 755 /var/run/nscd"
+		ewarn "chmod a+rw /var/run/nscd/socket"
+		echo ""
+		ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
+		echo ""
+	fi
+}
+
+start() {
+	checkconfig
+
+	ebegin "Starting Name Service Cache Daemon"
+	local secure=`while read curline ; do
+		table=${curline%:*}
+		entries=${curline##$table:}
+		table=${table%%[^a-z]*}
+		case $table in
+			passwd*|group*|hosts)
+			for entry in $entries ; do
+			case $entry in
+				nisplus*)
+					/usr/sbin/nscd_nischeck $table || \
+					/echo "-S $table,yes"
+				;;
+			esac
+			done
+		;;
+		esac
+		done < /etc/nsswitch.conf`
+	local pidfile=/var/run/nscd/nscd.pid
+	mkdir -p "$(dirname ${pidfile})"
+	start-stop-daemon --start --quiet \
+		--exec /usr/sbin/nscd --pidfile ${pidfile} \
+		-- $secure
+	eend $?
+}
+
+stop() {
+	local pidfile=/var/run/nscd/nscd.pid
+	ebegin "Shutting down Name Service Cache Daemon"
+	start-stop-daemon --stop --quiet \
+		--exec /usr/sbin/nscd --pidfile ${pidfile}
+	eend $?
+}
+
+# vim:ts=4
diff --git a/config-archive/etc/init.d/nscd.dist b/config-archive/etc/init.d/nscd.dist
new file mode 100755
index 00000000..e613715c
--- /dev/null
+++ b/config-archive/etc/init.d/nscd.dist
@@ -0,0 +1,66 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.5 2011/08/29 05:21:40 vapier Exp $
+
+depend() {
+	use dns ldap net slapd
+}
+
+checkconfig() {
+	if [ ! -d /var/run/nscd ] ; then
+		checkpath -d -m 755 /var/run/nscd
+	fi
+	if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
+		ewarn "nscd run dir is not world readable, you should reset the perms:"
+		ewarn "chmod 755 /var/run/nscd"
+		ewarn "chmod a+rw /var/run/nscd/socket"
+		ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
+	fi
+
+	if grep -qs '^[[:space:]]*persistent\>' /etc/nscd.conf ; then
+		checkpath -d -m 700 /var/db/nscd
+	fi
+}
+
+start() {
+	checkconfig
+
+	ebegin "Starting Name Service Cache Daemon"
+
+	local secure=`while read curline ; do
+		table=${curline%:*}
+		entries=${curline##$table:}
+		table=${table%%[^a-z]*}
+		case $table in
+			passwd*|group*|hosts)
+			for entry in $entries ; do
+			case $entry in
+				nisplus*)
+					/usr/sbin/nscd_nischeck $table || \
+					/echo "-S $table,yes"
+				;;
+			esac
+			done
+		;;
+		esac
+		done < /etc/nsswitch.conf`
+
+	local pidfile="/var/run/nscd/nscd.pid"
+	mkdir -p "${pidfile%/*}"
+
+	start-stop-daemon --start --quiet \
+		--exec /usr/sbin/nscd --pidfile ${pidfile} \
+		-- $secure
+	eend $?
+}
+
+stop() {
+	local pidfile="/var/run/nscd/nscd.pid"
+	ebegin "Shutting down Name Service Cache Daemon"
+	start-stop-daemon --stop --quiet \
+		--exec /usr/sbin/nscd --pidfile ${pidfile}
+	eend $?
+}
+
+# vim:ts=4
diff --git a/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop b/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop
new file mode 100644
index 00000000..f343de11
--- /dev/null
+++ b/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop
@@ -0,0 +1,22 @@
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=Print Queue Applet
+Name[de]=Applet für Druckerwarteschlange
+Name[en_GB]=Print Queue Applet
+Name[ru]=Апплет очереди печати
+Name[vi]=Tiểu dụng hàng đợi in
+Comment=System tray icon for managing print jobs
+Comment[de]=Symbol für Benachrichtigungsfeld zur Verwaltung von Druckaufträgen
+Comment[en_GB]=System tray icon for managing print jobs
+Comment[ru]=Иконка области уведомления для управления заданиями печати
+Comment[vi]=Biểu tượng khay hệ thống để quản lý các công việc in
+Exec=system-config-printer-applet
+Terminal=false
+Type=Application
+Icon=printer
+NotShowIn=KDE;
+StartupNotify=false
+X-GNOME-Autostart-Delay=30
+X-Desktop-File-Install-Version=0.18
+Categories=GTK;Monitor;System;
diff --git a/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop.dist b/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop.dist
new file mode 100644
index 00000000..36a58e6c
--- /dev/null
+++ b/config-archive/etc/xdg/autostart/Gentoo-print-applet.desktop.dist
@@ -0,0 +1,22 @@
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=Print Queue Applet
+Name[de]=Applet für Druckerwarteschlange
+Name[en_GB]=Print Queue Applet
+Name[ru]=Апплет очереди печати
+Name[vi]=Tiểu dụng hàng đợi in
+Comment=System tray icon for managing print jobs
+Comment[de]=Symbol für Benachrichtigungsfeld zur Verwaltung von Druckaufträgen
+Comment[en_GB]=System tray icon for managing print jobs
+Comment[ru]=Иконка области уведомления для управления заданиями печати
+Comment[vi]=Biểu tượng khay hệ thống để quản lý các công việc in
+Exec=system-config-printer-applet
+Terminal=false
+Type=Application
+Icon=printer
+NotShowIn=KDE;
+StartupNotify=false
+X-GNOME-Autostart-Delay=30
+X-Desktop-File-Install-Version=0.20
+Categories=System;Monitor;GTK;
diff --git a/cups/printers.conf b/cups/printers.conf
index 441752f5..3ed341df 100644
--- 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-04-23 07:26
+# Written by cupsd on 2012-04-23 17:35
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter FS-1020D>
 Info Kyocera FS-1020D
diff --git a/cupshelpers/._cfg0000_preferreddrivers.xml b/cupshelpers/._cfg0000_preferreddrivers.xml
deleted file mode 100644
index 31052b9e..00000000
--- a/cupshelpers/._cfg0000_preferreddrivers.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<preferreddrivers>
-  <drivertypes>
-    <!-- GENERIC DRIVERS -->
-    <drivertype name="generic-foomatic-recommended">
-      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
-      <deviceid>
-	<field name="DRV" match=".*,?R1"/>
-      </deviceid>
-      <fit>
-	generic
-      </fit>
-    </drivertype>
-
-    <drivertype name="generic-escp">
-      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):Generic-ESC_P"/>
-      <fit>
-	generic
-	none
-      </fit>
-    </drivertype>
-
-    <drivertype name="generic-escp">
-      <ppdname match="drv:///sample.drv/epson(9|24).ppd"/>
-      <fit>
-	generic
-	none
-      </fit>
-    </drivertype>
-
-    <drivertype name="generic-postscript">
-      <attribute name="ppd-make-and-model"
-		 match="Generic PostScript Printer"/>
-      <fit>
-	generic
-	none
-      </fit>
-    </drivertype>
-
-    <drivertype name="generic-pcl6">
-      <attribute name="ppd-make-and-model"
-		 match="Generic PCL 6 Printer"/>
-      <fit>
-	generic
-	none
-      </fit>
-    </drivertype>
-
-    <drivertype name="generic-pcl5e">
-      <attribute name="ppd-make-and-model"
-		 match="Generic PCL 5e Printer"/>
-      <fit>
-	generic
-	none
-      </fit>
-    </drivertype>
-
-    <drivertype name="generic-pcl5">
-      <attribute name="ppd-make-and-model"
-		 match="Generic PCL 5 Printer"/>
-      <fit>
-	generic
-	none
-      </fit>
-    </drivertype>
-
-    <drivertype name="generic-pcl">
-      <attribute name="ppd-make-and-model"
-		 match="Generic PCL Laser Printer"/>
-      <fit>
-	generic
-	none
-      </fit>
-    </drivertype>
-
-    <drivertype name="generic">
-      <fit>
-	generic
-	none
-      </fit>
-    </drivertype>
-
-    <!-- END OF GENERIC DRIVERS -->
-    <!-- now fit is either exact-cmd, exact, or close -->
-
-    <drivertype name="cups">
-      <ppdname match="drv:///sample.drv/"/>
-    </drivertype>
-
-    <drivertype name="ghostscript">
-      <attribute name="ppd-product" match=".*Ghostscript"/>
-    </drivertype>
-
-    <drivertype name="gutenprint-simplified">
-      <ppdname match="gutenprint.*:.*/simple|.*-gutenprint.*\.sim"/>
-    </drivertype>
-
-    <drivertype name="gutenprint-expert">
-      <ppdname match="gutenprint.*:|.*-gutenprint"/>
-    </drivertype>
-
-    <drivertype name="foomatic-recommended-hpijs">
-      <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
-      <deviceid>
-	<field name="DRV" match=".*,?R1"/>
-      </deviceid>
-    </drivertype>
-
-    <drivertype name="foomatic-hpijs">
-      <attribute name="ppd-make-and-model" match=".* Foomatic/hpijs"/>
-    </drivertype>
-
-    <drivertype name="foomatic-recommended-postscript">
-      <ppdname match="foomatic(-db-compressed-ppds)?:"/>
-      <attribute name="ppd-make-and-model" match=".*Postscript"/>
-      <deviceid>
-	<field name="DRV" match=".*,?R1"/>
-      </deviceid>
-    </drivertype>
-
-    <drivertype name="foomatic-postscript">
-      <ppdname match="foomatic(-db-compressed-ppds)?:.*-Postscript"/>
-    </drivertype>
-
-    <drivertype name="foomatic-recommended-nonpostscript">
-      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
-      <deviceid>
-	<field name="DRV" match=".*,?R1"/>
-      </deviceid>
-    </drivertype>
-
-    <drivertype name="foomatic-gutenprint">
-      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):.*-gutenprint"/>
-    </drivertype>
-
-    <drivertype name="foomatic">
-      <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
-    </drivertype>
-
-    <drivertype name="hpcups-plugin">
-      <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
-      <attribute name="ppd-make-and-model" match=".* plugin"/>
-    </drivertype>
-
-    <drivertype name="hpcups">
-      <ppdname match="drv:///(hp/)?hpcups.drv/|.*-hpcups"/>
-    </drivertype>
-
-    <drivertype name="hpijs-plugin">
-      <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
-      <attribute name="ppd-make-and-model" match=".* plugin"/>
-    </drivertype>
-
-    <drivertype name="hpijs">
-      <ppdname match="drv:///(hp/)?hpijs.drv/|.*-hpijs"/>
-    </drivertype>
-
-    <drivertype name="splix">
-      <ppdname match=".*splix"/>
-    </drivertype>
-
-    <drivertype name="turboprint">
-      <ppdname match=".*turboprint"/>
-    </drivertype>
-
-    <drivertype name="manufacturer-ricoh-ps">
-      <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PS/"/>
-    </drivertype>
-
-    <drivertype name="manufacturer-ricoh-pxl">
-      <ppdname match=".*/(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)/PXL/"/>
-    </drivertype>
-
-    <drivertype name="manufacturer-cmd">
-      <fit>
-	exact-cmd
-      </fit>
-    </drivertype>
-
-    <!-- Catch-all -->
-    <drivertype name="manufacturer"/>
-  </drivertypes>
-
-  <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-  <!-- This is where the types are arranged into the preferred order -->
-  <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-  <preferenceorder>
-    <!-- gutenprint is no good on the Brother HL-2030 (bug #645993) -->
-    <printer>
-      <make-and-model match="Brother HL-2030"/>
-      <deviceid>
-	<field name="MFG" match="Brother"/>
-	<field name="MDL" match="HL-2030"/>
-      </deviceid>
-      <blacklist>
-	<drivertype>gutenprint*</drivertype>
-      </blacklist>
-    </printer>
-
-    <!-- Ricoh family printers should use manufacturer's own PPD
-         files, with PostScript versions in preference to PXL versions
-	 (bug #550315 comment #8)
-         -->
-    <printer>
-      <make-and-model
-	  match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG) "/>
-      <deviceid>
-	<field name="MFG"
-	       match="(Ricoh|Lanier|Gestetner|InfoPrint|Infotech|Savin|NRG)"/>
-      </deviceid>
-      <drivers>
-	<drivertype>manufacturer-ricoh-ps</drivertype>
-	<drivertype>manufacturer-ricoh-pxl</drivertype>
-      </drivers>
-    </printer>
-
-    <!-- HP LaserJet 2100 series: avoid using PostScript for these
-         models because they only understand PS level 2 (bug
-         #710231). -->
-    <printer>
-      <make-and-model
-	  match="(Hewlett-Packard|HP) LaserJet 2100 Series"/>
-      <deviceid>
-	<field name="MFG" match="(HP|Hewlett-Packard)"/>
-	<field name="MDL" match="HP LaserJet 2100 Series"/>
-      </deviceid>
-      <avoid>
-	<drivertype>*-postscript</drivertype>
-      </avoid>
-    </printer>
-
-    <!-- The gutenprint driver for the Xerox 6250DP is black and
-         white, so prefer other drivers (LP #669152) -->
-    <printer>
-      <make-and-model match="Xerox 6250DP"/>
-      <deviceid>
-	<field name="MFG" match="Xerox"/>
-	<field name="MDL" match="6250DP"/>
-      </deviceid>
-      <avoid>
-	<drivertype>gutenprint*</drivertype>
-      </avoid>
-    </printer>
-
-    <printer>
-      <!-- For all printers -->
-      <drivers>
-	<drivertype>manufacturer-cmd</drivertype>
-	<drivertype>foomatic-recommended-hpijs</drivertype>
-	<drivertype>foomatic-recommended-nonpostscript</drivertype>
-	<drivertype>manufacturer*</drivertype>
-	<drivertype>foomatic-recommended-postscript</drivertype>
-	<drivertype>foomatic-postscript</drivertype>
-	<drivertype>hpcups</drivertype>
-	<drivertype>hpijs</drivertype>
-      </drivers>
-    </printer>
-
-    <printer>
-      <!-- Use hpijs on HP printers at this point (i.e. in preference
-           to gutenprint) -->
-      <make-and-model match="(HP|Hewlett-Packard) "/>
-      <deviceid>
-	<field name="MFG" match="HP|Hewlett-Packard"/>
-      </deviceid>
-      <drivers>
-	<drivertype>foomatic-hpijs</drivertype>
-      </drivers>
-    </printer>
-
-    <printer>
-      <!-- For all printers (continued) -->
-      <drivers>
-	<drivertype>splix</drivertype>
-	<drivertype>gutenprint-simplified</drivertype>
-	<drivertype>gutenprint-expert</drivertype>
-	<drivertype>foomatic-hpijs</drivertype>
-	<drivertype>foomatic-gutenprint</drivertype>
-	<drivertype>foomatic</drivertype>
-	<drivertype>cups</drivertype>
-
-	<!-- Generic drivers listed last, in this order -->
-	<drivertype>generic-postscript</drivertype>
-	<drivertype>generic-foomatic-recommended</drivertype>
-	<drivertype>generic-pcl6</drivertype>
-	<drivertype>generic-pcl5c</drivertype>
-	<drivertype>generic-pcl5e</drivertype>
-	<drivertype>generic-pcl5</drivertype>
-	<drivertype>generic-pcl</drivertype>
-	<drivertype>generic-escp</drivertype>
-	<drivertype>ghostscript</drivertype>
-	<drivertype>generic</drivertype>
-
-	<!-- Last of all, 3rd party non-free drivers -->
-	<drivertype>hpcups-plugin</drivertype>
-	<drivertype>hpijs-plugin</drivertype>
-	<drivertype>turboprint</drivertype>
-      </drivers>
-    </printer>
-  </preferenceorder>
-</preferreddrivers>
diff --git a/cupshelpers/preferreddrivers.xml b/cupshelpers/preferreddrivers.xml
index e8097feb..31052b9e 100644
--- a/cupshelpers/preferreddrivers.xml
+++ b/cupshelpers/preferreddrivers.xml
@@ -122,12 +122,6 @@
       <ppdname match="foomatic(-db-compressed-ppds)?:.*-Postscript"/>
     </drivertype>
 
-    <drivertype name="foomatic-pxlmono">
-      <!-- Treat this one specially because of the size of the output
-           it generates (see bug #661814) -->
-      <attribute name="ppd-make-and-model" match=".* Foomatic/pxlmono"/>
-    </drivertype>
-
     <drivertype name="foomatic-recommended-nonpostscript">
       <ppdname match="(foomatic(-db-compressed-ppds)?|ijsgutenprint.*):"/>
       <deviceid>
@@ -294,7 +288,6 @@
 	<drivertype>generic-pcl5e</drivertype>
 	<drivertype>generic-pcl5</drivertype>
 	<drivertype>generic-pcl</drivertype>
-	<drivertype>foomatic-pxlmono</drivertype>
 	<drivertype>generic-escp</drivertype>
 	<drivertype>ghostscript</drivertype>
 	<drivertype>generic</drivertype>
diff --git a/init.d/._cfg0000_nscd b/init.d/._cfg0000_nscd
deleted file mode 100755
index e613715c..00000000
--- a/init.d/._cfg0000_nscd
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.5 2011/08/29 05:21:40 vapier Exp $
-
-depend() {
-	use dns ldap net slapd
-}
-
-checkconfig() {
-	if [ ! -d /var/run/nscd ] ; then
-		checkpath -d -m 755 /var/run/nscd
-	fi
-	if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
-		ewarn "nscd run dir is not world readable, you should reset the perms:"
-		ewarn "chmod 755 /var/run/nscd"
-		ewarn "chmod a+rw /var/run/nscd/socket"
-		ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
-	fi
-
-	if grep -qs '^[[:space:]]*persistent\>' /etc/nscd.conf ; then
-		checkpath -d -m 700 /var/db/nscd
-	fi
-}
-
-start() {
-	checkconfig
-
-	ebegin "Starting Name Service Cache Daemon"
-
-	local secure=`while read curline ; do
-		table=${curline%:*}
-		entries=${curline##$table:}
-		table=${table%%[^a-z]*}
-		case $table in
-			passwd*|group*|hosts)
-			for entry in $entries ; do
-			case $entry in
-				nisplus*)
-					/usr/sbin/nscd_nischeck $table || \
-					/echo "-S $table,yes"
-				;;
-			esac
-			done
-		;;
-		esac
-		done < /etc/nsswitch.conf`
-
-	local pidfile="/var/run/nscd/nscd.pid"
-	mkdir -p "${pidfile%/*}"
-
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/nscd --pidfile ${pidfile} \
-		-- $secure
-	eend $?
-}
-
-stop() {
-	local pidfile="/var/run/nscd/nscd.pid"
-	ebegin "Shutting down Name Service Cache Daemon"
-	start-stop-daemon --stop --quiet \
-		--exec /usr/sbin/nscd --pidfile ${pidfile}
-	eend $?
-}
-
-# vim:ts=4
diff --git a/init.d/nscd b/init.d/nscd
index 70fb3ea5..e613715c 100755
--- a/init.d/nscd
+++ b/init.d/nscd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.3 2009/09/18 12:29:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nscd,v 1.5 2011/08/29 05:21:40 vapier Exp $
 
 depend() {
 	use dns ldap net slapd
@@ -9,17 +9,17 @@ depend() {
 
 checkconfig() {
 	if [ ! -d /var/run/nscd ] ; then
-		mkdir -p /var/run/nscd
-		chmod 755 /var/run/nscd
+		checkpath -d -m 755 /var/run/nscd
 	fi
 	if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
-		echo ""
 		ewarn "nscd run dir is not world readable, you should reset the perms:"
 		ewarn "chmod 755 /var/run/nscd"
 		ewarn "chmod a+rw /var/run/nscd/socket"
-		echo ""
 		ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
-		echo ""
+	fi
+
+	if grep -qs '^[[:space:]]*persistent\>' /etc/nscd.conf ; then
+		checkpath -d -m 700 /var/db/nscd
 	fi
 }
 
@@ -27,6 +27,7 @@ start() {
 	checkconfig
 
 	ebegin "Starting Name Service Cache Daemon"
+
 	local secure=`while read curline ; do
 		table=${curline%:*}
 		entries=${curline##$table:}
@@ -44,8 +45,10 @@ start() {
 		;;
 		esac
 		done < /etc/nsswitch.conf`
-	local pidfile=/var/run/nscd/nscd.pid
-	mkdir -p "$(dirname ${pidfile})"
+
+	local pidfile="/var/run/nscd/nscd.pid"
+	mkdir -p "${pidfile%/*}"
+
 	start-stop-daemon --start --quiet \
 		--exec /usr/sbin/nscd --pidfile ${pidfile} \
 		-- $secure
@@ -53,7 +56,7 @@ start() {
 }
 
 stop() {
-	local pidfile=/var/run/nscd/nscd.pid
+	local pidfile="/var/run/nscd/nscd.pid"
 	ebegin "Shutting down Name Service Cache Daemon"
 	start-stop-daemon --stop --quiet \
 		--exec /usr/sbin/nscd --pidfile ${pidfile}
diff --git a/xdg/autostart/._cfg0000_Gentoo-print-applet.desktop b/xdg/autostart/._cfg0000_Gentoo-print-applet.desktop
deleted file mode 100644
index 36a58e6c..00000000
--- a/xdg/autostart/._cfg0000_Gentoo-print-applet.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[Desktop Entry]
-Encoding=UTF-8
-Name=Print Queue Applet
-Name[de]=Applet für Druckerwarteschlange
-Name[en_GB]=Print Queue Applet
-Name[ru]=Апплет очереди печати
-Name[vi]=Tiểu dụng hàng đợi in
-Comment=System tray icon for managing print jobs
-Comment[de]=Symbol für Benachrichtigungsfeld zur Verwaltung von Druckaufträgen
-Comment[en_GB]=System tray icon for managing print jobs
-Comment[ru]=Иконка области уведомления для управления заданиями печати
-Comment[vi]=Biểu tượng khay hệ thống để quản lý các công việc in
-Exec=system-config-printer-applet
-Terminal=false
-Type=Application
-Icon=printer
-NotShowIn=KDE;
-StartupNotify=false
-X-GNOME-Autostart-Delay=30
-X-Desktop-File-Install-Version=0.20
-Categories=System;Monitor;GTK;
diff --git a/xdg/autostart/Gentoo-print-applet.desktop b/xdg/autostart/Gentoo-print-applet.desktop
index f343de11..36a58e6c 100644
--- a/xdg/autostart/Gentoo-print-applet.desktop
+++ b/xdg/autostart/Gentoo-print-applet.desktop
@@ -18,5 +18,5 @@ Icon=printer
 NotShowIn=KDE;
 StartupNotify=false
 X-GNOME-Autostart-Delay=30
-X-Desktop-File-Install-Version=0.18
-Categories=GTK;Monitor;System;
+X-Desktop-File-Install-Version=0.20
+Categories=System;Monitor;GTK;