saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index ac86369ab14730c89008914c5cfdf2fa599ef3d9..c86fa1bcec7d183aa85a806c68c168c2de5c1f4f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -947,6 +947,7 @@ maybe chmod 0644 'sgml/openjade-1.3.2.cat'
 maybe chmod 0644 'sgml/sgml-docbook.cat'
 maybe chmod 0644 'sgml/sgml-ent.cat'
 maybe chmod 0644 'sgml/sgml.conf'
+maybe chmod 0644 'sgml/xhtml1.cat'
 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'

diff --git a/sgml/catalog b/sgml/catalog
index 01d61d5df09eff215a045a11694c3c73e1344f1c..763c9c16b28943a90eda06b7401671141aa3c55f 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -5,3 +5,4 @@ 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"
+CATALOG "/etc/sgml/xhtml1.cat"

diff --git a/sgml/xhtml1.cat b/sgml/xhtml1.cat
new file mode 100644 (file)
index 0000000..0309e34
--- /dev/null
+++ b/sgml/xhtml1.cat
@@ -0,0 +1 @@
+CATALOG "/usr/share/sgml/xhtml1/xhtml.soc"

diff --git a/xml/catalog b/xml/catalog
index b14072d8e883b7274cbae7a8798378b77778398d..d23d0fa6e9e6d17eca3df27c9717da2468de6271 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -9,4 +9,9 @@
   <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="-//W3C//DTD XHTML 1.0 Strict//EN" uri="/usr/share/sgml/xhtml1/xhtml1-strict.dtd"/>
+  <public publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" uri="/usr/share/sgml/xhtml1/xhtml1-transitional.dtd"/>
+  <public publicId="-//W3C//DTD XHTML 1.0 Frameset//EN" uri="/usr/share/sgml/xhtml1/xhtml1-frameset.dtd"/>
+  <rewriteSystem systemIdStartString="http://www.w3.org/TR/xhtml1/DTD" rewritePrefix="/usr/share/sgml/xhtml1"/>
+  <rewriteURI uriStartString="http://www.w3.org/TR/xhtml1/DTD" rewritePrefix="/usr/share/sgml/xhtml1"/>
 </catalog>