gentoo resync : 19.03.2019

3 files changed, 3 insertions, 49 deletions

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index d64bf47a6713..f179588be333 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -3,13 +3,13 @@ AUX kodi-17-adapt-to-deprecated-symbols-and-functions.patch 17601 BLAKE2B 480fea
 AUX kodi-17-fix-audio-with-latest-ffmpeg.patch 580 BLAKE2B f979e3ff53e6ff08b6852059c3a82779b8688976f593fd480c1b4d464fa5f1edb21d103a24809ba435db69aca4acf03d4b0002c716caf9f3a1fad5d8b18ed71e SHA512 3c35ef05b79cf0af9bacc74bb79dd1178efb1cb6de0354b7a35c732c2006cc7071748a062f3b274591dcb30179d4cc0af527a223dcad2919426bac663f038dbb
 AUX kodi-17.3-ftpparse_string.patch 2076 BLAKE2B 9f00998669c07637eddcf829075babe11d69ed779c30e6364115fdeab83b8d95be63a9f123934909e708f19769d0260f4e47e5857ba76c139fd59ce59526ecb5 SHA512 d23865fe6624291d88c0a7674aa52b7e15889a96eb41590827248d8215643f773d0f02871efa858d2c533674627d4e6ebc69cba56be6ec9b58277bb2d6c204df
 AUX kodi-17.3-unrar-vulnerability.patch 1883 BLAKE2B 1e522f0e2637f7e3aec1077f2cef07ba7b2feb5987ec1ad6674c769ab590b36eecb198a52bec1d46903de608f206839a2f0742adf33ce624bb0fbfd1a939057e SHA512 5c59a3c47ea9bcd21712da0ca0dc6bf0618f2f9cad6fd011ebcc94ae90868159e528237727e174a5b137b2e6ef2cb895c01c1b4be91cae0c402697a7d85791aa
-AUX kodi-17.5-network-test-fix.patch 1410 BLAKE2B 2ab9947262307b4679a46b752ecd7b0bb8b482818dae3acbb427ddeab4cb4443c49812d292a7de57b39476ed073a6032537a00f2bf7ae2506a66a0653c5303aa SHA512 60f6971cce1bfade8c9cf658a392aab7d9a009a61b198f55c71315ef58747c65ada947488ecd085cedad89d9e72cb893b1e0aee1fc7e570db5950f5efbc0e2aa
 AUX kodi-17.6-nmblookup.patch 988 BLAKE2B 7ed3a0fc32d8eb60d0eb84f325ceed5e6c450e199efe2dcec94dad5aeacc9879ab6b25d893798e1d4951846dd64f53146ce3a75a3b0fda05b0d6b79ddf65e802 SHA512 bed33a4abc79cbd8318e11157041db94a1f56d13b70db8440f5890ad070784821f7f4382f74398ab478663ab9812eee105f2e0a3653ce5b79a4e29536a0899d3
 AUX kodi-17.6-wrapper.patch 1422 BLAKE2B 9b0ae9c7c67c5b6c1a8a19ac9ca8308d544ad2a495fbf7662a8b1b4a492ea44f2771cd88900ebc598a9fb7d29e66b837fad6cb5063bdfb610b1978649e927a23 SHA512 1e23b4a90ce4ba29d0ea3285157b1ea44be625264448a08213ec6b2c659dc6c5af1f32f51ab059318d913144d14ff9a4a763dd6707e2c2a7824752a3ec480c2c
 AUX kodi-cmake-no-java.patch 2297 BLAKE2B a993f526c3d3c72ed4623655effaf27fb6f2cff89e0c10847a74ee0231a20fd12c175adcd5e0f9c54e2f6d6643966bb4d56c10112ad3cea37f519f7092f20e04 SHA512 9eb7d64694411ce7e47976291fabce96b055c8b4b60bdd7cd37f992d8a3c813de1ef828464e6996124303b015b5c64eccbade10290747180f4ac1fe6a1747d19
 DIST ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz 11188798 BLAKE2B bb91a89a47f3ea6894f28834b477cc2c2db64590e0202b784182f724e89fb385385218463404076565bedcd41a81797c2f340ce579aee75e09f2c99ae494031d SHA512 b28bb6970c6767213f34e5f4f3e48ad5219a6c668a5264ff7de0a42712cb7393f389ddd88f56785a2dc8089f8231ae5fd05adfa10dbf15ea3e0ad7bc2ccd4d73
 DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 BLAKE2B b78a1825ea9a85a91bd9244f93eee1ccd603d5150ee26f08e2de3d04d8a2bb945b1fc16a12d6da98deaaf1bdf5b5a78d75f8814a0cb3d7177980cf1f19440069 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1
 DIST ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz 12417851 BLAKE2B 5275ca29c926c42f0597d9cc4847d597aca0c1ca3efbf3f64d97bde8040386187fbeab5a482179af85977aa72bfd495aa4ea40a34264e2cf29ace3f281da85ca SHA512 f22dd1bb177c218ed049697f3483bfa19a88d36e99d9bdb6ae423c7ea3b9e8fc6e21827c17109bf4b6e7edee1016c3a24168ac2282da19c91a0f07c6c0af9d55
+DIST ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz 12426917 BLAKE2B 83da9511d7b4ef6a8c813561a061c4fe86712e4424c30c9005500751c6c79f4232910caaf13cd34d2db1867f592b042dd291d6c32a77f80107ce87a3a7db1760 SHA512 b4d4bf16f05b953ba81769446c8fd90246e1919b9ef671fb212008151c83d8445e4123ad37c352aa6243074962832e817749d2de318eb721d5bb5d655fd77ab2
 DIST ffmpeg-kodi-4.0.3-Leia-RC5.tar.gz 12426965 BLAKE2B 6f255b7d0cbd12eb066a63e443ba4017b05410c7ea79fa6eb5577a12c373e06dcd6a6999c98eb6a797a4b015ec627bf7cb52647e285b017539c587a2b72d5ad4 SHA512 a95eaeca26baa9dca4343f1ed6dc068e0800199997a5ad1a28664061e533aa8b0e6d0ad53c18009e21bdd09177b7eda8e59a5a98a10f0f6a081cf03803ee9277
 DIST kodi-17.3-generated-addons.tar.xz 57548 BLAKE2B 794c20a2e494d02ee21260080ea4363953a44f424113ef92aaa2aa6e55a1ce51ce9fb84dee4acd10a3bf18af53c22e198a785ddcaf900f31f79b3a272bec08e9 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a
 DIST kodi-17.3.tar.gz 58466114 BLAKE2B 5f72f264c139a618802a735f93ecf78ad56bc2b021a8b2e060c32f777fee7ef405544a46cde61951fbfbf886b7f6c93b8b0df53731ec044f23b871f1777cb561 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987
@@ -43,5 +43,5 @@ EBUILD kodi-18.0_rc4.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c
 EBUILD kodi-18.0_rc5.ebuild 9403 BLAKE2B e54754cd12d199debb26d33df09b928a5b30835aad9edbc6325580f5d34a58d2e07c95d45339cf6e720dda0a6908f686ce6765c843207037f2bfac15eeaa7090 SHA512 4fc6dbcc909fd40d35c6ab0d01d9410f7848b3eddd62c090b3fe07593c2aee05e8f55d3613ac75e718bdf4162d947372436566703e3d95366006e3f3b4e43400
 EBUILD kodi-18.1.ebuild 9392 BLAKE2B 8e258f9f0e539c8ec2196090acd109f7b88a6b9579ed60caed41ff7c7dbcc9cdc1ba0150a72e783c60bc84a0478185e79386bf482ab9331a1a05be910bf0a80e SHA512 fa1f46e1e7b7c8672c8c38fefc60f973c9891c5f644bb6e8fe8bad556b9e8269bbe70c2a0b09a9a77637d9560405bebd2ee22c556172f013bc922f17a5fc7c98
 EBUILD kodi-18.1_rc1.ebuild 9398 BLAKE2B de021d468f8cd086e3b36b35a4cc7d13759fd520562408c64a2f241ef179221b470ed23ce49d666fd3e608fb673143e636cbe94b401b4f9a6893e11ffa19fa11 SHA512 63888cfe324ea00be70d901ca734704da4b6996f0838695510040ffbce1c2109b5a48c05cf3a5efd971c7ff3ca02aed9b9d006dd175eb48b9248e169ad7abff8
-EBUILD kodi-9999.ebuild 9399 BLAKE2B ec2fa9090c4215d77c6b17b28a7b53e1003e8b7c0d7667485160485912be90018b36b05431512bf22b26e6d0b6b5b53ea1ce447542f1a66f0669cc628fbc26d6 SHA512 0c4146e893f8f1bd49b6543c8745ff08092e38edacc8c4507f07292ba510e3a5441836fcaa794f6997af057ba302998610876d7feec764e91bc43033ff55a913
+EBUILD kodi-9999.ebuild 9400 BLAKE2B a236eead7bb444fc6ded827cf434e223cd214ec4db315f0b273abfa175d802c87195cefb05417203d7df8218d3c2f7551f61cbf9a80a7a7a1788cbcab588904b SHA512 31a112c047428237cd700dde8db40b7b5e312d20cc4fe381464188115e63fb0c7dc6b164bb4425011975c99ae7bc710be9d5b1cc9631c2135b1e1e62b7fdc4dc
 MISC metadata.xml 1766 BLAKE2B 53c734014a9d366496190b89c31c2988751ab9bb0065b4c98e2e0162a5e2a0431c8e1bc0ef944b74403492e463e879bf0c68c7efad485a60549a2051cffd6aee SHA512 389444c93cd6e15a1773663db5705bc7658e957435ede722f5e3bd6ef2ea9f761ff352e2e06f1baeff21e66bcb63203cb4a5ad47c0544a0577dbaf734d4a1ba8
diff --git a/media-tv/kodi/files/kodi-17.5-network-test-fix.patch b/media-tv/kodi/files/kodi-17.5-network-test-fix.patch
deleted file mode 100644
index 2f61cda953fe..000000000000
--- a/media-tv/kodi/files/kodi-17.5-network-test-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f585edfffa79ebbbcb0557be2e889809b76b5def Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 21 Dec 2016 17:10:54 +0100
-Subject: [PATCH 1/2] [cmake] build TestWebServer only if HTTPRequestHandlers
- are build
-
----
- xbmc/network/test/CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/network/test/CMakeLists.txt b/xbmc/network/test/CMakeLists.txt
-index 5d1dab328160..a323d1835b07 100644
---- a/xbmc/network/test/CMakeLists.txt
-+++ b/xbmc/network/test/CMakeLists.txt
-@@ -1,3 +1,5 @@
--set(SOURCES TestWebServer.cpp)
-+if(MICROHTTPD_FOUND)
-+  set(SOURCES TestWebServer.cpp)
- 
--core_add_test_library(network_test)
-+  core_add_test_library(network_test)
-+endif()
-
-From f7a514064923d0d693c122cc8fbe3b72cc205820 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 21 Dec 2016 17:10:57 +0100
-Subject: [PATCH 2/2] [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines,
- they are handled trough HAVE_LIBMICROHTTPD (cmake)
-
----
- xbmc/system.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/xbmc/system.h b/xbmc/system.h
-index 07dfe87e4a01..26757ca90642 100644
---- a/xbmc/system.h
-+++ b/xbmc/system.h
-@@ -97,8 +97,6 @@
- #define HAS_WIN32_NETWORK
- #define HAS_IRSERVERSUITE
- #define HAS_AUDIO
--#define HAS_WEB_SERVER
--#define HAS_WEB_INTERFACE
- #define HAS_FILESYSTEM_SMB
- #define HAS_ZEROCONF
- #define HAS_MDNS
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 6b1dd65216e0..56587d4ef8a3 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -10,7 +10,7 @@ LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
 LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.0.3"
 CODENAME="Leia"
-FFMPEG_KODI_VERSION="RC5"
+FFMPEG_KODI_VERSION="18.2"
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz