saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index feb34bf37dd7fdc2be43c8f4295064ddda926481..648f8bdcf5713d515f7f56371e696c6d38f05fd0 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -700,6 +700,7 @@ 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.3.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 dc4bd009e7da2ca115841a4fa3057ee5bb7e39d2..70eeb9ee9a5645e9742565fa1e72c82106dc6019 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -5,3 +5,4 @@ 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"
+CATALOG "/etc/sgml/xml-docbook-4.3.cat"

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

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