saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common
index 654538059bc4e290d1931c6481c94c997b133e61..a77e28597c26ffdf773f76a0866f7cc7baef6a4b 100644 (file)
--- a/portage/package.accept_keywords/common
+++ b/portage/package.accept_keywords/common
@@ -1,5 +1,4 @@
 
-~app-admin/puppet-4.8.1
 
 app-misc/ddate
 
@@ -9,7 +8,7 @@ app-misc/ddate
 ~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.22
 ~dev-db/mariadb-10.1.23
 dev-db/oracle-instantclient
 
@@ -17,10 +16,5 @@ dev-db/oracle-instantclient
 
 ~dev-libs/libgcrypt-1.5.6
 
-~dev-ruby/facter-3.6.1
-~dev-ruby/hiera-3.2.2
-~dev-ruby/hiera-eyaml-2.1.0
-~dev-ruby/hiera-eyaml-plaintext-0.6
-
 ~net-nds/phpldapadmin-1.2.3
 

diff --git a/portage/package.accept_keywords/ruby b/portage/package.accept_keywords/ruby
index e13cdaec23e5e310f36d9fee009d6168614d4358..3bdccbec248aa32aee527a0a78747371db004312 100644 (file)
--- a/portage/package.accept_keywords/ruby
+++ b/portage/package.accept_keywords/ruby
@@ -1,4 +1,5 @@
 
+~app-admin/puppet-4.8.1
 ~app-admin/puppet-4.10.1
 
 ~app-eselect/eselect-ruby-20161226
@@ -6,6 +7,10 @@
 ~dev-lang/ruby-2.2.7
 
 ~dev-ruby/deep_merge-1.1.1
+#~dev-ruby/facter-3.6.1
+~dev-ruby/hiera-3.2.2
+~dev-ruby/hiera-eyaml-2.1.0
+~dev-ruby/hiera-eyaml-plaintext-0.6
 ~dev-ruby/json-2.0.4
 ~dev-ruby/kpeg-1.1.0
 ~dev-ruby/minitest-5.10.1

diff --git a/portage/package.use b/portage/package.use
index f9df79a172d941799bdc3c1f5c3dcde621585f96..8bc2850f44067908f5486409e8ab5e404786f0de 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -76,6 +76,8 @@ net-fs/samba                  client oav quotas syslog winbind
 
 net-ftp/lftp                    convert-mozilla-cookies verify-file
 
+net-libs/gnutls                        openpgp tools
+
 net-misc/iputils                arping caps clockdiff gcrypt gnutls rarpd rdisc tftpd tracepath traceroute
 net-misc/openssh                ldns