gentoo auto-resync : 02:10:2024 - 01:26:10

7 files changed, 1 insertions, 1133 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index ee72dbc4decf..29e925ca867b 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 4618dd8c047a..ca0f5c4706e7 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,5 +1,3 @@
-AUX kodi-21-fix-dvd-playing.patch 1706 BLAKE2B d74af009e12eeb00d9402e58620c41c4da842830713fd0f9319d1e884e089a27432eccfc08d583a5d1eaa8fa9bcf4b00ea495e76f93b159a790ef1af3016d7e3 SHA512 b2badfe1fb5ffee0b2119670d205e0ba49005791be879f8d946c018e8f6af58174c1ffc0e85b89914c7858373b03ee5a3703f47af9d5aca11015aa701d149c16
-AUX kodi-21-fix-gcc14.patch 1374 BLAKE2B 5438405a2862328e1207787fad0d153bbfd7f94c5287e825bf0ef7e6a20cbc51185b626f8aba61b0747fb672418fdf5f44e715295a983107ca2ef018e1ad19e3 SHA512 60df712f47b0abc3b7a7247425b4ce4f273bfbadf8b4147883aa3e2432c02724d03c644785748bc3ac6bdf7fb19744ffea40c551420a02865dd83bfdac19f585
 AUX kodi-21-optional-ffmpeg-libx11.patch 549 BLAKE2B d828232075cf76a0655ec9f04106d98d503c9028138b7ab65db7ccd0cfbd4c50ee0629d3ab9a5d3c39f5209e0843a905178fdc28d2b6a2e5a56ec10760ab618b SHA512 c867311fa8bc13161d614e60c8510ec3a382438c92e98b5c755d6f4491472ad2aaf37adc6538f5494c90d8a20178901c5976028507e9c3a13644bdd783c2137a
 AUX kodi-21.1-fix-gcc15.patch 2463 BLAKE2B 769d4830d13ad0fa0eb5d7ebfe03d44d5e5c8642f5ef484534551ad970a980aaf7f8413b2b98ebcfd4fa2fb3a08b0d3099a16f044908791ae057ec3e639294e1 SHA512 88fa94678bd81c7182c6890fd314916fbd52ca8374994b41ac2b5b512556d0b9df38eb390ed238b396a496582c0b47c1efc5fbd6e9e26508c7e9c5a9f13c3689
 AUX kodi-21.1-silence-libdvdread-git.patch 1107 BLAKE2B 395d4677a5856fcfe22fd7e86828b989abccbf869ca2dc5d844efea895b3a4c0ea9633cc0f049d78ac215967aa52b871b79fc0fd3e2a78a0595e9b4156e3d845 SHA512 5b7679e5057fb56ab1af7a774251ec8ae3baa8622c809e77cb3495f5a421396c900a544d35df3d203e43426dd1b217a5a134505fc081423853d4b1764b788a0a
@@ -7,14 +5,11 @@ DIST apache-groovy-binary-4.0.16.zip 29793704 BLAKE2B 30f77c6400c85821cf78f6ba10
 DIST commons-lang3-3.14.0-bin.tar.gz 9442785 BLAKE2B 2ecdd06f97ac2688220055a08f67da9b859bed3ab00ff41800d5d9a1cebda599db2e816425c10c265dd6827a0ef79fc3dd094a8b3c9b9ae4ceae8f5750a59cf2 SHA512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc
 DIST commons-text-1.11.0-bin.tar.gz 3018564 BLAKE2B c32e41c6b8c90dea876caf4c2cedc9358d5e49506bfee7aee42ac6b92dbe8505d5e5d81c860a739bb06214b832cc29e91ddb95f3cfc24515c970302a519a5e43 SHA512 2e94877000dd270b69e2e8cbf49f258a90b4c628b6b6b0814e300a2f0e9c391f0816dceb0707e596ae3b7c9532f93e7a4917df47c77f44b3a810e14042ce5f3f
 DIST ffmpeg-6.0.1.tar.gz 15437409 BLAKE2B 6424e30c6d354abbbea8a807822ae61589413189e9c4ba7aa51c307179287506b9072626e9745861fe83753c0015b50d179f9b4f298fe9abf74bee13936639af SHA512 945e34840092dc0fd3824eb1af2be79868af2afb4fe13159b19a9bcfc464cc4d53243c13ff065199290e9393ddbf4b1c5c8abccf83a31a31d6c7490e499fd1fc
-DIST kodi-21.0-Omega.tar.gz 40987733 BLAKE2B 33adaf588b3362dc9d184bfb66c36ad5fa2e442255da47db4813f926e73f5a607dd7de809ecf8a4982f985bc8dac53cba17fb9db6a009bb0cdb6284db3b1edb4 SHA512 9c2ca6b6e72197d2b1c26a47cf4ddc209318fcaa5a30ea20475ecc5518c7d1395c2e9cf3e3a75a13334b0505e7b417acdb0d76a20567a0c86841b3e69232625b
 DIST kodi-21.1-Omega.tar.gz 41091890 BLAKE2B e711ef9b958ff3f8e006913ea6c42092164eeaae7011c2307f6d9846509e58db101a19dd51f4e95000de2f30ca2e77fd196187223d0ced7adad233d3ab57e286 SHA512 8458447c2a6d7ce0fdcfc7ec9b4ff1f8be0abf18a16804d245c3cef99408fcfb4b13aa18fca16c87e560316c97d281e214cf37fd7e17e243c1206c5575195dc8
 DIST libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz 102124 BLAKE2B 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c SHA512 d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2ed90d9accba2c11dbbf93b61ad00f69a40812ebf4eabcdda
 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c SHA512 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e
-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.1.ebuild 14313 BLAKE2B 0595a24ed49e32323dd7c26c4dc55421842edf76e9acebd3ca8d8a1f430c9667e65f2b904c29b5716124c2914e33988c6cbfbd76b4419666b33f8a706096d58c SHA512 c41888c1e1d125bc3b0210d88b76904c0d8e19a38e02e81cde7fab74702942374ae9c653e2b33a5478a34a7cc7995c8b4658d7b41605e9d3b6e6c2aadf892e85
 EBUILD kodi-21.9999.ebuild 14269 BLAKE2B 0b38b47b819e40f58996ee79bb4aad1da3177175dc0939c764d4b22de0f8c447ed436e491e34239a13f2e5197c32ab51c02b6dbe3fe76bf30eafe301de355277 SHA512 ac3fc2bdb912abe662760f55135875ac143e20471cb8a6b6ee69ed0983f085eeed47968a0c950155000caae299a67b35d404115ec70c6d98791bee1372b0278e
 EBUILD kodi-9999.ebuild 13796 BLAKE2B a34999f5ec80f1b4a04e9b7e6ba94464702b277ac21ac21460423b5c900a5f06521f28e2399217d6c43b817203a67ccb5d057e850282d425d93803b5d679e3be SHA512 e76a02c7eb84b8ca4f1fb6fd9d09be0073b49863cc3d7a64a5412bab022d8b3f8c0e0e180902d12b69104c601f7e0d5eb458232613720b514db7769f76f563dc
-MISC metadata.xml 2908 BLAKE2B 4b085bc5826f080224eadb489137f02741114afa1e424e5e61aa0cbe925a9f4fa9676ca45166d040f569ae99e94aa083533c5d3f0c9271c92286087cdb9f0dae SHA512 cf59967cf1631b3588fae307084ac7c48f03f1dffc5909ddafa9f6b126202391df0553d924a72a75e24302adc27e0f18d9c919084c7803d7dda15009d3731936
+MISC metadata.xml 2555 BLAKE2B 65aeffc3e2130f686a6172d43bd077f86fc45932ace4b865b112d1849f3f3bc3e99d819f09b326d94f83f3834fd504d57405876e304f459e35a280dfcc198283 SHA512 d2219a960862ba094effebc372e0af2973876fa429e39a943298531888c104e36bebff9efd679778f40f1e3ba6dfe2f719545b77f29a70abfe78deb0a9b4d1f9
diff --git a/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch
deleted file mode 100644
index febcdc2197e4..000000000000
--- a/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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/files/kodi-21-fix-gcc14.patch b/media-tv/kodi/files/kodi-21-fix-gcc14.patch
deleted file mode 100644
index fdfa36723f1f..000000000000
--- a/media-tv/kodi/files/kodi-21-fix-gcc14.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/xbmc/xbmc/pull/25106
-
-From 2bf5ab07731b3d4160196e6b8d9ab9e25bea2ef9 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Thu, 2 May 2024 08:02:42 +0000
-Subject: [PATCH 1/2] add missing c++ headers
-
-Add missing headers which are no longer indirectly included by
-other headers, fixes build with gcc-14
-
-Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
---- a/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp
-+++ b/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp
-@@ -17,6 +17,7 @@
- 
- #include "platform/posix/filesystem/SMBWSDiscovery.h"
- 
-+#include <algorithm>
- #include <array>
- #include <chrono>
- #include <mutex>
-
-From b6ddd8fb25ef20e8adb9a9f9b53bebf0cee3a970 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Thu, 2 May 2024 08:05:00 +0000
-Subject: [PATCH 2/2] Geometry: fix template-id not allowed for constructor
-
-fixes gcc-14 error:
-- warning: template-id not allowed for constructor in C++20
-
-Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
---- a/xbmc/utils/Geometry.h
-+++ b/xbmc/utils/Geometry.h
-@@ -177,7 +177,7 @@ template <typename T> class CSizeGen
-     return {m_w, m_h};
-   }
- 
--  template<class U> explicit CSizeGen<T>(const CSizeGen<U>& rhs)
-+  template<class U> explicit CSizeGen(const CSizeGen<U>& rhs)
-   {
-     CheckSet(static_cast<T> (rhs.m_w), static_cast<T> (rhs.m_h));
-   }
diff --git a/media-tv/kodi/kodi-21.0-r1.ebuild b/media-tv/kodi/kodi-21.0-r1.ebuild
deleted file mode 100644
index f1dbbd2a7b53..000000000000
--- a/media-tv/kodi/kodi-21.0-r1.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CODENAME="Omega"
-
-# libdvd{css,read,nav} are not unbundlable without patching the buildsystem.
-
-# Versions for the forked projects that are bundled
-# See tools/depends/target/<project>/<project>-VERSION
-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="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} )
-JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]}
-# Required to be set, but not used.
-JAVA_PKG_WANT_SOURCE="17"
-JAVA_PKG_WANT_TARGET="17"
-
-PYTHON_REQ_USE="sqlite,ssl"
-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 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/"
-
-SRC_URI="
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz
-		-> 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://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz
-	)
-"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	if [[ ${PV} != "9999" ]]; then
-		EGIT_BRANCH="${CODENAME}"
-	fi
-	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 arm64 ~riscv ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}
-fi
-
-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 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 )
-"
-RESTRICT="!test? ( test )"
-
-# dev-libs/libcec[-cubox] bug #818262
-COMMON_DEPEND="
-	>=dev-libs/flatbuffers-23.3.3:=
-	>=dev-libs/lzo-2.04:2
-	media-libs/giflib:=
-	>=media-libs/libjpeg-turbo-2.0.4:=
-	>=media-libs/libpng-1.6.26:0=
-	wayland? (
-		dev-cpp/waylandpp:=
-	)
-"
-COMMON_TARGET_DEPEND="${PYTHON_DEPS}
-	>=net-misc/curl-7.68.0[http2]
-	>=sys-libs/zlib-1.2.11
-	dev-db/sqlite:3
-	dev-libs/crossguid
-	>=dev-libs/fribidi-1.0.5
-	>=dev-libs/libcdio-2.1.0:=[cxx]
-	>=dev-libs/libfmt-6.1.2:=
-	dev-libs/libfstrcmp
-	dev-libs/libpcre[cxx]
-	>=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.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
-	x11-libs/libdrm
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	')
-	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
-	)
-	cec? (
-		>=dev-libs/libcec-4.0[-cubox]
-	)
-	dbus? (
-		sys-apps/dbus
-	)
-	gbm? (
-		>=dev-libs/libinput-1.10.5:=
-		media-libs/libdisplay-info
-		x11-libs/libxkbcommon
-	)
-	gles? (
-		|| (
-			>=media-libs/mesa-24.1.0_rc1[opengl]
-			<media-libs/mesa-24.1.0_rc1[gles2]
-		)
-	)
-	!gles? (
-		media-libs/glu
-	)
-	lcms? (
-		>=media-libs/lcms-2.10:2
-	)
-	libusb? (
-		virtual/libusb:1
-	)
-	lirc? (
-		app-misc/lirc
-	)
-	mariadb? (
-		dev-db/mariadb-connector-c:=
-	)
-	mysql? (
-		dev-db/mysql-connector-c:=
-	)
-	nfs? (
-		>=net-fs/libnfs-2.0.0:=
-	)
-	pipewire? (
-		>=media-video/pipewire-0.3.50:=
-	)
-	pulseaudio? (
-		media-libs/libpulse
-	)
-	samba? (
-		>=net-fs/samba-3.4.6[smbclient(+)]
-	)
-	udf? (
-		>=dev-libs/libudfread-1.0.0
-	)
-	udev? (
-		virtual/libudev:=
-	)
-	vaapi? (
-		media-libs/libva:=[wayland?,X?]
-	)
-	vdpau? (
-		|| (
-			>=x11-libs/libvdpau-1.1
-			>=x11-drivers/nvidia-drivers-180.51
-		)
-	)
-	wayland? (
-		>=x11-libs/libxkbcommon-0.4.1[wayland]
-	)
-	webserver? (
-		>=net-libs/libmicrohttpd-0.9.77:=[messages(+)]
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-	)
-	xslt? (
-		dev-libs/libxslt
-		>=dev-libs/libxml2-2.9.4
-	)
-	zeroconf? (
-		net-dns/avahi[dbus]
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	${COMMON_TARGET_DEPEND}
-"
-DEPEND="
-	${COMMON_DEPEND}
-	${COMMON_TARGET_DEPEND}
-	>=dev-libs/rapidjson-1.0.2
-	test? (
-		>=dev-cpp/gtest-1.10.0
-	)
-	wayland? (
-		>=dev-libs/wayland-protocols-1.7
-	)
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXrender
-	)
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	app-arch/unzip
-	dev-build/cmake
-	dev-lang/swig
-	virtual/pkgconfig
-	<=virtual/jre-17:*
-	doc? (
-		app-text/doxygen
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/kodi-21-fix-gcc14.patch
-)
-
-# bug #544020
-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
-	java-pkg-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_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() {
-	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
-
-	# Add all possible names for kissfft libraries
-	for datatype in {float,int16,int32,simd}; do
-		sed -i \
-			-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() {
-	local mycmakeargs=(
-		-Wno-dev # less noise
-
-		-DAPP_RENDER_SYSTEM=$(usex gles gles gl)
-		-DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11)
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_TESTING=$(usex test)
-		-DVERBOSE=ON
-
-		# Enforce use of configured python interpeter
-		-DPYTHON_PATH=$(python_get_library_path)
-		-DPYTHON_VER=${EPYTHON##python} # wont work for pypy
-
-		# Toolchain
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CLANGFORMAT=OFF
-		-DENABLE_CLANGTIDY=OFF
-		-DENABLE_CPPCHECK=OFF
-		-DENABLE_INCLUDEWHATYOUUSE=OFF
-		# https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_GOLD=OFF
-		-DENABLE_LLD=OFF
-		-DENABLE_MOLD=OFF
-		-DUSE_LTO=OFF
-
-		# Features
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CAP=$(usex caps)
-		-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_ISO9660PP=$(usex optical)
-		-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_OPENGL=$(usex !gles)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPTICAL=$(usex optical)
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SNDIO=OFF
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UDFREAD=$(usex udf)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-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
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_INTERNAL_FLATBUFFERS=OFF
-		-DENABLE_INTERNAL_FMT=OFF
-		-DENABLE_INTERNAL_FSTRCMP=OFF
-		-DENABLE_INTERNAL_GTEST=OFF
-		-DENABLE_INTERNAL_KISSFFT=OFF
-		-DENABLE_INTERNAL_PCRE=OFF
-		-DENABLE_INTERNAL_RapidJSON=OFF
-		-DENABLE_INTERNAL_SPDLOG=OFF
-		-DENABLE_INTERNAL_TAGLIB=OFF
-		-DENABLE_INTERNAL_UDFREAD=OFF
-
-		-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-${FFMPEG_VERSION}.tar.gz"
-	)
-	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
-
-	for flag in ${CPU_FLAGS[@]} ; do
-		local name=${flag#cpu_flags_*_}
-		mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) )
-	done
-
-	if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then
-		# Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
-		append-cflags -DNDEBUG
-		append-cxxflags -DNDEBUG
-	fi
-
-	# Violates ODR (bug #860984) and USE_LTO does spooky stuff
-	# 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
-}
-
-src_test() {
-	local -x CMAKE_SKIP_TESTS=(
-		# Known failing, unreliable test
-		# bug #743938
-		TestCPUInfo.GetCPUFrequency
-		# Test failure stemming from sci-libs/kissfft
-		# The difference between output[2i] and (i==freq1?1.0:0.0) is inf, which exceeds 1e-7, where output[2i]
-		# evaluates to inf,(i==freq1?1.0:0.0) evaluates to 0, and 1e-7 evaluates to 9.9999999999999995e-08.
-		TestRFFT.SimpleSignal
-		# 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
-	local -x KODI_HOME="${BUILD_DIR}"
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# bug #457588
-	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)"
-
-	einstalldocs
-	use doc && dodoc -r "${S}"/docs/html/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use dbus ; then
-		optfeature "getting battery level and active power source" sys-power/upower
-		optfeature "control of shutdown, reboot, suspend, and hibernate" sys-auth/elogind sys-apps/systemd
-		optfeature "storage management support (automounting, volume monitoring, etc)" sys-fs/udisks:2
-	fi
-}
diff --git a/media-tv/kodi/kodi-21.0-r2.ebuild b/media-tv/kodi/kodi-21.0-r2.ebuild
deleted file mode 100644
index f975ad26a22a..000000000000
--- a/media-tv/kodi/kodi-21.0-r2.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CODENAME="Omega"
-
-# libdvd{css,read,nav} are not unbundlable without patching the buildsystem.
-
-# Versions for the forked projects that are bundled
-# See tools/depends/target/<project>/<project>-VERSION
-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="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} )
-JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]}
-# Required to be set, but not used.
-JAVA_PKG_WANT_SOURCE="17"
-JAVA_PKG_WANT_TARGET="17"
-
-PYTHON_REQ_USE="sqlite,ssl"
-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 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/"
-
-SRC_URI="
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz
-		-> 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://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz
-	)
-"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	if [[ ${PV} != "9999" ]]; then
-		EGIT_BRANCH="${CODENAME}"
-	fi
-	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 ~arm64 ~riscv ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}
-fi
-
-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 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 )
-"
-RESTRICT="!test? ( test )"
-
-# dev-libs/libcec[-cubox] bug #818262
-COMMON_DEPEND="
-	>=dev-libs/flatbuffers-23.3.3:=
-	>=dev-libs/lzo-2.04:2
-	media-libs/giflib:=
-	>=media-libs/libjpeg-turbo-2.0.4:=
-	>=media-libs/libpng-1.6.26:0=
-	wayland? (
-		dev-cpp/waylandpp:=
-	)
-"
-COMMON_TARGET_DEPEND="${PYTHON_DEPS}
-	>=net-misc/curl-7.68.0[http2]
-	>=sys-libs/zlib-1.2.11
-	dev-db/sqlite:3
-	dev-libs/crossguid
-	>=dev-libs/fribidi-1.0.5
-	>=dev-libs/libcdio-2.1.0:=[cxx]
-	>=dev-libs/libfmt-6.1.2:=
-	dev-libs/libfstrcmp
-	dev-libs/libpcre[cxx]
-	>=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.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
-	x11-libs/libdrm
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	')
-	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
-	)
-	cec? (
-		>=dev-libs/libcec-4.0[-cubox]
-	)
-	dbus? (
-		sys-apps/dbus
-	)
-	gbm? (
-		>=dev-libs/libinput-1.10.5:=
-		media-libs/libdisplay-info
-		x11-libs/libxkbcommon
-	)
-	gles? (
-		|| (
-			>=media-libs/mesa-24.1.0_rc1[opengl]
-			<media-libs/mesa-24.1.0_rc1[gles2]
-		)
-	)
-	!gles? (
-		media-libs/glu
-	)
-	lcms? (
-		>=media-libs/lcms-2.10:2
-	)
-	libusb? (
-		virtual/libusb:1
-	)
-	lirc? (
-		app-misc/lirc
-	)
-	mariadb? (
-		dev-db/mariadb-connector-c:=
-	)
-	mysql? (
-		dev-db/mysql-connector-c:=
-	)
-	nfs? (
-		>=net-fs/libnfs-2.0.0:=
-	)
-	pipewire? (
-		>=media-video/pipewire-0.3.50:=
-	)
-	pulseaudio? (
-		media-libs/libpulse
-	)
-	samba? (
-		>=net-fs/samba-3.4.6[smbclient(+)]
-	)
-	udf? (
-		>=dev-libs/libudfread-1.0.0
-	)
-	udev? (
-		virtual/libudev:=
-	)
-	vaapi? (
-		media-libs/libva:=[wayland?,X?]
-	)
-	vdpau? (
-		|| (
-			>=x11-libs/libvdpau-1.1
-			>=x11-drivers/nvidia-drivers-180.51
-		)
-	)
-	wayland? (
-		>=x11-libs/libxkbcommon-0.4.1[wayland]
-	)
-	webserver? (
-		>=net-libs/libmicrohttpd-0.9.77:=[messages(+)]
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-	)
-	xslt? (
-		dev-libs/libxslt
-		>=dev-libs/libxml2-2.9.4
-	)
-	zeroconf? (
-		net-dns/avahi[dbus]
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	${COMMON_TARGET_DEPEND}
-"
-DEPEND="
-	${COMMON_DEPEND}
-	${COMMON_TARGET_DEPEND}
-	>=dev-libs/rapidjson-1.0.2
-	test? (
-		>=dev-cpp/gtest-1.10.0
-	)
-	wayland? (
-		>=dev-libs/wayland-protocols-1.7
-	)
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXrender
-	)
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	app-arch/unzip
-	dev-build/cmake
-	dev-lang/swig
-	virtual/pkgconfig
-	<=virtual/jre-17:*
-	doc? (
-		app-text/doxygen
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/kodi-21-fix-gcc14.patch
-	"${FILESDIR}"/kodi-21-fix-dvd-playing.patch
-)
-
-# bug #544020
-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
-	java-pkg-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_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() {
-	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
-
-	# Add all possible names for kissfft libraries
-	for datatype in {float,int16,int32,simd}; do
-		sed -i \
-			-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() {
-	local mycmakeargs=(
-		-Wno-dev # less noise
-
-		-DAPP_RENDER_SYSTEM=$(usex gles gles gl)
-		-DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11)
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_TESTING=$(usex test)
-		-DVERBOSE=ON
-
-		# Enforce use of configured python interpeter
-		-DPYTHON_PATH=$(python_get_library_path)
-		-DPYTHON_VER=${EPYTHON##python} # wont work for pypy
-
-		# Toolchain
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CLANGFORMAT=OFF
-		-DENABLE_CLANGTIDY=OFF
-		-DENABLE_CPPCHECK=OFF
-		-DENABLE_INCLUDEWHATYOUUSE=OFF
-		# https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_GOLD=OFF
-		-DENABLE_LLD=OFF
-		-DENABLE_MOLD=OFF
-		-DUSE_LTO=OFF
-
-		# Features
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CAP=$(usex caps)
-		-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_ISO9660PP=$(usex optical)
-		-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_OPENGL=$(usex !gles)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPTICAL=$(usex optical)
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SNDIO=OFF
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UDFREAD=$(usex udf)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-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
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_INTERNAL_FLATBUFFERS=OFF
-		-DENABLE_INTERNAL_FMT=OFF
-		-DENABLE_INTERNAL_FSTRCMP=OFF
-		-DENABLE_INTERNAL_GTEST=OFF
-		-DENABLE_INTERNAL_KISSFFT=OFF
-		-DENABLE_INTERNAL_PCRE=OFF
-		-DENABLE_INTERNAL_RapidJSON=OFF
-		-DENABLE_INTERNAL_SPDLOG=OFF
-		-DENABLE_INTERNAL_TAGLIB=OFF
-		-DENABLE_INTERNAL_UDFREAD=OFF
-
-		-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-${FFMPEG_VERSION}.tar.gz"
-	)
-	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
-
-	for flag in ${CPU_FLAGS[@]} ; do
-		local name=${flag#cpu_flags_*_}
-		mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) )
-	done
-
-	if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then
-		# Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
-		append-cflags -DNDEBUG
-		append-cxxflags -DNDEBUG
-	fi
-
-	# Violates ODR (bug #860984) and USE_LTO does spooky stuff
-	# 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
-}
-
-src_test() {
-	local -x CMAKE_SKIP_TESTS=(
-		# Known failing, unreliable test
-		# bug #743938
-		TestCPUInfo.GetCPUFrequency
-		# Test failure stemming from sci-libs/kissfft
-		# The difference between output[2i] and (i==freq1?1.0:0.0) is inf, which exceeds 1e-7, where output[2i]
-		# evaluates to inf,(i==freq1?1.0:0.0) evaluates to 0, and 1e-7 evaluates to 9.9999999999999995e-08.
-		TestRFFT.SimpleSignal
-		# 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
-	local -x KODI_HOME="${BUILD_DIR}"
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# bug #457588
-	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)"
-
-	einstalldocs
-	use doc && dodoc -r "${S}"/docs/html/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use dbus ; then
-		optfeature "getting battery level and active power source" sys-power/upower
-		optfeature "control of shutdown, reboot, suspend, and hibernate" sys-auth/elogind sys-apps/systemd
-		optfeature "storage management support (automounting, volume monitoring, etc)" sys-fs/udisks:2
-	fi
-}
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index 00f1f2a7232c..0371c8c122fd 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -17,18 +17,14 @@
 		<flag name="lirc">Enable support for IR remote controls using <pkg>app-misc/lirc</pkg></flag>
 		<flag name="mariadb">Enable support store of media library metadata on local or remote MariaDB</flag>
 		<flag name="mysql">Enable support store of media library metadata on local or remote MySQL</flag>
-		<flag name="dav1d">Enables AV1 decoding via <pkg>media-libs/dav1d</pkg></flag>
 		<flag name="nfs">Enable NFS client support</flag>
 		<flag name="optical">Enable Audio CD playback, optical disks detection and reading (CD-ROM, Video CD, and others), and ISO optical disk images direct reading. DVD disks may require additional 'udf' flag.</flag>
 		<flag name="pipewire">Enable pipewire support</flag>
-		<flag name="power-control">Enable control of shutdown, reboot, suspend, and hibernate</flag>
-		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
 		<flag name="soc">Use additional <pkg>media-video/ffmpeg</pkg> patches for efficient playback on some SoCs (e.g. ARM, RISC-V)</flag>
 		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
 		<flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use udev.</flag>
 		<flag name="udf">Enable UDF support. Required for playing blurays.</flag>
 		<flag name="udev">Use udev rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag>
-		<flag name="upower">Use <pkg>sys-power/upower</pkg> to get battery level and active power source</flag>
 		<flag name="webserver">Enable internal webserver</flag>
 		<flag name="xslt">Enable metadata XSLT scrapers support with <pkg>dev-libs/libxslt</pkg></flag>
 	</use>