gentoo resync : 02.09.2020

8 files changed, 16 insertions, 379 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 91a6acdc853e..998d10d32506 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index dc330bee5efe..f1d9a9b32bb0 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,20 +1,17 @@
 AUX kodi-18-remove-useless-test.patch 1295 BLAKE2B 36c6408ee1ef404539f097822952fa4000b4913ed5b54526bb4f2b452a553335eb3935e5a6cbcec0b1e497eed86d5417784016404596d31a063d608ca1f44d51 SHA512 73c50bf728d04117ad1493505bea561ade6c49e2e58de24a453374946d0931e11e094b749bad9d90ea48197521808a12b87c42e496acb6091380f4953b959567
 AUX kodi-18.5-cassert.patch 1402 BLAKE2B 02f2b63856cf1fd75749d78a0f9cf37cac55b20fc22302846011781c56e8902312a10e71c3e1b21f44aaa362efba2acefb73c5ae68643b569c541508f44d97bd SHA512 fbaa126dd647559749944c09e5424a76dccdaa5d8dc6299a52cb6215f20af29f3cf8d0596280f335e8a9be1ffe556fa47b33c9d28b22c2b47f51d738219aeb8c
-AUX kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch 1114 BLAKE2B 149786e52ea4379cc6841e15929d39787e3c2e40832f078026afe0a6f43908ca3a8e451a12be7324313601aa224f53131ad811a83a72bec08592eefd14bb1128 SHA512 44bb5a26b916dea80b162ca4c03e71b2f6d1e108d8f9a007ac1d1661119ecbd7a6b4d65471d97d8991feb0d0ef157f6e8f69f70f463e5af4dc1d9b68aafda28b
 DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
 DIST ffmpeg-kodi-4.3-Matrix-Alpha1.tar.gz 13478011 BLAKE2B 6219293fba86981c34c22b1a91c6dce0c298d523ecafe2e0ddce8b1ec4213d4f8f65610e4555a124a582d7fa8e858d0ad6921015fa4e639d64a02e955f7faf46 SHA512 23220650b550fe2008c38c955e10baf55e1ceaac780cf170db5349b156ac399ff3eda39509773f0c973c50083e75823b1da8e92b3751c04bb06a7f5687bef850
 DIST kodi-18-libmicrohttpd-0.9.71.patch 84981 BLAKE2B e07c7df63bdfbaf9dfc5d0989adf96eb663a8c99ea11c42dfc585d8b91343a3445e9bc2f1797e845b0895e79568526e8e594a76e8cb3d7b591153a0ad45ce807 SHA512 286a1466174d847eac460b2a7a1b66b082148f2a3e91c4f5f881b909a59b8fdb2037eda074bd3c6e5dbe6a65dc2bef9f1d6746d7db2cb78d285c4b7750c366c2
-DIST kodi-18.7.1.tar.gz 51052174 BLAKE2B 8e341d1b047cf170e845c775427f9fa54dabe2a9ad56afa80e90e0b6b508f2606907c813decdbdcc75eeeeb742ae1a600cc4d1bb40021bc6624a234f1aeb9946 SHA512 db44c2d3c998af37948ccd042932545c9d781b622dba85ec11b7dd97ec0be80f03d2687249a9483d1b2a7178179bf5a003f8d0f4c0e55c9f2a41f67a27a19e0f
 DIST kodi-18.7.tar.gz 51051040 BLAKE2B 7ff04cd0ddcf74e46eef4318cf870662b9e076b362322958a6b8019d49134e37981f7ca21b5806e38b942adc4c29ea2b25a19f46e5da3d469613cf19a29f4e8c SHA512 7e5678f5e23e8af929056a49b0ce0b992a1f53a1fe970a149610c5a24adb591085bb06cc405e8bdc6040eef853d23e99df660d7006fc1ea4e79afd3a697875c5
 DIST kodi-18.8.tar.gz 51052219 BLAKE2B 6e49b08b5e2bfe778dafb687658e82b90226a9f1c1a7827a4290d601fe4c98e5cbaabaa39563c19a2956b83ce3a76640f081a56a41dfea4d65fb8b503c6f37b0 SHA512 242eaa9144ba0d9b15f02ab41282295de76d375cf66d595e7f6687d47c996133fcf5647448dcd06759df9f30bd86cdba239720b9bdd8b57827b6f261c08c4aaa
-DIST kodi-19.0a1.tar.gz 51653713 BLAKE2B 7fb9e4e2a98f1ae77b8889c66f10d938d7aa63f1c77858a3b75d61e12eaf896472e05a13d0f4f0f953978349366e58190a86003bead481e915cddaec7c865b41 SHA512 52fb4b851a394b52fd50b99e13d4ed19cc7c069df52d29e1816faee4dfebde73501582a733d7d5112ad9ff20a7b7df5a8c26dfa29e886160ff8e06b5bedab4fc
+DIST kodi-19.0_alpha1_p20200830.tar.gz 51683611 BLAKE2B 8957e76bc0558d5ba8efb4c9884021b644376a8fe56d1d23086485d596d5f91ccf110bdbe2fdb9fd650da03eed5558fb55dd017ef1550b2b676b2baeae13c554 SHA512 4a9c407b2a0384297083bbfa279dda07fd70489e2da45542182a8faf9f1fbe92fb17f6aa9b8b14f8e95d7e00b5edd732587667649d91ff89b2ff43f3da95b32f
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-18.7.1.ebuild 9776 BLAKE2B 2c988ece7726fd6ad227b35fcf7e53c7fef61a8a0a511081741938f62e0eab5254ce537fed8a43e2c18688ee7a04b7c0c0de0247ca9997ceae1ad0607471f88e SHA512 44ce425be91bb45e2c1bf69fd05fe2a10f8341438f2e754283e4897e53cf35d580a3ce869848e415379fe3c4e503a8f13cab497658f648a7c582eeaae21e4928
 EBUILD kodi-18.7.ebuild 9762 BLAKE2B ed5b1e0bba1ae29387f59acc9f454872abdae8506b19570fa4df7ceda32a3551f684bc3f7be2b8426f4041d24a3bed830076d76c897a310c79d87773b7e3c566 SHA512 f0b4362ef5665ebb17618b09f6f25179423526cd9244c585d333349f8894a6d5543a76ccb181f0b0445de50305ce1813998720a8c5c1ac245ca5872b20bcc67f
-EBUILD kodi-18.8.ebuild 9619 BLAKE2B 1329861366f039dca5cfdbc450ad1c36d42bf2e2b464f1fec1bd2a4150a2c7df62ece6ad9846e978a4d8e6ea0624e718a61c7b4490c530ee7f8308a71b3ee2a8 SHA512 5f1e2b46fad7a81b00586ae7e94943bc2b3a8f14e14a8238dce4d62da47a139317d881ac853d6bdf70796ab278e9b5b320c31b2af9682ddae5f791f43c1cb40d
-EBUILD kodi-19.0_alpha1-r1.ebuild 9429 BLAKE2B 124d85552e57a4e6890ac4fee32c467d0572e5580ed7fe36aab4ae2b39e6982e51fe693c5650850ad6a005227a62df194e9c43d21a07679221f2fc72373874c8 SHA512 41d7531c261fe6cd559423fba3bd5c742a68ea6d4c2702f2c28e6f4bea896f84138d20ce1a502348114395aa3b7b1ea21ab590f11e185107cc1724f6489b1276
-EBUILD kodi-19.9999.ebuild 9360 BLAKE2B ae0d101e15421762d115a1b03939fb6420325404b993e70dc5b5cfda0a29d1d16b05346a08ab20e8626fc2a13a3beaca48e5fa7f131f4d4f2b7e7ebf6e90d2d0 SHA512 1cec9b72029e46c2312e802eaf9c70f63ac98b9d7ddc97530abf02b68e08cdb24d1219674b1abb2fae707c7fb3f272bfa0c9eb3a4bbca8bd95df6ab4749d4309
-EBUILD kodi-9999.ebuild 9360 BLAKE2B ae0d101e15421762d115a1b03939fb6420325404b993e70dc5b5cfda0a29d1d16b05346a08ab20e8626fc2a13a3beaca48e5fa7f131f4d4f2b7e7ebf6e90d2d0 SHA512 1cec9b72029e46c2312e802eaf9c70f63ac98b9d7ddc97530abf02b68e08cdb24d1219674b1abb2fae707c7fb3f272bfa0c9eb3a4bbca8bd95df6ab4749d4309
+EBUILD kodi-18.8.ebuild 9624 BLAKE2B f2fb687517e5fc0fc6ed480fda971fa5316f6699762df338392d8b9a9df68531fd38468e9667d23567352ce797fc4c790c1340c06fb0e5d5274cfe7c2883f760 SHA512 0de173c95440f2b5901f5a83649153fd791f678cc88606a41180df5a75a3bcd23d183fd38260e99f642ee1d9a201fa6c4b2a630c1991e50b218063e6390f489c
+EBUILD kodi-19.0_alpha1_p20200830.ebuild 9312 BLAKE2B 0ba1f48d13e0fc62eeb7eca48c97f01650b2526341b4e7f7ebc5535b6edc9014506cfb939480fb1dff7932b5f7ff805abbfa8959d133cda1f0e11fb88c8bf3ee SHA512 df981507a4b4525bcf52e744d6bcdc6092f99e7adaaecbc551de71c0a11ee15f27b4e84564b8af4778d52805017ea643f5bd5b82b23f58d74e4d2aed49e9d88e
+EBUILD kodi-19.9999.ebuild 9376 BLAKE2B 344550b72b9f98ac7d4a46a035c5ecc8aaf75f6665e87f93527f0fd983adbf4eb2c0cdac2d5c998e8a9435f98708f0c67c529821d1ede2a9e69eba6dc317cb22 SHA512 906cc1f7abf61fe22c697b60e9cedf9e5699abd6bd821f070360084a90d7868b630612404c5e6381afc25903caf7b0d940eb7b397a444b90c8ca5e22f6595ca3
+EBUILD kodi-9999.ebuild 9376 BLAKE2B 344550b72b9f98ac7d4a46a035c5ecc8aaf75f6665e87f93527f0fd983adbf4eb2c0cdac2d5c998e8a9435f98708f0c67c529821d1ede2a9e69eba6dc317cb22 SHA512 906cc1f7abf61fe22c697b60e9cedf9e5699abd6bd821f070360084a90d7868b630612404c5e6381afc25903caf7b0d940eb7b397a444b90c8ca5e22f6595ca3
 MISC metadata.xml 1796 BLAKE2B da81fcbb0abedc4f78e82fa6f9453e4ffe824b1cedefcc9a1261dc09e0bd43482a7bd03e908f959d1a3033c284188d79644a1a9bca5064836eb3d0908b7d0d7f SHA512 d76d9f8d4683df4ab488dd30852437649810d0b093f0590db8f95404445f25aca7efdaa9d706d3222d67104cb2c4b02896154fcd7df1173b0bfe7e2557d73847
diff --git a/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch b/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch
deleted file mode 100644
index 096a4032628b..000000000000
--- a/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3be79a564343886ade7e88f447944fd4b5452959 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 31 Jul 2020 14:56:21 -0400
-Subject: [PATCH] [test] [webserver] Conditional TestHTTPDirectory
-
-TestHTTPDirectory.cpp requires microhttpd so only include it if microhttpd is found.
-
-TestHTTPDirectory.cpp includes network/WebServer.h which includes network/httprequesthandler/IHTTPRequestHandler.h which includes microhttpd.h
----
- xbmc/filesystem/test/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/filesystem/test/CMakeLists.txt b/xbmc/filesystem/test/CMakeLists.txt
-index 235acc8549cf..9572459cf198 100644
---- a/xbmc/filesystem/test/CMakeLists.txt
-+++ b/xbmc/filesystem/test/CMakeLists.txt
-@@ -1,10 +1,13 @@
- set(SOURCES TestDirectory.cpp
-             TestFile.cpp
-             TestFileFactory.cpp
--            TestHTTPDirectory.cpp
-             TestZipFile.cpp
-             TestZipManager.cpp)
- 
-+if(MICROHTTPD_FOUND)
-+  list(APPEND SOURCES TestHTTPDirectory.cpp)
-+endif()
-+
- if(NFS_FOUND)
-   list(APPEND SOURCES TestNfsFile.cpp)
- endif()
diff --git a/media-tv/kodi/kodi-18.7.1.ebuild b/media-tv/kodi/kodi-18.7.1.ebuild
deleted file mode 100644
index 1500d25880b3..000000000000
--- a/media-tv/kodi/kodi-18.7.1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
-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
-	!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 )
-	https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
-PATCHES=(
-	"${FILESDIR}/${PN}-18.5-cassert.patch"
-	"${FILESDIR}/${PN}-18-remove-useless-test.patch"
-	"${DISTDIR}/${PN}-18-libmicrohttpd-0.9.71.patch"
-)
-
-if [[ ${PV} == *9999 ]] ; then
-	PYTHON_COMPAT=( python2_7 python3_{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 ~arm ~arm64 ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://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 dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	^^ ( gbm raspberry-pi wayland X )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		>=app-pda/libplist-2.0.0
-		net-libs/shairplay
-	)
-	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-1.0.2 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/flatbuffers
-	>=dev-libs/fribidi-0.19.7
-	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
-	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]
-	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
-	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
-	>=dev-libs/libcdio-0.94
-	>=dev-libs/libfmt-3.0.1
-	dev-libs/libfstrcmp
-	gbm? (	media-libs/mesa[gbm] )
-	gles? (
-		!raspberry-pi? ( media-libs/mesa[gles2] )
-	)
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	media-fonts/roboto
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.8
-	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
-		libressl? ( media-video/ffmpeg[libressl,-openssl] )
-		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	>=net-misc/curl-7.56.1[http2]
-	nfs? ( >=net-fs/libnfs-2.0.0:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
-	libressl? ( dev-libs/libressl:0= )
-	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	>=sys-libs/zlib-1.2.11
-	udev? ( virtual/udev )
-	vaapi? (
-		x11-libs/libva:=
-		opengl? ( x11-libs/libva[opengl] )
-		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
-		vdpau? ( x11-libs/libva[vdpau] )
-		wayland? ( x11-libs/libva[wayland] )
-		X? ( x11-libs/libva[X] )
-	)
-	virtual/libiconv
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	wayland? (
-		>=dev-cpp/waylandpp-0.2.3:=
-		media-libs/mesa[wayland]
-		>=dev-libs/wayland-protocols-1.7
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		system-ffmpeg? ( media-video/ffmpeg[X] )
-	)
-	x11-libs/libdrm
-	>=x11-libs/libxkbcommon-0.4.1
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? ( app-misc/lirc )
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:2 )
-	upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-libs/rapidjson
-	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
-	virtual/jre
-	x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
-	check_extra_config
-	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_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/platform/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}"/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_INTERNAL_FSTRCMP=OFF
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRCCLIENT=$(usex lirc)
-		-DENABLE_MARIADBCLIENT=$(usex mariadb)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.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
-
-	if use gbm; then
-		mycmakeargs+=(
-			-DCORE_PLATFORM_NAME="gbm"
-			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
-		)
-	fi
-
-	if use wayland; then
-		mycmakeargs+=(
-			-DCORE_PLATFORM_NAME="wayland"
-			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
-		)
-	fi
-
-	if use raspberry-pi; then
-		mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
-	fi
-
-	if use X; then
-		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_test() {
-	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
-	KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
-	cmake_src_install
-
-	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	newicon media/icon48x48.png kodi.png
-
-	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/KodiSend/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-18.8.ebuild b/media-tv/kodi/kodi-18.8.ebuild
index cf17871d239b..4311cb82d79d 100644
--- a/media-tv/kodi/kodi-18.8.ebuild
+++ b/media-tv/kodi/kodi-18.8.ebuild
@@ -28,7 +28,7 @@ else
 	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 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
diff --git a/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild b/media-tv/kodi/kodi-19.0_alpha1_p20200830.ebuild
index 6da60ce1906b..59fcf9edb60c 100644
--- a/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild
+++ b/media-tv/kodi/kodi-19.0_alpha1_p20200830.ebuild
@@ -19,20 +19,12 @@ 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}
+	GIT_COMMIT="a3d5f733751021dcd172954f5b618934b80a4a55"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/xbmc-${GIT_COMMIT}
 fi
 
-PATCHES=(
-	"${FILESDIR}/${P}-conditional-TestHTTPDirectory.patch"
-)
-
 inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
@@ -96,7 +88,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.13.1
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
+	!raspberry-pi? ( media-libs/mesa[egl] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
@@ -138,6 +130,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
 	X? (
+		media-libs/mesa[X]
 		x11-libs/libX11
 		x11-libs/libXrandr
 		x11-libs/libXrender
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 68f0cbca4eae..123db14e3779 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -92,7 +92,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.13.1
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
+	!raspberry-pi? ( media-libs/mesa[egl] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
@@ -134,6 +134,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
 	X? (
+		media-libs/mesa[X]
 		x11-libs/libX11
 		x11-libs/libXrandr
 		x11-libs/libXrender
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 68f0cbca4eae..123db14e3779 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -92,7 +92,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/fontconfig-2.13.1
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
+	!raspberry-pi? ( media-libs/mesa[egl] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
@@ -134,6 +134,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
 	X? (
+		media-libs/mesa[X]
 		x11-libs/libX11
 		x11-libs/libXrandr
 		x11-libs/libXrender