diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-04-21 19:14:15 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-04-21 19:14:15 +0000 |
| commit | 4d3ca96e8d4e084d4a568f4349876235b411db09 (patch) | |
| tree | 2f44057585e0924c60729d80f2e4c3ebacc425f4 /www-plugins | |
| parent | Version bump. No changes for us compared to 2.28.0, but the libpng sedding ha... (diff) | |
| download | gentoo-2-4d3ca96e8d4e084d4a568f4349876235b411db09.tar.gz gentoo-2-4d3ca96e8d4e084d4a568f4349876235b411db09.tar.bz2 gentoo-2-4d3ca96e8d4e084d4a568f4349876235b411db09.zip | |
Support multilib libraries alternatively to emul-linux-x86-xlibs.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'www-plugins')
| -rw-r--r-- | www-plugins/adobe-flash/ChangeLog | 6 | ||||
| -rw-r--r-- | www-plugins/adobe-flash/adobe-flash-10.3.183.75.ebuild | 9 | ||||
| -rw-r--r-- | www-plugins/adobe-flash/adobe-flash-11.2.202.280.ebuild | 9 |
3 files changed, 19 insertions, 5 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog index 05aef292e235..285a9db08580 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.186 2013/04/12 13:38:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.187 2013/04/21 19:14:15 mgorny Exp $ + + 21 Apr 2013; Michał Górny <mgorny@gentoo.org> adobe-flash-10.3.183.75.ebuild, + adobe-flash-11.2.202.280.ebuild: + Support multilib libraries alternatively to emul-linux-x86-xlibs. 12 Apr 2013; Jeroen Roovers <jer@gentoo.org> -adobe-flash-11.2.202.275.ebuild: Old. diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.75.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.75.ebuild index 4426fea53613..dece98377727 100644 --- a/www-plugins/adobe-flash/adobe-flash-10.3.183.75.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.75.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-10.3.183.75.ebuild,v 1.2 2013/04/11 14:46:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.75.ebuild,v 1.3 2013/04/21 19:14:15 mgorny Exp $ EAPI=4 inherit nsplugins multilib toolchain-funcs versionator @@ -27,7 +27,12 @@ NATIVE_DEPS="x11-libs/gtk+:2 kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4" -EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) +EMUL_DEPS="vdpau? ( + || ( + x11-libs/libvdpau[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-20110129 + ) + ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs" diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.280.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.280.ebuild index 43628f763e31..d78fc41d797e 100644 --- a/www-plugins/adobe-flash/adobe-flash-11.2.202.280.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.280.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.280.ebuild,v 1.3 2013/04/11 21:44:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.280.ebuild,v 1.4 2013/04/21 19:14:15 mgorny Exp $ EAPI=4 inherit nsplugins multilib toolchain-funcs versionator @@ -36,7 +36,12 @@ NATIVE_DEPS="x11-libs/gtk+:2 kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4" -EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) +EMUL_DEPS="vdpau? ( + || ( + x11-libs/libvdpau[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-20110129 + ) + ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs" |