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 | b5688d92eefc1f273c89c9c9bc4c5fcdc3400cee (patch) | |
| tree | 72b261330b1c95376123dc8a1db8c42c645f489d /media-libs/xvid | |
| parent | Version bump (diff) | |
| download | historical-b5688d92eefc1f273c89c9c9bc4c5fcdc3400cee.tar.gz historical-b5688d92eefc1f273c89c9c9bc4c5fcdc3400cee.tar.bz2 historical-b5688d92eefc1f273c89c9c9bc4c5fcdc3400cee.zip | |
In fact, since the dep block is allowing both installed block older yasm too.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'media-libs/xvid')
| -rw-r--r-- | media-libs/xvid/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.2.2-r1.ebuild | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest index 5650f05c10c1..3719d25bd39c 100644 --- a/media-libs/xvid/Manifest +++ b/media-libs/xvid/Manifest @@ -1,4 +1,4 @@ DIST xvidcore-1.2.2.tar.bz2 643344 RMD160 5fbbc99a02d9eab7f2394220cec2c872957ff26f SHA1 d03270c803592f7655e7aa4181de587be25ba97f SHA256 e42a602de489438b96f7f4742b68e9bed7efa7aee3570379bb2582b4290b6d11 -EBUILD xvid-1.2.2-r1.ebuild 1288 RMD160 093ee982a6f98d75b334bcb6575f00d9761a7ee6 SHA1 2cb7ef0a8b6c141f1e321df1249bce6d5c137481 SHA256 a1e37d1acf96c6a5147ce151579c76c4672d61d8b257272f9efbb0a14f631269 +EBUILD xvid-1.2.2-r1.ebuild 1305 RMD160 16df6e784cbba2f049265d61ee0ec96eb371b834 SHA1 5f21c144b26ddcb01b46ecabe26de24a30e62c3d SHA256 f37e1ca6ac9c70a06f4befc285db004719c460889f6222e0601d91f16f96444c MISC ChangeLog 14898 RMD160 48f5eff84a96867ef09c43bcf3590d4d7e28e126 SHA1 bc0616a5f7a10b9aa7e967d3b42fcc08097085e1 SHA256 451f09a374b833538da18ff6d498e284dd72b181e1a8afa75d498e11de16fe4e MISC metadata.xml 326 RMD160 91617f57d22a91f7320a8a4cf31acdb62be99786 SHA1 8a03f8977295939de344ac23e4fdd8185d953d65 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9 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="" |