Fix nswrapper install issue and clean up ewarn/elog messages a bit

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

3 files changed, 13 insertions, 6 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 52dd5e85e604..e8ec2b90c357 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.44 2010/08/12 12:40:03 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.45 2010/08/13 12:47:22 lack Exp $
+
+  13 Aug 2010; Jim Ramsay <lack@gentoo.org>
+  adobe-flash-10.1.82.76-r1.ebuild:
+  Fix nswrapper install issue and clean up ewarn/elog messages a bit
 
   12 Aug 2010; Jim Ramsay <lack@gentoo.org> -adobe-flash-10.1.53.64.ebuild,
   -adobe-flash-10.1.53.64-r1.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index f7a92a7b0578..d2d0d23b9bd0 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -5,8 +5,8 @@ DIST flash-plugin-10.1.82.76-release.i386.rpm 4901493 RMD160 be2f14dfae030c5cbfe
 DIST install_flash_player_9.tar.gz 3064515 RMD160 3789d59f8586bef05e0fbf180f7af095ffe6b5b4 SHA1 2eacd5ad186f1b90bab2999cca3f9cd3b039459c SHA256 f18b60b79e1501d095a6cb7f9d91de737dce6a5c9905348607c22b82d7cd0fda
 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-r2.ebuild 5606 RMD160 b78a0161a874c6121d9de87263b51c54f937f953 SHA1 61f477b751699bdaf0f10276d4e68dae200fba3c SHA256 e7501c56ad0667b7adb950c22b6345b3b718ffe28fe1977dc41c3e55f2374153
-EBUILD adobe-flash-10.1.82.76-r1.ebuild 5382 RMD160 127ca4a8fa34663f7f03abbcba9876f3de71c85f SHA1 0618c47ef63997df006e2335ed2254735e8aeacc SHA256 8659a6207c26c839622025b9b576a1b55b9187d3be8ba2f3695cdf24a271a57f
+EBUILD adobe-flash-10.1.82.76-r1.ebuild 5412 RMD160 b610b56117acaae4dcd243d03e2baa15949ab7e4 SHA1 cb20137377b7660c2c60350643c1c2c2bd56ad74 SHA256 1caee1b2cdf8b1f655182be6bdb571e743e7a6f907f3355509f4557334a631cc
 EBUILD adobe-flash-10.1.82.76.ebuild 5174 RMD160 ad4f2f2d572bc26d48031adc2a2658a79dae6c35 SHA1 82b43faee089e843e78b09780d65d86367002bd5 SHA256 b591a558d0ac109d1bb1c4f35bef2397f8926969399f0b9a276dd4b582e00823
 EBUILD adobe-flash-9.0.208.0.ebuild 1701 RMD160 2d7b899a48ca26685c26094ceb07495ac13524a6 SHA1 2a7d5510e196a4bebe31c3b05c872ca85675f3a8 SHA256 00f3f0779e7b9d059eb7df3c79ccaee5587b2f8d265f140b39570a44b7b22f80
-MISC ChangeLog 24878 RMD160 d287219e6b439abfcbeba011a8665f62a4d3a508 SHA1 08e99c1501e3086e546cb1111b0c52769a6f7cee SHA256 393f8f7dc302abf6e85fb7466e96f0fa891e9c1bd5f3e1cc53f801f4374becc1
+MISC ChangeLog 25028 RMD160 1b16f986c365b2dd9cd81c3ea39bbf682b8cbcc9 SHA1 2b0fd8cd50313c28169f016b1f16067406408d8d SHA256 f619311ce007d57dfa9bc6cb2a65f0f4a68b70468896eee0befcf764686795ff
 MISC metadata.xml 762 RMD160 eb5dcd4ca6ad5e4bb661d0166bc03c2e1ed83bae SHA1 6560e0b9497f011033fbf08919a6c99de1a816c9 SHA256 d4cf7c284e2a031b7ca3abc2788a1a84ff1a1447e82928c6f20fcbe1eeb594c3
diff --git a/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.ebuild
index e002e558fbaa..57eb9dee5c1e 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.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.82.76-r1.ebuild,v 1.2 2010/08/12 14:24:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.ebuild,v 1.3 2010/08/13 12:47:22 lack Exp $
 
 EAPI=1
 inherit nsplugins rpm multilib toolchain-funcs
@@ -113,6 +113,7 @@ pkg_postinst() {
 		elog "Adobe has released 10.1 in only a 32-bit version and upgrading"
 		elog "is required to close a major security vulnerability:"
 		elog "  http://bugs.gentoo.org/322855"
+		elog
 		if has_version 'www-plugins/nspluginwrapper'; then
 			if [[ $native_install ]]; then
 				# Note: This code branch is dead (no native 64-bit flash player
@@ -134,25 +135,27 @@ pkg_postinst() {
 					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]"
+					elog
 				fi
 			else
 				einfo "nspluginwrapper detected: Installing plugin wrapper"
 				local oldabi="${ABI}"
 				ABI="x86"
-				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}/libflashplayer.so"
+				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
 				nspluginwrapper -i "${FLASH_SOURCE}"
 				ABI="${oldabi}"
-
 				ewarn "Using adobe-flash-10.1 in a 64-bit browser is unstable:"
 				ewarn "  http://bugs.gentoo.org/324365"
 				ewarn "The recommended configuration is to use the 32-bit plugin"
 				ewarn "in a 32-bit browser such as www-client/firefox-bin"
+				elog
 			fi
 		elif [[ ! $native_install ]]; then
 			elog "To use the 32-bit flash player in a native 64-bit firefox,"
 			elog "you must install www-plugins/nspluginwrapper, though this"
 			elog "configuration is not recommended:"
 			elog "  http://bugs.gentoo.org/324365"
+			elog
 		fi
 	fi