saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index adb66747b56c102717b7172a817b840b8ae4841a..6aa5af16a26c1fd7211c0a12a36799e8857021c0 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -551,6 +551,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.4.cat'
 maybe chmod 0640 './shadow'
 maybe chmod 0600 './shadow-'
 maybe chmod 0644 './shells'

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

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

diff --git a/xml/catalog b/xml/catalog
index b20b1755721d0f3ff94175f8c92a5339cb1d8eee..ea55165dd33640df4b7b15bc0225edbb6c2ac9bc 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <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"/>
   <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"/>
@@ -8,6 +10,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"/>
-  <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"/>
 </catalog>

diff --git a/xml/docbook b/xml/docbook
index 9c26c12f2db5965fd2535696132e821a09d42ae9..13769235b38f4bf7ce14b8a277594eb3cfe969cc 100644 (file)
--- a/xml/docbook
+++ b/xml/docbook
@@ -9,7 +9,7 @@
   <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 XML Exchange Table Model 19990315//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/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"/>
@@ -32,4 +32,13 @@
   <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="-//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"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/dbnotnx.mod"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/dbgenent.mod"/>
+  <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.4/dbhierx.mod"/>
+  <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"/>
 </catalog>