From: Ulrich Müller <ulm@gentoo.org>
Date: Fri, 13 Dec 2019 15:11:01 +0000 (+0100)
Subject: net-analyzer/metasploit: Assign RESTRICT only once.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6209ff94fa9f8cae55a8274fc34320d10a808f76;p=gentoo.git

net-analyzer/metasploit: Assign RESTRICT only once.

Closes: https://bugs.gentoo.org/699202
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index 7b2bcb7d0de2..f06d33d3ee27 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
@@ -31,7 +31,7 @@ IUSE="development +java nexpose oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
+RESTRICT="strip test"
 
 #grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
@@ -128,8 +128,6 @@ COMMON_DEPEND="dev-db/postgresql[server]
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
 
-RESTRICT+=" strip"
-
 QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
 	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 6a64282832d5..54db9b0d61c9 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -31,7 +31,7 @@ IUSE="development +java nexpose oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
+RESTRICT="strip test"
 
 #grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
@@ -127,8 +127,6 @@ COMMON_DEPEND="dev-db/postgresql[server]
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
 
-RESTRICT+=" strip"
-
 QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
 	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin