diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-06-19 03:13:12 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-06-19 03:13:12 +0000 |
| commit | 8cc3ab3fae152d871e829fbc13b3faae6e8d77bd (patch) | |
| tree | a74ac07bcb8b9eaa372bef431ac23a422602fc12 /media-libs/lcms | |
| parent | Moved emul-linux-x86-baselibs-20140508-r{10,11} to -r{13,14} to allow unmaske... (diff) | |
| download | gentoo-2-8cc3ab3fae152d871e829fbc13b3faae6e8d77bd.tar.gz gentoo-2-8cc3ab3fae152d871e829fbc13b3faae6e8d77bd.tar.bz2 gentoo-2-8cc3ab3fae152d871e829fbc13b3faae6e8d77bd.zip | |
Fix file collision with emul-linux-x86-baselibs
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'media-libs/lcms')
| -rw-r--r-- | media-libs/lcms/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/lcms/lcms-1.19-r2.ebuild | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog index f443e4d38171..ac5f52f19519 100644 --- a/media-libs/lcms/ChangeLog +++ b/media-libs/lcms/ChangeLog @@ -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 <tetromino@gentoo.org> lcms-1.19-r2.ebuild: + Fix file collision with emul-linux-x86-baselibs 18 Jun 2014; Michał Górny <mgorny@gentoo.org> lcms-1.19-r2.ebuild, lcms-2.5-r1.ebuild, lcms-2.6.ebuild: diff --git a/media-libs/lcms/lcms-1.19-r2.ebuild b/media-libs/lcms/lcms-1.19-r2.ebuild index d20281c62cc0..9ea0f8784e31 100644 --- a/media-libs/lcms/lcms-1.19-r2.ebuild +++ b/media-libs/lcms/lcms-1.19-r2.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/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 @@ RDEPEND=" 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 ) |