amd64 stable, bug #316709

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

4 files changed, 14 insertions, 12 deletions

diff --git a/media-video/shrip/Manifest b/media-video/shrip/Manifest
index 5f1b9eb5d0d0..57bba76b7c7a 100644
--- a/media-video/shrip/Manifest
+++ b/media-video/shrip/Manifest
@@ -1,5 +1,4 @@
-AUX shrip-0.5.0-wur.patch 889 RMD160 4c29775fdda797a8026a14c4d5f73bc216b939c5 SHA1 5cd4464f359638b709fcc08e1b5d1aa0292142e6 SHA256 07b3ed04a67c9be85ff47362ad2a47f462aa41da2ec0fe45870380417f2ba104
-DIST shrip-0.5.0.tar.gz 375545 RMD160 b485624ef400558bdbd0b90e012fe92c1a95437b SHA1 8634d85fc803e7d63f7cf8ebb61fcbd553370847 SHA256 1909c41fe81bd3e3335a1d2fbe9d6f8d6295c89100cae44427534ce009f7f671
-EBUILD shrip-0.5.0-r1.ebuild 1018 RMD160 5cdcf2f6ecb21be62a626c731dcf05925108d860 SHA1 c01a95ce230cc681b4295cc8cad61105402c4d6b SHA256 d60744b5355b6d279dc7ed7b4ba1ad4dcfaae63e3964be745bba9affa175f32b
-MISC ChangeLog 1117 RMD160 4cca80d168952a641a05b867f2f4207ee4c00393 SHA1 cf8102141b1adcf57fc1cc9e4f1cb586e508a071 SHA256 801d86b1e99efff07af61f2670ac6b53e399b25a5aa2f78a16cbde83f5a218dc
+DIST shrip-0.6.0.tar.gz 337393 RMD160 f24147420a1235dbe150a965693f4cdc9ed6162c SHA1 71cd4918a89eceb6206eebcb8486ff9fcfdba371 SHA256 883a8a64af61edbb8de71e4207d47d1e04c227d2a6c713de1ee5db7740e3d05f
+EBUILD shrip-0.6.0.ebuild 908 RMD160 086cc40372f8edefdd42555657c25f1b7e7ef338 SHA1 832b7c1005f9cae6bcb1e611c6553d1704afd4a8 SHA256 d2bf1b360ac7ff0d0fa998ac4e8d84dc1c1cfb2b79c9f7bfff0055b71f424710
+MISC ChangeLog 1240 RMD160 043a3aac2062b995dcb9d871531ad498f3300af3 SHA1 57a6e98840c084ef0446f41fe583b8b70cc48dc9 SHA256 2f7cd9fd072d3be6d1ea5d6720f078fc5faedcd3f179f07a45239f4b805ba315
 MISC metadata.xml 295 RMD160 ad35b5022d11deca2c7f342d7cafd206bdf2ac58 SHA1 d9abe631cac8d0663b42a3472ac30bdb67518ea1 SHA256 f2c1cd1adf19f91c03e018bfe0e16af0b1a31079f04f6e9ca565d8737760f762
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index e0c879a90d0d..8936a798471d 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.574 2010/04/26 09:05:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.575 2010/04/26 19:18:13 maekke Exp $
+
+  26 Apr 2010; Markus Meier <maekke@gentoo.org> vlc-1.0.6.ebuild:
+  amd64 stable, bug #316709
 
   26 Apr 2010; Christian Faulhammer <fauli@gentoo.org> vlc-1.0.6.ebuild:
   stable x86, security bug 316709
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 38d5f77131a7..c07248d9b31e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -11,17 +11,17 @@ DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506
 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8
 EBUILD vlc-1.0.4.ebuild 11941 RMD160 9401debb4d071980307ac583f7b8e8ea52ad8a50 SHA1 94bf1ecc7203cc3315ace8d02805018e794c9caa SHA256 d0ac3016fcef6e5fa1b943101e9e0d83d731d06da6a8d82d572d1d8e9006a3ea
 EBUILD vlc-1.0.5.ebuild 12055 RMD160 827dd3c7f1ba1bb6e7b9b1d688c11b703aa6c205 SHA1 e4d094e7986207ba5e529bdccfbe2dcb52658130 SHA256 e98a0afe4f02d9a04b4b0a629f0bcdb1d90b6d80aabda8cfc38c728a77e92afb
-EBUILD vlc-1.0.6.ebuild 12261 RMD160 b05217e29f6b8c6832b3edb8485b55b61599fe1c SHA1 417f220b56a80f7320f271117600cdd338522379 SHA256 dcdda6ed9c1638a085e8fc489cfabd04e3c0e9fe80ccf8984d6e364a4ccef03e
+EBUILD vlc-1.0.6.ebuild 12261 RMD160 6b5ac16a6894a13cd0e24d19c7c9dc450e9f7411 SHA1 2ef72433a3ac00f58aa41f43ae6042d62ed6b2ba SHA256 313da90924c54976938a437ce109725c5ddfdc67c2e7ff95f10dfc705750479f
 EBUILD vlc-1.0.9999.ebuild 12217 RMD160 3eec1d182fa6f12894345165da6071b3f4ba5c21 SHA1 83bc5c5249a68618a85d937ad3bb7931187d0bc0 SHA256 8ac5307f2c23d9f5f996e9487f1e9a5815269ab8e670873376868f855059d059
 EBUILD vlc-1.1.0_pre2.ebuild 11847 RMD160 8929d49d053c100566295aa5b8634b3210a9d63b SHA1 825bab7321fd2967f595696e18ed2576d7f07a91 SHA256 893df21f4e6c0d725d4ec0f4bb1460008e57c0be18d93a8853e42420b1ee5ee4
 EBUILD vlc-1.1.9999.ebuild 11793 RMD160 51a944123258b0c77a5d26c2ed1db62981594da4 SHA1 a8eb03a6564888d561b743ee614b945c5626e86d SHA256 a9fa709e005d7eaf550ce40b26f9f3e7b1343fd2e3be4d895954d794cb3b0cff
 EBUILD vlc-9999.ebuild 11790 RMD160 a824573ae2dcc442c7be54787988f8b220675703 SHA1 2a1b5761a7586bba4c146948db121a06317ec365 SHA256 a1631a91a2b5eea69a74776dfa196e0ca3bf1c5a2008c8a97cd6a556ce32a556
-MISC ChangeLog 88983 RMD160 e9908ce2e827b590fe3124ad1bbdef6e389144d2 SHA1 be4be396eac2ea1ec7d73953c662d0404bdf98e9 SHA256 c5decec6398ce12b92eb91a0029e7fa102bd2d9efa0d221d100ec818801ef7b0
+MISC ChangeLog 89079 RMD160 9b61428c347a4de557c3b1a1b5f587e37979d2c3 SHA1 5e6dab9e6722ec9953b624820c9163d58093ec86 SHA256 6032c8ac3f056b1d9533a4473153b11107eeba1bc2991f5c01b243792bcdbc2f
 MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvVV3wACgkQNQqtfCuFneO4RgCeMwlU2cp53aIleJmrLvAuPFuX
-g8YAmgMDGhGEt7OEI+D83Ez23AEY4zF/
-=lTCT
+iEYEARECAAYFAkvV5qsACgkQkKaRLQcq0GJa1QCghk+uYfoFOCAjMG8s/YZWWtPF
+jpkAn08lhcyXdUCpAsVywqzST4Owrh0V
+=VAmc
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.0.6.ebuild b/media-video/vlc/vlc-1.0.6.ebuild
index c1483dd7c9e4..57082fa8ccec 100644
--- a/media-video/vlc/vlc-1.0.6.ebuild
+++ b/media-video/vlc/vlc-1.0.6.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.0.6.ebuild,v 1.3 2010/04/26 09:05:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.4 2010/04/26 19:18:13 maekke Exp $
 
 EAPI="2"
 
@@ -46,7 +46,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddax cddb cdio dbus dc1394
 	debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
 	+gcrypt ggi gnome gnutls hal httpd id3tag ieee1394 jack kate libass libcaca