tetromino 14/11/24 01:41:45 Modified: ChangeLog gtk+-3.12.2-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.740 x11-libs/gtk+/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.740&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.740&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.739&r2=1.740 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v retrieving revision 1.739 retrieving revision 1.740 diff -u -r1.739 -r1.740 --- ChangeLog 22 Nov 2014 23:02:47 -0000 1.739 +++ ChangeLog 24 Nov 2014 01:41:45 -0000 1.740 @@ -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 <[email protected]> + gtk+-3.12.2-r1.ebuild: + Avoid file collision with emul-linux-x86-gtklibs. *gtk+-3.12.2-r1 (22 Nov 2014) 1.2 x11-libs/gtk+/gtk+-3.12.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild?r1=1.1&r2=1.2 Index: gtk+-3.12.2-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk+-3.12.2-r1.ebuild 22 Nov 2014 23:02:47 -0000 1.1 +++ gtk+-3.12.2-r1.ebuild 24 Nov 2014 01:41:45 -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/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 @@ !<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 )"
