Update euse to look for /etc/portage/make.conf as well as /etc/make.conf. Bug 346519

svn path=/trunk/gentoolkit/; revision=866

diff --git a/bin/euse b/bin/euse
index 3cd9127a9dc25f316285281dae18dfcb69f7f907..eb636d5aac01cd6b0e9ef4608648cde5ea4f9471 100755 (executable)
--- a/bin/euse
+++ b/bin/euse
@@ -9,7 +9,20 @@
 PROGRAM_NAME=euse
 VERSION="svn"
 
-MAKE_CONF_PATH=/etc/make.conf
+error() {
+       echo "ERROR: ${1}"
+       set +f
+       exit 1
+}
+
+# Portage now supports make.conf in /etc and /etc/portage
+if [ -r /etc/make.conf ]; then
+       MAKE_CONF_PATH=/etc/make.conf
+elif [ -r /etc/portage/make.conf ]; then
+       MAKE_CONF_PATH=/etc/portage/make.conf
+else
+       error "make.conf file is not readable"
+fi
 MAKE_GLOBALS_PATH=/etc/make.globals
 MAKE_PROFILE_PATH=/etc/make.profile
 MAKE_CONF_BACKUP_PATH=/etc/make.conf.euse_backup
@@ -49,12 +62,6 @@ parse_arguments() {
        done
 }
 
-error() {
-       echo "ERROR: ${1}"
-       set +f
-       exit 1
-}
-
 get_real_path() {
        set -P
        cd "$1"