gentoo resync : 17.02.2018

3 files changed, 16 insertions, 2 deletions

diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 0e2eabef4c7d..4bb14dbf0656 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,4 +1,5 @@
 AUX libav-11.3-libvpx-1.5.0.patch 2168 BLAKE2B a667702aaf67f1dc5d3355c5f9808694a40f9d7758c66ac5320a0caa627a1d42363a794570883b09ff2c446752727c996e3cc66c16b23ab8c6f9625b4eef579a SHA512 ef4a50d710eb11658fbf13fa29e5f60a64dbb3bf99ed56e12480a595679c242876ea7e0211048c3013e762c9484c3cd3363244c1b040fc8fd11f010b497d2e9e
+AUX libav-11.8-perl526.patch 575 BLAKE2B cda427336a8d2fec7dc8633bec072e7b765c586cd56fae5c6dc94bcdde0634fc2032e73d46efc2946ddafad06dead628f48c7c608c4f96fd5d9622d4b6f2d2d6 SHA512 27a3df5ae92032536c6d79074b8513aeb3dc0e781a8bad46dcea8cd4a5279bff79f21b11b651fafa1ec24515c355ca2f4e1fd4fc4e99584860d9f60aa15396ac
 DIST fate-11.tar.xz 691009480 BLAKE2B 01e1e8125d34a623b5bd4bf1da0daee96d045e73fd069cf438f471970ad4cf71df8bd3235306b3493cb547fb5ac4bb8fce416e194fec9a7e9b9de68a5a15d572 SHA512 f9dc152964e3f19cf32d5d4cbc923a2bd05ba3b0f8f3880122df79d32852ee9d4795a0bfd66d7a2925299e9e9533888df6103e212ea3e5cbfe799d17ffa2b433
 DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f77420570a1b0c0b18db5517736656f52ad0a7ca807f65f5e9f9597709265fcd950cf989ad995aa4289ba0e364950e SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018
 DIST fate-12.tar.xz 755165356 BLAKE2B 031cef24bcfae6205cd6546f453cddb17387176ae837086dd38c8c7132ad9b8dee5367be5fb1b8c604b2203a1e2a55f0c3be2a62f825a95a7ace1aceb4593b70 SHA512 f6ffb3b673b01debd71d7c79cd5c3c4d6f6adb975ed0bdb7c791d674efd8a84ac98f7db3943dfbe3756a3f8819ceab2bdf4633c15fefddf0f8e10adfc805c1e1
@@ -7,7 +8,7 @@ DIST libav-11.8.tar.xz 4865796 BLAKE2B fb0e8f129edee0423252f334b12485d514f9fdfb3
 DIST libav-12.2.tar.xz 5268804 BLAKE2B e25b3dfe1026b9e69c89cbec2090070088a7004dc03e8cc23da2da03824a627c733c16c67e5fc65ec9f19942d93405d5ba6926de83cae04c497597f55220f004 SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03
 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
 DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a
-EBUILD libav-11.8.ebuild 11181 BLAKE2B b7e0f5d841c6ae3173490503d6079dccac7aee934b2d1225602d16696978a45784c5fde44866bff54afe69a95bb724f10c062bb0872dfce4d6ac431454fa397d SHA512 167c8c1c0931ea35b0661f894956969c03debff3de338d6f8b336b1cf0d2f88938cf626aa88ba91daf597394be29c2e0d622756ffd4e94f18ef3053f141851b8
+EBUILD libav-11.8.ebuild 11241 BLAKE2B 53b4d84474b17c28d362db15ae62296bd95015c307ef8f294c991a0aa9e4eea6d2990c542665accefaa39d2bab12a0d337b97c3ed6bcf24cc8b80bd32e60610d SHA512 82091fc9f20bcb357a759248c145e2723c10293f9b6114f1d0af1b0bac219e7edb891665c792eaacc6c517167803a83bff3fe4e57bbf95ab37206f048d40c2f3
 EBUILD libav-11.9999.ebuild 11141 BLAKE2B d7205d9a0d0e359b12c1e43ce315d0998dbe825fa39bc6cd02f23b142d1281a8327ca5578ced5767af43e89885509ee51e7eb2921b20f019b754b55ca7c63ada SHA512 c879c5bc09b22f77387bf62066b845d8d2e6f6e130d1a439dcc648cf7f1802df0abddcfb9a6c7f3fe11d122abe33da3726cd89eab1346fcce39730cc47f18cfe
 EBUILD libav-12.2.ebuild 11522 BLAKE2B 1aaf92397a4829251a03abae83ec3b06208c490f6f80ee37aad48930771c958afe88b50656b99a4f4a0a7d889137c413a347f0a46b681e5a4aad1dbf75c8be97 SHA512 a6afb2e793af497cff59660936b2aee2ff990faade1d8af9b52aa62c2380b3229f340a7698ff892aa87c603490e6965bdf1b422124cd560d76f77b961058f062
 EBUILD libav-13_pre20171219.ebuild 10941 BLAKE2B 80bca84307c4e999f621ddb8f495a53979221c769eec27f36ef930d5f72c4154871ee0579c8925fd0726dc24914463667625482d3d66532eccaeda0b845c28bc SHA512 ad192093c6d8897ec42af7f12009d84c4c2a0af35a1ae5fdc8569d9b86293fd3781f6858bb6e100d46790df18c81297aee0e20e90c459a01b2032a8d6dd36373
diff --git a/media-video/libav/files/libav-11.8-perl526.patch b/media-video/libav/files/libav-11.8-perl526.patch
new file mode 100644
index 000000000000..d9625c653dec
--- /dev/null
+++ b/media-video/libav/files/libav-11.8-perl526.patch
@@ -0,0 +1,12 @@
+diff -ruN libav-11.8.orig/doc/texi2pod.pl libav-11.8/doc/texi2pod.pl
+--- libav-11.8.orig/doc/texi2pod.pl	2016-09-06 18:09:14.000000000 +0200
++++ libav-11.8/doc/texi2pod.pl	2018-02-16 18:25:11.823113370 +0100
+@@ -379,7 +379,7 @@
+     # @* is also impossible in .pod; we discard it and any newline that
+     # follows it.  Similarly, our macro @gol must be discarded.
+ 
+-    s/\@anchor{(?:[^\}]*)\}//g;
++    s/\@anchor\{(?:[^\}]*)\}//g;
+     s/\(?\@xref\{(?:[^\}]*)\}(?:[^.<]|(?:<[^<>]*>))*\.\)?//g;
+     s/\s+\(\@pxref\{(?:[^\}]*)\}\)//g;
+     s/;\s+\@pxref\{(?:[^\}]*)\}//g;
diff --git a/media-video/libav/libav-11.8.ebuild b/media-video/libav/libav-11.8.ebuild
index 4a42816a6301..04dccfd24e3f 100644
--- a/media-video/libav/libav-11.8.ebuild
+++ b/media-video/libav/libav-11.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -153,6 +153,7 @@ src_prepare() {
 	epatch_user
 
 	epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696
+	epatch "${FILESDIR}"/libav-11.8-perl526.patch      #634646
 
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then