Replace IUSE=sse2check with IUSE=sse2 and add REQUIRED_USE=sse2 by Matt Turner (bug #410547).

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key A792A613)

2 files changed, 9 insertions, 27 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index d6334670511f..1c9c93663d29 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.202 2013/06/13 13:09:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.203 2013/06/18 23:44:18 jer Exp $
+
+  18 Jun 2013; Jeroen Roovers <jer@gentoo.org>
+  adobe-flash-11.2.202.291-r1.ebuild:
+  Replace IUSE=sse2check with IUSE=sse2 and add REQUIRED_USE=sse2 by Matt
+  Turner (bug #410547).
 
   13 Jun 2013; Jeroen Roovers <jer@gentoo.org>
   adobe-flash-11.2.202.291-r1.ebuild:
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild
index 4c4439e2111b..c20c58cb82f0 100644
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild,v 1.4 2013/06/13 13:09:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.291-r1.ebuild,v 1.5 2013/06/18 23:44:18 jer Exp $
 
 EAPI=4
 inherit nsplugins multilib toolchain-funcs versionator
@@ -31,7 +31,8 @@ SRC_URI="
 		!multilib? ( ${AF_64_URI} )
 	)
 "
-IUSE="-32bit +64bit debug kde multilib selinux +sse2check vdpau"
+IUSE="-32bit +64bit debug kde multilib selinux sse2 vdpau"
+REQUIRED_USE="sse2"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
@@ -81,30 +82,6 @@ any_cpu_missing_flag() {
 	grep '^flags' /proc/cpuinfo | grep -qv "$value"
 }
 
-pkg_pretend() {
-	if any_cpu_missing_flag 'sse2'; then
-		eerror "This version of adobe-flash requires a CPU that supports the"
-		eerror "SSE2 instruction set, and at least one of your CPUs does not"
-		eerror "support this feature."
-		eerror ""
-		if use sse2check; then
-			eerror "You should mask this version and use adobe-flash-10.3.* instead."
-			eerror "To do so, add the following line to your package.mask file:"
-			eerror " =${CATEGORY}/${P}"
-			eerror ""
-			eerror "Or if you are trying to build a binary package for another host"
-			eerror "that does support SSE2 instructions, you may override this"
-			eerror "check by setting USE=\"-sse2check\""
-			eerror ""
-			die "${P} requires CPU with SSE2"
-		else
-			eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash"
-			eerror "will not function unless all of the CPUs on the system where it"
-			eerror "is installed support the SSE2 instruction set."
-		fi
-	fi
-}
-
 pkg_setup() {
 	if use x86; then
 		export native_install=1