gentoo resync : 10.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
commit: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree: 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /media-video
parent: bd4aeefe33e63f613512604e47bfca7b2187697d (diff)
45 files changed, 464 insertions, 994 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 314f290f7f0f..705baa4236bb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dv2sub/Manifest b/media-video/dv2sub/Manifest
index dd1fb6a1c9f7..b7a0ecf823d0 100644
--- a/media-video/dv2sub/Manifest
+++ b/media-video/dv2sub/Manifest
@@ -1,3 +1,3 @@
 DIST dv2sub-0.3.tar.gz 121756 BLAKE2B 7cb66255964ed9d566da8297ef82b3ab653230c7980005d73ff5881dc1b90ac53359513d9154f07a3c0bce74675a420346fe525c6ee1407582cec8624acdbbec SHA512 3284afd6b9698d7a464771e244eed567c7937d5b022f7f98f6dfc1ae73fde220bb816cc16d44c22cbf2112a0b7621f41a2223f25e2b8d3cad469275db4e8cfe2
-EBUILD dv2sub-0.3.ebuild 752 BLAKE2B f20e34a6aa65ad590ab223e664fd63ac3525a4cc4ade306db3673e339f4cb8aaba8b1273a01965bf9698433300e872619e953def260051e65cbd1e1ba23a9b8e SHA512 135182c03b3c8b0277a4c0801e25858416afa1b33540b4f2f1700992f6cff5f1fe37506dc2bd77e77c79dfa2ba3c3c96359fd27e6146346efc64960f3d60104d
+EBUILD dv2sub-0.3.ebuild 647 BLAKE2B 6c6a4f888c9552dd2c08afbf6af42154bcc883f56bc1501481d7e0b73565f0b6e56c7e8e5b6eee50e618d7509596302e91d85080f0188923a2a68aea24f6d899 SHA512 9cced93722acd682dbd2263e7b3de54f64438aff58bbb33c16f16f9249ff584a89b1adb7b345c50b7a02f067c4e3ac8667065d3bfd50b0e4875e9dc334246b76
 MISC metadata.xml 667 BLAKE2B d16408995824b43f912898a73e92e431806cb4cfaa88edac29c1284b735540048192ab32a2d4ca9cbb02e4f39fb911d5e09883c81eaeb93d773362bcfe7084fa SHA512 549e626d3f62df95ad729d73bcb78af5064eefb1cf16b0907709970e018cc1210b482423b55a8e1f4fc3afc3c289d1a42a440b26b3bd5cde10746e34bf41751b
diff --git a/media-video/dv2sub/dv2sub-0.3.ebuild b/media-video/dv2sub/dv2sub-0.3.ebuild
index e22e2651ff56..bed7d5473ffa 100644
--- a/media-video/dv2sub/dv2sub-0.3.ebuild
+++ b/media-video/dv2sub/dv2sub-0.3.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils
-
-DESCRIPTION="extract info or subtitles from DV stream"
+DESCRIPTION="Extract info or subtitles from DV stream"
 HOMEPAGE="http://dv2sub.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dv2sub/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="kino"
@@ -23,8 +21,8 @@ RDEPEND="${DEPEND}
 	)"
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
+	default
+
 	if use kino; then
 		insinto /usr/share/kino/scripts/exports
 		exeinto /usr/share/kino/scripts/exports
diff --git a/media-video/dvd9to5/Manifest b/media-video/dvd9to5/Manifest
index b734b9839d10..5611615faa2d 100644
--- a/media-video/dvd9to5/Manifest
+++ b/media-video/dvd9to5/Manifest
@@ -1,3 +1,3 @@
 DIST dvd9to5-0.1.7.tar.bz2 11803 BLAKE2B 33ce2e5490f6c1dc3bafb58d628d705fb6fd14c3322e7fd49fbc598852aeedf6fc942604457da3a2e41dd838c58bbedfcac70ff03c61c0ccf8fe926c187b90da SHA512 5329ad810d181b62d3b57b48f21dc8114fb11806745ab611e1aac5980f3e732c740aaddf17de7ef6f23769c9da934e646c01e82c9aed3390b5a2f9ad704f5f84
-EBUILD dvd9to5-0.1.7.ebuild 627 BLAKE2B 99e1f54612b3f158a3510243ccf87cd9ca5b2833ba7a5bd1bc31266686f3b2b4b9356450b4956d07bbd4128c20d39f284bb797fb6b2a2922da7815a6fb518f7e SHA512 6bce20eea15052d2f98420934b15323f8d2ccbe616eaf1eb6905acbad34715b17bd857d38d7bbbcd75e25b0ee8614b37b84f6d114577764c183f06341f619451
+EBUILD dvd9to5-0.1.7.ebuild 586 BLAKE2B 29ba7a787df5d7c3e4a3696e3bc14487f0f3e8f4b88c40e8529bdb855ff58ef627de99774029e7b3345fcc29d0b105340cc064793ef532b0b5393322b33b1b00 SHA512 b3f87f0630c3a56e13ae1d125cbd1e1b0ea67d0b7b1ac7b6eef71f9ab14bb037fd9830c313ad5b52ab5da7cd5b93f7ac89d9568d705210ea95cebc0b997ea86a
 MISC metadata.xml 341 BLAKE2B 402770fa47e7035e4cc56885dc61b0c4d5ef3764f30664f1b2b0f577453b4ed33a0b9c3de26930d6f76561f790272319d35594abb5aa261522137a58b593bc26 SHA512 46233755a2b2654e19356ea2680101440b4b8c592dd4af1d472ff0837dba4c8dcfa38d9d7ee86e0079def89361974ba48faba4e147403ff140787c13bdd7e888
diff --git a/media-video/dvd9to5/dvd9to5-0.1.7.ebuild b/media-video/dvd9to5/dvd9to5-0.1.7.ebuild
index 36917a390764..8286c3a01832 100644
--- a/media-video/dvd9to5/dvd9to5-0.1.7.ebuild
+++ b/media-video/dvd9to5/dvd9to5-0.1.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Perl script to backup the main feature of a DVD-9 on DVD-5"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,15 +11,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
-RDEPEND=">=media-video/transcode-0.6.11
-	>=media-video/mjpegtools-1.6.2
-	>=media-video/dvdauthor-0.6.10
-	app-cdr/dvd+rw-tools
-	dev-lang/perl"
 
-src_compile() {
-	true # nothing to do
-}
+RDEPEND="
+	app-cdr/dvd+rw-tools
+	dev-lang/perl
+	>=media-video/dvdauthor-0.6.10
+	>=media-video/mjpegtools-1.6.2
+	>=media-video/transcode-0.6.11"
 
 src_install() {
 	dobin dvd9to5.pl
diff --git a/media-video/dvdimagecmp/Manifest b/media-video/dvdimagecmp/Manifest
index dc0868817676..8de5642b2dc7 100644
--- a/media-video/dvdimagecmp/Manifest
+++ b/media-video/dvdimagecmp/Manifest
@@ -1,4 +1,4 @@
 AUX dvdimagecmp-0.3.diff 727 BLAKE2B 6ea0daabcf71d5c1d8164b2ee21cc21072b88e961c4551da3a1645b3aa643880e4f0602ba46f4317f3fd43194997e25f823829705557740e40f0c951d7160fa8 SHA512 6c925557e225c943f455874f5d702236a71c2bfdeebb2e244fb76605ec893885e970f0bf8cac17721e0695ae91b2c19775e05f26443d99d91663f8e7a3a57a99
 DIST dvdimagecmp-0.3.tgz 10483 BLAKE2B b29dad324c0cf7b3d37b9439e61220fdde65e58618e7dc71abdb7ea041b48e604eec5217a60cb4039e12313e12472c8443f74fd4e75e521e5d86cd9faf5f21d1 SHA512 3283ea8e69702f7fbcb70645b75313e4e502bc1da80ce9698822d98782a7d7a7b1f886bd3220f7753c91717df2c42c38a5283b795467265d4edaf1330cab0db4
-EBUILD dvdimagecmp-0.3-r1.ebuild 697 BLAKE2B e71768975df7016ac2096ec4179bf4351d948df3b9a1b02519c76b0e7260bd1a72585fce13b9aa55fb426a71e6743969a210d35cebca8b21ed42baad3ed8c1b3 SHA512 eda2ed1a8c6aaa3e8b65c788281df3261118ef2bfa137fb22b5b1ece065093f4db55e4c3c338b184ecb9c1f3cfdd601513434f4685f893dc4fc5a43fc6ccd43c
+EBUILD dvdimagecmp-0.3-r1.ebuild 580 BLAKE2B 3c123d678b5a889923bdc321057a7fd19e25dfbf1a7f996ec9c1840f4c02f6f8aec8fb30e04b0af34e4a98934b2f31529f039ec9686b4cf19796b7f6f77fefc7 SHA512 7a973ee1a19737fafe23dea14ab969ab6231b18b781920e1f13fee6908f4aa60c55e2269bc39b2a34ba814db0e731eb15594e8ff9c1c8264ba18f53a2e36535c
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-video/dvdimagecmp/dvdimagecmp-0.3-r1.ebuild b/media-video/dvdimagecmp/dvdimagecmp-0.3-r1.ebuild
index 17bd464ecd1a..de6ad2452c5f 100644
--- a/media-video/dvdimagecmp/dvdimagecmp-0.3-r1.ebuild
+++ b/media-video/dvdimagecmp/dvdimagecmp-0.3-r1.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic
-
-IUSE=""
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tool to compare a burned DVD with an image to check for errors"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
 SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
+IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.diff"
-}
+PATCHES=(
+	"${FILESDIR}/${P}.diff"
+)
 
 src_compile() {
-	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	append-lfs-flags
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
 }
 
 src_install() {
diff --git a/media-video/emovix/Manifest b/media-video/emovix/Manifest
index 706c5951f9d3..9962948a671a 100644
--- a/media-video/emovix/Manifest
+++ b/media-video/emovix/Manifest
@@ -1,3 +1,3 @@
 DIST emovix-0.9.0.tar.gz 11297252 BLAKE2B 38e077285443ab5b447a4e3e4ede52474e63003601335b5ef012d6764a9501ba28066ebf46f2de60887ae7d1485b52bd9e05b7f7bce288d67931c4077c780bb0 SHA512 87df6f124d8478d0704472adf80e541b3573bc448836f4525d99b614aba5bffbeea8f73b0b8e0b4a9a95375ee78d0f78352254eeb4f99be67611f4d17f5c3e2a
-EBUILD emovix-0.9.0.ebuild 600 BLAKE2B 24eb3d44894247466a9ea1d2f83770a6185fef04f49830027eb4f44ea1129369a1d6a78fe2ce55eb1c5be74cd40e055894893e23d618deb225f3ef9b4a58e38b SHA512 2d593b49ac4d40e5adb75af2501357d1cd84190c22959c3bdd323f03ded718907c8562671bd164e3c3477bbaff5a2f0781d6b36b7c213906b752ab640115956d
+EBUILD emovix-0.9.0.ebuild 534 BLAKE2B 05b46bc62b88f53b4a1bc7cba0194e963034df7bc1dfc559cc260ac36aa6a191590e43bf44913dbe9e06e50695df8bd21e9c34bf6c4a016eb43074875678acbf SHA512 d3144a7eb2f500e182b03ec9c1ef32a3716f0149161374ac60ef3df10337fff24fd30d0c96030958e7fec4ff7225f4b23069f285c0351000fd33b361f1c405bf
 MISC metadata.xml 298 BLAKE2B 869929382a92e3868813734d914dc0b43f8de6eea72d4503b4131c34ede406b0f1516c4625c04e0e35fc5f726c27ab5c62e2acb9a3defb079b4316bd2a21d890 SHA512 1a8c14b452885e3e7bf4baf9468df6d5fdf58676031fd7f97b75ba78f5701abb9ce1b6a6b449745cf509b2d8ced78e3fa337b243885ec09988ebc45ba36c46d6
diff --git a/media-video/emovix/emovix-0.9.0.ebuild b/media-video/emovix/emovix-0.9.0.ebuild
index eea6ee9e0459..338095e2c030 100644
--- a/media-video/emovix/emovix-0.9.0.ebuild
+++ b/media-video/emovix/emovix-0.9.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-DESCRIPTION="Micro Linux distro to boot from a CD and play every video file localized in the CD root"
+DESCRIPTION="Micro Linux distro to boot from a CD and play videos"
 HOMEPAGE="http://movix.sourceforge.net"
 SRC_URI="mirror://sourceforge/movix/${P}.tar.gz"
 
@@ -16,7 +16,7 @@ DEPEND="dev-lang/perl
 	virtual/awk"
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed."
+	emake -j1 DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README* TODO
 	dosym /usr/lib/win32 /usr/share/emovix/codecs
 }
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 7b98e5783274..83e71a77e4b2 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,15 +1,9 @@
-AUX handbrake-1.1.0-nolibav.patch 9306 BLAKE2B 8b3fafe2063fc03d1e4a571eb5133b532e760dda4cafaee80b748efcacfc8c3546531e29393a82582cde75f14d07fccc9f4b3451d497cf3beae97d0e93da5515 SHA512 42f21168349a9120c78f80f14c3faea81ed4d65b9987aaa8162b718dbb919a7e736969c1ae18083bb853b657e45bd20453e6fa3a304e11592bc48c1faaa4f285
 AUX handbrake-1.2.2-backport-hardware-configure.patch 6394 BLAKE2B 64009363b658bea4aaa588339e0f596790eaf584a377b0c76ad5fded84652fa4fc93ef626e5e221b1a742b1cbc34f8a97e2f92bc875fb8e018a34c93948ede3c SHA512 62d8c54ca0148fcac76f356dd4588b1cdfdbec7621fe9a8b426a39ee7b2dc1eb3085f17e8c1ebe23f5d45b69e59e52c7c8dd113308598b3f2378bad32dec6bd5
 AUX handbrake-9999-fix-missing-x265-link-flag.patch 281 BLAKE2B 623f902bb31586513a51db95a63841e6234d4841d6332d2be9a6a0d7fd07f3e9cc694eb8945bebf718e10538fa390bbaa9dcbea81ba5324cbf20bd64bc582fdb SHA512 30d457258dd287cae3df66e7899b66480be2212a3969fe3a4e4f99ed383740e8f597fa7cf869922f29f501f100313b7efd78ebe09e2949ed4c235e2df22d22e5
+AUX handbrake-9999-libdl-link.patch 882 BLAKE2B 74b6f367828d267ccefa33a1a88cfe53bf06e7f090e70593800cccec1bbb64df9952851efd94e20ec0e61e73e4ef0657c8238acdccccc85372591bc8b25bc024 SHA512 9990842947ea8eaf738c9d34859444d352a06c46cb15ee18018cdd10d1c666fb953fffb7d15d44d077aca52c1eef21bdc5585f44a94a04ddefcd1656a72dadaa
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
-DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd SHA512 48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3
-DIST handbrake-1.1.1.tar.bz2 15319551 BLAKE2B d0569a796f3838f5696e3dcfed348a5111e063841cb594bbce7283568cdf868e6b751f3cd6086ebc83af5f2d6ad9e238717425f953677cca9e2908a9c0301aa9 SHA512 990035a5f850fafbc68c77dd61d7f7371c3eda2cc6e6ceb377f111c9016713523cf1685f519926ae8859446c99392c64b7ce91d72f9b5f9643a35a3d0326eef4
-DIST handbrake-1.1.2.tar.bz2 15291003 BLAKE2B b502ba18139c3332b8614e831005b4a846c0fab9a31bce2c9f3481d6d41ba3f087ded30adb6bd58220b14002f230fb920db1cc45ec7baee4fda573148fddfc8e SHA512 360f7fe3e4571bb623f54a00e9478a78d655448ffb1b8d72b7d32636a230f2ae4dabbfe803f6f9491537064ea4f6e238700b3d29912ae34383fbb1922e18e9b8
 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
-EBUILD handbrake-1.1.0-r1.ebuild 3595 BLAKE2B 2690c7d1583fa7acbdace1255196ef377613791dba04efddf8bc2b6d606d17b4ebafa8203277254ad48075e166eff39dcf9af52efc7612d5cff0491de77e4729 SHA512 e9f456bad7425d459bd35c733afc720045ddcf4622ffc371b0755a55bac288e3f101a8c60ef220be884653b3def6e4fe4d368d323d485242fd62f88ac81c4345
-EBUILD handbrake-1.1.1.ebuild 3595 BLAKE2B 2690c7d1583fa7acbdace1255196ef377613791dba04efddf8bc2b6d606d17b4ebafa8203277254ad48075e166eff39dcf9af52efc7612d5cff0491de77e4729 SHA512 e9f456bad7425d459bd35c733afc720045ddcf4622ffc371b0755a55bac288e3f101a8c60ef220be884653b3def6e4fe4d368d323d485242fd62f88ac81c4345
-EBUILD handbrake-1.1.2.ebuild 3595 BLAKE2B 2690c7d1583fa7acbdace1255196ef377613791dba04efddf8bc2b6d606d17b4ebafa8203277254ad48075e166eff39dcf9af52efc7612d5cff0491de77e4729 SHA512 e9f456bad7425d459bd35c733afc720045ddcf4622ffc371b0755a55bac288e3f101a8c60ef220be884653b3def6e4fe4d368d323d485242fd62f88ac81c4345
 EBUILD handbrake-1.2.2-r2.ebuild 4123 BLAKE2B 8195f875d49e0ec7f951e81fed5ab36b82dd989cbfe0845a6414abdd1bee9025f0d84a752b7400fe8d049b5fc64243ca8792cc58f5db88cfa47a293d2cee3adb SHA512 424866e13dff945b238f97686c1c48c42826823be3e924fb6989f1f74a330ed674c45a5e7bb4a0dd222a7b75d12035db37e73bfa8209abc38dc2fc0b98747e8c
-EBUILD handbrake-9999.ebuild 3595 BLAKE2B 8c41499f2c49c66a20a64843cc43213c82bd263e45ef6c22ca726eb546eba7f398b7e406bbca1956a1393bf455c1ccb4e2aa9012d7073bcdb8b1367f8b036d5c SHA512 144cfe12b5cec8e8a3613b85e5b2d3ba42c6e02eebe2c97e120119824874aa3ac5dc5b710cd0c367a4887d83f1b2a0fe94276e3a10d9796934ad2dc909741c90
+EBUILD handbrake-9999.ebuild 4139 BLAKE2B c606ab0204158e5c2b6e4b752247d8d4e08d06a1c3be8c929932f6b1da47358cb6483624aee982b0e96ece8a4a6c7ca7f0956228e1aec6efb1821c1a8ebede6e SHA512 7d37c3742c2784dc1cd29694d38e373ef23821800d2ff93081c289a134416c7badfb9e18129a719e56ac9d8959ca13667064a5d5d7264a953f74cbea9a1cccce
 MISC metadata.xml 949 BLAKE2B fc4ffd4d804c1098614e24525ae50673620b16e4d9480594cfbf4fc28f4aaa6274a6881548b9dbbbf6e431a839bf1742900faaa1612d11a22ad92f325af22579 SHA512 da975f8436e71359f279b26a2f41b1813f3177bf5768cb848f4feafa352c31084c7f2ba350fc6491400df8e261d2dcb8f32473657ceca6bd18d2fcd67b343185
diff --git a/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch b/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
deleted file mode 100644
index bb7e17bdde5b..000000000000
--- a/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From 9e1f245708a157231c427c0ef9b91729d59a30e1 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins.hb@gmail.com>
-Date: Tue, 28 Nov 2017 08:22:54 -0800
-Subject: [PATCH] add sdtp (sample dependency) box to mp4 (#1006)
-
-* add sdtp (sample dependency) box to mp4
-
-The AppleTV 4K requires this box in order to play 2160p60 video.
----
- contrib/ffmpeg/A21-mp4-sdtp.patch | 126 ++++++++++++++++++++++++++++++++++++++
- libhb/encavcodec.c                |   8 ++-
- libhb/encx264.c                   |   7 +--
- libhb/encx265.c                   |   3 +
- libhb/muxavformat.c               |   4 ++
- 5 files changed, 140 insertions(+), 8 deletions(-)
- create mode 100644 contrib/ffmpeg/A21-mp4-sdtp.patch
-
-diff --git a/contrib/ffmpeg/A21-mp4-sdtp.patch b/contrib/ffmpeg/A21-mp4-sdtp.patch
-new file mode 100644
-index 000000000..5d2221c47
---- /dev/null
-+++ b/contrib/ffmpeg/A21-mp4-sdtp.patch
-@@ -0,0 +1,126 @@
-+From c2204c579c8411771b53a4bc66324c7c5d07698a Mon Sep 17 00:00:00 2001
-+From: John Stebbins <stebbins@jetheaddev.com>
-+Date: Thu, 16 Nov 2017 14:40:12 -0800
-+Subject: [PATCH] movenc: add sdtp (sample dependency) box to mp4
-+
-+The AppleTV 4K requires this box in order to play 2160p60 video.
-+---
-+ libavcodec/avcodec.h |  9 +++++++--
-+ libavformat/movenc.c | 34 +++++++++++++++++++++++++++++++++-
-+ libavformat/movenc.h |  6 ++++++
-+ 3 files changed, 46 insertions(+), 3 deletions(-)
-+
-+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
-+index 5624835023..48e9d23679 100644
-+--- a/libavcodec/avcodec.h
-++++ b/libavcodec/avcodec.h
-+@@ -1161,8 +1161,13 @@ typedef struct AVPacket {
-+     int64_t convergence_duration;
-+ #endif
-+ } AVPacket;
-+-#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
-+-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-++#define AV_PKT_FLAG_KEY         0x0001 ///< The packet contains a keyframe
-++#define AV_PKT_FLAG_CORRUPT     0x0002 ///< The packet content is corrupted
-++/**
-++ * Flag is used to indicate packets that contain frames that can
-++ * be discarded by the decoder.  I.e. Non-reference frames.
-++ */
-++#define AV_PKT_FLAG_DISPOSABLE  0x0004
-+ 
-+ enum AVSideDataParamChangeFlags {
-+     AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
-+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
-+index a546fdfead..d263f444f4 100644
-+--- a/libavformat/movenc.c
-++++ b/libavformat/movenc.c
-+@@ -227,6 +227,30 @@ static int mov_write_stss_tag(AVIOContext *pb, MOVTrack *track, uint32_t flag)
-+     return update_size(pb, pos);
-+ }
-+ 
-++/* Sample dependency atom */
-++static int mov_write_sdtp_tag(AVIOContext *pb, MOVTrack *track)
-++{
-++    int i;
-++    uint8_t leading, dependent, reference, redundancy;
-++    int64_t pos = avio_tell(pb);
-++    avio_wb32(pb, 0); // size
-++    ffio_wfourcc(pb, "sdtp");
-++    avio_wb32(pb, 0); // version & flags
-++    for (i = 0; i < track->entry; i++) {
-++        dependent = MOV_SAMPLE_DEPENDENCY_YES;
-++        leading = reference = redundancy = MOV_SAMPLE_DEPENDENCY_UNKNOWN;
-++        if (track->cluster[i].flags & MOV_DISPOSABLE_SAMPLE) {
-++            reference = MOV_SAMPLE_DEPENDENCY_NO;
-++        }
-++        if (track->cluster[i].flags & MOV_SYNC_SAMPLE) {
-++            dependent = MOV_SAMPLE_DEPENDENCY_NO;
-++        }
-++        avio_w8(pb, (leading << 6)   | (dependent << 4) |
-++                    (reference << 2) | redundancy);
-++    }
-++    return update_size(pb, pos);
-++}
-++
-+ static int mov_write_amr_tag(AVIOContext *pb, MOVTrack *track)
-+ {
-+     avio_wb32(pb, 0x11); /* size */
-+@@ -1211,8 +1235,12 @@ static int mov_write_stbl_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
-+     mov_write_stts_tag(pb, track);
-+     if ((track->par->codec_type == AVMEDIA_TYPE_VIDEO ||
-+          track->par->codec_tag == MKTAG('r','t','p',' ')) &&
-+-        track->has_keyframes && track->has_keyframes < track->entry)
-++        track->has_keyframes && track->has_keyframes < track->entry) {
-+         mov_write_stss_tag(pb, track, MOV_SYNC_SAMPLE);
-++    }
-++    if (track->par->codec_type == AVMEDIA_TYPE_VIDEO && track->has_disposable) {
-++        mov_write_sdtp_tag(pb, track);
-++    }
-+     if (track->mode == MODE_MOV && track->flags & MOV_TRACK_STPS)
-+         mov_write_stss_tag(pb, track, MOV_PARTIAL_SYNC_SAMPLE);
-+     if (track->par->codec_type == AVMEDIA_TYPE_VIDEO &&
-+@@ -3647,6 +3675,10 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
-+         if (trk->cluster[trk->entry].flags & MOV_SYNC_SAMPLE)
-+             trk->has_keyframes++;
-+     }
-++    if (pkt->flags & AV_PKT_FLAG_DISPOSABLE) {
-++        trk->cluster[trk->entry].flags |= MOV_DISPOSABLE_SAMPLE;
-++        trk->has_disposable++;
-++    }
-+     trk->entry++;
-+     trk->sample_count += samples_in_chunk;
-+     mov->mdat_size    += size;
-+diff --git a/libavformat/movenc.h b/libavformat/movenc.h
-+index 008f4671c6..f4eb4e8078 100644
-+--- a/libavformat/movenc.h
-++++ b/libavformat/movenc.h
-+@@ -51,6 +51,7 @@ typedef struct MOVIentry {
-+     int          cts;
-+ #define MOV_SYNC_SAMPLE         0x0001
-+ #define MOV_PARTIAL_SYNC_SAMPLE 0x0002
-++#define MOV_DISPOSABLE_SAMPLE   0x0004
-+     uint32_t     flags;
-+ } MOVIentry;
-+ 
-+@@ -85,6 +86,7 @@ typedef struct MOVTrack {
-+     long        sample_count;
-+     long        sample_size;
-+     int         has_keyframes;
-++    int         has_disposable;
-+ #define MOV_TRACK_CTTS         0x0001
-+ #define MOV_TRACK_STPS         0x0002
-+ #define MOV_TRACK_ENABLED      0x0004
-+@@ -180,6 +182,10 @@ typedef struct MOVMuxContext {
-+     int missing_duration_warned;
-+ } MOVMuxContext;
-+ 
-++#define MOV_SAMPLE_DEPENDENCY_UNKNOWN 0x0
-++#define MOV_SAMPLE_DEPENDENCY_YES     0x1
-++#define MOV_SAMPLE_DEPENDENCY_NO      0x2
-++
-+ #define FF_MOV_FLAG_RTP_HINT              (1 <<  0)
-+ #define FF_MOV_FLAG_FRAGMENT              (1 <<  1)
-+ #define FF_MOV_FLAG_EMPTY_MOOV            (1 <<  2)
-+-- 
-+2.13.6
-+
-diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
-index 59d491148..9960a21b4 100644
---- a/libhb/encavcodec.c
-+++ b/libhb/encavcodec.c
-@@ -532,12 +532,14 @@ static void get_packets( hb_work_object_t * w, hb_buffer_list_t * list )
-         out->s.duration = get_frame_duration(pv, frameno);
-         out->s.stop     = out->s.stop + out->s.duration;
-         // libav 12 deprecated context->coded_frame, so we can't determine
--        // the exact frame type any more.  Luckily for us, we really don't
--        // require it.
-+        // the exact frame type any more. So until I can completely
-+        // wire up ffmpeg with AV_PKT_DISPOSABLE_FRAME, all frames
-+        // must be considered to potentially be reference frames
-+        out->s.flags     = HB_FLAG_FRAMETYPE_REF;
-         out->s.frametype = 0;
-         if (pkt.flags & AV_PKT_FLAG_KEY)
-         {
--            out->s.flags = HB_FLAG_FRAMETYPE_REF | HB_FLAG_FRAMETYPE_KEY;
-+            out->s.flags |= HB_FLAG_FRAMETYPE_KEY;
-             hb_chapter_dequeue(pv->chapter_queue, out);
-         }
-         out = process_delay_list(pv, out);
-diff --git a/libhb/encx264.c b/libhb/encx264.c
-index ce7879ec7..26645213a 100644
---- a/libhb/encx264.c
-+++ b/libhb/encx264.c
-@@ -701,6 +701,7 @@ static hb_buffer_t *nal_encode( hb_work_object_t *w, x264_picture_t *pic_out,
-              frames we only get the duration of the first which will
-              eventually screw up the muxer & decoder. */
-     int i;
-+    buf->s.flags &= ~HB_FLAG_FRAMETYPE_REF;
-     for( i = 0; i < i_nal; i++ )
-     {
-         int size = nal[i].i_payload;
-@@ -737,11 +738,7 @@ static hb_buffer_t *nal_encode( hb_work_object_t *w, x264_picture_t *pic_out,
-          * Also, since libx264 doesn't tell us when B-frames are
-          * themselves reference frames, figure it out on our own.
-          */
--        if (nal[i].i_ref_idc == NAL_PRIORITY_DISPOSABLE)
--        {
--            buf->s.flags &= ~HB_FLAG_FRAMETYPE_REF;
--        }
--        else
-+        if (nal[i].i_ref_idc != NAL_PRIORITY_DISPOSABLE)
-         {
-             if (buf->s.frametype == HB_FRAME_B)
-             {
-diff --git a/libhb/encx265.c b/libhb/encx265.c
-index ec7b7d574..242dc6f1f 100644
---- a/libhb/encx265.c
-+++ b/libhb/encx265.c
-@@ -425,16 +425,19 @@ static hb_buffer_t* nal_encode(hb_work_object_t *w,
-             buf->s.frametype = HB_FRAME_IDR;
-             break;
-         case X265_TYPE_P:
-+            buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
-             buf->s.frametype = HB_FRAME_P;
-             break;
-         case X265_TYPE_B:
-             buf->s.frametype = HB_FRAME_B;
-             break;
-         case X265_TYPE_BREF:
-+            buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
-             buf->s.frametype = HB_FRAME_BREF;
-             break;
-         case X265_TYPE_I:
-         default:
-+            buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
-             buf->s.frametype = HB_FRAME_I;
-             break;
-     }
-diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
-index f85336dfe..62a270d5b 100644
---- a/libhb/muxavformat.c
-+++ b/libhb/muxavformat.c
-@@ -1197,6 +1197,10 @@ static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *bu
-         {
-             pkt.flags |= AV_PKT_FLAG_KEY;
-         }
-+        if (!(buf->s.flags & HB_FLAG_FRAMETYPE_REF))
-+        {
-+            pkt.flags |= AV_PKT_FLAG_DISPOSABLE;
-+        }
-     }
-     else if (buf->s.frametype & HB_FRAME_MASK_KEY)
-     {
diff --git a/media-video/handbrake/files/handbrake-9999-libdl-link.patch b/media-video/handbrake/files/handbrake-9999-libdl-link.patch
new file mode 100644
index 000000000000..ace1528053a0
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-9999-libdl-link.patch
@@ -0,0 +1,13 @@
+diff --git a/gtk/configure.ac b/gtk/configure.ac
+index 92aabcbe8..1f4a1df95 100644
+--- a/gtk/configure.ac
++++ b/gtk/configure.ac
+@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
+ 
+ GHB_CFLAGS="$HBINC $GHB_CFLAGS"
+ 
+-HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
++HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
+ 
+ if test "x$use_fdk_aac" = "xyes" ; then
+     HB_LIBS="$HB_LIBS -lfdk-aac"
diff --git a/media-video/handbrake/handbrake-1.1.0-r1.ebuild b/media-video/handbrake/handbrake-1.1.0-r1.ebuild
deleted file mode 100644
index 5ab5c42c603c..000000000000
--- a/media-video/handbrake/handbrake-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	dev-libs/jansson
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libvpx
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-1.7:0= )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Fix missing x265 link flag
-	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	# Get rid of libav specific code when using ffmpeg
-	use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		$(use_enable libav-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(use_enable gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
-	if use gtk ; then
-		einfo ""
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.1.1.ebuild b/media-video/handbrake/handbrake-1.1.1.ebuild
deleted file mode 100644
index 5ab5c42c603c..000000000000
--- a/media-video/handbrake/handbrake-1.1.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	dev-libs/jansson
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libvpx
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-1.7:0= )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Fix missing x265 link flag
-	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	# Get rid of libav specific code when using ffmpeg
-	use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		$(use_enable libav-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(use_enable gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
-	if use gtk ; then
-		einfo ""
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.1.2.ebuild b/media-video/handbrake/handbrake-1.1.2.ebuild
deleted file mode 100644
index 5ab5c42c603c..000000000000
--- a/media-video/handbrake/handbrake-1.1.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	dev-libs/jansson
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libvpx
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-1.7:0= )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Fix missing x265 link flag
-	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	# Get rid of libav specific code when using ffmpeg
-	use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		$(use_enable libav-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(use_enable gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
-	if use gtk ; then
-		einfo ""
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 26469e6268b5..f75730cee0d1 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{1,2,3,4,5,6,7} python2_7 )
 
 inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
@@ -23,27 +23,30 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac x265"
+IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
 RDEPEND="
+	app-arch/xz-utils
+	media-libs/speex
 	dev-libs/jansson
 	media-libs/a52dec
 	media-libs/libass:=
 	>=media-libs/libbluray-1.0
 	media-libs/libdvdnav
-	media-libs/libdvdread
+	media-libs/libdvdread:=
 	media-libs/libsamplerate
 	media-libs/libtheora
 	media-libs/libvorbis
-	media-libs/libvpx
+	>=media-libs/libvpx-1.8
+	nvenc? ( media-libs/nv-codec-headers )
 	media-libs/opus
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	libav? ( >=media-video/libav-12.3:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
+	libav? ( >=media-video/libav-12.2:0=[fdk?] )
+	!libav? ( >=media-video/ffmpeg-4.2.1:0=[fdk?] )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -53,6 +56,7 @@ RDEPEND="
 		media-plugins/gst-plugins-a52dec:1.0
 		media-plugins/gst-plugins-libav:1.0
 		media-plugins/gst-plugins-x264:1.0
+		media-plugins/gst-plugins-gdkpixbuf:1.0
 	)
 	gtk? (
 		>=x11-libs/gtk+-3.10
@@ -65,7 +69,7 @@ RDEPEND="
 		x11-libs/pango
 	)
 	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-1.7:0= )
+	x265? ( >=media-libs/x265-2.9:0= )
 	"
 
 DEPEND="${RDEPEND}
@@ -82,8 +86,8 @@ PATCHES=(
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
 	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
 
-	# Fix missing x265 link flag
-	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
+	# Fix missing -ldl
+	"${FILESDIR}/${PN}-9999-libdl-link.patch"
 )
 
 pkg_setup() {
@@ -98,9 +102,6 @@ src_prepare() {
 
 	default
 
-	# Get rid of libav specific code when using ffmpeg
-	use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
-
 	cd "${S}/gtk"
 	# Don't run autogen.sh.
 	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
@@ -108,15 +109,21 @@ src_prepare() {
 }
 
 src_configure() {
+	# Libav was replaced in 1.2 with ffmpeg by default
+	# but I've elected to not make people change their use flags for AAC
+	# as its the same code anyway
 	./configure \
 		--force \
 		--verbose \
 		--prefix="${EPREFIX}/usr" \
 		--disable-gtk-update-checks \
-		$(use_enable libav-aac) \
+		--disable-flatpak \
+		--disable-gtk4 \
+		$(use_enable libav-aac ffmpeg-aac) \
 		$(use_enable fdk fdk-aac) \
-		$(use_enable gtk) \
+		$(usex !gtk --disable-gtk) \
 		$(usex !gstreamer --disable-gst) \
+		$(use_enable nvenc) \
 		$(use_enable x265) || die "Configure failed."
 }
 
@@ -137,10 +144,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
+	einfo "do not use the bundled (and often patched) upstream libraries."
+	einfo ""
+	einfo "Please do not raise bugs with upstream because of these ebuilds,"
+	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
 
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
 	if use gtk ; then
-		einfo ""
 		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
 	fi
 
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index cdfcbbf2fd8b..22beabadce9e 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST mediainfo_19.07.tar.xz 1903620 BLAKE2B 68487713e0c540022d2a5ee8416cb8e1c87ed2a4479f8d7c247d75137a62d3ae2994d02cd8853080837a23d582ce4acab497646bf2307a0b2b4d398635738baa SHA512 ef543b2b3fa61347adaa510fc3b051ff148e24ef6461e25b9f1d158f3c4b57ce96826d0c0e8ae46996092e0eb84e99308ba87d95dd0392b99f05b704438c5983
 DIST mediainfo_19.09.tar.xz 1906920 BLAKE2B 926a13dd4b059eb613acf89b3b3e12918a86ad45c8551948be2d55478bbe94a93a3fdf7a49fbc087e44fd81232a9fa85cb6dfbd25efb11b9997b1f90b49090e4 SHA512 ddcfa92d822a28fa804d5bddc0d29bdb8cff3779b924c2caef0e59b0f79f857a4140dc94bd2ed9158954f6400778572975ac63f45ee2b87664e3e3b5ed9327a0
-EBUILD mediainfo-19.07.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
-EBUILD mediainfo-19.09.ebuild 1602 BLAKE2B ba4076c82d812b436c9c707c36043e1f2a5c493fa23c78ab2b545dc1e207f1d42e49cc3795fd5675820ef4e614f37c94128e9e4c5e3a82ccb79e416338950ae7 SHA512 30306ad04a63f72802532bcc3bfbf9bac6cba5306af8d6f693052a17b24f033ab089a7dc1f928cb6fe5c569c5f73d71206fb8d6d0d1f9b4d135cabf8bc109637
+EBUILD mediainfo-19.09.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-19.07.ebuild b/media-video/mediainfo/mediainfo-19.07.ebuild
deleted file mode 100644
index 37cd73d53baf..000000000000
--- a/media-video/mediainfo/mediainfo-19.07.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit gnome2-utils xdg-utils autotools wxwidgets
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	if use wxwidgets; then
-		TARGETS+=" GUI"
-		setup-wxwidgets
-	fi
-}
-
-src_prepare() {
-	default
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		sed -i -e "s:-O2::" configure.ac || die
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-		dodoc "${S}"/History_${target}.txt
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/mediainfo/mediainfo-19.09.ebuild b/media-video/mediainfo/mediainfo-19.09.ebuild
index 255a3010c595..37cd73d53baf 100644
--- a/media-video/mediainfo/mediainfo-19.09.ebuild
+++ b/media-video/mediainfo/mediainfo-19.09.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/mplay-sh/Manifest b/media-video/mplay-sh/Manifest
index bd7a2ccfc826..0b522e531a54 100644
--- a/media-video/mplay-sh/Manifest
+++ b/media-video/mplay-sh/Manifest
@@ -1,3 +1,3 @@
 DIST mplay-0.5.3.tgz 26829 BLAKE2B 49bce50953f2a068cd63ddfe6328f12c66489c2d8b7cb3d399f0afe9246a6ec18e99a4d7a4da9ec7946d0c59b4c405ec351315897bf2ae8ab5f17cf8a5de668e SHA512 68ed7821e1f926a5be5031dd464eae7b861f517eefdd78437adf366e83974ec6cedaa4e75b4098aff8d7526dea47bae60ab1942b13e0a986ba2e7f3bbbf50fdb
-EBUILD mplay-sh-0.5.3-r1.ebuild 1049 BLAKE2B 5b746e20d74d237315637b36057dfbb49db5d10a9660c661e8cf6971c492648c782bcfd8fc22f8220d6efd3dd7eac90839b7a52791c290a6f490997c8b460fe2 SHA512 47457a6aababbf6be76c3383651ae60587f8d0285e03154e65497577e82192482536a6596b4b655e06f7e511dca8db4890fada3f6e51d9f8bece988474589003
+EBUILD mplay-sh-0.5.3-r1.ebuild 1058 BLAKE2B e601ad47156237297da51b721bd19ce6782a3b56b1d1f4e185e179094fc46fd99e95a34a0e1041c49e2554b66088f3ccb17171cb2d86ba95cce74d73541c4c94 SHA512 38dfe16f4f0e06bc333687fd7e83acd27e3c5ae0e7770fbda107b1f200a48685046338e549ad42ac6f499827d958ebea652666ec7d759339f9197d569112cd11
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild b/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild
index 0f6b9838c2c8..da819c2dd0db 100644
--- a/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild
+++ b/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild
@@ -1,34 +1,33 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 MY_P="mplay-${PV}"
 
 DESCRIPTION="mplayer wrapper script as backend for vdr-mplayer"
-HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=62306"
+HOMEPAGE="https://www.vdr-portal.de/board/thread.php?threadid=62306"
 SRC_URI="mirror://gentoo/${MY_P}.tgz
 	https://dev.gentoo.org/~zzam/distfiles/${MY_P}.tgz"
+S=${WORKDIR}/${MY_P}
 
 KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
+# for vdr user?
 DEPEND="media-tv/gentoo-vdr-scripts"
-RDEPEND=">=media-video/mplayer-0.90_rc4"
+RDEPEND="${DEPEND}
+	>=media-video/mplayer-0.90_rc4"
 
-S=${WORKDIR}/${MY_P}
+src_prepare() {
+	default
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
 	sed -i mplay.sh \
-		-e 's#$CONFDIR/silence.wav#/usr/share/vdr/mplay-sh/silence.wav#'
+		-e 's#$CONFDIR/silence.wav#/usr/share/vdr/mplay-sh/silence.wav#' || die
 	sed -i conf.examples/mplayrc \
-		-e 's#^MPLAY_PLAY.*#MPLAY_PLAY="/var/vdr/tmp/mplay.play"#'
+		-e 's#^MPLAY_PLAY.*#MPLAY_PLAY="/var/vdr/tmp/mplay.play"#' || die
 }
 
 src_install() {
@@ -41,7 +40,8 @@ src_install() {
 	insinto /usr/share/vdr/mplay-sh
 	doins conf.examples/silence.wav
 
-	dodoc README* HISTORY
+	dodoc HISTORY README*
+
 	keepdir /var/vdr/tmp
-	chown vdr:vdr -R "${D}/var/vdr"
+	fowners -R vdr:vdr /var/vdr
 }
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index ce0e961af931..9fe367f38e31 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,5 +1,7 @@
 AUX obs-studio-23.2.1-use-correct-libdir.patch 1776 BLAKE2B 4b3bcc6a0b1c128b3b2e90ce65d8515847413fb7b879943cd42789b8597dd7cb7036916cc5c796fb860237235cfba464c2a51c7aa43fb607f21dd9b823e9b2ce SHA512 33396fdb59d0588b8cae14539742f65d4f257ad1b9fb85fefae68c636de31099d8878e4b5ffde2ca16575c4ebe642164a2a8a4b8e87ca7101cf5bb3474bcd367
 DIST obs-studio-23.2.1.tar.gz 6204515 BLAKE2B bd025a1ec2809e8a0b47fba79c6a3d40feb255a03a461725501a9c7cdbc40c04b75ff714fa4b3787f876a3f524f3371119a3ea9666c3aeb003184f1eb2a63123 SHA512 aabc23d825c2ca3f40274a8e2c4935939dab4955d929c44b28cebde114e808543c1c0dc05791bb6d9f2611effb0f2cb3e20c9a653154c30a9851ea94e74c8169
+DIST obs-studio-24.0.3.tar.gz 6285359 BLAKE2B f799e93e9c35c22e5d7f6e4da04e30b06a3a1ad1b3bfd0a75acdbb5d1f28a717d84809a1f35a858252ff30094fa80521d752a35b5285b0a606d0d77ff88fb3cf SHA512 57cef700076457da1eee344042261e1ada6d6744fcb3033a1d4eaffb9e84dd350aa198984fba3de82d4e727706f562c7c3568d95de6859a4942d9fa6368a02ab
 EBUILD obs-studio-23.2.1.ebuild 3076 BLAKE2B 537845e1bb605bef3fb624912c2433dd52c350119a4ae6bb6a620b3bfa0de6a5170074b3b5c99521e7d54d255e27b32f4e8c117e545e06c9302e2560ab1d9fa6 SHA512 02fb36afdee9f05b98df9b21ae9c6fb449e8acb8be03aaf6b7e8533c3546fc3a72376fac4a2279a9eb96c73203c6cceb9658904e8226df1bd274acbb80c97c12
-EBUILD obs-studio-9999.ebuild 2984 BLAKE2B c2421879062c3593fd6644086b51d6a8bd1f9077d252b406ce6505d5eb052bbc2dff3ac0acd73fd6fab7d627f9b95c9588b59c7084be802f52d3d2e832daa3c3 SHA512 7a95552fcd24e0404b5a6e724c8d0e9ddbfedae67867d9a0119c1a32c2bb1f99f7d779b3a12da8a252e24db9a6e6b80f80f5c6879d30ba9b8f708c2fe24e8805
-MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f
+EBUILD obs-studio-24.0.3.ebuild 3113 BLAKE2B fc0e8d1ece5c80eba87e73be0ab1c39504a7f58ebd6a5ee484e8061b6a03200e27e0770e95e524456f2d95de0f9a3a3d151a925bb3158fd48ada693fe68f320c SHA512 e87680d42f2a0ca5329b6a0c0dfd2614efcfbb59f15a3b03946ae853726181206f089b847165640b9e293a1e11430a594b458eba1778c0ef043f59a29f88f441
+EBUILD obs-studio-9999.ebuild 3082 BLAKE2B e17e770fca7a25e2eeab49230a7feb72d4c0ffd76f9b6f22bbecddb0e12c07b63a5bbf3a2b71262af1e1e9c8fcbbba61c43527238e2e46bfe861cdb5fe8a1173 SHA512 5a01e927ae74a8b65fa88b6ad90ebb16b4b04c1846b979546612c791606f567659d813f10e9e274efb95684ac2e697fc7739fac14b96db6a2f50bc19cf64f8f4
+MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 89c066c043bd..cd2070e38ea0 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -19,6 +19,9 @@
     <flag name="python">Build support for scripting via Python 3.</flag>
     <flag name="speex">Enable noise suppression filter support via
       <pkg>media-libs/speexdsp</pkg>.</flag>
+    <flag name="ssl">Build support for TLS/SSL connections (RTMPS) via
+      <pkg>net-libs/mbedtls</pkg>.</flag>
+    <flag name="vlc">Build support for using <pkg>media-video/vlc</pkg> as a media source.</flag>
   </use>
   <upstream>
     <remote-id type="github">obsproject/obs-studio</remote-id>
diff --git a/media-video/obs-studio/obs-studio-24.0.3.ebuild b/media-video/obs-studio/obs-studio-24.0.3.ebuild
new file mode 100644
index 000000000000..58691bbb1db1
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-24.0.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	luajit? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	luajit? ( dev-lang/luajit:2 )
+	nvenc? (
+		|| (
+			<media-video/ffmpeg-4[nvenc]
+			>=media-video/ffmpeg-4[video_cards_nvidia]
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speex? ( media-libs/speexdsp )
+	ssl? ( net-libs/mbedtls )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DDISABLE_VLC=$(usex !vlc)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DOBS_VERSION_OVERRIDE=${PV}
+		-DUNIX_STRUCTURE=1
+		-DWITH_RTMPS=$(usex ssl)
+	)
+
+	if use luajit || use python; then
+		mycmakeargs+=(
+			-DDISABLE_LUA=$(usex !luajit)
+			-DDISABLE_PYTHON=$(usex !python)
+			-DENABLE_SCRIPTING=yes
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index d86c6eab4475..1629603a1fa5 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
@@ -21,7 +22,7 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
@@ -38,7 +39,6 @@ DEPEND="
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
-	dev-qt/qttest:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-video/ffmpeg:=[x264]
@@ -60,16 +60,16 @@ DEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
 	speex? ( media-libs/speexdsp )
+	ssl? ( net-libs/mbedtls )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
 	)
 	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc:= )
 "
 RDEPEND="${DEPEND}"
 
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -84,9 +84,11 @@ src_configure() {
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
 		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
+		-DDISABLE_VLC=$(usex !vlc)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-DUNIX_STRUCTURE=1
+		-DWITH_RTMPS=$(usex ssl)
 	)
 
 	if use luajit || use python; then
diff --git a/media-video/pgmfindclip/Manifest b/media-video/pgmfindclip/Manifest
index b1a781be7196..09c33498a008 100644
--- a/media-video/pgmfindclip/Manifest
+++ b/media-video/pgmfindclip/Manifest
@@ -1,3 +1,3 @@
 DIST pgmfindclip-1.13.tgz 4971 BLAKE2B 94239a2230fd22ed041e0a9dbc3b718352932be33a96a8b9d7745088a82fbbac57df43cd2c891f2c4e4c1ec95a30bf8a73e6175bcc9e395376b7657a3d1a55ec SHA512 1b1acb76bc97dfc227ad9f797670b1dd286c16a3d76aeeb74f7326ac89b3ed3f16432d765ea238b477c90527b955d3d03bb835f8c668c6ce48be49ce0d5f0e0d
-EBUILD pgmfindclip-1.13.ebuild 598 BLAKE2B e2a37d8953294e9e9099d38a01a22e67e169f1708da8b958c88f214f492e6900f01195724f5091a0ddb379efcc6ed1daeca9b46a740aa907114dfdb251e6c8f5 SHA512 871a4d0aba84daa31a8b6866404d6522af6d4cdf3b81ff4ad4c5d661867bf910a69dc64d36767ebaf95a092d43abb0332a5de54d6754b2290a560f8fef16f5ff
+EBUILD pgmfindclip-1.13.ebuild 574 BLAKE2B 96bddcdd4d65fd9929ae53e4f43ee5e969881e5e178b7a782b0664744fe0f6f8a5f305571c3edd981b170347ff8c098dd111fc7be886acfed9b21b4a3884323b SHA512 aa7adf78595a9a5adc776c5c51182c91db0a149c64f0429e6d65705270ee4e8bc2db364d69710bddfed5a7be7d2f44e2e1f47ecb7a5396e568c2538172cd12fb
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-video/pgmfindclip/pgmfindclip-1.13.ebuild b/media-video/pgmfindclip/pgmfindclip-1.13.ebuild
index bb9f6025871d..1024f842f370 100644
--- a/media-video/pgmfindclip/pgmfindclip-1.13.ebuild
+++ b/media-video/pgmfindclip/pgmfindclip-1.13.ebuild
@@ -1,14 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit toolchain-funcs
 
-IUSE=""
-
-S="${WORKDIR}"
-
 DESCRIPTION="automatically find a clipping border for a sequence of pgm images"
 HOMEPAGE="http://www.lallafa.de/bp/pgmfindclip.html"
 SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
@@ -16,17 +12,19 @@ SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
 
-src_unpack() {
-	unpack ${A}
+S="${WORKDIR}"
 
-	sed -i -e 's:gcc .* -o:$(CC) $(CFLAGS) $(LDFLAGS) -o:' "${S}"/Makefile
+src_prepare() {
+	default
+	sed -i -e 's:gcc .* -o:$(CC) $(CFLAGS) $(LDFLAGS) -o:' Makefile || die
 }
 
-src_compile () {
-	emake CC="$(tc-getCC)" || die
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
-src_install () {
-	dobin ${PN} || die
+src_install() {
+	dobin ${PN}
 }
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index ec97b50d5896..95e873d8b592 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -5,8 +5,10 @@ AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca
 AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54
 AUX smplayer-19.5.0-mpv-0.30.0.patch 969 BLAKE2B 3e2942b9e732418c14bb306492506dab0185fbb77f09856c40ca6035506ad8f2677611796478755ded1b1028d21304d7d6f78a4cc06fe832be6d8cb1acd0a3ce SHA512 d903010b237a7bdf0356ffb5068e802a7c96575f518c6a0f5862da8ae90ef117cee9dab36a7a05e909f1bbd39175fd4c829000fca1698d3c98c530a77200f1a8
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
+DIST smplayer-19.10.0.tar.bz2 5177399 BLAKE2B 5b22c964dc97391599c61996e0d4f1d1376334eed08420db0bc166f121b807a9c60de3c100be5a6cf5d50cad5af16d2487eceeb46cc22fea7b83c9e028ca33ef SHA512 d41394ad61d23af96f94510f9162d9a3b2c88b66cc2bcc17b2210072ad53c322369eda149edccc4ec459b8d65b7ea80a5e1ce3cdbd1ec266b2cf6b4f189dc9c3
 DIST smplayer-19.5.0.tar.bz2 5175017 BLAKE2B e7160ca7d404dd6a8d7c316df3c39b2e238410435960d714aec271d2034030f9e1b59997d11d758188e327117f0eb773cb8baccc1defc20cd071e40c87deb07c SHA512 ee19186b3f4eac94b06a1e389e42edb8c2b22f8182b679bdc40e3ae1569a6c69f168260abfee3b2827b71b10eb353e7a3821805798f37aae2600af3b73d25ca1
 EBUILD smplayer-18.6.0.ebuild 3198 BLAKE2B 9308361b80dda582ba1894bed9e47e2fd66a48be962d21fb267fa5909f1b73cc523aac8cc87f4d2ecc43be9044a18c5585be0e54da2935cd57e0336be068754b SHA512 c9f8da664cc37fdb2e7ac780f15ed87d4b6089a6c4015ad747f36e3a9ae0b96e4fd66c2ace62a15cb9b42887cd81b6f7e83dafd59b215f71117ea90e77f714a2
+EBUILD smplayer-19.10.0.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13
 EBUILD smplayer-19.5.0-r1.ebuild 3199 BLAKE2B d61dd1ebe3b0792c8436db40e857fb9724a9b3a990d8b9adfc1df8fdc89358211748a1275ee84339b042ff3a5874efbe6889a7a6b171fbbd1b6d3b0678a23cd8 SHA512 e63e5622eefb97d301a6847fa7b6396b7ee7018f9be93862be98179513a88b292c13ca72206e53ee3626076dd766701a60bef4f7f72cb33f6138d78118408afb
 EBUILD smplayer-19.5.0.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-19.10.0.ebuild b/media-video/smplayer/smplayer-19.10.0.ebuild
new file mode 100644
index 000000000000..1863a883169d
--- /dev/null
+++ b/media-video/smplayer/smplayer-19.10.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2007-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit l10n qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="https://www.smplayer.eu/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	autoshutdown? ( dev-qt/qtdbus:5 )
+	mpris? ( dev-qt/qtdbus:5 )
+"
+RDEPEND="${DEPEND}
+	|| (
+		media-video/mpv[libass,X]
+		media-video/mplayer[bidi?,libass,png,X]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
+	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
+)
+
+src_prepare() {
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+	default
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		Makefile || die
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
+		-i src/smplayer.pro || die
+
+	# Turn off intrusive share widget
+	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+		-i src/smplayer.pro || die
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Commented out because it gives false positives
+	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+	cd src || die
+	eqmake5
+}
+
+gen_translation() {
+	local mydir="$(qt5_get_bindir)"
+
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of the GPL
+	rm -f Copying* docs/*/gpl.html || die
+	# don't install empty dirs
+	rmdir --ignore-fail-on-non-empty docs/* || die
+
+	default
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "If you want URL support with media-video/mpv, please install"
+	elog "net-misc/youtube-dl."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-video/sub2srt/Manifest b/media-video/sub2srt/Manifest
index 8e6bff032840..2db79c0f5506 100644
--- a/media-video/sub2srt/Manifest
+++ b/media-video/sub2srt/Manifest
@@ -1,3 +1,3 @@
 DIST sub2srt-0.5.3.tar.gz 10737 BLAKE2B b0339cb798d1a2850d52e97f41c5a73fca97e29b7fbe8fa213d7f23d138558b30f4abc12cb3a17a7ff9f866846442c89d27ec7693eba6c2641548e1f1f493356 SHA512 21e75f7664d2892c49fa76021283f0705f7c8d888a6d8fffa0335184ca139e18378facb521d0ff1e15d6de0061eafe34c01103fdbe3ddd863f6d3653565a525f
-EBUILD sub2srt-0.5.3.ebuild 427 BLAKE2B 9dd0cedbf30208fec88bdc34ed3ca0348aea26e613e3c72ef8242f3dc823636793c20a0b82e91c87aed9a4923a9b398c96c24a4c1c86073eeddd9f7f7f2f82f8 SHA512 b0ea006bed355f6f9b9f2a0f45859fd177cd94ab1e7918bed3d42e3ad064a8479ad29bd103f7fef4dc58b64730d6d28833a2b6eea37318058c198824edb92e3a
+EBUILD sub2srt-0.5.3.ebuild 425 BLAKE2B 53dfe16e69ab4bd2799feec767f0c77a055e11c97d1729efce1842210c144e047d6b5f4e6b1889acc05b41f5a7567eefdcf55a51634c16254f77fbb019022a34 SHA512 84d1f534969ecc08f70d264346f9ca35ae828ca21923542039500d398d44737ec972bc2aad243e552dfac822ed19e622eaf1e8574010cf1c41749cffa7afdb20
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-video/sub2srt/sub2srt-0.5.3.ebuild b/media-video/sub2srt/sub2srt-0.5.3.ebuild
index c46153c149e3..86f93129d4a3 100644
--- a/media-video/sub2srt/sub2srt-0.5.3.ebuild
+++ b/media-video/sub2srt/sub2srt-0.5.3.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Tool to convert several subtitle formats into subviewer srt"
 HOMEPAGE="http://www.robelix.com/sub2srt/"
 SRC_URI="http://www.robelix.com/sub2srt/download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-
 IUSE=""
+
 RDEPEND="dev-lang/perl"
 
 src_install() {
diff --git a/media-video/submux-dvd/Manifest b/media-video/submux-dvd/Manifest
index f2aacdb9e37f..a03e36f08a40 100644
--- a/media-video/submux-dvd/Manifest
+++ b/media-video/submux-dvd/Manifest
@@ -1,3 +1,3 @@
 DIST submux-dvd-0.5.2.tgz 42223 BLAKE2B dfba1bd1680150e17fd73ead76f28a6335bfb2427627f87840f97c5303380419c46a1adde082141402f5d7778e28a817ca43224367ca28ccd84bcec479c1e10b SHA512 960a6634650c68a8194138155fac2b8e3840e1f77d7160461341c6b5342ee13d7575f09437543fbf25f303ef6a1a071004ae913ec54fb13f36e09636176d7906
-EBUILD submux-dvd-0.5.2.ebuild 628 BLAKE2B d5cebcfe53b388d4d0ba20bb5e8753efbe8d9d1afb96e7046828921d1a5caeebdd3ad7abdf8e211bc0e8dd747185915beb2a2107d1f6cedf71de56f3c5123906 SHA512 6c89ec1895b1a6b0413e276219af0a03d4375e204be99b3d44731c67d58500ff3d2abb5adde94c1e765906d603ff370a2aaae311a18681828fcdbf67e184232e
+EBUILD submux-dvd-0.5.2-r1.ebuild 552 BLAKE2B 5447ebf035d324bff12ff5394e68342ae3ba8583cabf30e522133ac55d5a17189f3b92bc0a6ad8efba1a06c96f3e38d885eb73af051b986b826536dfea1a2737 SHA512 a7df3e425b67d51b75aecae27e2470d83a29f697335be782be5a256098601d014e960d2b62986a32651f3374d49e11cc8acf1e2a5ab740370668ca5c08c7c75f
 MISC metadata.xml 334 BLAKE2B da68c733a593f81e7a8096a93827aa43bccee5f9470fccdf66ffdc76a5bb29a9bbeaa163180559714d4c7dca2c7cdd69cd50054d36a79b725100fdaaf093df43 SHA512 ea6800418e6612cab28cc5d0fb977d8227deaef467662b6c8619b974062c47b0658ff1e621b8fb85309c0f87f04afe3903053af1c21c629018a27eeec7f6c8de
diff --git a/media-video/submux-dvd/submux-dvd-0.5.2.ebuild b/media-video/submux-dvd/submux-dvd-0.5.2-r1.ebuild
index 777bfdb20647..b885b0ecf473 100644
--- a/media-video/submux-dvd/submux-dvd-0.5.2.ebuild
+++ b/media-video/submux-dvd/submux-dvd-0.5.2-r1.ebuild
@@ -1,29 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A subtitle multiplexer, muxes subtitles into .vob"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
 SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	# just 2 files not worth a makefile patch
-	dobin submux-dvd vob2sub || die
-	dodoc CHANGES FORMAT INSTALL README ${P}.lsm || die
-	dohtml spu.html || die
+	dobin submux-dvd vob2sub
+	dodoc CHANGES FORMAT INSTALL README ${P}.lsm spu.html
 }
diff --git a/media-video/subtitleripper/Manifest b/media-video/subtitleripper/Manifest
index 4b5140bda8b3..53ab8a8f6965 100644
--- a/media-video/subtitleripper/Manifest
+++ b/media-video/subtitleripper/Manifest
@@ -3,5 +3,5 @@ AUX subtitleripper-0.3.4-libpng.patch 574 BLAKE2B b988fd6863b4a9bf93fce52c7aca5b
 AUX subtitleripper-0.3.4-linkingorder.patch 732 BLAKE2B e258459ee1a9d78fac1919368368a7a7ed20980a3abb733f249be644da23fe6c86e8afa160177387a4de4d535f4252dcb64dbc98052c62978097d434700a7a66 SHA512 27d84a80217917986f945735bf66e725120e29aa88885207e8a619e372fd8bfd65c4240d98df93b51f69e83969cc0e9996debe7de87aca16853c85c752c8ca3a
 AUX subtitleripper-0.3.4-respect-ldflags.patch 762 BLAKE2B 2d46f526eebbaff2047911496209a79cbf47cfab88a33f3d465cd223d08d1016a64c5280c6f0d2a9f3e87fda3f6bb97de0f46097f0e518e1ae037e8242419563 SHA512 a3de917412395689bd3870ba0e1406b24d04a5080b57c05fb0f2ef0716e84e4f8d4693d6448a4a5415133729469cb32a06e858e6ba69984252e34d031974c328
 DIST subtitleripper-0.3-4.tgz 47299 BLAKE2B e1a25adf55727463cc7aa57e2d005597c92212b1cb1f7edd7a20c5701444967d96af268f3b6feaf6ac29aa2f9dcfe2e0248593f5197228d1d0bbff9fad67c315 SHA512 6d25a43b5b1bf8a6c69200c8bab995265356d1235a872bb641d30dbf27b765be9280325b4dd8aa625c25a865563bd7525dd277682d5baeff3c54951da7b9a86a
-EBUILD subtitleripper-0.3.4-r4.ebuild 1382 BLAKE2B 56e38e0ddf826d43400c6c9bd83cafda4e2902b49fce6d028474f7d5e671a8d2580bf0ae6dfe197d607aaef802140f2b68a8b1b28617824c28e132aeb7befe74 SHA512 92ebaa329af1820aab43cf8510102404615efc3fda863d4d30787b35d12c73179e49dd00566dc39b0b5a0fa894ca30e894156a5cb736ea182edc423cdf42c9ad
+EBUILD subtitleripper-0.3.4-r4.ebuild 1332 BLAKE2B 0f7fc3f706748bfc5f911e127637b885f19263a1c61fe04bfdf0615ae37bd67ec2c6d05305a13035aeba4ea2160469e93ed2427f80916d94125d06023c791de7 SHA512 60a037c9db2f25f5b1d176b8c094f397148c5257f90eacc87f7d86331c5faf5bb3ef54cd628c71373b0ef6b08e0d0baecfdd5d99af7eac03f5d224bfad1745f3
 MISC metadata.xml 343 BLAKE2B 414833b9d5d807e45f04b05c4a0d9e86061fc8bba6ecea6492a02a4e9d7484242510dc834b6abd9dd3ea8576d65d31e5868a576f493a3b03b7e20a99c608fc36 SHA512 7de9a159e7ed1c33d3c48b39b380f41464aa3db757a6ea222eae8162fa78898fc6ed4403f4cd86643676885a294bc0cad438884fcc10fc63a69f2856cffa5e14
diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
index 226c2b9531a7..e547faecaf76 100644
--- a/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
+++ b/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit versionator eutils toolchain-funcs
+inherit toolchain-funcs
 
-MY_PV="$(replace_version_separator 2 "-")"
+MY_PV="$(ver_rs 2 "-")"
 
 DESCRIPTION="DVD Subtitle Ripper for Linux"
 HOMEPAGE="http://subtitleripper.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
+
 RDEPEND=">=media-libs/netpbm-10.41.0
 	media-libs/libpng
 	sys-libs/zlib
@@ -22,23 +24,28 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${P}-linkingorder.patch
+	"${FILESDIR}"/${P}-libpng.patch
+	"${FILESDIR}"/${P}-glibc210.patch
+	"${FILESDIR}"/${P}-respect-ldflags.patch
+)
+
+src_prepare() {
 	# PPM library is libnetppm
-	sed -i -e "s:ppm:netpbm:g" Makefile
+	sed -i -e "s:ppm:netpbm:g" Makefile || die
 	# fix for bug 210435
-	sed -i -e "s:#include <ppm.h>:#include <netpbm/ppm.h>:g" spudec.c subtitle2pgm.c
+	sed -i -e "s:#include <ppm.h>:#include <netpbm/ppm.h>:g" \
+		spudec.c subtitle2pgm.c || die
 	# we will install the gocrfilters into /usr/share/subtitleripper
-	sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' pgm2txt
+	sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' \
+		pgm2txt || die
+
+	default
 
-	epatch "${FILESDIR}/${P}-linkingorder.patch"
-	epatch "${FILESDIR}"/${P}-libpng.patch
-	epatch "${FILESDIR}"/${P}-glibc210.patch
-	# respect CC and LDFLAGS
+	# respect CC
 	sed -i -e "s:CC =.*:CC = $(tc-getCC):" \
 		-e "/^CFLAGS/s: = :& ${CFLAGS} :" "${S}"/Makefile
-	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
 }
 
 src_install () {
diff --git a/media-video/tivodecode/Manifest b/media-video/tivodecode/Manifest
index 28c8401dd103..e550f906447f 100644
--- a/media-video/tivodecode/Manifest
+++ b/media-video/tivodecode/Manifest
@@ -1,3 +1,3 @@
 DIST tivodecode-0.2pre4.tar.gz 124685 BLAKE2B 991b0118f56690da383b3eb70c919c2c5b71b28b4fc84c61ec2a405f026852a47a4397771d3277307f60b7a010e6aa3f12a5dc5b3d0b27b110d6d970b7d44a74 SHA512 98ccca7b0dcf6dfac127b66ffa86f3c7010f46b324562b9785b9ed1932c518f46353823b95cef9623279c7a07fc2876dc4a09c602bd31568ad0ded0aaf7281a1
-EBUILD tivodecode-0.2_pre4.ebuild 541 BLAKE2B 3c3a5e000587300d5444f6a67b5847f438467fb0a1d5e3f668ab6c129798ee7ddeb0c846dce037a63ad7169936c4fd3470c5fa96767827c380e406cbd6ba0bed SHA512 be509f3d44c0650e8da085e08ba8225a494985c64619e1b398d765cc45f6a73141730a965562aa4fa51c23291df9a7bdcfb88995a9381ddd88091763cde0b359
+EBUILD tivodecode-0.2_pre4.ebuild 335 BLAKE2B 47bb8ba0766328009d526feddde0a80661337ea1ee92167a49ff4b2d8fbc69147b44b3dd8d852ccc2e4b7c5e75a833eb564ce5cb51838dd8721912f8c80687df SHA512 0c32b391a85d86348b476ba9127b2a24d8f81bbd83e19decce08689d7cc61e6e1668502262e7367edb40805bd3ce54986e3bf496a93bf616598badf006b964da
 MISC metadata.xml 543 BLAKE2B 9b1280b997b7799ba3afa033154bf207cd4f50ae0a21c67ac40b04687652f35bf644eb7a379b8e8803f702f23f523bfd65bd783d63db61b48544c05cfbd677eb SHA512 273e54c3d5f42f7afa0eb93d63930ea9f76dbf2573814a0a11b5cd974e32dc406f8f99d555f20012bc2e0337b86e31aef0d4493934201df0b0d14498b4bd4abe
diff --git a/media-video/tivodecode/tivodecode-0.2_pre4.ebuild b/media-video/tivodecode/tivodecode-0.2_pre4.ebuild
index cac9e1264c46..511c7c80d240 100644
--- a/media-video/tivodecode/tivodecode-0.2_pre4.ebuild
+++ b/media-video/tivodecode/tivodecode-0.2_pre4.ebuild
@@ -1,26 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils versionator
-
-MY_PV="$(delete_version_separator '_')"
+EAPI=7
 
+MY_P=${P/_/}
 DESCRIPTION="TiVo File Decoder"
 HOMEPAGE="http://tivodecode.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-LICENSE="BSD"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README ChangeLog
-}
+S="${WORKDIR}/${MY_P}"
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index fa84fcc06437..9d980324866a 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -1,5 +1,4 @@
 AUX commons-daemon-move.patch 337 BLAKE2B 79e847ce6e1c32c3cfbe192d8dce33175e2c0ef87b658d5ec8a3e8071bb737e8ea5d67814078d3c7693660879fca1a6c9038a124f19713382b0ded337bbf09ee SHA512 da836d7010769a0a81a959db4bb279418efeac75e2e444471d800889a6f2ff06227a76f04de9857da619af549b76f145263ca4c106d5485edcae679f9cf92ec5
-AUX mongod-wrapper 101 BLAKE2B cc52f011b065322fb7ebec982c5d0b188f4c72859770dec98bf002d6bcc9c43d520e0845ceaf1458efc4ed07bbccfb5c723ece61298bf6f2bfdebd363bebe4e7 SHA512 5895a2113cc165275587e9683a2e3a7de20ac5db75fc26b00bf55a619bc8ff18ead3f5465cefe0a02bea996d2d178a4954cc7fba84df76e27ea699d2be9ecc96
 AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2becd9569c8086b568e5c84508f2cc71c81605cc124bc17cd42c884d477b15181dba73544fc254610c1 SHA512 1cd4345daf09a27dcb8528abd076e920e30b6ff7a505acad74fdc291164c94569946cd493563331c5e52cb95c45e18522520aee47555db438fa87c46d07e35c5
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
 DIST unifi-video.Ubuntu16.04_amd64.v3.10.5.deb 161280194 BLAKE2B ae326fe818261124fb8bd1939e55cc2dfa1bb8bfd3350bb5b94ec74fe9a7ec57853548dfbf8ddf33699e0281a5cb918926a6fb93b6de07339072bca51bab2a46 SHA512 4e431f72e5c51952bb7a1e97d6cab407e03d7a42cfaaed97cbf65dbc0b7ebec2a04675783bebed6d0a3d69b1ef5988f6af4770a9ce680258999c481ccefd0bd2
diff --git a/media-video/unifi-video/files/mongod-wrapper b/media-video/unifi-video/files/mongod-wrapper
deleted file mode 100644
index f2eb2a437520..000000000000
--- a/media-video/unifi-video/files/mongod-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cleaned_args=$(echo $* | sed -e 's/--nohttpinterface//')
-/usr/bin/mongod ${cleaned_args}
diff --git a/media-video/vdrsync/Manifest b/media-video/vdrsync/Manifest
index 04daee64173e..264ccd929d7a 100644
--- a/media-video/vdrsync/Manifest
+++ b/media-video/vdrsync/Manifest
@@ -1,4 +1,4 @@
-AUX vdrsync-0.1.3_pre050322-path.diff 1378 BLAKE2B 23e44bf7f598c2a60629c4d1f74fe20a97b45457a698302a8b6ef8c589bd115585328bf7596b7717186486926152b5e5e08bad70ecf7697a31eb946dcb77c534 SHA512 e147082f6606ccc9a85dd8336976f2c10427ddb1418f7233969a8d6a3a40061847aaa24156c10d71b6dde772f1a6cf03d660edc299217b83d467c4ce285a72cf
+AUX vdrsync-0.1.3_pre050322-path.diff 1377 BLAKE2B 8587333a17dc6a31a67e05f4904c11562ec311cc1c63a88769d7467e0260316e376ca414e951119a63471b6c7a7a22b5840d925ee799ec05a354051ebc178e2b SHA512 0d7d1dad8b2cae5ed04259bf55dd921a583c47d5788eb17596706fa83487eab2026bfcf3c4fe42234ef4ee231746d0f42ec916cacc99262f5850de1f428d4d57
 DIST vdrsync-050322.tgz 295498 BLAKE2B 8f40605c8f035829aa7881de8a4435de9fa8b40af737d38b5452a2338b216acb454634eb14d79767c23de13520a2499420d8aa9908cc1b6a4f557222ea5ec3a0 SHA512 112dc3cb84511fcd8c61144378931dfb6af5a1650b728dd3dbd9004dc783c24fc26125d31fe02ba5b3c26174c82ac7fb2f74fd444b8c390640fcbc45e30c7a21
-EBUILD vdrsync-0.1.3_pre050322-r1.ebuild 1235 BLAKE2B f6b2dd96ff4b64506b92388de65f01736df75184ba7ecb94e96ea4cfd2e0cb624551248a49e970f3432ba5c3c85f3a13cdaee0051091971ec5257756896fcf7d SHA512 d63f0a97bedb6de401cc14dbf0bb29cd0c81a37fbc1bb4a54cdeda78e49a901449eae1aa8a0e4b8507d3884c7bb6e0340f576d0cb85a1012d7756e18067737e7
+EBUILD vdrsync-0.1.3_pre050322-r1.ebuild 912 BLAKE2B 78bd741ea687d22c59c4a4bb144fce90ee42bffd9c4e03a8613dbabeefbc82881d3261ebda8b281703e7763646ef6cdb99740db4d1bd2529d4f6306a14eed3d4 SHA512 2828c40a1509291a8fe80596661817d4714800d19215db7e6fde9d3da7c7214c2333617fc404a9a227bd830e05f0440d8b6e60d85304f93481abba7b8f5ff9b4
 MISC metadata.xml 357 BLAKE2B 2969a06704f541160af828c0e4bb2607cc86a22090e867607fd2951b08a22f45070e6c4fcf84ce22d6ec074b288ea4d8e04d42bd77dac69e3ec16600a311d1d0 SHA512 c301a1bb051eefde7856ef1462d13343fba21acfabde35a2fd9feba5c00f3aaf697b9e358132cc56114f59af0b785ffb07998d8a6d084369275cbf1b616a7fa4
diff --git a/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff b/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff
index 768665be62a8..3babee396dfa 100644
--- a/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff
+++ b/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff
@@ -2,8 +2,8 @@ fix not founded path to some progs
 
 Joerg Bornkessel <hd_brummy@gentoo.org> ( 29 May 2005 )
 
---- vdrsync.pl.orig	2006-05-29 19:10:25.146198500 +0200
-+++ vdrsync.pl	2006-05-29 19:09:06.937310750 +0200
+--- a/vdrsync.pl	2006-05-29 19:10:25.146198500 +0200
++++ b/vdrsync.pl	2006-05-29 19:09:06.937310750 +0200
 @@ -37,19 +37,19 @@
  # Hash that lists potential helper Programs
  #########################################################################
diff --git a/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
index fb37db3df2e3..c6248cefd7b6 100644
--- a/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
+++ b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 MY_P="${PN}-${PV#*_pre}"
 
-S=${WORKDIR}/vdrsync-${MY_SNAPSHOT}
-
 DESCRIPTION="converting vdr-recordings to mpeg2, dvd or other similar formats"
 HOMEPAGE="http://vdrsync.vdr-portal.de/"
 SRC_URI="http://vdrsync.vdr-portal.de/releases/${MY_P}.tgz"
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -20,30 +17,22 @@ IUSE="dvdr"
 
 DEPEND=""
 RDEPEND=">=dev-lang/perl-5.8.0
-		media-fonts/corefonts
-		dvdr? (
-			>=media-libs/gd-2.0.15
-			>=dev-perl/GD-2.0.7
-			>=dev-perl/GDTextUtil-0.86
-			>=media-video/dvdauthor-0.6.8
-		)"
+	media-fonts/corefonts
+	dvdr? (
+		>=media-libs/gd-2.0.15
+		>=dev-perl/GD-2.0.7
+		>=dev-perl/GDTextUtil-0.86
+		>=media-video/dvdauthor-0.6.8
+	)"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
+	default
 	sed -e "s:/usr/X11R6/lib/X11/fonts/truetype/arial.ttf:/usr/share/fonts/corefonts/arial.ttf:g" \
-		-i dvd-menu.pl
-
-	epatch "${FILESDIR}/${P}-path.diff"
+		-i dvd-menu.pl || die
+	eapply "${FILESDIR}/${P}-path.diff"
 }
-# vdrsync/dvd-menu use hardcoded tmp-directory for large (up to and
-# greater than 1G). Uncomment and change the next two lines to your
-# needs if you need another tmp-Dir
-#sed -e 's:"/tmp/":"/temp/":g' /usr/bin/dvd-menu.pl
-#sed -e 's:"/tmp/":"/temp/":g' /usr/bin/vdrsync.pl
 
 src_install() {
 	dobin check-vdrsync.pl vdrsync.pl vdrsync_buffer.pl
diff --git a/media-video/vstrip/Manifest b/media-video/vstrip/Manifest
index ca13aaaac9a4..3a1dae32b4bf 100644
--- a/media-video/vstrip/Manifest
+++ b/media-video/vstrip/Manifest
@@ -1,4 +1,4 @@
-AUX vstrip-0.8f-gentoo.patch 2035 BLAKE2B d9924bab3bc6dea8a9fdb335eb1676cec6f5cd3d997ad9dca44fa30d5222c7fbbd8ab3e8e96caf3470561bfb5a0b2c495882e918a084242ba63f67702a91536c SHA512 c304726b9575975125888abb82e0099715e4f54ba6193844072e02986ea363b852114b704caba963cae4680f762c88bed77f4584a7865b825e4a23f1ee3a31f7
+AUX vstrip-0.8f-gentoo.patch 2047 BLAKE2B 253332bd66e176f39a685ced6f49a6478044c8f8d0ceae89aa8ea57d74f8963d19d8a86a31eec28ea8acdae2db0c0997384d907e5772b374b2261b183c68a6d1 SHA512 5c8ac7a49a50b701108b06bc5f3305d2a4553d74fe30c7f628cdc5c9f4391dbf1e75764a2900727ddd6e706bff9386dbbde63269facf563a1b59b96c593de6ed
 DIST vStrip_08f.zip 409157 BLAKE2B cdb31341d014adb10b8d83b09d11896351d298b49eefce2b506eaca26883ca14ad8f007e42363fa961e9839b548ce0c7fd1edf9d4aea17c1a5d135bf0feb9089 SHA512 5b8fa07e923709aa0defcbe3ad6fced02eddd5cacc7c33a5ec777e1d64d1e33f3163c82c7fd74eb80f02833c75593e7fe544fa93a56271926a51dbc663f39276
-EBUILD vstrip-0.8f.ebuild 743 BLAKE2B a88cebacf5c35264bdb67bb130ce6f5a027afb66be081c5329b8d8ccb4b461911e803af5b7a8882599c385d24f391217458626ff4607dceebb266b488eec45af SHA512 6bc8edc21fdffe4cbcaa4373b6755efa5e73d3fa60daca448fd1cc05a0cf64816ad540f804a41e5eb299d2df12cd3b3f9be3e9928df056f8910c9653271115af
+EBUILD vstrip-0.8f.ebuild 707 BLAKE2B 0887d8b33fe182756582b4cb2c502903f66eae219b4ce64142f08e99c4d9f55c66cf598a87d85b9c3ddac77e6556000a5a219282c6753fc78e85e8f4d746efaf SHA512 bb73ba73219c40bf016389972ccf20eb5b5002580c8eaa5a8a454fab8e8a21cd23d412e5b8dabed5cad9b0b91fed0de837dc9ad174935b3e659c77a1c463a29b
 MISC metadata.xml 331 BLAKE2B 2f1f2817c5fa0b56ac253d45b5bd1d1fa3093488a9f8d89ff3cf24fe0b5693891cfd58a8e7535147f81645a6f8b2b6661b7aba33532a2b7d519e8dc9c949e8e7 SHA512 b01bf58ac5f7ecdc703ffc83ca687e07153770a7880084c245e6d8b868329dcca116680d3d7e41f1637343f9d825417f615f18a117952222f82f7d655f5d9d0b
diff --git a/media-video/vstrip/files/vstrip-0.8f-gentoo.patch b/media-video/vstrip/files/vstrip-0.8f-gentoo.patch
index 77328b091247..d4be5a2ea783 100644
--- a/media-video/vstrip/files/vstrip-0.8f-gentoo.patch
+++ b/media-video/vstrip/files/vstrip-0.8f-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile	2003-10-12 02:25:31.000000000 +0000
+--- a/Makefile
++++ b/Makefile	2003-10-12 02:25:31.000000000 +0000
 @@ -4,7 +4,7 @@
  
  ### Sources
@@ -20,8 +20,8 @@
  file_io.o : s_types.h file_io.h file_io.c
  in_buffer.o : s_types.h file_io.h in_buffer.h in_buffer.c
  main.o : s_types.h file_io.h vstrip.h main.c
---- dvd2avi_plugin.c
-+++ dvd2avi_plugin.c	2003-10-12 02:29:23.000000000 +0000
+--- a/dvd2avi_plugin.c
++++ b/dvd2avi_plugin.c	2003-10-12 02:29:23.000000000 +0000
 @@ -6,13 +6,17 @@
    
  *************************************************************************/
@@ -50,8 +50,8 @@
  		
  		lba = (dword)(fposition / fio_SECTOR_SIZE);
  		_close(fp);
---- file_io.c
-+++ file_io.c	2003-10-12 02:24:46.000000000 +0000
+--- a/file_io.c
++++ b/file_io.c	2003-10-12 02:24:46.000000000 +0000
 @@ -32,7 +32,7 @@
  		fp = _open(name, _O_BINARY | _O_RDONLY); // check size
  		if (fp != -1)
diff --git a/media-video/vstrip/vstrip-0.8f.ebuild b/media-video/vstrip/vstrip-0.8f.ebuild
index ebf44df3a614..7aa923068945 100644
--- a/media-video/vstrip/vstrip-0.8f.ebuild
+++ b/media-video/vstrip/vstrip-0.8f.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit eutils toolchain-funcs
 
@@ -15,24 +15,23 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
-RDEPEND=""
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 	edos2unix *.c *.h
 
-	for file in *.c *.h ; do
-		echo >>$file
+	local f
+	for f in *.c *.h ; do
+		echo >> "${f}" || die
 	done
+
+	default
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -D__UNIX__" CC="$(tc-getCC)" || die "emake failed."
+	emake CFLAGS="${CFLAGS} -D__UNIX__" CC="$(tc-getCC)"
 }
 
 src_install() {
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
commit	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree	5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /media-video
parent	bd4aeefe33e63f613512604e47bfca7b2187697d (diff)