diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2010-05-03 13:06:09 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2010-05-03 13:06:09 +0000 |
| commit | 2f27a325a050e7bf19c9e20d76121dfcf1c574ab (patch) | |
| tree | f459ac37cb8cdd6b4bb579cf27fc11384254b9a0 /www-plugins | |
| parent | Stable on amd64, bug #316889 (diff) | |
| download | gentoo-2-2f27a325a050e7bf19c9e20d76121dfcf1c574ab.tar.gz gentoo-2-2f27a325a050e7bf19c9e20d76121dfcf1c574ab.tar.bz2 gentoo-2-2f27a325a050e7bf19c9e20d76121dfcf1c574ab.zip | |
Clean up RDEPEND a bit
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins')
| -rw-r--r-- | www-plugins/adobe-flash/ChangeLog | 6 | ||||
| -rw-r--r-- | www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild | 6 | ||||
| -rw-r--r-- | www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog index 78d435bf22ca..9605f36e169a 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.20 2010/04/30 12:29:05 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.21 2010/05/03 13:06:09 lack Exp $ + + 03 May 2010; Jim Ramsay <lack@gentoo.org> adobe-flash-10.0.45.2.ebuild, + adobe-flash-10.0.45.2-r1.ebuild: + Clean up RDEPEND a bit 30 Apr 2010; Jim Ramsay <lack@gentoo.org> adobe-flash-9.0.262.0.ebuild, adobe-flash-10.0.45.2.ebuild, adobe-flash-10.0.45.2-r1.ebuild: diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild index 3433f6d00cfa..fbbbce09f546 100644 --- a/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.0.45.2-r1.ebuild,v 1.2 2010/04/30 12:29:05 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild,v 1.3 2010/05/03 13:06:09 lack Exp $ EAPI=1 inherit nsplugins rpm multilib toolchain-funcs @@ -31,8 +31,7 @@ NATIVE_DEPS="x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl - >=sys-libs/glibc-2.4 - || ( media-fonts/liberation-fonts media-fonts/corefonts )" + >=sys-libs/glibc-2.4" EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100220 app-emulation/emul-linux-x86-gtklibs @@ -47,6 +46,7 @@ RDEPEND="x86? ( $NATIVE_DEPS ) ) !multilib? ( $NATIVE_DEPS ) ) + || ( media-fonts/liberation-fonts media-fonts/corefonts ) !www-plugins/libflashsupport" # Ignore QA warnings in these binary closed-source libraries, since we can't fix diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild index c04058ac2402..d4f341e3d1b6 100644 --- a/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.0.45.2.ebuild,v 1.4 2010/04/30 12:29:05 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild,v 1.5 2010/05/03 13:06:09 lack Exp $ EAPI=1 inherit nsplugins rpm multilib toolchain-funcs @@ -31,8 +31,7 @@ NATIVE_DEPS="x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl - >=sys-libs/glibc-2.4 - || ( media-fonts/liberation-fonts media-fonts/corefonts )" + >=sys-libs/glibc-2.4" EMUL_DEPS="app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-gtklibs @@ -47,6 +46,7 @@ RDEPEND="x86? ( $NATIVE_DEPS ) ) !multilib? ( $NATIVE_DEPS ) ) + || ( media-fonts/liberation-fonts media-fonts/corefonts ) !www-plugins/libflashsupport" # Our new flash-libcompat suffers from the same EXESTACK problem as libcrypto |