gentoo resync : 01.12.2017

14 files changed, 450 insertions, 77 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 78579e552ce7..8db6988c81e4 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
new file mode 100644
index 000000000000..15fbdf54c8d0
--- /dev/null
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -0,0 +1,4 @@
+DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
+EBUILD dtv-scan-tables-0_p20171003.ebuild 730 BLAKE2B 72e4c584017945a4cb3bd70c6966099c71f7817ee40532ac42bb7e8f80a3572b6110eab019f3fb678e3ef381096c60afe25df3a1535e4705f6b600170c8037fc SHA512 1db9fbc172bfef0df1948a37226b3349f6afc8ebef66a799717841314006924d33e2f34306bfcdd6893cae8b5799e7f3a529295f70df016df0b43e638741e753
+EBUILD dtv-scan-tables-9999.ebuild 730 BLAKE2B 72e4c584017945a4cb3bd70c6966099c71f7817ee40532ac42bb7e8f80a3572b6110eab019f3fb678e3ef381096c60afe25df3a1535e4705f6b600170c8037fc SHA512 1db9fbc172bfef0df1948a37226b3349f6afc8ebef66a799717841314006924d33e2f34306bfcdd6893cae8b5799e7f3a529295f70df016df0b43e638741e753
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
new file mode 100644
index 000000000000..08c15c3ef583
--- /dev/null
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
+else
+	COMMIT="c1986d5148d8"
+	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/usr/share/dvb"
+fi
+
+DESCRIPTION="Digital TV scan tables in v3 and v5 format"
+HOMEPAGE="https://linuxtv.org/"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+DEPEND=">=media-tv/v4l-utils-1.4"
+
+DOCS=( README )
+
+src_compile() {
+	emake dvbv3 dvbv5
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" install install_v3
+	einstalldocs
+}
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
new file mode 100644
index 000000000000..08c15c3ef583
--- /dev/null
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
+else
+	COMMIT="c1986d5148d8"
+	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/usr/share/dvb"
+fi
+
+DESCRIPTION="Digital TV scan tables in v3 and v5 format"
+HOMEPAGE="https://linuxtv.org/"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+DEPEND=">=media-tv/v4l-utils-1.4"
+
+DOCS=( README )
+
+src_compile() {
+	emake dvbv3 dvbv5
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" install install_v3
+	einstalldocs
+}
diff --git a/media-tv/dtv-scan-tables/metadata.xml b/media-tv/dtv-scan-tables/metadata.xml
new file mode 100644
index 000000000000..54be7ff7e5d6
--- /dev/null
+++ b/media-tv/dtv-scan-tables/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 2dd6d6d74fc7..e30dbafd7f15 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -12,4 +12,4 @@ EBUILD gentoo-vdr-scripts-2.7.3.ebuild 3633 BLAKE2B 04c8d82eee76d7db739e885a78b4
 EBUILD gentoo-vdr-scripts-2.7.5.1.ebuild 3512 BLAKE2B b0e72718ffcc99a3c97ce4e54243e47992404d5df07ed56f1aee2c351cff5b7675e4d3aeca6f07658c6e29c4e7e13962ab49412e2f19359e36f7e5621c70750d SHA512 467442153b47078e3a3a15aff3de6dbfaf75e0f4852e964a10f42ad526bf1611b23861afd5aba74256b769f3fbfb9357574f71b3bc32971a973ae99f77d10a57
 EBUILD gentoo-vdr-scripts-2.7.5.ebuild 3505 BLAKE2B e669b4073cb0dc19be19b54f1300fe0a3a7c486beb2da453d0e424d6f405b86d5b9838e304893fb5d6520befefffb90b7767e2ca526c4cb66f3f6049aca4796b SHA512 8bb3d020026a5d44390c7772d1f9a074ee21f54daa9a7f2918b50112c0d96c57060bd7850be61951dd2073c4ee09e32d27cd1986e23146ec7f4d4301237a210c
 EBUILD gentoo-vdr-scripts-2.7.ebuild 3633 BLAKE2B 04c8d82eee76d7db739e885a78b4dd6208a2669260d84fecf4eb716b924793b5d1304121078d99db2643cfc8c09408af2e3d089852b88703ede344cbb94abbd7 SHA512 90532d380cb3e593fbec8a236731a626ed46dae40250c98472d43830ecf8ba2b718f42ff9748d9d956d80cfe1e46680d5d331fad59e5cbe8695c5e058201c017
-MISC metadata.xml 358 BLAKE2B 25b974de3c7a0aefc38fe9f59627bf35d8ee2a4a1aff8616d3f7edb06282d65c7433f50ff5cf6d964c03409507302db116da6074896f9b33f72787c4dcb5a23c SHA512 fcce89bd7190c6318e0821198da47932e23611064d500b3a5436d56390eac284eac00582af1294aa283a3cda8ad47dc9c34b2f5116d6dc0fcb1eaf7edded2384
+MISC metadata.xml 354 BLAKE2B 74ce746b4c49b338ad17df430f4aa1c11cad86684bf3c3003f2c2c2fc979435b53b5e30a997f009c53ea57d8441d09cc113b45ceaabc0a1d62f58e78ba73daae SHA512 9607950224075c12bcd9a43aef5cc3dd640cedee6689986713b10b2df1441a7694f8a527f03b66c15139dcaab917249ebd0899031432f545fe74a62aeabdce9d
diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index 9eb70f5875c8..973d97889167 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -5,7 +5,7 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
-  <use>
-    <flag name="nvram">Add support for using nvram-wakeup to set wakeup time in bios</flag>
-  </use>
+	<use>
+		<flag name="nvram">Add support for using nvram-wakeup to set wakeup time in bios</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 35337f698738..c3a97d670af2 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -3,20 +3,21 @@ 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-cmake-no-java.patch 2297 BLAKE2B a993f526c3d3c72ed4623655effaf27fb6f2cff89e0c10847a74ee0231a20fd12c175adcd5e0f9c54e2f6d6643966bb4d56c10112ad3cea37f519f7092f20e04 SHA512 9eb7d64694411ce7e47976291fabce96b055c8b4b60bdd7cd37f992d8a3c813de1ef828464e6996124303b015b5c64eccbade10290747180f4ac1fe6a1747d19
-DIST ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz 11188798 SHA256 7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0 SHA512 b28bb6970c6767213f34e5f4f3e48ad5219a6c668a5264ff7de0a42712cb7393f389ddd88f56785a2dc8089f8231ae5fd05adfa10dbf15ea3e0ad7bc2ccd4d73 WHIRLPOOL 34055af438910a82ee7f2571c2bc5515d6988af51b4f5a2e0eb8f183f6a7e9ea3cdc4b16a6d8d166ad52f46d29a9625fbb72e8f47ed95c732482b33393445f7a
+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 SHA256 01f914742f6af8afd1d2eb076425975e24c4eed75f5d57f1c816086dc4625192 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1 WHIRLPOOL ae6f0b3b798e92cd72aed8eb3e6dc82708c86052590b30ae93e1b8275dca89c5a4470dbc8ff51bfefd72bd40036b7bd1b7695ee77e90bab35b5e80bcb8b79826
-DIST ffmpeg-kodi-3.4-Leia-Alpha-1.tar.gz 12147515 SHA256 0b5b7446dd5b9eeef427617e140058fbe7be94f5893055bc38cce3ca96375e03 SHA512 84fa07f88a3ee89b5dec8bf0f06a9d5f8b9e4a8f52656c6509aa081b87e59ae7ea643bc4bd668b555128b75e2a4d89fe82d7fc4586d37d9ea737eedb25508910 WHIRLPOOL e4a54744dcac947f0a9b1ca28eb1176bafc491f74e5f1142bb6b1a0b9aa57abc38c6c8af6fd41239da72b9cbdd595bfb815998f6f1a6d2baa568bf5ea08fe24d
+DIST ffmpeg-kodi-3.4-Leia-Alpha-1.tar.gz 12147515 BLAKE2B 26f97d7c3ed515e2f0d275f2faa5d76306f4273ab51f31a39f61d06feed1686b27e9c7ee4a6230e73f9b4122ed888e6fa9cd99a84ec7c29a6ebebd07a77c032f SHA512 84fa07f88a3ee89b5dec8bf0f06a9d5f8b9e4a8f52656c6509aa081b87e59ae7ea643bc4bd668b555128b75e2a4d89fe82d7fc4586d37d9ea737eedb25508910
 DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8e2bb3e516daa4707d7ccf768d76a89b27bd1 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a WHIRLPOOL 1023c69687ac9958e72ab70c15a280800ea4866f8e0dc2740d9bfd50f75bef71c28f23f01a841f254022610e1388d14217ea384213161264dae721515c9dabe3
-DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634
-DIST kodi-17.5-generated-addons.tar.xz 57556 SHA256 41a2a02ee3eaaab6de9da3e2e7eef4ab8ae94e8654487cc4f4f13d2ea749fbcc SHA512 c0458c9086ae3df7eb6a17ac9bfe33f1d2b4d9897bdb5831af8bbb01d927263e99ab1dd0f7eb7795dac04d757d04a8ad2346c8b29bfe1faf95b84218792bcb8e WHIRLPOOL cc4e68be47bc4318d995ecafe977af95d17443f7f81743bb2a321e72ee56e2de037402810f97a606aa6a55c9e4e18fa8a9733a44e5ac3c4ae59916097910562a
-DIST kodi-17.5.tar.gz 58292301 SHA256 84c64acc270b9e845a67fbbe481ae5ddeb9b4568d76e42f2d5f9160fe0ce2de2 SHA512 e47f8a53ccee675031dfb816ffbe338dd2e94c22c944b814f332c1abdab16182304474c6b0d5cd7ad7eb9bc0500de6f5fc97b965dc5828635b58a6c596f82736 WHIRLPOOL ca743b927a19d81c71072c8a7bc5f87eec73367275633de79f5bcc950eee9ed60380ee49a599f49023e48ff29495d361fa2a071617f7fa6bd18606015cd8d15d
-DIST kodi-17.6-generated-addons.tar.xz 57564 SHA256 05d6fbc355ba780eabb378f3935e4c6712d03689d77dc2be9e24f30e060d418f SHA512 ee1344e859b2871f9dd3e2f2f75f9c0f9f787ac111a6b9ab8f80af6524a786d51baeb4f247a8c5b35001073be49bf4289d1c63e3114625143f3747aa9b1f4be2 WHIRLPOOL 28d77591807d95427bb30a3706e7c944d106dc680613c185e4b352bd66d00add731dc557d58e7aa544a166b22104bc64c7a4f7e53239d4b530ba6bf03e45bb0b
-DIST kodi-17.6.tar.gz 58275293 SHA256 c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d SHA512 1f1ba91e6129ab423f9ad47b63d7bb75775dbf18638a96413a572aaa790f4f0d738ca35486513e158a7f55d501f78f08dd9d68aabe2fbb80a729c6091b264111 WHIRLPOOL f3e9b4590db40caaa6b3afad0e4d2e134004915b16716a44ddd08530236d2caba22836203f1591cd3f50055fc61538d3789453786c01793691598f53cd3287f6
-DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a
-DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca
-DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a
+DIST kodi-17.3.tar.gz 58466114 BLAKE2B 5f72f264c139a618802a735f93ecf78ad56bc2b021a8b2e060c32f777fee7ef405544a46cde61951fbfbf886b7f6c93b8b0df53731ec044f23b871f1777cb561 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987
+DIST kodi-17.5-generated-addons.tar.xz 57556 BLAKE2B d162146b5888a5731d4aaf05d45a45fc10fd4e077dde4d18e6a11bf2d5cff64d8b8ba0871da9b15a854f4e1807b0c4db44c4a83976e9240d77d174778cb49ae4 SHA512 c0458c9086ae3df7eb6a17ac9bfe33f1d2b4d9897bdb5831af8bbb01d927263e99ab1dd0f7eb7795dac04d757d04a8ad2346c8b29bfe1faf95b84218792bcb8e
+DIST kodi-17.5.tar.gz 58292301 BLAKE2B a57838754a4fb73ad439dbb8b82284b530ee91790bd8c1e33b8c1ef074b63d6968ce50025e5a4a395acb4739f8ef430c93f3162844ca39f24e17ed61e4ef9cdb SHA512 e47f8a53ccee675031dfb816ffbe338dd2e94c22c944b814f332c1abdab16182304474c6b0d5cd7ad7eb9bc0500de6f5fc97b965dc5828635b58a6c596f82736
+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 libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 BLAKE2B fb3973e098201d177309ad7ca50131725eee4bc6f30f425efa5fea406411f6143ba03abd82cd6c91a250419d3e0a29aafcbf981ba015f6e14cd0ceb001222c12 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9
+DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 BLAKE2B 0a211fcedb216567bcd929048af01486ff91efbb8d31592fd116676b6ae95de3cd7bfab7cd79853b3d15e96c27e62cce8c79eeb9baee68a1bad4f3fce8a207a0 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e
+DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 BLAKE2B 37521d50f9983290df5209db417e39ea4f3dcf5c36eafe9f75a8c23689c7302c29c4197e40eebb0f1b35cd16e5264e251a72548a0ce2ec2ba1a3a22c1768adaf SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2
 EBUILD kodi-17.3-r1.ebuild 8577 BLAKE2B 89b0b422d7aafcd17a23d85e9821185e2afb7ae86e39cd0bee8355b7dbbd4478dc08f2010312d6af7a1987e33578b3a6db2c1b28549e2541c843617594168989 SHA512 be9bf1b24d6bcd3d797ee9f12a9495a7bd1245904b1a361a5bb67fff64eae69a9c5f8f3ae9b2a9c2aebe28b62c755135daeea7ae4f077e68ce5f0cad3169a78c
 EBUILD kodi-17.5-r1.ebuild 8830 BLAKE2B 8f09f8a724708f406157cb6a3acb81e06ca2c2f54bc81dab24b44b539ac1f3ca20cc450ce369fb516f7e8f80e0586af7e654418bca701e9df897e5f0f579a04d SHA512 68e7232a7a45afdfe8b042b4b999e2b7d803bf2812d021155636c40789ec713da025c7c8d01e094bc94121e7f8b22e6cccfc6871f99086646886059476da8df0
+EBUILD kodi-17.6-r1.ebuild 8741 BLAKE2B 63512c0c3c77736a551d2b0a255048a7579f852a5c3b592cb70581747dd7fc04a7beb9b1ceee60222266cb9e478e01f39dbb07f4e84f1a35b509bdb6552ff779 SHA512 6be7bb9f2bc68ef8dfbdf71972d221c503133f99ad42d1b434256d4c55fa6b9edeadc097f928c5176b1038d687b3dc5b38ce083aae969af6147e64562f68cf9e
 EBUILD kodi-17.6.ebuild 8745 BLAKE2B 98d3a0a1b855474eb0bf68b49bbf26a229ad0e8d7a825f10aa131e423401de090bc237a1dae00da87575a851b5f62e27c086964f58afdc6b8e3649b5093b3bab SHA512 e0ab4f578136da46ae6910886d2a8239bf81acdb39256158d616d12a4a6ee168fb45424a3fbd5f31d110117223dcae85d9d881485d238c9c7f59101ca112cc57
-EBUILD kodi-9999.ebuild 9434 BLAKE2B d6f9f082eed4ef7a4776be62f6e708a765c76211fc41e1a1f0f5c8ebf37afaf153ebed3d31b523d8ef1378eecc6df5b00584228fd50fa2665e78a444c46c1629 SHA512 6c156e7d8576c55e7105f5432a08bac9badcebb3e4d2cb7a79068b16b7f85f7042bf387f3d830aa4378f0a7f3b96543def17fb92784e9301cdaff74539612d45
+EBUILD kodi-9999.ebuild 9438 BLAKE2B c86dbb11d95a95d189d769b9d1cea73e636d634cb4e8cf5425d10e170b78ab8693ad7c6dca267f7a80cc9f103785102216de05ec4aad49cb3b48364175e6916d SHA512 d0bdf557d35c40477ccfbe29f969c68a934f055974820e81958bc3434a850ec3d1fb8b6fe10fa195a2ce00e9ef784e0adf549de57f911fed121db367a0684768
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-17.6-r1.ebuild b/media-tv/kodi/kodi-17.6-r1.ebuild
new file mode 100644
index 000000000000..4d0f122c12cb
--- /dev/null
+++ b/media-tv/kodi/kodi-17.6-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 versionator
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.11"
+FFMPEG_KODI_VERSION="17.5"
+CODENAME="Krypton"
+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
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.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 )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
+		<media-video/ffmpeg-3.4
+	)
+	mysql? ( virtual/mysql )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	X? (
+		x11-libs/libdrm
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	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
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index ffe00f762a1f..3d4c6f42f1e0 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -64,7 +64,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	gles? ( media-libs/mesa[gles2] )
 	lcms? ( media-libs/lcms:2 )
 	libusb? ( virtual/libusb:1 )
-	media-fonts/corefonts
+	virtual/ttf-fonts
 	>=media-fonts/noto-20160531
 	media-fonts/roboto
 	>=media-libs/fontconfig-2.12.4
@@ -98,7 +98,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
 	)
 	wayland? (
-		dev-cpp/waylandpp
+		>=dev-cpp/waylandpp-0.1.5
 		media-libs/mesa[wayland]
 		>=dev-libs/wayland-protocols-1.7
 		x11-libs/libxkbcommon
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index fd5b6183ec55..819cc8a59a3d 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -3,7 +3,7 @@ DIST v4l-utils-1.10.1.tar.bz2 1352235 SHA256 6147ccc29fe7dd3c5c3994d613c4f2a099b
 DIST v4l-utils-1.12.3.tar.bz2 1588049 SHA256 5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e SHA512 6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a WHIRLPOOL 1d5606defb85981ef6ab91536a1dd4ebe674bb89fff6fcbbc35a1bae00e9a7dd8e14abac10bb59947a0bdfcdec98259af48cd0b252f4ad75fff101e6030ba57a
 DIST v4l-utils-1.12.5.tar.bz2 1588944 SHA256 0618162ddb0b57fe7c45407d4d66ed79e3a134cdbc9e72598d34e61d3359e20d SHA512 ed2e7545a728360b9684db68330885b498a3a5611f49b80e54da72109d9ba2aa75e85f89f085ff0a6f077b17c880101fa5b78c9dff8a0df2eac1866bd80a04ea WHIRLPOOL 07d2c8184812366998134f3bda7c5a2f2888780f84324e6da342a43f7da824655db6d6a929c910f5569ec33774acc36542811ffe6cf74676b70e910c6c84d293
 DIST v4l-utils-1.6.2.tar.bz2 1148309 SHA256 d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 WHIRLPOOL bd1b825354ca52e62e8c5f83d43bfd2cec63611c65d6b2709a7274fd15ae0fa21345d2b95a073c0b3a33b7c94b304562f1efcf112e1357a58515bd0d6f37f396
-EBUILD v4l-utils-1.10.1.ebuild 1679 BLAKE2B 6992d2e70a92d88cfd42f5e3130c7205ce67d8cb18ee71f1fb11fca7dba12b42b7348917718680a38ade81eedc8289b645f37e2dc50f1f1358f671cdef6bf6a9 SHA512 de4ffeaab1f9901755e1b587004896d0def0b453f94628999f703ae950320f367e995b035fc7ebdd315e83e64c0ada651a035e56dffe167b2cd17b40372a5868
+EBUILD v4l-utils-1.10.1.ebuild 1678 BLAKE2B 4dd2f36394f2a40a76e172e4b181f40ef3216af3436cd04747ee1bf3ccd65cb687a2e0a4242c24e5f2bae708867c3501b2829a3239f20c748f1cb6b07a208d5f SHA512 fb4eddaea1d809cda58a7e4083aade8e9c4440b4163110c3990964e486ebc544ac6b1d27c0bdd60e95642dc4262e6570c11e603315b144093a2b84ce3e1658e5
 EBUILD v4l-utils-1.12.3.ebuild 1546 BLAKE2B 85be33f5e42353cf2edf3839451c77d89cb1a638d3c001cd09e3ba6e14d368a9d7fa54acd6847a4170721d420f572836119b5a6c01cbceaf8c8cfdc310d20aca SHA512 c51a9eca93a84e8814b7e6e2e365261492722c248448f1767f8753f7574196178fc099542d0c7307bce42e543c19eacb2b02282e8f4fcc279a04065723a3baec
 EBUILD v4l-utils-1.12.5.ebuild 1546 BLAKE2B 85be33f5e42353cf2edf3839451c77d89cb1a638d3c001cd09e3ba6e14d368a9d7fa54acd6847a4170721d420f572836119b5a6c01cbceaf8c8cfdc310d20aca SHA512 c51a9eca93a84e8814b7e6e2e365261492722c248448f1767f8753f7574196178fc099542d0c7307bce42e543c19eacb2b02282e8f4fcc279a04065723a3baec
 EBUILD v4l-utils-1.6.2.ebuild 1358 BLAKE2B ffd56191291dea491b054e46a5e2e4a675c69e71a62ae845a800037f8c223f521df2a4e47ccc8128fe6bd130c04ff78987fbf7a9e09f8a33a659ae3e13b51eda SHA512 92a7469693ab83d81f9c2e03da48d1442f0b5cf86bf8cea6e11be0096d0b48b5d79010ef948423356a5d479571968089bbff511f09543140aea6a9cf6771f36c
diff --git a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
index e6a4e35333dc..c0b97ee08ce9 100644
--- a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ppc ~ppc64 ~sparc ~x86"
 IUSE="qt5 udev"
 
 RDEPEND=">=media-libs/libv4l-${PV}
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index b781e3335b1b..3db3e6ce9c28 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -5,4 +5,4 @@ DIST xmltv-0.5.68.tar.bz2 1200116 SHA256 ed6589118943f1028b318dea2cd30c395c41b8a
 EBUILD xmltv-0.5.57.ebuild 5401 BLAKE2B 0c4ca8aa05463ca5d41790431d844adefddad12def480b846b5a04273d8c7b3ff67d698af343d81eedc384c15fae90f093441972d3ed516944d2eb074a305b83 SHA512 881ec922d61a10fe6911e0fd9f6d3dcc15e58ba4ed480cf6eb79dddaf73d5b46fda6c0e084e83681a9ab4ea544bfc3c97722e9de2b8bd225008c50abe3b24e35
 EBUILD xmltv-0.5.67.ebuild 6412 BLAKE2B 4243e3b07cd309fafa2b80a638ba06c934498c49553067eb46d87a76e7bf6a98009710a3c5e297f261b83a38e2fc07ecb21720aaeea587f33de60a318fd211b8 SHA512 dff1d33659be05a6aa2a02db20df66ceac10ac2d6f14f29a071e700be59ad93fd2af5cbcd561387af88e43b77a97f24660365e878dac8cc25ec37b226a1de004
 EBUILD xmltv-0.5.68.ebuild 6719 BLAKE2B 53aedba579a68deda5abd38587708af93bfcd7ff85180097b089dd250b802fc280bb76f2ed0ead591fe8a6c5356d27e0fe29dd76f66342175c84d98ae2d20c42 SHA512 44b24f18ce10ef1a6c578045a134b90abbcfbcfcc9af5381dd84047c2a87f2ce57b0a696096ed3d4402cf8b20769dd36e1bddb7f73cfca6da37f808c6f98eda5
-MISC metadata.xml 3194 BLAKE2B 2a6ec2f849e4a59c1a1b569c7f74861935f56dcd5328aef37f06d0e57da7415ee8c37037777c88bfd5a3e07da449a9941861fa6542c528e6d12c7470d642d615 SHA512 8234e2ccdc2740be4d75b008049c70b196351e0ba91142305b1621043daff40f6275221975642619eb9e706ad42a7b522a54e786d80715be9cbb4aac9edf6e69
+MISC metadata.xml 3093 BLAKE2B 90b78856bc1087d855dbd2b42cbd3feee702acc866c066d65ef2f866f454a162884ab497303363297392685f1cd413ec06b01a2700b6123b6040d3d7007ab50e SHA512 07b487b5d43f2cac0a15962bd87e11eaa38a703d9b6453b433eaab615a27f3f853982105e50c3b62ec625074c19dd491f0f2c3dbbe43c80284d99415bfa4a261
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 2e6c749e564e..bef47687a8ae 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>proxy-mintainers</name>
-  </maintainer>
-  <maintainer type="person">
-	<email>Aidenn0@geocities.com</email>
-    <name>Jason Miller</name>
-    <description>Proxied maintainer; set to assignee in all bugs</description>
-  </maintainer>
-  <use>
-    <flag name="ar">Argentina tv listing grabber</flag>
-    <flag name="ch">Switzerland bluewin tv listing grabber</flag>
-    <flag name="ch_search">Grabber for Switzerland</flag>
-    <flag name="dk">Denmark tv listing grabber</flag>
-    <flag name="dtvla">Latin America digital tv listing grabber</flag>
-    <flag name="ee">Estonia tv listing grabber</flag>
-    <flag name="es_laguiatv">Spain alternative grabber</flag>
-    <flag name="es_miguiatv">Spain alternative grabber</flag>
-    <flag name="eu_dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
-    <flag name="eu_egon">Grabber for german speaking area (Egon zappt)</flag>
-    <flag name="eu_epg">EPG grabber for some European countries.</flag>
-    <flag name="fi">Finland tv listing grabber</flag>
-    <flag name="fi_sv">Grabber for Finland (Swedish)</flag>
-    <flag name="fr">France tv listing grabber</flag>
-    <flag name="fr_kazer">France (Kazer) tv listing grabber</flag>
-    <flag name="hr">Croatia tv listing grabber</flag>
-    <flag name="huro">Hungarian tv listing grabber</flag>
-    <flag name="in">India tv listing grabber</flag>
-    <flag name="il">Israel tv listing grabber</flag>
-    <flag name="is">Iceland tv listing grabber</flag>
-    <flag name="it">Italy tv listing grabber</flag>
-    <flag name="na_dd">North America tv listing grabber</flag>
-    <flag name="na_dtv">North America Direct TV grabber</flag>
-    <flag name="na_tvmedia">Grabber for North America (TVMedia)</flag>
-    <flag name="na_icons">option for na_dd to download icons</flag>
-    <flag name="nl">Netherlands tv listing grabber</flag>
-    <flag name="no_gf">Norway Gfeed tv listing grabber</flag>
-    <flag name="pt">Portugal tv listing grabber</flag>
-    <flag name="pt_meo">Grabber for Portugal (MEO)</flag>
-    <flag name="re">Reunion Island (France) tv listing grabber</flag>
-    <flag name="se_swedb">Sweden tv listing grabber</flag>
-    <flag name="se_tvzon">Sweden (tvzon.se) tv listing grabber</flag>
-    <flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
-    <flag name="tv_check">enable GUI checking</flag>
-    <flag name="tv_combiner">enable grabbers combiner</flag>
-    <flag name="tv_pick_cgi">enable CGI support</flag>
-    <flag name="uk_atlas">Fast UK and Ireland tv listing grabber</flag>
-    <flag name="uk_bleb">Britain tv listing grabber</flag>
-    <flag name="uk_rt">Britain alternative tv listing grabber</flag>
-    <flag name="uk_tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
-    <flag name="sd_json">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
-    <flag name="za">South Africa tv listing grabber</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">xmltv</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>proxy-mintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>Aidenn0@geocities.com</email>
+		<name>Jason Miller</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<use>
+		<flag name="ar">Argentina tv listing grabber</flag>
+		<flag name="ch">Switzerland bluewin tv listing grabber</flag>
+		<flag name="ch_search">Grabber for Switzerland</flag>
+		<flag name="dk">Denmark tv listing grabber</flag>
+		<flag name="dtvla">Latin America digital tv listing grabber</flag>
+		<flag name="ee">Estonia tv listing grabber</flag>
+		<flag name="es_laguiatv">Spain alternative grabber</flag>
+		<flag name="es_miguiatv">Spain alternative grabber</flag>
+		<flag name="eu_dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
+		<flag name="eu_egon">Grabber for german speaking area (Egon zappt)</flag>
+		<flag name="eu_epg">EPG grabber for some European countries.</flag>
+		<flag name="fi">Finland tv listing grabber</flag>
+		<flag name="fi_sv">Grabber for Finland (Swedish)</flag>
+		<flag name="fr">France tv listing grabber</flag>
+		<flag name="fr_kazer">France (Kazer) tv listing grabber</flag>
+		<flag name="hr">Croatia tv listing grabber</flag>
+		<flag name="huro">Hungarian tv listing grabber</flag>
+		<flag name="in">India tv listing grabber</flag>
+		<flag name="il">Israel tv listing grabber</flag>
+		<flag name="is">Iceland tv listing grabber</flag>
+		<flag name="it">Italy tv listing grabber</flag>
+		<flag name="na_dd">North America tv listing grabber</flag>
+		<flag name="na_dtv">North America Direct TV grabber</flag>
+		<flag name="na_tvmedia">Grabber for North America (TVMedia)</flag>
+		<flag name="na_icons">option for na_dd to download icons</flag>
+		<flag name="nl">Netherlands tv listing grabber</flag>
+		<flag name="no_gf">Norway Gfeed tv listing grabber</flag>
+		<flag name="pt">Portugal tv listing grabber</flag>
+		<flag name="pt_meo">Grabber for Portugal (MEO)</flag>
+		<flag name="re">Reunion Island (France) tv listing grabber</flag>
+		<flag name="se_swedb">Sweden tv listing grabber</flag>
+		<flag name="se_tvzon">Sweden (tvzon.se) tv listing grabber</flag>
+		<flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
+		<flag name="tv_check">enable GUI checking</flag>
+		<flag name="tv_combiner">enable grabbers combiner</flag>
+		<flag name="tv_pick_cgi">enable CGI support</flag>
+		<flag name="uk_atlas">Fast UK and Ireland tv listing grabber</flag>
+		<flag name="uk_bleb">Britain tv listing grabber</flag>
+		<flag name="uk_rt">Britain alternative tv listing grabber</flag>
+		<flag name="uk_tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
+		<flag name="sd_json">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
+		<flag name="za">South Africa tv listing grabber</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">xmltv</remote-id>
+	</upstream>
 </pkgmetadata>