From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 4 May 2021 22:28:33 +0100
Subject: gentoo resync : 04.05.2021

---
 media-video/Manifest.gz                            | Bin 25632 -> 25638 bytes
 media-video/bdsup2sub/Manifest                     |   2 +-
 media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild    |  56 ----
 media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild    |  55 ++++
 media-video/dvdauthor/Manifest                     |   2 +-
 media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild    |   2 +-
 media-video/ffmpeg/Manifest                        |  10 +-
 media-video/ffmpeg/ffmpeg-4.2.4.ebuild             |  19 +-
 media-video/ffmpeg/ffmpeg-4.3.1.ebuild             |  19 +-
 media-video/ffmpeg/ffmpeg-4.3.2.ebuild             |  19 +-
 media-video/ffmpeg/ffmpeg-4.4.ebuild               |  19 +-
 media-video/ffmpeg/ffmpeg-9999.ebuild              |  24 +-
 media-video/gpac/Manifest                          |   4 +-
 media-video/gpac/gpac-1.0.1.ebuild                 |   5 +-
 media-video/gpac/gpac-9999.ebuild                  |   5 +-
 media-video/makemkv/Manifest                       |   2 +-
 media-video/makemkv/makemkv-1.16.3.ebuild          |   5 +-
 media-video/pitivi/Manifest                        |   2 +-
 media-video/pitivi/pitivi-0.999-r4.ebuild          |   2 +-
 media-video/rtmpdump/Manifest                      |   8 +-
 media-video/rtmpdump/metadata.xml                  |   1 -
 .../rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild      |   9 +-
 media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild |  15 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild          |  15 +-
 media-video/vdr/Manifest                           |   3 +
 media-video/vdr/files/vdr-2.4.7_gcc11.patch        | 292 +++++++++++++++++++++
 media-video/vdr/vdr-2.4.7.ebuild                   | 209 +++++++++++++++
 media-video/yle-dl/Manifest                        |   2 +
 media-video/yle-dl/yle-dl-20210502.ebuild          |  54 ++++
 29 files changed, 672 insertions(+), 188 deletions(-)
 delete mode 100644 media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild
 create mode 100644 media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild
 create mode 100644 media-video/vdr/files/vdr-2.4.7_gcc11.patch
 create mode 100644 media-video/vdr/vdr-2.4.7.ebuild
 create mode 100644 media-video/yle-dl/yle-dl-20210502.ebuild

(limited to 'media-video')

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 14d9be614d5f..ebbbe2bd63da 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/bdsup2sub/Manifest b/media-video/bdsup2sub/Manifest
index 3661510ea3c4..ecfed5a1ee59 100644
--- a/media-video/bdsup2sub/Manifest
+++ b/media-video/bdsup2sub/Manifest
@@ -2,5 +2,5 @@ AUX bdsup2sub-4.0.0-xdg.patch 1036 BLAKE2B c87a7b82a66c6bccc4b283a13ecef0d54b15d
 AUX build-4.0.0.xml 1836 BLAKE2B 39b481344bee30e17f5a825b8d6eced1f6c410468da5382978a6f07bd9b081d12ba04f7973d3cc127cb6353b7cc1853f8ad196bd1e46994fbffcc42058cbc190 SHA512 ec2f7c82dd00243a692182e8ecf363674703a11fcc59b81bb290bb9ef2afb0617da506459f7dc7e50018560364b2e5bddfb40e766e33cc15111b6984c18c6119
 DIST bdsup2sub-4.0.0.tar.xz 199796 BLAKE2B 293c7d0433103a3087fb057b938b1cf2d42acc01ccdeb8c815f124c3a6b61f20bb211d88f9f4a7e516f4f7aa54200d2c1ec36adbfe700321543f27a9408269f4 SHA512 d12f5ddde2b9fec9dc50a43212db52f068852c972c0ee559dbe7f56490d7082eb1f603413a17737f791450d7f1458ed5ba39fda9a7a1349af03c07a0173c13a6
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
-EBUILD bdsup2sub-4.0.0-r2.ebuild 1175 BLAKE2B 6aa6772e05051dde6fb0471d843666fd32bccb6d808fc90cba53f5c0994a086dbf9c0b625756a56440d670e761e5c3c11232974ca55de44632194930ad74b147 SHA512 1cf68cb7898a039a58cbcd794466e10c6249895234b6ac3add213cff2b862016b342a2796c550b141291ad7c63416fb3adfa6529b2a0bcadd552c4778093a3b9
+EBUILD bdsup2sub-4.0.0-r3.ebuild 1165 BLAKE2B 846d42f26b56867205a74b1d046be73239ee9aaefad681fbed20fb972188015390a3fb554fe4c0603e283d3acb603ae59cdbc70f10a2a10d6286d37568ae6c6b SHA512 82341a030f59dfaa2ef7e7a89ee8994eb37e9b2b8561c290c81e37ff986fa016e51886f0639bcd8515f1519c17a1cae39f499a57af0b2208d8b906e7719d771f
 MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild
deleted file mode 100644
index 72f449b2a644..000000000000
--- a/media-video/bdsup2sub/bdsup2sub-4.0.0-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-XDG_P="xdg-20100731"
-
-MY_PN="BDSup2Sub"
-
-DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams"
-HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm"
-SRC_URI="
-	http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
-	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	app-arch/xz-utils"
-
-S="${WORKDIR}/${PN}/${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-xdg.patch" )
-
-src_prepare() {
-	default
-
-	# apply XDG patch
-	cp -v "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
-}
-
-src_compile() {
-	eant build $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar "dist/${MY_PN}.jar"
-	java-pkg_dolauncher "${PN}" --main "${MY_PN}" --java_args -Xmx256m
-	newicon bin_copy/icon_32.png "${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" "${MY_PN}" "${MY_PN}"
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src
-}
diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild
new file mode 100644
index 000000000000..8246c205b408
--- /dev/null
+++ b/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit desktop java-pkg-2 java-ant-2
+
+XDG_P="xdg-20100731"
+
+MY_PN="BDSup2Sub"
+
+DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams"
+HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm"
+SRC_URI="
+	http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}/${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-xdg.patch" )
+
+src_prepare() {
+	default
+
+	# apply XDG patch
+	cp -v "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
+}
+
+src_compile() {
+	eant build $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar "dist/${MY_PN}.jar"
+	java-pkg_dolauncher "${PN}" --main "${MY_PN}" --java_args -Xmx256m
+	newicon bin_copy/icon_32.png "${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" "${MY_PN}" "${MY_PN}"
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index c1eeb6b35b4f..c0529ffc1e7d 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -4,5 +4,5 @@ AUX dvdauthor-freetype_pkgconfig.patch 1283 BLAKE2B 5802cc6e00b14748ff1de8ba528c
 DIST dvdauthor-0.7.1.tar.gz 421324 BLAKE2B 34d7f20cc7f8a5f8ea10cfd1404a15b04e909a343e008da18035f6bf78de7b4f16729b3c2ba5ebedd7bd12e72a801874d99d5c1e6f7458a311501e07afc11788 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9
 DIST dvdauthor-0.7.2.tar.gz 648305 BLAKE2B e3c918e101be1627b32d19a4ba17e676593ce260c72c4a1126acc691d9dec484e3d70817abfa1f1542d5a29d603ecbd9226e305caadd77abfb1278125f7d6c64 SHA512 202b8bba38939d122dc864921a57e89906ca99ddabf44e3b07419cc42cc052567cd892b41f1171c9c195c9a770758e9319a942ea64d14ee8fa847588c7761125
 EBUILD dvdauthor-0.7.1-r1.ebuild 1169 BLAKE2B 8ac8a9ef349484a0e8475e4710d05c8b39719f2f79f48686cfa05398fff5956eaf4bc596ec209f5dde88b2a6b2b43eca1d501d802f87fb258aa182dcc139e056 SHA512 472ef4197490a72fee192b6e1bc09a13cc00851b95d1db723b4898a0bb2c05d3bd4b0dd74aec88e36d7ad03e7bf24bfe1b3ccdb8c5c880414058c5de999c3be2
-EBUILD dvdauthor-0.7.2-r2.ebuild 1342 BLAKE2B aec77233d8ddfaecb3c1bd5b3d2f18c77fb6c8921aef456e1ae5be49a343b24a32252fd070cddd1a74b9ac05e8a779e9ccba025896da42f4dd8dfa1e2f7303ff SHA512 3b3945ccca66ead6f3b9809c53e1fe6cad17f3bcb5a71c88500c09ad35fbbc006de9c0693326184fea5245eb8f418bba96d6f0ac40db800c713d613e88903ec0
+EBUILD dvdauthor-0.7.2-r2.ebuild 1341 BLAKE2B 12ebce12f99994144fade997172ed61e2c59f3fcaf801a2bfcacd8a8721cf4a995f518a3733e1ebac2284b3193c37fb6dec693888c9fd322a8ee818eff580542 SHA512 05d420f296e3738f71488325be7cefbf49cd178cb4a4967853fd87f124daca9ecf39c2b03f2a2cead63f530b2d77306a73fc7cd8bcd256c07862829e48febde0
 MISC metadata.xml 310 BLAKE2B 98950538160adf1178a053c79da3802c04ef0ae8c45436df86f5da69c4ad200e38b971134dfc4d94c90f061502247a45d39d319b6bff1ec3f4e3cd3a9c432ac5 SHA512 e9f2f78be647d48778accbf7da1d1b925dd8c441fa07743c776eee3362bf75f57a7051a7805ad1b2ab76a5958a18ae1b889ccb006da66d3197fefb0498e1f0c4
diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
index f62b1cd090ac..dcd1561b0b16 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="graphicsmagick +imagemagick"
 REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index dacf1a9e9e42..b37d477aeb63 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,9 +8,9 @@ DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876b
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
 DIST ffmpeg-4.3.2.tar.bz2 11307134 BLAKE2B 97e1e598e4abe397b06298d545c3073ea2303e11c01e98343fe09d99174e02ca94f52c4df0d389fbefe7814686221446d30f107092f00cb0b69275c8747d6f32 SHA512 ec5566f8684f0ceb18184d59786ea1fc166ab28c46260ebcca5b919ad53137ba7317fd0c537e97df28553572a0d5e42c558773c808cf76995d67985aec2d6d4d
 DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf SHA512 212c330f477e9452b9d7873d6d3c452a5c946b6b9c17b01d94c60fda66e61e53b78388ef7686b8d9415a27cd3e05d5f0d6639a02a22467dbf1ed483b5594c80f
-EBUILD ffmpeg-4.2.4.ebuild 18162 BLAKE2B 3c16fcbcff2bbdf380b3ef786a37e34b475fd54fc136ea56b1273b3b9f765401d444206b2967d4307cd4ba83a7e2a7c015c30c32f56ce723a109370871914c73 SHA512 6f5b0dbe93a192ad93e5990a1958bb1e63d9d800a3af0b031c6f1e3732573084e4a0686c569be9046471d124bce240c90cde5c637f21aa9f28b138add94d85cb
-EBUILD ffmpeg-4.3.1.ebuild 18266 BLAKE2B 8eceb23ee9c3953ad01330b1d736c6d2ee58065abafadc37ae7c3592557263713a866c094c1a0efa82000dc280551217f0c3087d089a9fbf0fb2ab4e28e8fce7 SHA512 a1efda5a267ebdb8aa535e43c1eb82e6cac4b41b052b577f3dca5e8726da5836fad313a1761ee78540ca2a46a46f1b8590eec243f55c7778f438f21293231e54
-EBUILD ffmpeg-4.3.2.ebuild 18249 BLAKE2B 24459ebf7a336ef4fdcf240497363ec7e99ddc4e3966801695631bc28e7041aa82dbe5d3d9f548e5c697d91a4579dd542456fa9b5b60c17eab7579374112b673 SHA512 e6d1d863267a17df6e6f822ad5937e4e9bb4051ea2ea997df552ff5664deb5db53f871b2fafeec511e055f758e547b70ebc1f8872ba9cba9a4de199c3f11fd4f
-EBUILD ffmpeg-4.4.ebuild 18154 BLAKE2B bf9cd45489ee505ff425122d8b0e1e61f485dc5f6f4c0724d0750581769e5d0c29c412a1993370d8e02a0119b07d86285e28748a11e955646a8e45f3d3af6c16 SHA512 71ecb0f7a7c2c0dd8ba26793035fc436a5a40f09ac2707015aa2ae6eee6018ccefa41620b0beab9d0a581ef73e14f97ec33d0024321ec90518f13ab4d7aa5c69
-EBUILD ffmpeg-9999.ebuild 18154 BLAKE2B bf9cd45489ee505ff425122d8b0e1e61f485dc5f6f4c0724d0750581769e5d0c29c412a1993370d8e02a0119b07d86285e28748a11e955646a8e45f3d3af6c16 SHA512 71ecb0f7a7c2c0dd8ba26793035fc436a5a40f09ac2707015aa2ae6eee6018ccefa41620b0beab9d0a581ef73e14f97ec33d0024321ec90518f13ab4d7aa5c69
+EBUILD ffmpeg-4.2.4.ebuild 17661 BLAKE2B 4366ffd59e87da3187e619af6ad18b467f2991b53a229d05dd20ca6bfae9093d95ffcfd2eecabc542095cce2b182d03ae6bb2c682d8c9c76a23b9e557174403f SHA512 5b098a52a368f635aebf1d302ef9b84162e251d7aaf9ffe23963eeef731b92be3d397cf5f70f1f68028fc847a3ef4323c916d6c650a753e875725998fb4196ab
+EBUILD ffmpeg-4.3.1.ebuild 17765 BLAKE2B facecec39439dc19a9c2611cc3e902a84401b0ed8b5bcbb827fa38aaba7370f1ca21d4a8f1d4e22a2f9d8297b9024fe5dd654871968b4fb6589a03d69144a75d SHA512 411583535f592af3efcae090f0d820763f27f27b146694f55b1fd5798939463b2fd032801a9b3b14b5e6ce0fe89213bf5523e1c447af65790f5f565931814a5d
+EBUILD ffmpeg-4.3.2.ebuild 17748 BLAKE2B 49fb8aa388f9e2c999deefd0ab458f2c1d985bd0ab339bf60e07f2e96d1f5f0d6508d34980ebddc0347621ff49c0ca357ce535e4e76cffe27e861f2c5d43143a SHA512 858df025f7cfe5be9b318c1c51d23c2ea979cc1e699fd3f15c5a406f8464c06edb165bb586882a49bbb6d6704d4d6f4f0ad44afab67913f3ecd2bea86499d98f
+EBUILD ffmpeg-4.4.ebuild 17653 BLAKE2B 65b40124fd65e43e192aa62ac73b23abd74996c5d7d0f34db86de69aae02fb1ea8ad68bd3007ee18fce3a25381d1c09a4b691412f2fea5143a73fa9296c41fb7 SHA512 83b6a4c0cbed768c6317da77a2fc75dc926a05611beb8103926e4e8589107e9924e0a1f7b461b362a7e9cc8456de28f2aef879376edc4268e6143eed359e43d5
+EBUILD ffmpeg-9999.ebuild 17604 BLAKE2B 7e039e768162dcbaacd17955b63c2700af71990b2735badad34a3ef48bf0bee551e8a4422fa2a6adb28a34c60e6b8430157d2ba23942be6b905e7c5f19b28f78 SHA512 3408683e3bb0f971a48e1367bbb45ea8b385c5893ad219cdaf40c972bff82dacf32b2ec899aea13781bb966f2d5f75905164ca1842eedbf34821027a57f2c581
 MISC metadata.xml 5955 BLAKE2B 59329980a1e72c3899f09ddc2ac217aed5c540e91c1f1e0636ac2f84986e20ea7cdd0e07c9e350aed664933a4b02cfed2001bcd1e47723fba913b24b0d35b3aa SHA512 9c4d77572b982475313acddc8cd0df16a121d3a5363335d4d2a1e3021b3dd4bcda5efec9f4a913349efc532919441852dfa702df22dceda62d6f8af5fd491666
diff --git a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
index 6ef88dd7e711..a45e5850e1f7 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
@@ -71,7 +71,7 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		+gpl hardcoded-tables +iconv libxml2 lzma +network opencl
 		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
 		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
 		# libavdevice options
@@ -271,17 +271,9 @@ RDEPEND="
 	postproc? ( !media-libs/libpostproc )
 "
 
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
 RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
 		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
 "
 
 DEPEND="${RDEPEND}
@@ -319,7 +311,7 @@ REQUIRED_USE="
 	${CPU_REQUIRED_USE}"
 RESTRICT="
 	!test? ( test )
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -351,7 +343,7 @@ multilib_src_configure() {
 	local myconf=( ${EXTRA_FFMPEG_CONF} )
 
 	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use openssl && myconf+=( --enable-nonfree )
 	use samba && myconf+=( --enable-version3 )
 
 	# Encoders
@@ -387,10 +379,7 @@ multilib_src_configure() {
 		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
 	done
 
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
+	if use openssl ; then
 		myconf+=( --disable-gnutls )
 	fi
 
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index aa4da5b2e28c..ca7abdf9244e 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -68,7 +68,7 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
-		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		+gpl hardcoded-tables +iconv libxml2 lzma +network opencl
 		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
 		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
 		# libavdevice options
@@ -270,17 +270,9 @@ RDEPEND="
 	postproc? ( !media-libs/libpostproc )
 "
 
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
 RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
 		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
 "
 
 DEPEND="${RDEPEND}
@@ -319,7 +311,7 @@ REQUIRED_USE="
 	${CPU_REQUIRED_USE}"
 RESTRICT="
 	!test? ( test )
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -351,7 +343,7 @@ multilib_src_configure() {
 	local myconf=( )
 
 	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use openssl && myconf+=( --enable-nonfree )
 	use samba && myconf+=( --enable-version3 )
 
 	# Encoders
@@ -387,10 +379,7 @@ multilib_src_configure() {
 		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
 	done
 
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
+	if use openssl ; then
 		myconf+=( --disable-gnutls )
 	fi
 
diff --git a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
index 657510529850..f2ad87973029 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.2.ebuild
@@ -68,7 +68,7 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
-		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		+gpl hardcoded-tables +iconv libxml2 lzma +network opencl
 		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
 		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
 		# libavdevice options
@@ -270,17 +270,9 @@ RDEPEND="
 	postproc? ( !media-libs/libpostproc )
 "
 
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
 RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
 		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
 "
 
 DEPEND="${RDEPEND}
@@ -319,7 +311,7 @@ REQUIRED_USE="
 	${CPU_REQUIRED_USE}"
 RESTRICT="
 	!test? ( test )
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -350,7 +342,7 @@ multilib_src_configure() {
 	local myconf=( )
 
 	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use openssl && myconf+=( --enable-nonfree )
 	use samba && myconf+=( --enable-version3 )
 
 	# Encoders
@@ -386,10 +378,7 @@ multilib_src_configure() {
 		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
 	done
 
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
+	if use openssl ; then
 		myconf+=( --disable-gnutls )
 	fi
 
diff --git a/media-video/ffmpeg/ffmpeg-4.4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.ebuild
index 7ab4dcdeb81a..f1e2939f625e 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.ebuild
@@ -68,7 +68,7 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
-		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		+gpl hardcoded-tables +iconv libxml2 lzma +network opencl
 		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
 		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
 		# libavdevice options
@@ -270,17 +270,9 @@ RDEPEND="
 	postproc? ( !media-libs/libpostproc )
 "
 
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
 RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
 		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
 "
 
 DEPEND="${RDEPEND}
@@ -319,7 +311,7 @@ REQUIRED_USE="
 	${CPU_REQUIRED_USE}"
 RESTRICT="
 	!test? ( test )
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -348,7 +340,7 @@ multilib_src_configure() {
 	local myconf=( )
 
 	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use openssl && myconf+=( --enable-nonfree )
 	use samba && myconf+=( --enable-version3 )
 
 	# Encoders
@@ -384,10 +376,7 @@ multilib_src_configure() {
 		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
 	done
 
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
+	if use openssl ; then
 		myconf+=( --disable-gnutls )
 	fi
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 7ab4dcdeb81a..65f9e0ca8aef 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -12,7 +12,7 @@ EAPI=7
 # changes its ABI then this package will be rebuilt needlessly. Hence, such a
 # package is free _not_ to := depend on FFmpeg but I would strongly encourage
 # doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
+FFMPEG_SUBSLOT=57.59.59
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -68,7 +68,7 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
-		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		+gpl hardcoded-tables +iconv libxml2 lzma +network opencl
 		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
 		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
 		# libavdevice options
@@ -270,17 +270,9 @@ RDEPEND="
 	postproc? ( !media-libs/libpostproc )
 "
 
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
 RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
 		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
 "
 
 DEPEND="${RDEPEND}
@@ -319,7 +311,7 @@ REQUIRED_USE="
 	${CPU_REQUIRED_USE}"
 RESTRICT="
 	!test? ( test )
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
 S=${WORKDIR}/${P/_/-}
@@ -348,7 +340,7 @@ multilib_src_configure() {
 	local myconf=( )
 
 	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use openssl && myconf+=( --enable-nonfree )
 	use samba && myconf+=( --enable-version3 )
 
 	# Encoders
@@ -384,10 +376,7 @@ multilib_src_configure() {
 		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
 	done
 
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
+	if use openssl ; then
 		myconf+=( --disable-gnutls )
 	fi
 
@@ -429,7 +418,6 @@ multilib_src_configure() {
 	# Mandatory configuration
 	myconf=(
 		--enable-avfilter
-		--enable-avresample
 		--disable-stripping
 		# This is only for hardcoded cflags; those are used in configure checks that may
 		# interfere with proper detections, bug #671746 and bug #645778
@@ -553,6 +541,6 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
 		emake V=1 fate
 }
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 970b2ba753ef..438972e8936c 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,6 +1,6 @@
 AUX gpac-1.0.0-zlib-compile.patch 1498 BLAKE2B 84c5b0e8bf35e6c6a0b1655e2995e0a71a7b707dc922a4bf011c3b0ce00b64a6eba976dd7c1a45a5e8e208b608762e9bef6a38be9937714b573c7c907614d8d9 SHA512 8a066d2c2fbf185ed131792c48bbc5fe5414bcdbb77df6377a98a58f9bdd017b3260ea0d6e9130791589e64e351369f25f3849d4b635196e1c022ce6720ced1c
 AUX gpac-1.0.1-configure.patch 3414 BLAKE2B 30ab11d0e215429ea5fae9664817b3a0bac242c5e31248d26cc59f646bddb78670f5370ffd65db3bdd2025aa1d17e554f6479e9aab5e6d68c3b73c081bd2a230 SHA512 1b141de1b6bdb58970e4e3361e70ec1ff7675935f2039cd28e80deb4c21c118c56f1dca5bd6539b12332cbc2a1c13298568cc90c981e84fecea23914185d2ca8
 DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
-EBUILD gpac-1.0.1.ebuild 3333 BLAKE2B 564b90f22fb5c250dd202e939e2495d7f031ad02aa93e5abefaf13cb07526b28421d388150c6072791557c5287bcf0fd9940334e402bc95139ac82a7de9295dc SHA512 ce2d3b82b4a33c27c3107d9f1331d4b9f0cadf7eaa5ad723784b90af397bcd6ec8934e1a3416914090a3f657f57ba03bec6524d7319ce27ab703304dae2614a9
-EBUILD gpac-9999.ebuild 3338 BLAKE2B ea9c06904794bb1d1d0e4e869fd9917e4249c31fed343772f7e8f9e4e3798c672f0362352721f36a19218fdc0a70ddb698de62bdc33afcf5714be03d82c1c172 SHA512 c8f57ee2d753e1d15a883ceb4fe249bad52a8e2c6950268f767b42380cf3fc4ad08df108e9002387048d7137a8830965704ff5ce5a0e5c96bb2cacff8a28ee30
+EBUILD gpac-1.0.1.ebuild 3272 BLAKE2B dd25a6ae478b1993f31122e6b5ac26da97f8c84a15f5acdcf90ecd4a87d9bfe1e7ca5d2c83634d1821f4e5b2ae1586924df9090ea4a5fdea6f2e9e9e72247193 SHA512 59c07e5515c14a1866ea7d8f95fc9718d29ec5be3d792e88b625e1935a709f6521e521ea9749e54f7803c888f4974e5fb5d8885cd8b21c03827ad95851318a53
+EBUILD gpac-9999.ebuild 3277 BLAKE2B 1a3fada3b23fe904da85b187b87156a8922d9fd4ba010dd6cbf6daa708c8c5b165d852ade984d56b7548dc706a2d4897e3ade5a8a8f4e24a2ab6f19a27cb92a0 SHA512 b1f3893a28216cf2eef8ac6dfed6dc63a584d479a5f099e0d2e78876c31359151f618ff66ecf105eb540f7a3f86ba077219182800c035e9410b6c538d3242d4e
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/gpac-1.0.1.ebuild b/media-video/gpac/gpac-1.0.1.ebuild
index c372803a25a4..65ed5f65e282 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/10"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -45,8 +45,7 @@ RDEPEND="
 	truetype? ( media-libs/freetype:2 )
 	sdl? ( media-libs/libsdl )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	vorbis? ( media-libs/libvorbis )
 	X? (
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index abfcbc0e5d9d..e1c72932c19e 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/10"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -45,8 +45,7 @@ RDEPEND="
 	truetype? ( media-libs/freetype:2 )
 	sdl? ( media-libs/libsdl )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	vorbis? ( media-libs/libvorbis )
 	X? (
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 784fb0e46466..3b54e954db39 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -2,5 +2,5 @@ AUX makemkv-flags.patch 481 BLAKE2B 26ea134bddf0c1168944bc76de20cf1b860178a990da
 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
 DIST makemkv-bin-1.16.3.tar.gz 15309313 BLAKE2B 34cbf3ee5400a21a4c9f3f71e95afeb2129bda69daa4743321c3aff9ad8bf2c8f703fbf63e45720612b5305efb04484fd1a5719af74398fde2a15a3f982d65b4 SHA512 0806d8f9adde605efeff5d551ba721d9f400c8643e78ec562425aec1af33bb429e2816c5b9cf2e4a1b1efe4161f5d2623a182799d75c9833f045f5420bf13543
 DIST makemkv-oss-1.16.3.tar.gz 6536679 BLAKE2B 63d119dff4098b47cafbe63112118922f77404f1d9353f8aae944be105754a6662db576d318522436ce5d4121528e5b9cc06829e30787120928e8be881d953d6 SHA512 a620141cbaeb621feb5746a753eb448b181d9c795d0f78fad0659baeea21ebf8c6ce925b24f8b7d6844f92b0438a36a32fbac7c7260858e26116d55832a233c0
-EBUILD makemkv-1.16.3.ebuild 2978 BLAKE2B e7fabbd1fdcf3f0286a66f79ff81943ee59dcbb2c5195e79ee2ccbfd6bffa2b8c9e2b2046a203edc2538aff15d12a72e800d4f96d0b92a44181f47f7c5b5c52c SHA512 0dc533cbb7d81a7cff529467f33920c4c68c5a1191acbdc10ae621127cf20c8d5cad27d1311701e3642aa06d116b28b81b52a4e59b85c79b7b0d7a4de145dd74
+EBUILD makemkv-1.16.3.ebuild 2919 BLAKE2B 41f1f7f5db69d310218a35e1ef669b2195b15722a45696db70535bca66a3c6bd5eb7f9f9a6e01eaad0b69e1ab2ae5be7030ad50b71dc0e4bffd1b49896e07b05 SHA512 700991d1d26438130ec842ffa0fbddc49e07c5de33c668d0acd1bcf86c3c0a0e43d4bb623ff688b3791237d6fb609058eecb36ef4a51fc4a921b9641687524cf
 MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7
diff --git a/media-video/makemkv/makemkv-1.16.3.ebuild b/media-video/makemkv/makemkv-1.16.3.ebuild
index 06832f14e6ac..796c9cd05727 100644
--- a/media-video/makemkv/makemkv-1.16.3.ebuild
+++ b/media-video/makemkv/makemkv-1.16.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libressl"
+IUSE="+gui "
 RESTRICT="bindist mirror"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
@@ -32,8 +32,7 @@ DEPEND="
 		dev-qt/qtwidgets:5
 	)
 	>=media-video/ffmpeg-1.0.0:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=[-bindist(-)]
 "
 RDEPEND="
 	${DEPEND}
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 1db34ddc4753..0122c67693e9 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -3,5 +3,5 @@ AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d9
 AUX pitivi-0.999-python38.patch 1809 BLAKE2B fe95c44a409f0a629602d4656cfc90a02e2e676a40d3d3f232457e2a506225f25ab86d585f26ddbaf8551c5efc54e13f474b8b259dd05c2a8285c0b98b9249ba SHA512 f90523242fd8acaa4f0637b8facc5a528186c5dd371f67049b11b307bd6f06c693dd79bb305f2163bed4bd0140bd7fcee86fe7d4b2239be82a7dea47c6038026
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
 EBUILD pitivi-0.999-r3.ebuild 2541 BLAKE2B 583615b1bfee4b7b4074f21cbfcf1a10b1b221a6e16a758480f4c031335fb510cc46477c92421430f6240a47f3dbbf88584de53216caf865ad436ec1fd033584 SHA512 a190374c1527ad7febb37a1f74aee427c90d613c977b37ca541decc8469035cb41e815eba9aabb10c3042daa0700d282fa0d981fc22d8bd356339df5e21b4707
-EBUILD pitivi-0.999-r4.ebuild 2733 BLAKE2B 7fc6bc19f41af949929b213de602a597b10b3313f3b35080ab54b63fcd8cd3a2c961d01655d68772227659906828a07f4b43a62929e2e80ac2a6e32e822f63c9 SHA512 f28fb45cc38c78b38874ae215880599d9c9db0d9719d81e4595d8f1b3a3fd111ff4bc0ef089bbf0828776365b156d58d93f39ce77a957a96ab37eaa3a3aebd34
+EBUILD pitivi-0.999-r4.ebuild 2738 BLAKE2B 6c62b858794fd590ccaaf52e43a1d466df8d7340015d362f750cb22ff8beed5b1dbf937b40e4b56937de41b3d2692d8c0323cfb45979148ebb9c1f07fc9e9a64 SHA512 fabc1ab78c5b5fdeef31c40370b6d8687954c722dad4b80fb7e7bb851e260442bc32a1093eab14c9d7ca744f52253074671763147ebd93540d1ea004d628b020
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/pitivi-0.999-r4.ebuild b/media-video/pitivi/pitivi-0.999-r4.ebuild
index 0fea03048c4f..3a300ddf3731 100644
--- a/media-video/pitivi/pitivi-0.999-r4.ebuild
+++ b/media-video/pitivi/pitivi-0.999-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit gnome.org meson python-single-r1 virtualx xdg
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index f0b2e8a7450e..102d0befd7e0 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -3,7 +3,7 @@ AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c
 AUX rtmpdump-swf_vertification_type_2_part_2.patch 868 BLAKE2B a5014fdc8bcf2cecbe5120297d4563c7d396e54c34e5f6dddf420fcfdbea4797c865daa0750cb1fa65f7c959d36381ce257ec48b3f4f377ce9ead3b3fe4cf833 SHA512 a0c1c46561384961bbb45962d416664cbd7a4a8c2e16eda4370d9acf76be809541ade182e41320102f252ed4e69dd2d6a0de37ad4085b52a22dc6ff0135d8894
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
 DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d8f49f92075f6d4ca87992a7b9c4b4058f84333011e86cf38470f7b1dbf5e69f27e8b1fe34267104191c447342a03c18e3c SHA512 5357d01b51d3ec8c3c584c4e5aa9720a4c04b86573bc6cb7d724d660937b04b6dd35338b17721d6521fde2627e83763ed3b7c010f959bd72573016f3c47480b0
-EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2795 BLAKE2B 1719b876e6fa430158036323f3a29e5c47080df2e94876419d7c2bfd67b5a54e86938d0d4b8e3a77486a01de154beb9f759e9a9c402fa4d34234dbe6f1f24de5 SHA512 b3dc94d290e431d443d6ef7b20c149fcf20315dbded2dd2e93e997613a3181a5ce0e2a5bfeb4edfcfca544fbdeb05b18fd66c0acb3de1186715cf9a4e466a658
-EBUILD rtmpdump-2.4_p20190330.ebuild 2911 BLAKE2B 73e925601fe45531fda2d566015ed856ba36f3e5e5cc6365ad5dc29ceff57a56fe369892b27126c18788395b36ea7a5a1a3fed4f2f5f266732bdee299199c6d9 SHA512 f96859bc18c82fc10f263b4cf6501716c2a6295be44125f93975f84496436677b4898030ed6896979f85224669117b01ea97e3e825271449eac007e001b72f29
-EBUILD rtmpdump-9999.ebuild 2911 BLAKE2B 73e925601fe45531fda2d566015ed856ba36f3e5e5cc6365ad5dc29ceff57a56fe369892b27126c18788395b36ea7a5a1a3fed4f2f5f266732bdee299199c6d9 SHA512 f96859bc18c82fc10f263b4cf6501716c2a6295be44125f93975f84496436677b4898030ed6896979f85224669117b01ea97e3e825271449eac007e001b72f29
-MISC metadata.xml 830 BLAKE2B c716bc86aa84124cb7729fd1ff19a4cec080124c9110773da8c27360a155fe10e03e6d7be6af812ab8eff3d460c4b9cdfe3713432329500dc85f8612f14ae2db SHA512 111e30937fc4cfedbd0f03fc41fa6096d9ffdc6dff414c57dd9af1cf632eaa3721d76f66b6937eba786dbbfc035398879f03448098c0a9ff581203bdfa272f4b
+EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2696 BLAKE2B ac811b42e9812140688c9b5a33a2255b4457e095de83b096eaae4f9959d0de8a50e919d1e6fb7385e7d256af25ab23c8bd980da70532bc67d8c730e2da4d6af5 SHA512 653d227609c0c1a38a85ce9ceb0eeaca3b6628ba79af5e877d1a2a76e58d2296222ba584da04a55abb784a05c2a8dfdc9d27a95ab07fb16317f36c1c22b73edc
+EBUILD rtmpdump-2.4_p20190330.ebuild 2626 BLAKE2B f27169162b747cabe0feee80cd643ba8216a8d0034c0fff6671e09bc05ca53d59ecf9582850ca8ce27396c1422da2020e4cf08c580e617dfad04603746848029 SHA512 36b3792e7320513001c2986163d6dd7205d2d5ce9e64571a28e7772dfd34d807f8970499ae165d09a90d98e10a8d3dd66377fc6452fb4565c7611584fce26f93
+EBUILD rtmpdump-9999.ebuild 2628 BLAKE2B d42035baeef31109ce56ff60db20b0f6a90938549d005d67e423742b771851ffccae8b85e885e8449dc82d96f2ca40db0f2799cc14b26630670a215579f5ff80 SHA512 50db9397b5e4c51b5c31b5b1c8116a14e8bfea5f620df4f43fd2cd76d09eff74cc1d80c22a0b485a04256c0e91b3bd02251ee685db45382b8a942f99dbc172e5
+MISC metadata.xml 745 BLAKE2B 82d1570828f878a8c32cf642e4405c481d17134321b2046fc602107e3d2873cfcbcab439a2d94a341ddb223d0efdecf6b264c0816b768a15b10e1072df1c7c77 SHA512 b1ced41c93cd142aae5808f35fffdcb99c919a524fb386a463fddbba74f51c221121350fbfd2ca2807c2ee370bbf77a14127a9e7f215841b5d0bc72dd3343745
diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index 77d74434352c..0aab57cd9eae 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -14,7 +14,6 @@
     <use>
        <flag name="ssl">Enable Cryptographic features</flag>
        <flag name="gnutls">Use GnuTLS instead of OpenSSL for Cryptography</flag>
-       <flag name="libressl">Use LibreSSL instead of OpenSSL for Cryptography</flag>
        <flag name="tools">Enable installation of various binary tools in addition to librtmp library</flag>
     </use>
 </pkgmetadata>
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index a3b8a59caac3..fb6e6d60d9f0 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="gnutls ssl static-libs libressl"
+IUSE="gnutls ssl static-libs"
 
 DEPEND="ssl? (
 		gnutls? (
@@ -19,8 +19,7 @@ DEPEND="ssl? (
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
 		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
@@ -67,7 +66,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
index c5698f9c7a33..839b25613c0b 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,17 +11,14 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs +tools libressl"
-
-REQUIRED_USE="?? ( gnutls libressl )"
+IUSE="gnutls ssl static-libs +tools"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+		!gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -47,10 +44,6 @@ pkg_setup() {
 			ewarn "USE='gnutls' is ignored without USE='ssl'."
 			ewarn "Please review the local USE flags for this package."
 		fi
-		if use libressl; then
-			ewarn "USE='libressl' is ignored without USE='ssl'."
-			ewarn "Please review the local USE flags for this package."
-		fi
 	fi
 }
 
@@ -64,7 +57,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index c5698f9c7a33..fcab996e0c09 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,17 +11,14 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs +tools libressl"
-
-REQUIRED_USE="?? ( gnutls libressl )"
+IUSE="gnutls ssl static-libs +tools"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+		!gnutls? (  dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -47,10 +44,6 @@ pkg_setup() {
 			ewarn "USE='gnutls' is ignored without USE='ssl'."
 			ewarn "Please review the local USE flags for this package."
 		fi
-		if use libressl; then
-			ewarn "USE='libressl' is ignored without USE='ssl'."
-			ewarn "Please review the local USE flags for this package."
-		fi
 	fi
 }
 
@@ -64,7 +57,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls  && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 5a4e962254d3..172ce7553716 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -12,6 +12,7 @@ AUX vdr-2.4.1_ttxtsubs_segfault.patch 2484 BLAKE2B 73af246884dd3da39c53c53031f5a
 AUX vdr-2.4.6_clang.patch 527 BLAKE2B 6f74ee8a96657df7280ea51b55199768ed3bd968cd377df12674b29616b3a43703e4cc76c4c4fa43412a564bc51bdcb32ec565832177397200f5bd7aef9b05c6 SHA512 5ad498c5784551fdcde9911e2890b236c75e47f20dabe85b561bdb0e8771d7d6ce6ab160fa8831361799ed9d5da0cfa4f3788b509dd0eadf1cdb1eeeb6aad8a7
 AUX vdr-2.4.6_gentoo.patch 2236 BLAKE2B c7372e3bfe04ea14f1bb12459d4385d6001c6acafbf96b4d1d8a69e194e076af656b76bb349ce07a30b131dd9e779d39441a34cc41ff0ae651fd14c8f2791fef SHA512 6ff8d20e4c596e3705ac6814e0ea1562e4b1f2809d585440bd5940b7094127fce21e7f6a738281305d6782c9806336f2d030c864e189d2c85e3b302635f07685
 AUX vdr-2.4.6_makefile-variables.patch 1094 BLAKE2B eabc93d2bb383b1146c15c8b0bdff5979e172a5190a9c755071f1be66a662f89ce6f92c230a0df14ec5ca1958ac53326624e16c54457d83296a0b117047ac22a SHA512 5ee06df94028fc7bbd70fae718aab544f562a1a4d2cf380c282a24db33cdef1bea7224608c01e5ecb4a92cf1a709706342314918f36c0b6f65f5861c872fe499
+AUX vdr-2.4.7_gcc11.patch 9479 BLAKE2B 143612529d08f4cf29f42084db2ac4379695b25b6c19156f4f14e8bb93a9dc8057d6bfa40e1ebca23f624a9c126940f3c94a2cca0ed7a21c64a1b5abec27695f SHA512 dc9dba5bd47da5b9b3494a3ab453cdb21528338d04ef2b62ac314f3dd38035fede725dcac3a40f46cf46301e0d56b9fb896d1349038c0914e1c1fa3d6e633f12
 AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a94d23d4801dc8dea70dbd617e12a6e0968ad96624688b7ad1463dcc3676ccbccd85e29c7b556b5e989191fb020df2d SHA512 eb5da3977d5a55dfac8871bf638ad320bf03e84c6c667f098f6f39f71beecd861fd5ae8b898ad835b8441ce8bb9dcb82005ba0b0e1b785ac156e478b222515a9
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
 DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
@@ -25,8 +26,10 @@ DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 339bb23ed0f505087bdbbefb192824d5
 DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd SHA512 bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
 DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f SHA512 d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
+DIST vdr-2.4.7.tbz2 919632 BLAKE2B be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab SHA512 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
 EBUILD vdr-2.2.0-r6.ebuild 8159 BLAKE2B 383a0d759dea10033288f365a2d4c5ea90598a7254c7cd2179aa8ad98d111a84c2b324e2f63f2a8fac120a99038ab872ccf2f301f13a6a1e0e09da0877bade3b SHA512 195696b43bd21ea93bcf2a1056beb1557251f451ae52f5f4234afdbb78f82c99e3a628a19c3a6575cfb82b3530b4be0ecdd87eca349afc8afd5af1f4a535866c
 EBUILD vdr-2.4.1-r3.ebuild 6081 BLAKE2B 4bf9470dff3b8997e3e5c87755a8a1aed655c8bbe66c67a01cac6e13daad63da17347dd3b870db7e3326a2f5e6d4eea779103b3c79aac42c4b34341e82ff873e SHA512 eef8e4e4e9059126cbd4745b1d5ece8b79204d81d0f3bc0ffebad64cd52508446aea6c2af227befb971a913fcf6195abfa4c008069e83532cf914c95933599f2
 EBUILD vdr-2.4.6-r1.ebuild 5990 BLAKE2B c7f384d5f5f4d3db13efe9cf6996070b41ffea836b2460e755b037af90b7ba87aa22140fa2dabd820a7882075b0aaaf590863394526c025face8c0fa9bcf3f57 SHA512 b047a77e991e794001a6b7629408b798ca3cc60ca36e26b5ed1e18e8c99d63f2eacaeaa8a2cc14fce4ad8620e77639e944a5d392efaf3ba30da68d01030b7c31
+EBUILD vdr-2.4.7.ebuild 6146 BLAKE2B 144eb4cb23b11d002545e091de5e0992371feb0e1daac21acfb54a9e4ff1f981bc2bd018a47a6a7bd94fad86fda974ff87610bacfbcc792504eb472070bd2e27 SHA512 d0ab194d2f140e8aff2dc44e7f72a9f958cd620afae68d036a3d90c21fca86b200e8344745dba6d2b1a12dfb028ccb33f1e3335fc8f010c3f96324e3d4d342de
 MISC metadata.xml 1892 BLAKE2B 2a233ceb745f8df9350e37d99d8dce2cc56d3c21e0d187de483a2d2d18c0129a047d48cf7cddff7ea2500ae044d1eb196efb508cce0424368e03bbddb75c6d82 SHA512 dba266e22f0d99b98284db088beaf4fbd288cb8eee046a5f96610ed6cd748a116a3ced7ce74c69660d9943a7f7ccc016ba8a242174780275334b95a1ad4489c7
diff --git a/media-video/vdr/files/vdr-2.4.7_gcc11.patch b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
new file mode 100644
index 000000000000..866b018b5b79
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
@@ -0,0 +1,292 @@
+https://bugs.gentoo.org/786882
+
+compile fix for gcc-11
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 May 2021)
+diff -Naur vdr-2.4.7.orig/channels.c vdr-2.4.7/channels.c
+--- vdr-2.4.7.orig/channels.c	2021-05-02 19:34:32.312653108 +0200
++++ vdr-2.4.7/channels.c	2021-05-02 19:39:19.241653108 +0200
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include "device.h"
+ #include "libsi/si.h"
++using namespace std;
+ 
+ // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
+ // format characters in order to allow any number of blanks after a numeric
+diff -Naur vdr-2.4.7.orig/ci.c vdr-2.4.7/ci.c
+--- vdr-2.4.7.orig/ci.c	2021-05-02 19:34:32.313653108 +0200
++++ vdr-2.4.7/ci.c	2021-05-02 19:49:53.216653108 +0200
+@@ -27,6 +27,8 @@
+ #include "skins.h"
+ #include "tools.h"
+ 
++using namespace std;
++
+ // Set these to 'true' for debug output:
+ static bool DumpTPDUDataTransfer = false;
+ static bool DebugProtocol = false;
+diff -Naur vdr-2.4.7.orig/device.c vdr-2.4.7/device.c
+--- vdr-2.4.7.orig/device.c	2021-05-02 19:34:32.313653108 +0200
++++ vdr-2.4.7/device.c	2021-05-02 19:43:19.071653108 +0200
+@@ -20,6 +20,8 @@
+ #include "status.h"
+ #include "transfer.h"
+ 
++using namespace std;
++
+ // --- cLiveSubtitle ---------------------------------------------------------
+ 
+ class cLiveSubtitle : public cReceiver {
+diff -Naur vdr-2.4.7.orig/diseqc.c vdr-2.4.7/diseqc.c
+--- vdr-2.4.7.orig/diseqc.c	2021-05-02 19:34:32.314653108 +0200
++++ vdr-2.4.7/diseqc.c	2021-05-02 19:50:14.177653108 +0200
+@@ -14,6 +14,8 @@
+ #include "sources.h"
+ #include "thread.h"
+ 
++using namespace std;
++
+ #define ALL_DEVICES (~0) // all bits set to '1'
+ #define MAX_DEVICES 32   // each bit in a 32-bit integer represents one device
+ 
+diff -Naur vdr-2.4.7.orig/dvbdevice.c vdr-2.4.7/dvbdevice.c
+--- vdr-2.4.7.orig/dvbdevice.c	2021-05-02 19:34:32.314653108 +0200
++++ vdr-2.4.7/dvbdevice.c	2021-05-02 19:50:35.634653108 +0200
+@@ -21,6 +21,8 @@
+ #include "menuitems.h"
+ #include "sourceparams.h"
+ 
++using namespace std;
++
+ static int DvbApiVersion = 0x0000; // the version of the DVB driver actually in use (will be determined by the first device created)
+ 
+ #define DVBS_TUNE_TIMEOUT  9000 //ms
+diff -Naur vdr-2.4.7.orig/dvbplayer.c vdr-2.4.7/dvbplayer.c
+--- vdr-2.4.7.orig/dvbplayer.c	2021-05-02 19:34:32.314653108 +0200
++++ vdr-2.4.7/dvbplayer.c	2021-05-02 19:43:47.344653108 +0200
+@@ -15,6 +15,8 @@
+ #include "thread.h"
+ #include "tools.h"
+ 
++using namespace std;
++
+ // --- cPtsIndex -------------------------------------------------------------
+ 
+ #define PTSINDEX_ENTRIES 1024
+diff -Naur vdr-2.4.7.orig/dvbspu.c vdr-2.4.7/dvbspu.c
+--- vdr-2.4.7.orig/dvbspu.c	2021-05-02 19:34:32.314653108 +0200
++++ vdr-2.4.7/dvbspu.c	2021-05-02 19:44:08.952653108 +0200
+@@ -17,6 +17,8 @@
+ #include <inttypes.h>
+ #include <math.h>
+ 
++using namespace std;
++
+ /*
+  * cDvbSpubitmap:
+  *
+diff -Naur vdr-2.4.7.orig/dvbsubtitle.c vdr-2.4.7/dvbsubtitle.c
+--- vdr-2.4.7.orig/dvbsubtitle.c	2021-05-02 19:34:32.315653108 +0200
++++ vdr-2.4.7/dvbsubtitle.c	2021-05-02 19:44:42.537653108 +0200
+@@ -16,6 +16,8 @@
+ #include "device.h"
+ #include "libsi/si.h"
+ 
++using namespace std;
++
+ #define PAGE_COMPOSITION_SEGMENT    0x10
+ #define REGION_COMPOSITION_SEGMENT  0x11
+ #define CLUT_DEFINITION_SEGMENT     0x12
+diff -Naur vdr-2.4.7.orig/eit.c vdr-2.4.7/eit.c
+--- vdr-2.4.7.orig/eit.c	2021-05-02 19:34:32.315653108 +0200
++++ vdr-2.4.7/eit.c	2021-05-02 19:45:16.962653108 +0200
+@@ -18,6 +18,8 @@
+ #include "libsi/section.h"
+ #include "libsi/descriptor.h"
+ 
++using namespace std;
++
+ #define VALID_TIME (31536000 * 2) // two years
+ 
+ #define DBGEIT 0
+diff -Naur vdr-2.4.7.orig/font.c vdr-2.4.7/font.c
+--- vdr-2.4.7.orig/font.c	2021-05-02 19:34:32.315653108 +0200
++++ vdr-2.4.7/font.c	2021-05-02 19:51:53.540653108 +0200
+@@ -21,6 +21,8 @@
+ #include "osd.h"
+ #include "tools.h"
+ 
++using namespace std;
++
+ const char *DefaultFontOsd = "Sans Serif:Bold";
+ const char *DefaultFontSml = "Sans Serif";
+ const char *DefaultFontFix = "Courier:Bold";
+diff -Naur vdr-2.4.7.orig/menu.c vdr-2.4.7/menu.c
+--- vdr-2.4.7.orig/menu.c	2021-05-02 19:34:32.317653108 +0200
++++ vdr-2.4.7/menu.c	2021-05-02 19:45:44.891653108 +0200
+@@ -33,6 +33,8 @@
+ #include "transfer.h"
+ #include "videodir.h"
+ 
++using namespace std;
++
+ #define MAXWAIT4EPGINFO   3 // seconds
+ #define MODETIMEOUT       3 // seconds
+ #define NEWTIMERLIMIT   120 // seconds until the start time of a new timer created from the Schedule menu,
+diff -Naur vdr-2.4.7.orig/menuitems.c vdr-2.4.7/menuitems.c
+--- vdr-2.4.7.orig/menuitems.c	2021-05-02 19:34:32.318653108 +0200
++++ vdr-2.4.7/menuitems.c	2021-05-02 19:46:02.483653108 +0200
+@@ -17,6 +17,8 @@
+ #include "skins.h"
+ #include "status.h"
+ 
++using namespace std;
++
+ #define AUTO_ADVANCE_TIMEOUT  1500 // ms before auto advance when entering characters via numeric keys
+ 
+ const char *FileNameChars = trNOOP("FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&");
+diff -Naur vdr-2.4.7.orig/mtd.c vdr-2.4.7/mtd.c
+--- vdr-2.4.7.orig/mtd.c	2021-05-02 19:34:32.318653108 +0200
++++ vdr-2.4.7/mtd.c	2021-05-02 19:46:23.355653108 +0200
+@@ -10,6 +10,8 @@
+ #include "mtd.h"
+ #include "receiver.h"
+ 
++using namespace std;
++
+ //#define DEBUG_MTD
+ #ifdef DEBUG_MTD
+ #define DBGMTD(a...) dsyslog(a)
+diff -Naur vdr-2.4.7.orig/nit.c vdr-2.4.7/nit.c
+--- vdr-2.4.7.orig/nit.c	2021-05-02 19:34:32.318653108 +0200
++++ vdr-2.4.7/nit.c	2021-05-02 19:52:19.012653108 +0200
+@@ -16,6 +16,8 @@
+ #include "libsi/descriptor.h"
+ #include "tools.h"
+ 
++using namespace std;
++
+ #define DVB_SYSTEM_1 0 // see also dvbdevice.c
+ #define DVB_SYSTEM_2 1
+ 
+diff -Naur vdr-2.4.7.orig/osd.c vdr-2.4.7/osd.c
+--- vdr-2.4.7.orig/osd.c	2021-05-02 19:34:32.318653108 +0200
++++ vdr-2.4.7/osd.c	2021-05-02 19:47:12.501653108 +0200
+@@ -16,6 +16,8 @@
+ #include "device.h"
+ #include "tools.h"
+ 
++using namespace std;
++
+ tColor HsvToColor(double H, double S, double V)
+ {
+   if (S > 0) {
+diff -Naur vdr-2.4.7.orig/osdbase.c vdr-2.4.7/osdbase.c
+--- vdr-2.4.7.orig/osdbase.c	2021-05-02 19:34:32.318653108 +0200
++++ vdr-2.4.7/osdbase.c	2021-05-02 19:46:53.516653108 +0200
+@@ -15,6 +15,8 @@
+ #include "remote.h"
+ #include "status.h"
+ 
++using namespace std;
++
+ // --- cOsdItem --------------------------------------------------------------
+ 
+ cOsdItem::cOsdItem(eOSState State)
+diff -Naur vdr-2.4.7.orig/recording.c vdr-2.4.7/recording.c
+--- vdr-2.4.7.orig/recording.c	2021-05-02 19:34:32.323653108 +0200
++++ vdr-2.4.7/recording.c	2021-05-02 19:47:45.990653108 +0200
+@@ -31,6 +31,8 @@
+ #include "tools.h"
+ #include "videodir.h"
+ 
++using namespace std;
++
+ #define SUMMARYFALLBACK
+ 
+ #define RECEXT       ".rec"
+diff -Naur vdr-2.4.7.orig/remux.c vdr-2.4.7/remux.c
+--- vdr-2.4.7.orig/remux.c	2021-05-02 19:34:32.323653108 +0200
++++ vdr-2.4.7/remux.c	2021-05-02 19:48:03.230653108 +0200
+@@ -16,6 +16,8 @@
+ #include "shutdown.h"
+ #include "tools.h"
+ 
++using namespace std;
++
+ // Set these to 'true' for debug output:
+ static bool DebugPatPmt = false;
+ static bool DebugFrames = false;
+diff -Naur vdr-2.4.7.orig/skinclassic.c vdr-2.4.7/skinclassic.c
+--- vdr-2.4.7.orig/skinclassic.c	2021-05-02 19:34:32.324653108 +0200
++++ vdr-2.4.7/skinclassic.c	2021-05-02 19:48:26.271653108 +0200
+@@ -14,6 +14,8 @@
+ #include "themes.h"
+ #include "videodir.h"
+ 
++using namespace std;
++
+ #define ScrollWidth (Setup.FontOsdSize / 4)
+ #define TextFrame   (Setup.FontOsdSize / 10)
+ #define TextSpacing (Setup.FontOsdSize / 4)
+diff -Naur vdr-2.4.7.orig/skinlcars.c vdr-2.4.7/skinlcars.c
+--- vdr-2.4.7.orig/skinlcars.c	2021-05-02 19:34:32.324653108 +0200
++++ vdr-2.4.7/skinlcars.c	2021-05-02 19:48:46.063653108 +0200
+@@ -63,6 +63,8 @@
+ #include "symbols/teletext.xpm"
+ #include "symbols/volume.xpm"
+ 
++using namespace std;
++
+ #define Gap            (Setup.FontOsdSize / 5 & ~1) // must be even
+ #define TextFrame      (Setup.FontOsdSize / TEXT_ALIGN_BORDER)
+ #define TextSpacing    (2 * TextFrame)
+diff -Naur vdr-2.4.7.orig/skinsttng.c vdr-2.4.7/skinsttng.c
+--- vdr-2.4.7.orig/skinsttng.c	2021-05-02 19:34:32.324653108 +0200
++++ vdr-2.4.7/skinsttng.c	2021-05-02 19:49:15.256653108 +0200
+@@ -50,6 +50,8 @@
+ #include "symbols/teletext.xpm"
+ #include "symbols/volume.xpm"
+ 
++using namespace std;
++
+ #define Roundness     (Setup.FontOsdSize / 2)
+ #define Gap           (Setup.FontOsdSize / 5)
+ #define ScrollWidth   (Setup.FontOsdSize / 4)
+diff -Naur vdr-2.4.7.orig/thread.c vdr-2.4.7/thread.c
+--- vdr-2.4.7.orig/thread.c	2021-05-02 19:59:16.883653108 +0200
++++ vdr-2.4.7/thread.c	2021-05-02 20:00:08.879653108 +0200
+@@ -24,6 +24,8 @@
+ #include <unistd.h>
+ #include "tools.h"
+ 
++using namespace std;
++
+ #define ABORT { dsyslog("ABORT!"); cBackTrace::BackTrace(); abort(); }
+ 
+ //#define DEBUG_LOCKING  // uncomment this line to activate debug output for locking
+diff -Naur vdr-2.4.7.orig/timers.c vdr-2.4.7/timers.c
+--- vdr-2.4.7.orig/timers.c	2021-05-02 19:59:16.883653108 +0200
++++ vdr-2.4.7/timers.c	2021-05-02 19:59:52.287653108 +0200
+@@ -17,6 +17,8 @@
+ #include "status.h"
+ #include "svdrp.h"
+ 
++using namespace std;
++
+ // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
+ // format characters in order to allow any number of blanks after a numeric
+ // value!
+diff -Naur vdr-2.4.7.orig/tools.c vdr-2.4.7/tools.c
+--- vdr-2.4.7.orig/tools.c	2021-05-02 20:02:40.535653108 +0200
++++ vdr-2.4.7/tools.c	2021-05-02 20:03:06.859653108 +0200
+@@ -28,6 +28,8 @@
+ #include "i18n.h"
+ #include "thread.h"
+ 
++using namespace std;
++
+ int SysLogLevel = 3;
+ 
+ #define MAXSYSLOGBUF 256
diff --git a/media-video/vdr/vdr-2.4.7.ebuild b/media-video/vdr/vdr-2.4.7.ebuild
new file mode 100644
index 000000000000..c1f9413c3022
--- /dev/null
+++ b/media-video/vdr/vdr-2.4.7.ebuild
@@ -0,0 +1,209 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic l10n toolchain-funcs
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> ${P}.tbz2
+	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2 )
+	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
+	naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
+	pinplugin? ( http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.6_pinplugin.patch.bz2 )
+	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.6_ttxtsubs_v2.patch.bz2 )
+	permashift? ( http://vdr.websitec.de/download/${PN}/${P}/vdr-2.4-patch-for-permashift.diff.bz2 )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
+
+COMMON_DEPEND="
+	virtual/jpeg:*
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	media-tv/gentoo-vdr-scripts
+	media-fonts/corefonts
+	bidi? ( dev-libs/fribidi )
+	systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
+
+REQUIRED_USE="pinplugin? ( !mainmenuhooks )
+	permashift? ( !naludump !pinplugin )"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+	use debug && append-flags -g
+
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+	# use the corrected DIR /var/lib/vdr/* for acct/{user,group) handling
+	if has_version ">=media-tv/gentoo-vdr-scripts-3.0_rc1"; then
+		VIDEO_DIR="/var/lib/vdr/video"
+	else
+		VIDEO_DIR="/var/vdr/video"
+	fi
+
+	tc-export CC CXX AR
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+lang_po() {
+	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_configure() {
+	# support languages, written from right to left
+	export "BIDI=$(usex bidi 1 0)"
+	# systemd notification support
+	export "SDNOTIFY=$(usex systemd 1 0)"
+	# with/without keyboard
+	export "USE_KBD=$(usex keyboard 1 0)"
+	# detailed compile output for debug
+	export "VERBOSE=$(usex verbose 1 0)"
+}
+
+src_prepare() {
+	# apply maintenance-patches
+	ebegin "Changing paths for gentoo"
+
+	local DVBDIR=/usr/include
+	local i
+	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+		[[ -d ${i} ]] || continue
+		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+			einfo "Found DVB header files in ${i}"
+			DVBDIR=${i}
+			break
+		fi
+	done
+
+	# checking for s2api headers
+	local api_version
+	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+	if [[ ${api_version:-0} -lt 5*3 ]]; then
+		eerror "DVB header files do not contain s2api support or too old for ${P}"
+		eerror "You cannot compile VDR against old dvb-header"
+		die "DVB headers too old"
+	fi
+
+	cat > Make.config <<-EOT || die "cannot write to Make.config"
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		ARGSDIR			= \$(CONFDIR)/conf.d
+		VIDEODIR		= ${VIDEO_DIR}
+		LOCDIR			= \$(PREFIX)/share/locale
+		INCDIR			= \$(PREFIX)/include
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+		LIBDIR			= ${PLUGIN_LIBDIR}
+		PCDIR			= /usr/$(get_libdir)/pkgconfig
+
+	EOT
+	eend 0
+
+	eapply "${FILESDIR}/${PN}-2.4.6_gentoo.patch"
+	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
+	eapply "${FILESDIR}/${PN}-2.4.6_makefile-variables.patch"
+
+	# fix clang/LLVM compile
+	eapply "${FILESDIR}/${PN}-2.4.6_clang.patch"
+
+	# fix gcc-11 compile
+	eapply "${FILESDIR}/${P}_gcc11.patch"
+
+	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
+	use permashift && eapply "${WORKDIR}/${PN}-2.4-patch-for-permashift.diff"
+	use pinplugin && eapply "${WORKDIR}/${PN}-2.4.6_pinplugin.patch"
+	use ttxtsubs && eapply "${WORKDIR}/${PN}-2.4.6_ttxtsubs_v2.patch"
+	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
+	use mainmenuhooks && eapply "${WORKDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
+
+	add_cap CAP_UTF8 \
+		CAP_IRCTRL_RUNTIME_PARAM \
+		CAP_VFAT_RUNTIME_PARAM \
+		CAP_CHUID \
+		CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE"
+
+	# LINGUAS support
+	einfo "\n \t VDR supports the LINGUAS values"
+
+	lang_po
+
+	einfo "\t Please set one of this values in your sytem make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		einfo "\n \t No values in LINGUAS="
+		einfo "\t You will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING_PO} en
+
+	default
+}
+
+src_install() {
+	# trick the makefile to not create a VIDEODIR by supplying it with an
+	# existing directory
+	emake VIDEODIR="/" DESTDIR="${ED}" install
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	# backup for plugins they don't be able to create this dir
+	keepdir "${CONF_DIR}/plugins"
+
+	if use html; then
+		local HTML_DOCS=( *.html )
+	fi
+	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* )
+	einstalldocs
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	fowners vdr:vdr "${CONF_DIR}" -R
+}
+
+pkg_postinst() {
+	elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4"
+	elog "for major changes in this version\n"
+
+	elog "It is a good idea to run vdrplugin-rebuild now.\n"
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup\n"
+
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 363218650a3f..840e0e6558bf 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,3 +1,5 @@
 DIST yle-dl-20210212.tar.gz 64609 BLAKE2B 1cffaadd6c5628e0d2b2a02cda2c6a98939c0c92e9efda7a6fd0dc02c65f7e0b3a5de6d705143d4dbd1507bc8733d13dd9b0547592c86f6168de63d0fb73463a SHA512 cdef7ff929d3dacd8b599644b46d784412b232f64e3ba2f1d6d2338c8350d38e0ae089e2a79bf12a1d39311daff60a062432b945292c1728b310af3b3a68a98b
+DIST yle-dl-20210502.tar.gz 65149 BLAKE2B 26beded2ccee1d1ee077fd0e15b44f8bc849acc9103eb5fa0c5030b4fcd7c4a6d41a0d9636fdf6a1298e56357dfefec1935b12047edf97f9e7ca6307ef81a5fb SHA512 8e8a7d97c6a13a46dfc0573eaed5b8c5d3c2dd8ca12eac4d25c98908d7c802dfb12b6efa293b969c35ae480d8cb4898e90af9fb452ee0cd5d4d1b6556a6b9b1c
 EBUILD yle-dl-20210212.ebuild 1462 BLAKE2B 98d93097000e870959cbc04cc3b898bd7ab6d9ccec50c28da0523f96f7c8d1a9badda6e7005cbfe8c54bfb3705c956f5a7c33b75eb78fad5488e369010653069 SHA512 6bd5465392690f7c0790e09e9d64b4b698fb3356f189f82a8cd8ad118b0d5d5ac34f910bb8f667b6a90a3c76eb5c8f46dde50f0645d0f0f24a87fa1506aa8569
+EBUILD yle-dl-20210502.ebuild 1464 BLAKE2B 9c1078090e8495a87a4729546c82de481e2e8da9e7890f3909aa16422f767028e7fd665df39faaf36606728aa278005cabfdc563b33d77b3470795c82189f3ab SHA512 be06a861e680430d76678c66280931a48feb3bee4d482985c2cd300e004e5b527e78dbe0aa93593036bb4e05bb65035927de6ccac427b2dae5de6b8302e9e543
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/media-video/yle-dl/yle-dl-20210502.ebuild b/media-video/yle-dl/yle-dl-20210502.ebuild
new file mode 100644
index 000000000000..13fa558e1e62
--- /dev/null
+++ b/media-video/yle-dl/yle-dl-20210502.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download media files from Yle Areena"
+HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
+SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Requires an active internet connection during tests,
+# FEATURES="-network-sandbox" to test.
+RESTRICT="test"
+
+RDEPEND="media-video/ffmpeg
+	net-misc/wget
+	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/progress[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+		${RDEPEND}
+		media-video/ffmpeg[gnutls]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# Use 'pytest --geoblocked' to only test using non-geo restricted videos.
+distutils_enable_tests setup.py
+
+DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	elog "Sample configuration file has been installed to "
+	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
+	elog
+	optfeature "youtube-dl download engine" net-misc/youtube-dl
+}
-- 
cgit v1.2.3