gentoo resync : 06.05.2018

23 files changed, 226 insertions, 304 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 9050539f0832..0f9e4bd811fb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aacskeys/Manifest b/media-video/aacskeys/Manifest
deleted file mode 100644
index 732f658f7bb3..000000000000
--- a/media-video/aacskeys/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX aacskeys-0.4.0c-aacskeys-makefile.patch 1502 BLAKE2B 488418a0c887802d5ad05c10fc99c0c5362892f8ec0cfee40c8f9896d3161bfedc7ca8f65126509824ccf1999da6dc43becc05032c4de0c5538ea2f5ad28c636 SHA512 51cb650966da58dceccc9baf1f339bb4e92003b08537ca74c037aa70038a211fc0c3f91706d731de8c280f22c1c1aba472e7f023552bc85883a1d080e0dc1704
-AUX aacskeys-0.4.0c-libaacskeys-makefile.patch 2486 BLAKE2B 4eb0c861f7815d8d5d9c7cb63bb6a463fdf1be4de3cbd9f66c1d362f2cecc3c12e937dea36929c5eb29956f06470c63502f25f98c0f1da915ccd78808397fdd5 SHA512 f1ec7136c42162d9f981d80e918f63e729728d22d8c460d740004dcf8a9b3e7427b5ad33f40c5bdb88f872a2fad4d13651f069e43cae1464b961fa2503597b21
-DIST aacskeys-0.4.0c.tar.gz 4118637 BLAKE2B ad6b3b8aff0bc872463ba67ec2c097ff2b743ce2582bed0e1f910b101a1486b2fd2792a090a61786fa68b24e17ecc6ed4b996ffa2b3783139c5df0a26de697a4 SHA512 34c434fd1b118fb301b8af9c20762075bab213b39584e8e33c6b685c7504e4863f78ee2754d131e760c535dd24b29826dc6756833b5deaaa5c4b70ab8f9a6ba8
-DIST aacskeys-0.4.0e.tar.gz 4117374 BLAKE2B b7a5d829a29d652d44a0728d5456f6fdc83d71483504b1cbb2cd547eae12db71f10682b2874b1d6f17a21c5c1f1255e5aff230de02a0d54265ff6ae1abee0f2e SHA512 86435bd4b5ce31cae87390bade631d9dc36814cd5e03fdcaca02eefe3d351432e7ba61f7127f6030b92e929ba3726547d7c04d8558239bd23a32bcb1574b7f6f
-EBUILD aacskeys-0.4.0c-r2.ebuild 809 BLAKE2B 025f3cfdc53bfd31b70429a974a5d6d93add09e1181b06454e849b8b5871d07a11547f094f225511775ef759627abc9d033c076b5b64a7e92b56a4d5e092eee2 SHA512 ce803b7378c1502906466899da0811e5b20ccbca466458255de37b1a8b4e4040b1deec9bc6bf059c31d2bf6b5713bc6f57c2542d652c0117cf4d1cbf62dc4252
-EBUILD aacskeys-0.4.0e-r1.ebuild 864 BLAKE2B db93bc0d2472a416d794f37d42f6ea4b0bb0f94f9a7a5a5d05bb17c4f62b5eac26711a4955167158a8922ad556d78a460c113cb79f13cdd751ec62cdd3e706d8 SHA512 9ccfa5585de8a23f52d2225e87bca7cc1eebc13239e638c5b7ef382de5f7c760e50bc2f0c62da19aaae966e21f42e8fcefc0df52e2c3277812bcacf99aa8caac
-MISC metadata.xml 380 BLAKE2B 30bc7feeec2e8f2c718f46984ae0325c21d1a15390b1c64268e44e198f31e22bd53d09d0d48a0dcbb8fe08e53a5a17c1a0362f71d3ccc347da4b874d43d039fa SHA512 7160dff7516eb6b883400830f1a9d55f08552f911a4433ec1a041ac1dd99d88e41cdb8e2b68aae844aab0f00859e5135f03eeeca0edbdaf979e35a92087a21c8
diff --git a/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild b/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild
deleted file mode 100644
index 7eed7a5ffb04..000000000000
--- a/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2
-
-DESCRIPTION="Decrypt keys from an AACS source (HD DVD / Blu-Ray)"
-HOMEPAGE="http://forum.doom9.org/showthread.php?t=123311"
-SRC_URI="http://bluray.beandog.org/aacskeys/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl[-bindist]"
-DEPEND=">=virtual/jdk-1.6
-	${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-aacskeys-makefile.patch"
-	epatch "${FILESDIR}/${P}-libaacskeys-makefile.patch"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin bin/linux/aacskeys || die
-	dolib lib/linux/libaacskeys.so || die
-	dodoc HostKeyCertificate.txt ProcessingDeviceKeysSimple.txt \
-		README.txt || die
-}
diff --git a/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild b/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
deleted file mode 100644
index a9a91825c350..000000000000
--- a/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2
-
-DESCRIPTION="Decrypt keys from an AACS source (HD DVD / Blu-Ray)"
-HOMEPAGE="http://forum.doom9.org/showthread.php?t=123311"
-SRC_URI="http://bluray.beandog.org/aacskeys/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0=[-bindist]"
-DEPEND=">=virtual/jdk-1.6
-	${RDEPEND}"
-
-DOCS=(
-	HostKeyCertificate.txt
-	ProcessingDeviceKeysSimple.txt
-	README.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0c-aacskeys-makefile.patch"
-	"${FILESDIR}/${PN}-0.4.0c-libaacskeys-makefile.patch"
-)
-
-# overriding src_* functions from java-pkg-2 eclass.
-src_prepare() {
-	default
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	dobin bin/linux/aacskeys
-	dolib lib/linux/libaacskeys.so
-	einstalldocs
-}
diff --git a/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
deleted file mode 100644
index 272dcc010819..000000000000
--- a/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/aacskeys.make
-+++ b/aacskeys.make
-@@ -13,12 +13,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/Release
-   OUTDIR := bin/linux
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -I "/usr/local/ssl/include"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Wall -fomit-frame-pointer -O3 -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -I "/usr/ssl/include"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -s -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -I "/usr/local/ssl/include"
-+  RESFLAGS := -D "_REENTRANT" -I "/usr/ssl/include"
-   TARGET := aacskeys
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
-@@ -28,12 +28,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/Debug
-   OUTDIR := bin/linux/debug
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "DEBUG" -I "/usr/local/ssl/include"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -Wall -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "DEBUG" -I "/usr/ssl/include"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g
-   CXXFLAGS := $(CFLAGS)
-   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/local/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "DEBUG" -I "/usr/local/ssl/include"
-+  RESFLAGS := -D "_REENTRANT" -D "DEBUG" -I "/usr/ssl/include"
-   TARGET := aacskeys
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
diff --git a/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
deleted file mode 100644
index 2d5e6cc2431a..000000000000
--- a/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/libaacskeys.make
-+++ b/libaacskeys.make
-@@ -13,12 +13,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/ReleaseLib
-   OUTDIR := lib/linux
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Wall -fomit-frame-pointer -O3 -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-   TARGET := libaacskeys.so
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
-@@ -28,12 +28,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/DebugLib
-   OUTDIR := lib/linux/debug
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g -Wall -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-   TARGET := libaacskeys.so
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
diff --git a/media-video/aacskeys/metadata.xml b/media-video/aacskeys/metadata.xml
deleted file mode 100644
index 531e97b976d1..000000000000
--- a/media-video/aacskeys/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">aacskeys is a program to decrypt all required keys from an AACS protected HD-DVD / Blu-Ray to decrypt it.</longdescription>
-</pkgmetadata>
diff --git a/media-video/bdsup2sub++/Manifest b/media-video/bdsup2sub++/Manifest
deleted file mode 100644
index f8438bf48677..000000000000
--- a/media-video/bdsup2sub++/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bdsup2sub++-1.0.2-hidden-config.patch 1761 BLAKE2B 523f827ea794ffc38ecf09ff08e6bdc26acee3e2e0ded6835ca78b36fdbe188ceab2d7e5f41af73f42153dfcba31a423e376571f2d9496e78fe8dc93878ee9c9 SHA512 851759e87387f3bb4536f7cfc79db1ca3ec095448d4ba29bc9258288d8e2d010689dd64c423e4d300796b2f601eb820a58c3ef4339d5cbcfafb9adac9345a7d8
-DIST bdsup2sub++-1.0.2.tar.gz 301413 BLAKE2B b5651623f4a49378e4069a868410cd0a5ca7acc772cc1b30f788cc8ee355b570e7b2aea131867974530b4a0986f7cb9faffdd2fd86581cf5f730d6f7016b916e SHA512 181cd241588d0fe9217b4534c377af745ff04bcf1af5fbff44c821ec8e45063bb5df0bef0b5d8ba6a9f24740387959487c6e2d3964bfefd935a098ad525b8102
-EBUILD bdsup2sub++-1.0.2.ebuild 637 BLAKE2B 1f3f7d41cd461161e8f0361acb22c92d1892dee058b342e91e30467ce007ca010154d5add41caf00a5044994178fcd537cc970a67cfdfad62fe0042ec97afba8 SHA512 7164a28718280e5df09417088ecbcaf7dc44f593129fc4760f518638df8230e74ae0082be512511cfeb29950b6d950d13c60a002b1413365d9a41f6cb78c7f48
-MISC metadata.xml 838 BLAKE2B 038fdad805f1b92f9337dc4c67456219812e23ab814dc664b90638831a3f5bfa49def12f425a161e11b88c4007911247f5f59e1d1e023734c8be771d2402b11b SHA512 815da95f92b4ad0b2e2e4c9c04b92d51613f5e08f7722af7d597c1d350adca7a02bf8e231917c3f17e95bf7bc484f44ccf39cf73650973c4833d44a60894d766
diff --git a/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild b/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild
deleted file mode 100644
index aa0b4c64034f..000000000000
--- a/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_PN="BDSup2SubPlusPlus"
-DESCRIPTION="C++ port of BDSup2Sub"
-HOMEPAGE="https://github.com/amichaelt/BDSup2SubPlusPlus"
-SRC_URI="https://github.com/amichaelt/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/libqxt
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-PATCHES=( "${FILESDIR}/${P}-hidden-config.patch" )
-
-src_configure() {
-	eqmake4 ${PN}.pro
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch b/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch
deleted file mode 100644
index cf75cc35ca41..000000000000
--- a/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2e27e6a49cc0be24b9a8efbf6a2ab2ec84fd1f92 Mon Sep 17 00:00:00 2001
-From: darealshinji <djcj@gmx.de>
-Date: Thu, 23 Oct 2014 18:20:38 +0200
-Subject: [PATCH] save ini file in hidden directory on Unix systems
-
----
- src/bdsup2sub.cpp | 6 ++++--
- src/types.h       | 8 ++++++--
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/bdsup2sub.cpp b/bdsup2sub.cpp
-index 823e365..a9ccc15 100644
---- a/bdsup2sub.cpp
-+++ b/bdsup2sub.cpp
-@@ -386,15 +386,17 @@ void BDSup2Sub::init()
- 

- void BDSup2Sub::loadSettings()

- {

--    QString iniPath;

-+    QString iniPath, configPath;

- #ifdef Q_OS_WIN

-     iniPath = QString(getenv("APPDATA"));

-+    configPath = QString("bdsup2sub++");

- #endif

- #ifndef Q_OS_WIN

-     iniPath = QString(getenv("HOME"));

-+    configPath = QString(".config/bdsup2sub++");

- #endif

-     QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, iniPath);

--    settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "bdsup2sub++", "bdsup2sub++");

-+    settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, configPath, iniName);

- 

-     if (!fromCLI)

-     {

-diff --git a/types.h b/types.h
-index d760eca..784a81b 100644
---- a/types.h
-+++ b/types.h
-@@ -28,8 +28,12 @@
- const QString progName = "BDSup2Sub++";

- const QString progNameVer = progName + " 1.0.2";

- const QString authorDate = "0xdeadbeef, mjuhasz, Adam T.";

--const QString oldIniName = "bdsup2sub.ini";

--const QString iniName = "bdsup2sub++.ini";

-+#ifdef Q_OS_WIN

-+    const QString iniName = "bdsup2sub++";

-+#endif

-+#ifndef Q_OS_WIN

-+    const QString iniName = "config";

-+#endif

- 

- const QStringList scalingFilters = {

-     "Bilinear", "Triangle", "Bicubic", "Bell", "B-Spline", "Hermite", "Lanczos3", "Mitchell"

diff --git a/media-video/bdsup2sub++/metadata.xml b/media-video/bdsup2sub++/metadata.xml
deleted file mode 100644
index 83f720c7ec2f..000000000000
--- a/media-video/bdsup2sub++/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sautier.louis@gmail.com</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">amichaelt/BDSup2SubPlusPlus</remote-id>
-		<bugs-to>https://github.com/amichaelt/BDSup2SubPlusPlus/issues</bugs-to>
-	</upstream>
-	<longdescription lang="en">
-		BDSup2Sub++ (c) 2012 is a port of the original BDSup2Sub (c) 2009 by 0xdeadbeef and incorporating enhancements from Miklos Juhasz. It is a subtitle conversion tool for image based stream formats with scaling capabilities and some other nice features.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index e152b4dba0ef..608c16036595 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -8,6 +8,6 @@ DIST handbrake-1.0.7.tar.bz2 12650549 BLAKE2B 54fa6f4ee053de3ce1840695e66b0fef5a
 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
-EBUILD handbrake-1.1.0.ebuild 3597 BLAKE2B bcaa5f077f58ed23a8cd32a869c9eab0e0411a743794363322065e7fd8e048e3a7a46824ef8ab7e077b2b4fc4778c46ea73f3a7796625e593e54629fcbc756f8 SHA512 bfd15f0a8691d9b33089353dd8f500b8ad2155ef3d423d96247f20e1da2fdf8c908c37b75eb7ebfca1f9a0ab52255840902489d86b802cf3e7f073544e93771b
-EBUILD handbrake-9999.ebuild 3524 BLAKE2B 26efd30bd6f2e359fb5059aa2713645b7b7a3a1ae929b5492fb4589d2b76f454653994d88d8bbb875212080cc75933bf1cb8a90b1443022de0e7e2a7c0476786 SHA512 b519a8842dbd5a1420e1b3bd4256b2edbf5b1163c0a2eac90a6386798d86af63cdf18aa519f4244b51042a38a14a10cfae6fbf3211dbd9e1c981f730011dfb99
+EBUILD handbrake-1.1.0-r1.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-1.1.0.ebuild b/media-video/handbrake/handbrake-1.1.0-r1.ebuild
index e5423a884920..cd52cd8ded29 100644
--- a/media-video/handbrake/handbrake-1.1.0.ebuild
+++ b/media-video/handbrake/handbrake-1.1.0-r1.ebuild
@@ -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
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 0ce63641f6e7..2ba4dd148d21 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.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.3: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/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 4a880d2ec7a4..f1366a1f4452 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,5 @@
 DIST kaffeine-2.0.14.tar.xz 5972768 BLAKE2B b1c8f7338474804ce0003126a0e041a6aefb3d4b6b48c4c45577138f0686100b08c1f64adfd23658a0f04f8638d38df81c9f186d6fab60d607550e238d14a2a0 SHA512 03a4ffbfbe7b9c90de546bf7449e8e5f05d5e7023b75b5253297e885c412677a0c4b46c7f60761ef5f48ad3c284591acba6ff0fe4fa7256d5b01ca9a07d7276f
+DIST kaffeine-2.0.15.tar.xz 5988584 BLAKE2B a9361b321a0af13013596c2d06e53053a889a0697fcf5c644195d6bd7e43fb3c108d2c03cf3250c6cb8b14383e10735e883e5ebb17be1b5f9fe5ca81f012dd28 SHA512 d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d
 EBUILD kaffeine-2.0.14.ebuild 1455 BLAKE2B 82497d168fc1ecdab6cb5c5180eef9423fed401defd6f510dc02a0c8b84b8671af8f3eca703168a17ee43354f5911455a2716557c193a86c313c9ea678d25d9b SHA512 66043b4298b5bdf30ee7b6a0774899dadbbc4f852a2223ebbd03df804b1b1265521d69b5fc4155a28cb29549243c56026784bcfd705609fe084e3d6d49c1029d
+EBUILD kaffeine-2.0.15.ebuild 1341 BLAKE2B 63506afdc75b52956e64f86daa2c5b84a989046501c60f6be195252979f7f7a1a23345c3a9d323113f6fba40612a1dcf7e64cabac2649e8d4b0a3b7213d3ef2c SHA512 1eed00974ea2180b0569df76c9fc9c4b1ca7e0cd4f183b6d8d81d965434ee9d22f3a2b866f3463c64196afa8a2361cefb142d1ec163b3a77023ba609f820dd86
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.15.ebuild b/media-video/kaffeine/kaffeine-2.0.15.ebuild
new file mode 100644
index 000000000000..7ae8acd549b2
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.15.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://kaffeine.kde.org/"
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+IUSE="dvb"
+
+CDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+	dvb? ( media-libs/libv4l )
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	!media-video/kaffeine:4
+"
+
+DOCS=( Changelog NOTES README.md )
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		$(cmake-utils_use_find_package dvb Libdvbv5)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index deb11d5cfcc8..f08b5bce890b 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,3 +1,4 @@
+AUX 4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch 1768 BLAKE2B d2ec71166a4c3779007aabd975e3bd003b17713ff1bcd3c94e57183936c5f6fc24abd6ed5231dca94d1d37f66db7a13358c5dc52795200d190d848f0360ec1e6 SHA512 bee1af2f32215b2abc006b9f12c77e138dbe9bb2de41ae9f1022b6c10340cb8e2eb2831459b241c44e3a0789a9df81b7227dfc07beb3e7e3af6f718fb4a4c56d
 AUX motion.conf 37 BLAKE2B 0a30bc830b519022f8c3bfdedb274329ecb506f3b3e42fb3de1f61513b9ef86c7884a9298c17b19b4afbb83b33ceb4f35f85fd377775e2485bbbfa2feb76833e SHA512 06e2dd29b946f35c78e7cf0ddeca727ca7f3f84e57e38b6688b2a493d487061ea6c959c5b365305a7813e0d3315f719003c681c26265566f46faa6ff88606853
 AUX motion.confd 99 BLAKE2B d4548644a683d76d4d359b74a1a78ffe56a6575fa6cb0b902899f5576fa63d22aa2845a8ffef832714f066239d15aa736fb5af944eea46d388c8e27e949f3fc5 SHA512 b0135b220ac2f1857012455726fb5c5aaa73a79f864619cb7fbfbb1e8aaf95b0c4dd51bbc30f29714cc29a271f9196f3d92e160fa75a90ccbcf0024640620d5d
 AUX motion.confd-r1 272 BLAKE2B bb395beafecf0498158ff0358b489ab251d79e005148715ef89ea882dec945f82faec60c2650e703d4db82e0bef3ccc8abd9768adf23dc8df5161f7fd8f24714 SHA512 8a67b5b0360924e58ba3136a737ce73bb43201a49b2b6e2c632426561b830f6ab55cbbeaa89be7f1683aa8fd322b4f31b9f560e67a93eaceb964c9f56ceef363
@@ -8,5 +9,6 @@ DIST motion-release-4.1.1.tar.gz 447795 BLAKE2B 8c7dfdad89f49ba8ec39689d268b4bc9
 DIST release-4.0.1.tar.gz 444779 BLAKE2B e74b193f421e4fe165f36fe251eafe44203bbf8825b0062254bd7e0c9a57b286314c1bbb287c1c768db62649d82b83f4876ef236e446a1f21f7baf90d5ce5b4d SHA512 6ccde3890e6af56f28208321987dd1b9d62a55bbe7cbc3ab5600263602e6e8f47589392c2f3a3a6cb54f927ee76aea94d0e83f26ce8e4047890c891b6c2f8976
 EBUILD motion-4.0.1-r1.ebuild 1979 BLAKE2B 943b6b40dad276dc221c61d7d3de0af85992090437bab65fdf4b58ae4ffa22ac53e5e01498e5cf2fa371c751801ecc64d248a655c7c50550520feddad7c2341d SHA512 336da1d0dc347fa610bd810c309dedf82e66137723decba9edaeb44ae68ad0f490483f722fce267f1de8a70406698f6f5701711ec00b11d25cdba1a2a6cb5d95
 EBUILD motion-4.0.1-r2.ebuild 2011 BLAKE2B 29f89ea29bc4dc39aaa4b5beb5dbd96b9094226892eda76b025c7ddf874894cfb70f6ba50bf3dff6cfbe7088f04f9b0d8239280270e9a8d2eefd9cde5d1c5093 SHA512 6429e44d029443192c347ae8d0f309244cc63cc67ccf46b9f78c678c7621c808d085fca85d0120da71964d323e10d817c835513ef0a1fb5857be4b4aea36a305
+EBUILD motion-4.1.1-r1.ebuild 2206 BLAKE2B 40d1332ae002f75b2aa83edce1070f66159ded78c2d5b5ecfe280947b59fc837bcd5d00b976411c8c884ea1d6b457545ee7519eeed47e2cb73eb5c02d0167d97 SHA512 822db0bc6a312ee8c38605cb66eab4ebfd38ab0eda97ea8e15a1eeb8b4ef12a048280c2c28c31e8aab43393cc97a8cd81c3671d2a18a9ba2a6a5d16b5a60695f
 EBUILD motion-4.1.1.ebuild 2132 BLAKE2B 55a3e637fd7da85402f71a744d05c73cf0a4eb1a1d3a0df6a4bd7d94e6a14e64334e567c912a1d117e8ed3c0cf8fa43ea8040d9911d677b6b99065966a4bd51b SHA512 3882e33512a29332ce013c8a61749dbf986e546ac5c0e4662cabe77a1655ef281ecfa7649504446c52c4edb301524ae5bcd198ab7bf7eb6f781c36fc06aad84d
 MISC metadata.xml 688 BLAKE2B 62d5d1fc2c9581ee8d66557903d17060627060d4cc76d745bee2bbb17980bc81337574986a7bb1b2d6f669041ba09b355fce68655f9961d388f3ae40a65d3fb2 SHA512 f69d8539a16d80a49c147a60f8e831a245814c4853383f9991f4c2762aa2d1b7f22b8993eb7184a49c6c783b75d23ef91a10b6293563aa7e29f561f40fad56d1
diff --git a/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch b/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
new file mode 100644
index 000000000000..641d68a8d0c5
--- /dev/null
+++ b/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
@@ -0,0 +1,54 @@
+From 9a9e918ec819277c6c5c2f21b52dd63570e426a7 Mon Sep 17 00:00:00 2001
+From: James Cowgill <jcowgill@users.noreply.github.com>
+Date: Sun, 25 Feb 2018 20:13:57 +0000
+Subject: [PATCH] Fix build errors with FFmpeg 4.0
+
+---
+ ffmpeg.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/ffmpeg.c b/ffmpeg.c
+index b2780bb..23644db 100644
+--- a/ffmpeg.c
++++ b/ffmpeg.c
+@@ -67,6 +67,19 @@
+ 
+ #endif
+ 
++/*********************************************/
++#if (LIBAVCODEC_VERSION_MAJOR >= 57)
++
++#define MY_CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
++#define MY_CODEC_FLAG_QSCALE        AV_CODEC_FLAG_QSCALE
++
++#else
++
++#define MY_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
++#define MY_CODEC_FLAG_QSCALE        CODEC_FLAG_QSCALE
++
++#endif
++
+ /*********************************************/
+ AVFrame *my_frame_alloc(void){
+     AVFrame *pic;
+@@ -538,7 +551,7 @@ static int ffmpeg_set_quality(struct ffmpeg *ffmpeg){
+         /* The selection of 8000 in the else is a subjective number based upon viewing output files */
+         if (ffmpeg->vbr > 0){
+             ffmpeg->vbr =(int)(((100-ffmpeg->vbr)*(100-ffmpeg->vbr)*(100-ffmpeg->vbr) * 8000) / 1000000) + 1;
+-            ffmpeg->ctx_codec->flags |= CODEC_FLAG_QSCALE;
++            ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_QSCALE;
+             ffmpeg->ctx_codec->global_quality=ffmpeg->vbr;
+         }
+     }
+@@ -663,7 +676,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){
+       ffmpeg->ctx_codec->strict_std_compliance = -2;
+       ffmpeg->ctx_codec->level = 3;
+     }
+-    ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
++    ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_GLOBAL_HEADER;
+ 
+     retcd = ffmpeg_set_quality(ffmpeg);
+     if (retcd < 0){
+-- 
+2.16.2
+
diff --git a/media-video/motion/motion-4.1.1-r1.ebuild b/media-video/motion/motion-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..f4f49ccb2b55
--- /dev/null
+++ b/media-video/motion/motion-4.1.1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools readme.gentoo-r1 systemd user
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="https://motion-project.github.io"
+SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg libav mmal mysql postgres sqlite v4l webp"
+
+RDEPEND="
+	virtual/jpeg:=
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	mmal? ( media-libs/raspberrypi-userland )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="${RDEPEND}
+	v4l? (
+		media-libs/libv4l
+		virtual/os-headers
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}/Fix-build-errors-with-FFmpeg-4.0.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need to setup /etc/motion/motion.conf before running motion for the
+first time. You can use /etc/motion/motion-dist.conf as a template.
+Please note that the 'daemon' and 'process_id_file' settings are
+overridden by the bundled OpenRC init script and systemd unit where
+appropriate.
+
+To install motion as a service, use:
+rc-update add motion default # with OpenRC
+systemctl enable motion.service # with systemd
+"
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+pkg_setup() {
+	enewuser ${PN} -1 -1 -1 video
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with mmal) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3) \
+		$(use_with v4l v4l2) \
+		$(use_with webp) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	keepdir /var/lib/motion
+	fowners motion:video /var/lib/motion
+	fperms 0750 /var/lib/motion
+
+	readme.gentoo_create_doc
+	readme.gentoo_print_elog
+}
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 068a5b594196..f4a38363ba75 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,4 +1,3 @@
-AUX movit-fix-locale.patch 556 BLAKE2B e291bbae87bdc4faa470ed99f98c610ef4d68a88884893629116258f0584d956f6afac00ceb986e27840f5cb422637e6abd7467f838d6ae1467cc758c203e53a SHA512 5a9d94a5b7404fd327412bd8b994710158e1d81fcbfda39b372dc2d89d592b87e3f067970dc73c68c7c335f8cd2adddb5a108068f13c506e850e4fac69bab819
 DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc5cbac3d72e4a88f33cbe572b6f61b5323acb7ea6dfc67f92c0ba231bedc5251c276831ea7a9e77ab6d570 SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07
 DIST movit-1.2.0.tar.gz 534145 BLAKE2B 6409bd2d1e85e21dbce00c36152275553594f0c9d809802b5f96e8b7e56c03ccda9588631c156e34da1d54962bbdbbd03d9e78c60062bc01a04896b7fd88410f SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154
 DIST movit-1.6.1.tar.gz 870278 BLAKE2B 736b34cf4d5a9d9b59e56dc994d467ffc33e86c8bd04a8062362e76f4d7a4c973252a65258d6b29753942c0f320e778a4a1ae4484795b3129de779a51770f936 SHA512 36e425cc1bcfce9afd9124c696d95f2f6c74279161c178195d9f4d22a34acb1919aac5f51c29aa13b95d0a7343beacb41b1686fb4ad92acd136c6a25ccb4044d
diff --git a/media-video/movit/files/movit-fix-locale.patch b/media-video/movit/files/movit-fix-locale.patch
deleted file mode 100644
index f98c9705e9f9..000000000000
--- a/media-video/movit/files/movit-fix-locale.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/init.cpp	2016-02-14 19:53:12.141197530 +0100
-+++ b/init.cpp	2016-02-14 19:55:09.374196665 +0100
-@@ -388,7 +388,12 @@
- 	// Now we have something on the form X.YY. We convert it to a float, and hope
- 	// that if it's inexact (e.g. 1.30), atof() will round the same way the
- 	// compiler will.
--	float glsl_version = atof(glsl_version_str);
-+	
-+	std::istringstream locale_convert(glsl_version_str);
-+	locale_convert.imbue(std::locale("C"));
-+	double glsl_version;
-+	locale_convert >> glsl_version;	
-+	
- 	free(glsl_version_str);
- 
- 	return glsl_version;
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index 9d1f5996db58..264fd88be152 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -2,5 +2,5 @@ AUX subliminal-2.0.5-add-missing-comma.patch 1196 BLAKE2B 1042b22bf4c6f488ada97c
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST subliminal-2.0.5-r1.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
 EBUILD subliminal-2.0.5-r1.ebuild 2390 BLAKE2B 2bf409c62bd16060d4f300f3b39f4e1ae764487589ae9393966134674efe22ca1a97512167d314c115caf073e03eb84be4c7c5568ec10d017d700762d75823dd SHA512 1791ffa5c66ccda423407d32d827c8b192bff2096fbe2804f2a3de5f0a3efeebc36983011473adca8e3895377ddf0d6058c5160bd2686861607ab3cddb06e182
-EBUILD subliminal-9999.ebuild 2201 BLAKE2B 81b8221d442dbb4aef44e69d07c519a5a09e4d451ad96ad0dfd11bec6ce1d985ee98276ae8f6bd8621ceeaae6acc0a4f4fc76392b4aadb5b2dd08b401f468667 SHA512 a5badb96a49668df898c0143e4967c04b8411fbb8f5d2c669722351825cb55540ae1919fa666a299f271d57709511eb0cd9904191ca5d7b15a5550cdc9d009da
+EBUILD subliminal-9999.ebuild 2205 BLAKE2B b855e38c7ccda26de47f0b7b3835b7c2874f80c9bfa3743bad77cdc2e2e508c22f4673da01c4e956ab23b203a8d109f8fa6e8310351758a15b504e6aca66965f SHA512 b40950450ca83282804b66f767a4efd9e86e2580d6b5e057b98d850baa4921a96c7095d8254f0cb12bdb7a16a1329e0dbd1f771e8b4e6e53dd205af8c43ca4a8
 MISC metadata.xml 549 BLAKE2B 296a55c59aad7c1d33e65258eaa0481ed167e1c78fa4fa8273acf83366c7b9365f30136ed7d0ad1b71bbde76aa4d0c5e3da98f375be9ad20b76ee77c835d6947 SHA512 cccd163878caccdee339a2e19f9cd5b0954477e767284c4183f9e589c0b5fe59353dfec14982e6dea83d91fc2f2d66904f8f40a1e69c7abab4a6d6baabfdc0c4
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index b79e7028e0d3..31429196ed48 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -1,9 +1,9 @@
-# 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=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1 git-r3