saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 19db96a5dbae9bc068c32179f404eef2de7f7efb..115aff96521a08afebccfe19afce58b153aceb1a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2762,7 +2762,6 @@ maybe chmod 0644 'sgml/debiandoc-sgml-1.2.27.cat'
 maybe chmod 0644 'sgml/dsssl-docbook-stylesheets.cat'
 maybe chmod 0644 'sgml/linuxdoc.cat'
 maybe chmod 0644 'sgml/openjade-1.3.2.cat'
-maybe chmod 0644 'sgml/sgml-data-2.0.8.cat'
 maybe chmod 0644 'sgml/sgml-docbook-3.0.cat'
 maybe chmod 0644 'sgml/sgml-docbook.cat'
 maybe chmod 0644 'sgml/sgml-ent.cat'
@@ -3577,5 +3576,4 @@ maybe chmod 0644 'xinetd.d/svnserve'
 maybe chmod 0755 'xml'
 maybe chmod 0644 'xml/catalog'
 maybe chmod 0644 'xml/docbook'
-maybe chmod 0644 'xml/sgml-data'
 maybe chmod 0644 'xml/xml-core'

diff --git a/sgml/catalog b/sgml/catalog
index 9fda9aa7940e49fd447a7429eb173c2750c2e797..d416f43ee42ef11a4be7c81d52760a32b18a22bb 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -8,7 +8,6 @@ CATALOG "/etc/sgml/xml-docbook-4.3.cat"
 CATALOG "/etc/sgml/xml-docbook-4.4.cat"
 CATALOG "/etc/sgml/xml-docbook-4.5.cat"
 CATALOG "/etc/sgml/openjade-1.3.2.cat"
-CATALOG "/etc/sgml/sgml-data-2.0.8.cat"
 CATALOG "/etc/sgml/xml-core-0.13_p2.cat"
 CATALOG "/etc/sgml/debiandoc-sgml-1.2.27.cat"
 CATALOG "/etc/sgml/linuxdoc.cat"

diff --git a/sgml/sgml-data-2.0.8.cat b/sgml/sgml-data-2.0.8.cat
deleted file mode 100644 (file)
index 6c718d4..0000000
--- a/sgml/sgml-data-2.0.8.cat
+++ /dev/null
@@ -1,13 +0,0 @@
-CATALOG "/usr/share/sgml/dtd/catalog"
-CATALOG "/usr/share/sgml/entities/ArborText/catalog"
-CATALOG "/usr/share/sgml/entities/Hewlett-Packard/catalog"
-CATALOG "/usr/share/sgml/entities/sgml-iso-entities-8879.1986/catalog"
-CATALOG "/usr/share/sgml/entities/sgml-iso-entities-9573-13.1991/catalog"
-CATALOG "/usr/share/sgml/html/dtd/catalog"
-CATALOG "/usr/share/sgml/html/dtd/4.0/catalog"
-CATALOG "/usr/share/sgml/html/dtd/4.01/catalog"
-CATALOG "/usr/share/sgml/html/dtd/iso-15445/catalog"
-CATALOG "/usr/share/sgml/html/entities/catalog"
-CATALOG "/usr/share/xml/qaml/catalog"
-CATALOG "/usr/share/xml/svg/catalog"
-CATALOG "/usr/share/xml/entities/xml-iso-entities-8879.1986/catalog"

diff --git a/xml/catalog b/xml/catalog
index 148a0ee16c14399c41ea1b2fcccd1b034fee597c..c3b32270734592d357788dde6a477ea2306a96e8 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -1,15 +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">
-  <public publicId="+//IDN faq.org//DTD Frequently Asked Questions" uri="/etc/xml/sgml-data"/>
-  <system systemId="http://xml.ascc.net/xml/resource/qaml-xml" uri="/etc/xml/sgml-data"/>
-  <public publicId="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" uri="/etc/xml/sgml-data"/>
-  <system systemId="/usr/share/sgml/dtd/qaml-xml.dtd" uri="/etc/xml/sgml-data"/>
-  <public publicId="-//W3C//DTD SVG" uri="/etc/xml/sgml-data"/>
-  <system systemId="http://www.w3.org/TR/2001/REC-SVG-20010904/" uri="/etc/xml/sgml-data"/>
-  <system systemId="http://www.w3.org/Graphics/SVG/1.1/" uri="/etc/xml/sgml-data"/>
-  <system systemId="/usr/share/sgml/dtd/svg" uri="/etc/xml/sgml-data"/>
-  <public publicId="ISO 8879:1986//ENTITIES" uri="/etc/xml/sgml-data"/>
   <system systemId="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" uri="/etc/xml/xml-core"/>
   <public publicId="-//OASIS//DTD XML Catalogs V1.0//EN" uri="/etc/xml/xml-core"/>
   <system systemId="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" uri="/etc/xml/xml-core"/>

diff --git a/xml/sgml-data b/xml/sgml-data
deleted file mode 100644 (file)
index 7fbc44f..0000000
--- a/xml/sgml-data
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="+//IDN faq.org//DTD Frequently Asked Questions" uri="/usr/share/xml/qaml/catalog.xml"/>
-  <system systemId="http://xml.ascc.net/xml/resource/qaml-xml" uri="/usr/share/xml/qaml/catalog.xml"/>
-  <public publicId="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" uri="/usr/share/xml/qaml/catalog.xml"/>
-  <system systemId="/usr/share/sgml/dtd/qaml-xml.dtd" uri="/usr/share/xml/qaml/catalog.xml"/>
-  <public publicId="-//W3C//DTD SVG" uri="/usr/share/xml/svg/catalog.xml"/>
-  <system systemId="http://www.w3.org/TR/2001/REC-SVG-20010904/" uri="/usr/share/xml/svg/catalog.xml"/>
-  <system systemId="http://www.w3.org/Graphics/SVG/1.1/" uri="/usr/share/xml/svg/catalog.xml"/>
-  <system systemId="/usr/share/sgml/dtd/svg" uri="/usr/share/xml/svg/catalog.xml"/>
-  <public publicId="ISO 8879:1986//ENTITIES" uri="/usr/share/xml/entities/xml-iso-entities-8879.1986/catalog.xml"/>
-</catalog>