Current state

diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf
index 782d4f78201d72ba344399f59f0d2524d2996d74..aad69f422ee97ae39ca6b8cd260280c0272d68ae 100644 (file)
--- a/etckeeper/etckeeper.conf
+++ b/etckeeper/etckeeper.conf
@@ -5,7 +5,8 @@ VCS="git"
 #VCS="darcs"
 
 # Options passed to git commit when run by etckeeper.
-GIT_COMMIT_OPTIONS="--author 'Frank Brehm <frank.brehm@profitbricks.com>'"
+#GIT_COMMIT_OPTIONS="--author 'Frank Brehm <frank.brehm@profitbricks.com>'"
+GIT_COMMIT_OPTIONS=""
 
 # Options passed to hg commit when run by etckeeper.
 HG_COMMIT_OPTIONS=""

diff --git a/portage/package.keywords/common b/portage/package.keywords/common
index c6e1b2aed7a2775b741fb7a0a08ba79ccc8169cd..ec2f3f96d9ca1915dd65f20a3b5ae71d79148bdd 100644 (file)
--- a/portage/package.keywords/common
+++ b/portage/package.keywords/common
@@ -12,6 +12,7 @@ app-emulation/qemu
 
 app-misc/ddate
 
+~dev-python/backports-abc-0.4
 ~dev-python/configobj-5.0.5
 # =dev-python/configshell-9999 **
 ~dev-python/iniparse-0.4
@@ -79,5 +80,7 @@ sys-infiniband/librdmacm
 
 ~sys-kernel/gentoo-sources-3.5.7
 
+~virtual/python-backports_abc-0
+
 ~www-servers/tornado-4.2.1
 

diff --git a/portage/package.use b/portage/package.use
index 2a1938bc0ccd34184c7fa848f203f2f3c5d22608..c03a7647d08c4471cbc5cc67bc26c5866faf98d7 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -30,6 +30,7 @@ net-ftp/lftp                    convert-mozilla-cookies verify-file
 net-misc/iputils                caps gnutls
 net-misc/openssh                ldns
 
+sys-apps/busybox                pam
 sys-apps/etckeeper              cron
 sys-apps/irqbalance             caps numa
 sys-apps/openrc                 tools