Reintroduce ~amd64 for 10.1, but do not automatically invoke nspluginwrapper (Bug #324356)

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

3 files changed, 52 insertions, 42 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 33dd57ea53f6..9693578ea9f6 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.28 2010/06/17 13:42:44 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.29 2010/06/18 18:16:08 lack Exp $
+
+  18 Jun 2010; Jim Ramsay <lack@gentoo.org> adobe-flash-10.1.53.64.ebuild:
+  Reintroduce ~amd64 for 10.1, but do not automatically invoke
+  nspluginwrapper (Bug #324356)
 
 *adobe-flash-9.0.277.0 (17 Jun 2010)
 
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 90f9ad3c1b6c..0fb08d34d9be 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -7,7 +7,7 @@ DIST install_flash_player_9.tar.gz 3064514 RMD160 6adde6cafc02ddef8e7698e31d9e1f
 DIST libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz 3731155 RMD160 9c1a269c25b88a062f2529c7943ae9f73c408c1a SHA1 88193dd555e1510ffac360e293558458e75a7118 SHA256 eeabb58a7bb71843cd99fbbb5ba77b6dce93018bfcff579f6f89327a990074d6
 EBUILD adobe-flash-10.0.45.2-r1.ebuild 5570 RMD160 23042c93827381a93ac7f9d3f262772e1cb13362 SHA1 fe26306fbaee82c34bdca797a9ab2e8cba13d604 SHA256 0058ae7a2d67a565993d3b284e9a71d083b95d94efdcf4ad6605106cffc5935a
 EBUILD adobe-flash-10.0.45.2.ebuild 6183 RMD160 7edf856be492869869d4cd125569d9b635566807 SHA1 4d85e459450d06659521410902ddd69df8b958f3 SHA256 8b573fa7ddaa6d7c53de6f1b1950c86e7bea365a8f208f681e8803ed202f241c
-EBUILD adobe-flash-10.1.53.64.ebuild 4923 RMD160 5f94fd785bdb7825b01c63833dfad94b6f9a5e9e SHA1 c303a85bf7ff587ec53a90bba2a17ecf4627b128 SHA256 5c84b7869c5efc39c4e276280996112c0e983a417d38ac8b6d5a9e4f300f9c4d
+EBUILD adobe-flash-10.1.53.64.ebuild 5206 RMD160 21dc8e0c6fe8c844efd228fcbb38fb08265c8839 SHA1 322f857ea935539919054ff4588e4ca6fcbc38bf SHA256 a8d906d9d4855d781a4cfddf94175008e772d146265235febc4e5ec71902e0eb
 EBUILD adobe-flash-9.0.277.0.ebuild 1626 RMD160 410409527632f46f7c2d23e9a6d71e69f05c809c SHA1 cad1b3a384687ef8ea01c538d7d5a3b33ee158a1 SHA256 019d7d4bcf6ad1e87cba29ff59bf965be3dc59d82564f29d1ce728f64a62e5a8
-MISC ChangeLog 22196 RMD160 f86f6e7f660ff52d60d87f09b73f2f31a8827b29 SHA1 98ad76cd2579793d965bd0e7cd6f361c5adcfcf2 SHA256 41933f47925057cf0f5fa7f711fe99a2cf0a205bd43476b93526bdf8e3141b76
+MISC ChangeLog 22367 RMD160 1b7e2032f6389253b65aade4de21098408278a82 SHA1 4ba7de8533a9ae49861cd166c10fadf0631ddf72 SHA256 2e5347957c4b247714df55527a71ec15688f3aff90f8b2d424375b31c1d6e132
 MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6
diff --git a/www-plugins/adobe-flash/adobe-flash-10.1.53.64.ebuild b/www-plugins/adobe-flash/adobe-flash-10.1.53.64.ebuild
index 8418ad70ea46..db73a3dadfea 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.1.53.64.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.1.53.64.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1.53.64.ebuild,v 1.4 2010/06/16 12:05:53 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.1.53.64.ebuild,v 1.5 2010/06/18 18:16:08 lack Exp $
 
 EAPI=1
 inherit nsplugins rpm multilib toolchain-funcs
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.adobe.com/"
 IUSE="multilib"
 SLOT="0"
 
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 LICENSE="AdobeFlash-10.1"
 RESTRICT="strip mirror"
 
@@ -31,8 +31,7 @@ EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100409
 	app-emulation/emul-linux-x86-xlibs"
 
 RDEPEND="x86? ( $NATIVE_DEPS )
-	amd64? ( $EMUL_DEPS
-		www-plugins/nspluginwrapper )
+	amd64? ( $EMUL_DEPS )
 	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
 
 # Ignore QA warnings in these binary closed-source libraries, since we can't fix
@@ -109,42 +108,49 @@ src_install() {
 
 pkg_postinst() {
 	if use amd64; then
-		elog "Adobe has released 10.1 in only a 32-bit version so far and"
-		elog "upgrading is required to close a major security exploit[1]."
-		elog "You will be going back to a 32-bit plugin with nswrapper until"
-		elog "Adobe decides otherwise."
-		elog "  [1] http://bugs.gentoo.org/322855"
+		elog "Adobe has released 10.1 in only a 32-bit version and upgrading"
+		elog "is required to close a major security exploit:"
+		elog "  http://bugs.gentoo.org/322855"
 		elog
-		if has_version 'www-plugins/nspluginwrapper'; then
-			if [[ $native_install ]]; then
-				# TODO: Perhaps parse the output of 'nspluginwrapper -l'
-				#       However, the 64b flash plugin makes 'nspluginwrapper -l' segfault.
-				local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
-				if [[ -f ${FLASH_WRAPPER} ]]; then
-					einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
-					nspluginwrapper -r "${FLASH_WRAPPER}"
-				fi
-				if [[ $need_lahf_wrapper ]]; then
-					ewarn "Your processor does not support the 'lahf' instruction which is used"
-					ewarn "by Adobe's 64-bit flash binary.  We have installed a wrapper which"
-					ewarn "should allow this plugin to run.  If you encounter problems, please"
-					ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
-					ewarn "  ${CATEGORY}/$PN[+32bit -64bit]"
-				fi
-			else
-				oldabi="${ABI}"
-				ABI="x86"
-				local FLASH_SOURCE="${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}/libflashplayer.so"
-
-				einfo "nspluginwrapper detected: Installing plugin wrapper"
-				nspluginwrapper -i "${FLASH_SOURCE}"
-
-				ABI="${oldabi}"
-			fi
-		elif [[ ! $native_install ]]; then
-			einfo "To use the 32-bit flash player in a native 64-bit firefox,"
-			einfo "you must install www-plugins/nspluginwrapper"
-		fi
+		elog "Furthermore, there are stability problems when running 10.1 in a"
+		elog "64-bit browser with nspluginwrapper.  The current recommended"
+		elog "configuration is to use a 32-bit browser such as"
+		elog "www-client/firefox-bin:"
+		elog "  http://bugs.gentoo.org/324356"
+		elog
+		# Temporarily skip automatic nspluginwrapper stuff, since it is fraught
+		# with peril (Bug #324365):
+		#
+		#if has_version 'www-plugins/nspluginwrapper'; then
+		#	if [[ $native_install ]]; then
+		#		# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+		#		#       However, the 64b flash plugin makes 'nspluginwrapper -l' segfault.
+		#		local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+		#		if [[ -f ${FLASH_WRAPPER} ]]; then
+		#			einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+		#			nspluginwrapper -r "${FLASH_WRAPPER}"
+		#		fi
+		#		if [[ $need_lahf_wrapper ]]; then
+		#			ewarn "Your processor does not support the 'lahf' instruction which is used"
+		#			ewarn "by Adobe's 64-bit flash binary.  We have installed a wrapper which"
+		#			ewarn "should allow this plugin to run.  If you encounter problems, please"
+		#			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
+		#			ewarn "  ${CATEGORY}/$PN[+32bit -64bit]"
+		#		fi
+		#	else
+		#		oldabi="${ABI}"
+		#		ABI="x86"
+		#		local FLASH_SOURCE="${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}/libflashplayer.so"
+		#
+		#		einfo "nspluginwrapper detected: Installing plugin wrapper"
+		#		nspluginwrapper -i "${FLASH_SOURCE}"
+		#
+		#		ABI="${oldabi}"
+		#	fi
+		#elif [[ ! $native_install ]]; then
+		#	einfo "To use the 32-bit flash player in a native 64-bit firefox,"
+		#	einfo "you must install www-plugins/nspluginwrapper"
+		#fi
 	fi
 
 	ewarn "Flash player is closed-source, with a long history of security"