Fix yasm 1.0.0 detection wrt #314897 by Davide Pesavento.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index ddd6e1bc6c78cbadb34c3515831542f01d1fe8aa..47e9654bccaada87be0cf6f6cd389bf506a693aa 100644 (file)
--- 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.114 2010/02/21 10:15:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.115 2010/04/13 07:50:50 ssuominen Exp $
+
+  13 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> xvid-1.2.2-r2.ebuild:
+  Fix yasm 1.0.0 detection wrt #314897 by Davide Pesavento.
 
 *xvid-1.2.2-r2 (21 Feb 2010)
 

diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 7c528c868c0971710829a357964c201e54f2b874..d143cbbb7776a02f8830378a70fb855e247bf050 100644 (file)
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,6 +1,6 @@
 AUX xvid-1.2.2-noexecstack.patch 17680 RMD160 cf312c4b27acdc47a8340acfe8423b4450e07743 SHA1 a3547697ebba7583ca2ccd1e430762b84079cb55 SHA256 ef35cff8d86cee714f887746995c664b307ae35dd77472b9007987562dc7e8d3
 DIST xvidcore-1.2.2.tar.bz2 643344 RMD160 5fbbc99a02d9eab7f2394220cec2c872957ff26f SHA1 d03270c803592f7655e7aa4181de587be25ba97f SHA256 e42a602de489438b96f7f4742b68e9bed7efa7aee3570379bb2582b4290b6d11
 EBUILD xvid-1.2.2-r1.ebuild 1313 RMD160 d4893a53bf47518fd6b13f0050c7bcf3e59a821d SHA1 c691bde05571df0156a6155bfd6f97851e9164a8 SHA256 5713781721efaa756461b2f489764cd279afe509df1d6888b2b66614012d6599
-EBUILD xvid-1.2.2-r2.ebuild 1409 RMD160 a10ab627af873277585f5149dc56f61232e14083 SHA1 0e336e831db55bb1bb395f19dd35dc6ccee41ecf SHA256 a3c844043c826848f32893581aeb37005be0d13930ab2604d2e961ef3ee85052
-MISC ChangeLog 15121 RMD160 541b36da6a97b5ff5dea0ddba95bc653d7d984a8 SHA1 8f83e431c8369e72ead4180332e801f3b29fbf73 SHA256 0aa3fbea1a801e52eba9bc516581a89e4fafa4f6c73fe74d98f201408ae46180
+EBUILD xvid-1.2.2-r2.ebuild 1494 RMD160 32260368e14cc4ccd008cc502fe14f553992a2cc SHA1 e7633c7e3cdced3bf8badcb636403e5c4f6ad1a9 SHA256 1f9ae09f0c97084d8a625831ad96b9dde2e5ffe8fb7af89c756949b8974136f9
+MISC ChangeLog 15258 RMD160 bb6d450d172f1edc03309c91f45d240bb00f85cf SHA1 1338a3d7c2c897f4e6654e5fcbd02b890b2bb92a SHA256 ee511a500a4855d7987c1f515664acc0076188612daae99755c62aca9e27ff13
 MISC metadata.xml 326 RMD160 91617f57d22a91f7320a8a4cf31acdb62be99786 SHA1 8a03f8977295939de344ac23e4fdd8185d953d65 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9

diff --git a/media-libs/xvid/xvid-1.2.2-r2.ebuild b/media-libs/xvid/xvid-1.2.2-r2.ebuild
index 08ecafd153f9bde32eed80aea0a10ff3899c1389..9467908e67cfa3b578fe79c9cc7e836b175fbc56 100644 (file)
--- 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.1 2010/02/21 10:15:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild,v 1.2 2010/04/13 07:50:50 ssuominen Exp $
 
 EAPI=2
 inherit eutils multilib
@@ -31,6 +31,10 @@ S=${WORKDIR}/${MY_PN}/build/generic
 src_prepare() {
        cd "${WORKDIR}"
        epatch "${FILESDIR}"/${P}-noexecstack.patch
+
+       sed -i \
+               -e '/^minimum_yasm_minor_version/s:=.*:=0:' \
+               "${S}"/configure || die
 }
 
 src_configure() {