[gentoo-commits] proj/elfix:master commit in: scripts/, /

[Anthony G. Basile]

commit:     0c769ad9174df3da0bec260f675d64c5b40d7061
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 21:23:29 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 22:48:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=0c769ad9

scripts/paxmark.sh: make.conf can be a directory

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 ChangeLog          |  4 ++++
 scripts/paxmark.sh | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d9993b1..f602585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-03
+
+       * scripts/paxmark.sh: make.conf can be a directory
+
 2014-12-22
 
        * scripts/paxmark.sh: remove erroneous elog functions

diff --git a/scripts/paxmark.sh b/scripts/paxmark.sh
index 408e6aa..9d151f0 100755
--- a/scripts/paxmark.sh
+++ b/scripts/paxmark.sh
@@ -87,6 +87,14 @@ paxmarksh() {
 }
 
 MAKE_CONF="/etc/portage/make.conf"
-[[ -e $MAKE_CONF ]] && source $MAKE_CONF
+
+if [[ -d $MAKE_CONF ]]; then
+       for MC in $MAKE_CONF/*; do
+               source $MC
+       done
+elif [[ -e $MAKE_CONF ]]; then
+       source $MAKE_CONF
+fi
+
 PAX_MARKINGS=${PAX_MARKINGS:="PT"}
 paxmarksh "$@"