diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-11-24 01:41:11 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-11-24 01:41:11 +0000 |
| commit | c3f490cd302db5cf56dc5925f08a6e995584c933 (patch) | |
| tree | 06ed7e26f212fda42fd21c5c3071755c46a8ffd3 /app-accessibility/at-spi2-atk | |
| parent | Avoid file collision with emul-linux-x86-gtklibs. (diff) | |
| download | gentoo-2-c3f490cd302db5cf56dc5925f08a6e995584c933.tar.gz gentoo-2-c3f490cd302db5cf56dc5925f08a6e995584c933.tar.bz2 gentoo-2-c3f490cd302db5cf56dc5925f08a6e995584c933.zip | |
Avoid file collision with emul-linux-x86-gtklibs
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'app-accessibility/at-spi2-atk')
| -rw-r--r-- | app-accessibility/at-spi2-atk/ChangeLog | 6 | ||||
| -rw-r--r-- | app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app-accessibility/at-spi2-atk/ChangeLog b/app-accessibility/at-spi2-atk/ChangeLog index f5733d53c9c4..8b39339eb706 100644 --- a/app-accessibility/at-spi2-atk/ChangeLog +++ b/app-accessibility/at-spi2-atk/ChangeLog @@ -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 <tetromino@gentoo.org> + 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) diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild index 3e1a96b66be6..f670e112fd1a 100644 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.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-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 @@ COMMON_DEPEND=" " 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}] |