diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-06-07 13:44:53 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-06-07 13:44:53 +0000 |
| commit | cba7a953e51383ecfb7b9fae86e0c9eb46922731 (patch) | |
| tree | ded1524224966aac7afd42bee9fe1d2450fc7bd4 /media-libs/xvid | |
| parent | Version bump (diff) | |
| download | gentoo-2-cba7a953e51383ecfb7b9fae86e0c9eb46922731.tar.gz gentoo-2-cba7a953e51383ecfb7b9fae86e0c9eb46922731.tar.bz2 gentoo-2-cba7a953e51383ecfb7b9fae86e0c9eb46922731.zip | |
In fact, since the dep block is allowing both installed block older yasm too.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/xvid')
| -rw-r--r-- | media-libs/xvid/xvid-1.2.2-r1.ebuild | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media-libs/xvid/xvid-1.2.2-r1.ebuild b/media-libs/xvid/xvid-1.2.2-r1.ebuild index d384c0352814..960ca5b5e610 100644 --- a/media-libs/xvid/xvid-1.2.2-r1.ebuild +++ b/media-libs/xvid/xvid-1.2.2-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild,v 1.10 2009/06/07 13:20:06 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild,v 1.11 2009/06/07 13:44:53 ssuominen Exp $ EAPI=2 -inherit eutils multilib +inherit multilib MY_PN=${PN}core MY_P=${MY_PN}-${PV} @@ -20,8 +20,9 @@ IUSE="examples pic" NASM=">=dev-lang/nasm-2.05.01" YASM=">=dev-lang/yasm-0.8.0" -DEPEND="x86? ( ${NASM} ) - amd64? ( || ( ${YASM} ${NASM} ) ) +DEPEND="amd64? ( !<dev-lang/yasm-0.8.0 + || ( ${YASM} ${NASM} ) ) + x86? ( ${NASM} ) x86-fbsd? ( ${NASM} )" RDEPEND="" |