saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 40371fd9b2626d052557b269ec5f2550dc7c2670..3cc009da7d65b839e57e22f7195f436a9f60f064 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -905,6 +905,7 @@ 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 0644 'sgml/xml-docbook-4.5.cat'
 maybe chmod 0640 'shadow'
 maybe chmod 0600 'shadow-'
 maybe chmod 0644 'shells'

diff --git a/sgml/catalog b/sgml/catalog
index 1bf44795dfe88e9e4fa36c68e74ad783bf057d33..01d61d5df09eff215a045a11694c3c73e1344f1c 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/xml-docbook-4.2.cat"
 CATALOG "/etc/sgml/openjade-1.3.2.cat"
+CATALOG "/etc/sgml/xml-docbook-4.5.cat"

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

diff --git a/xml/docbook b/xml/docbook
index a8a8a948fcb5baa9209f3b7ba298ba921f9658fd..76779afbf9127d414e3fd93e0034d05bb86c598f 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.4/soextblx.dtd"/>
+  <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/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"/>
@@ -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.5//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/dbpoolx.mod"/>
+  <public publicId="-//OASIS//DTD DocBook XML V4.5//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/docbookx.dtd"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/dbcentx.mod"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/dbnotnx.mod"/>
+  <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/dbgenent.mod"/>
+  <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/dbhierx.mod"/>
+  <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/calstblx.dtd"/>
+  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.5"/>
+  <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.5" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.5"/>
 </catalog>