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 | 78cb37a72695cd947b59d9e5d58954cdb64828c5 (patch) | |
| tree | 639d807f143ac593ee41f14a8b7c144129a41b85 /www-plugins | |
| parent | Fixing all QA warnings in all versions by adding all prebuild binaries to QA_... (diff) | |
| download | gentoo-2-78cb37a72695cd947b59d9e5d58954cdb64828c5.tar.gz gentoo-2-78cb37a72695cd947b59d9e5d58954cdb64828c5.tar.bz2 gentoo-2-78cb37a72695cd947b59d9e5d58954cdb64828c5.zip | |
Fixed unpack for 32-bit-only on amd64 (Bug #376091)
(Portage version: 2.1.9.49/cvs/Linux i686)
Diffstat (limited to 'www-plugins')
3 files changed, 14 insertions, 5 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/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 |