tetromino 14/11/24 01:40:34 Modified: ChangeLog at-spi2-core-2.12.0-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.75 app-accessibility/at-spi2-core/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog?rev=1.75&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog?rev=1.75&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog?r1=1.74&r2=1.75 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- ChangeLog 22 Nov 2014 20:01:41 -0000 1.74 +++ ChangeLog 24 Nov 2014 01:40:34 -0000 1.75 @@ -1,6 +1,10 @@ # ChangeLog for app-accessibility/at-spi2-core # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.74 2014/11/22 20:01:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.75 2014/11/24 01:40:34 tetromino Exp $ + + 24 Nov 2014; Alexandre Rostovtsev <tetrom...@gentoo.org> + at-spi2-core-2.12.0-r1.ebuild: + Avoid file collision with emul-linux-x86-gtklibs. *at-spi2-core-2.12.0-r1 (22 Nov 2014) 1.2 app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild?r1=1.1&r2=1.2 Index: at-spi2-core-2.12.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-spi2-core-2.12.0-r1.ebuild 22 Nov 2014 20:01:41 -0000 1.1 +++ at-spi2-core-2.12.0-r1.ebuild 24 Nov 2014 01:40:34 -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-core/at-spi2-core-2.12.0-r1.ebuild,v 1.1 2014/11/22 20:01:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild,v 1.2 2014/11/24 01:40:34 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -19,7 +19,7 @@ # x11-libs/libSM is needed until upstream #719808 is solved either # making the dep unneeded or fixing their configure # Only libX11 is optional right now -RDEPEND=" +COMMON_DEPEND=" >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}] >=sys-apps/dbus-1[${MULTILIB_USEDEP}] x11-libs/libSM[${MULTILIB_USEDEP}] @@ -28,7 +28,13 @@ introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ) +" +DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.40 virtual/pkgconfig[${MULTILIB_USEDEP}]
