diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-15 14:06:15 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-15 14:06:15 +0000 |
| commit | 0b29520680dd265d622823c9aec9c28ee62daae6 (patch) | |
| tree | 7ec4f08b5053d8ca4fd8954ae77f615179130977 | |
| parent | Drop old. (diff) | |
| download | gentoo-2-0b29520680dd265d622823c9aec9c28ee62daae6.tar.gz gentoo-2-0b29520680dd265d622823c9aec9c28ee62daae6.tar.bz2 gentoo-2-0b29520680dd265d622823c9aec9c28ee62daae6.zip | |
Disallow mixing of emul-linux-x86 with multilib dependencies, since all dependencies are unmasked now.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
| -rw-r--r-- | app-text/acroread/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/acroread/acroread-9.5.5.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog index 4fb2f886156e..45823472cd21 100644 --- a/app-text/acroread/ChangeLog +++ b/app-text/acroread/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/acroread # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.201 2014/05/27 13:36:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.202 2014/06/15 14:06:15 mgorny Exp $ + + 15 Jun 2014; Michał Górny <mgorny@gentoo.org> acroread-9.5.5.ebuild: + Disallow mixing of emul-linux-x86 with multilib dependencies, since all + dependencies are unmasked now. 27 May 2014; Michał Górny <mgorny@gentoo.org> acroread-9.5.5.ebuild: Support fulfilling the dependencies using multilib packages, bug #490156. diff --git a/app-text/acroread/acroread-9.5.5.ebuild b/app-text/acroread/acroread-9.5.5.ebuild index 19595e3ba622..196f69516ce4 100644 --- a/app-text/acroread/acroread-9.5.5.ebuild +++ b/app-text/acroread/acroread-9.5.5.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-text/acroread/acroread-9.5.5.ebuild,v 1.5 2014/05/27 13:36:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild,v 1.6 2014/06/15 14:06:15 mgorny Exp $ EAPI=5 @@ -38,14 +38,17 @@ RDEPEND="media-libs/fontconfig ) amd64? ( || ( - app-emulation/emul-linux-x86-gtklibs + app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ( x11-libs/gtk+:2[abi_x86_32(-)] - || ( x11-libs/pangox-compat[abi_x86_32(-)] <x11-libs/pango-1.31[X,abi_x86_32(-)] ) + || ( + x11-libs/pangox-compat[abi_x86_32(-)] + <x11-libs/pango-1.31[X,abi_x86_32(-)] + ) ) ) || ( - app-emulation/emul-linux-x86-baselibs + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ( =dev-libs/openssl-0.9.8*[abi_x86_32(-)] net-dns/libidn[abi_x86_32(-)] |