gentoo resync : 04.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
commit: e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree: 9cb29a544215119b5c5538e37211b994ce1c87ae /media-video
parent: 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
36 files changed, 755 insertions, 444 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 949c15800790..ac86db594733 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 62fb6ce977f3..c88e043c680a 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,3 +1,5 @@
 DIST cheese-3.24.0.tar.xz 1846412 BLAKE2B bc18ee7009f4297df232c0ffdc40f5783891f721efe137e4127c7ea61595dcb033e98b415ea31e5918d93c408355e6534ddd95687a570b5abcc1c5ce0603d262 SHA512 c81d2f3038970f735960a2cbcec3a074ac2e9835d3f1fa6aae83d65299692d0464fed274e71caa59831a105430ce5db56557ea0cda27c72cdb050a59331b3107
+DIST cheese-3.28.0.tar.xz 1544904 BLAKE2B cdad63b4175bb52c3a77ee5ed0058afdd8b5d509ef17b5931d2f01457b9ff327d3ad270ad963e3185c928ddc7203b00163137a789683669d3f8c39d5a9926da8 SHA512 c52b083b132a8c885df55def3d6bf96180fc93c8b7368f48412c8dd63e073a268ff0e86959a977bd8bf372a53e127419b96046d92cb3a96674f86cfb3477ceea
 EBUILD cheese-3.24.0.ebuild 1968 BLAKE2B 8f16d0c1619fb95d25726f100a6c74b79f626e28ca0aa75f9f4c0d8ea8da6500ecf9f4f0ffa22e0377f60eca782fc2aea42f0e01a159f730a337a4fbf1a3af75 SHA512 c3416e1b21277460764e7947019387b76f094fc835f2f9c180f13ca6d85adef794a5550a5b23fc7086d9d8c65991bcfc2330d175770a0730f92809cf39a2403b
+EBUILD cheese-3.28.0.ebuild 1919 BLAKE2B ca6da0952d46277cbc27c996876c1141ed61c16f0b9768ba7c076d977f772293b58aa8085a00a39c69b6bb72bc32422952a2fef1c36397465226ecff866c1140 SHA512 acd4e073d0fb1ab45a7345b364c81aa973e27218743fab0924cabd4fbbb88ac1cb35932ded1c18253aed3bcf8be1eded4b7e93aadfb419dd25d98663f201e703
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.28.0.ebuild b/media-video/cheese/cheese-3.28.0.ebuild
new file mode 100644
index 000000000000..8b870aafa450
--- /dev/null
+++ b/media-video/cheese/cheese-3.28.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 virtualx
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # subslot = libcheese soname version
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.90:2
+	>=x11-libs/gtk+-3.13.4:3[introspection?]
+	>=gnome-base/gnome-desktop-2.91.6:3=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=media-libs/clutter-1.13.2:1.0[introspection?]
+	>=media-libs/clutter-gtk-0.91.8:1.0
+	media-libs/clutter-gst:3.0
+	media-libs/cogl:1.0=[introspection?]
+
+	media-video/gnome-video-effects
+	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+	x11-libs/libX11
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+
+	>=media-plugins/gst-plugins-jpeg-1.4:1.0
+	>=media-plugins/gst-plugins-v4l2-1.4:1.0
+	>=media-plugins/gst-plugins-vpx-1.4:1.0
+"
+# libxml2+gdk-pixbuf required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_configure() {
+	gnome2_src_configure \
+		GST_INSPECT=$(type -P true) \
+		GTESTER_REPORT=$(type -P true) \
+		VALAC=$(type -P true) \
+		$(use_enable introspection) \
+		--disable-lcov \
+		--disable-static
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
diff --git a/media-video/dvbackup/Manifest b/media-video/dvbackup/Manifest
index e093d66f7736..264c0a5be9e7 100644
--- a/media-video/dvbackup/Manifest
+++ b/media-video/dvbackup/Manifest
@@ -1,4 +1,4 @@
 AUX dvbackup-0.0.4-gcc4.diff 336 BLAKE2B 1a585fd6b6120117d0e25276c3dd786cd85df1d7d53dc09f58a4be26cecc9a786eee81e0b77f8ef5d4433426a78c496d8f1032e62b926330f1ac462a1c5685e1 SHA512 adda4164cc3f6722ffe1ea44066b8b0d1d0aeceb6de771403a1b357bf04764d60ddb90342083392263ba09d3b3360f85ada86b3173ced0a535b856d7a8a47db6
 DIST dvbackup-0.0.4.tar.gz 115303 BLAKE2B 326804a5d6b6c8fcc79fd84a03cf49a064c3960e81d6939e5409c8f62a97ef53f844457b7cf8e00b9f8f512748bcf64ff3d956da05cb9fdac368b308de5660f6 SHA512 0e647b37229e644edf72765c3c9644617140118e8e9e854b6a2da490aac1ef3dfe28edd647323f1f0d0219aa82f4548de3dd5a01e10320db0b0dcf3b88e748b1
-EBUILD dvbackup-0.0.4-r1.ebuild 1102 BLAKE2B c6b0cdf32a61d0d2a269dd0f5bad4564179f8deee59d8d9b87018f8904479545b6269c8e062fd8a8cd7ea5b3ca04f7ab9e72cbc1fb265df80f5c1226a5c5d3c3 SHA512 351e1efc1b285e659ef0257c3d5fd6a8ca3fb90a5d198d6f3cb3c0c97c8776d515985231aa3740531467c079fb7549a3f6c9331e5d3caee5ad4b841dfdfdb1a7
+EBUILD dvbackup-0.0.4-r2.ebuild 1126 BLAKE2B c607cc02a789e1b62dbf1fdcbaf9d79e3e65c91ea1ee7a26916f2873a530d9fae18868adb881d19973e71e046a32b05885d4bbda66aa8e0b2914d642665b15e3 SHA512 5997422b7b275e22a0f298a6eace6d2e74ffcd9181748a9978260241885c6d58d2b487d74cbb9fb3ab207a43a8b2bbac85d9783df13f5960884284c72e34f44d
 MISC metadata.xml 301 BLAKE2B 6c8a23bb89f017298449be359a424685dbc613521e538318ce470faa9fbcd7ac97dfa009075b9c3939f4d6b06d8f881ef4e6e744ba50c23313b920866b21c3e2 SHA512 57d7055984f446902f9ab3783215376794153cabe2c3b05b80d6a83bb288c58575b86b7ee6631f90a8992f7a28c06815b44e4d96847a5de8d1149cb05763eb10
diff --git a/media-video/dvbackup/dvbackup-0.0.4-r1.ebuild b/media-video/dvbackup/dvbackup-0.0.4-r2.ebuild
index dabe40404d6f..a053819d1635 100644
--- a/media-video/dvbackup/dvbackup-0.0.4-r1.ebuild
+++ b/media-video/dvbackup/dvbackup-0.0.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=7
 
-inherit eutils
+inherit toolchain-funcs
 
 DESCRIPTION="A small utility for creating backups on DV tapes"
 HOMEPAGE="http://dvbackup.sourceforge.net/"
@@ -22,13 +22,15 @@ RDEPEND="${DEPEND}
 	media-libs/libdv"
 
 src_prepare() {
+	default
+
 	local i
 
-	epatch "${FILESDIR}/${P}-gcc4.diff"
+	eapply "${FILESDIR}/${P}-gcc4.diff"
 
 	# fix Makefile to respect $LDFLAGS
 	sed -i -e 's:gcc \$(CFLAGS):\$(CC) \$(CFLAGS) \$(LDFLAGS):g' \
-		-e 's:^\(CFLAGS=\):#\1:g' Makefile
+		-e 's:^\(CFLAGS=\):#\1:g' Makefile || die "sed failed"
 
 	# convert LATIN1 docs to UTF-8
 	for i in ChangeLog ReleaseNotes; do
@@ -40,13 +42,12 @@ src_prepare() {
 }
 
 src_compile() {
-	emake dvbackup || die "emake failed"
+	emake CC="$(tc-getCC)" dvbackup
 }
 
 src_install() {
 	dobin dvbackup
 	insinto /usr/share/${PN}
 	doins underrun-ntsc.dv underrun-pal.dv
-	dodoc AUTHORS ChangeLog ReleaseNotes
-	dohtml dvbackup.html
+	dodoc AUTHORS dvbackup.html ChangeLog ReleaseNotes
 }
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d3747f22bfc6..ef1e7855ccec 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -16,6 +16,6 @@ EBUILD ffmpeg-3.3.4.ebuild 15956 BLAKE2B 43f20cd2657f7f18102d67311b5cfac1698e59c
 EBUILD ffmpeg-3.3.6.ebuild 15957 BLAKE2B eb439e2f522e49991df4143b4ec69b428e4ea69c97f6aab1d1aa19628d0b311adfb484cd7d807c44b90a8e74c87255992fa8181ad8ddee51ed515424bc7e60b1 SHA512 9329ae807ed9c5e3f63f2ca9c1c658728f924dca5885375438ccc01a22ee9f21da208cfaa62329eb5df77200ba27fc0ffeb3250b6507e6731210b46e973dbd96
 EBUILD ffmpeg-3.3.8.ebuild 15963 BLAKE2B 661e209e31328a85b460a4edcc43373986dde755297908e476ab38a4aab9b5a263bba7c6b93d98ed6931fb9ad10523207457805e4ad7e7a17ccc48b27b22e195 SHA512 2fe576a2bc1f5581528ace1cf20952cae8d3ca4eb5889b37b823b13d49cb56956beae0fed0a0a3e335252be1ed811de85d4f92ea7efe799c821498fa4be7c2cb
 EBUILD ffmpeg-3.4.4.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f
-EBUILD ffmpeg-4.0.2.ebuild 16478 BLAKE2B 86bde33dbe714c6ee01923cc6a641d76154bf9c4ec0e15fcf4903293ce9874d8f4c4c91e4ed5da2d0ba8b1d0a9a91141b3c7ffdc7cb3ab3e7ff9d7ecee45c6c4 SHA512 0b3035478c18bc4b9557daaf17f958eef8139af6dbad51b229ba3025eec1099384de6f09c4d37cbdaa0ac977ed32c542d72ff79245803490c409eb8e15fd774c
+EBUILD ffmpeg-4.0.2.ebuild 16483 BLAKE2B f1c9238ca3cb364bbcd5ce20fda8db567ce19d9eda1e9e6b83fc4e0a2d73edee52062e25b2cfa9515668577c80a6216f74b90ed4b2136541b9da5c32cdfd9a1f SHA512 019f3eb86d811e02a984c968cd867e59a895959483b1784f63df1045411edbc2218190f65ae6098818e78c4d9cccf0489ed93754878959f4d5989999bb5a526c
 EBUILD ffmpeg-9999.ebuild 16532 BLAKE2B d83feedb396b1e948f5bad72ba5ea79c26391c5eea49bfa5f1845960d0cd2add0cb0de796338600a5a799a9d651f37d87efed9ee382af88e7f87cd53b881f4ac SHA512 9e75c604bdcf11db95dbde2b91d2dac972950eb48b74aa48bfae694eefeb5a7738fa0c66fcf87f99cc9357f96def56c7631eca7fc829327361a50279c625a75a
 MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85
diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
index 5e43e8e67aac..e6c7e1a95d90 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 0314242e032c..8493554490eb 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,5 +1,5 @@
 DIST gaupol-1.4.1.tar.gz 524816 BLAKE2B 677f1ee0e3b523f97d4b0f6491547d07a658c41c3c2c0f76732589592b542176761df28e13735af58371594043ef234f7987988deacd4d8f73554a87f555d001 SHA512 464e71390ba13f1da11bd40ecb4683d146acb6e547204231a2e78c24719b4ad9ba188210d1bf2108924bcfa0df89c0296f428cba693d3b6d4366e98950cb072a
 DIST gaupol-1.4.tar.gz 524369 BLAKE2B 6f27ce3328339fc2f6248bb58d80965a5a26fed220ddf9c989a5029b4322ea790f768cb9e0472bb2c5eae4e4da3abd4b0f808e785273ff9fb787ff5b7df5d137 SHA512 da9256dd8dafeaff012226a8ff09807c7cb7609c293bde7d90b05b4f75c47751e65181f1bf47dff1c8e979f48186996253141ff18e849786bf2cff5ed5555148
-EBUILD gaupol-1.4.1.ebuild 1384 BLAKE2B f2a4eb63b65b6c855650faa7da6af5ced3d0c504f604b31927056d9e8661d64e262a8b44aeda1077a59eff16296d79f2fcec28fc100f632f7717315b5110058a SHA512 49096af25b97bdeec8d3c7f913f5f473de8183e91a4f895a7234d02d419fde062c50ae2cd0cdc83f8f85c49fd3647a74633778df56b86baddf197265624394e5
+EBUILD gaupol-1.4.1.ebuild 1386 BLAKE2B 5ec40c5e0af3db14aa3453d7fe586ea0b346ecde6cc73f8d5f812279b23db7ca72915b386c78c719ca057f2f6a4a445c2673be4711d6d3ccfad6b26fc563b14b SHA512 b34e09c2ca5f21cdf6227d9ec0cc9836d004367686753d33ad4c0d7415a9456cf5325b0c3710e9da142640ca3c0a040037d69772bf878f0577ee7441fcfc2b3f
 EBUILD gaupol-1.4.ebuild 1424 BLAKE2B 95b4045fa111616491df258bee5542338e04209b7083fae27901b50255eaefe75be5c94cbe7d976e2b57365ed5f6d6a9287da586bd9971155a0d4cb88d73761f SHA512 1a74311606a5dfe5c8b827fa8ac01d258fbbdc2d9b635433c90a088ceb10994cfc3bdc229073fa5e47200ba3bb1726a4c6bcb385ac0366f93d4ab23452b54dcc
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/gaupol-1.4.1.ebuild b/media-video/gaupol/gaupol-1.4.1.ebuild
index 25d3dea5fb47..44d9699252e7 100644
--- a/media-video/gaupol/gaupol-1.4.1.ebuild
+++ b/media-video/gaupol/gaupol-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit distutils-r1 gnome2-utils virtualx xdg-utils
 
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 608c16036595..255b8b7cc600 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -3,11 +3,9 @@ AUX handbrake-1.1.0-nolibav.patch 9306 BLAKE2B 8b3fafe2063fc03d1e4a571eb5133b532
 AUX handbrake-9999-fix-missing-x265-link-flag.patch 281 BLAKE2B 623f902bb31586513a51db95a63841e6234d4841d6332d2be9a6a0d7fd07f3e9cc694eb8945bebf718e10538fa390bbaa9dcbea81ba5324cbf20bd64bc582fdb SHA512 30d457258dd287cae3df66e7899b66480be2212a3969fe3a4e4f99ed383740e8f597fa7cf869922f29f501f100313b7efd78ebe09e2949ed4c235e2df22d22e5
 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-0.10.5.tar.bz2 10452839 BLAKE2B 50dd8cc968fc7da262c9a17d4baa7b4093a33746a08afcb8980de539f947f1fd3607dc0d0c3824023d24abd4d430d5418e92d5e939f334e090c1fa192dfdb3ec SHA512 30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea
-DIST handbrake-1.0.7.tar.bz2 12650549 BLAKE2B 54fa6f4ee053de3ce1840695e66b0fef5ac09aed79f61755f146dbf990c624608e9acf2f81e69871ece85daf5a3f09780a75f43567c5b08afc55863495958ec7 SHA512 bacc5ff105893a0fdea95174839663e00027c87a13f00fb67d39c347b55e35869c0b998ec52181389b98cc2cc358d221e41d729e76952e4cb21fe8d12ee5a44a
 DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd SHA512 48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3
-EBUILD handbrake-0.10.5-r2.ebuild 3479 BLAKE2B d035befa6a812aab6a6f4f333bf66637009d228cf54ddc22dc3ec8d95ec9b8b5cea6183c8366352dd2c82452303126d4dfe9a449848d2cccb844486cbda36f70 SHA512 1f5bf9e88bbed89473edcf81013eee4b6ef223ea4fe9fc43ca46aa0b1ce657a122f2f6a020b46d354d36fb4c6044911c36c3c37793f5d2c6feffe89275d3ce52
-EBUILD handbrake-1.0.7.ebuild 3524 BLAKE2B 26efd30bd6f2e359fb5059aa2713645b7b7a3a1ae929b5492fb4589d2b76f454653994d88d8bbb875212080cc75933bf1cb8a90b1443022de0e7e2a7c0476786 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99
+DIST handbrake-1.1.1.tar.bz2 15319551 BLAKE2B d0569a796f3838f5696e3dcfed348a5111e063841cb594bbce7283568cdf868e6b751f3cd6086ebc83af5f2d6ad9e238717425f953677cca9e2908a9c0301aa9 SHA512 990035a5f850fafbc68c77dd61d7f7371c3eda2cc6e6ceb377f111c9016713523cf1685f519926ae8859446c99392c64b7ce91d72f9b5f9643a35a3d0326eef4
 EBUILD handbrake-1.1.0-r1.ebuild 3597 BLAKE2B 3f3369bb7a0149a847267e92190a6462d552d1dc2b108f9ca044335fcccbab919a30cc05eed920b6ade90d45b4fc01872846babef77386f083059c2822411d09 SHA512 96942d20f0779f0b548d644a97e3ab3b34f5e2b25cd752507936f1c4c685728705bc2476c5c6d4c1ffeff43013031419767e4aed459d0807c3a8a5ddd11ffb63
+EBUILD handbrake-1.1.1.ebuild 3597 BLAKE2B 3f3369bb7a0149a847267e92190a6462d552d1dc2b108f9ca044335fcccbab919a30cc05eed920b6ade90d45b4fc01872846babef77386f083059c2822411d09 SHA512 96942d20f0779f0b548d644a97e3ab3b34f5e2b25cd752507936f1c4c685728705bc2476c5c6d4c1ffeff43013031419767e4aed459d0807c3a8a5ddd11ffb63
 EBUILD handbrake-9999.ebuild 3597 BLAKE2B 5997effcfd06d412b66eb6d9cd305806c1e2f8a69c3d2fb6d123843a913c0fddbf399f35496f283507e43dd3ebbea3c2058af68d7207d7a428df605244e8225d SHA512 9cdbab17900c033bbb4b785c13828937cb0c0d8dd2e3d43af76170389ebe8d2b561f038055e1dad38259f92d723119c9f6db182266fecb36b2febd2c21d50966
 MISC metadata.xml 826 BLAKE2B 3cbdae05b5011afa3ef7dd76f7979756e0385584511b9eecdac3cc9a031ed31cc64b225214acf6e8f4691455ac31c4a8f9fa8612884705c3da23ab4bbae32e7b SHA512 f6344c1c82a507438d41d38020cd3ca33ba056d156d0fcdc72b6c4def5adee1260bb1f89ad8aec544f22e58738c2be22da210bfad7b2ed6c95f201cdc619a0d6
diff --git a/media-video/handbrake/handbrake-0.10.5-r2.ebuild b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
deleted file mode 100644
index 558ee7f48fc6..000000000000
--- a/media-video/handbrake/handbrake-0.10.5-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.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:=
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libvpx
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	libav? ( >=media-video/libav-12:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-2.3: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
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-		virtual/libgudev:=
-	)
-	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}-0.10.3-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 AUTHORS CREDITS NEWS THANKS TRANSLATIONS
-}
-
-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
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/handbrake/handbrake-1.0.7.ebuild b/media-video/handbrake/handbrake-1.1.1.ebuild
index 0ce63641f6e7..cd52cd8ded29 100644
--- a/media-video/handbrake/handbrake-1.0.7.ebuild
+++ b/media-video/handbrake/handbrake-1.1.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 else
 	MY_P="HandBrake-${PV}"
-	SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -42,8 +42,8 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	libav? ( >=media-video/libav-10.1:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+	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
@@ -99,7 +99,7 @@ src_prepare() {
 	default
 
 	# Get rid of libav specific code when using ffmpeg
-	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+	use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
 
 	cd "${S}/gtk"
 	# Don't run autogen.sh.
@@ -145,6 +145,7 @@ pkg_postinst() {
 	fi
 
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_preinst() {
@@ -153,4 +154,5 @@ pkg_preinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/media-video/m2vrequantizer/Manifest b/media-video/m2vrequantizer/Manifest
index de38e5adebed..ef249c564118 100644
--- a/media-video/m2vrequantizer/Manifest
+++ b/media-video/m2vrequantizer/Manifest
@@ -1,3 +1,3 @@
 DIST M2VRequantizer-20060306.tgz 25576 BLAKE2B 4b5c3887b9e1b03b2b03ae83ff1c18027b37e4af8e4c5e8b5845b8467ee9828b2df30ddc061547a10274ad15685a2defc88d3303060f6b61d3e29a38b2a9c9b4 SHA512 e3173aa19301028682adb2046bc536b20ca4c3bacfa7e40e0c22a5174411831969a9ed0e6737be7dede00006ba1629fb178822001166c02c507434e66c66b861
-EBUILD m2vrequantizer-0.0.2_pre20060306.ebuild 684 BLAKE2B 97ef499cff5f3f695368827b11565b23392ff39fff34bde2b66b76de5c3d4ad810c4afeac4fc023fb04782c2f6f34e2e52f59f9807e5052778957e9b8169cf8e SHA512 421882f7bcc5acfed46d4000aa9c8548398513f345aa3d93c12898a389f9947d2422d0e9e1cb48596f9d0f3c7c7a68f3a069a2cc1b470edbddabee59fdaed8c7
+EBUILD m2vrequantizer-0.0.2_pre20060306-r1.ebuild 713 BLAKE2B f0ab82dffc00be4dbe56a2571ec6ef948ed08a8fbe33ef5f865a776be3d50c40c3ec4262b4278b58a35fbc21cd9d00aa4bbd1bead2728c65e654ea47d70cfaa7 SHA512 0448b798d72202b77227b28a00768b0a6b2b7525798847a5bda1ccfa77d0c213f388eab28a6044f6f6f94711298880cfbc62033fc7ecd408d01499495b5a94a9
 MISC metadata.xml 357 BLAKE2B 2969a06704f541160af828c0e4bb2607cc86a22090e867607fd2951b08a22f45070e6c4fcf84ce22d6ec074b288ea4d8e04d42bd77dac69e3ec16600a311d1d0 SHA512 c301a1bb051eefde7856ef1462d13343fba21acfabde35a2fd9feba5c00f3aaf697b9e358132cc56114f59af0b785ffb07998d8a6d084369275cbf1b616a7fa4
diff --git a/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306.ebuild b/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306-r1.ebuild
index 524ea9eceb47..e53d8d04db30 100644
--- a/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306.ebuild
+++ b/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_P="${PN/m2vr/M2VR}-20060306"
 
@@ -12,25 +14,19 @@ SRC_URI="mirror://vdrfiles/requant/${MY_P}.tgz"
 KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/M2VRequantiser
+S="${WORKDIR}/M2VRequantiser"
 
 src_prepare() {
-
-	sed -i "s:#elif defined(__i386__):#elif defined(__i386__) || defined(__amd64__):" main.c
+	default
+	sed -i "s:#elif defined(__i386__):#elif defined(__i386__) || defined(__amd64__):" main.c || die
 }
 
 src_compile() {
-
-	gcc -c ${CFLAGS} main.c -o requant.o
-	gcc ${CFLAGS} ${LDFLAGS} requant.o -o requant -lm
+	$(tc-getCC) -c ${CFLAGS} main.c -o requant.o || die
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} requant.o -o requant -lm || die
 }
 
 src_install() {
-
 	dobin requant
 }
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index ba708e433732..46a918de81f2 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,5 @@
-AUX makemkv-ffmpeg.patch 1162 BLAKE2B 17a0b850eedf830fdc95c01444be3783310b23a84db646f983c95d985f8e010a4633ee0bac175a7f27e0d26f4402e617afab18e95bf64d368601d4c19144f68e SHA512 52ac2ca86b621502f78f2f1a6dc3df713686369c4ec227597bd539b7bd55d4198d0710107d858d796d6e3503f9b9a9bc53e020e2eb0cd5a29c8897e4da00bd67
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
-DIST makemkv-bin-1.12.2.tar.gz 9137254 BLAKE2B 9dbb6ff446f76bd119fdad65a97b983badeee17f78b59d79a4cb55f22d1bff443493ddbc1be77686906e324c6dbd3c93b851b0944238e97fc29bc4503c85ef07 SHA512 25b6be8dcea8aa521f2cf4b4ebac1a7a29ed1de603c5c14ee50f94fbf6a2968bf94116ba2dc39129334fb62497966d01032da4b276563c2e819a5f62f93d4d94
-DIST makemkv-oss-1.12.2.tar.gz 4379033 BLAKE2B 24da56b6b3c356dd41d7a6f0449258c0b45cfb8f4882f130fb934911c5c42c080294f4e6445e949f840c372079f143a9b4c920e7f79ed71e553b8486bcc778b4 SHA512 d418dbb14b55bc69937d2265220b3df9dd4baf7d083ba94ff51ed5d9eb2e65c0c4dd2527076dfdcc539ccde7da24dcba94e471bef47998921f0d154330dc2980
-EBUILD makemkv-1.12.2.ebuild 2868 BLAKE2B e03723f1f3ea7c21084fad26732cb43a2b770530aa6407804686f043268726dc3bf20bd6bf4a5f7e9083eb4ce44c67910e8f408c6c3edf520abe8ba88f04f6ad SHA512 c02583d2e9a2fb7721a383004f06c9f3f70b86c0d10d6915d18b2b9dda616f49ed4994bb8af31c36783105c919616cde76b197036edd9387fc177da1c0659a3e
+DIST makemkv-bin-1.12.3.tar.gz 9252749 BLAKE2B b81503e6bb98dbf0f61cf7918ab614972032106fc44c79d698df8fc3ebf73b4c07f74e6208cacc1756dc6a5b06a6ada663d0529f9f35bf7f0c658e18b07cb6ac SHA512 79d73c8a3dcc4028a79b8aef8c228e6519ef8df7178cdbacd85ae24b8c6078a43651e34bb32c0ff83027ea2def998fefc938676ca6d83645d2b52fc36d65df9b
+DIST makemkv-oss-1.12.3.tar.gz 4379072 BLAKE2B 3fded704fbb8f5c4fac944cac028fe8b7d7c9e86402475d84638db0052480d7694c170c5babb0422f756920f0f5b191031e555fce0dfdde8b9ee63be1d57c195 SHA512 cfb4f61333751038120b94e3854afa471e9007af36b47cb0a681c3615a7f66e0462ee601c711cd9ea7cb51cc6e0ff38662a62b78e0e47735b8c19b2da272f892
+EBUILD makemkv-1.12.3.ebuild 2859 BLAKE2B fc304b3cc80241f3a2f07e020291ca76dca99b85b028b92a1833cde011fdbadc45b9a908371fc77f5c5f050f2a116599b0754d659f4bb4eac6c25e80d616fba6 SHA512 d8d8b25018297ecee548e46bc364953d2db2fe41cbe970b74933ec18400d03ab7317e2b5fe5606cce73de0bb31560b6bd17dbb3169f88807a9a7383de19f010c
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch
deleted file mode 100644
index 930c144d263d..000000000000
--- a/media-video/makemkv/files/makemkv-ffmpeg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Taken from https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm
-See https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615
-and https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca
-diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
-index 20db4e9..f08d53c 100644
---- a/libffabi/src/ffabi.c
-+++ b/libffabi/src/ffabi.c
-@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n
-         info->profile : FF_PROFILE_UNKNOWN;
- 
-     if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0)
--        ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-     if (argp) {
-         for (i=0;argp[i];i+=2) {
-@@ -718,7 +718,7 @@ int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod
-     info->delay = (int32_t)ctx->avctx->delay;
-     info->flags = 0;
- 
--    if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0)
-+    if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0)
-         info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER;
- 
-     return 0;
diff --git a/media-video/makemkv/makemkv-1.12.2.ebuild b/media-video/makemkv/makemkv-1.12.3.ebuild
index e5003042929a..bcc7cf5092ec 100644
--- a/media-video/makemkv/makemkv-1.12.2.ebuild
+++ b/media-video/makemkv/makemkv-1.12.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
 
 src_configure() {
 	# See bug #439380.
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 4eefdd496afb..1af81c4a1dc6 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -2,6 +2,5 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe
 AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
-EBUILD mjpegtools-2.1.0-r2.ebuild 2856 BLAKE2B 69ecbbd0dd2a8b6176d9fa5a93e1b5321331e1f701168a809f8d1660d05855bd1cf8187073895442443bd0cdf212494985b56500bebdc531c6b092a47675eae7 SHA512 741507bd082bfdd7a46f1fa5a73cca2c7c903b922268afacc8edaf0ad43392743b79dae798abe9eab7f12f9866199d6f868c386fff930e060eb4f7543e655642
-EBUILD mjpegtools-2.1.0-r3.ebuild 2874 BLAKE2B 2cb1e3ae4aa80bc45cc879a19e281a3c42b4727d7d749a267b922de30822a2fc4064bbc74a49f8adbd75a7957ddfbefdc9491a21bbb6d008def1cf9f5c215ad0 SHA512 7c8fe8511ce01a561947d3e4baee6817e520b1ae39dedfb471ff0010542f8bf64ec1f09fd90a26e3c5aa899046de9f00950d60b5d29779c9f7e9523d31aadf50
+EBUILD mjpegtools-2.1.0-r3.ebuild 2873 BLAKE2B a40d80911829ee07b60582fb4c964469d522d123d41f16644fc43f3da5e231c60bcf767291663b66a36c6dd600e07e4fd61f17d842673749d9d0c2d4b9471398 SHA512 bc1c60e424c841aaad9538a3bdb038341e560cf98ae2b4f93443c4e2e9cdc8b9325efda3980b34495279f3a0cbb9af1db863422ffdd0d496d9ffafce42d2dd36
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
deleted file mode 100644
index 09216f8d0c94..000000000000
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
-REQUIRED_USE="sdlgfx? ( sdl )"
-
-RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
-	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0= )
-	gtk? ( x11-libs/gtk+:2 )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		sdlgfx? ( media-libs/sdl-gfx )
-	)"
-
-DEPEND="${RDEPEND}
-	cpu_flags_x86_mmx? ( dev-lang/nasm )
-	>=sys-apps/sed-4
-	virtual/awk
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pic.patch
-	# https://sourceforge.net/p/mjpeg/bugs/139/
-	epatch "${FILESDIR}"/${P}-sdl-cflags.patch
-	epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
-	eautoreconf
-	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-multilib_src_configure() {
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-	local myconf=(
-		--enable-compile-warnings
-		$(use_enable cpu_flags_x86_mmx simd-accel)
-		$(use_enable static-libs static)
-		--enable-largefile
-
-		$(use_with quicktime libquicktime)
-		$(use_with dv libdv)
-		$(use_with sdl libsdl)
-		--without-v4l
-		$(use_with sdl x)
-
-		# used by tools only
-		$(multilib_native_use_with gtk)
-		$(multilib_native_use_with png libpng)
-		$(multilib_native_use_with sdlgfx)
-
-		# used only in V4LCONF_LIBS that is not used anywhere...
-		--without-dga
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# avoid building programs
-		emake bin_PROGRAMS=
-	fi
-}
-
-multilib_src_test() {
-	# there are no tests at the moment, so it would just build
-	# all programs in non-native ABIs...
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install \
-			bin_PROGRAMS=
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "mjpegtools installs user contributed scripts which require additional"
-		elog "dependencies not pulled in by the installation."
-		elog "These have to be installed manually."
-		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
-		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
-	fi
-}
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 4f1dfbf19fae..9b92deb1bff7 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index ffd4621c1ea4..11dd2ae352e8 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,12 +2,15 @@ AUX mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch 1456 BLAKE2B 0d360a6470
 AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 BLAKE2B 655bf30240ac95f63385bd3bb3c5c9da264aedfb20c2e4abbf43d17dbdb9f5f7a79c6b8d056f6bec32144be87a23b88f0722d6193ad216771bd9e220ef7efa76 SHA512 15861e0f27598c626a5f39319b473483d5d1cec26ca2aad928f6cc751568d7c6eab9bac479665677da92c5c962a3060a8b7cc02899390702e7fed370c28d9a6e
 AUX mpv-0.25.0-fix-float-comparisons-in-tests.patch 2096 BLAKE2B 88cfe962f3c9901e39837a8c890d0d07f362f3f5b2c1d9adc6cadffddb19bf38b918c76bdeb1d634a62ad09115c1d4adcfe218a3202843542d1d751e60e1d449 SHA512 46fdb40f0eafc9fdbf180d0334de5b57a3949b4479835750462414a996272da3ae816d62f58fc986f448045e4e8f8121cebbad19a0a031c589f5ed346a210875
 AUX mpv-0.27.0-add-missing-link-flags-for-rpi.patch 988 BLAKE2B 2dc3c70dbb0565db93fbaa9852e37afd1d953e896bb820095afdac8bc8d1bba52fca07173a63d306990e7c72611afb40e22a21d1bc8293b69691d4f5252c2753 SHA512 bb204c5910d927d3dd159fe17f8edecbbc80a9d36b60d83f08d10181e019fcb140a701d2b3d4c6436d08ef0ebe95fb81bb5d7467c2b63a1b098ba412defeea32
-AUX mpv-9999-make-ffmpeg-version-check-non-fatal.patch 1461 BLAKE2B e87177c8e726d2599a7037734c4128a4ebdfee5a17a15287f61ae70d880cd4262418396efcd976beca9cfcfbb84158051e217eb2be793208e72f0513a3256f9b SHA512 26c3020cb1f531611358d2a16bea3e26926292abb4b40694f4357c4d36d2bee17edbf317f9068c7364cda35cc6e27e2fe9d23a284b1da8d136bed2f1e0cea64d
+AUX mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch 1463 BLAKE2B 94343df8eb4b64462fdf5003bf3cfd028b44e1d5dbf43e2879dc371b0eb71e2569925d7d8b5a988ab38b22ed7ec9375b73d73b9ce7396793d3d96665a4469711 SHA512 7d82e578f9e8bd486f309abd3131cbd98e8f48ce7cc696105f860db032741621498a937b8bf887ee9fee0a4f36d5b476e1722a5c639a0d2842bf82712cd8de86
 DIST mpv-0.27.2-patches-r0.tar.xz 6564 BLAKE2B c02efea40e0b19d60eaa49520988464fbf4c9221108cbf19021934dc0cb0a975dab148ec1ea03753d81b8035173e3e5bd74b262ab5675d9fc5dce4a0f75ea37c SHA512 d1c955c32082338f5c7f1cd8268471ca0ac6dcd817c5fe39fb82f0e8bd3babf6f2f954d4ce52e9be786e5527df75cc6f4f3de8106a3517c8a1d8e39be1b4ebbd
 DIST mpv-0.27.2.tar.gz 2957191 BLAKE2B 35e316e5a30869ae44ff229e99ae11a88e2f7d55b55946bfb752d5ed2d8212885c0c2abb59c9ff6d23a72daee47d80f44511313d67ee6fb265e6681ba4b89ee1 SHA512 bf74a150b3732b8c233362e0902c54f85fbea9ca1765a2a8f946a6eecd9b37a72ede36a36d0dd98a770539c4f81fe24c8ce26be9db7cd6eddd8514a8f82d9cda
 DIST mpv-0.28.2.tar.gz 2982558 BLAKE2B 5faef4122d456916f43bd603192fc72dee1ad16fa3c842d54a2e53dc8f9db416545549a86af62481fe211dc088821ab13b832c09f82572b36167dd3a73d57f62 SHA512 e6206e8c65dca084e2cfa73ab09278b7113cdfd90b89877d1f75a1068c6379a093ea3955a023857357683edce1aba8c12ee441fd195d887af4d939fc7b66cef4
+DIST mpv-0.29.0.tar.gz 3057997 BLAKE2B 6d72d0f4e10fd4a1b7af624c95dda69035ed3b500788ad84dc7837a62cd1debdd57ebef2fdac9795ccd0d29feef91af6e8aa942bb49ef996c1a4b00f6080af85 SHA512 77204218bd217ae1da4812b09e0509965a3ef102d3de5cd4360f007ccf3779e4cbde5cfd6adae9629ea39062bd365e847429bdf7f9a1ddebd0a67d267492b221
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
+DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
 EBUILD mpv-0.27.2.ebuild 10646 BLAKE2B d540c5bf23ccaca0a46462b64e615468d6f3f7f60d834da91f200e1919db3ab5f8624d3545fe583431908bef16e24aa60fe1023cd11b913840590aecf5519906 SHA512 e233419cec44ddc5d2391a3dca4795772f3c0fec57f8f306e05a9abd53c163b29402458fc11b76a5508cfa6c01a0205d6b8a49eec64b4d9b9097bc36523a2b3c
 EBUILD mpv-0.28.2.ebuild 10447 BLAKE2B 2af786cb54863f244f32f0e509593f1c48ed147a92adfa2985dca7e82740c6358f4610b8b2e8a8788985992b66b234d775fafe5ac1c62672c4661a26fe2af9eb SHA512 cc1b2e724d7c8a55caadee3cdfed66ab94e0e146354f2813109ebb47ffdd82aa3181dd8febc9d84500f739b9e4b2fe6e6f74dd9c9f494edadd8508152962ec44
-EBUILD mpv-9999.ebuild 10308 BLAKE2B 64a9be3b17704c91ac416ae105d63636fc9ba7f7f0bffd01fb3571ec03fc78cff92036ee2ecc939e0cf372db6598d72d7b18649909cf3d8921e66da6a56a3c84 SHA512 0f3a8b45e453c33355b4eb564f5206cfeb4b355e36c1c3d9a6df3e4d7f65795b2018677576a6d345386edbd63237db509405c57c607eedb5951bfd5a51899135
+EBUILD mpv-0.29.0.ebuild 10218 BLAKE2B 733cab5beef84e1683f78649a2a729c4578a6ee2a64f4e21d121bcf6ee6a3834bf9b58cb3b042f5d3cf32f429a7a3e9621ed062fb9b1fcc86f78bcdffbe35849 SHA512 fc3a430715aed3b79ebf0bec8f0fb0b477b7c198f4c7498acc86bf4b895d05be3097591fc92f41bac2728c2be5b443f0abd2d553f7395e7e5ca00dba7c9e85c9
+EBUILD mpv-9999.ebuild 10226 BLAKE2B 4a673a4e9febbecdd5be0af8965db6bc6ce83f711fa170993f196b3be62fe1bcf5a22c324c9c44c8241e4a5552c79322b4a5a7de6ad019d4bfb101cd09acea7a SHA512 c39b92265226730c7fb36472dcdfb5fe2a0ccaf9859a9f26ba49966ab28b48476f36c1b17c7852e3f9eaab817da1bacfc0cc0efd5083f4d0e9de3ad43f76bdce
 MISC metadata.xml 2434 BLAKE2B 49d49e82a085bc55ca6ace16fe6d90d66988cc5e63837a4c1cc479b14fe0c83aae87478a9dc0a209f28f03a7f17363e42f64753d9d1496b671669a7add3dab2c SHA512 3a14c0d283f6369fcc3ea160d53dbdf44b41fa5ddcc2c5e724040c2d462542f6638b763984e7b47e1d69eab25a4347d5f821b5ebe5bc4bc5471f0f8b7e615af1
diff --git a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
index 1594617fba9a..1a4975a4e305 100644
--- a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
+++ b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
@@ -3,10 +3,10 @@ player: make ffmpeg/libav version check non-fatal
 We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
 
 diff --git a/player/main.c b/player/main.c
-index 5a3fe4c1b7..8cfbb09c56 100644
+index f56191a297..4e51aebd66 100644
 --- a/player/main.c
 +++ b/player/main.c
-@@ -429,13 +429,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
+@@ -387,13 +387,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
          // Distro maintainers who patch this out should be aware that mpv
          // intentionally ignores ABI in some places where it's not possible to
          // get by without violating it.
@@ -25,4 +25,4 @@ index 5a3fe4c1b7..8cfbb09c56 100644
 +                "Please rebuild mpv in case of any problems.\n");
      }
 
-     if (!mpctx->playlist->first && !opts->player_idle_mode)
+     if (!mpctx->playlist->first && !opts->player_idle_mode) {
diff --git a/media-video/mpv/mpv-0.29.0.ebuild b/media-video/mpv/mpv-0.29.0.ebuild
new file mode 100644
index 000000000000..eae5391d95d1
--- /dev/null
+++ b/media-video/mpv/mpv-0.29.0.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=2.0.9
+
+inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+	DOCS=(); SRC_URI=""
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua
+	luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
+	selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib
+	zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( opengl )
+	egl? ( || ( gbm X wayland ) )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	luajit? ( lua )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	vulkan? ( || ( X wayland ) )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	zsh-completion? ( cli )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader[X?,wayland?]
+	)
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=dev-libs/wayland-protocols-1.14
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch"
+)
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default_src_prepare
+}
+
+src_configure() {
+	python_setup
+	tc-export CC PKG_CONFIG AR
+
+	if use raspberry-pi; then
+		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+	fi
+
+	# Prevent access violations from zsh completion generation.
+	# See Gentoo bug 656086.
+	use zsh-completion && addpredict /dev/dri
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize # Don't add '-O2' to CFLAGS.
+		--disable-debug-build # Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		--disable-android
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable javascript)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable zlib)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth # Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2) # Listed under audio, but also includes video.
+		$(use_enable oss oss-audio)
+		--disable-rsound # Only available in overlays.
+		--disable-sndio # Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland wayland-scanner)
+		$(use_enable wayland wayland-protocols)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable vulkan shaderc)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev # Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+		$(use_enable vulkan)
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote # Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
+		ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
+		ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
+		ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] &&
+			has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index f99a57b4a267..ba554e7956f9 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
-WAF_PV=1.9.8
+WAF_PV=2.0.9
 
 inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
 
@@ -29,15 +29,15 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
 LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
 SLOT="0"
 IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
-	dvd +egl gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv
-	+lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
+	dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua
+	luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
 	selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib
 	zsh-completion"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
 	aqua? ( opengl )
-	cuda? ( !libav opengl )
+	cuda? ( opengl )
 	egl? ( || ( gbm X wayland ) )
 	gbm? ( drm egl opengl )
 	lcms? ( opengl )
@@ -59,8 +59,7 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] )
-	libav? ( ~media-video/libav-9999:0=[encode,threads,vaapi?,vdpau?] )
+	>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
 	alsa? ( >=media-libs/alsa-lib-1.0.18 )
 	archive? ( >=app-arch/libarchive-3.0.0:= )
 	bluray? ( >=media-libs/libbluray-0.3.0:= )
@@ -138,7 +137,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch"
 )
 
 src_prepare() {
diff --git a/media-video/recordmydesktop/Manifest b/media-video/recordmydesktop/Manifest
index 3595b443ecea..ba561aecb952 100644
--- a/media-video/recordmydesktop/Manifest
+++ b/media-video/recordmydesktop/Manifest
@@ -2,5 +2,5 @@ AUX 0.3.8.1-fix-libjack-check.patch 518 BLAKE2B b4486cf048577f7d8f527b977d3cd981
 AUX 0.3.8.1-fix_new_theora.patch 2212 BLAKE2B 260643c7092e44fd040ee3f248f97969e4fc5be2d2b12946ab57b6412cded727676fd8426caacd0ad3e98b456f51a7173a66ebc9f8a95abce802ca65039199e9 SHA512 f504d9c889344be7f44a06b6125acf73fc32573256356afd99093af92ee3268267616b5956c0ada7a8484dcfb9f482ffa9c6c6d6f54b4080bc17a12cd2f21761
 DIST recordmydesktop-0.3.8.1.tar.gz 198732 BLAKE2B d28b8d61e340f100ea0954fef2861c4dd8ec2cdaef5a70b18d727d652579c85b901d35a056af7a81e49c98a602a9fb75ce0b5a302aab53ab735577b0159b95fa SHA512 a32df1257d7d8928123437b38abcbdf623a9a65d313df5bec9bc06ef7229ebe4664a3cbea1fe5f6f1f9b89efb939873adc020f4ac072477f6df9481a37e7c350
 EBUILD recordmydesktop-0.3.8.1-r4.ebuild 1214 BLAKE2B a87fd37e4ec96284509d3955762a59d1eb9aa664c43d0c767b8bd0e344a883d0facd973f800598b3a1861348efe90de80d62997fc3048be54174304123bfd68d SHA512 150babc27790593a51ce03bd446afacfcd9e872449294c85f4d2178edd448f416ebf2b642cf9953300e4fb5ae896d86b8691b74868e9593d1101ecdbea44421d
-EBUILD recordmydesktop-0.3.8.1-r5.ebuild 1205 BLAKE2B 9878d6359d9fb20e38ed71d7e78781c96e8802875c95e6b3ca1e086e6a657eb528e927aad015222d00ef1561891c0cf4595c43e2e2b36ac863510057f450aede SHA512 56f9a24d29d57e6401b02a83de0e356e061d9ec39825f28fcd87b2c7eadadb817b6512b13288c61584c6558b0bb01b1e3740f91db959c39fa5f6893e82eb0950
+EBUILD recordmydesktop-0.3.8.1-r5.ebuild 1204 BLAKE2B 0cb48f0de4f55ea85243ec283b3106890e09151306950ac1c38762bd741d74f6add3f91cdf79d6a77e165901f7f43207f0d6b189c0891009320dd4b2ea24c036 SHA512 ba18156c2bd8478278eee9e192345115ce6b5966713b67b7e84068fd4b7af38451b42fd8eb305a6f0ec292cee13c4eba7845bbf732b6e33f51beeb533aac6415
 MISC metadata.xml 316 BLAKE2B 1742ad6dfbf9b34550898774321b339ebe6e6b5205650a9cf5f9ffb73b0e37ddccec560ccfc3657c8b21fd539367c3a14b7d6ecac87037a600290a16900f8856 SHA512 b2b2172a9a6fe5c1b1677138e045a24ec1922838e0ed7c2a958b41b73864c8a35f4dc6717468f0d2231763521b9b067d5123c930ec48c51789a7ea962629e1a8
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
index 31fc84d1a5a8..4dedc005322c 100644
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE="alsa jack"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/subcheck/Manifest b/media-video/subcheck/Manifest
index c8211c96c127..41d26dfbf037 100644
--- a/media-video/subcheck/Manifest
+++ b/media-video/subcheck/Manifest
@@ -1,3 +1,3 @@
 DIST subcheck-0.78.2.tar.gz 9542 BLAKE2B 7bc85f4b94fa8565178edb6cef302a4a518a5c7a90228e25ccbe2f820a510a0bc124c6e04dd942db3b9128a6683963adfadd35153e5010805879a622f3e3c586 SHA512 1cee792b22870d6e881549c5a6e758c8926cd243d56d4a637371419662670e566f909602eeef6c4427e19666052f332cd8333db81b1cce20eeb168d69c201684
-EBUILD subcheck-0.78.2.ebuild 653 BLAKE2B 6508a375e8809710cf8237ea87c2f04d824404b5891366e6c1fc3f4eb87a9d1cd25276f87a2e359c022d1032506827d5a0138a08410c26772a0cfea444f775d0 SHA512 ab7e818a8adc6180ee7f20d5e6ff0f0b28189edac31bda14ea04c8cbb8906cf72a221a63007f7b8b773990cf22d42855cba716d1c7b799c1a64a5b2b4ac0af50
+EBUILD subcheck-0.78.2-r1.ebuild 657 BLAKE2B 7ee011dfe72b9d4a7d174aafc38e72bc105e4dd2089541389ad3f75ea090c16ca89ad03c4e9be1023fde9369243ffa584b787e7f0f639a054f733f92e291da48 SHA512 85083fb2ce06d78956b693dd03f9c624843dbb695f141bb35c4a44bafe03a281b499ede6aeed0e6ca9b7aeee80111ef6da38b546fa9ebf91dccecc02c03649b6
 MISC metadata.xml 678 BLAKE2B 02aecde3f41e50f1b2b1d3fc2abed2d8d9064d3cf690caa4726030e42e8b19b880f2f446cb95e97488c536fa01848b4fec64c6d7226a74e17d397812ded5e9a7 SHA512 7d49cbdc873e3431915aa9fac1b66a11e97415686ef663ba9eb493d402d866507d2c53ceef12ac38f21ed7fc7e668b183465dd10ba36025ba9c581fdf0e81205
diff --git a/media-video/subcheck/subcheck-0.78.2.ebuild b/media-video/subcheck/subcheck-0.78.2-r1.ebuild
index 50a06a20ebdd..58a9591990ff 100644
--- a/media-video/subcheck/subcheck-0.78.2.ebuild
+++ b/media-video/subcheck/subcheck-0.78.2-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Subcheck checks srt subtitle files for errors"
 HOMEPAGE="http://subcheck.sourceforge.net/"
@@ -20,15 +18,13 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	sed -i -e "s:${PN}.pl:${PN}:g" all-checksub
-}
-
-src_compile() {
-	:  # nothing to do
+	default
+	sed -i -e "s:${PN}.pl:${PN}:g" all-checksub || die "sed failed"
 }
 
 src_install() {
-	doman man/subcheck.8.gz
+	gunzip man/subcheck.8.gz || die
+	doman man/subcheck.8
 	newbin subcheck.pl subcheck
 	dobin all-checksub
 	dodoc Changes
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index f094c32617ce..2facaaa587f6 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,8 +1,6 @@
 AUX subliminal-2.0.5-add-missing-comma.patch 1196 BLAKE2B 1042b22bf4c6f488ada97c628d98c79e6733816ffe094af9ae45be632edfd0547086911fd3e2154cc13c5ca609bb436a3d73f6825bd8242074be323cee969192 SHA512 82cabee6a7bdc701f73e7115edc975fbde8f0008dff2e4dcf7fcb27b9203dc9efd42b54aa31a632501e3e3ed405638fcb3fb273eff4bf19cbc8085d710d3763b
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
-DIST subliminal-2.0.5-r1.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
 DIST subliminal-2.0.5-r2.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
-EBUILD subliminal-2.0.5-r1.ebuild 2390 BLAKE2B 2bf409c62bd16060d4f300f3b39f4e1ae764487589ae9393966134674efe22ca1a97512167d314c115caf073e03eb84be4c7c5568ec10d017d700762d75823dd SHA512 1791ffa5c66ccda423407d32d827c8b192bff2096fbe2804f2a3de5f0a3efeebc36983011473adca8e3895377ddf0d6058c5160bd2686861607ab3cddb06e182
 EBUILD subliminal-2.0.5-r2.ebuild 2394 BLAKE2B 399c363ccad16d620946ac3b7649d4b2eb5091fabedb1f38a5a4050044baf7fe2e3a6fe74d20472bc47c19215b9675189b95b27a4926d07343aeffe29fbd3ba8 SHA512 ce9460a7e9148b80337f6dca0e97ad23fb1a31245b92955ed766f7b51211b62632f42393280fdd8a02ed054937dd89dfa6ea7e2dcafd28d0d961593597f6fc86
 EBUILD subliminal-9999.ebuild 2205 BLAKE2B b855e38c7ccda26de47f0b7b3835b7c2874f80c9bfa3743bad77cdc2e2e508c22f4673da01c4e956ab23b203a8d109f8fa6e8310351758a15b504e6aca66965f SHA512 b40950450ca83282804b66f767a4efd9e86e2580d6b5e057b98d850baa4921a96c7095d8254f0cb12bdb7a16a1329e0dbd1f771e8b4e6e53dd205af8c43ca4a8
 MISC metadata.xml 549 BLAKE2B 296a55c59aad7c1d33e65258eaa0481ed167e1c78fa4fa8273acf83366c7b9365f30136ed7d0ad1b71bbde76aa4d0c5e3da98f375be9ad20b76ee77c835d6947 SHA512 cccd163878caccdee339a2e19f9cd5b0954477e767284c4183f9e589c0b5fe59353dfec14982e6dea83d91fc2f2d66904f8f40a1e69c7abab4a6d6baabfdc0c4
diff --git a/media-video/subliminal/subliminal-2.0.5-r1.ebuild b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
deleted file mode 100644
index d17857af0c50..000000000000
--- a/media-video/subliminal/subliminal-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE='xml(+)'
-COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
-SRC_URI="
-	https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PF}.tar.gz
-	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/click-4.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
-	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
-	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		app-arch/unzip
-		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	)
-"
-
-# Tests don't work in 2.0.5. Recheck in later versions. See Gentoo bug 630114.
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${P}-add-missing-comma.patch" )
-
-S="${WORKDIR}/${PF}"
-
-python_prepare_all() {
-	# Disable code checkers as they require unavailable dependencies.
-	sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
-	sed -i -e "s/'pytest-\(pep8\|flakes\)',//g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	if use test; then
-		mkdir -p tests/data/mkv || die
-		ln -s "${WORKDIR}"/test*.mkv tests/data/mkv/ || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 2663ff794b84..f8a54f1e62ef 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -3,5 +3,10 @@ AUX mongod-wrapper 101 BLAKE2B cc52f011b065322fb7ebec982c5d0b188f4c72859770dec98
 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.9.7.deb 117374890 BLAKE2B b0f274da3052471472cd2405ec0a5d79fd97cbc30f014ede42a004dcffc4d27b9b5ecc36f32b4f60f8c47ba73b85795d2851345f5472b85192cf836bfb929173 SHA512 9a0f48d81f3935baad4004681cabe2ff46f4f86f8770c260c98fbd724de2949427de8ec706d86d612a9ccbcda69ca227aa4a123c3208e0a4ab7c0a51540c06f8
+DIST unifi-video.Ubuntu16.04_amd64.v3.9.8-beta.1.deb 117380976 BLAKE2B 7fea704c3b780d51c3d0fc1de24b74654ba438b5223b368bbd6b42110b98fb22f0aa29816b6acec9961a9fa4f6dbace54361c64c4c12ae6a39b855c9e91702a1 SHA512 a4782c3b5319d7bc54d5df3dc64fdfec86e729636cc2e5479d7ca3a8f5112c57c83c0ac421be3cc0ce88975d6f47dd7bb57743d6802164531fdafed2bbe484bb
+DIST unifi-video.Ubuntu16.04_amd64.v3.9.8-beta.2.deb 117447150 BLAKE2B f42a916e6ce78d02306559f9bb5c09e2a065facbe3abe3055a921b0a11dd7826f36c119eebda3495c8410560b6d5134e8cbbfb5c5a019e575e6fc4cc803e76b2 SHA512 0d9fc72a45fb0e87c7fc98c389c02336d12263d69ce96f17e255e354781ba84882f1f9cf4a4baa14e2638646491273407ccce93e020e75e3703405b48a2a13dc
+EBUILD unifi-video-3.9.7-r1.ebuild 1973 BLAKE2B b0a4ae35006ae86c461115a72d60ed9d543a37a4770d20b3db37adccf89129d3f05583200ee4acfd7b3fc3f2797461cb22c4297b979d7010eb8631fbd0aaebed SHA512 8b8f5b6c763bb8dc0c9140ec21051befc7bb83aeaa1dffec2fc9c677af1a5e4b5f77b80ede09b74a672c4139cdc309270a71e0d81d3b62ded95a04648af9f792
 EBUILD unifi-video-3.9.7.ebuild 1915 BLAKE2B 8f5b52c6fcee9b79c2d26299df1a8b7e4c8db8b39d75355eb620e8bc96dba886f3a89b57ffbf42fbee444dda8151272fe0c6cfdd85f601bcc7507ae4837fba6e SHA512 1f55c2c3722a22fd36593b36460994938db7e1dc5b19f1dfeee6917152527863ee175076556583ab8273eb64e39e7e2c7111e4c88f76e4d654f872368d991d6c
+EBUILD unifi-video-3.9.8_beta1.ebuild 1967 BLAKE2B 05de10417fa46867fb208af436bcbf02850cdf1205386e4c6b99a9fdd6393a5fa0ea09a0d8302defc1a280f4f9752c913166e5fe597ef9b8aa1f3719501e9c25 SHA512 da14718873a2fe7f394b5ecf7e323ad39296096d62fd14f957ec28bcec342187d14839dabb54ece452256b3a15b84ed6772156091f61f02a0cd80f3f286a6236
+EBUILD unifi-video-3.9.8_beta2.ebuild 1965 BLAKE2B fd3816a5bf3486934b551687c239d66e4c04991beb55abeafcf0363bd67d28e268e3d0766abc1af27e84f21f9605765b83cdc9271e5ccd44e4e69d1768a5369d SHA512 f26634247a323888d59c97cec4c32c4afe2714d485423a0032c39af8556cff9e1a417e69be8e4b1b49c389bdb5f5aafecfc6e5e0c89887137beb8b13a4cdfece
 MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
diff --git a/media-video/unifi-video/unifi-video-3.9.7-r1.ebuild b/media-video/unifi-video/unifi-video-3.9.7-r1.ebuild
new file mode 100644
index 000000000000..c186c92adeeb
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.9.7-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="/usr/lib*/${PN}/lib/*.so /usr/lib*/${PN}/bin/*"
+
+pkg_setup() {
+	enewuser ${PN}
+	enewgroup ${PN}
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	static_dir="/usr/$(get_libdir)/${PN}"
+	#install static data
+	insinto ${static_dir}
+	doins -r usr/lib/${PN}/*
+	fperms -R +x ${static_dir}/bin
+	fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/
+
+	#wrapper to work around mongodb-3.6 compat issue
+	exeinto ${static_dir}/bin/
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	#prepare runtime-data dirs which live in /var but are symlinked from static
+	#data dir, and are writable by non-root user
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	dosym ../../../var/log/${PN} ${static_dir}/logs
+
+	dodir /var/lib/${PN}/work
+	fowners ${PN}:${PN} /var/lib/${PN}/work
+	dosym ../../../var/lib/${PN}/work ${static_dir}/work
+
+	keepdir /var/lib/${PN}/data
+	fowners ${PN}:${PN} /var/lib/${PN}/data
+	dosym ../../../var/lib/${PN}/data ${static_dir}/data
+
+	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	into /usr
+	dosbin usr/sbin/${PN}
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/media-video/unifi-video/unifi-video-3.9.8_beta1.ebuild b/media-video/unifi-video/unifi-video-3.9.8_beta1.ebuild
new file mode 100644
index 000000000000..3b4c14cd3ad4
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.9.8_beta1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="/usr/lib*/${PN}/lib/*.so /usr/lib*/${PN}/bin/*"
+
+pkg_setup() {
+	enewuser ${PN}
+	enewgroup ${PN}
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	static_dir="/usr/$(get_libdir)/${PN}"
+	#install static data
+	insinto ${static_dir}
+	doins -r usr/lib/${PN}/*
+	fperms -R +x ${static_dir}/bin
+	fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/
+
+	#wrapper to work around mongodb-3.6 compat issue
+	exeinto ${static_dir}/bin/
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	#prepare runtime-data dirs which live in /var but are symlinked from static
+	#data dir, and are writable by non-root user
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	dosym ../../../var/log/${PN} ${static_dir}/logs
+
+	dodir /var/lib/${PN}/work
+	fowners ${PN}:${PN} /var/lib/${PN}/work
+	dosym ../../../var/lib/${PN}/work ${static_dir}/work
+
+	keepdir /var/lib/${PN}/data
+	fowners ${PN}:${PN} /var/lib/${PN}/data
+	dosym ../../../var/lib/${PN}/data ${static_dir}/data
+
+	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	into /usr
+	dosbin usr/sbin/${PN}
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/media-video/unifi-video/unifi-video-3.9.8_beta2.ebuild b/media-video/unifi-video/unifi-video-3.9.8_beta2.ebuild
new file mode 100644
index 000000000000..23414586dcf0
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.9.8_beta2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+pkg_setup() {
+	enewuser ${PN}
+	enewgroup ${PN}
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	static_dir="/usr/$(get_libdir)/${PN}"
+	#install static data
+	insinto ${static_dir}
+	doins -r usr/lib/${PN}/*
+	fperms -R +x ${static_dir}/bin
+	fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/
+
+	#wrapper to work around mongodb-3.6 compat issue
+	exeinto ${static_dir}/bin/
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	#prepare runtime-data dirs which live in /var but are symlinked from static
+	#data dir, and are writable by non-root user
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	dosym ../../../var/log/${PN} ${static_dir}/logs
+
+	dodir /var/lib/${PN}/work
+	fowners ${PN}:${PN} /var/lib/${PN}/work
+	dosym ../../../var/lib/${PN}/work ${static_dir}/work
+
+	keepdir /var/lib/${PN}/data
+	fowners ${PN}:${PN} /var/lib/${PN}/data
+	dosym ../../../var/lib/${PN}/data ${static_dir}/data
+
+	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	into /usr
+	dosbin usr/sbin/${PN}
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0b6c2d0fb57d..a5485f450dfa 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -16,7 +16,7 @@ AUX vlc-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa9464
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
 EBUILD vlc-2.2.8-r1.ebuild 14828 BLAKE2B b3f586131caf059eb621eb3d8b5a4acef12ea8e5a55aa5445b372777e9c67c5444e2c5ff0a2045d3a7c151b7453a10dfe6f55121b4afc7bbf2adcb065f94fa85 SHA512 de4c8f6b34dd6be0d7657c69fd926ba88e2d49fe2185d368693532c73d9ae497326742dc8608beca7f970c55a49e7471fb165a969b813cd2ac4b51afdcd4576d
-EBUILD vlc-3.0.3-r1.ebuild 13311 BLAKE2B c491f0e6e2420ec7a38b54381c7aa1d47fa6363bd64dd9b09ceefc6c25af00e97ea98ce29db28a104ccdb203b2353a9d6978249f4a1f96feb87237b5770d9754 SHA512 57eaee066838353db635819b76fdbe6ec191b728ad5540e4b72668184551b9c866cd000a0c939cba96d1ea160ca11bf171c46f6b904f332eac9e93b71e71fb14
+EBUILD vlc-3.0.3-r1.ebuild 13310 BLAKE2B d82054e40b55266e527b109ab3ffe712099a78ab65ac045b6903fa1b459428114e01a950981c69ecf5f697a329228c492bbdea6b96c3e5682de9bcd0427cef29 SHA512 f7f6d5c06e6c2b6205d067038788168b3c74e7fd3ad70a5dfba35d1dc71e22a1b4677435f7bf06533af07cd8cfdca94d5cbb9ab9477cfd30cbf060f6f8aac1be
 EBUILD vlc-3.0.9999.ebuild 13258 BLAKE2B a854c15e9d55053045a0579adb86b09e2e9666d90418c3e8de2bf93d005fba065b65896ff9a7ed5b5db5b1a2400a82ab62809a7eb99b07047daa9939dedc729d SHA512 86781b905ced59d14c9d6955d57ed4f9e076f2d2f5ca95d13cfd1171c285ef6cd7d1bbee11ea427bfd4250db3511fdfdb9782f1a7e6e78aa5e6163c428d3aa97
 EBUILD vlc-9999.ebuild 13182 BLAKE2B 7fe08b02b5cc03fa81a439c36a23725052047704bdf9d7cf38c05467108a5a539d3b87af99beb795094a2581558b20be8a281c3417ea717b4d6b420d28017c15 SHA512 9e7b21a95098c4a853efff043f3f00474b0a3e14c1ef17cac0ce579555bc5de4562561a5a0bbba3024030607b8fd94549ac917d684f4853e157a4961a478dcda
 MISC metadata.xml 6544 BLAKE2B 206a3f6f2f0f7b081db92625b722460814fb2ac71a579c3e32cffbbe2cdb4a49c89b25eb151052999ba9c56c82b0cf61da6c2e05eb01518e0d97a5371e14e29e SHA512 b9bc5b98d1ea0ee567d7b552afe9af9110ab8cacb5194cfa90800ae9fb021200eb3e983f45459649029e852584dee20c8ec844c1f158e514005b99d3d9f965e7
diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild
index a93e6174bb38..3a76f2f5cf9d 100644
--- a/media-video/vlc/vlc-3.0.3-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.3-r1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
commit	e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree	9cb29a544215119b5c5538e37211b994ce1c87ae /media-video
parent	480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)