gentoo resync : 17.12.2017

5 files changed, 6 insertions, 19 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 99f20f821909..9cf23f30a3df 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index ab6b589c2926..fe12b73ecd4f 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -19,5 +19,5 @@ EBUILD kodi-17.3-r1.ebuild 8577 BLAKE2B 89b0b422d7aafcd17a23d85e9821185e2afb7ae8
 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 9438 BLAKE2B c86dbb11d95a95d189d769b9d1cea73e636d634cb4e8cf5425d10e170b78ab8693ad7c6dca267f7a80cc9f103785102216de05ec4aad49cb3b48364175e6916d SHA512 d0bdf557d35c40477ccfbe29f969c68a934f055974820e81958bc3434a850ec3d1fb8b6fe10fa195a2ce00e9ef784e0adf549de57f911fed121db367a0684768
+EBUILD kodi-9999.ebuild 8915 BLAKE2B 362622730de6ded1057a5daf85ddab263aa1e26180ade754670fbfb5be6b9fb633f47832981147e3fe66d82c218fb21f40e78feb0b5d6f481af526217f3f225b SHA512 d1d0945b12a262438923d09273c1b0e0c5e0ac59cdc7fa6259a7d1fb8d7fed4e8965c21299f3e763791d32e35879bc441a7f2778dd8e41985bf72f54207b4e83
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 3d4c6f42f1e0..974be45715a5 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -46,7 +46,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
 	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-1.0.1 )
+	bluray? ( >=media-libs/libbluray-1.0.2 )
 	caps? ( sys-libs/libcap )
 	dbus? ( sys-apps/dbus )
 	dev-db/sqlite
@@ -65,7 +65,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	lcms? ( media-libs/lcms:2 )
 	libusb? ( virtual/libusb:1 )
 	virtual/ttf-fonts
-	>=media-fonts/noto-20160531
 	media-fonts/roboto
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.8
@@ -85,7 +84,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=sys-libs/zlib-1.2.11
 	udev? ( virtual/udev )
 	vaapi? (
-		x11-libs/libva[egl]
+		x11-libs/libva
 		opengl? ( x11-libs/libva[opengl] )
 		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
 		vdpau? ( x11-libs/libva[vdpau] )
@@ -190,7 +189,7 @@ 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
+		xbmc/platform/linux/*.cpp || die
 
 	# Prepare tools and libs witch are configured with autotools during compile time
 	AUTOTOOLS_DIRS=(
@@ -300,18 +299,6 @@ src_install() {
 
 	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
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 5c2388141ae8..cf5a0100894e 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 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a
 DIST v4l-utils-1.12.3.tar.bz2 1588049 BLAKE2B 1f76e6cd76781119beb01a1d570599cd2710a4c00ea18c380e576cb8281bab07e09cb6c1469201d0fba53b8bb5f4c4fa812dcda06203d83566216272e9abe3b0 SHA512 6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a
 DIST v4l-utils-1.12.5.tar.bz2 1588944 BLAKE2B b87c24c6fdaf3e80407dd28b047c27420ff70007e12200e69395021def3abb74eec3565337a6484cf44b5a5cc7678d9bc718876424fa58d6d16d0e0c37ab59cf SHA512 ed2e7545a728360b9684db68330885b498a3a5611f49b80e54da72109d9ba2aa75e85f89f085ff0a6f077b17c880101fa5b78c9dff8a0df2eac1866bd80a04ea
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
-EBUILD v4l-utils-1.10.1.ebuild 1678 BLAKE2B 4dd2f36394f2a40a76e172e4b181f40ef3216af3436cd04747ee1bf3ccd65cb687a2e0a4242c24e5f2bae708867c3501b2829a3239f20c748f1cb6b07a208d5f SHA512 fb4eddaea1d809cda58a7e4083aade8e9c4440b4163110c3990964e486ebc544ac6b1d27c0bdd60e95642dc4262e6570c11e603315b144093a2b84ce3e1658e5
+EBUILD v4l-utils-1.10.1.ebuild 1677 BLAKE2B ee20cb0d015e70978f713d720978614cc0844c0e5d9d4dde951c3380a094d5d5769ee64883a8a9952917e9d5eee1615caf4008ab6940c13c6932985a2bc466d6 SHA512 4d800bceff5d5c7abe6687455c102de865017f19cc6bb22ad0c1b16359c492c920ff7a6f32f601bdad6d7d9df860860beba4487ed63094deb832f17c64a0341e
 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 c0b97ee08ce9..0d33270441f5 100644
--- a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
@@ -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}