10 files changed, 521 insertions, 87 deletions
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 2e25a4f1b7d7..0b0e9492cffb 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index c7d4545e195b..f91428525cff 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,3 +1,3 @@
-DIST gentoo-vdr-scripts-2.8.tar.bz2 49662 BLAKE2B 1a49d03441c991f6aa08cefc3b6d3a926a18ef7cb6c97bef886f922901f681ab95e9b60648d3930136148dafdf87f702d564e5a89fb6945ef9ed0cec1c2fbbaa SHA512 587bfc329efb92f1d9d9f87b3eb88ff9c74f92587d20c1489e67c861c769f9cb307bd6314aa88dc7d2a1400bc408033b913093b8f219fa59857638f2d062eecf
-EBUILD gentoo-vdr-scripts-2.8.ebuild 2379 BLAKE2B c815ccb8ba882381c07f21e5b61908858e6c371f26fc6c753923dc5a750a7bd514bfa3f2bca66b82ff077e8af801ac1a4f18a7f7062ada038f7104e23641da75 SHA512 b73a0f45d467503f5986688657312fad9b4cf17815600dd6deec180e3b36ed25f6abb8a7823e960e3738b0510d04d83a84adeb8b68eedceb0d4cde7fa234b80c
-MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
+DIST gentoo-vdr-scripts-3.0_rc2.tar.gz 59284 BLAKE2B 88666442e27646a06a1e7d4b7389a02196b48eee3a14c20c70281b5db862237cac8982e989628810e5c6721ebca32347fbf2a80f29e0ff2d839760f076d50d2a SHA512 d1ba41190565a129b6bd69aedd32590a5479a6390fb17a8d2a9e8926dd35260b3581b25b049da84e35e0d047b81c326512b67d45b488aa60ad10acafe93432d9
+EBUILD gentoo-vdr-scripts-3.0_rc2-r1.ebuild 1899 BLAKE2B d1347810f302f4fca6447debc3d73b0c13c3e2fab2b7b667e6777b82c9108460ce23ff803ce23dd1633c1a3178a96d2be943a15f1972ecb70112a30c56a77115 SHA512 3893859fa0a5f4c4de663ae268b2d1e6b95e68ebbad55a4ae0312061418de7e7878cc67972388c92a5297b669daae622dcd74ca29048fad0ba1670d17ff23e95
+MISC metadata.xml 508 BLAKE2B 0e1fd077065c9e960657a6a6b2648f77a96cf106c57732b31c65050d3e85cdb35f3f735944bfc423f79be8382f5f210dcc7acfe04cdc10b294400f579cda251d SHA512 9409dce6ee81e8d7a7541528880eca2b38ba500cfc38a8c2d0eb0636c54ab5b5cb2987befa9f420fbb28b391b0516299ccc02b25b60137bef024cf2e70ee15a3
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
deleted file mode 100644
index 8b3b09f8b22a..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-GVS_VERSION="3ef03483b825a032d2618c2f3fb61865b0fc2f1e"
-
-DESCRIPTION="Scripts necessary for use of VDR as a set-top-box"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/snapshot/gentoo-vdr-scripts-${GVS_VERSION}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE=""
-
-RDEPEND="app-admin/sudo
-	sys-process/wait_on_pid"
-
-S="${WORKDIR}/${PN}-${GVS_VERSION}"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 -1 "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	default
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	keepdir "${VDR_HOME}/shutdown-data"
-	keepdir "${VDR_HOME}/merged-config-files"
-	keepdir "${VDR_HOME}/dvd-images"
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	elog "${CATEGORY}/${PN} supports an init script"
-	elog "to start a X server"
-	elog "Please refer for detailed info to"
-	elog "/usr/share/doc/${PF}/README.x11-setup\n"
-
-	elog "systemd is supported by ${CATEGORY}/${PN}"
-	elog "This are described in the README.systemd file"
-	elog "in /usr/share/doc/${PF}/\n"
-
-	einfo "nvram wakeup is supported optional."
-	einfo "To make use of it emerge sys-power/nvram-wakeup.\n"
-
-	elog "Plugins which should be used are set via"
-	elog "the config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled them via the frontend eselect vdr-plugin.\n"
-
-	if [[ -f "${EROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${EROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-
-	# backup routine for old /etc/sudoers entry
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${EROOT}"/etc/sudoers; then
-		ewarn "Please remove depricated entry from /etc/sudoers:"
-		ewarn "${VDRSUDOENTRY}"
-		ewarn "sudoers handling is supported by:"
-		ewarn "/etc/sudoers.d/vdr"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-3.0_rc2-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-3.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..267957a48b58
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-3.0_rc2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tmpfiles user-info
+
+DESCRIPTION="Scripts necessary for use of VDR as a set-top-box"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/"
+SRC_URI="https://github.com/madmartin/gentoo-vdr-scripts/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+
+DEPEND="
+	acct-group/vdr
+	acct-user/vdr"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	sys-process/wait_on_pid"
+BDEPEND="${DEPEND}"
+
+src_install() {
+	default
+
+	local VDR_HOME="$(egethome vdr)"
+	einfo "VDR_HOME=${VDR_HOME}"
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}/shutdown-data" "${VDR_HOME}/merged-config-files" "${VDR_HOME}/dvd-images"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	elog "${CATEGORY}/${PN} supports an init script"
+	elog "to start a X server"
+	elog "Please refer for detailed info to"
+	elog "/usr/share/doc/${PF}/README.x11-setup\n"
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "Read about it in /usr/share/doc/${PF}/README.systemd"
+
+	elog "Plugins which should be used are configured in"
+	elog "the config-file /etc/conf.d/vdr.plugins"
+	elog "or enable/disable them with \"eselect vdr-plugin\".\n"
+
+	if [[ -f "${EROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${EROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${EROOT}"/etc/sudoers; then
+		ewarn "Please remove the following deprecated line from /etc/sudoers:"
+		ewarn "  vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+		ewarn "sudoers handling is now supported by:"
+		ewarn "/etc/sudoers.d/vdr"
+	fi
+}
diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index 2b167a7461de..b4dbb6eb43d2 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index f6d3df8cc15b..1cd522f9debc 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -6,6 +6,7 @@ DIST kodi-19.0.tar.gz 52311355 BLAKE2B 543936b8fb607d1d629a8f2abd9cd0cb3bf6114aa
 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 kodi-19.4-Matrix.tar.gz 53487622 BLAKE2B 75432f0fe225d10548c9cbce1ec5a1722ce75e9bc6f19ba9a8deffc50874be94ca1552c5bd75b3ea1712344ebdf6f5934bca3ee315e6acccd2141df7de3304e9 SHA512 2804c57d85877873dae8e62f083b86f51fceebb802819523654a231f50f9850022956e1a9b91702e7c8b3f7ab437ceea7b10319239a8289dbf877ce94bba07c9
 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
@@ -13,6 +14,7 @@ EBUILD kodi-19.0-r2.ebuild 10959 BLAKE2B 91b00967a1a81cc44edcf28907de17cb4ef51c1
 EBUILD kodi-19.1-r2.ebuild 10980 BLAKE2B 51df21a2bc5577199c3d00e76b7b1fbf6faddacbde1b70b4a2e1834e4cfb5691d2d6a861d39348125e29a4cf4ec0a332ea0d233d26af91c6810081c994ab1a14 SHA512 ef44b03077717ddb8c412c86acb90a916adef4b2cada3611c6ea1ab48c1a8745880c16e21ca9e3a1ec6eea15be60c16747d689094058f5aeae130f5775287917
 EBUILD kodi-19.2-r1.ebuild 10967 BLAKE2B aa98be2ffb033153dde9768f69ebbd48f8b283e72f1a938ee4a5bfdb23f2dbaf1db705bd8021054e49dfd5690fc140da72b14479d92d9a7c6af6f78c0b74a70d SHA512 8a3d87bf7de71a21a6cd43148761b609dce52e7467ffb6515a4952ef16e4ed5cf4a04fd0b8e8b4f30ab32912d49ac9c2db0a739a9014617d38b23b0464173752
 EBUILD kodi-19.3-r1.ebuild 10970 BLAKE2B f735aa870b97d620016d7add3d6be68dfa2714e592e59f9cad49d4c9df820468774468d612bffa46428220742a7d26ca4338e165be841f668a45bc98117af77a SHA512 3888c3b014ff78ccb637975271bb4efb9b2851720280c57a6d9bfb12b669e73ccf0f2a82c43346e9fb08d115fbe92bcd34bf31e405d222d80b23bf2888f733df
+EBUILD kodi-19.4.ebuild 10970 BLAKE2B f735aa870b97d620016d7add3d6be68dfa2714e592e59f9cad49d4c9df820468774468d612bffa46428220742a7d26ca4338e165be841f668a45bc98117af77a SHA512 3888c3b014ff78ccb637975271bb4efb9b2851720280c57a6d9bfb12b669e73ccf0f2a82c43346e9fb08d115fbe92bcd34bf31e405d222d80b23bf2888f733df
 EBUILD kodi-19.9999.ebuild 10970 BLAKE2B f735aa870b97d620016d7add3d6be68dfa2714e592e59f9cad49d4c9df820468774468d612bffa46428220742a7d26ca4338e165be841f668a45bc98117af77a SHA512 3888c3b014ff78ccb637975271bb4efb9b2851720280c57a6d9bfb12b669e73ccf0f2a82c43346e9fb08d115fbe92bcd34bf31e405d222d80b23bf2888f733df
 EBUILD kodi-9999.ebuild 11014 BLAKE2B 1155f586e15067a856e8bbb3719d13cd437d7a733494d853e011d965aec45632fab87e1dd2503e457386aaecfb36a3c2293736aa13ffd0460ef0a3b5e6f5b0cf SHA512 7d0d7efd7411bda4d415b92d7ea65f88e7eeb0d223de8b5b933976653e082a333c89ca523a19b49f99a1e503815988b383dd3c6f7eacefff77a8eb88cc18f5d6
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/kodi-19.4.ebuild b/media-tv/kodi/kodi-19.4.ebuild
new file mode 100644
index 000000000000..4794c16bf228
--- /dev/null
+++ b/media-tv/kodi/kodi-19.4.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2022 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,10} )
+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-4*[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-driver )
+		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() {
+	local myctestargs=(
+		# Known failing, unreliable test
+		# bug #743938
+		-E "(TestCPUInfo.GetCPUFrequency)"
+	)
+
+	# 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/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 7f87a79f071e..81ee80d58452 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -8,6 +8,9 @@ DIST plexmediaserver_1.24.2.4973-2b1b51db9_amd64.deb 86646728 BLAKE2B bbf06b3e0c
 DIST plexmediaserver_1.24.2.4973-2b1b51db9_i386.deb 79557092 BLAKE2B 90afb0880f6c95b382456c60d8b039e189df0dba531258f1fda52fe8d360052131e4af7bb21ced59870ccd38a10857512058b47d7323e1e431500c643c8259ba SHA512 dea8cc65b126ecebd4ac78911f560f8622c8276b5306d07a822cdb650bb9ee4c54c6dd56dada059516ba554aec37d9e8f22f75fb415a533d452086f1e264762d
 DIST plexmediaserver_1.24.4.5081-e362dc1ee_amd64.deb 87182480 BLAKE2B 9e93656ee7dd9f39162463d34e11c2f8cd81b8481baaeeffe85efb73c2223f59eb3c9bda30689252e368582631070884ee5704485e408576018608777fe617a1 SHA512 e50c900dc97303347732ce6404ca6f2584c1e4292b9d55f1588cf2864b7fbc6aee5dff7c2b311d0c2877b90578a52177a97593a617b7a9c9e892fc032e50ef58
 DIST plexmediaserver_1.24.4.5081-e362dc1ee_i386.deb 79593852 BLAKE2B ab141fefe68d4d5c92e48cbbc93661bd56612289a8bc0559c8083ad169b997f555fb02d808d7a8feda9d47f573f2041668ed3dd876ab81b848958c4b820869c2 SHA512 e17d6c8268690e46d49197e4e77df8af97d8a2c5046605237d6c90a2627da1cfb6c16c36dccc7bc31f95f497de7da1e0a2bab8e5331bc1f3bc44d5a3610ab1bb
+DIST plexmediaserver_1.25.4.5487-648a8f9f9_amd64.deb 78416314 BLAKE2B 8adf34e6095ebda829d0fa6a1bc7fabb8c159d9883bc1fc4cfe55feba9e51be71b9ad552889835bc374c4c04479d4c0bfd6255f21674f56d9960cc8dded53f30 SHA512 f324746bcae8406356fd3ae9a3647d6c1de44b26f35cc000af203af8dc8be69363e85562e56411fa2fc2039de0d58fe9f8beb1eab4029ade62b0afbb0af849ea
+DIST plexmediaserver_1.25.4.5487-648a8f9f9_i386.deb 70409128 BLAKE2B 7d51592eb688d248347f9023a0fab10426ee93d66ae8aad48272c3efe286015eb831c7fce52287dc4522cca8c5c4a9d06524a3ab91a26aa84daab12b892f1b3e SHA512 de930e905b175f860922ecca0bd9ea86a102b4420d1ffb71b6c04632fed83bf41a90fd042d5e0b4e7f77a902fce19049347f81460e451f3016f1687eb18bd6c5
 EBUILD plex-media-server-1.24.2.4973.ebuild 1897 BLAKE2B 5c0ce1b07cc8dc777496303b10285d7f4a5f857e24771d7a530a782b67f09a3d30d61358ded0f3a218e85be12eabafd00ad86b37fc2886cd20d958899bd7afaa SHA512 1d7cd03c59bb3fe0d7f54e4fb26a91f3585df259639283513dd64db8447dbb0ee3c421d3893fd9fed186d597e0b01adb2142b8194d74adc666711edd8af86b11
 EBUILD plex-media-server-1.24.4.5081.ebuild 1915 BLAKE2B b832db59b01e96210db26f1059267b696b29bd3318e91dfa5a18e3dc756cb06355aad0b61909b1bcc11eaaecedc9c0cb8dfe9f449213546d26b41ea3db4c9fa4 SHA512 17a06b1f92d9de1ce088502fcc14cf8ca7551c8a4e1d68d172a0df34ce1f409489c829a1923715bbe71d1511e6d63cf1cc97f09e4c1c3b2886f22c84d0e0733c
-MISC metadata.xml 365 BLAKE2B 15f5fc48ba078990543015de0fc468551c976eec1da1a96fc1ad785ee622a0eae1b07ff7dca1b88ed87a370c5fdc5527da760bb606918a9d49051629cd8bc517 SHA512 59759753b0810801dcc559ae57813b36071c3634c4eab189b31ebf5206c3bc111a8072ce6cf28eb7fb2b39c74993a68d7d3ee57241a7161d7e4d60a0b9a44438
+EBUILD plex-media-server-1.25.4.5487.ebuild 1915 BLAKE2B 2d018d9dc4982c485f32113224f82e86d95ab27ed71b370fd1d9bcc32d8e7442edba693f5730cb97484b2f1943c727b7d656e6ca21d2a44955667c4d68942fe9 SHA512 f6e384c7a8dfca1cb845b392a4a3908349b02ab73edb8c598e2c713ab39f12bd910fd4daba779a8779b29273532c5de8e9bf0bfd3e45257d2476df3963f34fd5
+MISC metadata.xml 610 BLAKE2B 021cf89bcdb668702a2839fd138e189858c1ba7433172199ab1884e825aaf738d10f9499dafbea51ab826d087de8c5676cbbfeb09205a536ea6f8637545878f8 SHA512 1ae65b9eb169bc44e166fa602c5987c2994d1f4f1e22c05028ab363be54a6da8f1e243733c4c0dca660ba2aaa8173c144c05854e4e1ca6273f1ad556725a0dc9
diff --git a/media-tv/plex-media-server/metadata.xml b/media-tv/plex-media-server/metadata.xml
index 7eda2a7f8005..ac5ae640aeea 100644
--- a/media-tv/plex-media-server/metadata.xml
+++ b/media-tv/plex-media-server/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>luigi.mantellini+gentoo@gmail.com</email>
+		<name>Luigi Mantellini</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<changelog>http://forums.plex.tv/discussion/62832/plex-media-server#latest</changelog>
 		<doc>https://support.plex.tv/hc/en-us/categories/200007268-Getting-Started</doc>
diff --git a/media-tv/plex-media-server/plex-media-server-1.25.4.5487.ebuild b/media-tv/plex-media-server/plex-media-server-1.25.4.5487.ebuild
new file mode 100644
index 000000000000..7d940b4cb325
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.25.4.5487.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 systemd unpacker
+
+MY_PV="${PV}-648a8f9f9"
+MY_URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="Free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
+	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
+S="${WORKDIR}"
+
+LICENSE="Plex"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="mirror bindist"
+
+DEPEND="
+	acct-group/plex
+	acct-user/plex"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/plexmediaserver/lib/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
+)
+
+src_install() {
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Add startup wrapper
+	dosbin "${FILESDIR}/start_pms"
+
+	# Add user config file
+	mkdir -p "${ED}/etc/default" || die
+	cp usr/lib/plexmediaserver/lib/plexmediaserver.default "${ED}"/etc/default/plexmediaserver || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	keepdir /var/log/pms
+	fowners plex:plex /var/log/pms
+
+	keepdir /var/lib/plexmediaserver
+	fowners plex:plex /var/lib/plexmediaserver
+
+	newinitd usr/lib/plexmediaserver/lib/plexmediaserver.init "${PN}"
+
+	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
+	keepdir /var/lib/plexmediaserver
+
+	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+	# so it doesn't try to rebuild libraries that can't be rebuilt.
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/80plexmediaserver
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}