From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 3 Dec 2006 19:17:06 +0000 (-0000)
Subject: drop RESTRICT=stricter since every aspect it covers can be handled properly via other... 
X-Git-Tag: v2.1.2~405
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e24d26625f3ecd5ecef6ad82e81dbb75114a456;p=portage.git

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

svn path=/main/trunk/; revision=5164
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index bbfab8456..b0c7e571f 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -47,7 +47,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
 		
@@ -63,7 +63,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}"
@@ -161,7 +161,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