gentoo resync : 13.10.2017

5 files changed, 9 insertions, 48 deletions

diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 9c8b3db76344..459a4952de4c 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,15 +1,13 @@
 AUX faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch 305 SHA256 c554313121f935aaabbe5b05addfc065bdf782bc0634ee9a91ceabde001ea823 SHA512 8052728ef8190450837fb2aabf6175bbb7b16e21f88e8d3e0b21b401747957bcf5ae101800b2dab83a2bb23cddc595f0980a97bd72fba4cc0eb0c04a03bcf586 WHIRLPOOL a2336295cbd32361935739d143ab7010306bac00f4b2de1101d1386ab9c10801026deb872ca1a4acfb4312ac954318cf06d19bb4fda9ee55f1cf56b0767cc69b
 AUX faad2-2.7-libmp4ff-shared-lib.patch 867 SHA256 e0aaefeb20ebfec2f09e88a190f78e5744d9f1c71fe41977db8e4f29b5b88022 SHA512 e26a147d539172fb6d1ff64b489d066b8bc9a39b3a0406638aa056210d786c9d02512a4f186d94879994db4ff7e29dbd4dc771afdf37cec4507d1a3dd7d87eab WHIRLPOOL ca1248048544193facf99cbebd5c92e299e4d9eaac36a924407c8224f752548fcd5f46ce18471b272806e4db63735185f2796f1b85b36375ef1254cb575747eb
 AUX faad2-2.7-man1_MANS.patch 405 SHA256 e3e745cca309443d0149a09cc9988fec09c51e242b0e564afcb0af787dbb9031 SHA512 fff6f5dbc0ad086a4131e3ecd66a5db74dc8d9ce908c51a9e94c138847b91d62c63bbad15d32d94a220246db113cc7d4768efa888c82ae95fe5dd3c83b94cf4a WHIRLPOOL 937024c276608180210c20441a7167a875a1a2770feaa8547d146063b12e9a9188da98139c1036e397811c89c6c3a373a769473edc546b7b028c52875bb89cf7
-AUX faad2-2.8.1-dummy_version_macro.patch 315 SHA256 c24f1d0f52ed8be92a0d5395e874d72964ece558a9324b0c3d98f33a25ac15ad SHA512 f4544e52522ad1ea40aec879d085628f18349f1574e4247767510726297a989a999090321f8f160c4d0fc6b87281c8c2c22276039ebe6f5123c6c12e95ad5b26 WHIRLPOOL 93c06415790e2913b27718e0f9b39d918b0180e05301bc1454672198760fe949723c0865f78bf69c531e25163ab8dc5630cf5444ec707ee8d12cc7998013d42c
-AUX faad2-2.8.1-libmp4ff-shared-lib.patch 886 SHA256 a2175f9ea2f84e56adc74f9f051d032f1495715ee0b219f91956883bfb09f549 SHA512 a051972f3f14a37897b8b8cae2b1a956fb7081fc3a8ba5db68418c4f981a5b97c081a567541f74e79e8e0d2665568273425d7b43f9b97f4adf650c45fec3bca5 WHIRLPOOL f1e23e59dd0d83836e2d2ba3f32f4154609495baa091f2177e64bc1476359c9f158693ed4f9b8e2543e690fb906572d246b8be890abc6710202024e331bf04f1
-AUX faad2-2.8.5-libmp4ff-shared-lib.patch 829 SHA256 ab0f1ecccfa32e671da388499e834ca62ba0f1cbebac3fa55c9c9fe3a26a9f76 SHA512 7b91428cf6d52a84fc31928e155921ad233e62accf5f3e56db8b66545f50cf332aee921e007a5142e06a13d54341b010fad606d3cb68d1d5eb21a00651fe7a94 WHIRLPOOL 0935398f3d3109caab0ecd7db4042dfdb70f0bd1c1ca233bdfec503408b12c9096e6297e0b68b0f2570e9d7cb533b7600719124b7feea71f76764643c719ca26
+AUX faad2-2.8.5-libmp4ff-shared-lib.patch 882 SHA256 86f1a61b9faa9b37243ca0e49d68a2aa287eec60bff9fd0c8871f7a98163c3c8 SHA512 e1797594ef86c07518cf6d08a2b02d8cb2d4dc95cc83e759c985b7ebf415dfff1c92e42e2806eb66cd7bd60c6cbc0f31b445bc433c63268fd1d17af12a12d53f WHIRLPOOL 34f68f71c869aa6ce760440054977b7ae42e2ab503650fe0526a66360ca5b2c6b9ab4a54e499581210db885c4bba2b8a1c5a6731fb268b7ef6413340faf2faf9
 DIST faad2-2.7.tar.gz 1137407 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161 WHIRLPOOL 6e30d466e47de0e06751718005573a632c5aa0cd209445c56c25d859f917265452676ce897ac5ad1cd308d411911aaf232bfc50904469f9434b2cc95b6ae928f
-DIST faad2-2.8.1.tar.gz 802453 SHA256 133270a9be0c9ab8fea18017703ab4a94f9eddbb45a8aa6a511a1469fa413591 SHA512 102271e72b3d2f7f043f89d503ff8bf32c276001510055d8db5d9242fe51004ba727b33180134773fc77b2498ee61fe84a1a8db45705200ce79e4aa06b9da9ee WHIRLPOOL 5303692dcdac21d64ae6db0aa71c5ecbac7550a8227d5ea163374f15ee0433f7221ccb683f67ffa2ffe4dbbe3b8f0bad226cec7a99e264cd8a1022896d60915e
 DIST faad2-2.8.5.tar.gz 1025674 SHA256 ba7364ba8ff9256abb8aa4af8736f27d0b7eaab51c14ff828cc86aabff33ec65 SHA512 bb3445aa82b18688b32d7ac9983e5fbf47b6c717486e58c711483967cbf3887540e8a57840a76e686eb990eae341496457ec39278f1c62256708b2d5ef4587ae WHIRLPOOL dc5023eee9f6d4c6e55ef7697a2e27c7282bbc48ddf9b8643be975067093f452050534eb8dc041cc03da9c97b4a5020002fab96eff52dfe0284adcb579745ff0
+DIST faad2-2.8.6.tar.gz 1025654 SHA256 654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21 SHA512 9b6d7e0277ae6c93a8a799f75e7fa9b9cde6419d61533a4c5ab4335382d0cb01aa0aa2fe0fe727bb94d66fafcfeb1b6871141ab5d8dff49600775ffde5b239b8 WHIRLPOOL fcecff8d68c6493c3fd708f3d553884891ba6ac6e7051cee56773dabcf19dca124863ae3195550fc51812445bb5a154bcda561ab6419553c4e7d3cd3e08963e4
 EBUILD faad2-2.7-r3.ebuild 1462 SHA256 b32632f4c30a99abc04b037c3b5c5e2e396e3d1ce1298fc448d29acbde4be897 SHA512 d59e688d540477838ff9faa5f23857ff6f0144caff8aa8c32aecd03fd7ad47eb1be79fbadcb2686808d1d307a46d69d91d309d52076caddaaa9c49bc3267e63c WHIRLPOOL a565021a0f0bbf2943f5c9735583e2bb91f3379dd3f1bcc12ec0afeaaea2434c48bb4d0001fc09fe614728dd28d572c383f432d8a659a2b109e83e5d016a84a7
-EBUILD faad2-2.8.1-r1.ebuild 1305 SHA256 c6f7068e8e8eeb22e16c9e0c9710f05899107cd3f0320c34b3151462e26f6e9c SHA512 a94ad3e761ab6e3eafeff120157b49200556c439f440f890b06157024ec2c05ee110feed83087f2218b30814ef88de010f37ea1c03875d3cd6a69b6c797f9c26 WHIRLPOOL ecfc5e4ae027ae8ac6e0f7204185eae3be7655fce26c9d2d2fd3e2f860a30eba372632545163139c915a7045c006fad4773a4cee264233f64d524d0516476a2f
 EBUILD faad2-2.8.5.ebuild 1246 SHA256 0373c3829e01f818f2ae9eb4e0f869fee3e15da6ea57fac3da3426f944b32ebd SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284 WHIRLPOOL 4114521d8a581ab4e04e5c0e42142d889a11749b6937e75e14a0a55ab567fc6b17bf5498a2a7d3d76ec4b7795592fe989e4cf7e9ac32f200329fdb0e9ba30457
+EBUILD faad2-2.8.6.ebuild 1246 SHA256 0373c3829e01f818f2ae9eb4e0f869fee3e15da6ea57fac3da3426f944b32ebd SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284 WHIRLPOOL 4114521d8a581ab4e04e5c0e42142d889a11749b6937e75e14a0a55ab567fc6b17bf5498a2a7d3d76ec4b7795592fe989e4cf7e9ac32f200329fdb0e9ba30457
 MISC ChangeLog 2703 SHA256 02d41548697952fedcb9659785dfb232fd5768da3ee629f0c7794cdd09d78caa SHA512 23f8a23413b25a96dc0cc190e0c15a18332d45c3908957ab46825246b0659b1f40389459e8638b6c5c640ee9d37a15439078348932d34da40f59cf00fcf36d38 WHIRLPOOL b66c791b51ae3271e5a946da608dff5511811175ed85cee48b06650a97a6fd531481cb42ea844a7864924d12fe18fab3b5c389294c1847e6f34e3db640b872c1
 MISC ChangeLog-2015 20580 SHA256 d138aa5a3bf20f1b6d4769f63afa05b7d11d465ebf1eb6b8c8af339208b5230a SHA512 11c2cbdeec3c47bc30a6811d4d423a7b3793214cc358e3240dd8db9700a282a56084f34fd8f372a99d8c0bea164982097f5af1ab7a3fffd201ce89348c70aa81 WHIRLPOOL f0e6974e004b3a4c317b88094c4db4494d2214553b3e74294615795e1d9b6937f8c954a2c1f6c9bbd6059a7c6240a706b9b385201345a77441792e0000f02c29
 MISC metadata.xml 619 SHA256 9e03c5bb92d674759ec8f8db68938ae4c22326ea04cd82c68139eac8d3de26a5 SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd WHIRLPOOL 31188787fbc19342113f77ff76b50c670f56e697d6ca88737758758e8e0bb69e28d15c75b8102e293cd7ce9083ba14a2e86bcad7b30969eb41a6bfd59131926d
diff --git a/media-libs/faad2/faad2-2.8.1-r1.ebuild b/media-libs/faad2/faad2-2.8.6.ebuild
index 870b51eab5c2..3429665fa71f 100644
--- a/media-libs/faad2/faad2-2.8.1-r1.ebuild
+++ b/media-libs/faad2/faad2-2.8.6.ebuild
@@ -12,13 +12,12 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
-DOCS=( AUTHORS ChangeLog NEWS README README.linux TODO )
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 RDEPEND=""
 DEPEND=""
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.1-libmp4ff-shared-lib.patch
-	"${FILESDIR}"/${P}-dummy_version_macro.patch
+	"${FILESDIR}"/${PN}-2.8.5-libmp4ff-shared-lib.patch
 )
 
 src_prepare() {
diff --git a/media-libs/faad2/files/faad2-2.8.1-dummy_version_macro.patch b/media-libs/faad2/files/faad2-2.8.1-dummy_version_macro.patch
deleted file mode 100644
index 8a7608b1899b..000000000000
--- a/media-libs/faad2/files/faad2-2.8.1-dummy_version_macro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/p/faac/faad2/ci/f58984cbceb6dd62589069f9b7e8ae5425c3438c/
-
---- faad2-2.8.1/include/neaacdec.h
-+++ faad2-2.8.1/include/neaacdec.h
-@@ -73,7 +73,7 @@
-   #endif
- #endif
- 
--#define FAAD2_VERSION PACKAGE_VERSION
-+#define FAAD2_VERSION "unknown"
- 
- /* object types for AAC */
- #define MAIN       1
diff --git a/media-libs/faad2/files/faad2-2.8.1-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.8.1-libmp4ff-shared-lib.patch
deleted file mode 100644
index 77a77365f3e2..000000000000
--- a/media-libs/faad2/files/faad2-2.8.1-libmp4ff-shared-lib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- faad2-2.8.1/common/mp4ff/Makefile.am
-+++ faad2-2.8.1/common/mp4ff/Makefile.am
-@@ -1,7 +1,8 @@
--noinst_LIBRARIES = libmp4ff.a
--noinst_HEADERS = mp4ff.h mp4ffint.h
-+lib_LTLIBRARIES = libmp4ff.la
-+include_HEADERS = mp4ff.h mp4ffint.h
- 
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+AM_CFLAGS = -DUSE_TAGGING=1
- 
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_LDFLAGS = -version-info 0:0:0
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h
---- faad2-2.8.1/frontend/Makefile.am
-+++ faad2-2.8.1/frontend/Makefile.am
-@@ -4,6 +4,6 @@
- AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
- 
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
--	     $(top_builddir)/common/mp4ff/libmp4ff.a
-+	     $(top_builddir)/common/mp4ff/libmp4ff.la
- 
- faad_SOURCES = main.c audio.c audio.h
diff --git a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
index 944b5f8bd610..00ae46c0467f 100644
--- a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
+++ b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch
@@ -15,10 +15,12 @@
  		     mp4tagupdate.c mp4ff.h mp4ffint.h
 --- faad2-2.8.5/frontend/Makefile.am
 +++ faad2-2.8.5/frontend/Makefile.am
-@@ -4,6 +4,7 @@
+@@ -3,7 +3,8 @@
+ 
  AM_CPPFLAGS = -I$(top_srcdir)/include
  
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la
+-faad_LDADD = $(top_builddir)/libfaad/libfaad.la
++faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
 +	    $(top_builddir)/common/mp4ff/libmp4ff.la
  
  faad_SOURCES = mp4read.c audio.c main.c audio.h mp4read.h