From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 3 Dec 2006 20:05:39 +0000 (-0000)
Subject: Merged from trunk 5163:5164
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4be3679c325af4c3ab316f82fb82a0273ccf21af;p=portage.git

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 09268dae3..497952149 100644
--- 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