saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 01812e5c25598d37b4ada3524c48fa65fb3efa20..c70433bc7b7e0ca30f2e7ba579cca30b1a65a402 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2315,6 +2315,8 @@ maybe chmod 0755 'portage'
 maybe chmod 0644 'portage/bashrc'
 maybe chmod 0755 'portage/env'
 maybe chmod 0644 'portage/env/nopie.conf'
+maybe chmod 0755 'portage/env/sys-apps'
+maybe chmod 0644 'portage/env/sys-apps/systemd'
 maybe chmod 0644 'portage/make.conf'
 maybe chmod 0755 'portage/package.accept_keywords'
 maybe chmod 0644 'portage/package.accept_keywords/common'

diff --git a/portage/bashrc b/portage/bashrc
index cdc1e7ee4dcf24061e84dca1bd2ad8e0bd52a16e..d15eef271e65afe12aa976446d44b977f456f762 100644 (file)
--- a/portage/bashrc
+++ b/portage/bashrc
@@ -1,3 +1,13 @@
+#!/bin/bash
+
+for conf in ${PN} ${PN}:${SLOT} ${PN}-${PV} ${PN}-${PV}-${PR}; do
+    e=/etc/portage/env/${CATEGORY}/${conf}
+    if [[ -f ${e} ]]; then
+        einfo "Reading environment from ${e}"
+        . ${e}
+    fi
+done
+
 case "${EBUILD_PHASE}" in
        preinst|prerm) etckeeper pre-install ;;
        postinst|postrm) etckeeper post-install ;;

diff --git a/portage/env/sys-apps/systemd b/portage/env/sys-apps/systemd
new file mode 100644 (file)
index 0000000..8378c1a
--- /dev/null
+++ b/portage/env/sys-apps/systemd
@@ -0,0 +1,3 @@
+ABI_X86="64"
+
+# vim: noai : ts=4 fenc=utf-8 filetype=sh

diff --git a/portage/package.use b/portage/package.use
index 8383675e226bb977451ccd2c700a19abb9094d3f..6f9bcba14272090be2b9ab7c1291eb5462429cad 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -427,6 +427,7 @@ sys-apps/openrc                             audit
 sys-apps/paludis                       glsa inquisitio qa visibility
 sys-apps/pciutils                      dns network-cron -zlib
 sys-apps/portage                       epydoc gentoo-dev native-extensions python3
+#sys-apps/systemd                      -abi_x86_32 -abi86_x86_32 libidn2 -sysv-utils
 sys-apps/systemd                       libidn2 -sysv-utils
 sys-apps/usbutils                      network-cron
 sys-apps/util-linux                    ddate loop-aes python_single_target_python3_5 tty-helpers