Disable test_media_list_player on 1.0.x as it deadlocks, bug #281419, fixed for real in master.

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

4 files changed, 17 insertions, 12 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 8c6f42ce8a24..74a0c6419dbf 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.496 2009/08/21 10:29:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.497 2009/08/21 12:13:27 aballier Exp $
+
+  21 Aug 2009; Alexis Ballier <aballier@gentoo.org> vlc-1.0.1.ebuild,
+  vlc-1.0.9999.ebuild:
+  Disable test_media_list_player on 1.0.x as it deadlocks, bug #281419,
+  fixed for real in master.
 
   21 Aug 2009; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
   Add zlib deps for modules that require it, not really needed because we
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 798700240f7b..23d89e2f206f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,19 +4,19 @@ Hash: SHA1
 DIST vlc-0.9.10.tar.bz2 17526464 RMD160 25a96098e3507d48f7d62d1b2f3a1138c2004832 SHA1 8b562a5327c358a332f97d9012702ca2b445c0ed SHA256 54f6ef6e592e0c0315da82ccbe76304210073d0b778e65e3c47e1e950c12b726
 DIST vlc-1.0.1.tar.bz2 19794042 RMD160 9604d3fd33888a058472ebda711ac17f78f8de3f SHA1 4bd670f538651633c1115c8f4efc94211ff882ec SHA256 2b4a1d82699f37a7b696bcdc87e669f17c1ba6ab37bf7a96fd953940e00fd463
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
-DIST vlc-patches-67.tar.bz2 5648 RMD160 f8f4ecd7ab846b00448158819cb875c4c9de8785 SHA1 98ff0d1a3a29ca0652f28d8189038d642c62af02 SHA256 7aef5ab023e8a93dcfb151a1a13500b63d8fd7bb97d0c3cf5670fe87b3ea7a37
 DIST vlc-patches-68.tar.bz2 4927 RMD160 10c87549fc7cc0446b35bc7cf810a693a173d69e SHA1 ca643dcd04d65a9820d60341b834435dab95f036 SHA256 cb192cd418fcc4b459750c77c82b258d0b606f0d2cfa68edfee81fd508e9b509
 DIST vlc-patches-69.tar.bz2 5312 RMD160 627261e8f4764e2f4e93e4c64cf33561a742cbeb SHA1 efc45ed9e91ed9b8702a499d9b456e16957013fc SHA256 f18461b7f8fb78e9faa9200563304dda511a974ba656273a56ac232d94dbb0ab
+DIST vlc-patches-70.tar.bz2 5881 RMD160 8929f0c32a8762bdccce1d6198854f4e333796c9 SHA1 9714b68763565e9ce6c7ec8d431dbb9fc0e6fdfc SHA256 38fac8341ec642b0d7278486b9f0f621c5a22eed4343f3359b470901e2cfea56
 EBUILD vlc-0.9.10.ebuild 11220 RMD160 d348e0bdf3ee19a1ff92b67b741fc07bdb5b303d SHA1 d137baecf3bb09e11ded9c8039d24cc79838bbbb SHA256 91dadd354791b74437c935a4509f7f329320a963422c26b43a6422a55a980e4a
-EBUILD vlc-1.0.1.ebuild 11987 RMD160 6b731b9595947513e396a0e349ab051cd83da19f SHA1 c32cd3fd188637c930f419599f735b70128cd0d2 SHA256 9514852f31ad5cffff49803f02b5d85cb1332852c9710dc300d51cc0f464e6a4
-EBUILD vlc-1.0.9999.ebuild 11951 RMD160 033ca44f9ee0b3e7c86bc0b1789c0953a96cd8fe SHA1 868c4bc249059eab9d6f5baeeb7263518ed26591 SHA256 96fc0103c905ebdd43d776dbacffa6b9f15322e78bd22a5e7ea6f4611eb40d43
+EBUILD vlc-1.0.1.ebuild 11987 RMD160 d9c34944d417e56c9bcbdd23c237045ebf95dc7f SHA1 81a53f8ef03945b6a7271f8e25a8f67f2da4a89c SHA256 ffb9c1bc4606ca0d58205bb3db7cd48d2832583153d66a35cf42f74efae9639d
+EBUILD vlc-1.0.9999.ebuild 11951 RMD160 5dee3edbe3642fb10ce4416bf1bd8a36959c455c SHA1 8427745df07d3613eae9677c4950053576f6be3a SHA256 8578306d5026e463b8bbe665851aa010bd0b503bfd0f156e04381d43e628f176
 EBUILD vlc-9999.ebuild 11891 RMD160 2b3d65bf6543cfda3d1d2706df0f838518c74867 SHA1 4aeb39a06f53c3e2ec484bcfe3c58572dcfb6694 SHA256 808865af41767ec0196aa673ae969d161033aaa1729dddfbbcf5a8bd940aacac
-MISC ChangeLog 78879 RMD160 99fd7e865c9affe51b8a984cdb89e874fae23f83 SHA1 b0368629ba1a80c80ed8ed0287dfae19f96fb9b7 SHA256 e679bfb17edf4ffd794e5d7bbaadc27b8c97cffd3d0b87b0e08cd6eafd41b180
+MISC ChangeLog 79073 RMD160 2d10eab662e7da97442c919b9c83180577eb23d5 SHA1 126311d0238b8cbeab371ef718880571bc731361 SHA256 8630ff8d6a8828d70a45941ebbb6eba64dc5683f3cf66cc3f8d542801916bc51
 MISC metadata.xml 3976 RMD160 dbfa0c1454d2d1c167425a2135a5e4406cd4e456 SHA1 17926d44165e841588c3e93676ea6b429de14e85 SHA256 22a4c78c9960eb4be35caa117f033f4a654378936ffe1ed9813d4704f6c9219a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqOdv8ACgkQvFcC4BYPU0p58gCfSj5QPeoJ/9nX6nVvfrxWCpy2
-7AcAoL2YjfIx+T0rlzPofLCzAuYveEIB
-=28Yp
+iEYEARECAAYFAkqOj3kACgkQvFcC4BYPU0r8SgCghAutznoGgw4wzcj2XPXb6qXk
+BSMAoI8mJyqNxqsM4G9wCMPvak9MJScE
+=8chq
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.0.1.ebuild b/media-video/vlc/vlc-1.0.1.ebuild
index 551417583efe..4a32bec7e32c 100644
--- a/media-video/vlc/vlc-1.0.1.ebuild
+++ b/media-video/vlc/vlc-1.0.1.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/vlc/vlc-1.0.1.ebuild,v 1.3 2009/08/21 10:11:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.1.ebuild,v 1.4 2009/08/21 12:13:27 aballier Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 VLC_SNAPSHOT_TIME="0013"
 
-PATCHLEVEL="67"
+PATCHLEVEL="70"
 M4_TARBALL_VERSION="1"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild
index 920b820251c9..f96bad767cae 100644
--- a/media-video/vlc/vlc-1.0.9999.ebuild
+++ b/media-video/vlc/vlc-1.0.9999.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/vlc/vlc-1.0.9999.ebuild,v 1.23 2009/08/21 10:11:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.24 2009/08/21 12:13:27 aballier Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 VLC_SNAPSHOT_TIME="0013"
 
-PATCHLEVEL="67"
+PATCHLEVEL="70"
 M4_TARBALL_VERSION="1"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"