tetromino 14/11/24 01:41:11 Modified: ChangeLog at-spi2-atk-2.12.1-r1.ebuild Log: Avoid file collision with emul-linux-x86-gtklibs (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Revision Changes Path 1.60 app-accessibility/at-spi2-atk/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?rev=1.60&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?rev=1.60&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?r1=1.59&r2=1.60 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- ChangeLog 22 Nov 2014 20:02:56 -0000 1.59 +++ ChangeLog 24 Nov 2014 01:41:11 -0000 1.60 @@ -1,6 +1,10 @@ # ChangeLog for app-accessibility/at-spi2-atk # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.59 2014/11/22 20:02:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.60 2014/11/24 01:41:11 tetromino Exp $ + + 24 Nov 2014; Alexandre Rostovtsev <[email protected]> + at-spi2-atk-2.12.1-r1.ebuild: + Avoid file collision with emul-linux-x86-gtklibs *at-spi2-atk-2.12.1-r1 (22 Nov 2014) 1.2 app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild?r1=1.1&r2=1.2 Index: at-spi2-atk-2.12.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-spi2-atk-2.12.1-r1.ebuild 22 Nov 2014 20:02:56 -0000 1.1 +++ at-spi2-atk-2.12.1-r1.ebuild 24 Nov 2014 01:41:11 -0000 1.2 @@ -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-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild,v 1.1 2014/11/22 20:02:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild,v 1.2 2014/11/24 01:41:11 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -24,6 +24,10 @@ " RDEPEND="${COMMON_DEPEND} !<gnome-extra/at-spi-1.32.0-r1 + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ) " DEPEND="${COMMON_DEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}]
