Apply again the cdparanoia patchset for both release and git version so it won't get lost again. Wrt bug#470872.

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

4 files changed, 26 insertions, 19 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 3856a01471e1..370cb25adc55 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
 # 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.162 2013/06/17 07:35:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.163 2013/06/23 09:01:01 scarabeus Exp $
+
+  23 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.7.ebuild,
+  libav-0.8.9999.ebuild:
+  Apply again the cdparanoia patchset for both release and git version so it
+  won't get lost again. Wrt bug#470872.
 
 *libav-9.7 (17 Jun 2013)
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 91ea7be02fb3..b21e65ead597 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -6,27 +6,27 @@ DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27
 DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
 DIST libav-0.8.7.tar.xz 3763180 SHA256 8be6cbee4066ea031110d0f1cf8f9fecda8bc36d868aafdc7e0d34b59e6d5f3d SHA512 34b23bc61b4755b7d9aa078b77571641a167da0fb356c549ee48fa61fcedd4e9dcd7965ac65487606ef18edb3512f08a565de901f1927f11a18c1864da4ec83a WHIRLPOOL 3896adac36dc789a74e3839061e466f6277d225ecc13e9f6f96953b353fe6e15cd76b0464704240eb97c4c0fec230b21d7e4aa684869e367bb489ddee938bada
 DIST libav-9.7.tar.xz 4068900 SHA256 da5a425ba43d89317257e14f0a40c720e0e8ff587507d4baeca36185a3bc5972 SHA512 e54a2b49da342feaaa1a299b7fa8daed3e9389b63c1d8d421ae521dadb211ae3e6f9b3ac50a7e69d8c1de9b7bdcf5d4924617ba4d21302be00012c07957a70d5 WHIRLPOOL bbed97d0631dfe818394ae4e9bc9d366616789373d8395fb4a13d32bd289b31fca04cf11ef926793c709f6a11e05fde710b3e78a9c71c2d1a304219a78624a04
-EBUILD libav-0.8.7.ebuild 9097 SHA256 4a2be4513ab153331f017123c619e1439b6527a70fafb5711fd9b375d497ba26 SHA512 b659c8deb6a3ee3157705944f04bc1de16e8172e90b8c9ea7d0bb48c24438344b7c54322ba01ebea0dc5167dd6eae43e4c9b5ee57489d5af6b04db7c73138955 WHIRLPOOL 2dfc7cdaa1b0528d2b2d6207dd8718b9f0b86b400b412cb5d4bf5026aefe2c1cdce0c11f100eb96ee31cdb85813f97040be044d41c927efe9c847ab35fab9c83
-EBUILD libav-0.8.9999.ebuild 9106 SHA256 887c9024987a4bb3591209615e36ec90bbc84d2551b6a11f1f4815a232dfec53 SHA512 23158d4e06849754c365ca9eb3bf0e978c92fa0a0b6a492561f24cb91742e1cf38f70db9a08b62a27170a01df1901c02f807e9bbf8a5fddb734671a18551556f WHIRLPOOL 57ecc11298e872f259e7c60f0808fc0dfb362e81eb508802869fdc1c62144b8a82783ffe45e0c63190f9bcc23e8c65220a1b84b4bb53636587935c4e0b96991e
+EBUILD libav-0.8.7.ebuild 9168 SHA256 31b3ecc32c3656d3da877af268b07f38bf9265e9b1f330eca845b1560db1ab35 SHA512 0188c7a3536c7c230a8f470486136d1f0d52898a3cc54433adc0dc870d45607534810782f52720dbc93c25129a8d0b1e117b51e8a298823f1f346d2316e74c2b WHIRLPOOL 0aa261c911c064cdd959c35911a62a5ac78bf73b818b2ca689307dfcde28110a7bf71c8183c6783818373def8f006b1f8b397a29161d676386fac2ee96757ff5
+EBUILD libav-0.8.9999.ebuild 9177 SHA256 1fcb95dde06073809f6ad4f59e6b003aa147c3e7d18af7844dd88e289fac54e4 SHA512 9040a9beca49e7bce0348404bacf8d43f0f913837ba92647dbaec0fec9b551450b9b0664a15f529f291d1aa73d9d79c3a72ea0f3d2ef13dfa176b21cd2e9eae7 WHIRLPOOL c8192c37ac5843c2e5e2b3b6dcc4c7e5c5edf7c904a16c6086978686ca2b835a7ec81e4dc372fc6a5a90f666ec7de26db3102f5f02d3dff93b67d9672f2319a3
 EBUILD libav-9.7.ebuild 8878 SHA256 3a470ceea2b867d6b8a60b31593be719db4a28e576e39413ab375e54c0204831 SHA512 1436ed67ed165f2e769afd7b458f9f50fa3b28eaa0e5dcdcc383b5967207b63fcbf6fed2f3fccdc0064b323645b70e82eb0757781552bfaffe88f702487cd91d WHIRLPOOL 395228ffc12da22f3cdf6fc24da7e2d57775621d756ad57e860032a272c3379b7b6898bab2f0dcc674b003c39fc5f571a606fc6660e1954e3505c8f6923d5606
 EBUILD libav-9.9999.ebuild 8875 SHA256 80eb803a0f52cedafc4ea18badd860fef1eb6c63558e61873ce5c5d707eb937f SHA512 f45638b51ad4b6eb7ceb6bb56f4efe1a0289dd5fee5ea475c8bb612bfe4be3a0cc45088f22be0190e54079ecd50f8e10178034024f4e7080ff3a125cbb7a83f8 WHIRLPOOL a7c0daf7103b5c9e4b735ce738e2e4257e9a39807248af97f0075de0998ce122fcda861ad51114fdd1da0878353d267660f9c6db544d0094ad9fd58c9b59aaf2
 EBUILD libav-9999.ebuild 8752 SHA256 e94478470026ea989b66da5406229be0d77903da397ff09b92c3aff2316718f8 SHA512 410013c71ce6f8c65a195dbb1f90aa6ba8eb2fef7fdcceabbba60946658bec3c07d0fc0ac4df38ff8028a665f72d33e91dcef0427a03c2490f43618feb65af41 WHIRLPOOL 91ebce456282710b7286a32c37b5f0d6d4fd69c76d88dcfd7b1e56d7c7cdc07d2b4840cee32dba8e48b03025a68dd44ca614d2ee01d945e841d645544aae084f
-MISC ChangeLog 23824 SHA256 dd6556ef55fd257e13f5460c287792b64a7ba02bc35d8b688afa0ecec3b4794d SHA512 902cdabe0e521844b95abfa9f2cd5e0c98a35028163e1f3cd7c87c6aa12aefd7c023f7f820450e76c4e196c5ac18a778f595580e1bc52453050f87cdd7b9198f WHIRLPOOL 21a5c9088754254871d8498cf82ad7fca6ab2fba3ec3bf1ee652c09e8d31caf585bfab72990df16d8a44df98c6d05725aac36d6c4c25108e11a1a2240e5fe563
+MISC ChangeLog 24042 SHA256 aa413fd364b9d12f325bef8665e6a3e07845e864735b6a7289a697b83c346a09 SHA512 b440d9c0e51d2916c9d33ace253942572ab22a63618004a927cb1948dffd10f2bb65e3102df5e1cd8d9a9807f7ee7b5ead20e2057f0c460ea3e6ea89a36b938f WHIRLPOOL 16beb6338fa6adb6bf5d5bc579f249d325ac30d8e7d88ac12864cddb571c6079eae46b951a674c25e3274be5c0866d85cc38c4704767da0d7306e842e7abc02d
 MISC metadata.xml 3106 SHA256 968ffe2f92f6e2ae9963fe0005e78fc205ebca769d48eedd578472cef8c8cfcc SHA512 f10f99a54e1806b17d0923429c2df151e470edceefd854e63c0411b2be6fbbaf829e441dd318ff0e87d5f2d6985c52673646c20c971fba9c0d44d67edc3bb5c8 WHIRLPOOL 9004c95991227752427cf62491949845931683a9a45a7a555b98b1bf92cf7d2efad0e2c912b4a069e58e31f41062d0025b8e3a082e0cc37c5d13484969058a47
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRvryXAAoJEOSiRoyO7jvopccP/3zsneb6v7K1bAkouwt6UTcf
-dSBmqWjpKB0yvFG9dn/sSV6IkLStJZ1oBtHvtXyMTpYm9RpBPD99saIdla6sWUhy
-jzxaGIFOOyGVZa5Tu6Kgu/medkFqKoAi6E7wbbkN2gdlPG+O4pqD1OIYBU+NRsRQ
-ZgOPUIr2zNlnT/I1fI3FzN44lhDNSOE77Q0/7QBZBmiquDnwgFHnUxYXkv1MpFiY
-/bQM4eXRV3Zr86nl8jCLJxRXtBo0TJtehGZxyxbC4itEkOQdFNnkt2ewPqRjOiaS
-pH0Nhw8loVavqAe+mXb3smjwHHnuM7T2xoP/qVkLoQKTF9JY730beuOZitT1ouzs
-ABhX3YGKQUDPJ+YgZ9n25Fx0WHUJ+oNyb0NezPNc06ixNv/T9uLt7X7NWKFKPPo8
-9+e+0CogQpUTlk9MrQA/leEHP9YvPWxKH1crgbnY1KzQvCTaOi12K0wTrVc/vqEX
-P+xDE+QcYRsPF6+XL6yaJV7BEV6Om/yYu7rHb6mSugunSTQ7KcM3RdC2pUviKRXk
-W4ClsYLsY0w3K7zJdVPb5/t70C1cTwgmf4mrt5TOhaqWLXGiCKKhx1VeMd21SuOx
-E+fXGA6ok6k9aF2lAUR5dcx+6GNJ0de1+ZzDk65GZ1izZ/vLer3NZDlcDCfS+iGz
-PBXo/LNda0d64jQOxgpN
-=ybh4
+iQIcBAEBCAAGBQJRxrlGAAoJEOSiRoyO7jvo32oQAJD+tb3Id1s/31881oY+OCUD
+4t3EcGa8nYcjZ7cN8lbtasStgdJnY+Q4POhxLVG6lVoIkz05yLkbjLNnvNaQLKz0
++Fe6r/+KERD1/8pVvIxhWxMtB9VzMdvxWq4ZCZulTAFInXlbqo+SRFXkp1srf9xL
+pfmHfzBjbj1W7eC59xQCiif8mEzXxzaudrngLTf9pUSN0zNUr3A2tDubSiTwPTK8
+zOxNcHZW0RDojKa/pF+KXpnN83pfFMnlW4b0Y4yTHFF9HaBxRawCrvsBENtvNedj
+dH9IIpAO3J77aAbLVeg0vZaBnpJBv/Ytfco/+tkbxbUlB+J2a/hZ0L5U9GrK+0cw
+4PMGxGAkxhuofYuknMHP/4W/Ipr9CpSGV+4tAG0h8Cs4oAYRf6Knz7dyf8QLorpN
+u5vCiIiyPVQxjPz5YecbiQE9IMQSR31pcjQCIoB506YZQKpOHWyDqelFTy3BiU41
+WpCdoffPcIrUxrOKRmzDAXDXwhTYd9V16j9wJzmGA6SViItw7ZfnJWFrcKz04qGc
+gcQBdtopYn314uZWjsYtNNF2GYSfdreWsvaaEE4sJ0iR/OAZOp+pp9G2wzbzAk5G
+A+41JplIjNn68qWOMnsHnoZ+xtlR/Ezo8ERo5fX/ceyGtRDfljH2m26b7AUdc4jL
+ydFq+HmdVurRXqM1mSyT
+=wS7q
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.7.ebuild b/media-video/libav/libav-0.8.7.ebuild
index 10cd1d3198bd..7420345c8f06 100644
--- a/media-video/libav/libav-0.8.7.ebuild
+++ b/media-video/libav/libav-0.8.7.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.7.ebuild,v 1.12 2013/06/13 12:40:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.7.ebuild,v 1.13 2013/06/23 09:01:01 scarabeus Exp $
 
 EAPI=5
 
@@ -112,6 +112,7 @@ src_prepare() {
 	if [[ ${PV%_p*} != ${PV} ]]; then
 		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
+	epatch "${FILESDIR}/${PN}-0.8.5-support-libcdio-paranoia.patch"
 }
 
 src_configure() {
diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild
index 4a80f3beff8a..1535a25f28c3 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.23 2013/06/13 12:40:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.24 2013/06/23 09:01:01 scarabeus Exp $
 
 EAPI=5
 
@@ -112,6 +112,7 @@ src_prepare() {
 	if [[ ${PV%_p*} != ${PV} ]]; then
 		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
+	epatch "${FILESDIR}/${PN}-0.8.5-support-libcdio-paranoia.patch"
 }
 
 src_configure() {