diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-10-30 15:48:30 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-10-30 15:48:30 +0000 |
| commit | 3585a6bc5e84aed07890ab695978e1c7ca258475 (patch) | |
| tree | 9771aa388ed463a6ab1391b197f15fff9badcd9b /media-libs | |
| parent | bump x264 requirements (diff) | |
| download | gentoo-2-3585a6bc5e84aed07890ab695978e1c7ca258475.tar.gz gentoo-2-3585a6bc5e84aed07890ab695978e1c7ca258475.tar.bz2 gentoo-2-3585a6bc5e84aed07890ab695978e1c7ca258475.zip | |
Fix nasm vs. yasm depend.
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/xvid/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.2.2-r2.ebuild | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog index b293a7aef1a5..85a57e182961 100644 --- a/media-libs/xvid/ChangeLog +++ b/media-libs/xvid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/xvid # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.121 2010/08/18 04:19:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.122 2010/10/30 15:48:30 ssuominen Exp $ + + 30 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> xvid-1.2.2-r2.ebuild: + Fix nasm vs. yasm depend. 18 Aug 2010; Jeroen Roovers <jer@gentoo.org> xvid-1.2.2-r2.ebuild: Stable for HPPA (bug #318319). diff --git a/media-libs/xvid/xvid-1.2.2-r2.ebuild b/media-libs/xvid/xvid-1.2.2-r2.ebuild index e6dd4afacd24..006a631ff840 100644 --- a/media-libs/xvid/xvid-1.2.2-r2.ebuild +++ b/media-libs/xvid/xvid-1.2.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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-r2.ebuild,v 1.8 2010/08/18 04:19:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild,v 1.9 2010/10/30 15:48:30 ssuominen Exp $ EAPI=2 inherit eutils multilib @@ -20,10 +20,9 @@ IUSE="examples pic" NASM=">=dev-lang/nasm-2.05.01" YASM=">=dev-lang/yasm-0.8.0" -DEPEND="amd64? ( !<dev-lang/yasm-0.8.0 - || ( ${YASM} ${NASM} ) ) - x86? ( ${YASM} ${NASM} ) - x86-fbsd? ( ${NASM} )" +DEPEND="amd64? ( || ( ${YASM} ${NASM} ) ) + x86? ( || ( ${YASM} ${NASM} ) ) + x86-fbsd? ( || ( ${YASM} ${NASM} ) )" RDEPEND="" S=${WORKDIR}/${MY_PN}/build/generic |