Fix nspluginwrapper auto-install logic for amd64

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

3 files changed, 24 insertions, 18 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 050be33acef6..ae69e1013003 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.80 2011/05/14 01:29:18 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.81 2011/05/14 16:15:18 lack Exp $
+
+*adobe-flash-10.3.181.14-r1 (14 May 2011)
+
+  14 May 2011; Jim Ramsay <lack@gentoo.org> -adobe-flash-10.3.181.14.ebuild,
+  +adobe-flash-10.3.181.14-r1.ebuild:
+  Fix nspluginwrapper auto-install logic for amd64
 
   14 May 2011; Jim Ramsay <lack@gentoo.org> -adobe-flash-9.0.289.0.ebuild,
   -adobe-flash-10.1.102.64.ebuild, -adobe-flash-10.2.152.27.ebuild,
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index b2ffefb3ecc2..9f7b12ac2caf 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -9,23 +9,23 @@ DIST flash-plugin-10.3.181.14-release.i386.rpm 5446685 RMD160 2a2b4d456c1bc6e60b
 DIST flashplayer10_2_p3_64bit_linux_111710.tar.gz 4310219 RMD160 a57e8c4555545ca348f4b33e8c042c3f66e905f4 SHA1 a53ee83c02421f900fe25fd3738efd77932e542c SHA256 ef05f679f8977144621560587ffdf9bc81812e9941dea422e977070c9cd05ff0
 EBUILD adobe-flash-10.2.159.1.ebuild 5203 RMD160 517edb0d526593d8175a2930877199a452fd4626 SHA1 90a3f5cc0d6a9282cfa8cb2fbd548f4160ab747b SHA256 07dd4f85690cc0c3ad1ebc08922c221aee811a996a2963bf82a413c27e3aecfd
 EBUILD adobe-flash-10.2.159.1_p201011173.ebuild 7063 RMD160 37873f2c83eeb0eb06089958580fb8f2deab25a9 SHA1 a17550a27fa665bff135645cab194641974491ac SHA256 e9886879abfd1ebce26529545ada71cb1b253fd3f92ccb8ef2281e7d99b15a74
-EBUILD adobe-flash-10.3.181.14.ebuild 3965 RMD160 7dcc654faa1c58a15e6cb773d83c080c5cd7c3e5 SHA1 13ebb517b060356022fc311ca4db572523ceb2e1 SHA256 7821c2e699499f46295e3eacb29e075ed64b195dfe2c98a1dc03502c2fa750d5
-MISC ChangeLog 33026 RMD160 e078a0fc94d0dc91a34bbab2fc6ae60779a51b1e SHA1 20af1a6cbb052481b2a09e7e97683597ac4ef2ab SHA256 c0b255b34265b838ea588ea8309fa8bb2fd703ab6e2cf41a16e1c2d504303184
+EBUILD adobe-flash-10.3.181.14-r1.ebuild 3975 RMD160 17a876e3e291dbe37b76a393547f77ef1497143a SHA1 84709ae222fad53b14f56e8a0596bde62b13433e SHA256 9b4bdd1d87c015a7f922bbb527448e701e3c51504c76e33617230bee5bf43c68
+MISC ChangeLog 33236 RMD160 30872b32d9c4378046b351cc01ff3f814d3df674 SHA1 4408a734e430441209c36e2d5ac54012631c4262 SHA256 38b4f5eeee05704c7b1dfe1e14a24ac23537de4040ed900c94d3886cdad5e832
 MISC metadata.xml 785 RMD160 66fe1574aaa4e0b2c32320511af9287bf05b8f32 SHA1 3d5e100baaa390a48daf8157e9b99a770e20f2a9 SHA256 482fdb357cf00ce3781e61f35d555227bc4ad57d2a6f1bcfe0c69ed5ec1e517e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNzdr6AAoJEA8o5SF9Rr6qNL4P/1ZumKHqJqMumy+12cF4wCP5
-KCFF7HH0E3ZyDn1ru7EO+4vf4A2ldjkYnLE38RZsfebZ/MKlYO+8vT5h+xNkE6qn
-gMNhsT1iBEyjITO2NWYhIvm/6KiJlsxYYHfvATLhEsHU7ib1rV/K2lkBZA1VmGFU
-YwIgen53SWNFd2YBmOzKkz3YGi4x0/CR5ijoWgUnkV2pT2Mj8SuBnVg2ueudK6zc
-5DVEWg9l4CuCxUbAIeZj7C7BK0kchaWIP28cO8J0A/keRwR4a7crdY0KNFrcZ97x
-/b4uazDa6AJlQ6sfbM66n0ibeQc1FIIa0Sfl0CcRJXlKNCedwUd9UtnwKkNlqwAO
-G16AWKHR17w+yj/yog6nhHcGmMf3LzoxatNwpX1XStMmz1ImYCnoQxNb8UVKej8p
-9p1Y2IMJRYK1GGGAkLZZE1d3REMWRvDOeFG/vjWwx5fqosnvLboTC3xsbAeEp5pv
-cwcZTKGNX+2C0Mvqlh8Lm6QQEsr/FYScULRHTd7eZjkycw6g6qpUaT/ljPIBvgh8
-ZQmNqXjhtYBCLaVo54hUhMWddhM8HluzTJj+rRmn51dgihamTY0y3W4LPqpFFA7E
-IASki2TGemZL+Lyk72915M8AXeruDeadg2QI9Ihxg/o4BG+sqC42pU1SAg1w1i4j
-T5yfsYAAt0KvNUkWfsw9
-=Q0WZ
+iQIcBAEBCAAGBQJNzqrjAAoJEA8o5SF9Rr6qlR4QAI4Qrmim16TBv9PVuC/rxEle
+gHNUBGcyqCGhE0hpwailPHmgHaSxEQ3nh/uJ9I6Fl6/mtx0+C3g5XlNQr4q+4F+2
+lx7r4zjix25kM/OjXPNUesWv6wPzaNU5cdgGRxcnMw3Yj88MeMU51zmXtYugCjZm
+jbRLfQoBI/uByvqnKZwRkQFex3S75FGZU3q9FxT55b0LuGJ7aucNbxXiULZ8NPX3
+CTzs+lvFM7rAAscxOMMr6X9+a6f2AIAzEI7zTV4Hv2B3s1g0Go0RTsW5f8oTHY6E
+JeREdBWbgilrvSkfNfVkvq9YYXHUYqsEW8N6oJIEH3ZP4ebiuuEcQiinekffwmgg
+D1rhwrNhDB2dcZddhZxNnP64I+RFbnqwunZCcyhUH1V3ssxbuvyRFsQIDC0QWo83
+FIqZeT8utY6+Y/+zJ8rkuTZJTpuN0t1DHmQNwjea1Xf8YmELl0Awix/Wk4OSoNBv
+RreBzgGhebubzoOTO9LRcZV0hmxFSI67w6B7XziZrscl24Eun5wFK7Rwo2Wmqhsq
+bTSlsNyGpQOmPNqn+ddwfPz45/G+v5wYVZA6IiHatXN/UtHyOoQL/0SNE1OCMMjk
+d4s2dfQj6rkSZ6YZEPuF+dDv1UcMgpsH1je8GpGtdX43lnqiIiffE6Kf8LvRfyZN
+Ma5mr5icOuPUcbxNX801
+=6rOj
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.181.14.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.181.14-r1.ebuild
index abf026ac4b8f..ac31732fc6af 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.181.14.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.181.14-r1.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.3.181.14.ebuild,v 1.2 2011/05/14 01:06:38 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.181.14-r1.ebuild,v 1.1 2011/05/14 16:15:18 lack Exp $
 
 EAPI=4
 inherit nsplugins rpm multilib toolchain-funcs
@@ -113,7 +113,7 @@ pkg_postinst() {
 			elog "nspluginwrapper detected: Installing plugin wrapper"
 			local oldabi="${ABI}"
 			ABI="x86"
-			local FLASH_SOURCE="${ROOT}/${INSTALL_BASE32}/libflashplayer.so"
+			local FLASH_SOURCE="${ROOT}/${INSTALL_BASE32}/plugin/libflashplayer.so"
 			nspluginwrapper -i "${FLASH_SOURCE}"
 			ABI="${oldabi}"
 			elog