diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-15 15:48:46 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-15 15:48:46 +0000 |
| commit | 342444542c11cef88c1da8c69ad41d5afe6e5a1d (patch) | |
| tree | 2889b62253e6bf8233455ad4f2e79975f5d8d32a /app-emulation/emul-linux-x86-xlibs | |
| parent | Cleanup old. (diff) | |
| download | gentoo-2-342444542c11cef88c1da8c69ad41d5afe6e5a1d.tar.gz gentoo-2-342444542c11cef88c1da8c69ad41d5afe6e5a1d.tar.bz2 gentoo-2-342444542c11cef88c1da8c69ad41d5afe6e5a1d.zip | |
Move cross-emul-linux deps to !abi_x86_32?.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-emulation/emul-linux-x86-xlibs')
| -rw-r--r-- | app-emulation/emul-linux-x86-xlibs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog index 92b6574b81bb..0912d15c9416 100644 --- a/app-emulation/emul-linux-x86-xlibs/ChangeLog +++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-xlibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.131 2014/05/08 21:49:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.132 2014/06/15 15:48:46 mgorny Exp $ + + 15 Jun 2014; Michał Górny <mgorny@gentoo.org> + emul-linux-x86-xlibs-20140508.ebuild: + Move cross-emul-linux deps to !abi_x86_32?. *emul-linux-x86-xlibs-20140508 (08 May 2014) diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild index 5c2e00850b32..cf0b4fa728b5 100644 --- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild +++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild,v 1.1 2014/05/08 21:49:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild,v 1.2 2014/06/15 15:48:46 mgorny Exp $ EAPI=5 inherit emul-linux-x86 @@ -11,11 +11,12 @@ KEYWORDS="-* ~amd64" IUSE="abi_x86_32 opengl" DEPEND="" -RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} - x11-libs/libX11 - opengl? ( app-emulation/emul-linux-x86-opengl ) - +RDEPEND=" !abi_x86_32? ( + ~app-emulation/emul-linux-x86-baselibs-${PV} + x11-libs/libX11 + opengl? ( app-emulation/emul-linux-x86-opengl ) + !media-libs/fontconfig[abi_x86_32(-)] !media-libs/freetype[abi_x86_32(-)] !x11-libs/libICE[abi_x86_32(-)] |