diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-07 13:21:55 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-07 13:21:55 +0000 |
| commit | d87309d304324c0de517fe6aaecc9c8c67fbd7b7 (patch) | |
| tree | 44338ba019aa3373edb48776a9d1511706f40263 /dev-libs | |
| parent | Stable for x86, wrt bug #470422 (diff) | |
| download | gentoo-2-d87309d304324c0de517fe6aaecc9c8c67fbd7b7.tar.gz gentoo-2-d87309d304324c0de517fe6aaecc9c8c67fbd7b7.tar.bz2 gentoo-2-d87309d304324c0de517fe6aaecc9c8c67fbd7b7.zip | |
add blockers on emul-libs and stack it for baselibs -r7
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/expat/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/expat/expat-2.1.0-r3.ebuild | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog index b92a3e979ed1..95cfd10bd97a 100644 --- a/dev-libs/expat/ChangeLog +++ b/dev-libs/expat/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/expat # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.149 2013/08/02 00:19:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.150 2013/08/07 13:21:55 aballier Exp $ + + 07 Aug 2013; Alexis Ballier <aballier@gentoo.org> expat-2.1.0-r3.ebuild: + add blockers on emul-libs and stack it for baselibs -r7 *expat-2.1.0-r3 (02 Aug 2013) diff --git a/dev-libs/expat/expat-2.1.0-r3.ebuild b/dev-libs/expat/expat-2.1.0-r3.ebuild index dab5302a4b76..049f1c990366 100644 --- a/dev-libs/expat/expat-2.1.0-r3.ebuild +++ b/dev-libs/expat/expat-2.1.0-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/dev-libs/expat/expat-2.1.0-r3.ebuild,v 1.1 2013/08/02 00:19:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r3.ebuild,v 1.2 2013/08/07 13:21:55 aballier Exp $ EAPI=5 inherit eutils libtool multilib toolchain-funcs multilib-minimal @@ -13,6 +13,8 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="elibc_FreeBSD examples static-libs unicode" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" src_prepare() { elibtoolize |