Merge branch 'next'

13 files changed, 7 insertions, 208 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 63f6711e78d4..207ee02eb815 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 626350eed4c3..30a50037e2b7 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -4,5 +4,5 @@ DIST movit-1.6.1.tar.gz 870278 BLAKE2B 736b34cf4d5a9d9b59e56dc994d467ffc33e86c8b
 DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7
 EBUILD movit-1.2.0.ebuild 750 BLAKE2B 73e786af169f9ef8cf00ff84e0de2a0ec9447eac79c99e609bbcd6b9636f54b6438bbef0d8e022f42c6e7765a824c64d45b21fcfd9c5a1d3536c566d469e8ba0 SHA512 9afdcef285b790f47358946e81a731e07f2e7d78dfc0824d162789fef4b8bb8f056b24cb16da3195f31a7e9a2a75a015238d9fcd0eeac05d9b5a871349ba062d
 EBUILD movit-1.6.1.ebuild 769 BLAKE2B 24408b89d61c5f1906b6984ab96c670247f5671b8825fc20609b1cd5779ed0575d5963b03c90ef896e38305e7f9c14daeb84ca52618681ecac457f1e9048e11b SHA512 373b280233db085556e2ee56a9c2ea1777023b61aaabb302b059487fbda491b602571b55369a3a0d28b100912595ce832681c4fd6885871b79ceb6c7a5ec1963
-EBUILD movit-1.6.2.ebuild 771 BLAKE2B 62d7d32042b5f4ba63edc3a6fb83aed1299fb05f2e092935d1092f87ea68d06e0ee47834d70d01e91bd98660d73c1f2e911cbd812ebf1accd670c21fa8af6e4d SHA512 8c7ac47a2e308d6d18b490d29feeb86881cfb5d245d98310a75a5d58ba1dd5c140f37b16effd2b36db258906cedeb5cf7d66aa6b1cdd5ee8e79bcc7f0d6ea5e4
+EBUILD movit-1.6.2.ebuild 770 BLAKE2B d9eae27b907bb2b461227685adffd633c4f978e507ab648d8b85e10c348c7d832782169bbf419d8fcba8d2156c92ce4fcc4c9d7049d833d1af2a92272504886c SHA512 6732ddbd8bf380e59e1d7f9e0afcc1d12ab171d7738d149761a10dac690ec8e28b835ba8ee444982b9d26385b8fc07e20194d7250d284a8977a378e69d1ece3e
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
index b515ff5747a1..3e85ddf5b02e 100644
--- a/media-video/movit/movit-1.6.2.ebuild
+++ b/media-video/movit/movit-1.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://movit.sesse.net/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="media-libs/mesa[X(+)]
diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
index 37fb4adc3b5a..54709b0e6e41 100644
--- a/media-video/photofilmstrip/Manifest
+++ b/media-video/photofilmstrip/Manifest
@@ -1,8 +1,4 @@
-AUX photofilmstrip-2.1.0-PIL_modules_imports_fix.patch 3432 BLAKE2B 05626efec54a20a1e5be19a3128a50a2e32164f36ebc3f86b74bf0dbab9d5d296a435dfc25ff5b35f5aa0817dcfd16b8a8868768073156db3cc8d267d4630e94 SHA512 d37c31f89d421014023a1b9bb7be1a78731a056a6332e2d1040e1bdc90c7e5652e53b8708e23f68e5ae289063c27e7a05d7c8369845a36d8665297babd23f68a
-AUX photofilmstrip-2.1.0-PIL_tostring_fix.patch 1479 BLAKE2B ce193bc77c20f755bfe3f8777a9371a152ff15bb8b3d0ce2f0003eb449f22bce943d4bd737d251d7e5212fd0776611620b1151ff9a7f7b07201db851273f57af SHA512 d08bfc7b77dd6a7e6ef38b74cb40bb9817fd272d22f598318a1313b08901fd042808cbfba25d3a748f8f9fba1c900b9c920db28cc95ac9d2424d5e3cb971ffaf
 AUX photofilmstrip-3.7.1-disable-docs-by-default.patch 379 BLAKE2B 8af4a4e5ab1f407ba72dad0975a5f17e2eb245a42484dcfcb996a785dc2a49c4e5c22a5136e4dc0c375dc0dc16baeb4cc4ef60b7ec21b48b6f11fadc91383e3f SHA512 92f24eac04653e2be160872a553d96d1d0c763c50879fc124ae3dd9a3f84d7988274965f122eb4ba7709ee9f65409e7d24fda36693129cf55a8d2cd26a4bc539
-DIST photofilmstrip-2.1.0.tar.gz 243163 BLAKE2B 30bc0de885a00b715377b262039b3c22425315e77c7e5ac7db377535f0dc3a7614bd83b894bcfbaf53601be140fef0e9754a3911958b9f71aec1e5d0214fe972 SHA512 e3cbf19d73d6cc16dcef23c11d84e5bfd1d0721cb72bb4d775390152be2fb20cab14912a9e0e73ef2d9dba9c041883591df2708cdeb7e7447cbcb18e750ea142
 DIST photofilmstrip-3.7.1.tar.gz 354585 BLAKE2B df1e8756677814f35a59d7f4d3585647393e37262eb80c3299805cb0811cdfb4a16c96f90aaa192469266805145db68a582671a34f2b2780b75f1e0318460bd7 SHA512 fc2284c6c52eea5d9a6415149681e26505d6e084ad31897c44cde8e2b4845584b8521b375da06fd0a59179bfa73f6aabe769caad7a8186d5f87ecacebaff24fb
-EBUILD photofilmstrip-2.1.0-r2.ebuild 1485 BLAKE2B a059225726d6d4d960411d9050a28695a4352f83121f0e504f5370fc0e1246ef58e5eac21a128d30caed0c0afe2bab9fe92ddd2d5a8c69b3ec0ecabd4d58c027 SHA512 d33f7b219a450b1f6517075420675c23b4176763171bbdf4b7baa37f350c9b4a3e80f4c04fc667b80f3aee69d797a97261f8ecf3776418b2b10868becab7c762
 EBUILD photofilmstrip-3.7.1.ebuild 2055 BLAKE2B bd3f762857a28ab28be20d1070539f6cc3fe6e63f111e4d4992a82d9b733a1df08bbd327387b6a5bc3381695d881394ab462644fe3510c0c5fa80f3bfe43941e SHA512 39cc395df0c5dc2de391e1d54d4e77656839502c4e9109e63f2d582b11b80cea54d3e0d6b2b74e1b3be6117d6f7f55627f7dfa13ffbb49938e5b5de72488b247
 MISC metadata.xml 683 BLAKE2B 517c2479c9ce8b3d78afd530cd6f97fcd6fefc73aaffc889584729035151d40fdd5cfe8efcf285aa5e6f3522af8825dab0e214cd5f252bb69da3f5c2b6f17c44 SHA512 58801972ef5326f757ce11964e47267df3b199f36290d0d81d3fecc97f59f678a110c107082d8d8bdebd54fc7268dd75a463a089aa22361157f4770f0d6b7251
diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch
deleted file mode 100644
index 989459775413..000000000000
--- a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- photofilmstrip-2.1.0-orig/photofilmstrip/core/__init__.py
-+++ photofilmstrip-2.1.0/photofilmstrip/core/__init__.py
-@@ -22,47 +22,47 @@
- # WA: py2exe and PIL
- import os
- if os.name == "nt":
--    import Image
-+    import PIL.Image as Image
- 
--    import ArgImagePlugin
--    import BmpImagePlugin
--    import BufrStubImagePlugin
--    import CurImagePlugin
--    import DcxImagePlugin
--    import EpsImagePlugin
--    import FitsStubImagePlugin
--    import FliImagePlugin
--    import FpxImagePlugin
--    import GbrImagePlugin
--    import GifImagePlugin
--    import GribStubImagePlugin
--    import Hdf5StubImagePlugin
--    import IcnsImagePlugin
--    import IcoImagePlugin
--    import ImImagePlugin
--    import ImtImagePlugin
--    import IptcImagePlugin
--    import JpegImagePlugin
--    import McIdasImagePlugin
--    import MicImagePlugin
--    import MpegImagePlugin
--    import MspImagePlugin
--    import PalmImagePlugin
--    import PcdImagePlugin
--    import PcxImagePlugin
--    import PdfImagePlugin
--    import PixarImagePlugin
--    import PngImagePlugin
--    import PpmImagePlugin
--    import PsdImagePlugin
--    import SgiImagePlugin
--    import SpiderImagePlugin
--    import SunImagePlugin
--    import TgaImagePlugin
--    import TiffImagePlugin
--    import WmfImagePlugin
--    import XbmImagePlugin
--    import XpmImagePlugin
--    import XVThumbImagePlugin
-+    import PIL.ArgImagePlugin as ArgImagePlugin
-+    import PIL.BmpImagePlugin as BmpImagePlugin
-+    import PIL.BufrStubImagePlugin as BufrStubImagePlugin
-+    import PIL.CurImagePlugin as CurImagePlugin
-+    import PIL.DcxImagePlugin as DcxImagePlugin
-+    import PIL.EpsImagePlugin as EpsImagePlugin
-+    import PIL.FitsStubImagePlugin as FitsStubImagePlugin
-+    import PIL.FliImagePlugin as FliImagePlugin
-+    import PIL.FpxImagePlugin as FpxImagePlugin
-+    import PIL.GbrImagePlugin as GbrImagePlugin
-+    import PIL.GifImagePlugin as GifImagePlugin
-+    import PIL.GribStubImagePlugin as GribStubImagePlugin
-+    import PIL.Hdf5StubImagePlugin as Hdf5StubImagePlugin
-+    import PIL.IcnsImagePlugin as IcnsImagePlugin
-+    import PIL.IcoImagePlugin as IcoImagePlugin
-+    import PIL.ImImagePlugin as ImImagePlugin
-+    import PIL.ImtImagePlugin as ImtImagePlugin
-+    import PIL.IptcImagePlugin as IptcImagePlugin
-+    import PIL.JpegImagePlugin as JpegImagePlugin
-+    import PIL.McIdasImagePlugin as McIdasImagePlugin
-+    import PIL.MicImagePlugin as MicImagePlugin
-+    import PIL.MpegImagePlugin as MpegImagePlugin
-+    import PIL.MspImagePlugin as MspImagePlugin
-+    import PIL.PalmImagePlugin as PalmImagePlugin
-+    import PIL.PcdImagePlugin as PcdImagePlugin
-+    import PIL.PcxImagePlugin as PcxImagePlugin
-+    import PIL.PdfImagePlugin as PdfImagePlugin
-+    import PIL.PixarImagePlugin as PixarImagePlugin
-+    import PIL.PngImagePlugin as PngImagePlugin
-+    import PIL.PpmImagePlugin as PpmImagePlugin
-+    import PIL.PsdImagePlugin as PsdImagePlugin
-+    import PIL.SgiImagePlugin as SgiImagePlugin
-+    import PIL.SpiderImagePlugin as SpiderImagePlugin
-+    import PIL.SunImagePlugin as SunImagePlugin
-+    import PIL.TgaImagePlugin as TgaImagePlugin
-+    import PIL.TiffImagePlugin as TiffImagePlugin
-+    import PIL.WmfImagePlugin as WmfImagePlugin
-+    import PIL.XbmImagePlugin as XbmImagePlugin
-+    import PIL.XpmImagePlugin as XpmImagePlugin
-+    import PIL.XVThumbImagePlugin as XVThumbImagePlugin
-     Image._initialized=2
- # WA: end
diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch
deleted file mode 100644
index dc29c9c8e14f..000000000000
--- a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Gentoo-Bug: https://bugs.gentoo.org/584128
-
---- a/photofilmstrip/core/ProjectFile.py
-+++ b/photofilmstrip/core/ProjectFile.py
-@@ -196,7 +196,7 @@
-     def __ThumbToQuery(self, picId, pic):
-         pilThumb = PILBackend.GetThumbnail(pic, height=120)
-         thumbWidth, thumbHeight = pilThumb.size
--        thumbData = buffer(pilThumb.tostring())
-+        thumbData = buffer(pilThumb.tobytes())
-         
-         query = "INSERT INTO `thumbnail` (" \
-                     "picture_id, width, height, data" \
---- a/photofilmstrip/core/renderer/CairoRenderer.py
-+++ b/photofilmstrip/core/renderer/CairoRenderer.py
-@@ -121,7 +121,7 @@
-     def _PilToCairo(self, pilImg):
-         pilImg = pilImg.copy()
-         w, h = pilImg.size  
--        data = pilImg.convert('RGBA').tostring()
-+        data = pilImg.convert('RGBA').tobytes()
-         buff = array.array('B', data)
-         cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_ARGB32, w, h)
- #        cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_RGB24, w, h)
---- a/photofilmstrip/core/renderer/PyGameRenderer.py
-+++ b/photofilmstrip/core/renderer/PyGameRenderer.py
-@@ -100,7 +100,7 @@
-     def _PilToPyGame(self, pilImg):
-         mode = pilImg.mode
-         assert mode in "RGB", "RGBA"
--        return pygame.image.fromstring(pilImg.tostring(), pilImg.size, mode)
-+        return pygame.image.frombytes(pilImg.tobytes(), pilImg.size, mode)
- 
- 
- #    def CropAndResize(self, ctx, rect):
diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild
deleted file mode 100644
index d20fa98d7060..000000000000
--- a/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Movie slideshow creator using Ken Burns effect"
-HOMEPAGE="http://www.photofilmstrip.org"
-SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}/${P}.tar.gz"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo sdl"
-
-RDEPEND="
-	dev-python/wxpython:3.0[cairo?,${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-video/mplayer[encode]
-	sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-# Fix bug #472774 (https://bugs.gentoo.org/show_bug.cgi?id=472774)
-PATCHES=(
-	"${FILESDIR}/${P}-PIL_modules_imports_fix.patch"
-	"${FILESDIR}/${P}-PIL_tostring_fix.patch"
-)
-
-DOCS=( CHANGES COPYING README )
-
-src_prepare() {
-	# Remove unneeded icon resources update needing running X
-	# Fix app doc/help files paths
-	sed -i \
-		-e '/self\._make_resources\(\)/d' \
-		-e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \
-		setup.py || die
-
-	sed -i \
-		 -e "s:\"photofilmstrip\":\"${PF}\":" \
-		 photofilmstrip/gui/HelpViewer.py || die
-
-	# Fix desktop file entry
-	sed -i \
-		-e '/^Version.*/d' \
-		data/photofilmstrip.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doman docs/manpage/*
-
-	# Do not compress the apps help files
-	docompress -x /usr/share/doc/${PF}/${PN}.hh{c,k,p}
-
-	distutils-r1_src_install
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 3f359ea417d5..1e2244117582 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,5 +3,5 @@ AUX pipewire-0.2.6-fix-probing-without-starting.patch 2119 BLAKE2B f7180ad95f0f2
 AUX pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch 5684 BLAKE2B 9ce85e2f15b18ef458d21a44b10c875b0cb456972a61dd1ff127ad62510604d35ea6dd70daa0191181a34d2fea613ac254ffd6fa4f0fa3bb6114191e3a62996e SHA512 ba194a678b1130a29b17f1831c1a94c24db6cb05ae1d2a0e825fd1099aa2a300200d7cbfd5e5b592c54aea33893c68e554edd4bdfd1ca6cc84739b12e33058f6
 AUX pipewire-0.2.6-revert-combine-all-perms.patch 1039 BLAKE2B 5fd1d82c92680b6097ac70367eb5f7fc8190d0589d4bb228dc93c6f673763a65a7c18a5fd3b242686ba86773d90078cc50a5d7c2277dc90edcdb341d5ecb9f23 SHA512 c9bab5e79b4a88f240d34702dfe5de2df4ab7c5158d5b95228647018cb5bb69ec124fb47405074aef91480d25d388df7cdbb7fa94396d228b6f573697b2f8333
 DIST pipewire-0.2.6.tar.gz 421137 BLAKE2B 155667d14fe5380e21f0b70accea72dc4478085916a9126185136f6d33bd7729d91b790c171dcf7b6aea2c52894462d16516f8821229ca0bf9f6cde15df524d9 SHA512 3d1db41f5beb42a0ee15ae7bc8afb89b54a37c3a6a414e88b5e33ceaf98ec6dda0d9a2d03ac47a8dfce48e9637e647291919e6670bb70589b0d1951fbcbd3ff8
-EBUILD pipewire-0.2.6.ebuild 1836 BLAKE2B c076453215c8ffb67e4e61518dac5e0eb924be63a802be4f883b701ad05d6f51fd6e090bdc4c21ff9a799e532a759a9f454c9f84219dc816c73c22411d91f8e2 SHA512 132038875b9dc8ce1e19edf36c14529d7c3e974575b6becea66abf43eaba1ec4523862a10feaace9847bfa57b141d70fce84d281540fbd455d89cae7943eec54
+EBUILD pipewire-0.2.6.ebuild 1841 BLAKE2B 53bf55660ea633db8908b6ef40adc99380ea66786f61e6facbfa18fdaa7488a747de287fb01e151a77041f3767ac8eeffb973c347f36604ed5c7549923e75598 SHA512 8f70774b235c56cba113b3c060b6412cc638c1e6bb1aaafe9d98ccccc939941daa181ca6de5b5db1e854bde845f09f3799d34b9be5b646700c9245ba9083fe12
 MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c
diff --git a/media-video/pipewire/pipewire-0.2.6.ebuild b/media-video/pipewire/pipewire-0.2.6.ebuild
index 75c4a6074d2b..37e0fe081701 100644
--- a/media-video/pipewire/pipewire-0.2.6.ebuild
+++ b/media-video/pipewire/pipewire-0.2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/tcmplex-panteltje/Manifest b/media-video/tcmplex-panteltje/Manifest
index f06a69d5ebeb..1c6cf6cf0aed 100644
--- a/media-video/tcmplex-panteltje/Manifest
+++ b/media-video/tcmplex-panteltje/Manifest
@@ -1,3 +1,3 @@
 DIST tcmplex-panteltje-0.4.7.tgz 81185 BLAKE2B 048958f4544c0f0212a740e25ce27527ebf69b1510421cbc5cb752f52f3608cd498514f0ff6c45a4430cda45abc1ca5594bb7e1e3205294c16af658a8c166a96 SHA512 d8e9d802ff9d6a9df5ae9d0c0f5392cbaddcce4dc0977ff587406dd8449903941bd60ceda6b48df812f66f51e2e8cf451f9b23a006eebc736ba64b21bd0d293c
 EBUILD tcmplex-panteltje-0.4.7-r1.ebuild 549 BLAKE2B cb160d8e88dcc331a0dd7fd771cfee755cd774e2c8ecac0730579aab187712d8421715a3d3a3d8ca5673689b7e600145804404bf4ceefb4b62ed70edade7414a SHA512 0378d5dcdd58651e42315543c42c1abe7f441d3e7c95f3eb036b06111475057c43c1158eb013076f16e9bc567e41ec4a2a73497dbd587792b5b21af81061c5e5
-MISC metadata.xml 445 BLAKE2B 1a8fb0fb52895ecb3c483a140c7be1d0d4f678ae2d6dea62f98c48be7dcd6087e2c668e791331841605ec97df7a420164bee9719a93ae5b96c9b2b0c6be7a033 SHA512 94b5e8d81a6a63427566d34974ebcfd237b360711122d18c9eae15ae82edb4a2799af75cadb71d2e70e75618e67d8ec5c456eee4ba5da31354c59cb8b3d158e1
+MISC metadata.xml 334 BLAKE2B da68c733a593f81e7a8096a93827aa43bccee5f9470fccdf66ffdc76a5bb29a9bbeaa163180559714d4c7dca2c7cdd69cd50054d36a79b725100fdaaf093df43 SHA512 ea6800418e6612cab28cc5d0fb977d8227deaef467662b6c8619b974062c47b0658ff1e621b8fb85309c0f87f04afe3903053af1c21c629018a27eeec7f6c8de
diff --git a/media-video/tcmplex-panteltje/metadata.xml b/media-video/tcmplex-panteltje/metadata.xml
index e4a826d781f5..eded805f8eed 100644
--- a/media-video/tcmplex-panteltje/metadata.xml
+++ b/media-video/tcmplex-panteltje/metadata.xml
@@ -4,10 +4,6 @@
 <maintainer type="person">
   <email>lordvan@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
-  <email>hd_brummy@gentoo.org</email>
-  <name>Joerg Bornkessel</name>
-</maintainer>
 <maintainer type="project">
   <email>media-video@gentoo.org</email>
   <name>Gentoo Video project</name>
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index 54f436b72758..6d932c8bf86e 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -5,4 +5,4 @@ DIST vdr2jpeg-0.1.9.tgz 31160 BLAKE2B 6f84e82167f45b8fe3c2a00e72ed5ad660b7a895e1
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
 EBUILD vdr2jpeg-0.1.9-r1.ebuild 915 BLAKE2B b480b02f7d33f693c59941a3d5774142a3b2babc253b36e9dc13608db4403e0afecc576a66e1ba267193f50ea9b7bea5dbc2eacb36c421ad4f40de884d23fa62 SHA512 5091eee9033acef859bf3e94ba8dd28b7b27f18d1261c7819c9261f4fe603c86feb674ca09195bdd9397a8a8f6a5f88794709b0da3ba36a877ac4e4842b13fa0
 EBUILD vdr2jpeg-0.2.0.ebuild 896 BLAKE2B 76e2844841070922de6582eb022cc283834a4659c00ef0534b02d391b78c66e93419bcd80982cafa656ea7a74bec3bc3c90136d40a0b430c41a2acf85ab37dfc SHA512 a14256d860e8da83960099cb1e3fae3c9f4e60673922343af2a28e4e969fd04b4797497168ca630b34e0d12130b0bfc66ce5b2300120e93acfd2c1d67638ddd1
-MISC metadata.xml 536 BLAKE2B e69422432b87ba637e2905d7bac350ed88060952a90efaa494fe9e3fc5e41b75efb805c5372dee17c16312387a811217225043401053f9c35b08f5264c029cb1 SHA512 5e6be6b01884093e88882c9e6809c2c9d09434eec99ed2b88df9b008a01539847c48db59979fe5273699c792c732361477848ab6f7a891ce2c7ae69adcc3731a
+MISC metadata.xml 419 BLAKE2B 279c38b934b85b3727cbf916d0b8b1db9bb1c8bdd483f939e4bd074a4ad0bb01afe9e7ebc5e77809b8eba4d318cbff128f09cc97657e731d3e0d44908abf8a37 SHA512 a6f8afa146ad1ab8006c82f2a6207385ecea870d45db738ae84428ad9b6ad7cc65ed4ca26b6871d69e75cfbbfb0cf525a41394e3e17aa46d14ea081917a23ca4
diff --git a/media-video/vdr2jpeg/metadata.xml b/media-video/vdr2jpeg/metadata.xml
index b7c52134a436..5e673b528cd3 100644
--- a/media-video/vdr2jpeg/metadata.xml
+++ b/media-video/vdr2jpeg/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-			<email>hd_brummy@gentoo.org</email>
-			<name>Joerg Bornkessel</name>
-		</maintainer>
-		<maintainer type="project">
+	<maintainer type="project">
 			<email>media-video@gentoo.org</email>
 			<name>Gentoo Video project</name>
 		</maintainer>