mgorny 14/06/15 14:06:15 Modified: acroread-9.5.5.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.6 app-text/acroread/acroread-9.5.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild?r1=1.5&r2=1.6 Index: acroread-9.5.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.5.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acroread-9.5.5.ebuild 27 May 2014 13:36:01 -0000 1.5 +++ acroread-9.5.5.ebuild 15 Jun 2014 14:06:15 -0000 1.6 @@ -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 @@ ) 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(-)] 1.202 app-text/acroread/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/ChangeLog?rev=1.202&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/ChangeLog?rev=1.202&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/acroread/ChangeLog?r1=1.201&r2=1.202 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- ChangeLog 27 May 2014 13:36:01 -0000 1.201 +++ ChangeLog 15 Jun 2014 14:06:15 -0000 1.202 @@ -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 <[email protected]> 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 <[email protected]> acroread-9.5.5.ebuild: Support fulfilling the dependencies using multilib packages, bug #490156.
