diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-10 17:15:29 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-10 17:15:29 +0000 |
| commit | 1fc62a9027db3338a68f23746bdd7850a588d57c (patch) | |
| tree | c290d85b92ba008cacb82d609c04f70a93ddae40 /media-libs/tiff | |
| parent | Update RDEPENDS for new ssl connection verification. (diff) | |
| download | gentoo-2-1fc62a9027db3338a68f23746bdd7850a588d57c.tar.gz gentoo-2-1fc62a9027db3338a68f23746bdd7850a588d57c.tar.bz2 gentoo-2-1fc62a9027db3338a68f23746bdd7850a588d57c.zip | |
Add blockers on emul-libs so that it is stacked for baselibs r10
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs/tiff')
| -rw-r--r-- | media-libs/tiff/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/tiff/tiff-4.0.3-r3.ebuild | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog index 212afbf06ddd..0862408dcd4a 100644 --- a/media-libs/tiff/ChangeLog +++ b/media-libs/tiff/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/tiff # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.236 2013/08/10 17:12:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.237 2013/08/10 17:15:29 aballier Exp $ + + 10 Aug 2013; Alexis Ballier <aballier@gentoo.org> tiff-4.0.3-r3.ebuild: + Add blockers on emul-libs so that it is stacked for baselibs r10 *tiff-4.0.3-r3 (10 Aug 2013) diff --git a/media-libs/tiff/tiff-4.0.3-r3.ebuild b/media-libs/tiff/tiff-4.0.3-r3.ebuild index b46d21ed528c..b30bbe7270bf 100644 --- a/media-libs/tiff/tiff-4.0.3-r3.ebuild +++ b/media-libs/tiff/tiff-4.0.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild,v 1.1 2013/08/10 17:12:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild,v 1.2 2013/08/10 17:15:29 aballier Exp $ EAPI=5 inherit eutils libtool multilib-minimal @@ -18,7 +18,11 @@ IUSE="+cxx jbig jpeg lzma static-libs zlib" RDEPEND="jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) jbig? ( media-libs/jbigkit:=[${MULTILIB_USEDEP}] ) lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )" + zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="${RDEPEND}" MULTILIB_WRAPPED_HEADERS=( |