amd64 stable wrt #297845

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

4 files changed, 11 insertions, 7 deletions

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 42fef1fd5ef2..666b786321fb 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -13,9 +13,9 @@ DIST mplayer-1.0_rc4_p20091124.tbz2 8560654 RMD160 2e22afd7bed2bdf74bdea340bc17d
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
 EBUILD mplayer-1.0_rc2_p20090322.ebuild 19347 RMD160 bb35264678a933118c627972ce581fbec61560d7 SHA1 7d76a98c99e8cbc223d0fc11e4cd51c7e34015c4 SHA256 8cd6cec71b68ab877970971cf6f60d1a9e31f255b08fbfde668b5aaba018592a
 EBUILD mplayer-1.0_rc2_p20090731.ebuild 18842 RMD160 e78d416b0c67c7a00dfc509d207ea8cdfceed042 SHA1 935cbb253c6bef17874ce75e0c948f700e4208b7 SHA256 e6fc6c92c3011516f501790677461bda5ff03284012fcbb17acfb49418ab4653
-EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18979 RMD160 21d72ec125d74f4f119323bd5da979360b611606 SHA1 b84ffc5598361b53c0239c86c0fe0a06ca946216 SHA256 9575b99519f03cdd626b9f4dce0320826096d61dfb7b5f7f91e925e3f8f1ff60
+EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18980 RMD160 7426c1ccc0d07d37d1a1476b2852ce5cf61e5df9 SHA1 9445a5bbcf8baa42a7c8a943231b45a0db7e64a6 SHA256 29f840c84a4ba8ee8c61e1679eaeecb6d02c5b93703016d4d6fb0e7cb493165f
 EBUILD mplayer-1.0_rc4_p20091026.ebuild 18682 RMD160 b396095fbf3cf87303e857dae62773804e5b9ba2 SHA1 f009c372722b1f769f39f9f84e8d315a68d13da7 SHA256 5fc6d86531d24702b6e069ab3d9c3cafcf48c2145889574398d5c3d12930b1c4
 EBUILD mplayer-1.0_rc4_p20091124-r1.ebuild 19059 RMD160 e07d98ac3d2c621a884fe50a9cec13dbfa51109c SHA1 6941d5ea2f9763248a4d0ebd100a88f7434bc11a SHA256 90b6a5ecb705a44a7cb89cff91eaa9fb6eae18137c5b248bef2dd5abc6f3c2e6
 EBUILD mplayer-9999.ebuild 20056 RMD160 69cf1a6dba14bddf575a424fd71a2f475bb78a47 SHA1 7640cdb73fe533b01b5c216ec5ebd285a46c06dc SHA256 e0413b99192df46874ce32a416fb7b2ef017198da4eef18aa1da5764108a2035
-MISC ChangeLog 122661 RMD160 46f2ba6bf0d232e6e2ea52bb0ed3d2e2a2327af3 SHA1 1fa79fcdaeb359b5f4ac0490e3b7bf836c2c14c0 SHA256 ddd919aa4948182e717097afa34fbe72d34f794713aa48dbab7ea019874e590a
+MISC ChangeLog 122784 RMD160 6748ebd9a66b5770badaf0cb25e93789b076be14 SHA1 b8c7643ae24051eb904ec357e038d59442da282d SHA256 cdda3c60fcd29465a7f191c36c56397a19a5df99e1c978b3c4e7a87839ae168e
 MISC metadata.xml 3826 RMD160 b3b94c3fe039c7070929753aa107ba1bc5505900 SHA1 672a2300ccc9cc55327827491745e4433a077fab SHA256 d3e09e8c2dbbb6ed597bda0f964714ce3aae10493438fc1492ce65ac9e5cc179
diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 24012f783a74..c909718cb43e 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.25 2009/11/26 03:50:42 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.26 2009/12/22 11:09:48 ssuominen Exp $
+
+  22 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  x264-encoder-0.0.20091021.ebuild:
+  amd64 stable wrt #297845
 
 *x264-encoder-0.0.20091124 (26 Nov 2009)
 
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index c29dcf794191..8094aab1eef4 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -11,7 +11,7 @@ EBUILD x264-encoder-0.0.20081006.ebuild 1802 RMD160 0b2a163f38ae689124151a7f7744
 EBUILD x264-encoder-0.0.20090502.ebuild 1810 RMD160 ed96c097af487a47fde4b19eb98b66e4104850a3 SHA1 35e218ce253709c22f0938b2f203065cdf078eb3 SHA256 1bd2043df93ffa2fac6f763dee7f634eefe6f2d7dd28c0944475953eae244156
 EBUILD x264-encoder-0.0.20090629.ebuild 1810 RMD160 03a28213206a655b9c4d3e1a2d50b0d47a9863ac SHA1 4ef7a0627d501cc493e7929fed27d91a1be6b02d SHA256 02c45dc49388f1b906199f0e548fa08d2f4576357954a03f66952ccce712aea1
 EBUILD x264-encoder-0.0.20090908.ebuild 1559 RMD160 b27189de1813303d9fddf06709c66cd5b8bc02a2 SHA1 5a84ffe39d12ef25743cd0e875468048591c92f7 SHA256 13f325289bd673275e214841a0c47024941c34e077f75a243efdd9172b1194db
-EBUILD x264-encoder-0.0.20091021.ebuild 1559 RMD160 7adeddfe86c77318e0fcbf6347c04fb4bfd744f1 SHA1 e0539b538985a8b1d885b647cdc907ce613f1876 SHA256 9ef5cd44f9283a0b34cff04cef15d31e3b63dee2e605879f948740a980edceca
+EBUILD x264-encoder-0.0.20091021.ebuild 1558 RMD160 f2e7f0ae21f1b6c91e1bca5fe695b87606afbecc SHA1 128afd02d95dbc37db507075aaee5b5ffce2f9d1 SHA256 568048bc890547fb48992bfeeab8811f6b0533417d1927ff0f8697de30c474c1
 EBUILD x264-encoder-0.0.20091124.ebuild 1559 RMD160 a575aeddc70b3c051a7d4df314c2ae54b36d8f61 SHA1 797019f74e0c1c0aa8623842b8be1c5447c579bd SHA256 ebd7187755eb4f3b7cfe64b2ea39cbb93b7d58d11efa57259ba4f6535f2661ae
-MISC ChangeLog 4415 RMD160 d8eb7cd15c4eda2a0ee8cc2bce2931aa6cfe540e SHA1 a5b7a948076c7a805cc4e7c77a68c92765d9d9b4 SHA256 69c9bd89c5e7b714a5763cde9dbb38b423dff103e58f3971559e21082509635f
+MISC ChangeLog 4535 RMD160 2215fa7ac7765811a0f1bdb80d9b1a7c58d0786d SHA1 6ff5a37bfc837e2113f8845964a8d4ddd646fc25 SHA256 201b2e4cfe7a7af4f4aad678c8570eb2a3e0769b85360119383d98c72ddd3ffd
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild
index 0cad0360c027..d20242532bc1 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild,v 1.1 2009/10/22 15:03:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild,v 1.2 2009/12/22 11:09:48 ssuominen Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs versionator
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug +mp4 +threads"
 
 RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )