Apply fixes also to live ebuilds.

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

6 files changed, 52 insertions, 19 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 1b28070b8096..4d9e0176a13f 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.134 2013/01/17 10:55:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.135 2013/01/17 11:29:34 scarabeus Exp $
+
+  17 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.5.ebuild,
+  libav-0.8.9999.ebuild, libav-9.9999.ebuild, libav-9999.ebuild:
+  Apply fixes also to live ebuilds.
 
   17 Jan 2013; Luca Barbato <lu_zero@gentoo.org> libav-0.8.5.ebuild,
   +files/libav-0.8.5-support-libcdio-paranoia.patch:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 3931e7e0e6b3..bae66e58a4ed 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -10,17 +10,27 @@ DIST libav-0.8.4.tar.xz 3797112 SHA256 a4a53410ed864848063628277eb94f1921a7edfef
 DIST libav-0.8.5.tar.xz 3761376 SHA256 d82cfbbca9825d8cf6cff4d830a57d094d359d23da7179a2d2811300cdcac57f SHA512 88e28b27f4a1f5dd856210b32527bc6c631e3c8470eedcdf303368cb2ff848407d6eb4359279eb8bf6d21375c0e5ac6860db8e1e96c4030990a643f9a365061c WHIRLPOOL a4ba175d9b40c5c1969be74fdae31c1bc67abf308e38c2baf429aecd16f5f7cd34df33e4f18661b5214d4c768011b2b742dc646ef5ceed51278b4ee04736546e
 DIST libav-9.1.tar.xz 4062784 SHA256 549969acacd8b341644ef027a058c2499b2ef2f088f7bf23a49f21d747458741 SHA512 35672cbb338847a929674f3d3ff7a265f0b4ad2701ac42bb1c8d4792b930bd5471b494d535e498347c4cf135cfc20a7c252f68ca776a9127cdb884b78593c743 WHIRLPOOL cf64de1c600f723ff7b220936f3d5f087d30fb03267a2f865e26a3910061e251affdc1b8cad913ce4c02b82895d8333d9e6604a16be22c20354f736ce280a630
 EBUILD libav-0.8.4.ebuild 9093 SHA256 392473a04603b5f3f71a016fd142a92b4c773c83a70ba27462967d0e8abc962b SHA512 49f54eb912d315c761b3ddfe86528a9db89bfbe1e8b9e5088bf6b06f562ccb38e3ea3cecd122e1f867f690c2f551dbb48c14bbb2b70e123b543c5f5e3853bf12 WHIRLPOOL 17f3fa472cf1469de5c1b562b6d01184dbba68d07517884f3de8d94f69ec627260d0ea1f48356edc378c6d5b34a5c2c18a361c6560fa60b29db2b1ecd8f45891
-EBUILD libav-0.8.5.ebuild 9151 SHA256 769ae9eae033a8bf515653d72aba03a07389eac83ff202fa952745a723aff7e1 SHA512 ca1d83c46abf9f5a1b6b7e315c66564e59293d3ba873f0feaa47b0d57761819eb91493d62e6162488a84d7bdd29f06d565bd64c051ab202dbb63faeb061947ae WHIRLPOOL de5c991aa4a79578b85dcb8f217506ec3380b8232791f167b38f5db343eb233c73b641a4d78189a4ce7c92ffa7d4733319c2ef555d262a28517c36d92d70aadb
-EBUILD libav-0.8.9999.ebuild 9050 SHA256 25f2c5478177b560910ac33e35853ee61b45dd9afdf07e47cdd767ae9dfcffdb SHA512 c8f3d250d2ab1ad38508b040f1fb95261080ce6e8d43831eb5497fdac4b4d725228b26e715564bf93d844df72f8950ee2446d84373f96244615d64cba4e95389 WHIRLPOOL f404574155ea601d119cf04fae0a756a7ae3766580504027954cb71925436f033576d1a18dd66acadce880936aed46207149dcb22dd17e41e09b4da04bfc3a86
+EBUILD libav-0.8.5.ebuild 9160 SHA256 5eec28b42d2dbff68659dacf47b40666c3667331d6085611d4ea264b1787733c SHA512 b01b91ccb20ce3440ba4e51b7495a31a7a4c19361048c088fbc7581b40d6b8d8002d17288e325827d3c9ac59c144b0a21377cac2f3555a79c7e2c5cf6ea02951 WHIRLPOOL 7354db4a5e036db5bb853af793280302191c5e14446d2e543fcc4b3cadbd8d18eb292f17f8df0464b3ab0f284a9fa68f7e10e53b0629fc641f07fbcaf7130ac8
+EBUILD libav-0.8.9999.ebuild 9110 SHA256 596fc2c01d57af2f3af6af4b45139eb766b9d43503f8874ed82bbff6a099d0e1 SHA512 1717f9cf91ab218e302c685e7f3ab0231ce731fc79c45fb5b797ce7243125317d51fd788d151742407164b49f54528408382f9672e053a09438de44132bc7ef0 WHIRLPOOL a1c93c43997b327982e24dea09a4c64189133e270528a499e8cfb9ce64dd7c86598ef212264d6f52e30dcaa1ee3ce8f60725e225aaa8f9eedc0f34832f3a4d1b
 EBUILD libav-9.1.ebuild 9279 SHA256 50cc016f9fdf254beac8fb08fccc75d1cb71d77d165afda610c4c8bdc922c016 SHA512 d8a4cc561c5944613d3ef081970a59e855ed731e36a5fd8b27d6f25a112040e7a4cf1f7dfbd960f5e77b670f767e7ee416518477a6ba8f716e07bd2d7ec22a9e WHIRLPOOL 4c2bd72a85ef868b744316074440b3ee896558050f0316be7e147ea6c1b2c2c5d8c8f6efa80158b890be009bf36f9baaae2c98c2a326d9e8cdd07d8a45e01514
-EBUILD libav-9.9999.ebuild 9161 SHA256 09ffef2b051372fd87c7435572bcb1cb2c3f1301dc6d106ae169ba93d2781ef8 SHA512 c36222d3d580c19b489bf244d5d380d69c50d907839e06ac0f404840f34cbd53741bbea27a542cac924830a7095eb1d1b6c65368e3b557b004b0f48379e8cf4c WHIRLPOOL 94c2cc28a37066752ddf28e8ce31ce15a002ff486289d1f7fcd99100b7ed4e1205df558d6faee71b007ac6bf8fa8226f57950c0ec462c28b3abb31405293193e
-EBUILD libav-9999.ebuild 9038 SHA256 61854e48db2835dcb2d0f13943b7f28a591259988defd8c7ebcb0a4774ebfe69 SHA512 de4672db9285c64f929840923f8ffc1d49a23654fe1695ee115cb20706f0ce4b387b7eb9632e5bb01f1190fed36e9f0996c5134689521f22402d51e3aa5b56dc WHIRLPOOL 93525fa877baf66a9d7f46d1829b8f76be65bbcfa5a57d92cb00fa053f13b0716dba052c10bc0bff46f87ba57dc0e5866981250d13d37a723418d488f1f1187d
-MISC ChangeLog 19850 SHA256 c690594f2a0ec57c59abe31c9343b36036e4beeeef7fce904025218810f603fb SHA512 e0c2ba339d7b98ae53ce60b41655846a2aa041969ec33ffbbf670880525fdf0fd43bb0bed84c02f8bac52d79d570f487ccf690a3aed7eadc31f3c2021708182a WHIRLPOOL a5186f0f4917108e2988e8838c2df87aeea7f79085b8ea10bb67191dde5fb82b27929499729a8ae5a4cccfeb714ddc2e71313535d949413ebb9aaee713f530b6
+EBUILD libav-9.9999.ebuild 9221 SHA256 28622def870362de2b79f9f40d3b7c14457b2b54c3f474545847cc4bf48830a0 SHA512 aa9b5a136b133f9c435a394939e013d3f5fff9d8b7343ddef4e66abf14fa9c7dceb59821522ebaf391211a840cd79672fc58e159115761c0fbd3989b13f4deed WHIRLPOOL 165abbbc8c03560cec32dcbe715ad14cc1550bc576a3e0a2ccdab4db6069e0cc3071a7338395aba4791d2bdc800832c3c7b02c0aa98487975fcfbea714c5b9e6
+EBUILD libav-9999.ebuild 9098 SHA256 8b440cc6669897456f79d326b62d514ca694590c0d906807616a659dd81a5618 SHA512 fec355fe239b2bb88839487918f35ac3634fbe4ed7c48ea5c46995d767c711a74d35bc7414fe2f21b587a0d71fd269dfb1b29321fe51728d9935923321f233cc WHIRLPOOL b31b3b5e53cda3e403ec51d3a09e3f47a278eb136d32c0bfed04cf36f627e606d0ea9e7570a9739e1dee7ffa87f7ee0d58ef8441bf3cf5cdf85acb7d5ad87489
+MISC ChangeLog 20029 SHA256 9bae59b404c3a75f9e16c877abf57418b4e13a875a839c842b94017fe2fddf9f SHA512 44f1b455e2da0b25d961ff831cfcbb912dcfda551f21f045b3916501e24ebb3ea4b56a19089e48453925a20e04676012e7f3052020b67e20f436bae2bdac408d WHIRLPOOL 4c42934a3b96ea7949e108592879b8063323ef9561cda40affd24d24cd38ef3809227a0b35da38fb9beb789458d1f8bd851461091fb45f88b74c6677310a1961
 MISC metadata.xml 3023 SHA256 26380d1657785b484265cc5ce3112dfef63231857cd64f81300b30b806a2f8e8 SHA512 7eb1ea995315cf8caed89296b5fe1cdb9ebaceb8e0cb8e2e1bef22f59f0a518ce128d4e43d18550bdc711df9237790cdf91c775d28e016ea752a3abfa6faa533 WHIRLPOOL 45f87adcebdea041818809051ad67dbb3b880f46971dbab594b4b7dfe4d31a84d97dc5b6e45bb0c51b50b21142074490bd8d268d9b73bfb5ee839ee78e428b0d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlD32NgACgkQcXOrnRGRc45g5gD9H85g8wb62W7uNb48Eh03v4GZ
-daLyuKQWqNYgZdunDB8BAIWDRZN+koudLz+rH2VrtrcZuhQoM5E8/Af8O5/xRvun
-=wDoK
+iQIcBAEBCAAGBQJQ9+CiAAoJEOSiRoyO7jvo/XEQAKOi+KA6fi8CM4K6s9RaT7gC
+cZHjPri7WeUXTgY9kPpDuCmvYOWTe2XABVyf1QXhsBE/ST5R+Fy4iJ91GICu4KuL
+oEapQj66H3qpICWmBKYuD7U6qjVCFavI9rjayHnhM6E7LvX5Tl55grE0hgksfglh
+gpznbE3PIgDwJ7j4PqX0uewdHNc5TSxKuI/Rt7pDjSfePHCzHXO6/0z8dNZmDS9n
+x6bC801nIeEY5h5+uQWA8vosbSkYm9qB6cZ/eMYXniiZr7WZDQ4IY8JynefjCBO9
+PGKl6VCRsnJB20ytXilVLZpE/YfqcPXpUjxrgtaGoH6jPLCTQQp0/dc1L6GhSp+U
+696ZuH8E9dF7ffhn7hDaV4Qb4IEDej8AjYX7AnZrt+DqlTuEYvK8qiDMcKkqq+mb
+k3DRgQPAnppRTuLSD7MNbCkC0+4Um6Dmnqkv15/zBnu50GjkYQIHk3WbnnaS830T
+SMw8UFhHVvrCNQRustGDRURGmEnlkdT31tPXeyabNCX/nEJ78NYdUCh1LZDWZTcJ
+JGaTeG1Tn/iCgmG1SOVOdCX7HcHgieDW1cnFOBZUwOkPmg/H/UNz3hMfYMMyZj6w
+56HbiJG0b+KRUEtXFg7PZ0ImlCQUnAEuz3jZbQUEmgOoKxdjl3+cbzh93RlQ2QgF
+Qq0//TBL/SBC0En6aPf6
+=nsRC
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.5.ebuild b/media-video/libav/libav-0.8.5.ebuild
index c810bda20024..a03689aa5f89 100644
--- a/media-video/libav/libav-0.8.5.ebuild
+++ b/media-video/libav/libav-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.5.ebuild,v 1.7 2013/01/17 10:55:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.5.ebuild,v 1.8 2013/01/17 11:29:34 scarabeus Exp $
 
 EAPI=5
 
@@ -47,8 +47,12 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia
-				<dev-libs/libcdio-0.90[-minimal] ) )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
 	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild
index 519739476055..25488e1d9b9f 100644
--- a/media-video/libav/libav-0.8.9999.ebuild
+++ b/media-video/libav/libav-0.8.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.21 2013/01/16 14:25:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.22 2013/01/17 11:29:34 scarabeus Exp $
 
 EAPI=5
 
@@ -48,7 +48,12 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
 	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
diff --git a/media-video/libav/libav-9.9999.ebuild b/media-video/libav/libav-9.9999.ebuild
index bec69dd26828..3ac5c6bf8060 100644
--- a/media-video/libav/libav-9.9999.ebuild
+++ b/media-video/libav/libav-9.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.2 2013/01/16 10:37:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.3 2013/01/17 11:29:34 scarabeus Exp $
 
 EAPI=5
 
@@ -51,7 +51,12 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
 	encode? (
 		aac? ( media-libs/vo-aacenc )
 		amr? ( media-libs/vo-amrwbenc )
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index b9ce966e5181..5e1db8e77580 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.55 2013/01/16 10:37:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.56 2013/01/17 11:29:34 scarabeus Exp $
 
 EAPI=5
 
@@ -47,7 +47,12 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
 	encode? (
 		aac? ( media-libs/vo-aacenc )
 		amr? ( media-libs/vo-amrwbenc )