| 1 |
ssuominen 10/10/30 15:48:30 |
| 2 |
|
| 3 |
Modified: ChangeLog xvid-1.2.2-r2.ebuild |
| 4 |
Log: |
| 5 |
Fix nasm vs. yasm depend. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.122 media-libs/xvid/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xvid/ChangeLog?rev=1.122&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xvid/ChangeLog?rev=1.122&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xvid/ChangeLog?r1=1.121&r2=1.122 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v |
| 19 |
retrieving revision 1.121 |
| 20 |
retrieving revision 1.122 |
| 21 |
diff -u -r1.121 -r1.122 |
| 22 |
--- ChangeLog 18 Aug 2010 04:19:18 -0000 1.121 |
| 23 |
+++ ChangeLog 30 Oct 2010 15:48:30 -0000 1.122 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-libs/xvid |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.121 2010/08/18 04:19:18 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.122 2010/10/30 15:48:30 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 30 Oct 2010; Samuli Suominen <ssuominen@g.o> xvid-1.2.2-r2.ebuild: |
| 31 |
+ Fix nasm vs. yasm depend. |
| 32 |
|
| 33 |
18 Aug 2010; Jeroen Roovers <jer@g.o> xvid-1.2.2-r2.ebuild: |
| 34 |
Stable for HPPA (bug #318319). |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.9 media-libs/xvid/xvid-1.2.2-r2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild?rev=1.9&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild?rev=1.9&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild?r1=1.8&r2=1.9 |
| 43 |
|
| 44 |
Index: xvid-1.2.2-r2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild,v |
| 47 |
retrieving revision 1.8 |
| 48 |
retrieving revision 1.9 |
| 49 |
diff -u -r1.8 -r1.9 |
| 50 |
--- xvid-1.2.2-r2.ebuild 18 Aug 2010 04:19:18 -0000 1.8 |
| 51 |
+++ xvid-1.2.2-r2.ebuild 30 Oct 2010 15:48:30 -0000 1.9 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
EAPI=2 |
| 59 |
inherit eutils multilib |
| 60 |
@@ -20,10 +20,9 @@ |
| 61 |
NASM=">=dev-lang/nasm-2.05.01" |
| 62 |
YASM=">=dev-lang/yasm-0.8.0" |
| 63 |
|
| 64 |
-DEPEND="amd64? ( !<dev-lang/yasm-0.8.0 |
| 65 |
- || ( ${YASM} ${NASM} ) ) |
| 66 |
- x86? ( ${YASM} ${NASM} ) |
| 67 |
- x86-fbsd? ( ${NASM} )" |
| 68 |
+DEPEND="amd64? ( || ( ${YASM} ${NASM} ) ) |
| 69 |
+ x86? ( || ( ${YASM} ${NASM} ) ) |
| 70 |
+ x86-fbsd? ( || ( ${YASM} ${NASM} ) )" |
| 71 |
RDEPEND="" |
| 72 |
|
| 73 |
S=${WORKDIR}/${MY_PN}/build/generic |
Archives