Adjust upper bound of dvbpsi dependency on vlc 2.0.9; fixes bug #504738, reported by Maciej Piechotka. Users that need a higher version of libdvbpsi are suggested to use a different vlc version.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 17 insertions, 12 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 5fa6f1b18363..267ab5fcdd00 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.894 2014/03/12 16:15:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.895 2014/03/19 07:57:21 tomwij Exp $
+
+  19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.9.ebuild:
+  Adjust upper bound of dvbpsi dependency on vlc 2.0.9; fixes bug #504738,
+  reported by Maciej Piechotka. Users that need a higher version of libdvbpsi
+  are suggested to use a different vlc version.
 
   12 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.5.ebuild,
   vlc-2.0.7.ebuild, vlc-2.0.8.ebuild, vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index b6df0c575ccd..b6aa22ae8d74 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -24,7 +24,7 @@ EBUILD vlc-2.0.5.ebuild 10991 SHA256 41c77d7ee1944f87aa51f94fa60e6fe328bd5e892cd
 EBUILD vlc-2.0.7.ebuild 11049 SHA256 5380c9d66585e9656eb6e2537177f91f5d3f314d477d3eef9c22e39345940796 SHA512 98ed76a1966dae6538716de1dcafd31a6e7378f5739a4978b93aa7332bb11d81f56a82004769143fa9af2bbcb4821974db02612d457410525cbeb5d0a4cc5d24 WHIRLPOOL e2b2ac8b4271452b74a1607615a6f85108d2c4616515512ced8252d547bdd594a3594d5109e96c5a115db9d1a284c4d17a5e6c25dcb11ccb4323b425a490cfe2
 EBUILD vlc-2.0.8.ebuild 13209 SHA256 2681fd06c5df72d9500ec07a0ac95ce63ce66d9b5ace0db00135daab6a19a550 SHA512 8174d442414ba0e4835bea9b546ce78e28cf2d4c95f4bb8f816b12d0d2352aba2909de2f1144da07531802e03eda3431b6da6967cf8ca5f8a41eb14631526cac WHIRLPOOL b660362d3cc3a049a6019e7593b1721e15864a96f37d266391e1f4bb536f2f46c0ac8b159ef9d8a520e87f68764fc0b7e82434628ee0a0ab0e7b9d88551ef951
 EBUILD vlc-2.0.8a.ebuild 13210 SHA256 8dbdeb5f39c51fd14f4617193c1a633290dec04df1352180c434981b7a927b59 SHA512 81ca966f60874a24df6bfd3fea0c0765fd7c5ed69a87f94671a357ea8b0c527cdbcef660d91ba55bdc09da2307fd31ba90861373714ce96bbba97afb4bf6fc3e WHIRLPOOL d22f6ff3bb5003f971917e0852d0648cbcdafd062fc6646342961d00126bd2f42bae592a2f67f6952917f21b8ab7ba2bc86cca8b8ff49888d886e81b992ed1cd
-EBUILD vlc-2.0.9.ebuild 13209 SHA256 19e9337a15917a46226e1bdbdcfc106ee4a659ac86bfbe4a29f0fb00445f246a SHA512 dff6e74e9d11d94c1b9d1c3dc8a4e2ebe030c3053933d1a93410056ab4e107e37b1dfe45a4492c9d5d660136f562aa7bd5756afc3ce8011b27f13ee794b94ed1 WHIRLPOOL 620dc285ac52faa6e18ba5a95106a4f872d40a93c198b5200dde787b3e1b3d759e78163aef9c096c246e4997a92e02c95823486ca5e6431b4e24ab815f91bf93
+EBUILD vlc-2.0.9.ebuild 13236 SHA256 6d5f7ab2f2cdf487586bc93030becf89e923b866359f1ed776ac2b74c0b936b2 SHA512 ca9092155b9a742ff6af233c0d8c0c9b7f464af188127c5822561f932c166aade48c0207bdb4ac612b12e29bb21b5e67a75caf17b2e595b31d30cdc099a978fe WHIRLPOOL 9ea9306938bb0d99622089176b5ea9a72cb36803851175629ce68ccc74c9050c7625c07c8c0c24d88b3d5e7ac824b37f7ecf18439870d691f6c90622da6d3fea
 EBUILD vlc-2.0.9999.ebuild 13232 SHA256 cf093a92111c59477c49dce60838966b5d437522d760d5b80b12e63e6d75bc40 SHA512 0c440be32c1956ffd63e10abd6070d97b407740acc50de1a06f2a92e0f3d76a47ed4f134a3242fa8e414f0ae271abed65570199afd33d5adb59932287efb44a1 WHIRLPOOL 51a748e14987ac3919a91e023b773a6a0605a5896cb5ab41f47c103f45d8256d67288ef481c4ca21909f23bc940a22a1a018c917d750762c7304aeef582290cc
 EBUILD vlc-2.1.0.ebuild 14133 SHA256 f359c85e870ecac0c100995c881da4a325f29b914b79fd68ecb504042a70ce6f SHA512 82d4254d45625909d87c9de91f09034e45367759df1cb88456024839aa286b181d28e7cfcb470181fd022122cccdf2e3ef6878c5b9e4e49fdab564f0d01ca15d WHIRLPOOL 219a9849b5211a3e713a817b9462181229d1729a55ad9afefd271866b74090c14c45e4edad6faab3dc0e694e4057ed70a601dee48df958127bfb4c0989eb8cc9
 EBUILD vlc-2.1.1.ebuild 14111 SHA256 064cd3dcc88fbf40334d9345c3fb801a4f1cebc266308b0fe5fd0c7e71742b2d SHA512 efe09abdf4f9d9ddeec0d49b04dde2952c7f8e144b2edfd35f03914c0fe97e3216c0f4c46ab590239f236e5f0addd6a05361a9443b75f3bcbcc8d697c25e5689 WHIRLPOOL 6662ec6be51f6ea98e4a131cf6036395b59a113eeea7731b85615d66b82892f3737db40d44123cec74ffedda1f9f637bb132350c3a89382a8c56b342b3c667d7
@@ -32,17 +32,17 @@ EBUILD vlc-2.1.2.ebuild 14111 SHA256 bacaf3cd5b1182023386370d5fcc8c00484c8f25809
 EBUILD vlc-2.1.4.ebuild 14486 SHA256 c4de16a8a6dc508c7f0a04711c5e0b4d58ade2c62a48a25bd63b5fffcd00c90c SHA512 8e9071cd163df3026ec83d5cab4917a3bf978ae470ff1e12279290d441dd266a9c586d493027249ab717351bc2c7b920127e458652721629ee2187ffdb0b7c61 WHIRLPOOL 4f22a732c503aa8707636f99de7248c03b883efc93cd8ad4d61fc40070a782704e87e64ad89b93dd5b74cd21fb0c95e1514c6f6a63c6500343927b7b0d10e915
 EBUILD vlc-2.1.9999.ebuild 14502 SHA256 a2b9ba15c8697fffecff6ae091be6a163ebeea3e2f63a76844ffc9f62392c691 SHA512 235848446bca021d4db005d4e932471088a2043373196f8f3244fd960b625166aaaf73b14bf7d9a2196d157923d3174c419d716f6842bca3b0fe9ee31e3b5bca WHIRLPOOL 41da9a81b1f763175ce0f1088933ca252c5bbdaa6bc6d2443d762c814b83cca8634ce8c4ed40473d6797608817c0b1db4f52c68f357230fbeaf61ea6ac6c6070
 EBUILD vlc-9999.ebuild 14660 SHA256 4385ee75c8c7cac331be9cd1f9f6512ac401a62dd07825919543f481ab51594c SHA512 baadfd6438a3b51ae69fb7fd852bdc89b9964ff3f5eda2fad27f19ef8b3e3d9f138297ae49a4fc6010bdb6c2af4fd47e292411b951b805ed47c430378994f387 WHIRLPOOL efaceca95385371afe5366cf014b3edda71e848c30b4464c65dd9b81d3113334a9121f77a1bd148754ab3f0112b3c6acbde529f7c46aeae93ab82108f186d691
-MISC ChangeLog 25314 SHA256 3aa0d9efe7c2c02f45c5cbfab13395936cbb854258f06699eccaf0e7b9c17510 SHA512 b7241bd2d22f5785abf93f5d67846c288fa6ce53a84682139481e485a3798dd4413ae03059692ce0a6d0585e1d28b81ba774c6ee53f1f204defd871ed91e16e2 WHIRLPOOL 3547f88a0494d8044412e39d6f2bad98f26e8b8b9ca76b4e75faf80ac4e7de75e2e8f7c557abe83d081d870a9438d58329463425b49d4cabf970848bfcd6b539
+MISC ChangeLog 25581 SHA256 0698db28199352045a767ed021684198089396179b6de7cbf769ee681b530b1b SHA512 57e3b54fde4fbc6389d10f09b1890b054209a52a781aa98c6090dd4f9d0fde78208622761bd4c9da862152ae44f0afd7ac2f4b3fdfbe1b462df22e0a2233ec1e WHIRLPOOL 74f83f209b72bb26d3bcee4a1bb27bebbbd93c2b95f83ed9df34674e91aecb186bd9e086a4610e4db61bd3761f3f992a2eb04220384170c4e984418493865dac
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 7078 SHA256 06f15f0f664689d21c79529dcd73781bc7be5c087df60cb7512c634445ab62bd SHA512 0186ee55a67cc50a935a7fb39bcbc3119165f27c342bef97695262c6cebf05a792babd899a7933dc79e2255b01d26b9f737c1f55b2b329078edeac3ab4a57319 WHIRLPOOL 674a810ff112b97d341e2453d97d15f4e82bddbf83c61baa970e19ebdf45d3193bd7509f889fea72c309a64146c2879e1bedcb0f9d0b18a3c71fef3990b080c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTIIgcAAoJEJWyH81tNOV9+ggH/AofxW/O6nF9h8+uND4FFU9o
-0/9SyjUbDEI860iDlBK0NUFKoMOq1nZMFwU6fdDePzJ+Q0MCZH45vmNPcljstTvm
-BvKFsUkZhBZuKKrCR/4ESgSjXL+sFdodVkHpBU7cfxVkmqANcYIQfWtQml9G4Vrl
-kveKx81QL07UjKLk4cNtHinCj9Yu5Mv0926UwWUpiYN1Rp3gVUX5xMHfxfZWHxtE
-ZBWIODyKpSDTLNMqy41pr+6B3GA39kHVDSH9KFX2c89x3/oc11nBaDDlQ/9C4uzj
-UFAnEVgzxXidyMLhbeqQVgVn3puv3tiAQy19Z/F6pYSVX87RulnOCeFYzCc3A9s=
-=hOqY
+iQEcBAEBCAAGBQJTKU3gAAoJEJWyH81tNOV9cuQH/iiDX8XB9QZkPdsHmBrwmiPh
++M/bVmfjqL3SUNii3zkToDOTqeiWwY7zZ4N3bE9t5tmt5hw5PXiPh9BqTgzZ123G
+gmtG7Jk/sHqoH9mjA1oo7bDAjSura0ek7tXMzIqtEnZTbbbwz2whXiKN7l8fT+Eg
+v57t6Iq1L0j5+dFgjWv9K57C/OcAJOshhpL1HKE99MsCob+TCtlfOD6TLBqBDHkP
+N9olMFn8Lp4sGT45sJESnA4dWB7NhHpKV8XFz22gYlwK+8BKyBHukVY5ojJGWFk6
+6ovq+2/Anz6+dEjcczm+x1ut22Lyd4Pnkj2rBOFYmPtAlV9HEScU50TvfdWJT4Y=
+=4ELz
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.0.9.ebuild b/media-video/vlc/vlc-2.0.9.ebuild
index b6df0506d935..cd62765f4dde 100644
--- a/media-video/vlc/vlc-2.0.9.ebuild
+++ b/media-video/vlc/vlc-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v 1.9 2014/03/12 16:15:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v 1.10 2014/03/19 07:57:21 tomwij Exp $
 
 EAPI="5"
 
@@ -74,7 +74,7 @@ RDEPEND="
 		dirac? ( >=media-video/dirac-0.10.0:0 )
 		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
 		dts? ( media-libs/libdca:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
+		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 <media-libs/libdvbpsi-1:0 )
 		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
 		egl? ( virtual/opengl:0 )
 		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )