Merged from trunk 5163:5164

drop RESTRICT=stricter since every aspect it covers can be handled
properly via other means

svn path=/main/branches/prefix/; revision=5165

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 09268dae3e73eb354eadd1582d109b09c17cc9a9..497952149810560ac9eabe71c45ca5fcc9061490 100644 (file)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -46,7 +46,7 @@ install_qa_check() {
                local qa_var insecure_rpath=0 tmp_quiet=${PORTAGE_QUIET}
                
                # display warnings when using stricter because we die afterwards
-               if has stricter ${FEATURES} && ! has stricter ${RESTRICT}; then
+               if has stricter ${FEATURES} ; then
                        unset PORTAGE_QUIET
                fi
                
@@ -62,7 +62,7 @@ install_qa_check() {
                        vecho " with the maintaining herd of the package."
                        vecho "${f}"
                        vecho -ne '\a\n'
-                       if has stricter ${FEATURES} && ! has stricter ${RESTRICT}; then
+                       if has stricter ${FEATURES} ; then
                                insecure_rpath=1
                        else
                                vecho "Auto fixing rpaths for ${f}"
@@ -160,7 +160,7 @@ install_qa_check() {
 
                if [[ ${insecure_rpath} -eq 1 ]] ; then
                        die "Aborting due to serious QA concerns with RUNPATH/RPATH"
-               elif [[ -n ${die_msg} ]] && has stricter ${FEATURES} && ! has stricter ${RESTRICT} ; then
+               elif [[ -n ${die_msg} ]] && has stricter ${FEATURES} ; then
                        die "Aborting due to QA concerns: ${die_msg}"
                fi