x86 stable wrt bug #318319

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 6d2902f8f9c33a1555fb6c279796604da7d94b5e..0ee32af3271c1bec29764f68f6c4dad6159a6e42 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.117 2010/05/11 21:54:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.118 2010/05/17 09:21:18 phajdan.jr Exp $
+
+  17 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> xvid-1.2.2-r2.ebuild:
+  x86 stable wrt bug #318319
 
   11 May 2010; Brent Baude <ranger@gentoo.org> xvid-1.2.2-r2.ebuild:
   stable ppc64, bug 318319

diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 63e6bd26f5197c0ec960d99a3ea119b2eec15347..02b15d55fd455642502ab1e09fcaa300c5a150ce 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 1489 RMD160 0874c5c06b0fba98ad4537d54bb58aab429abc23 SHA1 38550e4748337e7e5cbdc2bd808cee6c1e137f8b SHA256 3b8546085027884c5565d20e779fb0ee916e9d75bb2bd14d03a27a281ed4f6ec
-MISC ChangeLog 15438 RMD160 711557b85b25120afa2f527baccf87a719b710ab SHA1 7f20e855acc36dcae5dce0555af93dabd0fce842 SHA256 47d542b37b9452ba339a49b2f5b9b4c27458148810596c7ded05f9b899686178
+EBUILD xvid-1.2.2-r2.ebuild 1492 RMD160 025966d142758217118bf84cea8195aa144d2885 SHA1 2eb0f4e1df4fb7222ad7d025f4a5b032784fbf23 SHA256 bf5b7b482f9cdec0ae8f96221e2d2ee6e5e27194476f633f2a4b1dafada60196
+MISC ChangeLog 15549 RMD160 f1ee0411bb83edc8257771e76e58340e8cda7724 SHA1 48c71935bf7fb901cc1ea952ffc3ae7178a87b1f SHA256 d728cab853a9b5d52f215f531ddaa410e724a4e7a61a56b2a4084a42205ac408
 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 4e1f7c6268b10cf34234a3cf3c0ed66a9d9416ae..38818aafdd23fc1333d148ff2ebf153711c72e62 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.4 2010/05/11 21:54:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild,v 1.5 2010/05/17 09:21:18 phajdan.jr Exp $
 
 EAPI=2
 inherit eutils multilib
@@ -14,7 +14,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="examples pic"
 
 NASM=">=dev-lang/nasm-2.05.01"