summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2015-06-14 16:42:14 +0000
committerUlrich Müller <ulm@gentoo.org>2015-06-14 16:42:14 +0000
commit5d2d8555cf1e9b1f5bb61b74110bdb1ace6ca736 (patch)
tree8b283f9a6a2da6e892c4475c11c9002cff7c750d /www-plugins
parent[QA] Remove emul-linux-x86-* from dependencies. (diff)
downloadgentoo-2-5d2d8555cf1e9b1f5bb61b74110bdb1ace6ca736.tar.gz
gentoo-2-5d2d8555cf1e9b1f5bb61b74110bdb1ace6ca736.tar.bz2
gentoo-2-5d2d8555cf1e9b1f5bb61b74110bdb1ace6ca736.zip
[QA] Remove emul-linux-x86-* from dependencies.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'www-plugins')
-rw-r--r--www-plugins/adobe-flash/ChangeLog5
-rw-r--r--www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild47
2 files changed, 20 insertions, 32 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index f926f0ca0099..0a1404f20cd8 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-plugins/adobe-flash
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.314 2015/06/11 04:11:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.315 2015/06/14 16:42:14 ulm Exp $
+
+ 14 Jun 2015; Ulrich Müller <ulm@gentoo.org> adobe-flash-11.2.202.466.ebuild:
+ [QA] Remove emul-linux-x86-* from dependencies.
11 Jun 2015; Jeroen Roovers <jer@gentoo.org>
-adobe-flash-11.2.202.460.ebuild, adobe-flash-11.2.202.466.ebuild:
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
index 87c8fd44c0d0..49d2ce6f6eae 100644
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.466.ebuild,v 1.3 2015/06/11 04:11:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild,v 1.4 2015/06/14 16:42:14 ulm Exp $
EAPI=5
inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
@@ -80,36 +80,21 @@ RDEPEND="
abi_x86_64? ( ${NATIVE_DEPS} )
abi_x86_32? (
amd64? (
- || (
- (
- >=dev-libs/atk-2.10.0[abi_x86_32(-)]
- >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
- >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
- >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
- >=x11-libs/pango-1.36.3[abi_x86_32(-)]
- )
- app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
- )
- || (
- (
- >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
- >=dev-libs/nspr-4.10.4[abi_x86_32(-)]
- >=dev-libs/nss-3.15.4[abi_x86_32(-)]
- )
- app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
- || (
- (
- >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
- >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
- >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
- >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
- >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
- )
- app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
- )
+ >=dev-libs/atk-2.10.0[abi_x86_32(-)]
+ >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+ >=dev-libs/nspr-4.10.4[abi_x86_32(-)]
+ >=dev-libs/nss-3.15.4[abi_x86_32(-)]
+ >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+ >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+ >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
+ >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
+ >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+ >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+ >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+ >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+ >=x11-libs/pango-1.36.3[abi_x86_32(-)]
)
x86? ( ${NATIVE_DEPS} )
)