Removing nspluginwrapper USE flag, bug #360235

Package-Manager: portage-2.1.9.34/cvs/Linux i686

4 files changed, 14 insertions, 21 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index aa3dc93e760b..c2cc2d16a3d1 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.71 2011/03/24 14:20:12 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.72 2011/03/28 12:51:55 lack Exp $
+
+  28 Mar 2011; Jim Ramsay <lack@gentoo.org> adobe-flash-10.2.153.1.ebuild,
+  adobe-flash-10.2.153.1_p201011173.ebuild:
+  Removing nspluginwrapper USE flag, bug #360235
 
   24 Mar 2011; Christoph Mende <angelos@gentoo.org>
   adobe-flash-10.2.153.1.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 4c11a7a4116e..90a04e358ed2 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d
 AUX memcpy-to-memmove.sh 1418 RMD160 322005bfe0717630b945eb71ae4aa808a1d14d5e SHA1 72ee58862db06ee235055123137604619273819f SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096
 AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a
@@ -13,15 +10,8 @@ EBUILD adobe-flash-10.1.102.64.ebuild 5420 RMD160 e0bbbe87ca4235bc18b04c859579d6
 EBUILD adobe-flash-10.2.152.27.ebuild 5525 RMD160 c0a31ea0a1f593f3e0d005c943c77674ac0ddc9b SHA1 07814a538c2ea6b53af0032f767b817706766e5c SHA256 ad1569f02cef387b49501443df745815c7cdcdf40502d8139c20ae28ba54cead
 EBUILD adobe-flash-10.2.152.27_p201011173-r1.ebuild 6664 RMD160 b720447aa8d06c2f0e360ced84e29d05e80e4c63 SHA1 c85a0f0b42d9aa1537fc2be028f8ef6331d5c2cf SHA256 13c58e9e9daa07ae2095fb169d5412e5b6724ca243c93d96ddeb57644b57a08e
 EBUILD adobe-flash-10.2.152.27_p201011173-r2.ebuild 7104 RMD160 70b4a78f1736ab55d1c7871b2f168e17c9565994 SHA1 af441792a7ffe93abb604430f47a61da4b05fb9e SHA256 6147b2966b52ab222077514cc7ac7ade0049bbb8b0a6dce3639710d9ef28f1a7
-EBUILD adobe-flash-10.2.153.1.ebuild 5518 RMD160 f017b55aabed9fca3fd6c6cf92620e607c7fa0fc SHA1 ebde467ed22e2595e4426f64f1cb785f27ae59ae SHA256 07c597060185b9740ab3ee5d9f1ad46ded6388fa61713f56b2963b5b1cfeda68
-EBUILD adobe-flash-10.2.153.1_p201011173.ebuild 7101 RMD160 d6de8797d45d61049f78f0662fb029369bb7a711 SHA1 cf03d690f3fcaaf231436c623b45f83d270abd38 SHA256 698bd044e67a998c5ecada5ec4ba413d3d19224c5bf560cdcd2b66bc7528833d
+EBUILD adobe-flash-10.2.153.1.ebuild 5477 RMD160 09d9369e2478fba80214e47af6c14f213659cb15 SHA1 c75da6974c46c0f2f4b26a2298d3a74cf507804d SHA256 c36482e899a2dea18ca1682c6554072e068f5a77300ce3c52ae630e27e9dd17f
+EBUILD adobe-flash-10.2.153.1_p201011173.ebuild 7063 RMD160 72f48b72a412dec40fb5224e8bf38d10c4df967a SHA1 632f0a8458c59c4cae4436e48afa9e40a4c46359 SHA256 9a710652bae58c550439c1b53120efd21918786154f69112932d018350a0347c
 EBUILD adobe-flash-9.0.289.0.ebuild 1784 RMD160 4ab05470e71f2d6eb9bbbea082e0b315439a1a43 SHA1 ed5c641d06bb52b99f670c921ad00d249b46c87a SHA256 945cfbb1141497499aafed9b371df02d05d35c0fe5dccd9316e0e05de83a2b87
-MISC ChangeLog 31288 RMD160 d4ccb6ccd272d529cc9a88eb77b7763dc2a9689f SHA1 cf8fdf5dedf748354f41373f6411835dd55beaf5 SHA256 9207990d0ef4f03f3c7fb3b65f38157177c664a03de815af2b8d8716587adf9b
+MISC ChangeLog 31454 RMD160 bbeab463c385d7cbb87f440284f019edd08764c0 SHA1 b5d88ce9a968371d1767b4f9af2866b860d1807b SHA256 9ee53cedb03a123e2baca9abf3bc0273d6f116e9304795eb1fc575f81effb0c6
 MISC metadata.xml 871 RMD160 ac48ff7d977e5186b001c20b6e8e0efa8b08cbce SHA1 fa5753208d813b3b5567e857777ab91a3dde2f0f SHA256 2b80f87d99387c862da9e79507dc7b06b827a402d5d2344126ee627712cf85e0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk2LUwIACgkQmWq1bYTyC0OYGgEAkwk8mHnuOhKXQSOlUmd5ELO8
-C6NBDVBc6GKOlysxMBoA/3jv6ht5UUad/hNp6um+lUaVf9xPzSt4Z1LvGR1E5XAw
-=JqYm
------END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.2.153.1.ebuild b/www-plugins/adobe-flash/adobe-flash-10.2.153.1.ebuild
index 0fb9222aea76..81d45b04be7d 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.2.153.1.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.2.153.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.153.1.ebuild,v 1.4 2011/03/24 14:20:12 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.153.1.ebuild,v 1.5 2011/03/28 12:51:55 lack Exp $
 
 EAPI=1
 inherit nsplugins rpm multilib toolchain-funcs
@@ -10,7 +10,7 @@ MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugi
 DESCRIPTION="Adobe Flash Player"
 SRC_URI="${MY_32B_URI}"
 HOMEPAGE="http://www.adobe.com/"
-IUSE="+nspluginwrapper vdpau"
+IUSE="vdpau"
 SLOT="0"
 
 KEYWORDS="-* amd64 x86"
@@ -30,7 +30,7 @@ EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
 	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
 	app-emulation/emul-linux-x86-soundlibs"
 
-DEPEND="amd64? ( nspluginwrapper? ( www-plugins/nspluginwrapper ) )"
+DEPEND="amd64? ( www-plugins/nspluginwrapper )"
 RDEPEND="x86? ( $NATIVE_DEPS )
 	amd64? ( $EMUL_DEPS )
 	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
diff --git a/www-plugins/adobe-flash/adobe-flash-10.2.153.1_p201011173.ebuild b/www-plugins/adobe-flash/adobe-flash-10.2.153.1_p201011173.ebuild
index 80582aa64397..4ae9a526e8b9 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.2.153.1_p201011173.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.2.153.1_p201011173.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.153.1_p201011173.ebuild,v 1.2 2011/03/23 19:17:31 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.153.1_p201011173.ebuild,v 1.3 2011/03/28 12:51:55 lack Exp $
 
 EAPI=3
 inherit rpm nsplugins multilib toolchain-funcs versionator
@@ -28,7 +28,7 @@ amd64? (
 )"
 #HOMEPAGE="http://www.adobe.com/"
 HOMEPAGE="http://labs.adobe.com/technologies/flashplayer10/"
-IUSE="multilib +nspluginwrapper +32bit +64bit vdpau bindist"
+IUSE="multilib +32bit +64bit vdpau bindist"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
@@ -48,8 +48,7 @@ EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
 	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
 	app-emulation/emul-linux-x86-soundlibs"
 
-DEPEND="amd64? ( multilib? ( 32bit? ( nspluginwrapper? (
-	www-plugins/nspluginwrapper ) ) ) )"
+DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )"
 RDEPEND="x86? ( $NATIVE_DEPS )
 	amd64? (
 		multilib? (