From: Christian Faulhammer <fauli@gentoo.org>
Date: Tue, 22 Jun 2010 08:56:10 +0000 (+0000)
Subject: add ~x86 for bug 325007
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8303f80c5c527ee2963c56f359411638b4484455;p=gentoo.git

add ~x86 for bug 325007
Package-Manager: portage-2.1.8.3/cvs/Linux i686
---

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 7389cb10b752..f94b54ea3a32 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,14 +6,14 @@ DIST ffmpeg-0.5_p22846.tar.bz2 3675057 RMD160 3ebd997321d59fa0baf87329518e925ccb
 DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a SHA1 c130e3bc368251b9130ce6eafb44fe8c3993ff5c SHA256 6730baa6750f0cbffaf5f4c04f8ddcf1ebe6c651a6eeb12ae947a228de4c8120
 EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9
 EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
-EBUILD ffmpeg-0.6.ebuild 7761 RMD160 611bf4257eeacdea750ea83ad907fb0647b35afd SHA1 248b706b132aa8de0e028bf103beae24bde67007 SHA256 4c1958ce42c98bfb9fbfe722c65ed48852094ed0859f26c631f888831c1fa77d
+EBUILD ffmpeg-0.6.ebuild 7766 RMD160 c4cb11d70186c682252ddeea1114c44139d892de SHA1 26d8f8acbc5951e525d79c3e5e450eadb08929a5 SHA256 ba04d60676529f5853d790c2dc4790f67626f10882b16f147898082e0c2f2a08
 EBUILD ffmpeg-9999-r1.ebuild 7505 RMD160 add44aea05b08b090c54d04ff2079fe23af3b17f SHA1 dae062b2ac5bfd76f898da7cb6fe7e1043802ac8 SHA256 8480d048c15fa7187feebf48e6b651b7bbf828b6110c2bea992318fe860adb82
-MISC ChangeLog 53674 RMD160 4cdbb5517b85b1769ca10710f215b106068d6850 SHA1 0b42c3e9cb8f7b404de0b9f730202e7c6a559396 SHA256 43d52be15709ca3190a37079226b6232d553f7f9a1e280442c495499e708a9a1
+MISC ChangeLog 53769 RMD160 3d0919d3ee142128cc23a3dab77b5f83dbe7c1c0 SHA1 9ab28d1e79dd90586f95ca1ea7426a2a7561c237 SHA256 f303541b5a7f9292be80ed0aaf20a3391f51492d27092c12c706a068189ac61e
 MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkwgZj0ACgkQvFcC4BYPU0oaMQCfWD7Pay+c6rhcH6fYCmZEAiei
-B2IAoLb/WQXx8rPeVKVOhxdeMO3FMsuD
-=A8Cz
+iEYEARECAAYFAkwgey0ACgkQNQqtfCuFneP2gQCbBYsRSWRV9QTMA7F90suMP7U/
+Xi8AniUopYVhKKTbH77CLX51Eu6ABCSQ
+=GXxq
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f18ee2029164..6277fa349d42 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.594 2010/06/22 05:56:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.595 2010/06/22 08:56:10 fauli Exp $
+
+  22 Jun 2010; Christian Faulhammer <fauli@gentoo.org> vlc-1.1.0.ebuild:
+  add ~x86 for bug 325007
 
 *vlc-1.1.0 (22 Jun 2010)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index d829c5518f35..a016db394e49 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,15 +7,15 @@ DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1
 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3
 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8
 EBUILD vlc-1.0.6.ebuild 12316 RMD160 f9e95b57ca80417f744808f47d92f92c4a1f8027 SHA1 ad8ba73ec351c0623a91b28bd27aad44893a5d99 SHA256 a5c00bd42a93d39eb356b43f6e9ba660db0138690bd19b302041514507b8c62c
-EBUILD vlc-1.1.0.ebuild 12040 RMD160 d1bda24ba758042c5628824920be1c3c638b5436 SHA1 b5e264a25bba38cc36ed394e9690192ab50c3ee1 SHA256 5a4a737c135ab44742efbc02fda0be8bc23875cffa301506c8037b55cb7a65db
+EBUILD vlc-1.1.0.ebuild 12042 RMD160 207f6b22d286ffdaae20e33f359cd85a58b7c58b SHA1 678442d419a91e191d0165702c9bdc1ecd4f06b8 SHA256 d83cb304d4783da06ee2f35c4d88d8044f6378c17e1bee0e5361dceb4513cb34
 EBUILD vlc-1.1.9999.ebuild 12027 RMD160 1f96083d98b07e67fa300904dc6a7478d17b5a27 SHA1 4b8d1004b8a1661dcf79c197d88e220bcb797fe7 SHA256 0387b919f7238ad8a0e6681f391a4805831c784db92d22a38e6a3a8c8196016c
 EBUILD vlc-9999.ebuild 12024 RMD160 f2eae7bbb5806461ac54cc5488527808dfc98a6e SHA1 50b0acfacba0b6150922004d0cc637226fa90760 SHA256 575079423d0f37c3cb53514921bacd4dbe83331b5e2afeacfe1182a90714a61c
-MISC ChangeLog 92010 RMD160 9d88104a7e98dd3782b9a5952d811d8185af8f94 SHA1 522ec9d975c7b425f4a65b4b5f1b3589fbd868cc SHA256 12054dc84185194e40d3b67f3ab2315eea1e1a912671a893f4ad34179e9234f1
+MISC ChangeLog 92107 RMD160 bcfaeb53dce9ff5cc38a8d24d5e3fcc633c907da SHA1 b42d1d005edeb9a6e6f4169de297fb6cd317e333 SHA256 cc83bfc7a9d9114260abca14bf3dc10321e0aaba0b0c15beaf33da665a7c5579
 MISC metadata.xml 4410 RMD160 a45aa6995938c863a9f9c351471392fd91d88119 SHA1 36bb27e88806dea7926b3965fb14afcdbfe5653c SHA256 7e240147c0cffdb48ac2736144e6064396c765d1627ff22c1d4fac6f2b6473a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkwgULAACgkQvFcC4BYPU0q8zgCgs4Q+ZjFllR0RrvdcaoCVgkFh
-Rz4Anj3ml0iKgQvd34pFEuWG2Oj2gaHW
-=ONuK
+iEYEARECAAYFAkwgetIACgkQNQqtfCuFneNxzwCeOeMZZ+4ATYxMe/G3ppkbEaGI
+UWQAn01zUgLzcgSXQqa00gp2BF3tHfAk
+=NvRu
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.0.ebuild b/media-video/vlc/vlc-1.1.0.ebuild
index 5f6a56d097cf..2d8591fd0055 100644
--- a/media-video/vlc/vlc-1.1.0.ebuild
+++ b/media-video/vlc/vlc-1.1.0.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-video/vlc/vlc-1.1.0.ebuild,v 1.1 2010/06/22 05:56:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.2 2010/06/22 08:56:10 fauli Exp $
 
 EAPI="2"
 
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
 	+gcrypt ggi gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca