[gentoo-commits] gentoo-x86 commit in media-libs/xvid: xvid-1.2.2-r1.ebuild

["Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>]

ssuominen    09/06/07 13:44:53

  Modified:             xvid-1.2.2-r1.ebuild
  Log:
  In fact, since the dep block is allowing both installed block older yasm too.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 media-libs/xvid/xvid-1.2.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild?r1=1.10&r2=1.11

Index: xvid-1.2.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xvid-1.2.2-r1.ebuild	7 Jun 2009 13:20:06 -0000	1.10
+++ xvid-1.2.2-r1.ebuild	7 Jun 2009 13:44:53 -0000	1.11
@@ -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 @@
 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=""