saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index e2e7f6f47a8e755a6fc0ec8f620312c694659de3..0a8225697dfaf1f62ec597abef77df15188c5edf 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -558,3 +558,4 @@ maybe chmod 0644 './xinetd.d/time-stream'
 maybe chmod 0755 './xml'
 maybe chmod 0644 './xml/.keep_app-text_build-docbook-catalog-0'
 maybe chmod 0644 './xml/catalog'
+maybe chmod 0644 './xml/docbook'

diff --git a/xml/catalog b/xml/catalog
index 84f482e86eb1d5d2401f60bc1516cb7d67d7df99..a6ff8b5651f18fc42e27d06593bf8a55cf65ba63 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -1,3 +1,11 @@
 <?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"/>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <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"/>
+  <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook"/>
+  <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"/>
+</catalog>

diff --git a/xml/docbook b/xml/docbook
new file mode 100644 (file)
index 0000000..0e4858c
--- /dev/null
+++ b/xml/docbook
@@ -0,0 +1,6 @@
+<?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">
+  <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"/>
+</catalog>