committing changes in /etc after emerge run

diff --git a/.etckeeper b/.etckeeper
index cfa861c3eba6a012d399f515505c25e0725a7571..9667f73d49a2d3bcb06222029cc132ea75cb72aa 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -502,7 +502,8 @@ maybe chmod 0444 'openldap/schema/ppolicy.schema'
 maybe chmod 0644 'openldap/schema/rfc2307bis.schema'
 maybe chgrp 'ldap' 'openldap/slapd.conf'
 maybe chmod 0640 'openldap/slapd.conf'
-maybe chmod 0600 'openldap/slapd.conf.default'
+maybe chgrp 'ldap' 'openldap/slapd.conf.default'
+maybe chmod 0640 'openldap/slapd.conf.default'
 maybe chmod 0600 'openldap/slapd.ldif'
 maybe chmod 0600 'openldap/slapd.ldif.default'
 maybe chmod 0755 'openldap/ssl'
@@ -632,7 +633,6 @@ maybe chmod 0644 'security/time.conf'
 maybe chmod 0644 'services'
 maybe chmod 0755 'sgml'
 maybe chmod 0644 'sgml/catalog'
-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'

diff --git a/sgml/catalog b/sgml/catalog
index bac0e64fbc3b938a137f2e1451a840e23779cdcb..ee6a468cde9bd08486e9e1fff89f874e1d7b86e5 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -4,4 +4,3 @@ CATALOG "/etc/sgml/xml-docbook-4.2.cat"
 CATALOG "/etc/sgml/xml-docbook-4.1.2.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"

diff --git a/sgml/openjade-1.3.2.cat b/sgml/openjade-1.3.2.cat
deleted file mode 100644 (file)
index 8a1ee5a..0000000
--- a/sgml/openjade-1.3.2.cat
+++ /dev/null
@@ -1,2 +0,0 @@
-CATALOG "/usr/share/sgml/openjade-1.3.2/catalog"
-CATALOG "/usr/share/sgml/openjade-1.3.2/dsssl/catalog"

diff --git a/sgml/sgml-docbook.cat b/sgml/sgml-docbook.cat
index a346b7d01fc106c8108dcbc16bfbbae5660e1ec2..21f33a08a7940779e55a931f5d5dacc9d0dddba2 100644 (file)
--- a/sgml/sgml-docbook.cat
+++ b/sgml/sgml-docbook.cat
@@ -1,2 +1 @@
 CATALOG "/etc/sgml/sgml-ent.cat"
-CATALOG "/etc/sgml/openjade-1.3.2.cat"