gentoo resync : 21.08.2021

14 files changed, 103 insertions, 265 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f5cc6e08fdb8..8033c284e218 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 723396a3b039..271c25118e00 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,4 +1,4 @@
 AUX kaffeine-2.0.18-kwindowsystem-5.82.patch 885 BLAKE2B 4ea110e8ddf8fc1555953a9de61002ef3a0c2395eb0f5d1ce5516cf256ae0d4a1a92571c797ff1c48801c555073e3fda424aa180e73f4f1d4888023b6b491376 SHA512 0270e812a61669c6fe78061d2045319668d6d05f0181fb028318ad397dd230d4e21756fd304bcb0b46be4c342a1abed4c8cf046ab0b06bd4babb67c282d1ed89
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
 EBUILD kaffeine-2.0.18-r1.ebuild 1523 BLAKE2B 34353431c4762fb778b341bb7431e325aee9bb3c296427129953bcfef256823ffe2cdeae828f82830accbaff6b34fdb485fa261d1513f8180b4e0c15299a35cb SHA512 5c8843a715286fc1e3f34518ec629fc2276aba15d559810f25c74c0ceba5049c15681030e53d1d11f6431d307abfbf992365168ce66136c41f67037a4414a013
-MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
+MISC metadata.xml 437 BLAKE2B d3529bba29a6d7a30f5eaaa035c23892194974403aa31f25d82822aef3d86d42c953557e6e56ab83bda7f1d1e33e6a374eb17f090140d5b8846af7ab9c6aeac0 SHA512 e2701b8e2a323c06177d96610634947a0fb010c3cae455faa0e2844243995e3a8843a311d5e6f6005580d7b6012d4172d7c56a3b106a515b0371f1b8a8010f26
diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml
index 00c71c8a23d3..572559d50e45 100644
--- a/media-video/kaffeine/metadata.xml
+++ b/media-video/kaffeine/metadata.xml
@@ -9,4 +9,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index f30084000a9d..ff7332014ee7 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,8 +1,6 @@
 AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe438b68eb3c62804c24285862af7a2ab93a06d4f8029da9a1a2dc7817fb55eeddeded100968066b6e6d152856c14e9034cb SHA512 234c02625898f67994261e00ca940bbd597c60d2060507ee1e7391ea61353e00906325aec608d2ba545a7b4725d1ad645bd9d2cd33d23669490de3646998005b
 AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
-DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
 DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
-EBUILD mjpegtools-2.1.0-r4.ebuild 2850 BLAKE2B 5ed1abde176b50de2e0484a0f89e88fd70703a8861b072cf8b487505faff0aba9ff7e33320e81df8ecc7387d6e1114d81ebf54e2e64cf559a3d825c5ed682c91 SHA512 6f626cc2e4d1f060ec1d64699a98ee52766a18f29a78c8859e96162518e4c1ab76e347b6ffb81153faff8b4063c16e48377ef260c5838bc5fd99943a5db887e8
 EBUILD mjpegtools-2.2.0-r1.ebuild 2679 BLAKE2B 5f67591a0b27b85095b1522d1de4efe1373f1ba67a552cab271d5a933c7da6d5e42f3f53ab8daaf9a84c522ac71bc1cddf13869ffce7fe4b7a2f14adee1decea SHA512 58a9ae7d7a37ccfce311668a532b98aa0c28fc86b05cc41369f5f983e74413f3feaa360af57ff20ad62ed4f94f76f2cdaf7b6cf2dae95b0e28c3024df73ec609
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
deleted file mode 100644
index 4f884d393033..000000000000
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
-REQUIRED_USE="sdlgfx? ( sdl )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2 )
-	png? ( media-libs/libpng:0= )
-	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
-	sdl? (
-		>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		sdlgfx? ( media-libs/sdl-gfx )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-apps/sed-4
-	virtual/awk
-	cpu_flags_x86_mmx? ( dev-lang/nasm )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pic.patch
-	# https://sourceforge.net/p/mjpeg/bugs/139/
-	"${FILESDIR}"/${P}-sdl-cflags.patch
-	"${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-multilib_src_configure() {
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-	local myconf=(
-		--enable-compile-warnings
-		$(use_enable cpu_flags_x86_mmx simd-accel)
-		$(use_enable static-libs static)
-		--enable-largefile
-
-		$(use_with quicktime libquicktime)
-		$(use_with dv libdv)
-		$(use_with sdl libsdl)
-		--without-v4l
-		$(use_with sdl x)
-
-		# used by tools only
-		$(multilib_native_use_with gtk)
-		$(multilib_native_use_with png libpng)
-		$(multilib_native_use_with sdlgfx)
-
-		# used only in V4LCONF_LIBS that is not used anywhere...
-		--without-dga
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# avoid building programs
-		emake bin_PROGRAMS=
-	fi
-}
-
-multilib_src_test() {
-	# there are no tests at the moment, so it would just build
-	# all programs in non-native ABIs...
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install \
-			bin_PROGRAMS=
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "mjpegtools installs user contributed scripts which require additional"
-		elog "dependencies not pulled in by the installation."
-		elog "These have to be installed manually."
-		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
-		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
-	fi
-}
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 21d270e70808..e9e1507ff816 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -7,6 +7,5 @@ DIST projectx-0.91.0.10.tar.xz 830104 BLAKE2B 511481dd2c391a6a26acfa0603f1c221d0
 DIST projectx-icon.png 1692 BLAKE2B 6da85b69961b81f64638b04860b467e8cf599287513d85157aa71e4575003b8ef6e96cbe4b0b40b54bb15b6ca74c14f4bf1855c80f1f6db89294567a77f9e151 SHA512 33d9e505140d2dd22d34f87ebff040530130bbb7d1e9958d7345f442bd3d6e17dff8d243e22f374217aed20139871e406e46ca6f03ca48eb338dc3630af2417a
 DIST projectx-idctfast.tar.xz 12444 BLAKE2B e4b2a6ab235601dbdd1acf8a73a14fecb5da455670bad52598e0dbd8a7300305fad1b22b3d550dd046dcac68975af4b225e042f7c968ce9108f702d01586302f SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
-EBUILD projectx-0.91.0.10-r2.ebuild 3277 BLAKE2B a682a39f1869f45ddea86f759fe04375da69e0b0b9f40894d385e1e758c287aa608fa0b362c8161455b5fd3fca558f1f8557b3dbc27d6ad9880188e35cf0be20 SHA512 bf4a4c64e156feabf89e2b0f81097c6d2a809e7ea065601eff23fe8a78b746887a30b5c1a7bccba3d835e6fadc90d232f2a4182dd3d22425669233da7d11b531
-EBUILD projectx-0.91.0.10-r3.ebuild 3282 BLAKE2B 86e0dc08b4aa451439a1d51cd47a02919662b925d8178f32257c2de08d64a17316f44913b992abaade9b3d65b3c17eaf19dc15de9e5391dd34de835f2605e19d SHA512 03645b4c86772d82a94a4005eeb6fc5b70224ef346e1cd01ae4f5077a71d2d3ea3bcab60ccc7b1de40c95343ec042b360788ffef503c65c4145196d8df936d7a
+EBUILD projectx-0.91.0.10-r3.ebuild 3281 BLAKE2B ee583ac243692e5e6ad22e0fc1e8f62b31d89f336612fc46560069d554b5fe753081145dcbe2deca44e7ac1d468c7e09a22ed217e392a832caae9a40a084fd9a SHA512 2c1c1fe0231da7fe3f950ede177c207ca223e0abdc2242dc7d0b6fffe24707fab63a280514e5b272615cf19c278c8824b02e0688608b9f20e83d77d9ff618d60
 MISC metadata.xml 742 BLAKE2B 5aacc52def6d49258139e9435aa1db4f2295a07e4491a921db142c262c84a3deaaf8b9b22d7bc68dcd00ee142cb4f9912463f4ab2fb79eae74ea461375b1467c SHA512 3a5546c1efbafa335ee5d05ff24c2b22f0f49d8944e242348bef9627ac5e72205d9bd3e697b3d89c7d0ef3e34d98fe19b58c021f41bcaff872c74373a6803341
diff --git a/media-video/projectx/projectx-0.91.0.10-r2.ebuild b/media-video/projectx/projectx-0.91.0.10-r2.ebuild
deleted file mode 100644
index 9dc9a50eaad6..000000000000
--- a/media-video/projectx/projectx-0.91.0.10-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit desktop eutils java-pkg-2 java-ant-2 toolchain-funcs xdg
-
-XDG_P="xdg-20100731"
-
-DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
-HOMEPAGE="http://project-x.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~billie/distfiles/${PN}-idctfast.tar.xz
-	https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz
-	https://dev.gentoo.org/~billie/distfiles/${PN}-icon.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-COMMON_DEPEND="
-	dev-java/commons-net:0
-	X? ( dev-java/browserlauncher2:1.0 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jre-1.5
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jdk-1.5
-	app-arch/xz-utils
-	virtual/libiconv
-"
-
-S="${WORKDIR}/Project-X"
-
-mainclass() {
-	# read Main-Class from MANIFEST.MF
-	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	local X
-
-	# apply stdout corruption patch (zzam@gentoo.org)
-	eapply "${FILESDIR}/${PN}-0.91.0.10-stdout-corrupt.patch"
-
-	# apply BrowserLauncher2 patch
-	use X && eapply "${FILESDIR}/${PN}-0.91.0.10-bl2.patch"
-	rm -rf src/edu || die
-
-	# apply IDCTFast patch
-	eapply "${FILESDIR}/${PN}-0.91.0.10-idctfast.patch"
-
-	# apply XDG patch
-	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
-	eapply "${FILESDIR}/${PN}-0.91.0.10-xdg.patch"
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-0.91.0.10.xml" build.xml || die
-
-	# patch executable and icon
-	sed -i -e "s:^\(Exec=\).*:\1${PN}_gui:g" \
-		-e "s:^\(Icon=\).*:\1${PN}:g" *.desktop || die
-
-	# convert CRLF to LF
-	edos2unix *.txt MANIFEST.MF
-
-	# convert docs to utf-8
-	if [ -x "$(type -p iconv)" ]; then
-		for X in zutun.txt; do
-			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die
-		done
-	fi
-
-	# merge/remove resources depending on USE="X"
-	if use X; then
-		mv -f htmls resources/ || die
-	else
-		rm -rf src/net/sourceforge/dvb/projectx/gui || die
-		rm resources/*.gif || die
-	fi
-
-	# update library packages
-	cd lib || die
-	rm -f {commons-net,jakarta-oro}*.jar || die
-	java-pkg_jar-from commons-net
-	use X && java-pkg_jar-from browserlauncher2-1.0
-	java-pkg_ensure-no-bundled-jars
-}
-
-src_compile() {
-	local IDCT="idct-mjpeg"  # default IDCT implementation
-	if use x86 || use amd64; then
-		use cpu_flags_x86_mmx && IDCT="idct-mjpeg-mmx"
-		use cpu_flags_x86_sse && IDCT="idct-mjpeg-sse"
-	fi
-
-	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
-
-	cd lib/PORTABLE || die
-	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
-		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_doso lib/PORTABLE/libidctfast.so
-
-	java-pkg_dolauncher ${PN}_cli --main $(mainclass) \
-		--java_args "-Djava.awt.headless=true -Xmx256m"
-
-	if use X; then
-		java-pkg_dolauncher ${PN}_gui --main $(mainclass) \
-			--java_args "-Xmx256m"
-		dosym ${PN}_gui /usr/bin/${PN}
-		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
-		domenu *.desktop
-	else
-		dosym ${PN}_cli /usr/bin/${PN}
-	fi
-
-	dodoc *.txt
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src
-}
diff --git a/media-video/projectx/projectx-0.91.0.10-r3.ebuild b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
index d8f6c92c8c24..a6df47e09cb3 100644
--- a/media-video/projectx/projectx-0.91.0.10-r3.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
 
 COMMON_DEPEND="
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 6624ded45369..a8f364616ef1 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -3,4 +3,4 @@ AUX subtitlecomposer-0.7.0-tests-optional.patch 242 BLAKE2B 6a3d88a537ad39a151b8
 AUX subtitlecomposer-0.7.0-valid-desktop-file.patch 1090 BLAKE2B 4491d0bf738fe19374d40b2d278322694a456ac2d11394853653f44351ddf06714143164773eb6597ba4b6f55cf510803231c1241cca20cdc9822d3892f8e646 SHA512 4f2802be511da0b9f132d4368e23c06510fd0c115c8a19f5c05d0e737c355b3c061d290e38370a5992b85a48d77b23949ce3ebf675b9086d585df5be056e358b
 DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
 EBUILD subtitlecomposer-0.7.0.ebuild 2005 BLAKE2B 7ef30553b68f40208e46ca6f3338458d7c3269cf8227b8e965dcfd88ef590e6929e40a334135f83e5f2a69161668cfd2e4eede8a8100aa1915526f0b3e29808e SHA512 147ac6581658b440958fa2df73ac346c5656762a2889bd596c8c5bca99faa101b775771bd62b4567187e1e2edf2b780f567c0932f72b5d5b27a1edd2f07ae714
-MISC metadata.xml 524 BLAKE2B 662474bada941eadcab48ae4432e72af4f786ff61d2bc1db20115e2f70ca4953e01c38fd550cce72908fe5c36077d9e1b240f53e24142c7556802f3a7783d1bd SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe
+MISC metadata.xml 504 BLAKE2B dda761a3e03dc5954c8935c98f573e02281449e3bea9326a3671f7ddae83a318e255b2e9dcb3ffd1234999b0dd19d05608053684653df9e94b17b26cdbe06a40 SHA512 5185b1142a02574ebe97cfb27e023c969601d4a360b0c10eba98cb90e19e666db992cad1fc0b041f39c999394f9afd58e7ab0fffed266e15301c6735482ecff0
diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml
index bd0879e135d9..b469a3e960ac 100644
--- a/media-video/subtitlecomposer/metadata.xml
+++ b/media-video/subtitlecomposer/metadata.xml
@@ -13,6 +13,6 @@
 		<flag name="mpv">Build mpv backend support</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">maxrd2/subtitlecomposer</remote-id>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index eee6bcf9b434..768454a789b7 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -4,4 +4,5 @@ AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2
 EBUILD unifi-video-3.10.13-r2.ebuild 1965 BLAKE2B 21f735f65e95f3d0f0169a7be009d43b9a1525318faa50d9639264bba9c23a119a3bedc255a1bc7881dc94cad9346decb3acdf473732ab87ffe75caa31d8dcb6 SHA512 5c0d9af2a50cdbf82029e1b6aefad026779592828ca99a1223b1602886b078bcf383197f4a1299d7ebffbbd74b67abcbac93f911a73170cd3ec112ec85e48b32
 EBUILD unifi-video-3.10.13-r3.ebuild 1965 BLAKE2B fc71df9184fea92ec66910f36815bcffffc4869d52eb112ff56806942dc442dedfd1097c5983f669f424ccbec9f0cf3bce44bd67c3f57ba41939fc6e1b7f7d2f SHA512 d174900c49e91eed75d41526d63f36c3a055087ec1b1b042a90ed63c2a7a3b7d651a0a755a9d73489da375db3bff9b95b13d33e7abde29463d42c73bc9a3d23a
+EBUILD unifi-video-3.10.13-r4.ebuild 1986 BLAKE2B 2126101402739eed0c4a90bc27974c958449ecc4d5fe89103405c3bfb2e5a57a3f17a5731d875657ad3cef27aa93de98b6c061ed3472188eee20f2f6127f78ac SHA512 0a1795e1db2122f33567d4dfed247dcc744e101f843c6d4a807bdf7ba6ecc7050330ddfb853d773e41b87f39551caf0da6615da1428a1074012bc0cd405ed38a
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r4.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r4.ebuild
new file mode 100644
index 000000000000..0ca08a362e9c
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.13-r4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="acct-group/unifi-video
+	acct-user/unifi-video"
+RDEPEND="${DEPEND}
+	dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	export CODEPATH=/usr/lib/${PN}
+	export DATAPATH=/var/lib/${PN}
+	LOGPATH=${DATAPATH}/logs
+	VARLOGPATH=/var/log/${PN}
+
+	insinto /usr/lib
+	doins -r .${CODEPATH}
+	into /usr
+	dosbin usr/sbin/unifi-video
+
+	keepdir ${LOGPATH}
+	dodir ${DATAPATH}
+	fowners -R ${PN}:${PN} ${DATAPATH}
+	dosym ${LOGPATH} ${VARLOGPATH}
+	dosym ${LOGPATH} ${CODEPATH}/logs
+
+	dosym ${DATAPATH} ${CODEPATH}/data
+
+	fperms 500 ${CODEPATH}/bin/ubnt.avtool
+	fperms 500 ${CODEPATH}/bin/evostreamms
+	fperms 500 /usr/sbin/${PN}
+	fowners -R ${PN}:${PN} ${CODEPATH}
+	fperms -R 0400 ${CODEPATH}/lib/
+	fperms 500 ${CODEPATH}/lib/
+
+	echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	if [[ ! -f ${DATAPATH}/system.properties ]]; then
+		cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
+		echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
+	fi
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 2a3b57e7d0e5..43c650d81557 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -16,7 +16,7 @@ EBUILD vlc-3.0.12.1-r102.ebuild 13761 BLAKE2B f374707de28935c411e9b02e99073eac29
 EBUILD vlc-3.0.14-r5.ebuild 13742 BLAKE2B 4eb92ef7de92aeeac6ebb217d221a49479ee7457f9497ae66dd8c8740c6474753c553f9c50562750cc925ebdfa5642e22aef080ac5960a4f37ddd13af41cbdc4 SHA512 cebbb15a7d7b9af8ccebad3bae87c1809136a4d4f8f6ee879a3d51822122ac47b92fbd8f07d8b0370179a1584ce150186f40fbe103aa39db8d39a2ea0f50a846
 EBUILD vlc-3.0.14-r6.ebuild 13812 BLAKE2B a54502501de617cf3a541fbd9de0543cc50afe2413fcdba84eb22a6602d9229f95ca50692c978c3d13f9755e087cb0eb1dc68e85f50274119e5014de2799365b SHA512 23d8b5b057b1991680f8e5786ca07fea20fba9f4de40ea79a8827fdd9eae74f3380df3c445c8f1fc8ab63b4fdfa78bc8437cd5ad60b974503a45e43d53d0d211
 EBUILD vlc-3.0.16-r5.ebuild 13807 BLAKE2B c5330aa94a746437244da0b97eab00ae356d54d42997c80ea7e4dd5498ff7f82b737013a9fd72fa42b87df2306dab3f8889f10bd7dca6ebefd00f2034a83cf61 SHA512 d64e09323facd3c670d7a04bd307996056af8ae260e73d3ac3cad7fe1910077cc71d309c82bbc16731b37ac2f3439bf77d1d2b3f9971005442c06b77412a1683
-EBUILD vlc-3.0.16-r6.ebuild 13876 BLAKE2B 20e9ce647c8626fa4c26bda1bb685f54d1c80cf6712c6b99b2681e2645ba532a5f90292489d26f0e3b7d20148d9961a3843e2e47c068c89fc89333c2af949d1d SHA512 91af950f70b883e744d46719dfcbcecc90c90bb6fd854d1a9a63cb0d4d2c525f4fa2481030d52e43d6e8025e099f2c877ba9bf86463ff2a294c754dba6085e32
+EBUILD vlc-3.0.16-r6.ebuild 13947 BLAKE2B 9159aee81de28beb081bd2522e26fa311b7ac372518c0726c1e029b2b1422718e0e203521d05465c2691a22d3bee4cc8fab63c664d497ecf632bb48c34ba4c0c SHA512 4d80bfd4c2f8e69f71b460383e8fb702b4aff07fbbfe58020e27fac6a57e4161e61e7303c81d65f5485b66134ac541cc99832b99f132020a783e192078434ba6
 EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
 EBUILD vlc-9999.ebuild 13505 BLAKE2B 29f331ef011e705ff842f6c79fe0feb6c91a53ae2a476f36ecc23d7e10f1bb5a17626fd0e808d5aa5e99cb0e19810bdf1c5a926db01875333fbc654f03eec694 SHA512 8393e4cb2b4b6ec1d4d7bba05333ce15306b040eef3812112266cb8d1e32edd18779c3e44ab78d48faaf6c0ef13371f80ee21369fc5267fc1762d5f5901d7f8a
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/vlc-3.0.16-r6.ebuild b/media-video/vlc/vlc-3.0.16-r6.ebuild
index 695200e37de9..48bd7c7cc459 100644
--- a/media-video/vlc/vlc-3.0.16-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r6.ebuild
@@ -24,7 +24,7 @@ else
 	#else
 	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	#fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv -sparc ~x86"
 fi
 
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
@@ -460,6 +460,11 @@ src_configure() {
 	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
 
+	if use riscv; then
+		# Bug #803473
+		append-libs -latomic
+	fi
+
 	if use truetype || use bidi; then
 		myeconfargs+=( --enable-freetype )
 	else