saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 115aff96521a08afebccfe19afce58b153aceb1a..16065b692013f189e7736c280d66e4c63c7e4373 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2766,7 +2766,6 @@ maybe chmod 0644 'sgml/sgml-docbook-3.0.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/xml-core-0.13_p2.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'
@@ -3576,4 +3575,3 @@ maybe chmod 0644 'xinetd.d/svnserve'
 maybe chmod 0755 'xml'
 maybe chmod 0644 'xml/catalog'
 maybe chmod 0644 'xml/docbook'
-maybe chmod 0644 'xml/xml-core'

diff --git a/sgml/catalog b/sgml/catalog
index d416f43ee42ef11a4be7c81d52760a32b18a22bb..1d23a6ec38f1620375abf07d731f6378c52324fd 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -8,6 +8,5 @@ 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/xml-core-0.13_p2.cat"
 CATALOG "/etc/sgml/debiandoc-sgml-1.2.27.cat"
 CATALOG "/etc/sgml/linuxdoc.cat"

diff --git a/sgml/xml-core-0.13_p2.cat b/sgml/xml-core-0.13_p2.cat
deleted file mode 100644 (file)
index dc0d903..0000000
--- a/sgml/xml-core-0.13_p2.cat
+++ /dev/null
@@ -1 +0,0 @@
-CATALOG "/usr/share/sgml/dtd/xml-core/catalog"

diff --git a/xml/catalog b/xml/catalog
index c3b32270734592d357788dde6a477ea2306a96e8..682b82d5b8246fbd8b4bf1607f8e9734674dabc4 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -1,10 +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">
-  <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"/>
-  <public publicId="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" uri="/etc/xml/xml-core"/>
   <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//DTD DocBook" catalog="file:///etc/xml/docbook"/>

diff --git a/xml/xml-core b/xml/xml-core
deleted file mode 100644 (file)
index dd64ebf..0000000
--- a/xml/xml-core
+++ /dev/null
@@ -1,8 +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">
-  <system systemId="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
-  <public publicId="-//OASIS//DTD XML Catalogs V1.0//EN" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
-  <system systemId="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
-  <public publicId="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" uri="/usr/share/xml/schema/xml-core/catalog.xml"/>
-</catalog>