diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-28 14:01:51 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-28 14:01:51 +0000 |
| commit | 87b5f6da852a212ef9e0fcd3dc966164634420b7 (patch) | |
| tree | d07f3d8bf958bbc21c8cf1c45dfaaf77f9314616 /sys-libs/zlib | |
| parent | Stable for ppc, wrt bug #477950 (diff) | |
| download | gentoo-2-87b5f6da852a212ef9e0fcd3dc966164634420b7.tar.gz gentoo-2-87b5f6da852a212ef9e0fcd3dc966164634420b7.tar.bz2 gentoo-2-87b5f6da852a212ef9e0fcd3dc966164634420b7.zip | |
Fix blocker on emul-libs
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-libs/zlib')
| -rw-r--r-- | sys-libs/zlib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.8-r1.ebuild | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog index 24922478c193..d16d3a0fd7dc 100644 --- a/sys-libs/zlib/ChangeLog +++ b/sys-libs/zlib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/zlib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.124 2013/06/23 07:43:53 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.125 2013/07/28 14:01:51 aballier Exp $ + + 28 Jul 2013; Alexis Ballier <aballier@gentoo.org> zlib-1.2.8-r1.ebuild: + Fix blocker on emul-libs *zlib-1.2.8-r1 (23 Jun 2013) diff --git a/sys-libs/zlib/zlib-1.2.8-r1.ebuild b/sys-libs/zlib/zlib-1.2.8-r1.ebuild index 0c91f955dbb6..2b00773df37a 100644 --- a/sys-libs/zlib/zlib-1.2.8-r1.ebuild +++ b/sys-libs/zlib/zlib-1.2.8-r1.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/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v 1.1 2013/06/23 07:43:53 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v 1.2 2013/07/28 14:01:51 aballier Exp $ EAPI=4 AUTOTOOLS_AUTO_DEPEND="no" @@ -19,7 +19,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="minizip static-libs" DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 ) +RDEPEND="abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) !<dev-libs/libxml2-2.7.7" #309623 src_prepare() { |