diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-11-24 01:41:45 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-11-24 01:41:45 +0000 |
| commit | f73d7aac4dd14ee4baed70c02832602235b24142 (patch) | |
| tree | 459b544ed079715967caf4fd7585d42b7dd4d91e /x11-libs | |
| parent | Avoid file collision with emul-linux-x86-gtklibs (diff) | |
| download | gentoo-2-f73d7aac4dd14ee4baed70c02832602235b24142.tar.gz gentoo-2-f73d7aac4dd14ee4baed70c02832602235b24142.tar.bz2 gentoo-2-f73d7aac4dd14ee4baed70c02832602235b24142.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 'x11-libs')
| -rw-r--r-- | x11-libs/gtk+/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.12.2-r1.ebuild | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 1aeb3f4931cb..518e93a1ec63 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.739 2014/11/22 23:02:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.740 2014/11/24 01:41:45 tetromino Exp $ + + 24 Nov 2014; Alexandre Rostovtsev <tetromino@gentoo.org> + gtk+-3.12.2-r1.ebuild: + Avoid file collision with emul-linux-x86-gtklibs. *gtk+-3.12.2-r1 (22 Nov 2014) diff --git a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild index f4f672dfeeda..7c2178a8f05e 100644 --- a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.12.2-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/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v 1.1 2014/11/22 23:02:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v 1.2 2014/11/24 01:41:45 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -91,6 +91,10 @@ RDEPEND="${COMMON_DEPEND} !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90 X? ( !<x11-base/xorg-server-1.11.4 ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ) " PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |