Force libass to be < 0.9.7, vlc 0.9.10 and 1.0.1 will not build against 0.9.7, git versions are fine.

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

4 files changed, 16 insertions, 11 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 74a0c6419dbf..8fce3264922c 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.497 2009/08/21 12:13:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.498 2009/08/21 12:17:17 aballier Exp $
+
+  21 Aug 2009; Alexis Ballier <aballier@gentoo.org> vlc-0.9.10.ebuild,
+  vlc-1.0.1.ebuild:
+  Force libass to be < 0.9.7, vlc 0.9.10 and 1.0.1 will not build against
+  0.9.7, git versions are fine.
 
   21 Aug 2009; Alexis Ballier <aballier@gentoo.org> vlc-1.0.1.ebuild,
   vlc-1.0.9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 23d89e2f206f..2e15162c95b4 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,16 +7,16 @@ DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1
 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 d9c34944d417e56c9bcbdd23c237045ebf95dc7f SHA1 81a53f8ef03945b6a7271f8e25a8f67f2da4a89c SHA256 ffb9c1bc4606ca0d58205bb3db7cd48d2832583153d66a35cf42f74efae9639d
+EBUILD vlc-0.9.10.ebuild 11245 RMD160 44761b62928f238f8d125e79464c436c08e8a611 SHA1 af8b7b0a26e7c0af2280f36904b69291fe0e6228 SHA256 1a91f8b0bd3a00762b01f7b09254435d071b88674f16701856243a492592c79d
+EBUILD vlc-1.0.1.ebuild 12012 RMD160 b2711f4fb4ee61c7925383bf9df080ed2a419c81 SHA1 598a21708657b0c62b0e6fddefa060c505673f4d SHA256 cde2b79a89af8552ccefe4f03a05fb4fe18fd18acb8d03ea56ba72d1d2dfbae1
 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 79073 RMD160 2d10eab662e7da97442c919b9c83180577eb23d5 SHA1 126311d0238b8cbeab371ef718880571bc731361 SHA256 8630ff8d6a8828d70a45941ebbb6eba64dc5683f3cf66cc3f8d542801916bc51
+MISC ChangeLog 79271 RMD160 213bd03bdf2a465c48d5dbf1223374874a83a649 SHA1 1d3187fbae9e99576e1f1a7a15ed33c282a56626 SHA256 06fcc3cfff972f66a2b30a039448d1a29a89466aefbe4b0a826f10f5993b9072
 MISC metadata.xml 3976 RMD160 dbfa0c1454d2d1c167425a2135a5e4406cd4e456 SHA1 17926d44165e841588c3e93676ea6b429de14e85 SHA256 22a4c78c9960eb4be35caa117f033f4a654378936ffe1ed9813d4704f6c9219a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqOj3kACgkQvFcC4BYPU0r8SgCghAutznoGgw4wzcj2XPXb6qXk
-BSMAoI8mJyqNxqsM4G9wCMPvak9MJScE
-=8chq
+iEYEARECAAYFAkqOkF4ACgkQvFcC4BYPU0oKqQCfWr96eroLbfA/Kq9Rf/mr7t7M
+B2QAnjnRSMhbZlfnYewEFNScLz5c9HsR
+=N61a
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.9.10.ebuild b/media-video/vlc/vlc-0.9.10.ebuild
index 76f27464622c..27b446fd3cbb 100644
--- a/media-video/vlc/vlc-0.9.10.ebuild
+++ b/media-video/vlc/vlc-0.9.10.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-0.9.10.ebuild,v 1.5 2009/08/21 10:11:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.10.ebuild,v 1.6 2009/08/21 12:17:17 aballier Exp $
 
 EAPI="1"
 
@@ -93,7 +93,7 @@ RDEPEND="
 			sys-libs/zlib )
 		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
 		kate? ( >=media-libs/libkate-0.1.1 )
-		libass? ( >=media-libs/libass-0.9.5 media-libs/fontconfig )
+		libass? ( >=media-libs/libass-0.9.5 <media-libs/libass-0.9.7 media-libs/fontconfig )
 		libcaca? ( media-libs/libcaca )
 		libnotify? ( x11-libs/libnotify )
 		libsysfs? ( sys-fs/sysfsutils )
diff --git a/media-video/vlc/vlc-1.0.1.ebuild b/media-video/vlc/vlc-1.0.1.ebuild
index 4a32bec7e32c..ca72e322025a 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.4 2009/08/21 12:13:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.1.ebuild,v 1.5 2009/08/21 12:17:17 aballier Exp $
 
 EAPI="2"
 
@@ -95,7 +95,7 @@ RDEPEND="
 		ieee1394? ( sys-libs/libraw1394 sys-libs/libavc1394 )
 		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
 		kate? ( >=media-libs/libkate-0.1.1 )
-		libass? ( >=media-libs/libass-0.9.5 media-libs/fontconfig )
+		libass? ( >=media-libs/libass-0.9.5 <media-libs/libass-0.9.7 media-libs/fontconfig )
 		libcaca? ( media-libs/libcaca )
 		libnotify? ( x11-libs/libnotify )
 		libproxy? ( net-libs/libproxy )