saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 4aedcee0c10f5d74b0ab5cf92d9ce27111e97c5d..68c8c8df6452aa597879bdda1453667d3558a1d4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -699,6 +699,7 @@ maybe chmod 0644 './sgml/sgml-docbook.cat'
 maybe chmod 0644 './sgml/sgml-ent.cat'
 maybe chmod 0644 './sgml/sgml.conf'
 maybe chmod 0644 './sgml/xml-docbook-4.1.2.cat'
+maybe chmod 0644 './sgml/xml-docbook-4.2.cat'
 maybe chmod 0644 './sgml/xml-docbook-4.4.cat'
 maybe chmod 0640 './shadow'
 maybe chmod 0600 './shadow-'

diff --git a/sgml/catalog b/sgml/catalog
index bcdac486f628a4ca47c694dd2d2e76f6cf5edc21..dc4bd009e7da2ca115841a4fa3057ee5bb7e39d2 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -4,3 +4,4 @@ CATALOG "/etc/sgml/xml-docbook-4.1.2.cat"
 CATALOG "/etc/sgml/xml-docbook-4.4.cat"
 CATALOG "/etc/sgml/sgml-docbook-3.0.cat"
 CATALOG "/etc/sgml/dsssl-docbook-stylesheets.cat"
+CATALOG "/etc/sgml/xml-docbook-4.2.cat"

diff --git a/sgml/xml-docbook-4.2.cat b/sgml/xml-docbook-4.2.cat
new file mode 100644 (file)
index 0000000..a0bbd93
--- /dev/null
+++ b/sgml/xml-docbook-4.2.cat
@@ -0,0 +1,2 @@
+CATALOG "/etc/sgml/sgml-docbook.cat"
+CATALOG "/usr/share/sgml/docbook/xml-dtd-4.2/docbook.cat"

diff --git a/xml/catalog b/xml/catalog
index 8c13367190e78a840a5156402b740af0e38f455f..82584f320e513c96fe30ea2a366888db269b880f 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -3,6 +3,7 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <public publicId="-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" uri="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
   <system systemId="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" uri="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
+  <system systemId="http://glade.gnome.org/glade-2.0.dtd" uri="/usr/share/xml/libglade/glade-2.0.dtd"/>
   <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///etc/xml/docbook"/>
   <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook"/>
@@ -10,5 +11,4 @@
   <delegatePublic publicIdStartString="ISO 8879:1986" catalog="file:///etc/xml/docbook"/>
   <delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook"/>
   <delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook"/>
-  <system systemId="http://glade.gnome.org/glade-2.0.dtd" uri="/usr/share/xml/libglade/glade-2.0.dtd"/>
 </catalog>

diff --git a/xml/docbook b/xml/docbook
index 13769235b38f4bf7ce14b8a277594eb3cfe969cc..69adb050135fb84239ffd3e0b11226fa8a81bc62 100644 (file)
--- a/xml/docbook
+++ b/xml/docbook
@@ -9,29 +9,29 @@
   <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/dbnotnx.mod"/>
   <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/dbgenent.mod"/>
   <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/dbhierx.mod"/>
-  <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/soextblx.dtd"/>
+  <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/soextblx.dtd"/>
   <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/calstblx.dtd"/>
   <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.1.2"/>
   <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.1.2"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-amso.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-box.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-cyr1.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-cyr2.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-dia.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-grk1.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-grk2.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-grk3.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-grk4.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-lat1.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-lat2.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-num.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Publishing//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-pub.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES General Technical//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/ent/iso-tech.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-amsa.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-amsb.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-amsc.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-amsn.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-amso.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-amsr.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-box.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-cyr1.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-cyr2.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-dia.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-grk1.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-grk2.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-grk3.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-grk4.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-lat1.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-lat2.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-num.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES Publishing//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-pub.ent"/>
+  <public publicId="ISO 8879:1986//ENTITIES General Technical//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/ent/iso-tech.ent"/>
   <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/dbpoolx.mod"/>
   <public publicId="-//OASIS//DTD DocBook XML V4.4//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd"/>
   <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/dbcentx.mod"/>
@@ -41,4 +41,13 @@
   <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/calstblx.dtd"/>
   <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.4"/>
   <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.4" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.4"/>
+  <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/dbpoolx.mod"/>
+  <public publicId="-//OASIS//DTD DocBook XML V4.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/dbcentx.mod"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/dbnotnx.mod"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/dbgenent.mod"/>
+  <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/dbhierx.mod"/>
+  <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.2/calstblx.dtd"/>
+  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.2"/>
+  <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.2"/>
 </catalog>