saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 656e9ebf1f8c575a81be96e08dc9a8a31733ff3b..375576debba9afe3a4d8c108916212a909eb8039 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1504,6 +1504,7 @@ maybe chmod 0644 './sgml/sgml-docbook-4.4.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.3.cat'

diff --git a/sgml/catalog b/sgml/catalog
index f04652e5e5d9ae6da262b3e00b5edb7e0bab536d..32a2e807485ee54c6671b926b9bace0aba512b95 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -14,3 +14,4 @@ CATALOG "/etc/sgml/xml-simple-docbook-4.1.2.4.cat"
 CATALOG "/etc/sgml/xml-simple-docbook-1.0.cat"
 CATALOG "/etc/sgml/openjade-1.3.2.cat"
 CATALOG "/etc/sgml/sgml-docbook-4.4.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 8c13367190e78a840a5156402b740af0e38f455f..7f0da6c8f2df92bb575fe3114d77b346098ff6a8 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -11,4 +11,9 @@
   <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"/>
   <system systemId="http://glade.gnome.org/glade-2.0.dtd" uri="/usr/share/xml/libglade/glade-2.0.dtd"/>
+  <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>