gentoo resync : 25.10.2021

10 files changed, 493 insertions, 25 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index dad5c27c2950..b225da314b85 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 3355ece37cdf..97d59109669a 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -5,12 +5,14 @@ DIST ffmpeg-kodi-4.4-N-Alpha1.tar.gz 13717391 BLAKE2B 2c45778e36167a8740f8f724dc
 DIST kodi-19.0.tar.gz 52311355 BLAKE2B 543936b8fb607d1d629a8f2abd9cd0cb3bf6114aa93647c7e8ccee2f99ff1f84a2740bb57f0cbf675b3efa5914e98c57effb28ecd8e9df83a39d67ee708280a2 SHA512 d6c9fe7414b64d33d919d6c3de1ddb4800e36b786a460d2d2f5c1e5346cd4819487e54f212c37778103d44dd051f7df6c74e0a98a0b21d1e4dc9bedaa8570422
 DIST kodi-19.1.tar.gz 52323919 BLAKE2B 6aa82632d2d70e5f84340c572b586e903e7dbc50c4f99fc5118761d495bd13dcbbcd70462e6288147dd4a305952d1e07f08daf45bbc402b59e3ef785391e1fe7 SHA512 725cbc270259ef5d3b79f9bc271b789dc8ef6616a6d4038e0cd449755ca4ed25198ad6e854b304aedc1fb911ecb98a0aad1b3e469857f8aed54fc4634193eb75
 DIST kodi-19.2-Matrix.tar.gz 52359726 BLAKE2B d560a48b050757d22f8fc4c5b4c9c84be2ff4acb2057f1571f00f93c29b5b71ec19b2f09dee3abe578414364523efcbd8b4d6bc3a425ddc4a5a789baebd352d0 SHA512 0efcfa9f3bb00f7fa53f4a500b75f8232f1775af446e997c6a0fd7636ca4e0b161cf075fad52130b5bd7c23f4f4decfb8c60a87669a920c89b13fc3ff55469fb
+DIST kodi-19.3-Matrix.tar.gz 52354039 BLAKE2B 33d9f0081391fcc37d5f2548d92e0746540394db5e495dfd43fed3e68e776091b505ef4ef21a5fa4c3bef74793642d81ad270c58414ab995ab51a20af76ad530 SHA512 ccb8f26ff8a9ca0cec50e069ff9c658de89a868093a8da25d6a55317d68656de6fd7107c5348c545b4f3cdd541293cfd58f8d171877bfa7533d39e072df68c04
 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-19.0-r1.ebuild 10827 BLAKE2B 36f09ef533f53e7022fd3143eec46e3bb016e98b7d9a5649da8ad8b49f366fad469006f568ca17e18252dfa61aebf73bc0d72706aeb28f8234cb383be2254345 SHA512 e09aca92ca458f529273a9468c18be18beeb1144e65b6db2f3d289849c02b48f95792eb0847e93c18395dbba4296f2bb936e6766f9c7a7c5b352e6efa995290a
 EBUILD kodi-19.1-r1.ebuild 10850 BLAKE2B 79852614ea4a3fde03141edb4fceec64b7b00c5f8104b3df80c6f2bf11e6912b59bf2660effc4711ce2ff407fce8f3e751a31a80e52324d6bd0dec11cffb6583 SHA512 122a8a60ba9d1995d971e87e757d86fb1eaa95e380dcd2d12ca6ebf541b822ec98419bc5150c084b242eac3f2e152ac8d4789801bc90d91c946badc88dea21b7
 EBUILD kodi-19.2.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
+EBUILD kodi-19.3.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
 EBUILD kodi-19.9999.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
 EBUILD kodi-9999.ebuild 10883 BLAKE2B bde5172b18271d7b694317013e1a10ee7a3fd8dab3dd33ae55d2814dbeaef8beee579c7c874dfa02f28c5938183b07f0815475077eb9ee4aa6e1d09b91ef2494 SHA512 b8652e57b708c213b92767d47855c03d5b1afcf198d0e725e3a91d09d8d6933ffd917ab5e0b3845abbbd840655c0138e8a3caf749f6d9fa191e139fe789c5a2e
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/kodi-19.3.ebuild b/media-tv/kodi/kodi-19.3.ebuild
new file mode 100644
index 000000000000..297409ecfaf0
--- /dev/null
+++ b/media-tv/kodi/kodi-19.3.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="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.3.2"
+CODENAME="Matrix"
+FFMPEG_KODI_VERSION="19.1"
+PYTHON_COMPAT=( python3_{8,9} )
+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 )"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	EGIT_BRANCH="Matrix"
+	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_PV="${MY_PV}-${CODENAME}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}
+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 dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gbm wayland X )
+	?? ( mariadb mysql )
+	bluray? ( udf )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+	power-control? ( dbus )
+	vdpau? (
+		X
+		!gles
+		!gbm
+	)
+	zeroconf? ( dbus )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/lzo-2.04
+	>=dev-libs/flatbuffers-1.12.0:=
+	>=media-libs/libjpeg-turbo-2.0.4:=
+	>=media-libs/libpng-1.6.26:0=
+"
+COMMON_TARGET_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.1.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/crossguid
+	>=dev-libs/fribidi-1.0.5
+	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/spdlog-1.5.0:=
+	dev-libs/tinyxml[stl]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	')
+	>=dev-libs/libcdio-2.1.0[cxx]
+	>=dev-libs/libfmt-6.1.2
+	dev-libs/libfstrcmp
+	gbm? (
+		>=dev-libs/libinput-1.10.5
+		media-libs/mesa[gbm]
+		x11-libs/libxkbcommon
+	)
+	gles? (
+		!raspberry-pi? ( media-libs/mesa[gles2] )
+	)
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/freetype-2.10.1
+	>=media-libs/libass-0.13.4
+	!raspberry-pi? ( media-libs/mesa[egl] )
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
+		media-video/ffmpeg[openssl]
+	)
+	!system-ffmpeg? (
+		app-arch/bzip2
+		dav1d? ( media-libs/dav1d )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.68.0[http2]
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	!gles? ( media-libs/glu )
+	>=dev-libs/openssl-1.1.1k: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
+	udf? ( >=dev-libs/libudfread-1.0.0 )
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		!gles? ( 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
+		>=x11-libs/libxkbcommon-0.4.1
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+	X? (
+		media-libs/mesa[X]
+		!gles? ( media-libs/libglvnd[X] )
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	xslt? (
+		dev-libs/libxslt
+		>=dev-libs/libxml2-2.9.4
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
+	lirc? ( app-misc/lirc )
+	power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
+	dev-libs/rapidjson
+	test? ( >=dev-cpp/gtest-1.10.0 )
+"
+BDEPEND="${COMMON_DEPEND}
+	dev-lang/swig
+	dev-util/cmake
+	media-libs/giflib
+	>=dev-libs/flatbuffers-1.11.0
+	>=media-libs/libjpeg-turbo-2.0.4:=
+	>=media-libs/libpng-1.6.26:0=
+	virtual/pkgconfig
+	virtual/jre
+"
+
+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
+		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}"/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}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local platform=()
+	use gbm && platform+=( gbm )
+	use wayland && platform+=( wayland )
+	use X && platform+=( x11 )
+	local core_platform_name="${platform[@]}"
+	local mycmakeargs=(
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon)
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DVERBOSE=ON
+		-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_CLANGFORMAT=OFF
+		-DENABLE_CLANGTIDY=OFF
+		-DENABLE_CPPCHECK=OFF
+		-DENABLE_ISO9660PP=$(usex optical)
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_RapidJSON=OFF
+		-DENABLE_INTERNAL_FMT=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_INTERNAL_FLATBUFFERS=OFF
+		-DENABLE_INTERNAL_DAV1D=OFF
+		-DENABLE_INTERNAL_GTEST=OFF
+		-DENABLE_INTERNAL_UDFREAD=OFF
+		-DENABLE_INTERNAL_SPDLOG=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MDNS=OFF # used only on Android
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex !gles)
+		-DENABLE_OPTICAL=$(usex optical)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SNDIO=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UDFREAD=$(usex udf)
+		-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"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
+		-DCORE_PLATFORM_NAME="${core_platform_name}"
+	)
+
+	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
+
+	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 ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
+		CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
+		CXXFLAGS+=' -DNDEBUG'
+	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
+
+	if use !eventclients ; then
+		rm -f "${ED}"/usr/bin/kodi-ps3remote || die
+		rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
+		rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
+		rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
+	fi
+
+	python_optimize "${D}$(python_get_sitedir)"
+}
diff --git a/media-tv/mythtv-status/Manifest b/media-tv/mythtv-status/Manifest
index babd8ad7a2fb..ee3ca636c970 100644
--- a/media-tv/mythtv-status/Manifest
+++ b/media-tv/mythtv-status/Manifest
@@ -1,4 +1,4 @@
 AUX mythtv-status.1 10118 BLAKE2B 68cee986a2737ff3e234de09c93dee2297fb72e4fe72035cf052b21e113a03983b8ef1d2ddd473f69bec40f10acbf6d8bfeef09a9cd95945db2140d88da6c134 SHA512 b7c7faed71ee4601a6b48181ae1e0540dc5f7bf64b4fdf6a117c974a617a1d1e3de32b4d78f100426c67367ae39cb2618aa39adbb7fa1fe4f414f01fb1d2a5a5
 DIST mythtv-status-0.10.4.tar.gz 37640 BLAKE2B 5fb07894d35a487b8903cade2eda48c6e53efb89690c00105bd8248a3d0518d172a47d5799901f102fc6b3621afedb4c507810a62be6ed3a31480d0c2592f24b SHA512 9701eb59e084df0bdcc487cc79949bb8efd9657b9982a2e545220938255657b49a72cc30c94a08ebc8341ec0d222e03646466f806bc44de3f2d531b75d0d7c1a
-EBUILD mythtv-status-0.10.4.ebuild 821 BLAKE2B 41d95439cba718fc7d0a10278bde8299171a46ba2836ff91684c5a9394136b29e7988576d7d0382f422066bd6971ce6e60ec9c3764e245e79d3baef0956d3f3b SHA512 97aa7586fed4a0910463ac7eb66f7b9a08e012bb90c1a39edc0eb09ea51c2f1c18b5c4309dd8bf93087badea4cdabbb742be6f273db129e7720c139db8e82a5c
+EBUILD mythtv-status-0.10.4.ebuild 745 BLAKE2B 8adc80b94606b914d94e5d92615b3d75dd01736fcec02b392e9af1017624c73c1ce6714621c4ced325eafcdfcfcce7133c98496ff30de2f6c1cb5ba420b6dfc7 SHA512 0eedc5d6d0f702c3af050ea93ed3a1c3f7464e312c4465f32f3e9864e5dae7d9085db35451bec5b413c2021cc8b26f1b9bcc6e0d57ceb49a6ec44cfbe6843f65
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-tv/mythtv-status/mythtv-status-0.10.4.ebuild b/media-tv/mythtv-status/mythtv-status-0.10.4.ebuild
index a9bea06654da..ce2ab4fbf7d1 100644
--- a/media-tv/mythtv-status/mythtv-status-0.10.4.ebuild
+++ b/media-tv/mythtv-status/mythtv-status-0.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,9 +11,8 @@ SRC_URI="http://www.etc.gen.nz/projects/mythtv/tarballs/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
+RDEPEND="
 	dev-perl/libwww-perl
 	dev-perl/XML-LibXML
 	dev-perl/Date-Manip
@@ -21,15 +20,6 @@ DEPEND="
 	dev-perl/Sys-SigAction
 	dev-perl/Config-Auto
 	media-tv/mythtv[perl]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
 
 src_install() {
 	dobin bin/mythtv-status
diff --git a/media-tv/shoutcast2vdr/Manifest b/media-tv/shoutcast2vdr/Manifest
index 80a1037234ad..2124c80fdefc 100644
--- a/media-tv/shoutcast2vdr/Manifest
+++ b/media-tv/shoutcast2vdr/Manifest
@@ -1,3 +1,3 @@
 DIST shoutcast2vdr-0.0.8.gz 3538 BLAKE2B ca09d53488354316af12a0e192c835a29313a07096f534e049ad975dbc55f36f71cbac754e75ad14362b9bae60ab6a513d04bd4a4b2fa89e7a4909310c29aa3d SHA512 ae5ce60c993ff85b3ac9ab3567be55a22ad1929b98a035b323583fa6166b21a96bd7e7017917865d4a339790e7d6c1113820d7230787225d97c68e2174f02c37
-EBUILD shoutcast2vdr-0.0.8-r1.ebuild 718 BLAKE2B 087fb91e8b7226a569c902dcf51d869de15136467991c607b3a0e2c165cbbcb3d5a5a370c5a1846692aebabb3998c4b3aad3efcd11a3512746f1ddf4fdefc28b SHA512 6ba6486ceded70f6328eb25594f4ea8f3094b19055d98ae6f65b2e84b42d52e457b0f707aa4e5d45e96387f830411ce9c30c225bf40dbf7812dd4989f6574aae
+EBUILD shoutcast2vdr-0.0.8-r1.ebuild 719 BLAKE2B 4135261d7fbee9379b675566a50363fbc6a4587abf4fc8cb331cb0053fb42d33b9a55f86882b12cebf8c355c52f2e87805b31eae131ac3b96c21e313a98d50ae SHA512 9f0db8ddcc19948f6aaeb7f67a2cef5b47840a72aad06a45e9dc93b098e1f2f8bf6c66036b88f910db959b72ac3b473c854e7ff9aa97af2199fbfe3e53de414f
 MISC metadata.xml 244 BLAKE2B 7222dd1e8f714217b90fa86e81e31b345a4b2e861ca846f3cfcaab3f6820dea4b067d0d335336af53dfd7985287fc213d27ca777bd876cb2bb72fadba79cc1ec SHA512 d066cd23818ff8a6ace46dde4dd13e5da409672c7843057ff90819a7d691fd53c2e7de7b696a0a08945a4e770f63722f4923e78b22c40568db755ddca6a58f0e
diff --git a/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8-r1.ebuild b/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8-r1.ebuild
index 3c2005d2d825..cda850ecea3b 100644
--- a/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8-r1.ebuild
+++ b/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8-r1.ebuild
@@ -1,29 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="VDR script: generate shoutcast playlists"
 HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=19478"
 SRC_URI="http://www.kost.sh/vdr/${P}.gz"
+S="${WORKDIR}"
 
-KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="media-video/vdr"
-RDEPEND=""
+KEYWORDS="amd64 x86"
 
-S="${WORKDIR}"
+RDEPEND="media-video/vdr"
 
 PLAYLIST_DIR="/var/cache/vdr/music/playlists"
 
 src_prepare() {
-	sed -i shoutcast2vdr-0.0.8 -e "s:outputdir=/home/volker/vdr/radio:outputdir=${PLAYLIST_DIR}:"
+	default
+	sed -i shoutcast2vdr-0.0.8 -e "s:outputdir=/home/volker/vdr/radio:outputdir=${PLAYLIST_DIR}:" || die
 
 	# wrt bug 520624
-	sed -i shoutcast2vdr-0.0.8 -e "s:mkdir:mkdir -p:"
+	sed -i shoutcast2vdr-0.0.8 -e "s:mkdir:mkdir -p:" || die
 }
 
 src_install() {
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 09a21b59cb50..85fee1b8e7c2 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,4 +1,6 @@
 AUX v4l-utils-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD v4l-utils-1.20.0.ebuild 2446 BLAKE2B 39b9192ddee93f01b4ee75db9813a426b083ab302db54c0923fde944b843677146a8bec48cde8eb939ec97a90bba2ff1a491fc33cc73b85c8ae8b5f44ac68058 SHA512 c50f3149199bacfd770cc1ef241f0d621621b3867dc9911c0a9b778f0e6d1598eb844ee6c28ca2e1760e8145836614979ac6145b6dbec617f5f1a2102bc67c21
+DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
+EBUILD v4l-utils-1.20.0.ebuild 2779 BLAKE2B fa000969d7af8f938f096cb8136b96c5fa342d1a499952939e31c879e99148450f70d228052741f902acc3e195cd137f39ad7af89197bfe4823847dea56ae589 SHA512 11b7a270d5631672a6a61ee3bdca45e6415962b9c92fbf9ba6e215cbfbf0f1f185a301abe819b284e7fa150b27e19b56c466a7997db948fe91b58c293286a4a1
+EBUILD v4l-utils-1.22.1.ebuild 2709 BLAKE2B 41b79ad0afd87e2907a7030ed15050ef9202d27cab661b83fc72583ff515174cce0604659935b91887c972153c2b338ad637e318ac643d20e288d3d932ce1d50 SHA512 734ee79b4b66433cf1e0ba898dad56b3a76860a87611a85b449512f9b38089f7f8209a593c593fb1705bae729598c0d86c81e6ede85a596ad159c310099d3d38
 MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7
diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
index 4965c6c3c704..d10a82913bc4 100644
--- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -104,3 +104,13 @@ src_install() {
 	newdoc utils/dvb/README README.dvb
 	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then
+		ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so"
+		ewarn "you may need to take action to avoid breakage. See"
+		ewarn "https://bugs.gentoo.org/767175 for more details."
+	fi
+}
diff --git a/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
new file mode 100644
index 000000000000..65a827a5b6d4
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs udev xdg
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bpf dvb opengl qt5 +udev"
+
+RDEPEND="
+	>=media-libs/libv4l-${PV}[dvb?,jpeg]
+	>=virtual/jpeg-0-r2:0=
+	bpf? ( virtual/libelf:= )
+	udev? ( virtual/libudev )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl )
+		media-libs/alsa-lib
+	)
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
+"
+
+# Not really prebuilt but BPF objects make our QA checks go crazy.
+QA_PREBUILT="*/rc_keymaps/protocols/*.o"
+
+check_llvm() {
+	if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
+		local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}
+		${clang} -target bpf -print-supported-cpus &>/dev/null ||
+			die "${clang} does not support the BPF target. Please check LLVM_TARGETS."
+	fi
+}
+
+pkg_pretend() {
+	has_version -b sys-devel/clang && check_llvm
+}
+
+pkg_setup() {
+	check_llvm
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use qt5; then
+		local qt5_paths=( \
+			MOC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/moc" \
+			UIC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/uic" \
+			RCC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/rcc" \
+		)
+		if ! use opengl; then
+			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
+		fi
+	fi
+
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable dvb libdvbv5) \
+		$(use_enable qt5 qv4l2) \
+		$(use_enable qt5 qvidcap) \
+		$(use_enable bpf) \
+		--with-jpeg \
+		$(use_with udev libudev) \
+		--with-udevdir="$(get_udevdir)" \
+		"${qt5_paths[@]}"
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then
+		ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so"
+		ewarn "you may need to take action to avoid breakage. See"
+		ewarn "https://bugs.gentoo.org/767175 for more details."
+	fi
+}