gentoo resync : 24.12.2018

11 files changed, 190 insertions, 129 deletions

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 810eee10ebb3..7051dac1b80c 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -3,6 +3,7 @@ AUX kodi-17.3-ftpparse_string.patch 2076 BLAKE2B 9f00998669c07637eddcf829075babe
 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
@@ -11,20 +12,21 @@ DIST kodi-17.3-generated-addons.tar.xz 57548 BLAKE2B 794c20a2e494d02ee21260080ea
 DIST kodi-17.3.tar.gz 58466114 BLAKE2B 5f72f264c139a618802a735f93ecf78ad56bc2b021a8b2e060c32f777fee7ef405544a46cde61951fbfbf886b7f6c93b8b0df53731ec044f23b871f1777cb561 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987
 DIST kodi-17.6-generated-addons.tar.xz 57564 BLAKE2B 9b3000ac23a6aab24b703a2b66016dbf0637ff3d615b89435cba3717acb913a4543bb57aaa9ae59a9493891ba62af06414ef2c0cea3a81e9ec32ea60e209330d SHA512 ee1344e859b2871f9dd3e2f2f75f9c0f9f787ac111a6b9ab8f80af6524a786d51baeb4f247a8c5b35001073be49bf4289d1c63e3114625143f3747aa9b1f4be2
 DIST kodi-17.6.tar.gz 58275293 BLAKE2B 538675b7a3400d9182f957da9bbf609ce5ece502c3a7f4a32e26c802bae9795979554204148e06d1923d8e68ba1f06f9d92bf11416f73cf9431381642ca00639 SHA512 1f1ba91e6129ab423f9ad47b63d7bb75775dbf18638a96413a572aaa790f4f0d738ca35486513e158a7f55d501f78f08dd9d68aabe2fbb80a729c6091b264111
-DIST kodi-18.0b5.tar.gz 50861823 BLAKE2B dd78bec6bf3df1ebe7b1ff82b8b90b0d7d326c71b9f2c0f6b6e08c0589a41563b07dfa7947096c6a01ae7e89cf79200c33c1d98c4a7333141972986bb2be652a SHA512 13699671544677cad8d90d4474422edc8ffc0be93672568daf21d2a9a96d9f9696a953227b4a1cca56ac423f288fbead9c68fd814d53320adcf96d5357403780
+DIST kodi-18.0rc2.tar.gz 50969888 BLAKE2B 982d660c6f87706fa5d50c5ece84ea3d27adcd3ad561a77082cb2c1abfdd378b233aeaa8102682f0c89bb6f3c28481fa03b6070d4e9c3ba9b37b66096211071e SHA512 2f5bba021221cdc45242abc90a993dd033c2d7839f1031159869ac7a777a0675324ec2858868ff5060b16a8d5f367a6135a20ac570a099e907032678c91eac0c
+DIST kodi-18.0rc3.tar.gz 50978485 BLAKE2B 791053553f475dbcacc2bc7c3a1e420849de3f48d3eb3d788f958b2b2c3fb47454cfd909f36cefee37050923c39173690b5d48d517a042254d796aeafb39fcb8 SHA512 622e3fff01e8d856bb524339796410d3fc3226539ae91c69a367464e8f5aeb28ca3ffd605dc4a4f9944e4cc59a1949d7da6fec70175d978a44f3b5bbb59190c3
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 BLAKE2B fb3973e098201d177309ad7ca50131725eee4bc6f30f425efa5fea406411f6143ba03abd82cd6c91a250419d3e0a29aafcbf981ba015f6e14cd0ceb001222c12 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9
 DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 BLAKE2B 0a211fcedb216567bcd929048af01486ff91efbb8d31592fd116676b6ae95de3cd7bfab7cd79853b3d15e96c27e62cce8c79eeb9baee68a1bad4f3fce8a207a0 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 BLAKE2B 37521d50f9983290df5209db417e39ea4f3dcf5c36eafe9f75a8c23689c7302c29c4197e40eebb0f1b35cd16e5264e251a72548a0ce2ec2ba1a3a22c1768adaf SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-17.3-r1.ebuild 8570 BLAKE2B 386a04c9273f1a46e25486ff2ca5b5ac0f5b69e41159a3cfe3dd27c6267ebdc4330954bc76c3ff1f9ab8f85f762e771a3c35bc12d24cb602b02a11cac65ba89e SHA512 7288a31c582db5a7489303c454f5574095a95a1e917d498c6ddd016a48178062e23a67cbfd3b4c3fd339c4337600fce7d3cab2a71fe26550d95cf334f674fe62
-EBUILD kodi-17.6-r6.ebuild 8772 BLAKE2B 8f8771eeea3c218b67d7635198f863abe5e7ba8944a7c91dcf25c91896384cf6bd9444c2fd3372e8b4f59406ad824f0756a359607592b9b8bfdb92cb73bd930d SHA512 3191d2243ba596b742e63f81688cb93da8aba2c5d5de3d4afd615084610146e8747cdf0599484f708da85094832858a277151e7f9e8a0f447077307269bed913
-EBUILD kodi-17.6-r7.ebuild 8855 BLAKE2B fee87c48f742bfe531f815521b8427acf78c214a67ee0d4b74271d70bad032b544537397bf93dc3a3dc038737fc792370e0f934e66fea9632b0d6df882b1a99d SHA512 c92db2ae7565fd536365fdfed1c64f9a4ecfcdad9a5cfde05e0b9682355172c4fade5e425a52671aaa12a491547a5fb33631fecab17c940d8c694905629eb843
-EBUILD kodi-17.6-r8.ebuild 8859 BLAKE2B a7b358dafe730dc3c086464bd0a50ae1a59b915c09a9691b5d72c0df066acfde5271c82c6e88d06908043a2baf7ad86fb5060714ea6e8a62715a3b7eb9a7f58d SHA512 2d0fdb6f659855ad605db8705eafbe92367bb57e15008afff77c0fa6082777a406ab767d7136384a9888fb7438ec1a9667c21a509fbd8c7cb619277ceb3d3556
-EBUILD kodi-17.6-r9.ebuild 9042 BLAKE2B de96b31f2f4d6b19672734a1e7ee211266ddb96e7130fda9cb2c68959af0965f69295480a5239ccd738082c4d4216cfd5edbc4126d6c2cfc615bcef819d4db36 SHA512 9e4d9c75df563a722cbd7fe17b6826a911523b3db6686b1c32b0bc2413ad0bc7fba1832e54f7174da061d6d0d4549a91511596d22ceff7d364baa9c38568c88a
-EBUILD kodi-17.6.ebuild 8760 BLAKE2B f9103fc6c39d3c0bde68bc6a5299ea05cdde028e7d648f0f478eed4ba7b0d803c3b9bb569c60d9beadf2d97da28840bf4009f70bd3e1e05219d667220fbddea6 SHA512 9cd7660957f0955b720c898622aeefa1722e8c9764421b69cd1cf39123a50085ad666cc5a2707ba8a8f1012a761b19093e6fcc601df460831bc1881893daa6ba
-EBUILD kodi-18.0_beta5-r1.ebuild 8808 BLAKE2B 8aca97a0a93c6226ec2c091955e9c2780b7b4ceb12bae7ae3054510bf0f356018bf4a4084a8f7ccf52bf88b19ba1794873669efa5e29deefd635eff62fbf2c7b SHA512 3a36a8f2f766106f61d2539d4aebeaeeb4a6e6751cf861385424b7be02cea2bcbf4d11be0352549b819d65504474af27003f1fcd411adfb72b0229cff02f59a2
-EBUILD kodi-18.0_beta5.ebuild 8609 BLAKE2B 248f1ee68d5bde7ab30beae4dcb830e5847c9ff25f69f146662f1c8119125205862f84e44ce7a17e68807b6f7629ad40fa91f658045a71eb6c46a57687789c09 SHA512 e01f6923341c816808a95eb7327b6a2edc23ee9e6d63a0e4ceb1c3c08661bfbd23d6d1b2a97e1b7d7f21eaa8b0e691e312cc905327c90f6ad214a80ea6584ce7
-EBUILD kodi-9999.ebuild 8808 BLAKE2B 8aca97a0a93c6226ec2c091955e9c2780b7b4ceb12bae7ae3054510bf0f356018bf4a4084a8f7ccf52bf88b19ba1794873669efa5e29deefd635eff62fbf2c7b SHA512 3a36a8f2f766106f61d2539d4aebeaeeb4a6e6751cf861385424b7be02cea2bcbf4d11be0352549b819d65504474af27003f1fcd411adfb72b0229cff02f59a2
+EBUILD kodi-17.3-r1.ebuild 8480 BLAKE2B b631eebc108988594dea9e3c27271ad68f0dafd8b8521c3fe94384431792129354be8361e9d8885d0f992693c1254002f3bf0abd221f2b3011e76c5bd5bbb287 SHA512 85a8a39d6cc6015a41a2b3fd31a4d0d57c63a04e70e4fdd1707511353c59c55d3bcebafc3e4298d0a1cb69f674a421c73ac7292d87696b18f3aa10fac91e6603
+EBUILD kodi-17.6-r6.ebuild 8685 BLAKE2B 1146805552d46f802fe7ac0ce569f5ef0acc92662206dfed327fcccb6c4594d4a04dd61cce501aa1eb8b72bcc9847b8bf63a6f647a196690c1ff15e352716372 SHA512 caf8f41edc15290a29c4f7c8ee534f7ff53f8858b51d2f9c26fd741f60983aebd9d1611064203620a962b00d9f6cbbdbf50c506905468d193ff6af337e29fe44
+EBUILD kodi-17.6-r7.ebuild 8768 BLAKE2B aed28022afb2c90e9826d5d633eac7435d646657e194ae1744ff8bf56c37710fa0e8169711798ac36aed90a09a994ef9415a3ba2cd778ff2dc173b767e2fa3c5 SHA512 f2e7bf671b120137887fe78540146f5355db891d296ce5b3e7f52df722b2ce24fd3b8ca23ec8b8b7ef1c2e720f5a0dd445dd7758eb4fa4929350318b1ecde69d
+EBUILD kodi-17.6-r8.ebuild 8772 BLAKE2B d41f9854da871e126a08525963b5a293f64cc17c8b405af884240f83c81d17de501da9980c97ed7ab56e930cf731f4cdaab4b4cae837f3cef3925640aa786651 SHA512 0e52b44fb4fe197357309414a01bf5408c053e3116c6325624a65eb923a48b6f4b51cec27de8d4537b37acaa9a3327ea50935ca904a6cbdbcea3887bcc4b8741
+EBUILD kodi-17.6-r9.ebuild 8989 BLAKE2B 5e94d368233d04132dc112615da4d28bafc8aba10f9219cbb77e060ba35ad79a0fb9be2286744e73ff12e02a3aae7a10ff1d82f18330bbcdcc1e91782b751c16 SHA512 940f9ce9e9a67cbc236de34ef1ffab2d04a5730eaa883e5ca2fcef88416311a39e3aa9f3f2ef2af5be0b11b7a956aa8df5bdc1b145ff371d911e75a0fbdb868f
+EBUILD kodi-17.6.ebuild 8670 BLAKE2B e8ea1e0dc347c5e891ccad4b05ea5f21c19284e0d5c4b8dc01041e9f582b513e5d6d469e34890b497fc2fa57e1ee5a295209727894c3126a4341dd6095da4cff SHA512 c17607cfc393474ba61bddb29ff9eafeabc1dde7ef4ecead7cca1044695f03c64a5c18a9fc4da0b19fb854e20de49f05290add100f5e4258349fe2809283b44a
+EBUILD kodi-18.0_rc2.ebuild 9366 BLAKE2B d11bbfae54b8b67923d6574255bdb67efcd2caa2c54617e5fea31b71fbb7fed17e102868e024323a17415c9906de9bdc373fb8a267d9153d31ebf8f034a85e99 SHA512 7db29341f1eb28928c6ce004dc5e7745ae77e8d072ea1caecb209f73a557d2d89b1a6633cd22a9da8f850123665e2fd289bead4f28b541a5596360f16210786d
+EBUILD kodi-18.0_rc3.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
+EBUILD kodi-9999.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
 MISC metadata.xml 1766 BLAKE2B 53c734014a9d366496190b89c31c2988751ab9bb0065b4c98e2e0162a5e2a0431c8e1bc0ef944b74403492e463e879bf0c68c7efad485a60549a2051cffd6aee SHA512 389444c93cd6e15a1773663db5705bc7658e957435ede722f5e3bd6ef2ea9f761ff352e2e06f1baeff21e66bcb63203cb4a5ad47c0544a0577dbaf734d4a1ba8
diff --git a/media-tv/kodi/files/kodi-17.6-wrapper.patch b/media-tv/kodi/files/kodi-17.6-wrapper.patch
new file mode 100644
index 000000000000..dc3e9887da94
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.6-wrapper.patch
@@ -0,0 +1,39 @@
+From bbc7a53911f1ef8a4a24b76d88c5b0e5899e082f Mon Sep 17 00:00:00 2001
+From: Michael Cronenworth <mike@cchtml.com>
+Date: Fri, 16 Mar 2018 13:48:34 -0500
+Subject: [PATCH] DllLoader: Update variable to use standard va_list type
+
+The _G_ types were ancient, internal-only types defined in _G_config.h
+and are now deprecated.
+
+https://sourceware.org/ml/libc-announce/2018/msg00000.html
+https://sourceware.org/git/?p=glibc.git;a=commit;h=48a8f8328122ab8d06b7333cb87be46feeaf7cca
+
+Signed-off-by: Michael Cronenworth <mike@cchtml.com>
+---
+ xbmc/cores/DllLoader/exports/wrapper.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c
+index 1980bfe65cac..7c7d4ac6131d 100644
+--- a/xbmc/cores/DllLoader/exports/wrapper.c
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -45,9 +45,6 @@ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+ typedef fpos_t    fpos64_t;
+ #define stat64    stat
+-#if defined(TARGET_DARWIN) || defined(TARGET_ANDROID)
+-#define _G_va_list va_list
+-#endif
+ #endif
+ 
+ #ifdef TARGET_POSIX
+@@ -485,7 +482,7 @@ int __wrap___printf_chk(int flag, const char *format, ...)
+   return res;
+ }
+ 
+-int __wrap___vfprintf_chk(FILE* stream, int flag, const char *format, _G_va_list ap)
++int __wrap___vfprintf_chk(FILE* stream, int flag, const char *format, va_list ap)
+ {
+   return dll_vfprintf(stream, format, ap);
+ }
diff --git a/media-tv/kodi/kodi-17.3-r1.ebuild b/media-tv/kodi/kodi-17.3-r1.ebuild
index b47d78e91497..17b5bb57e1e8 100644
--- a/media-tv/kodi/kodi-17.3-r1.ebuild
+++ b/media-tv/kodi/kodi-17.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -106,13 +106,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6-r6.ebuild b/media-tv/kodi/kodi-17.6-r6.ebuild
index 6b505c1116f3..c2446a8bac16 100644
--- a/media-tv/kodi/kodi-17.6-r6.ebuild
+++ b/media-tv/kodi/kodi-17.6-r6.ebuild
@@ -106,13 +106,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6-r7.ebuild b/media-tv/kodi/kodi-17.6-r7.ebuild
index 31259159e9df..cd7898f209d6 100644
--- a/media-tv/kodi/kodi-17.6-r7.ebuild
+++ b/media-tv/kodi/kodi-17.6-r7.ebuild
@@ -104,13 +104,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6-r8.ebuild b/media-tv/kodi/kodi-17.6-r8.ebuild
index 9fc40bceaebc..add7aad92ba3 100644
--- a/media-tv/kodi/kodi-17.6-r8.ebuild
+++ b/media-tv/kodi/kodi-17.6-r8.ebuild
@@ -104,13 +104,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6-r9.ebuild b/media-tv/kodi/kodi-17.6-r9.ebuild
index 0df46272fb8f..8c702b973d44 100644
--- a/media-tv/kodi/kodi-17.6-r9.ebuild
+++ b/media-tv/kodi/kodi-17.6-r9.ebuild
@@ -17,6 +17,7 @@ FFMPEG_KODI_VERSION="17.5"
 CODENAME="Krypton"
 PATCHES=(
 	"${FILESDIR}/${P}-nmblookup.patch"
+	"${FILESDIR}/${P}-wrapper.patch"
 )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
@@ -104,13 +105,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6.ebuild
index ed06b92fcf63..fe74f13692d1 100644
--- a/media-tv/kodi/kodi-17.6.ebuild
+++ b/media-tv/kodi/kodi-17.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -107,13 +107,8 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
+	upower? ( sys-power/upower )"
+
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
 	app-arch/unzip
diff --git a/media-tv/kodi/kodi-18.0_beta5-r1.ebuild b/media-tv/kodi/kodi-18.0_rc2.ebuild
index 4b9bc5d60e06..00b10dacb86f 100644
--- a/media-tv/kodi/kodi-18.0_beta5-r1.ebuild
+++ b/media-tv/kodi/kodi-18.0_rc2.ebuild
@@ -3,12 +3,7 @@
 
 EAPI=6
 
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
-
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
 LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
 LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
 LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
@@ -20,6 +15,24 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
+
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
@@ -60,6 +73,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
 	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
 	>=dev-libs/libcdio-0.94
 	dev-libs/libfmt
 	dev-libs/libfstrcmp
@@ -124,12 +138,7 @@ RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
+	upower? ( sys-power/upower )
 "
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
@@ -147,19 +156,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/jre
 	x86? ( dev-lang/nasm )
 "
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
 
 CONFIG_CHECK="~IP_MULTICAST"
 ERROR_IP_MULTICAST="
@@ -172,6 +168,22 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/media-tv/kodi/kodi-18.0_beta5.ebuild b/media-tv/kodi/kodi-18.0_rc3.ebuild
index 0648210f36ae..f981572f1b73 100644
--- a/media-tv/kodi/kodi-18.0_beta5.ebuild
+++ b/media-tv/kodi/kodi-18.0_rc3.ebuild
@@ -3,12 +3,8 @@
 
 EAPI=6
 
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
-
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
 LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
 LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
 LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
@@ -20,6 +16,24 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
+
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
@@ -55,10 +69,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/fribidi-0.19.7
 	cec? ( >=dev-libs/libcec-4.0 )
 	dev-libs/libpcre[cxx]
+	>=dev-libs/libinput-1.10.5
 	>=dev-libs/libxml2-2.9.4
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
 	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
 	>=dev-libs/libcdio-0.94
 	dev-libs/libfmt
 	dev-libs/libfstrcmp
@@ -123,12 +139,7 @@ RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
+	upower? ( sys-power/upower )
 "
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
@@ -146,19 +157,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/jre
 	x86? ( dev-lang/nasm )
 "
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
 
 CONFIG_CHECK="~IP_MULTICAST"
 ERROR_IP_MULTICAST="
@@ -171,6 +169,22 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -294,3 +308,13 @@ src_install() {
 	python_domodule tools/EventClients/lib/python/xbmcclient.py
 	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 4b9bc5d60e06..f981572f1b73 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -3,12 +3,8 @@
 
 EAPI=6
 
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
-
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
 LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
 LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
 LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
@@ -20,6 +16,24 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
+
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
@@ -60,6 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
 	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
 	>=dev-libs/libcdio-0.94
 	dev-libs/libfmt
 	dev-libs/libfstrcmp
@@ -124,12 +139,7 @@ RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
 	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
+	upower? ( sys-power/upower )
 "
 DEPEND="${COMMON_DEPEND}
 	app-arch/bzip2
@@ -147,19 +157,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/jre
 	x86? ( dev-lang/nasm )
 "
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
 
 CONFIG_CHECK="~IP_MULTICAST"
 ERROR_IP_MULTICAST="
@@ -172,6 +169,22 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
 src_prepare() {
 	cmake-utils_src_prepare