fix zlib dep, bug #383351; for now we will force to use the older version until bug...

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 903d0d55464a90c3c41a41d5bb407f2eca66f001..a2d02a6835365c6dc99c46e7db2fda8109c05031 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.740 2011/09/21 08:58:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.741 2011/09/21 15:52:18 aballier Exp $
+
+  21 Sep 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.11.ebuild:
+  fix zlib dep, bug #383351; for now we will force to use the older version
+  until bug #383179 is sorted out with respective upstreams
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> vlc-1.1.9999.ebuild,
   vlc-9999.ebuild:

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index f8b6a0424d86dbaa2a17108d97b50b7edb5558e8..02b4a117caf57b7fdc6968020fc996764315a4da 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST vlc-1.1.11.tar.bz2 26319862 RMD160 fa8a32a8e81a5f707b3cace6fa9808d5d7cb9fe6 SHA1 068e75bdbfe6e595a4db14ad49e05688c8b1d5ad SHA256 682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
 DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
-EBUILD vlc-1.1.11.ebuild 12378 RMD160 dab6507d8de996c819c8a1add5b33ae43f342294 SHA1 50479218dfb33eab93d02aa6f1f25edec1655fd0 SHA256 bbbbd8f423d66b6b90950fc2074103c70f5a6afa53710c6db7e8d5086c890b71
+EBUILD vlc-1.1.11.ebuild 12391 RMD160 554f9c6bd824d15a404b4956a07ff8202d15e60a SHA1 d60a8c6ca04bd915636c6576ce4e450660dc87e6 SHA256 0bdc4c4bfd0373f87ac4492e40ade1f0d7a8365a36886078f84e8c147b0ffeb4
 EBUILD vlc-1.1.9999.ebuild 12290 RMD160 18b9846b2b7e51219a4590965ac125993716665c SHA1 eb6e7f85ffc5e408a385429b4ef2e0b84d5adbe1 SHA256 4d6be0e05f2aeff08bebe416715e5dc8997b3c3190956290eeae82d46077466f
 EBUILD vlc-9999.ebuild 10894 RMD160 f94bd245527f3ad4507f3805df12dbdf3beae2de SHA1 f273f3d53096ae51a5199dbaeffa1e082f68b796 SHA256 58b29667e71a149ce26bd5b2719ded29ec5f7497ddb960de581e0711f2c1439d
-MISC ChangeLog 109994 RMD160 73ade58b12add3d6a71ee9e3744ea600ab9a10bb SHA1 76007b4a9f369391cb28f782c6d79a755e293df3 SHA256 9579ddd225ce1256051b20f1d37e4d5788b949869c8fe6b853ef9e8942b7c94e
+MISC ChangeLog 110204 RMD160 e66f0d917a7780e8f12820efe8fb607f59a1f25d SHA1 1c7e252310a7e71db25f202fdc79974d0e62834e SHA256 1a81947555baa4466e30b711c3b5166bed52291bbe3bbc989052c4a46c8ba27d
 MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk55p8MACgkQfXuS5UK5QB0+qAQAh6PL7gfxlIBYgtij0nl30jOc
-vSp9+L4WwIbabJmdZcgxMl1+fBAWe2buLq1cKTSgVE/H2JQ+SDApp6kgrS6Sh4ja
-zowyvKH4wi+ZWDz1LYd6d1hQv8mkLjTGOrSaj4hbwe9a5oBYT/4e9jSj6tA7chyJ
-EXpBV8aXkAyc2E4jWXI=
-=dN9G
+iEYEARECAAYFAk56CDgACgkQvFcC4BYPU0plRACeOneaLAve2PJOcsM4glpGoyrC
+jT0AoIG9IE6gZgPLbq79HTosQ5EEH53P
+=tf9c
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-1.1.11.ebuild b/media-video/vlc/vlc-1.1.11.ebuild
index 7751b58a941f30e4e7872144fba3d2cb6e2e327b..07aefab4fa218a1e9666197c588be686c0434c76 100644 (file)
--- a/media-video/vlc/vlc-1.1.11.ebuild
+++ b/media-video/vlc/vlc-1.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.5 2011/08/27 17:38:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.6 2011/09/21 15:52:18 aballier Exp $
 
 EAPI="3"
 
@@ -60,7 +60,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
        vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
-               sys-libs/zlib
+               <sys-libs/zlib-1.2.5.1-r1
                >=media-libs/libdvbpsi-0.1.6
                a52? ( >=media-libs/a52dec-0.7.4-r3 )
                aalib? ( media-libs/aalib x11-libs/libX11 )