tetromino 14/12/26 16:13:10 Modified: ChangeLog gtk-engines-xfce-3.0.1-r301.ebuild Log: Fix file collision with emul-linux-x86-gtklibs (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Revision Changes Path 1.169 x11-themes/gtk-engines-xfce/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog?rev=1.169&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog?rev=1.169&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog?r1=1.168&r2=1.169 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- ChangeLog 23 Dec 2014 16:14:41 -0000 1.168 +++ ChangeLog 26 Dec 2014 16:13:10 -0000 1.169 @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/gtk-engines-xfce # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog,v 1.168 2014/12/23 16:14:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog,v 1.169 2014/12/26 16:13:10 tetromino Exp $ + + 26 Dec 2014; Alexandre Rostovtsev <[email protected]> + gtk-engines-xfce-3.0.1-r301.ebuild: + Fix file collision with emul-linux-x86-gtklibs *gtk-engines-xfce-3.0.1-r301 (23 Dec 2014) 1.2 x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild?r1=1.1&r2=1.2 Index: gtk-engines-xfce-3.0.1-r301.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk-engines-xfce-3.0.1-r301.ebuild 23 Dec 2014 16:14:41 -0000 1.1 +++ gtk-engines-xfce-3.0.1-r301.ebuild 26 Dec 2014 16:13:10 -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-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild,v 1.1 2014/12/23 16:14:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild,v 1.2 2014/12/26 16:13:10 tetromino Exp $ EAPI=5 MY_PN=gtk-xfce-engine @@ -15,9 +15,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" IUSE="debug" -RDEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}] +COMMON_DEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}] >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r5 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + )" +DEPEND="${COMMON_DEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}]" S=${WORKDIR}/${MY_PN}-${PV}
