diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2011-08-11 14:40:29 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2011-08-11 14:40:29 +0000 |
| commit | a213961b07e8d48ca3b4e74797ab9763ee79df7c (patch) | |
| tree | ba3854cf4558d8fb2a8705494a1d32ed4a2f328d /www-plugins | |
| parent | Fixing all QA warnings in all versions by adding all prebuild binaries to QA_... (diff) | |
| download | historical-a213961b07e8d48ca3b4e74797ab9763ee79df7c.tar.gz historical-a213961b07e8d48ca3b4e74797ab9763ee79df7c.tar.bz2 historical-a213961b07e8d48ca3b4e74797ab9763ee79df7c.zip | |
Fixed unpack for 32-bit-only on amd64 (Bug #376091)
Package-Manager: portage-2.1.9.49/cvs/Linux i686
Diffstat (limited to 'www-plugins')
4 files changed, 30 insertions, 21 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog index f32a0e9d1821..722a32f8465d 100644 --- a/www-plugins/adobe-flash/ChangeLog +++ b/www-plugins/adobe-flash/ChangeLog @@ -1,6 +1,11 @@ # 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.98 2011/08/11 14:31:46 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.99 2011/08/11 14:40:29 lack Exp $ + + 11 Aug 2011; Jim Ramsay <lack@gentoo.org> + adobe-flash-11.0.1.60_beta201107131-r1.ebuild, + adobe-flash-11.0.1.60_beta201108082.ebuild: + Fixed unpack for 32-bit-only on amd64 (Bug #376091) 11 Aug 2011; Jim Ramsay <lack@gentoo.org> adobe-flash-10.3.181.26.ebuild, adobe-flash-10.3.181.34.ebuild, adobe-flash-10.3.183.5.ebuild, diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index 7b0ae3ecdfb0..ce1845e6500a 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -14,24 +14,24 @@ DIST flashplayer11_b2_install_lin_64_080811.tar.gz 7047824 RMD160 0d92ab6fff1f6b EBUILD adobe-flash-10.3.181.26.ebuild 3825 RMD160 5e797d57f8aa6da50ba80b551a9c3e13dd247ff0 SHA1 4ea3cc63adb2649a06c3decdf3b704fbfb087d04 SHA256 ac5c70c2df94bb74924d5f751f17e12eb66ce8618bec91f20226abfcbf9c47e9 EBUILD adobe-flash-10.3.181.34.ebuild 3825 RMD160 b2a012f5cdc18c3017b280b998e9425578f406e8 SHA1 ded6046f326fbac83aebce4de547d86887dba979 SHA256 a417161c61930d0d27c7745cc48f3690cb74c50cbba976991ae50f899db3c671 EBUILD adobe-flash-10.3.183.5.ebuild 3826 RMD160 420bf8728bd5c90eccacfe105bc7e4d05fb9613a SHA1 5e1047d37da42a5d3b7671f88d97439ab4b8057c SHA256 58fb0d0908f2a2d7af23a8d81d5674d3e6d0076aeaf30245dc6da4dc5fe69d22 -EBUILD adobe-flash-11.0.1.60_beta201107131-r1.ebuild 7233 RMD160 3b0622b6d7ca2befdde87d99c896eca777a87c24 SHA1 c50d652ff2b2b8189eebbe66849386f3a6207124 SHA256 bfdb6941f1fe174cc5a6be1642e3f727d52c2ed2c20756a2eece7f14df611e39 -EBUILD adobe-flash-11.0.1.60_beta201108082.ebuild 7282 RMD160 2f86ed012e7d4afcd5ca5f62675ad860f34bc575 SHA1 29af553ece72041780dc0bd77fd548edb80d0cd1 SHA256 610400be11476ca199f2f9cc8b1bb1ca876dfa441f3b3c2a74b9ffadce84b964 -MISC ChangeLog 36452 RMD160 43ada8f12bd58500c981346e7a46665078bd6b5a SHA1 b0c8dfa32be7eafa3178d03a87fff20875d83f4a SHA256 6e125170c5b6ca9ff81a1d6c80bde0cc5db21f9aaf35bc3dbaa248b0a4430c90 +EBUILD adobe-flash-11.0.1.60_beta201107131-r1.ebuild 7272 RMD160 d6745bf78e6b178d157a13cb96dece4e33925d0e SHA1 6ff2fb41f522ec95365f72aea8600cc3344c7111 SHA256 92d0326b85bdbde12715e3b71a22301c460724d04a9347d5158a526cf8f00bdc +EBUILD adobe-flash-11.0.1.60_beta201108082.ebuild 7321 RMD160 8c92f9c868a67feb3d0b71be911f0c685a99e073 SHA1 83df787ef067f8d920d5df507d7926d84a04d74d SHA256 afa76715d337f85cc5e5b466156b989c85e830760ea72f4f2da4c6035e90a653 +MISC ChangeLog 36646 RMD160 6d1a78225bc0271883cd4b9c2f6620f63cdb8a1e SHA1 021804185604c558d575fccd653a86089031b4b6 SHA256 2a4c40b9d07bd4c68646787d6aefe198599147cd4a925a9ca0b233f71240c442 MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJOQ+fjAAoJEA8o5SF9Rr6qUkQP/RytZuSt3LTNukJfvENnHn/c -/quIz4M0A/UWtPRi6rkbpusxWZidi9XkH9i/EIryUnX0xkNPubxYeN9EiA3FMS1k -4IYWbHFo1muBMRlTGK1EwVR1Xk0U2TVqLWVg4duJ9r6bzdg5nJHTQGR5gWIIlwkb -6Nfnxdx2CBmsW4iorkxexwdWpDnOyJ2DulwYNpBRsQG4n2TCVyU5PEKgt+v1j2Nv -4IMY94GgZZGn8ixfw1lQ+hBB0ojlTKKQMoklvgoaGIa4E4MT3wfmQc4UC9A1adtb -Rqwxi6kie0+QEkVX0lfqShjn+blL+n5iGfsR2xrCoYOy8UEdJ1Hwk13xcF+Yqo5s -enjxCMzEl5F7cai/yAIr5x0b858mSExFVFCckHyruc6HqxLtZD52wBaAvNe/gxV8 -wLJnPsdNxDqramFuipRU4q94yk6AKpxYfKtgk0t142xpI4O7cBYU/xgrNuZQuAgo -FLHPWanc+mkTdXt7/vYniPguYdjxmg7vQwq2FynqDPg/tsQtG4BFuFfywd//B59u -6VxfwFCC0Xh7AKNXslRxWJ6kfafZPgfWaBvAKO2/gsUK9/lL2dEW9/+a1OdckIXx -485FeTBECswxaIVExy7BIIwhjrlH8rf5nRfhy3ofxygooEHzXrWarcGIarrWdN3t -JSHIIiGk7j+GBQrh1ka0 -=mxZQ +iQIcBAEBCAAGBQJOQ+noAAoJEA8o5SF9Rr6q+vcQAIaGBqmoHojt2slr501hyvBL +99951389dirki5GulfYwDwIrMYfaOCKbw57083qpFDlG/BJmARd3c3eq7xpuPt9B +xCk5vYLRPkrDq4ymIxoF+mI/a3kYxh77xNQixlxP46I3mA/BvrpcA/vB09ks5/zL +NudNpXRMJ4C/KNoOvJ8fP4yZo5DkOqR086pzwKn5+GXbsH4qOcJfc+KDSP6S8Upy +D6MyiW9WBNkIqdZICszUGG3iVC+D/CpyT4uOOZxN3iFQpehi74ky197xowgPjQZd +SshbcZObrcgLhTXijBnr+k7mDcdco1dbNpTsF5wBZ8yCEVMmuRzMlgLz/2MCCJIg +0llFvO2c6N2KKZmAOIE150PPESROBl4G9aChoS3z2tuM2r5sV/Jcjmc2NFBvGcyI +0i/vQi2K1BQhLMQ2R8Aixedd6ynn/A8y3YQ9bz7j42CdcSMA4qJFcBh+i9V7c1pC +HZi8/9HYaqDc+J3wNvRXnmOZ7+DoYbIRlqp957tOfU4uKA4xKVQnd4jda/r17C9v +WKUqL5gap9CrxxnQPN8ZF9UmqWSoSqCoki/Fb+vbboAPp4WWhhSGFXrFs70GsXwS +aC3RmMoZv06cNI4eBvRm+Z+W3p6PonijRTMNGaMHcaQYCsTvuBzHiCoprZRgabPU +73BUuhvy8EEoS7HW9E5E +=6IH8 -----END PGP SIGNATURE----- diff --git a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-r1.ebuild index 5ccad30f2b3e..ef2ab0107ba1 100644 --- a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-r1.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-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-11.0.1.60_beta201107131-r1.ebuild,v 1.2 2011/08/11 14:31:46 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-r1.ebuild,v 1.3 2011/08/11 14:40:29 lack Exp $ EAPI=4 inherit nsplugins multilib toolchain-funcs versionator @@ -104,7 +104,9 @@ src_unpack() { # elsewhere: local my_32b_src=${MY_32B_URI##*/} local my_64b_src=${MY_64B_URI##*/} - unpack $my_64b_src + if [[ $native_install ]]; then + unpack $my_64b_src + fi mkdir 32bit pushd 32bit >/dev/null unpack $my_32b_src diff --git a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201108082.ebuild b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201108082.ebuild index 38868e2c3c6b..5dbedf5fa521 100644 --- a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201108082.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201108082.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-11.0.1.60_beta201108082.ebuild,v 1.2 2011/08/11 14:31:46 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201108082.ebuild,v 1.3 2011/08/11 14:40:29 lack Exp $ EAPI=4 inherit nsplugins multilib toolchain-funcs versionator @@ -104,7 +104,9 @@ src_unpack() { # elsewhere: local my_32b_src=${MY_32B_URI##*/} local my_64b_src=${MY_64B_URI##*/} - unpack $my_64b_src + if [[ $native_install ]]; then + unpack $my_64b_src + fi mkdir 32bit pushd 32bit >/dev/null unpack $my_32b_src |