media-tv/kodi: bump to 17.0b6

Closes: https://github.com/gentoo/gentoo/pull/2962

3 files changed, 53 insertions, 30 deletions

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 4b8a0adbe517..a1d1ae0073bd 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -6,8 +6,8 @@ DIST kodi-16.0-generated-addons.tar.xz 76876 SHA256 fb164bf2aaf54d0c4a6da60b768b
 DIST kodi-16.0.tar.gz 52093964 SHA256 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 SHA512 b187f57601dfadc2119622f19558dbaca6ba7c708f5c24d65b876ee32888251940ffa8caadf978ee1afbd7c8da5007771e013d639819b998c345e968149995ac WHIRLPOOL ca19325b52c4c7de72a8d18cc9d68a83203274d3a432bcd83188904a9a2ba4e69372144c40ada3b3cd89ed12d740a1dceec75c5511b706b922374784bf817b3f
 DIST kodi-16.1-generated-addons-r1.tar.xz 54528 SHA256 ffa06845ed95597b46a178575e361f0641f78778be553d7a9f51b4cc190d2629 SHA512 32c9a5bb6ed5f5d8e73a37c35268c1a7176c6a4c52c5b5e8f6c5c76a3c51445ff0a5b8802be94ada5d63ecbea4d7e69b61d579c931900f6ba6abb583bbe542d9 WHIRLPOOL 3cd62abee6854efbee0070d811d0ef03f7b2d1d629c91d43fb2a2883c83733267affef60339459ce1ca7e30b1b856e20b929883cd12958348803c428d69e142e
 DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d
-DIST kodi-17.0b5-generated-addons.tar.xz 57040 SHA256 c291f6c040acfab600a5fa8e8277181940a2cee15d9caf11f9a4f8e01cc55b8f SHA512 84131f6176bb71d93efb385e6f0b8c9e917cad4a7e9d39b81fe26ab7ce8d3320c24c8b452d5356b2b207bd5b9f0c75308ff515155a39043de73de5ff26e3e786 WHIRLPOOL 20b5da022205c4c7ba9312d987ce4b485d0f58f8eebbabf3aeaf127816d06ac460738fce0f6c3a574b6838a64768d1102db137750fcead711d34cfcd1f0ff174
-DIST kodi-17.0b5.tar.gz 54923580 SHA256 e27d31c24de77f5f6b79f32d60c4e34787a2f98dcd7a15339ab6cf290f10a15d SHA512 bc3a2d4fec90444177071b6abc2f58ad69e1df22ff66b40cea341ecd2cf4f378691956f67ad275dd890a32798e265a92add8b0cf6a7beeaeb74091adb618996d WHIRLPOOL 56bcbf58671a406fa401285b3c363a6d9e9e496a29da84e2628a5e75fa6347218e741c8383dd36e99c61c043225cd3c2e57779060293bfc8a11926abc771e933
+DIST kodi-17.0b6-generated-addons.tar.xz 57572 SHA256 c2ad18a9252dd3d6fbd9f468c9dbe4329bdda7c3c5645dc4fb9b3e1273891f69 SHA512 a7a13b249ad89b7e05306f1a92aa2cb1603b9c368172d3f3b9d6d3473befd1aa503636c5bb9c40bff837fe6c440a828dafb3dcd098627ab7198dbc72d39d0398 WHIRLPOOL 2d3f3443c081a5a7b4dc94d4b71afb36b5c92d286f0dfcd2e8f3c528474ab9baaec4ca151ee0fbcb3cf3c1987a1563cd2720506f189b2350229a0217ca0aec76
+DIST kodi-17.0b6.tar.gz 58035550 SHA256 961330e0b833793a6d58a00f29b58869dab643a24bf7622b790a43a2dde6fa4b SHA512 eb4070a508934d15e55cf981e94582a3484cb521b12ed1c90b2057d9e06c8a9c055d67a230019c88abf109c6984060165d05613211da7d7c3822be7aff22f976 WHIRLPOOL 855c9e8c2387ba09209444eb808e910c259d8e719310851669fa27cb65768a85c9901a4ee4dd448b9239b53be8dcb8c41fb082828b67a750ba84ea4ae0cc1db7
 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
diff --git a/media-tv/kodi/kodi-17.0_beta5.ebuild b/media-tv/kodi/kodi-17.0_beta6.ebuild
index 3661b6eb2c2b..ececda0b75ba 100644
--- a/media-tv/kodi/kodi-17.0_beta5.ebuild
+++ b/media-tv/kodi/kodi-17.0_beta6.ebuild
@@ -68,9 +68,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/yajl-2
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
-	media-fonts/anonymous-pro
 	media-fonts/corefonts
-	media-fonts/dejavu
+	media-fonts/noto
+	media-fonts/roboto
 	alsa? ( media-libs/alsa-lib )
 	media-libs/flac
 	media-libs/fontconfig
@@ -285,14 +285,25 @@ src_install() {
 	rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die
 
 	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf || die
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
-		/usr/share/kodi/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/AnonymousPro.ttf || die
-	dosym /usr/share/fonts/anonymous-pro/Anonymous\ Pro.ttf \
-		/usr/share/kodi/addons/skin.estuary/fonts/AnonymousPro.ttf
-	#lato is also present but cannot be unbundled because
-	#lato isn't (yet) in portage: https://bugs.gentoo.org/show_bug.cgi?id=589288
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/NotoMono-Regular.ttf || die
+	dosym /usr/share/fonts/noto/NotoMono-Regular.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/NotoMono-Regular.ttf
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Bold.ttf || die
+	dosym /usr/share/fonts/noto/NotoSans-Bold.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Bold.ttf
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Regular.ttf || die
+	dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Regular.ttf
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym /usr/share/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 462bb8b6d630..ececda0b75ba 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -68,9 +68,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/yajl-2
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
-	media-fonts/anonymous-pro
 	media-fonts/corefonts
-	media-fonts/dejavu
+	media-fonts/noto
+	media-fonts/roboto
 	alsa? ( media-libs/alsa-lib )
 	media-libs/flac
 	media-libs/fontconfig
@@ -139,7 +139,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 # Force java for latest git version to avoid having to hand maintain the
 # generated addons package.  #488118
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
+[[ ${PV} == 9999 ]] && DEPEND+=" virtual/jre"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887
@@ -158,7 +158,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack || default
 	cp "${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdcss/libdvdcss-master.tar.gz" || die
 	cp "${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdread/libdvdread-master.tar.gz" || die
 	cp "${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdnav/libdvdnav-master.tar.gz" || die
@@ -190,13 +190,14 @@ src_prepare() {
 		mkdir "${WORKDIR}"/${CBUILD} || die
 		pushd "${WORKDIR}"/${CBUILD} >/dev/null || die
 		einfo "Building host tools"
-		cp -a "$S"/{tools,xbmc} ./ || die
-		local tools=( JsonSchemaBuilder )
+		cp -a "${S}"/{tools,xbmc} ./ || die
+		local tool tools=( JsonSchemaBuilder )
 		use texturepacker && tools+=( TexturePacker )
 		for tool in "${tools[@]}" ; do
 			tc-env_build emake -C tools/depends/native/$tool
-			mkdir "$S"/tools/depends/native/$tool/bin || die
-			ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die
+			mkdir "${S}"/tools/depends/native/$tool/bin || die
+			ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool \
+				"${S}"/tools/depends/native/$tool/bin/$tool || die
 		done
 		popd >/dev/null || die
 
@@ -205,7 +206,7 @@ src_prepare() {
 		# Binary kodi.bin links against libsquish,
 		# so we need libsquish compiled for the target system
 		emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX)
-	elif [[ ${PV} == "9999" ]] || use java ; then #558798
+	elif [[ ${PV} == 9999 ]] || use java ; then #558798
 		tc-env_build emake -f codegenerator.mk
 	fi
 
@@ -234,7 +235,7 @@ src_configure() {
 	# No configure flage for this #403561
 	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
 	# Requiring java is asine #434662
-	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+	[[ ${PV} != 9999 ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
 
 	econf \
 		--disable-ccache \
@@ -284,14 +285,25 @@ src_install() {
 	rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die
 
 	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf || die
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
-		/usr/share/kodi/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/AnonymousPro.ttf || die
-	dosym /usr/share/fonts/anonymous-pro/Anonymous\ Pro.ttf \
-		/usr/share/kodi/addons/skin.estuary/fonts/AnonymousPro.ttf
-	#lato is also present but cannot be unbundled because
-	#lato isn't (yet) in portage: https://bugs.gentoo.org/show_bug.cgi?id=589288
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/NotoMono-Regular.ttf || die
+	dosym /usr/share/fonts/noto/NotoMono-Regular.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/NotoMono-Regular.ttf
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Bold.ttf || die
+	dosym /usr/share/fonts/noto/NotoSans-Bold.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Bold.ttf
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Regular.ttf || die
+	dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Regular.ttf
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym /usr/share/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