Remove unused variable INSTALL_BASE. Set QA_PREBUILT appropriately.

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

3 files changed, 13 insertions, 24 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index e140777c90ef..0c91df6aa299 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.214 2013/09/27 19:35:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.215 2013/09/28 15:05:38 jer Exp $
+
+  28 Sep 2013; Jeroen Roovers <jer@gentoo.org>
+  adobe-flash-11.2.202.310-r1.ebuild:
+  Remove unused variable INSTALL_BASE. Set QA_PREBUILT appropriately.
 
 *adobe-flash-11.2.202.310-r1 (27 Sep 2013)
 
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 1ca02d82c323..9d5970710f9f 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -6,26 +6,14 @@ AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8f
 DIST adobe-flash-11.2.202.310-debug.i386.tar.gz 7403002 SHA256 ac0033a0db826138ba2b6cebc44c3efed8c57c9f696d0aba137f27318ce603b1 SHA512 8d470be8553655091a2bb01e27868b4d5f1cea990b3fc0afff88f2d705365c1d2c7cf6ae82cee35fb53ce265bbd8efc065d3fa9cadb092a96558f6ada4d95705 WHIRLPOOL 5533c98cb7ea2489d922e15d7003c847646abec4941e9fab9835f952166aab50e0ec65a3aae33b3bf486e8c9d4cb4fdd38d9fc5a789731b470c1d414f17e6490
 DIST adobe-flash-11.2.202.310.i386.tar.gz 6923724 SHA256 7051aee6bbca66a562c1a8acfa63533744c71cdbe231276f4097462dd24dc061 SHA512 87d340c519e19a4165ff1a16d84b66469707fe49f068da4b717110a8a084a1f35a20c5a7b18e217a40704dfa62ed8f62a929f7894fe1c2fff06a9df612ac2d61 WHIRLPOOL 90ee7bd6c148db110f9e50812587ab0a228daaba13f30477fb718a7e11bfd452cf65dd61d7d635bd46429c1d00179f497ca4322b0bf3953f06152da9bf035f3f
 DIST adobe-flash-11.2.202.310.x86_64.tar.gz 7235294 SHA256 f2c7a410b81d044fd619b9bfd5a81522e02fafa1314d61382c21123ae0c9290f SHA512 2882ea869eed270e4b24dc4dffd5e5ac3a3249d6d4e4d985b246314602d72dc3775909dcf43539925b0e821dadf2abade0fd46c4bac068539b71b7a081c0568b WHIRLPOOL 05402df96157bf5237f9265cbaee49aacecef69b6d74018843c2b72a432e80400b924b26b0b3c3e5e88f274f54374575d31a658975a2281dd3a91d049b1924ad
-EBUILD adobe-flash-11.2.202.310-r1.ebuild 6853 SHA256 407281e4f355867c8962722ca916a45cbf848e5e9aaef5c47cd45ba27976ff2b SHA512 e14ea23d814accd1d0a3fbc0ce3ea25530757555982a7465c8591348d31366a0c4c2e425e9e1377c0e410be425cf6d87ddd28ab548d998d4c177dcdaaed47241 WHIRLPOOL 26da28d929ec30e778974c52a50596feed39ffa0305233baf535e2e3c28e2e4e636f9c5d5f6dfc981490e7e3e7e2bd596956c692e3c8b5c5e0d4d56045e773f2
+EBUILD adobe-flash-11.2.202.310-r1.ebuild 6769 SHA256 df7f2d83440a6adaa7341a465e140b4b542cfb71251902d21002f484d1290f29 SHA512 2056edacda01afd1d0119bb1232042c50c9ef45b8a811757441d2acb2734507b5911dcaa6ccbdbbe5d9ba2abae1def67e19b044282fa98c2f48432f379a61b4e WHIRLPOOL 1a2ed417de8ad1e9cee95e267d70e3046a213b9d421a94f5543913a8aee3cc7dab884403516e9ed2d6b2370f610258eaef7dab41cee86f2545467563815f78a5
 EBUILD adobe-flash-11.2.202.310.ebuild 7324 SHA256 93e7064deaecd96506cebf77a315af5424616caec58db6a60b6699e178e2ac9b SHA512 39dc68a5b2b926287277cd226f54d07208f598be85b388ea020a476b8e4e3e8c8d6b39cf6acfeed5f9815f4339de486cbb4d0fbea338643c5ad4f8df36557474 WHIRLPOOL c594fb3a1cc0ed83b4dae602a74200097b780ec562e10e3945168e5790bfd659088709de5d2ddd6785f7515bfa8e47c912795811b315cd18c0407eb285c69587
-MISC ChangeLog 53584 SHA256 5e6bbdea89255f66a99bd81637636adc3a68c609a181f3b9a606550ed7acfaac SHA512 241c016178d4dfaecc90587c68a2f1a51220a7ac056f68ee942c06340be145ce9c864154608b8dcfba17bf41ef87e50b6313d03b0943c34d88272521fd9cc5c7 WHIRLPOOL c82b4808f157a50bd742deee1c082327a5a79d72760795dc8fba4223cc3d83886ed5e6d39ae027b1a60635a0027c42b67643ffee4836a171bc5efed95d24d0e2
+MISC ChangeLog 53737 SHA256 8cf623ff67e21368237a2f9857176e9014399f7ee0e5eeb1a2a9ee2f4024f956 SHA512 b62590483c77e9ad7297206a20fee0b18221b509b2b1a4f41951bcbb24ef82c5461379b556c917c44046f1bc03cf709b420352c33b69d524fc4b98a372e36980 WHIRLPOOL 2914a423970bf2bb8017ea67fa1f254d23d0f46b5af7d8f07cb1c3b15e90777d94eeac4a1607485c576d9167f6a227135de0401aa0ea9b4d1f8ecdd148821b41
 MISC metadata.xml 616 SHA256 6e1428bd0d59c68629d9d71a04ac2f39cb709ae34f9887d26a04d8dcaafa3e84 SHA512 051cf27faf9edfcd9e5ac12d6936bf87d876bdac9c9389ce414850f77724795401bd4d1d704f45d23a8f0802db1cfa701bbe9384bd94b47879f5c56a50374ff1 WHIRLPOOL 3e8fb952a34307dd571feb013ce5a741d50eeb9420b4a6678e780392bedaecb3e318811a26607f2d4a7717ab2439afb4baccb78f5c01f5c04aa8fc4e33c69ca3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSRd4eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvI4QALxfWamSC6dCD/+EDidbwMNy
-RLl7L6EbG/unGGCKlA2l/suncEmSxTODLaH/6XbpfxLQyjaqOqplOh9JteMXDOdx
-smIVMlxakOd5RP4iAQp/rhEe+11Pf55Z+eTWLFsvR4qF3aRT/DyoUjIqVaQc1kCR
-iVarHe/hjLLkb14BSJjMZtuVC9x1jtNeQ8wjSERqk+bPewV4DmjWlYVvVKStrcxm
-DCGNIjKfWmaYd4/bqtFcPQ9TqpJSSeUfCMmq30FJkwlgNJ70mAHSznKMrtvpMxVv
-fMsKxa/Ifrcct1OTCUbVTfeYIYDIZguOl7LM1WOlblPc18rryciNkfFLLaon9tNX
-zzfpExEY1nM5LvWc4IqLaxWVvifxBMFF35+Bn6z4iYVLwZGhSeeXW2Cu+ApCibvY
-L5TRBLnu8aja/PSCVBE2P9+1GiIYGvhjqvs/593ScoWCKdb7fWrVRlUbf/GnDqZw
-2lW/v8hfqYc7KX/oRWZ22lGCbUHoeSz6CDVRruPRvjXsIuiptc7aFtE4M6WS/OlG
-nBnNS3WoA9okRf3qV6+n294gIZi0G0Lymg/Axe6OEM/mUlXr3hA0z5WQ9PGMzB5z
-3ZbklCt3LYI6vD2vB67wdfE5+i/lgsFyoXpNW2o1JA5wYFRSPkcwLPW03Dvfm+Uo
-WG5i5dakZTcGEHogV2dF
-=TDpV
+iEYEAREIAAYFAlJG8EMACgkQVWmRsqeSphMSaQCbBn8K2YBefqWwnjW5H2ZVkZDj
+SxwAniub62VJX89YHtMv2/+i4emP5gOK
+=HMkq
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild
index e88f80135c37..40a5d060b0b8 100644
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.310-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.310-r1.ebuild,v 1.1 2013/09/27 19:35:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild,v 1.2 2013/09/28 15:05:38 jer Exp $
 
 EAPI=5
 inherit nsplugins toolchain-funcs versionator multilib-minimal
@@ -110,11 +110,8 @@ RDEPEND="
 	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
 "
 
-# Where should this all go? (Bug #328639)
-INSTALL_BASE="opt/Adobe/flash-player"
-
 # Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="opt/*"
+QA_PREBUILT="usr/*"
 
 any_cpu_missing_flag() {
 	local value=${1}