tetromino 14/06/19 03:13:12 Modified: ChangeLog lcms-1.19-r2.ebuild Log: Fix file collision with emul-linux-x86-baselibs (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path 1.175 media-libs/lcms/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lcms/ChangeLog?rev=1.175&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lcms/ChangeLog?rev=1.175&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lcms/ChangeLog?r1=1.174&r2=1.175 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- ChangeLog 18 Jun 2014 19:36:59 -0000 1.174 +++ ChangeLog 19 Jun 2014 03:13:11 -0000 1.175 @@ -1,6 +1,9 @@ # ChangeLog for media-libs/lcms # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.174 2014/06/18 19:36:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.175 2014/06/19 03:13:11 tetromino Exp $ + + 19 Jun 2014; Alexandre Rostovtsev <[email protected]> lcms-1.19-r2.ebuild: + Fix file collision with emul-linux-x86-baselibs 18 Jun 2014; Michał Górny <[email protected]> lcms-1.19-r2.ebuild, lcms-2.5-r1.ebuild, lcms-2.6.ebuild: 1.3 media-libs/lcms/lcms-1.19-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lcms/lcms-1.19-r2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lcms/lcms-1.19-r2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lcms/lcms-1.19-r2.ebuild?r1=1.2&r2=1.3 Index: lcms-1.19-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lcms-1.19-r2.ebuild 18 Jun 2014 19:36:59 -0000 1.2 +++ lcms-1.19-r2.ebuild 19 Jun 2014 03:13:12 -0000 1.3 @@ -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/media-libs/lcms/lcms-1.19-r2.ebuild,v 1.2 2014/06/18 19:36:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r2.ebuild,v 1.3 2014/06/19 03:13:12 tetromino Exp $ EAPI="5" @@ -25,6 +25,10 @@ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r11 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) " DEPEND="${RDEPEND} python? ( >=dev-lang/swig-1.3.31 )
