saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index b210aa3c70264865a0c0e1a96674b41b447bd391..5cc6783537b68e58db22de387f04929efa2a982a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -452,6 +452,7 @@ maybe chmod 0644 './sgml/catalog'
 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 0640 './shadow'
 maybe chmod 0600 './shadow-'
 maybe chmod 0644 './shells'

diff --git a/sgml/catalog b/sgml/catalog
index b53072973c2ccf3b14addf0f53c6f140a539d7ed..b799fa42fd86237fb489a424169a910bf786dd6d 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -1,2 +1,3 @@
 CATALOG "/etc/sgml/sgml-ent.cat"
 CATALOG "/etc/sgml/sgml-docbook.cat"
+CATALOG "/etc/sgml/xml-docbook-4.1.2.cat"

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

diff --git a/xml/docbook b/xml/docbook
index 0e4858c22b997b7d2318c7dc94e878616955c345..9c26c12f2db5965fd2535696132e821a09d42ae9 100644 (file)
--- a/xml/docbook
+++ b/xml/docbook
@@ -3,4 +3,33 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current" rewritePrefix="file:///usr/share/sgml/docbook/xsl-stylesheets"/>
   <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current" rewritePrefix="file:///usr/share/sgml/docbook/xsl-stylesheets"/>
+  <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/dbpoolx.mod"/>
+  <public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.1.2/dbcentx.mod"/>
+  <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.1.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"/>
 </catalog>