saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 367caaaead7ec12b03d88d1d74c4c1641413c17a..98a799af1c12e7801b6dc0c57569c23c516ebf4a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -10,7 +10,6 @@ mkdir -p './request-key.d'
 mkdir -p './security/limits.d'
 mkdir -p './security/namespace.d'
 mkdir -p './skel/.ssh'
-mkdir -p './sudoers.d'
 mkdir -p './systemtap'
 mkdir -p './udev/hwdb.d'
 maybe chmod 0755 '.'
@@ -180,6 +179,10 @@ maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog.dist.new'
 maybe chmod 0755 'config-archive/etc/mysql'
 maybe chmod 0644 'config-archive/etc/mysql/my.cnf'
 maybe chmod 0644 'config-archive/etc/mysql/my.cnf.dist.new'
+maybe chmod 0755 'config-archive/etc/portage'
+maybe chmod 0755 'config-archive/etc/portage/package.accept_keywords'
+maybe chmod 0644 'config-archive/etc/portage/package.accept_keywords/common'
+maybe chmod 0644 'config-archive/etc/portage/package.accept_keywords/common.dist'
 maybe chmod 0644 'config-archive/etc/resolvconf.conf'
 maybe chmod 0644 'config-archive/etc/resolvconf.conf.dist.new'
 maybe chmod 0644 'config-archive/etc/rsyslog.conf'
@@ -1970,7 +1973,6 @@ maybe chmod 0644 'ssmtp/revaliases'
 maybe chgrp 'ssmtp' 'ssmtp/ssmtp.conf'
 maybe chmod 0640 'ssmtp/ssmtp.conf'
 maybe chmod 0440 'sudoers'
-maybe chmod 0750 'sudoers.d'
 maybe chmod 0440 'sudoers.dist'
 maybe chmod 0644 'sysctl.conf'
 maybe chmod 0755 'sysctl.d'

diff --git a/config-archive/etc/portage/package.accept_keywords/common b/config-archive/etc/portage/package.accept_keywords/common
new file mode 100644 (file)
index 0000000..8ead334
--- /dev/null
+++ b/config-archive/etc/portage/package.accept_keywords/common
@@ -0,0 +1,27 @@
+
+
+app-misc/ddate
+
+~app-text/groonga-6.1.2
+~app-text/groonga-normalizer-mysql-1.1.1
+
+~dev-cpp/cpp-hocon-0.1.4
+
+~dev-db/xtrabackup-bin-2.4.6
+# ~dev-db/mariadb-10.1.22
+~dev-db/mariadb-10.1.23
+~dev-db/mycli-1.7.1
+dev-db/oracle-instantclient
+
+~dev-java/leiningen-bin-2.7.1
+
+~dev-libs/libgcrypt-1.5.6
+
+~dev-util/quilt-0.65
+
+~net-nds/phpldapadmin-1.2.3
+
+=sys-kernel/gentoo-sources-4.12.12
+~sys-kernel/gentoo-sources-4.14.12
+~sys-kernel/gentoo-sources-4.14.32
+~sys-kernel/gentoo-sources-4.14.41

diff --git a/config-archive/etc/portage/package.accept_keywords/common.dist b/config-archive/etc/portage/package.accept_keywords/common.dist
new file mode 100644 (file)
index 0000000..67b917c
--- /dev/null
+++ b/config-archive/etc/portage/package.accept_keywords/common.dist
@@ -0,0 +1,27 @@
+
+
+app-misc/ddate
+
+~app-text/groonga-6.1.2
+~app-text/groonga-normalizer-mysql-1.1.1
+
+~dev-cpp/cpp-hocon-0.1.4
+
+# move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin
+~dev-db/percona-xtrabackup-bin-2.4.6
+# ~dev-db/mariadb-10.1.22
+~dev-db/mariadb-10.1.23
+~dev-db/mycli-1.7.1
+dev-db/oracle-instantclient
+
+~dev-java/leiningen-bin-2.7.1
+
+~dev-libs/libgcrypt-1.5.6
+
+~dev-util/quilt-0.65
+
+~net-nds/phpldapadmin-1.2.3
+
+=sys-kernel/gentoo-sources-4.12.12
+~sys-kernel/gentoo-sources-4.14.12
+~sys-kernel/gentoo-sources-4.14.32

diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common
index a80e5fe3b280eba4d50b76e0eb71fd156e62d01c..185ac6aec5091233f40f778d781d05c96755d26c 100644 (file)
--- a/portage/package.accept_keywords/common
+++ b/portage/package.accept_keywords/common
@@ -7,7 +7,8 @@ app-misc/ddate
 
 ~dev-cpp/cpp-hocon-0.1.4
 
-~dev-db/xtrabackup-bin-2.4.6
+# move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin
+~dev-db/percona-xtrabackup-bin-2.4.6
 # ~dev-db/mariadb-10.1.22
 ~dev-db/mariadb-10.1.23
 ~dev-db/mycli-1.7.1
@@ -24,3 +25,4 @@ dev-db/oracle-instantclient
 =sys-kernel/gentoo-sources-4.12.12
 ~sys-kernel/gentoo-sources-4.14.12
 ~sys-kernel/gentoo-sources-4.14.32
+~sys-kernel/gentoo-sources-4.14.41

diff --git a/portage/package.use b/portage/package.use
index b0530a91f3102ab7493f7b027dfe1f4bebd1f53b..3350d1c575ab7960ed8ecae8de3161eded9e542f 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -1,6 +1,6 @@
 
 app-admin/puppet               augeas diff doc shadow
-app-admin/rsyslog               mdblookup normalize omudpspoof relp rfc3195 rfc5424hmac snmp usertools zeromq
+app-admin/rsyslog               kubernetes mdblookup normalize omudpspoof relp rfc3195 rfc5424hmac snmp usertools zeromq
 app-admin/salt                  keyring ldap libcloud libvirt mako neutron nova openssl portage raet timelib
 app-admin/sudo                 offensive openssl
 app-admin/syslog-ng             dbi