gentoo auto-resync : 03:06:2024 - 00:07:25

12 files changed, 138 insertions, 372 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 0eb0cd0097c8..626756efa2a6 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index ee790b452b6b..489363d5cc0e 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -5,6 +5,7 @@ AUX kodi-19.5-flatbuffers.patch 1172 BLAKE2B 35434d6d71296bc4377ccb762d1dc1d73d1
 AUX kodi-19.5-gcc-13.patch 1849 BLAKE2B 1d3183305557b260bad52dbe0bb5828118013c08274861b902c6fa23e86422cc2d49936f125a00d57c29ba0ec7a9001cac53ac499e2ef4345d3a81f143d48c80 SHA512 e2f66f6a0ff4fa1a49a15a185cfbc9a76af8ff4630241a8c01e3de4d1e09f12d2724dc1fa7bb71c1c15e563810babcbb4217635a4e5460b33bbb0a4f81f2e5db
 AUX kodi-20.2-binutils-2.41.patch 3399 BLAKE2B 5608adfb32777371a71091de237e6173c72c272a5911e999c3e4bde6f0c0f788db644ccf1098ddabbbba7e6d2a0d65fbfa7570f6acf83cd351a6e779dd8b7f5f SHA512 aec2995737c78cf4ae3e9a4e9212f0481664fd91eb83e07d0bd354cede014015929628833e8b5a87fb19dda20d30abc5585d676a69bff3ee0111fb1f21bb87e7
 AUX kodi-20.3-gcc-14.patch 2048 BLAKE2B 8b34f1717c8c79c37ec6ccd51fbdbdc3495bb50166a22e1f3494a2d97c104055b187fe1fd84a4d35c125ba3975f4537372deae09666135117419ff02b10f0d42 SHA512 cd9210a573fe59cd822fb564c0aa32e6b3faad87bc79c02ae53740dba87e85f1a2a6429032f3393006e16ac6fb7a81ae18155c87ddd62bdd54680e09a90fa322
+AUX kodi-21-fix-dvd-playing.patch 1706 BLAKE2B d74af009e12eeb00d9402e58620c41c4da842830713fd0f9319d1e884e089a27432eccfc08d583a5d1eaa8fa9bcf4b00ea495e76f93b159a790ef1af3016d7e3 SHA512 b2badfe1fb5ffee0b2119670d205e0ba49005791be879f8d946c018e8f6af58174c1ffc0e85b89914c7858373b03ee5a3703f47af9d5aca11015aa701d149c16
 AUX kodi-21-fix-gcc14.patch 1374 BLAKE2B 5438405a2862328e1207787fad0d153bbfd7f94c5287e825bf0ef7e6a20cbc51185b626f8aba61b0747fb672418fdf5f44e715295a983107ca2ef018e1ad19e3 SHA512 60df712f47b0abc3b7a7247425b4ce4f273bfbadf8b4147883aa3e2432c02724d03c644785748bc3ac6bdf7fb19744ffea40c551420a02865dd83bfdac19f585
 DIST apache-groovy-binary-4.0.16.zip 29793704 BLAKE2B 30f77c6400c85821cf78f6ba1070da1e68644531f85f71cf7695443b13b81393cc89d4103eb869d1523f0a22a6e1c3428dcabf4f79c8a2c6eb2a6dea74e84e8f SHA512 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0
 DIST commons-lang3-3.14.0-bin.tar.gz 9442785 BLAKE2B 2ecdd06f97ac2688220055a08f67da9b859bed3ab00ff41800d5d9a1cebda599db2e816425c10c265dd6827a0ef79fc3dd094a8b3c9b9ae4ceae8f5750a59cf2 SHA512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc
@@ -13,7 +14,6 @@ DIST ffmpeg-6.0.1.tar.gz 15437409 BLAKE2B 6424e30c6d354abbbea8a807822ae615894131
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
 DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f
-DIST kodi-20.3-Nexus.tar.gz 54567232 BLAKE2B 956be2d1bef16910d88f244331bdff60cce309d9596ec7939a459489b7fa7ab3ca7b29e2aca0de542f48f95321d86c9d7a606ac311a7a3c69e0e6f901511982e SHA512 cdec1383d33f421828f0249ac2929980c6eaa39e345a8a364d9f3479f873029a15f3f6e6d40707fd2df2067a71bdaa3c6a1e26277074c31c631c71afe7465cb4
 DIST kodi-20.5-Nexus.tar.gz 54568445 BLAKE2B 15eb409918fa3768528d9abd24c52fd8b94c82699ef2ce10a529278fe25544dc335b66d137ae8ae304511cd92c1c0be34881937ec705ba936f5a4b0d737903f7 SHA512 a47a54ca11e1d3daeddea8c1ae716cd4461e3441de43a026a920c709b2ff5c7e0acc2a5fd4ac8c15f0da1940bd7f21a65eff32203ad8e167603c1576b21d4dcc
 DIST kodi-21.0-Omega.tar.gz 40987733 BLAKE2B 33adaf588b3362dc9d184bfb66c36ad5fa2e442255da47db4813f926e73f5a607dd7de809ecf8a4982f985bc8dac53cba17fb9db6a009bb0cdb6284db3b1edb4 SHA512 9c2ca6b6e72197d2b1c26a47cf4ddc209318fcaa5a30ea20475ecc5518c7d1395c2e9cf3e3a75a13334b0505e7b417acdb0d76a20567a0c86841b3e69232625b
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
@@ -23,9 +23,9 @@ DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb363
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e
 EBUILD kodi-19.5-r2.ebuild 11404 BLAKE2B 0a49eaeeda4e3bacc05b85df0d97a7bca3d29263f5a73493024d3b50d96d164a318acc8d1810a8ad970504cc1efb54caa721caf7825cfea7ff78b5fe4a2518aa SHA512 8af7746280eeefdbe6fa6eabbfa39a653cc3a859d4e1eab20b21fd1a01b2a0f1d6b193c21a24e0e49ab9fa8eb8e00807d2d7ce874327d7fccf4724fca43114b7
-EBUILD kodi-20.3-r1.ebuild 12413 BLAKE2B 0e18e2c0bb31332cae6d24f96d4cf97c7e94e822304538d9a377b757ad3a976b57d0c7a373bc96a1dbbb58f3d988b2f2a8c42dabde7f27b1d51eea8f822a506b SHA512 52a30929d8cc833cc378abca2a4b370b22e074277e8e8aa7f5803ca80e3398eac166f42f85346a312630045a0bd434f43bec69496c7dea287edfd2ca9cac3758
 EBUILD kodi-20.5-r1.ebuild 12413 BLAKE2B 0e18e2c0bb31332cae6d24f96d4cf97c7e94e822304538d9a377b757ad3a976b57d0c7a373bc96a1dbbb58f3d988b2f2a8c42dabde7f27b1d51eea8f822a506b SHA512 52a30929d8cc833cc378abca2a4b370b22e074277e8e8aa7f5803ca80e3398eac166f42f85346a312630045a0bd434f43bec69496c7dea287edfd2ca9cac3758
 EBUILD kodi-21.0-r1.ebuild 13663 BLAKE2B ad00b5aa92c669d534aca6fef5008fbdd60875d1698d751d236f05237565ced7a37b717ea7979f67398476e76033d3817f20ce16bf3be9ed223abc014a791a30 SHA512 0810e05a7808e5d0f369c94662e3894a340ab1528f2d93475f1bf19080c7c410b58ab6a03ef3f857a540db674d6feb9f3f98f10c331c0a825bc8701a937687ba
+EBUILD kodi-21.0-r2.ebuild 13710 BLAKE2B e8864f27a607504257fab3fdc55757ebf39bae55830a633263e60a67d8835be5479b77da09cb1d60f36212db4e2a524dac2af196c76045d52127517627b56c0a SHA512 a89ef2de81b4e19b0e6bdf5738bc9952f38b70e05ae1161add82ecb001643e27fea1134c92a4e4b724f8c0870f8e8475c65523a57d2a6c8071e9e38115a4882a
 EBUILD kodi-21.9999.ebuild 13611 BLAKE2B f35bf1aaf54db47f122de7b1ea651e6ff36ccfc0401f3998d3548e08e4d09f4be6930771c30b09f044fa1d03c64464311ee8190c38c79416b80026187f06c387 SHA512 df1d31caf1657158e1ae38d622c9992b09489e53f14f4d445bf3625247ade3e696c5b5acdcf1aeedd27d32e58747000b3529f33cb3f05c3fa38c012c1ee6dece
 EBUILD kodi-9999.ebuild 13055 BLAKE2B 3e35b71bfc005b87a766ff3c025a9563e14649e073222d8dedce9c1b4e48034c24f0cbf8ac1989e8a7d60a3aa09e6452bf2497502830b46068350af0f79a450a SHA512 569757489bf42acfcbfe6ec89317cf40a8dae7041aa5311529ef4f3f5dec677f721d92390f73d57e3382d9b4895450eb641c665abf94940b76bd7fe09f0c9555
 MISC metadata.xml 2908 BLAKE2B 4b085bc5826f080224eadb489137f02741114afa1e424e5e61aa0cbe925a9f4fa9676ca45166d040f569ae99e94aa083533c5d3f0c9271c92286087cdb9f0dae SHA512 cf59967cf1631b3588fae307084ac7c48f03f1dffc5909ddafa9f6b126202391df0553d924a72a75e24302adc27e0f18d9c919084c7803d7dda15009d3731936
diff --git a/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch
new file mode 100644
index 000000000000..febcdc2197e4
--- /dev/null
+++ b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/933370
+https://github.com/xbmc/xbmc/issues/24955
+https://github.com/xbmc/xbmc/pull/24968
+
+From e8493d3ac390bac4ca74fa5435bb258d6764dae5 Mon Sep 17 00:00:00 2001
+From: Jose Luis Marti <joseluis.marti@gmail.com>
+Date: Tue, 9 Apr 2024 23:06:10 +0200
+Subject: [PATCH] [DllLoader] Remove fstatvfs64 wrapper
+
+Co-authored-by: fuzzard <fuzzard@users.noreply.github.com>
+--- a/xbmc/cores/DllLoader/exports/wrapper.c
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -36,7 +36,6 @@ typedef fpos_t    fpos64_t;
+ #endif
+ 
+ struct mntent;
+-struct statvfs64;
+ 
+ void* dllmalloc(size_t );
+ void* dllcalloc( size_t , size_t );
+@@ -92,7 +91,6 @@ int dll_ftrylockfile(FILE *file);
+ void dll_funlockfile(FILE *file);
+ int dll_fstat64(int fd, struct stat64 *buf);
+ int dll_fstat(int fd, struct _stat *buf);
+-int dll_fstatvfs64(int fildes, struct statvfs64 *buf);
+ FILE* dll_popen(const char *command, const char *mode);
+ void* dll_dlopen(const char *filename, int flag);
+ int dll_setvbuf(FILE *stream, char *buf, int type, size_t size);
+@@ -445,11 +443,6 @@ int __wrap_fstat64(int fd, struct stat64* buf)
+   return dll_fstat64(fd, buf);
+ }
+ 
+-int __wrap_fstatvfs64(int fd, struct statvfs64* buf)
+-{
+-  return dll_fstatvfs64(fd, buf);
+-}
+-
+ int __wrap_setvbuf(FILE *stream, char *buf, int type, size_t size)
+ {
+    return dll_setvbuf(stream, buf, type, size);
+--- a/xbmc/cores/DllLoader/exports/wrapper_mach_alias
++++ b/xbmc/cores/DllLoader/exports/wrapper_mach_alias
+@@ -20,7 +20,6 @@ ___wrap_fread _fread
+ ___wrap_freopen _freopen
+ ___wrap_fseek _fseek
+ ___wrap_fsetpos _fsetpos
+-___wrap_fstatvfs64 _fstatvfs64
+ ___wrap_ftell _ftell
+ ___wrap_ftrylockfile _ftrylockfile
+ ___wrap_funlockfile _funlockfile
diff --git a/media-tv/kodi/kodi-20.3-r1.ebuild b/media-tv/kodi/kodi-21.0-r2.ebuild
index a518af43864c..f975ad26a22a 100644
--- a/media-tv/kodi/kodi-20.3-r1.ebuild
+++ b/media-tv/kodi/kodi-21.0-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-# FFmpeg can be unbundled, but is currently stuck at a very old version.
+CODENAME="Omega"
+
 # libdvd{css,read,nav} are not unbundlable without patching the buildsystem.
 
 # Versions for the forked projects that are bundled
@@ -11,9 +12,12 @@ EAPI=8
 LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2"
 LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2"
 LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2"
-FFMPEG_VERSION="4.4.1"
-CODENAME="Nexus"
-FFMPEG_KODI_VERSION="Alpha1"
+FFMPEG_VERSION="6.0.1"
+
+# Java bundles from xbmc/interfaces/swig/CMakeLists.txt
+GROOVY_VERSION="4.0.16"
+APACHE_COMMON_LANG_VERSION="3.14.0"
+APACHE_COMMON_TEXT_VERSION="1.11.0"
 
 # Doesn't build with jdk-21
 _JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} )
@@ -23,11 +27,12 @@ JAVA_PKG_WANT_SOURCE="17"
 JAVA_PKG_WANT_TARGET="17"
 
 PYTHON_REQ_USE="sqlite,ssl"
-PYTHON_COMPAT=( python3_{10..11} ) # python3.12 support added in 21
+PYTHON_COMPAT=( python3_{10..12} )
 
 CPU_FLAGS="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"
 
-inherit cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 xdg
+inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \
+	toolchain-funcs xdg
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/"
@@ -37,13 +42,15 @@ SRC_URI="
 		-> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz
 		-> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-${GROOVY_VERSION}.zip
+	https://mirrors.kodi.tv/build-deps/sources/commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+	https://mirrors.kodi.tv/build-deps/sources/commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
 	css? (
 		https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz
 			-> libdvdcss-${LIBDVDCSS_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://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz
 	)
 "
 if [[ ${PV} == *9999 ]] ; then
@@ -56,11 +63,11 @@ 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/_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 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
 
@@ -69,13 +76,14 @@ 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 doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	^^ ( gbm wayland X )
 	?? ( mariadb mysql )
 	bluray? ( udf )
 	gbm? ( udev )
+	soc? ( system-ffmpeg )
 	udev? ( !libusb )
 	vdpau? ( X !gles !gbm )
 	zeroconf? ( dbus )
@@ -84,7 +92,7 @@ RESTRICT="!test? ( test )"
 
 # dev-libs/libcec[-cubox] bug #818262
 COMMON_DEPEND="
-	>=dev-libs/flatbuffers-1.12.0:=
+	>=dev-libs/flatbuffers-23.3.3:=
 	>=dev-libs/lzo-2.04:2
 	media-libs/giflib:=
 	>=media-libs/libjpeg-turbo-2.0.4:=
@@ -106,13 +114,15 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/openssl-1.1.1k:0=
 	>=dev-libs/spdlog-1.5.0:=
 	dev-libs/tinyxml[stl]
+	dev-libs/tinyxml2:=
 	media-fonts/roboto
 	media-libs/libglvnd[X?]
 	>=media-libs/freetype-2.10.1
 	media-libs/harfbuzz:=
-	>=media-libs/libass-0.13.4:=
+	>=media-libs/libass-0.15.0:=
 	media-libs/mesa[egl(+),gbm(+)?,wayland?,X?]
 	>=media-libs/taglib-1.9.0
+	=media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
 	sci-libs/kissfft
 	virtual/libiconv
 	virtual/ttf-fonts
@@ -145,14 +155,13 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	)
 	gbm? (
 		>=dev-libs/libinput-1.10.5:=
+		media-libs/libdisplay-info
 		x11-libs/libxkbcommon
 	)
 	gles? (
-		!raspberry-pi? (
-			|| (
-				>=media-libs/mesa-24.1.0_rc1[opengl]
-				<media-libs/mesa-24.1.0_rc1[gles2]
-			)
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[gles2]
 		)
 	)
 	!gles? (
@@ -177,30 +186,14 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		>=net-fs/libnfs-2.0.0:=
 	)
 	pipewire? (
-		>=media-video/pipewire-0.3.24:=
+		>=media-video/pipewire-0.3.50:=
 	)
 	pulseaudio? (
 		media-libs/libpulse
 	)
-	raspberry-pi? (
-		|| (
-			media-libs/raspberrypi-userland
-			media-libs/raspberrypi-userland-bin
-			>=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
-			<media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
-		)
-	)
 	samba? (
 		>=net-fs/samba-3.4.6[smbclient(+)]
 	)
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc,vaapi?,vdpau?,X?]
-		=media-video/ffmpeg-4*[openssl]
-	)
-	!system-ffmpeg? (
-		app-arch/bzip2
-		media-libs/dav1d:=
-	)
 	udf? (
 		>=dev-libs/libudfread-1.0.0
 	)
@@ -220,7 +213,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		>=x11-libs/libxkbcommon-0.4.1[wayland]
 	)
 	webserver? (
-		>=net-libs/libmicrohttpd-0.9.55:=[messages(+)]
+		>=net-libs/libmicrohttpd-0.9.77:=[messages(+)]
 	)
 	X? (
 		x11-libs/libX11
@@ -242,7 +235,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	${COMMON_TARGET_DEPEND}
-	dev-libs/rapidjson
+	>=dev-libs/rapidjson-1.0.2
 	test? (
 		>=dev-cpp/gtest-1.10.0
 	)
@@ -254,11 +247,11 @@ DEPEND="
 		x11-libs/libXrender
 	)
 "
-# <dev-lang/swig-4.2.0 https://github.com/xbmc/xbmc/issues/24385
 BDEPEND="
 	${COMMON_DEPEND}
+	app-arch/unzip
 	dev-build/cmake
-	<dev-lang/swig-4.2.0
+	dev-lang/swig
 	virtual/pkgconfig
 	<=virtual/jre-17:*
 	doc? (
@@ -266,6 +259,11 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/kodi-21-fix-gcc14.patch
+	"${FILESDIR}"/kodi-21-fix-dvd-playing.patch
+)
+
 # bug #544020
 CONFIG_CHECK="~IP_MULTICAST"
 ERROR_IP_MULTICAST="
@@ -273,11 +271,6 @@ In some cases Kodi needs to access multicast addresses.
 Please consider enabling IP_MULTICAST under Networking options.
 "
 
-PATCHES=(
-	"${FILESDIR}"/kodi-20.2-binutils-2.41.patch
-	"${FILESDIR}"/kodi-20.3-gcc-14.patch
-)
-
 pkg_setup() {
 	check_extra_config
 	java-pkg-2_pkg_setup
@@ -290,6 +283,10 @@ src_unpack() {
 	else
 		unpack ${MY_P}.tar.gz
 	fi
+
+	unpack apache-groovy-binary-${GROOVY_VERSION}.zip
+	unpack commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+	unpack commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
 }
 
 src_prepare() {
@@ -306,6 +303,23 @@ src_prepare() {
 			-e "s/\(find_library(KISSFFT_LIBRARY NAMES .*\)/\1 kissfft-${datatype} kissfft-${datatype}-openmp/" \
 			cmake/modules/FindKissFFT.cmake || die
 	done
+
+	if tc-is-cross-compiler; then
+		# These tools are automatically built with CMake during a native build
+		# but need to be built in advance using Autotools for a cross build.
+		NATIVE_TOOLS=(
+			TexturePacker
+			JsonSchemaBuilder
+		)
+
+		local t
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			pushd "${S}/tools/depends/native/$t/src" >/dev/null || die
+			AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+			popd >/dev/null || die
+		done
+		elibtoolize
+	fi
 }
 
 src_configure() {
@@ -368,6 +382,8 @@ src_configure() {
 		-DENABLE_VDPAU=$(usex vdpau)
 		-DENABLE_XSLT=$(usex xslt)
 
+		-DWITH_FFMPEG=$(usex system-ffmpeg)
+
 		#To bundle or not
 		-DENABLE_INTERNAL_CROSSGUID=OFF
 		-DENABLE_INTERNAL_DAV1D=OFF
@@ -383,18 +399,21 @@ src_configure() {
 		-DENABLE_INTERNAL_TAGLIB=OFF
 		-DENABLE_INTERNAL_UDFREAD=OFF
 
-		-DWITH_FFMPEG=$(usex system-ffmpeg)
-
+		-DTARBALL_DIR="${DISTDIR}"
 		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
 		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dgroovy_SOURCE_DIR="${WORKDIR}/groovy-${GROOVY_VERSION}"
+		-Dapache-commons-lang_SOURCE_DIR="${WORKDIR}/commons-lang3-${APACHE_COMMON_LANG_VERSION}"
+		-Dapache-commons-text_SOURCE_DIR="${WORKDIR}/commons-text-${APACHE_COMMON_TEXT_VERSION}"
 	)
 
 	# Separated to avoid "Manually-specified variables were not used by the project:"
+	use cec && mycmakeargs+=( -DENABLE_INTERNAL_CEC=OFF )
 	use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" )
+	use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
 	use !system-ffmpeg && mycmakeargs+=(
-		-DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz"
+		-DFFMPEG_URL="${DISTDIR}/ffmpeg-${FFMPEG_VERSION}.tar.gz"
 	)
-	use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
 	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
 	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
 
@@ -413,10 +432,26 @@ src_configure() {
 	# https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e
 	filter-lto
 
+	if tc-is-cross-compiler; then
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			pushd "${S}/tools/depends/native/$t/src" >/dev/null || die
+			econf_build
+			install -m0755 /dev/null "$t" || die # Actually build later.
+			mycmakeargs+=( -DWITH_${t^^}="${PWD}/$t" )
+			popd >/dev/null || die
+		done
+	fi
+
 	cmake_src_configure
 }
 
 src_compile() {
+	if tc-is-cross-compiler; then
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			emake -C "${S}/tools/depends/native/$t/src"
+		done
+	fi
+
 	cmake_src_compile all
 	use doc && cmake_build doc
 	use test && cmake_build kodi-test
@@ -434,6 +469,8 @@ src_test() {
 		# bug #779184
 		# https://github.com/xbmc/xbmc/issues/18594
 		$(usev x86 TestDateTime.SetFromDBTime)
+		# Tries to ping localhost, naturally breaking network-sandbox
+		TestNetwork.PingHost
 	)
 
 	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 0c07fed545da..d8ab890d4c8b 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,18 +1,11 @@
 AUX tvheadend-4.0.9-use_system_queue.patch 296 BLAKE2B 0986117969d9bb3463123e984aba7a73c8caf89b16f0c10e870a9b49857f8c946958a31900d99c5d332f5635cbd49ae544c2cc97f1e8a211c352bcaba965fe76 SHA512 56180b9c2fbb092530963229213805ec63e3d941c67d967e38b46f778db85db981234fe5727b5a8dcf64ab3a9e24c9d10b681abf275249e0d6f0ad63e391ecc4
-AUX tvheadend-4.2.1-hdhomerun.patch 1045 BLAKE2B cad3922efbdd20c457c9570ecc75a786a997cafbe698226e31e4175394c38b79071ed7a165194ddc31e318ed015a0253dfb1f978695db35721749077154534f4 SHA512 416af870e5070001fbd0e09ec8c14160ff7c54b716564f708c6a983ca529cdf5963678c05551ad676a23c3347b4932bd7ae65e8eeea47a5f9f3955b46292c3f9
 AUX tvheadend-4.2.2-dtv_scan_tables.patch 463 BLAKE2B 4e52d89d75c05d8a3cc645280794dd4570953bb5452d1067442177d7eb4c85779a8bcb96f1f8d3fbbcb6a34e770ff014bb262103eae5a92556ac4586038cdd9e SHA512 9bdecbac57ee1f30be91f9145e32f89949b5631090edc85cd5383915b09949ec9211f62474bd06afb4600e431093ce2ee5550d204b08c64b5b2e1a1cd38a517d
 AUX tvheadend-4.2.7-python3.patch 2952 BLAKE2B c6eee8aea74abd9a6eaacd3206a4b0191a45ce63e9e18bb213f1f6c85702a3836c44c55dd7131df4d739fb1f689c8bd97e24f4924e113649b7b0c9d349d471c7 SHA512 f031a06e5d4db4ea265a3e99bb07bee983ab40e5b028d9e69457971090e538b2057d49258cadda75db7816c2e4e9609819e59ab8a30d3ce848444774bfa1a02f
-AUX tvheadend-4.2.8-fno-common.patch 1771 BLAKE2B a9c52afedc3c145fdd3bb3b67abf6890228b3083c56ba29abd86288fbf6b71d2960e6b4ed7aec383830f45db1cd637e8ef6124aa305166e301c49f52b3e65cbf SHA512 c2378d2f76dea88f2e987d9c62ca67f40cefd467c050dc30ab5d7127bc530642e78ccca9f36371373f2bd2101e451148310db41770e932f592484a119cae16fb
-AUX tvheadend-4.2.8-gcc9.patch 1772 BLAKE2B dc0033d7f61b8099d3f352cf8f05ff9073f3d6196c10ecac97c1cb1e7af7e01712478b2ef78b991336127ffbfcc9faf49b30b92f9af5e3c500783bc580a8908a SHA512 9b9d74a7d88187dd7895302b3c6142a14a136823fda5840fa464a5d3f3f97c8b59d4f839d10da14bd13bb6b346b75cac07069dab8ae626f68bc3000a70484834
-AUX tvheadend-4.2.8-hdhomerun.patch 1067 BLAKE2B bbbac3dfc8e533770d096bf726c40429358307d5134186693fca5bb69ea7a291afc0f2aa24fb2744d330e72bdfb78ec44ed96f2f2c9a625d9ac63ed2bc913a5c SHA512 118d9086f52c727dd64c0a10471857b12f8c0798887bcd712383823ffcaa0a12a3b487b7941871f8120bc00672608eca596d6ca09cfd47abb9684deef4611faa
-AUX tvheadend-4.2.8-no-dvb-fix.patch 817 BLAKE2B d07b38662175f64c29c166c16aa0fc76240aa86d325a1b715dee3de4733287a615566d9cb53fce9da37cc69ff66992eb228c45e8b7dce77cc125a8dfc303ece8 SHA512 37fe828b3a878913468bd06e115dfd9eec29df840455872019414187bb4a904c50d2476fc0508c465a92029f28068a6e6da54d9089ca2c5957f34a94835dc04a
 AUX tvheadend-4.3-hdhomerun.patch 1435 BLAKE2B 3250c5d1ce2a757a2fdee646cb64136661e171c5ae5b30199560e2e74fbfbfefb6d8284e5c2cb92d179751f5fa814148240e08e132761d4d3e2b66844ccd53b9 SHA512 a013ecb61cf05ff5d976f88be58a4ba5471034ab02d34778a8c472746355f2630a88b90951ba98513c787e616119183087d7560be6a9c89c5ea9c26285fe2d5d
 AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060e102b801337fd5a1e3f1376f4e5de59a8da0ae5bfb9a2335c1205504d28a3582ac6f7c095b0623d0 SHA512 11448507059ed12bef972dfd898771ab2a63078927e55a356b44be04c738e461535ba2a621a9aba4b621cb316dfd66e74b3c25c22c45ccf73a28f6dd0ad3cb23
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 573 BLAKE2B e99853082623ca0522bf83aec4be33f2cdc62ba3e3e09bd22246f93c93d5342180be409ba9ad8f862830aca68ca0dbfafd3da0ecb9033e43d6a7e50a523c0bd8 SHA512 8f8e8f9feed45c20919bca402ef9179208a305cd7b06b47dfbbc368fc85d739c3dca2b53e6964bff10f8581cc4c8091660ac2be3b975d80941dc7a16cbb3fb49
-DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
 DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0 SHA512 068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da
-EBUILD tvheadend-4.2.8-r2.ebuild 3611 BLAKE2B 80411facff811cbff41124e5a68cdb80f6a5b4e4ad44e182bcb9358ef7ced1bfb25dface222d16599f4b401c90a65adb0b9e7e7538b0fb7e5be2fd906a0088b6 SHA512 37932ec32c4cc7dda757c13246954e60a1d9ebf33f401f7ac54e580db753f8aff19ab89ffbd45469a050bd654bbdfd24845e8fbcbafcff22b7bd86bf9b6cc31c
 EBUILD tvheadend-4.3_p20240322.ebuild 4417 BLAKE2B a59ffe6dbf89d7be88d156102e973d10344194ffffd8e6f5e71b6600a0bf55e440242975148b433cbcf68f8a5c485d32f31dcc45d463d4e74a615235d9a8cd7a SHA512 63e00ec5ce6bac7b8c9492dc25947a234c6416387b7dcbefc636a1d7224beaaf3bc253ba90b6bd385c4be455015f806e68822cd68bb3a2d9d830ad43bfaab22c
 EBUILD tvheadend-9999.ebuild 4273 BLAKE2B df25cdcc7f9bebcb423711cebac099e355d514ca2816ad99f358e5f18efd8e450f68f66bb1541dfa257c83eb6d482899e5dc6eb2f247d44cd549cec3f0002847 SHA512 32496bc56999d7ba908e6b3b1aa175365a18f4cacd331a8e4e7eecd82d66681615ccd24928ec7b45ac936e593803188af88030dc6c9e2f57d91a42e7586e8c43
-MISC metadata.xml 1446 BLAKE2B 622295d497db162d2a214c94187f0e15a9c23b8cc7d484255618f2bb3d10c5de9ecd9aaacbceeb05c27e5d53ffa2338fcd2678cdfdc386104033c1c57aa51c96 SHA512 5e34e61e7ecec9a997ece8b50f6a45f1158e203df0759e08e8d3735a4973baa795a556f9bcac1aaf8069cd25974655adc3f393c0f1670cf6e6a3762903d84759
+MISC metadata.xml 1168 BLAKE2B dc42b9e7a3cc221a875b758f838fe3e4aac5fe6af865459b3e866e735905f8a3245496019d5924bc5cc6ee77410a03e0977dd425141c66ca52fcb8d83d410d99 SHA512 242b625a50dcadc5d6af611cdabce021cf09e3e13f626930532e725f9cac8d80bfeed87f0dd6e420c9c9a5c0ac521508440ec85f649581e5cb214b6cfc11c935
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
deleted file mode 100644
index 64f6f691b976..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./configure.orig ./configure
---- ./configure.orig	2017-04-21 10:32:22.000000000 +0200
-+++ ./configure	2017-04-23 13:31:08.717237211 +0200
-@@ -357,7 +357,7 @@ if enabled hdhomerun_static; then
- else
- 
-   if enabled_or_auto hdhomerun_client; then
--    if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
-+    if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then
-       enable  hdhomerun_client
-       LDFLAGS="$LDFLAGS -lhdhomerun"
-     fi
-diff -up ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
---- ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig	2017-04-21 10:32:22.000000000 +0200
-+++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h	2017-04-23 13:31:08.717237211 +0200
-@@ -24,7 +24,7 @@
- #include "htsbuf.h"
- #include "tvhdhomerun.h"
- 
--#include "libhdhomerun/hdhomerun.h"
-+#include <hdhomerun/hdhomerun.h>
- 
- typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
- typedef struct tvhdhomerun_device      tvhdhomerun_device_t;
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
deleted file mode 100644
index 23f48652f9de..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 15 May 2020 17:45:30 +0100
-Subject: [PATCH] Fix building with -fno-common (default from GCC 10)
-
----
- src/input.h        | 4 ++--
- src/input/mpegts.c | 2 ++
- src/input/mpegts.h | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/input.h b/src/input.h
-index a9c96df04..3dce355c6 100644
---- a/src/input.h
-+++ b/src/input.h
-@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th );
- extern const idclass_t tvh_input_class;
- extern const idclass_t tvh_input_instance_class;
- 
--tvh_input_list_t    tvh_inputs;
--tvh_hardware_list_t tvh_hardware;
-+extern tvh_input_list_t    tvh_inputs;
-+extern tvh_hardware_list_t tvh_hardware;
- 
- #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link)
- #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link)
-diff --git a/src/input/mpegts.c b/src/input/mpegts.c
-index e02d491f1..fca4f3429 100644
---- a/src/input/mpegts.c
-+++ b/src/input/mpegts.c
-@@ -20,6 +20,8 @@
- #include "mpegts/fastscan.h"
- #include "memoryinfo.h"
- 
-+struct mpegts_listeners mpegts_listeners;
-+
- extern memoryinfo_t mpegts_input_queue_memoryinfo;
- extern memoryinfo_t mpegts_input_table_memoryinfo;
- 
-diff --git a/src/input/mpegts.h b/src/input/mpegts.h
-index 9dda3baca..9c4c57b73 100644
---- a/src/input/mpegts.h
-+++ b/src/input/mpegts.h
-@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener
-   void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
- } mpegts_listener_t;
- 
--LIST_HEAD(,mpegts_listener) mpegts_listeners;
-+extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners;
- 
- #define mpegts_add_listener(ml)\
-   LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)
--- 
-2.26.2
-
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
deleted file mode 100644
index 9ccadb44c42c..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
---- ./src/plumbing/transcoding.c.orig	2019-01-12 09:58:47.000000000 +0100
-+++ ./src/plumbing/transcoding.c	2019-03-12 15:49:24.922314869 +0100
-@@ -1804,7 +1804,7 @@ transcoder_init_video(transcoder_t *t, s
-   char *str, *token, *saveptr, codec_list[sizeof(tp->tp_src_vcodec)];
-   int codec_match=0;
- 
--  strncpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
-+  memcpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
- 
-   tvhtrace(LS_TRANSCODE, "src_vcodec=\"%s\" ssc_type=%d (%s)\n",
- 		  tp->tp_src_vcodec,
-@@ -2130,10 +2130,10 @@ transcoder_set_properties(streaming_targ
-   transcoder_t *t = (transcoder_t *)st;
-   transcoder_props_t *tp = &t->t_props;
- 
--  strncpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1);
--  strncpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1);
--  strncpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1);
--  strncpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1);
-+  memcpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1);
-+  memcpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1);
-+  memcpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1);
-+  memcpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1);
-   tp->tp_channels   = props->tp_channels;
-   tp->tp_vbitrate   = props->tp_vbitrate;
-   tp->tp_abitrate   = props->tp_abitrate;
-@@ -2141,7 +2141,7 @@ transcoder_set_properties(streaming_targ
- 
-   memcpy(tp->tp_language, props->tp_language, 4);
- 
--  strncpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
-+  memcpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
- }
- 
- 
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
deleted file mode 100644
index c30af8aba2a1..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13cd23c371e3377973502f8dc65654b6a0ff372b Mon Sep 17 00:00:00 2001
-From: Michael Marley <michael@michaelmarley.com>
-Date: Wed, 26 Jun 2019 19:35:50 -0400
-Subject: [PATCH] Fix compilation with libhdhomerun 20190621
-
-They renamed the symbol that was used to determine whether the
-"hdhomerun_discover_find_devices_custom" needed to be aliased,
-causing an FTBFS.  Instead, recognize both the old and new symbols.
----
- src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-index 58dec51ab..18068faf5 100644
---- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-@@ -32,7 +32,8 @@
- 
- #include "config.h"
- 
--#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN
-+#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \
-+           || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED)
- #define hdhomerun_discover_find_devices_custom \
-            hdhomerun_discover_find_devices_custom_v2
- #endif
--- 
-2.23.0
-
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
deleted file mode 100644
index b398064292e5..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 27ec1008df054072fac6b58ffb8d820423522442 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 10 May 2020 23:02:14 +0100
-Subject: [PATCH] dvbpsi: Fix build when DVB is not enabled at all
-
----
- src/input/mpegts/dvb_psi.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
-index 15203d98c..96b1689fb 100644
---- a/src/input/mpegts/dvb_psi.c
-+++ b/src/input/mpegts/dvb_psi.c
-@@ -2331,9 +2331,11 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm,
-     psi_tables_atsc_t(mm);
-     break;
-   case DVB_SYS_DVBC_ANNEX_B:
-+#if ENABLE_MPEGTS_DVB
-     if (idnode_is_instance(&mm->mm_id, &dvb_mux_dvbc_class))
-       psi_tables_dvb(mm);
-     else
-+#endif
-       psi_tables_atsc_c(mm);
-     break;
-   case DVB_SYS_NONE:
--- 
-2.26.2
-
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 7dfa9e2d079e..8c2259f17cf7 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -6,12 +6,8 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<use>
-		<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
-		<flag name="constcw">Enable support for the constcw protocol</flag>
-		<flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
 		<flag name="ddci">Enable support for DDCI hardware</flag>
 		<flag name="dvbcsa">Enable decryption of the DVB Common Scrambling Algorithm</flag>
-		<flag name="dvben50221">Enable support for hardware CAM</flag>
 		<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
 		<flag name="imagecache">Enable support for image caching</flag>
 		<flag name="iptv">Enable support for Internet Protocol TV</flag>
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
deleted file mode 100644
index 11b918469163..000000000000
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# <ffmpeg-5 dep for bug #834399, https://github.com/tvheadend/tvheadend/pull/1460
-RDEPEND="
-	acct-user/tvheadend
-	virtual/libiconv
-	dbus? ( sys-apps/dbus )
-	dvbcsa? ( media-libs/libdvbcsa )
-	dvben50221? ( media-tv/linuxtv-dvb-apps )
-	ffmpeg? ( <media-video/ffmpeg-5:= )
-	hdhomerun? ( media-libs/libhdhomerun )
-	dev-libs/openssl:0=
-	uriparser? ( dev-libs/uriparser )
-	zeroconf? ( net-dns/avahi )
-	zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
-	${RDEPEND}
-	dvb? ( sys-kernel/linux-headers )
-"
-
-RDEPEND+="
-	dvb? ( media-tv/dtv-scan-tables )
-	xmltv? ( media-tv/xmltv )
-"
-
-REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
-
-# Some patches from:
-# https://github.com/rpmfusion/tvheadend
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
-	"${FILESDIR}"/${PN}-4.2.{1,8}-hdhomerun.patch
-	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
-	"${FILESDIR}"/${PN}-4.2.7-python3.patch
-	"${FILESDIR}"/${PN}-4.2.8-gcc9.patch
-	"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
-	"${FILESDIR}"/${PN}-4.2.8-fno-common.patch
-)
-
-DOCS=( README.md )
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	use inotify &&
-		CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-}
-
-src_configure() {
-	CC="$(tc-getCC)" \
-	PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-	econf \
-		--disable-bundle \
-		--disable-ccache \
-		--disable-dvbscan \
-		--disable-ffmpeg_static \
-		--disable-hdhomerun_static \
-		--nowerror \
-		$(use_enable capmt) \
-		$(use_enable constcw) \
-		$(use_enable cwc) \
-		$(use_enable dbus dbus_1) \
-		$(use_enable debug trace) \
-		$(use_enable dvb linuxdvb) \
-		$(use_enable dvbcsa) \
-		$(use_enable dvben50221) \
-		$(use_enable ffmpeg libav) \
-		$(use_enable hdhomerun hdhomerun_client) \
-		$(use_enable imagecache) \
-		$(use_enable inotify) \
-		$(use_enable iptv) \
-		$(use_enable satip satip_server) \
-		$(use_enable satip satip_client) \
-		$(use_enable systemd libsystemd_daemon) \
-		$(use_enable timeshift) \
-		$(use_enable uriparser) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable zlib)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/tvheadend.initd tvheadend
-	newconfd "${FILESDIR}"/tvheadend.confd tvheadend
-
-	use systemd &&
-		systemd_dounit "${FILESDIR}"/tvheadend.service
-}
-
-pkg_postinst() {
-	elog "The Tvheadend web interface can be reached at:"
-	elog "http://localhost:9981/"
-	elog
-	elog "Make sure that you change the default username"
-	elog "and password via the Configuration / Access control"
-	elog "tab in the web interface."
-
-	. "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
-
-	if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
-		echo
-		ewarn "The HOME directory for the tvheadend user has changed from"
-		ewarn "${EPREFIX}/etc/tvheadend to ${EPREFIX}/var/lib/tvheadend. The daemon will continue"
-		ewarn "to use the old location until you update TVHEADEND_CONFIG in"
-		ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move your existing files"
-		ewarn "before you do so."
-	fi
-}