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

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 14 insertions, 32 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/Manifest b/www-plugins/adobe-flash/Manifest
index dd0ba7463a26..ef9d3afa4c5e 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -9,14 +9,14 @@ DIST adobe-flash-11.2.202.291-debug.i386.tar.gz 7401909 SHA256 55b83ecfcc6ed307d
 DIST adobe-flash-11.2.202.291.i386.tar.gz 6923403 SHA256 513abbfd9e4d7115c00264d82654ad226aa22f44e837301ccd0dd0e81de3a1f6 SHA512 f4aa275b6c97a4cb04a8bb5aafcb53bc193e69a78e78b34f79a84abec76bb52de512b311d75f037a4c8fee7bf8b370d37e53d75dbf54eaff91f7ad7d4c939cf5 WHIRLPOOL 34c099d12a449de15e0a9b22bd62f6f360f63dead1ec0ae3c444281e20fc5b94b8d7cd09a91caa56aa12de80ab2e2bc7b178923244317b3d267f5a3d1760e711
 DIST adobe-flash-11.2.202.291.x86_64.tar.gz 7234043 SHA256 eb2c827e334a6d21b6285f78c81c335bd51c412b6c7459e599d543bac6f40ab7 SHA512 d882c5b11a2fa7d4a47dbede3ef32270d8aa30e0eb294f8594ffbebf4640a2959e21f145a0fa536b61ba76ed41c8d1cc3c01f9a0c96308e013db1fb0083052a8 WHIRLPOOL 349f320699a7cc70af27611cf3812afdc4fa85ad046944c0a86f8c3909b9370006e4fd089551449cc828ee5abefa597b19e783002dcf5cf1e0cdc2c51f959548
 EBUILD adobe-flash-10.3.183.90.ebuild 3554 SHA256 3e0cfc0d2ba587e667236b275757e01cfa4451b6368a11475999114cdd08d2cb SHA512 9e94a5614b77288103c511da813b928f0493ad69c2bc292c23a78bd0ad401392a2f6dcdc3120ca9909c4a9d9d7c6dd751649bfffdd483a71b2ea0c77a9a3dc24 WHIRLPOOL 8b89d9f3253a9338ef07baca1fea74ccb71c6270a78e37d6c4b8653051cec9901dbfcd8f023887bc6b8c29501c90f091af7426ade213f598dbd50ad52139a68f
-EBUILD adobe-flash-11.2.202.291-r1.ebuild 8366 SHA256 cbf93b57611316e403d40451d17d682552787c0c09e5b8cd36a7f4d4418f0872 SHA512 e0742b90ca5a639a749b272cb72eb8335909116e698ba150ec29f34ec7278aced9ab7dc1a0677657540c3e2df4c4d709f3529c87d4ffae6a2f609bcff8684b72 WHIRLPOOL 13184f54c9dac0ecc86e6aca7b1cc03ae801799073ff53142ab4e0d4137c251ec57f80ebbb5bd71abfc622afa07a09a401d2278c9b115f9ca9908c8aa3dff3b8
+EBUILD adobe-flash-11.2.202.291-r1.ebuild 7439 SHA256 7e013af2380233a4423522cdd5169189c09c3e9b9d91eb8b635e4fee42b150ee SHA512 2a9f8a6dbcf57c0f005e6b1be8ad9a27d42f6ab37d5c6679b9a2b363861f49a8974ac94a67e6a9446389cb591eb873986c89ef7c2cf8fc5b7ac28571fbd341d6 WHIRLPOOL 47e50265b52d00c8398292cb74be068713876310e70fb15ca38cf9a1ec8fc0c210aceefee6f0dbdb0786d0fb0df0ad6026c5bf8964bd49b9a71903d0a018cf81
 EBUILD adobe-flash-11.2.202.291.ebuild 8087 SHA256 92816dd00c11e292b22fd1f0f57abb9402c1cf221d84f1e604b5492fbeae1d4f SHA512 6799460709c57c86e7cdc1a5cad39ac3f777a457cd22b519cfe0e03cce920831676ae13275af19c544b8f1d0ca84af53442bf67b8d2c920f376e57b8b8e35103 WHIRLPOOL 2ad480d57364eac84b9af8c80b10c62a195a51fda74b6bb3f3e03d9240ed2cb2f5d17a620656072c1f5a39576f2997760c4b79d13212e2636a7b37326c778eca
-MISC ChangeLog 51954 SHA256 50172709679f6f70fdec48550d8c72d07ec17c2a353dec180c579443e4344cb0 SHA512 2e4c853c74c4dc34f9f71bad06c63997f914a8ac2fc2236532fd57dfbe77a58d776a39209ad10cc05db9591ea9ebe3720726e19d1c6b2c8da4d514e84765870a WHIRLPOOL 94a7197e333766e95b61ad7de28db2383163d2cb2773d4edb15c9ada42343234abd3d28bd1212b24fc785376ffc500cb804c0bad06eb320965f3a18ac716be96
+MISC ChangeLog 52138 SHA256 215b67fce90f9187c1a41e5acd173f7c5ea1a2e4aff5ea7a1110e6c726d72865 SHA512 664a4644969d10d65f93d56eb43d0fb9fab93beda5083dfbb3481413b1edaee5cebe13b61bfe1f2238bbeeaf60185b28ac314b11488216d74861825749810973 WHIRLPOOL 777de64a7eb3c20b3f4a60cf440ba4366a5dc13815dc199aa5ea532cfec6f53f58f8a22d77376962f7371f92731a37928b0ae8520aa92203d295203d2209cd67
 MISC metadata.xml 910 SHA256 ce8ddbe474e3b8e3cb069714254b6315f4a315092ea26f4c012f2516fbf4c7f3 SHA512 1ad409756e0c76fa4e5b6b7570eaceac505a7d922d307b0a0ed1a92212c08933d8519f58db5c54a2b3fa321cc647e7f98d3d7ab7755899f054139abb09618984 WHIRLPOOL 36af66ef3e829090c20e9d97ad78228725580979a91a6c1c2708d1ea877dd5d81dffe39c13f79dc0719883f042ae3997a90931f946b0d044a4c1141601e4cec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG5xJoACgkQVWmRsqeSphNXLACfU0mDUR86PoCAmGCma+4RbBCE
-Al8Anj0HOKM4UudOJz2/qOLDcWxVq6O3
-=Hgz6
+iEYEAREIAAYFAlHA8NMACgkQVWmRsqeSphMfvgCeJJf23Xb48ve6PWpfqvNrZsyD
+mrEAnRiR70V3JkeQKIQCY+Ok/HGaLn31
+=OKCx
 -----END PGP SIGNATURE-----
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