7 files changed, 6 insertions, 87 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f92c4b5f4ac6..ea8af2b7e5e1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 3f6995a16ced..7eb58b4c3559 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,5 +1,3 @@
-DIST guvcview-src-2.0.8.tar.bz2 902736 BLAKE2B 3c4ced349a252f365d86dc30c5208d09372796cc6397a9643b31afb9904642c7a88481d6054b3523a4f9d037e69021ae84ced420364e69ab9e7f19fbc0b84c6a SHA512 ba959602bc5518426906786416e433cc8b6de1e0fd73b91378aa231ae4e469935921e87dd37827c3c6b409f0f9551e3e29d0cd3d30afd0e08ad3eb2e6bf5150a
 DIST guvcview-src-2.1.0.tar.bz2 775670 BLAKE2B e6f0fe87b1c44e00265228195b93bb5863170487fd1c3b9741667dc32295406bd920f44150efaecb42ab9396ec67897d3bef517e29ee788c2a6a8a6a95692f81 SHA512 f449e1b1623bb2a96847fc88c4e334ff5bde91f0f9779e37ccbd5777fb96ea4106c3df2c9c30f5d6cacf99e4da04815fc3b739387c2a8fb496c3080b1f99ab70
-EBUILD guvcview-2.0.8.ebuild 1583 BLAKE2B 5630106ae1f320af23b6f16f5b1c5945de2e0072f0163a3fac79fc8d4d5361d7e8288d877caf310c31b577448ed99df15181389a82b9205f20bb35f489605eb1 SHA512 6ae09e7755fbf3fb91031f648258d0b2c9e048f01e9828287a44efb84a1d5b25b1061a5e9eb6516f63c6a0ca73183a224b605a52675c528783491a944fc758bf
 EBUILD guvcview-2.1.0.ebuild 1553 BLAKE2B 4f4fdc3d02762f8744edd62edbad8c144a004438ae6050978b331b48a05427356b1a580f4736b63ac3dc77edc8f97050e5b385cb5171a9a4d4af24b94502e10a SHA512 918ba2f2730aa03802a136588d7986232728cd9fb0e210655aa6c17947e602be1d35283161064909a94ef14eab3e7b40d60afea881576edeea36d5f12da02df2
 MISC metadata.xml 381 BLAKE2B d720778a6b2eb8b44e4e14d00129463dfe9d1b00ae8f65df21e91dd5fd9a3a34a17fcd646227b8da5d38291d01b1cbc52050ec3f15e5ea983e6c4bc11268735d SHA512 28c16af3583e468277389a9a80a24b0e2a5b9515fcb5e3840edc399c20d57df669cea911d4f62461f4d75211c7396d5a12ef61d73554eeb0a8ea78ad7e6e7d1f
diff --git a/media-video/guvcview/guvcview-2.0.8.ebuild b/media-video/guvcview/guvcview-2.0.8.ebuild
deleted file mode 100644
index d00ccad28bc2..000000000000
--- a/media-video/guvcview/guvcview-2.0.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=${PN}-src-${PV}
-inherit autotools qmake-utils toolchain-funcs
-
-DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices"
-HOMEPAGE="http://guvcview.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gsl pulseaudio qt5"
-
-BDEPEND="
-	dev-util/intltool
-	dev-build/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-libs/glib-2.10
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	media-libs/libv4l
-	>=media-libs/portaudio-19_pre
-	>=media-video/ffmpeg-2.8:0=
-	virtual/libusb:1
-	virtual/udev
-	gsl? ( >=sci-libs/gsl-1.15:= )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	!qt5? ( >=x11-libs/gtk+-3.6:3 )
-"
-# linux-headers: bug 448260
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.4-r2
-	virtual/os-headers
-"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-src_prepare() {
-	default
-	sed -i '/^docdir/,/^$/d' Makefile.am || die
-	echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984
-	eautoreconf
-}
-
-src_configure() {
-	export MOC="$(qt5_get_bindir)/moc"
-
-	# 599030
-	tc-export CC CXX
-
-	local myeconfargs=(
-		--disable-debian-menu
-		--disable-static
-		$(use_enable gsl)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5)
-		$(use_enable !qt5 gtk3)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 2e29f4aa1267..0a7993ab76a3 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,5 +11,5 @@ DIST mplayer-1.5_p20231206.tar.xz 15212032 BLAKE2B c4658a0070296a9e24bb8388787a2
 EBUILD mplayer-1.5_p20230215.ebuild 17495 BLAKE2B 00fbaddadf64602f68a02c1fadf950081697f749003454165154792c78e0da4a4132e1c766c5fefece67ea98b947324a2e0f1ebc13a733b36368b416fe68850e SHA512 ea127eb56b1a6f5df61e9ed7fabea50ea56b53f9f3c3986acd8aa9fee638fc11495d80d62e8e990489f4488f87aa72d2e1977693dd48304fec50076d506091b2
 EBUILD mplayer-1.5_p20230618.ebuild 17887 BLAKE2B 09ffce401d06826d180e5694469fc2014e97abfe7417f60b00c2469e16c59c3e2d2fb506d5b5573724bd6e391497e0dfb237166e6ef6eef1333a35f341c41bc7 SHA512 7a82ebee32e708ea5133a79f7b3e1d4f1102bbad8c874d3a3bc7def70361fd8703140455f4a35af3752a143b0ec4249208aaa76ff5e655c4639b3eb2bc4aa39a
 EBUILD mplayer-1.5_p20231206.ebuild 17908 BLAKE2B 15016d72084f6dfacee9bb4e21f3d62421b4f8c625b323071f1dc288231850c6c0eb7e216b6e14221edae2041abcae19d7d6a6df6a595d3e561172df561c9235 SHA512 bab83f04006922dfd467e1ecd904d8e206b1468c2d49f449e8b11fc381606f4d11ffd496c620b87b72ff0bf1dc2da9f12d84674d461460503421740a5373bee9
-EBUILD mplayer-9999.ebuild 17847 BLAKE2B 9f9ee521826c84609cb6c7642cf031da978c7b0ed5f52ed4d71dda64b68824a7710d8caa94e062f0aedc68b8076a39ff0e90e3e8edb6fca7088400699417d7b2 SHA512 ab3adb7ce75b94544cbea35f4e4e18792d9103847138529700ef33540dcb3ff68cc23fe1239af23346c6dfd3f1b2b10dcf02911410627787d091e3b9b372c1c7
+EBUILD mplayer-9999.ebuild 17840 BLAKE2B 2fe583c53048f2fd66bbd3b63331fdc9906df313c704907127d32c1504a702b29a7db8618429ab6f979dfabc36ef8cad21d0cec7feed9861944176bbb2a210a5 SHA512 6a4dbb74ded57d6c472f9313c569cd67474b4dfb3e4a7fe64fca297a569bd367db7a6e49d9c352bbbbb72afccb39d4bc7f98f9c7ef9f498d70b2664c63087a6f
 MISC metadata.xml 2475 BLAKE2B 5a083ce5b8ed729245ec9eaf544be95f6cbdb9fcb5b80d3a21195557c3aede46d09bd93a0d1acd3830fc796f90dd5f15a17a3d3c69ba2a1a54a0676264dd02de SHA512 f04082ffd63adf9102dd82eb5b4c628fbf912701c7dae69f0b00bbad4e0957355e43369912e9422acc087200de982920c212efb60ba9c26675f74fd5f37fd739
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 2257a9dbf343..6b3151bed816 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -124,13 +124,11 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:= )
 	pnm? ( media-libs/netpbm )
-	pulseaudio? ( media-sound/pulseaudio )
-	rar? (
-		|| (
+	pulseaudio? ( media-libs/libpulse )
+	rar? ( || (
 			app-arch/unrar
 			app-arch/rar
-		)
-	)
+	) )
 	rtmp? ( media-video/rtmpdump )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl )
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index 003ca3115517..ff7561ba10d9 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,3 +1,3 @@
 DIST vcsi-7.0.16-r1.tar.gz 36775 BLAKE2B 02d850c1a2bcf69387d3b3b9bfcddc0a34c746af88604f848bb567ba975763eecf03c122a0ee88ab68b3254f669a2133fb64cffb77270557034d9ceb8ffd7894 SHA512 1e9f77a2cd1f4fca0cf051ea6f0600d2307136d2adbe8b51b2a81371136fd3cac5ea2c18a1ac00ef7e85e10f536582224c613fbbfc7acf1b8eb70fdfb32b0889
-EBUILD vcsi-7.0.16.ebuild 804 BLAKE2B 572e4024e1683a23c748b977736a4e8c934267c46e3667c995b2654437e49d8b4a25709d3b2c8b8679ca60eaebbb282dbc9c0a23db0c4db29ae09352ce3afb07 SHA512 d4a938a5899b433739f33411348c628031ebf7ed0d63236fe0b868cbda82532775660c4f2674c7e99c278047cc023996e685f32f4b560953c79f6f20b38f2af2
+EBUILD vcsi-7.0.16.ebuild 805 BLAKE2B 8a3ebe9d2067760f14c3e59df9eb698dcfa7450446c7d619b82b25280ee306d241453c94d5040e3609e311d7d6dad11babaea2a982b6d4c4cc4630a83da486c5 SHA512 a44b00e1ac0465c913b32c019ddf22f258c93eab85f58420dd64820698539c37046b90ca7fa2a70828dc1a09117412be07ec9b82aff68ccceadd4722e2db0f42
 MISC metadata.xml 360 BLAKE2B ce24ac556a68afcb83ed4743d9325e022db13f1a7822c48a12d04b1de0bdac9c007d133637a79db2543fa478b518ea2492e52de5f0eb70cdf8b84bb78d43e793 SHA512 e12514604784ae5f5de50c692fada83d0fe7a5735c5d21346f08303d74e0722427fa7c10caaf5c84fb03ff484227948d77c3429a35d3532eea67f7cd9e20f448
diff --git a/media-video/vcsi/vcsi-7.0.16.ebuild b/media-video/vcsi/vcsi-7.0.16.ebuild
index d855b6fb8cd1..3d90d044c130 100644
--- a/media-video/vcsi/vcsi-7.0.16.ebuild
+++ b/media-video/vcsi/vcsi-7.0.16.ebuild
@@ -18,7 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
+RDEPEND="dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/parsedatetime[${PYTHON_USEDEP}]
 	dev-python/pillow[jpeg,truetype,${PYTHON_USEDEP}]