gentoo resync : 03.11.2021

13 files changed, 34 insertions, 35 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index b225da314b85..db1a3cee0fb2 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 97d59109669a..862c3b028139 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -9,10 +9,10 @@ DIST kodi-19.3-Matrix.tar.gz 52354039 BLAKE2B 33d9f0081391fcc37d5f2548d92e074654
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-19.0-r1.ebuild 10827 BLAKE2B 36f09ef533f53e7022fd3143eec46e3bb016e98b7d9a5649da8ad8b49f366fad469006f568ca17e18252dfa61aebf73bc0d72706aeb28f8234cb383be2254345 SHA512 e09aca92ca458f529273a9468c18be18beeb1144e65b6db2f3d289849c02b48f95792eb0847e93c18395dbba4296f2bb936e6766f9c7a7c5b352e6efa995290a
-EBUILD kodi-19.1-r1.ebuild 10850 BLAKE2B 79852614ea4a3fde03141edb4fceec64b7b00c5f8104b3df80c6f2bf11e6912b59bf2660effc4711ce2ff407fce8f3e751a31a80e52324d6bd0dec11cffb6583 SHA512 122a8a60ba9d1995d971e87e757d86fb1eaa95e380dcd2d12ca6ebf541b822ec98419bc5150c084b242eac3f2e152ac8d4789801bc90d91c946badc88dea21b7
-EBUILD kodi-19.2.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
-EBUILD kodi-19.3.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
-EBUILD kodi-19.9999.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
-EBUILD kodi-9999.ebuild 10883 BLAKE2B bde5172b18271d7b694317013e1a10ee7a3fd8dab3dd33ae55d2814dbeaef8beee579c7c874dfa02f28c5938183b07f0815475077eb9ee4aa6e1d09b91ef2494 SHA512 b8652e57b708c213b92767d47855c03d5b1afcf198d0e725e3a91d09d8d6933ffd917ab5e0b3845abbbd840655c0138e8a3caf749f6d9fa191e139fe789c5a2e
+EBUILD kodi-19.0-r2.ebuild 10836 BLAKE2B 993dd7e26ac0c62f3f7ad8d3f40643b2a41b48f40175209d7c2c34568e13fe3084283e41609bae345e6097f9b8ba2e8e5d2c3680086a1012a17108f4d32d74a1 SHA512 4a1912915b2d431cd1490f4676f8953dc64c2cb86b4295e303224c5a8be5eed83cf95a462cbc5e0c3c9c8b77afbad281c18e4b16001286c2e0b3036a5b2aa73b
+EBUILD kodi-19.1-r2.ebuild 10859 BLAKE2B 7f0c75528e4b5f6b1d3cd73b83f871a1d82e233f16aa7dd65b7780f6791b1ad94c67fd4eda4ec65031a4631d85167c18492789662fda9f4aa2a3b928d38dc080 SHA512 90d5bebf9255ac375dbf426c53fd19260c998c7f6b0eed0d8138825a4cc5fe7d1b8028fff366ea6dfd4e6942965400baac4497fcde68542bc81880e7ad0d4773
+EBUILD kodi-19.2-r1.ebuild 10844 BLAKE2B a9017f6a7e8f03fb62d600ce5245c808a964e36a197743365d8118a198fb369a3c1897f5dd295b898bbbda8ab669a4188570746a3c23c6abcdd9b59ddf182001 SHA512 6ec2de9397bc7a5dcd9806641461f6cd2be67812960c604e8925c7eccce80a7a831be811b4e71eb51d834307a3fb781caa73d196200cf9d1f03be0a371a26230
+EBUILD kodi-19.3-r1.ebuild 10844 BLAKE2B a9017f6a7e8f03fb62d600ce5245c808a964e36a197743365d8118a198fb369a3c1897f5dd295b898bbbda8ab669a4188570746a3c23c6abcdd9b59ddf182001 SHA512 6ec2de9397bc7a5dcd9806641461f6cd2be67812960c604e8925c7eccce80a7a831be811b4e71eb51d834307a3fb781caa73d196200cf9d1f03be0a371a26230
+EBUILD kodi-19.9999.ebuild 10844 BLAKE2B a9017f6a7e8f03fb62d600ce5245c808a964e36a197743365d8118a198fb369a3c1897f5dd295b898bbbda8ab669a4188570746a3c23c6abcdd9b59ddf182001 SHA512 6ec2de9397bc7a5dcd9806641461f6cd2be67812960c604e8925c7eccce80a7a831be811b4e71eb51d834307a3fb781caa73d196200cf9d1f03be0a371a26230
+EBUILD kodi-9999.ebuild 10892 BLAKE2B 0126eb402c3a9a2a40a899f92d24420e63f0ef8cf271687088eb26b97d4118dd4e6d9ed61e1769c30bcac564bab4c20dc7072de14d3495f796c2efe612c784ef SHA512 bbb90ed185357736b4a25a3333fd8e9b90925a90ee5ea0ba3c2eac36f213d26817ee2cb0544f288eaef234c49c0a5bae2f399d283e35477da73b8b60a6777b13
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/kodi-19.0-r1.ebuild b/media-tv/kodi/kodi-19.0-r2.ebuild
index 011c42cd8f58..8540230410e9 100644
--- a/media-tv/kodi/kodi-19.0-r1.ebuild
+++ b/media-tv/kodi/kodi-19.0-r2.ebuild
@@ -92,7 +92,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	dev-libs/libfstrcmp
 	gbm? (
 		>=dev-libs/libinput-1.10.5
-		media-libs/mesa[gbm]
+		media-libs/mesa[gbm(+)]
 		x11-libs/libxkbcommon
 	)
 	gles? (
@@ -104,7 +104,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	media-fonts/roboto
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl] )
+	!raspberry-pi? ( media-libs/mesa[egl(+)] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
@@ -121,7 +121,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	!gles? ( media-libs/glu )
 	>=dev-libs/openssl-1.0.2l:0=
 	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
+		|| ( 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(+)] )
diff --git a/media-tv/kodi/kodi-19.1-r1.ebuild b/media-tv/kodi/kodi-19.1-r2.ebuild
index 364b5cbd5ed3..5dc4cc3fc8e9 100644
--- a/media-tv/kodi/kodi-19.1-r1.ebuild
+++ b/media-tv/kodi/kodi-19.1-r2.ebuild
@@ -96,7 +96,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	dev-libs/libfstrcmp
 	gbm? (
 		>=dev-libs/libinput-1.10.5
-		media-libs/mesa[gbm]
+		media-libs/mesa[gbm(+)]
 		x11-libs/libxkbcommon
 	)
 	gles? (
@@ -108,7 +108,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	media-fonts/roboto
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl] )
+	!raspberry-pi? ( media-libs/mesa[egl(+)] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
@@ -125,7 +125,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	!gles? ( media-libs/glu )
 	>=dev-libs/openssl-1.0.2l:0=
 	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
+		|| ( 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(+)] )
diff --git a/media-tv/kodi/kodi-19.2.ebuild b/media-tv/kodi/kodi-19.2-r1.ebuild
index 297409ecfaf0..ce99caf2c47f 100644
--- a/media-tv/kodi/kodi-19.2.ebuild
+++ b/media-tv/kodi/kodi-19.2-r1.ebuild
@@ -93,7 +93,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	dev-libs/libfstrcmp
 	gbm? (
 		>=dev-libs/libinput-1.10.5
-		media-libs/mesa[gbm]
+		media-libs/mesa[gbm(+)]
 		x11-libs/libxkbcommon
 	)
 	gles? (
@@ -105,7 +105,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	media-fonts/roboto
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl] )
+	!raspberry-pi? ( media-libs/mesa[egl(+)] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
@@ -122,7 +122,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	!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] )
+		|| ( 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(+)] )
diff --git a/media-tv/kodi/kodi-19.3.ebuild b/media-tv/kodi/kodi-19.3-r1.ebuild
index 297409ecfaf0..ce99caf2c47f 100644
--- a/media-tv/kodi/kodi-19.3.ebuild
+++ b/media-tv/kodi/kodi-19.3-r1.ebuild
@@ -93,7 +93,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	dev-libs/libfstrcmp
 	gbm? (
 		>=dev-libs/libinput-1.10.5
-		media-libs/mesa[gbm]
+		media-libs/mesa[gbm(+)]
 		x11-libs/libxkbcommon
 	)
 	gles? (
@@ -105,7 +105,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	media-fonts/roboto
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl] )
+	!raspberry-pi? ( media-libs/mesa[egl(+)] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
@@ -122,7 +122,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	!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] )
+		|| ( 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(+)] )
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 297409ecfaf0..ce99caf2c47f 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -93,7 +93,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	dev-libs/libfstrcmp
 	gbm? (
 		>=dev-libs/libinput-1.10.5
-		media-libs/mesa[gbm]
+		media-libs/mesa[gbm(+)]
 		x11-libs/libxkbcommon
 	)
 	gles? (
@@ -105,7 +105,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	media-fonts/roboto
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl] )
+	!raspberry-pi? ( media-libs/mesa[egl(+)] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
@@ -122,7 +122,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	!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] )
+		|| ( 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(+)] )
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index ba7860ec5fa3..e540c4b93607 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -91,7 +91,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	dev-libs/libfstrcmp
 	gbm? (
 		>=dev-libs/libinput-1.10.5
-		media-libs/mesa[gbm]
+		media-libs/mesa[gbm(+)]
 		x11-libs/libxkbcommon
 	)
 	gles? (
@@ -103,7 +103,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	media-fonts/roboto
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.15.1
-	!raspberry-pi? ( media-libs/mesa[egl] )
+	!raspberry-pi? ( media-libs/mesa[egl(+)] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
@@ -120,7 +120,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	!gles? ( media-libs/glu )
 	>=dev-libs/openssl-1.1.0:0=
 	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] )
 	)
 	pipewire? ( media-video/pipewire )
 	pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index b484134260ea..0de40943abe8 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -11,6 +11,6 @@ AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46db
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
 DIST mythtv-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092
-EBUILD mythtv-31.0-r5.ebuild 12344 BLAKE2B 614e5a4b0fda18d861ef3555a69c9af7ca0bbe1bdf2c3611d35c7f04667ad8ef38f6d2d3d3ef751ef4c1538a3937ab236ffa439d8c94b10bc6e4b480ebb6e721 SHA512 ca865900a5df068706f55561b9ebe2023bab5fe223b3defa88979c284693f8c0d154a0ed32bcdb14feb251e9f0d45df286e0a604a33712511596f57ed52d0e5e
-EBUILD mythtv-31.0_p20210731.ebuild 12453 BLAKE2B 8c0771c16357803c0340179f807f5387c578b16332318c58e24c487672cf3c32b9dd0bbd56110b759413c657dab2515f3a8f16207a1788be5e1a0dedb42cebf6 SHA512 a299ddfd24c059935efd36d7a06986c846aa493b9f102741efd5d0fb62e8460766ac7e8780aed21bebc3c9aab9766f8720869cb0f42407ac7922d223caef20e9
+EBUILD mythtv-31.0-r6.ebuild 12347 BLAKE2B 619330a3762961639f26f6899f53b15ce950a2b6e31b8345df9751be230dda076ac9f304840bcb26d5dae218228e3b05acb14653f6a440e4e593ea458bef7e49 SHA512 d8a1732e25c6fea59a7066b2ac7051021801fd6dca55b4990ed57127de5efd8589ff51622105776b4ba9131e1b85b354a952179b3be2b0783a29f11be6dd07ec
+EBUILD mythtv-31.0_p20210731-r1.ebuild 12456 BLAKE2B 96c9dab397bcdbbc3967329e98fc4a5bef837db458a45ace6f03e9eb7e3a84c981783b0dd73979baa11bd38d20635617d18be136f6d430f1d314295befef7c92 SHA512 e113f79ea739474062c570e756d7014dc493a5128d0d1497464e63abe7580dc79710797d2b99aad34406435c7dc0c6a3883c5a49ef7f83da11b9b616be2e0ee7
 MISC metadata.xml 2239 BLAKE2B b8b2c890bec1edfdc46ed53ddfc694af63ed762996759b7dd0a03c0d743874256deb0cae4cad36f9ce28388f349a023528536f828e86e51b93ffdc50597d55d6 SHA512 1b6abf1bafa4a34cc91209b23d8b8957852f7efda3013f2868086faf3d14f28b8c9e84edc1a07f09e952723dc406c5ea8be809935f45750be7155970d165c421
diff --git a/media-tv/mythtv/mythtv-31.0-r5.ebuild b/media-tv/mythtv/mythtv-31.0-r6.ebuild
index 45f316f6ed08..3c56430412b7 100644
--- a/media-tv/mythtv/mythtv-31.0-r5.ebuild
+++ b/media-tv/mythtv/mythtv-31.0-r6.ebuild
@@ -69,7 +69,7 @@ RDEPEND="
 		media-libs/libdvdcss
 		sys-fs/udisks:2
 	)
-	egl? ( media-libs/mesa[egl] )
+	egl? ( media-libs/mesa[egl(+)] )
 	fftw? ( sci-libs/fftw:3.0=[threads] )
 	hdhomerun? ( media-libs/libhdhomerun )
 	ieee1394? (
diff --git a/media-tv/mythtv/mythtv-31.0_p20210731.ebuild b/media-tv/mythtv/mythtv-31.0_p20210731-r1.ebuild
index 811cdfd2ce02..f7c558464048 100644
--- a/media-tv/mythtv/mythtv-31.0_p20210731.ebuild
+++ b/media-tv/mythtv/mythtv-31.0_p20210731-r1.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
 		media-libs/libdvdcss
 		sys-fs/udisks:2
 	)
-	egl? ( media-libs/mesa[egl] )
+	egl? ( media-libs/mesa[egl(+)] )
 	fftw? ( sci-libs/fftw:3.0=[threads] )
 	hdhomerun? ( media-libs/libhdhomerun )
 	ieee1394? (
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 7a3155bc56df..4c2e30a40c81 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -4,10 +4,10 @@ AUX plex-media-server.conf.d 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe
 AUX plex-media-server.init.d 380 BLAKE2B 03d5737128390c13d914a94e8d861cf24abed92b2a5c672e72cd7dad8ed9a71ba7bccc28f06acaf5920be7d0b809746b6a8f4daffef4594830cf8ad5f071a2f5 SHA512 44ddd5a046851f77f550ff9f0bf158a3bce465101b5fdbd31b68ed64dc6c8e823f70c05b833f97101b4608256422ff4aa026114fac17f9e6e3670602ed9ef816
 AUX plexmediaserver 89 BLAKE2B c7866fce849e6ce2a15ec5a1550146072aa62d278ee47bf2ca70327babf5877750c0749d879e51bacc05ddd242d8a46c808665b9f299cee999dfa2d243ced073 SHA512 798a1736133339865aa1ffc6074720e84b28f3e3298c044019ec4959ba724f7a96dcbfcac29f1f39252cadb2a863a500423027970e5f2699e806bc4d532d9974
 AUX start_pms 1768 BLAKE2B c111f268535f03f1763c9a2f16ccc4a317f9540721a1c89e33306d6ad6d6ee34673d6a13326923c2fa399d1a3f7ad3e26c89d097de8f977a9ad7973c99dff811 SHA512 8c672a9de6f20c968869fb2bd643bdfe6d3e7ca6d89dfddfd5d7a4bc425a34e1b30ba711a0f0afd79df428df4151a59f18880cff7e0ef12df146421f299858c5
-DIST plexmediaserver_1.24.1.4931-1a38e63c6_amd64.deb 87347750 BLAKE2B 4cfe52f29257401fc333960c0de85065d9977a5cc5a49488bca904aef9d0778fce7b2a5dea753ebf394f3dd98a4bff52f7ee3db3c938f6272f210ac1b3766256 SHA512 d2d4631e951b130c39cf49741f7cc145482ed4d03f823441bc9564354836b10fd3eb441bc053f5447679646d659d8bf7ace3ff15bd06dbbab4a218a931b51769
-DIST plexmediaserver_1.24.1.4931-1a38e63c6_i386.deb 79765562 BLAKE2B 3752fda531e5c2139240c0af1927c2ba55abde4ecb6f71d244bf37f5d8ef47a2fdff51ea76c7fbe0878ed6c9292e5b0b98f1f9934a8aa71fc9991c265c3f11fe SHA512 7d87fc54c5536b3cc1d221d0bca0f6a63c282ff26fc2cb5b63595633553821dac344f508e7c39f17db91414a1d424428896c09b3c1806a841014fe68afdc111e
 DIST plexmediaserver_1.24.2.4973-2b1b51db9_amd64.deb 86646728 BLAKE2B bbf06b3e0c879f687000ad2bd6a3a19c62a1e8f6cedf9a713a1d3772c9dcb351d2f02d4ffcf8c4b5a68bcfba8fb296d85b3d2ba4e8450252b7ad9db5f97478c5 SHA512 c8b8a1e6d520c5b9955784639ad77031e951128a549b946e8bf50fb82447ba8e0a9071c683c97d50c120cfb5c9581eab883a68ff15263ee416a0543bf8d940b9
 DIST plexmediaserver_1.24.2.4973-2b1b51db9_i386.deb 79557092 BLAKE2B 90afb0880f6c95b382456c60d8b039e189df0dba531258f1fda52fe8d360052131e4af7bb21ced59870ccd38a10857512058b47d7323e1e431500c643c8259ba SHA512 dea8cc65b126ecebd4ac78911f560f8622c8276b5306d07a822cdb650bb9ee4c54c6dd56dada059516ba554aec37d9e8f22f75fb415a533d452086f1e264762d
-EBUILD plex-media-server-1.24.1.4931.ebuild 1897 BLAKE2B 0715aaf1a8bbb2613099747c25211d8c52d3d6e83baa5f00f9f1010c37e6ccfd7b3835216c4ae9b380eef6dcc56c977ec63b1a3fcda306a0392014e10cefb9e9 SHA512 a976cc9a85525c96b143e3302c127aa4fb30bcd8bb805120b4e4347f171e2154cd6f7f88181d4d145b2996f76c608e1b2a0ad4d395af1746f0359cd0d8f24059
+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
 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 598 BLAKE2B 52dadc2654893adb01e92020d068724c673ab643f7d62e313ace06e6f73405d5a81d26fff4fa91c61d045ca905bd277b5c519d14ebcdd6d945542beeb4c8fdb5 SHA512 c9581810d463e5cb09b85a01149f697a229e6df0c6f1a7dd7b4a82f63048b24c875f072cba7c568a1dce946c122e181c597cefc011a96e45af803cb8957a117e
diff --git a/media-tv/plex-media-server/plex-media-server-1.24.1.4931.ebuild b/media-tv/plex-media-server/plex-media-server-1.24.4.5081.ebuild
index 0c8867ffe82b..e313293fa758 100644
--- a/media-tv/plex-media-server/plex-media-server-1.24.1.4931.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.24.4.5081.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit readme.gentoo-r1 systemd unpacker
 
-MY_PV="${PV}-1a38e63c6"
+MY_PV="${PV}-e362dc1ee"
 MY_URI="https://downloads.plex.tv/plex-media-server-new"
 
 DESCRIPTION="Free media library that is intended for use with a plex client"
@@ -41,7 +41,7 @@ src_install() {
 
 	# Add user config file
 	mkdir -p "${ED}/etc/default" || die
-	cp "${FILESDIR}/plexmediaserver" "${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
@@ -53,8 +53,7 @@ src_install() {
 	keepdir /var/lib/plexmediaserver
 	fowners plex:plex /var/lib/plexmediaserver
 
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
+	newinitd usr/lib/plexmediaserver/lib/plexmediaserver.init "${PN}"
 
 	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
 	keepdir /var/lib/plexmediaserver