gentoo resync : 29.10.2017

7 files changed, 381 insertions, 51 deletions

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 513ae0a5921e..6f9ff69deddb 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,8 +1,12 @@
 AUX mlt-6.2.0-ruby-link.patch 689 SHA256 1dded16d00052d5d2542175ab1a971b52dff473d319747aa4d97ae668e1cac2c SHA512 54b468fdba4cc9fd92a06e31d7b59e602c4c8541f6d227a56b8a028e7be8f580541838ce5d8e5d9b841a0ff8ab56ab96a40990c9e86e15952da51ae4ce825b15 WHIRLPOOL d19ce04c82a1e6e16308aba22e4180b7655dd9f862bbf8fc33b10f957d8761e0177bb0721183c133116e38aee761a378f3035c23b4bd6c3680992dd6f77b2d90
+AUX mlt-6.4.1-glibc226-1.patch 1224 SHA256 0a3c41b54d660fc174556321e248265a055c6da26a7378566d55d3d5862afaad SHA512 d2113579e75061dbd9f873828ef115a6da3f39300dda9b02573792b1e18b0ef662b4cce58f9d6f7c1fecedbdf7fe8d74deb34cdcb90a9bf64fd1c08a89f15810 WHIRLPOOL e6e5bf4a16ef3b393521df6e1303c26df1ae09ad685ffa253d8003e2589133603bac8db6582b94cb36e00816950c21f320be8a8f98f3474b535bccb9008aaf9b
+AUX mlt-6.4.1-glibc226-2.patch 732 SHA256 fb8a13b16b3d7f9bd51dca6a6d4c56738cf056e37d1e230ff9fadbcf2e64bb10 SHA512 3a696bb3ffbc8940b39fecf3dbee21d938a417fdd28aaf59d17b184a941bf2b45bbfde40f9b84e358517cee5db2da47e19f69488ca518a255267241c8dca7db3 WHIRLPOOL c6759432734694508e843811c9892506d9b1f862b00b99a1720da5d0cc87578426ea7fa9d99fe945537e2085533f411088f3152928b17f5e365a1f9bb4d7ed08
 AUX mlt-6.4.1-libebur128-unbundle.patch 4162 SHA256 4872117b2b43e3bb82f96f9bb531860e71fe3e8e730a4123965506213ae209b9 SHA512 70db75522fce9ba8b296cb86c4574ba499e6274eb1cab3170e0524cba76482af4fde49a2c422215461ceb6f1258c00e535914c90c177b93893c2b330ad0cd08b WHIRLPOOL 62ddb1ee6fccfffa7f8ec275e38b5d9acfae3fb105490b57c6cd6a1bbd52cf244e5ebea20005e1f272adce10185e261aaa7b95683d275b5d5fb1004b5d42cdaa
+AUX mlt-6.4.1-opencv-3.3.patch 1346 SHA256 61d168b826741cda400f67380c5ae9fa6245f3d0527338e1494da4f8ab76a8f1 SHA512 5bab43be1a0e85764a7a80f58a1f211aef737a6ccbe3d9080e12103235891a0418aa8505268a71632b737834c9a5eb379bdefcb24f63862a596860dd118ee622 WHIRLPOOL aadd587d4accd29ccfcecba0fbf3372a1ce4bbcd58dc70410af50db7043bf51cd4b8badd6d4866174a4cd08140f74f65af68889e3fe44071170d5deec926f6a5
 DIST mlt-6.4.1.tar.gz 1344030 SHA256 87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb WHIRLPOOL 5b89a42bd95be98e5461d5dcf2dd0f2fe481b519078c54fc461ff8561a2cc29eb18027061efd6a4d53b2a3c15bf4605add57fdfd98a49226eaf3abc738b73962
 EBUILD mlt-6.4.1-r2.ebuild 5611 SHA256 87e2762bcdf800c70aba822c5296aee427b64548ee31004d9898d301c382d735 SHA512 dc24d3812d5452b056ee7e7192f22712177aec8cdf5470e76314a7335f7a8ba849f5dd629b9d6f5c9f873a4b03181cb00914398406106b1aec682b8e8f0bed20 WHIRLPOOL d0b3531890c74ca1535992ddaaf09dc8edde6a2ebd4771509adeaec1d602160bd62526bcd52a4e51ef8bdf62f4a915cc9d2fe74b13a37032ef02f9d9c158bdd9
-EBUILD mlt-6.4.1-r3.ebuild 5695 SHA256 f5521d1ecb1d037fab839aa453d125487dbe938625c02b8a7be8230f51f78f68 SHA512 f09276d5c07f0e3530c6bb78bf62910eed4160375f790a2576f92714f6925329e88bb85cc4ab97899c2b37d709a9d35ae97f9a1fe9ec864077469623ce91d695 WHIRLPOOL e94808ed34d5f497b0ce887a1d096ba2b56770688c2d8c51efa19d13ecf2c2aa388dbbbe774233e0994977da4ca7ee0796664cae27fd763384794dde0d669abd
+EBUILD mlt-6.4.1-r3.ebuild 5740 SHA256 5fb64cd944e2766e6c25e40c116b9f9ae3866e8511a1ac0965cbf6228197f478 SHA512 bd60ee226c895d492215aae324c03a971af16c8e81b90c6a67c6ade0e39437d0e506407a69616bcf48ac15e1c63d9f31c1fa31f61f8fb952f8eb306ce583adaf WHIRLPOOL 3e4525d34ffefbe93e5eed0a98d4f1ea9003d1df1ffd5dd2a166b51d44bb4c0b87c251f4c9951fa60e420d21a4a1ef79cb68c456fe5d9917a5bf776bdaa00cf1
+EBUILD mlt-6.4.1-r4.ebuild 5814 SHA256 4ea03713e2e9af9981dad48bb96be51011684399fc77ce8017fdc220a9741378 SHA512 c3cbfa307c8b2e6b163e46d3a6ce0daa0b2ba45b3316c5ca55d4de79bcfaba3019416854bd2594d1cb538a5731e343468bc3fa0e408ac67c6f1935cef17ce0cf WHIRLPOOL 20dc81a231908bc315a5eb396a5bd5cd443cd406410be7e4e3b55bd5aa34059854a9d6d530d5bd838e2e0e810cde9ff982af38cd115074bd29b5901385c74427
 MISC ChangeLog 7686 SHA256 18446c0ec5118510f377ab8b8f40ee3740acc91467c96b7e7e6a1249071042c0 SHA512 c46342484514eeccf9aa8febcef9124251282a837881ca810f2eed3b0e80c6a049de0b666feb75a3e5416a4090dba8c6fd8d4394d178512acf5019b7e066bca9 WHIRLPOOL ec9d22690d6e07969f4bdaab649de2d5410e083e7b57f7c4d349a19dfe4378183dc540111c34e2719a4f1b769b4564ee70a83707aceee0211e571a0f5bdc28c0
 MISC ChangeLog-2015 17633 SHA256 b35b70222bff7554b6e4173e6aa0efc79a1eb996fa97d2e27629f4728c8581e0 SHA512 b408d322a82ab8558ab7048739a5dacd1298b5d02e6a1f32bdb0da9fd2c1f6ad44d463f536f2592cb02537cc0fafde8d9b57ae92c47847f08afff43ef732c0a6 WHIRLPOOL 254f90f3f76a534c1e1bdbb2126e5778601c55c71df41bcebda7a3959fb62d1b023d2d374028f3c08c02f7106678ad8cf8b3d6f2c3111713365ffcc524da09a0
-MISC metadata.xml 1533 SHA256 3358c96e30e1bc43963a64cfb30ad096a3d39a89b64266ed62be366d2ad3776d SHA512 4102761541c972d509d639e012a126dc4c7e5547bc31027e2bb5654a1ca04ba82ab7c9a7cae2fdeae98a5c7e0227bf98deaa8a737e56146afd35d43a5a26499c WHIRLPOOL 0e141c87b6cb3244a05d9a4e9b9d3d49a1d3e03ba8b8b0cb051eef65366dcf3263350b1426dba2c619fa69ac73e2c81afc453ea07ced7ab54867b6ffe858c556
+MISC metadata.xml 1501 SHA256 f1723731cc9d4d48fb2c87dea4c7a6205038ecf2f804408759cc813b131219d0 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4 WHIRLPOOL 2ecbf7d62271b255c04d2d954fecb1e9b41404c214d72648daec718377e08b2515339751c5a8b0aea76d880a153de31e742d3e2c35ab95801cdc7eb641df547f
diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch
new file mode 100644
index 000000000000..2f486939d8f7
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch
@@ -0,0 +1,40 @@
+From 2125e3955a0d0be61571cf43b674f74b4b93c6f8 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Sat, 26 Aug 2017 18:31:47 -0700
+Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reported by schnitzeltony on Andreas Müller.
+Patch by Dave Plater.
+---
+ src/framework/mlt_property.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 404d513f..043f530b 100644
+--- a/src/framework/mlt_property.h
++++ b/src/framework/mlt_property.h
+@@ -3,7 +3,7 @@
+  * \brief Property class declaration
+  * \see mlt_property_s
+  *
+- * Copyright (C) 2003-2014 Meltytech, LLC
++ * Copyright (C) 2003-2017 Meltytech, LLC
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -31,7 +31,11 @@
+ #endif
+ 
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+-#include <xlocale.h>
++#  if GLIBC_MINOR >= 26 && !defined(APPLE)
++#    include <locale.h>
++#  else
++#    include <xlocale.h>
++#  endif
+ #else
+ typedef char* locale_t;
+ #endif
diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch
new file mode 100644
index 000000000000..d992ee32e06c
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch
@@ -0,0 +1,22 @@
+From fbf6a5187776f2f392cf258935ff49e4c0e87024 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Wed, 30 Aug 2017 09:08:16 -0700
+Subject: [PATCH] Fix glib test macros to include locale.h.
+
+---
+ src/framework/mlt_property.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 043f530b..3ecebd67 100644
+--- a/src/framework/mlt_property.h
++++ b/src/framework/mlt_property.h
+@@ -31,7 +31,7 @@
+ #endif
+ 
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+-#  if GLIBC_MINOR >= 26 && !defined(APPLE)
++#  if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
+ #    include <locale.h>
+ #  else
+ #    include <xlocale.h>
diff --git a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch
new file mode 100644
index 000000000000..0a3732da2e30
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch
@@ -0,0 +1,33 @@
+From 622ff3acf6256739bd547ade1ceca0e6df5022e6 Mon Sep 17 00:00:00 2001
+From: BoboopTeam <BoboopTeam@users.noreply.github.com>
+Date: Thu, 7 Sep 2017 22:14:48 +0200
+Subject: [PATCH] module: opencv: Remove deleted cv::Tracker::create()
+
+This static method is no longer present in OpenCV API, this workaround should fix compilation against OpenCV 3.3.0 and newer
+---
+ src/modules/opencv/filter_opencv_tracker.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp
+index 48ffb56b..3cfc07d2 100644
+--- a/src/modules/opencv/filter_opencv_tracker.cpp
++++ b/src/modules/opencv/filter_opencv_tracker.cpp
+@@ -111,11 +111,15 @@ static void analyze( mlt_filter filter, cv::Mat cvFrame, private_data* data, int
+ 		data->algo = mlt_properties_get( filter_properties, "algo" );
+                 if ( data->algo == NULL || !strcmp(data->algo, "" ) )
+                 {
+-			data->tracker = cv::Tracker::create( "KCF" );
++			data->tracker = cv::TrackerKCF::create();
++		}
++		else if (!strcmp(data->algo, "MIL" ))
++		{
++			data->tracker = cv::TrackerMIL::create();
+ 		}
+ 		else
+-                {
+-			data->tracker = cv::Tracker::create( data->algo );
++		{
++			data->tracker = cv::TrackerBoosting::create();
+ 		}
+ 
+ 		// Discard previous results
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 6bb3994f390d..9cf408a58aae 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -1,33 +1,33 @@
 <?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>
-  <maintainer type="project">
-    <email>kde@gentoo.org</email>
-    <name>Gentoo KDE Project</name>
-  </maintainer>
-  <use>
-    <flag name="compressed-lumas">Compress the luma files in png.</flag>
-    <flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
-    <flag name="melt">Build the melt commandline tool</flag>
-    <flag name="lua">Build SWIG bindings for Lua</flag>
-    <flag name="kdenlive">Build support for <pkg>kde-apps/kdenlive</pkg></flag>
-    <flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
-    <flag name="python">Build SWIG bindings for Python</flag>
-    <flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
-    <flag name="ruby">Build SWIG bindings for Ruby</flag>
-    <!--
-	<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
-	<flag name="java">Build SWIG bindings for Java</flag>
-	<flag name="perl">Build SWIG bindings for Perl</flag>
-	<flag name="php">Build SWIG bindings for PHP</flag>
-	<flag name="tcl">Build SWIG bindings for TCL</flag>
-	-->
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">mlt</remote-id>
-    <remote-id type="github">mltframework/mlt</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="compressed-lumas">Compress the luma files in png.</flag>
+		<flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
+		<flag name="kdenlive">Build support for <pkg>kde-apps/kdenlive</pkg></flag>
+		<flag name="lua">Build SWIG bindings for Lua</flag>
+		<flag name="melt">Build the melt commandline tool</flag>
+		<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
+		<flag name="python">Build SWIG bindings for Python</flag>
+		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
+		<flag name="ruby">Build SWIG bindings for Ruby</flag>
+		<!--
+		<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
+		<flag name="java">Build SWIG bindings for Java</flag>
+		<flag name="perl">Build SWIG bindings for Perl</flag>
+		<flag name="php">Build SWIG bindings for PHP</flag>
+		<flag name="tcl">Build SWIG bindings for TCL</flag>
+		-->
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mlt</remote-id>
+		<remote-id type="github">mltframework/mlt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/mlt/mlt-6.4.1-r3.ebuild b/media-libs/mlt/mlt-6.4.1-r3.ebuild
index 0e847602b09c..326ab2493b78 100644
--- a/media-libs/mlt/mlt-6.4.1-r3.ebuild
+++ b/media-libs/mlt/mlt-6.4.1-r3.ebuild
@@ -16,8 +16,8 @@ SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate melt opencv opengl
-cpu_flags_x86_mmx qt5 rtaudio sdl cpu_flags_x86_sse cpu_flags_x86_sse2 xine xml lua python ruby vdpau"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
+gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
 # java perl php tcl vidstab
 IUSE="${IUSE} kernel_linux"
 
@@ -30,25 +30,23 @@ COMMON_DEPEND="
 		libav? ( media-video/libav:0=[vdpau?] )
 		!libav? ( media-video/ffmpeg:0=[vdpau?] )
 	)
-	xml? ( >=dev-libs/libxml2-2.5 )
-	sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video]
-		 >=media-libs/sdl-image-1.2.4 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3
-		media-libs/ladspa-sdk
-		>=dev-libs/libxml2-2.5 )
 	fftw? ( sci-libs/fftw:3.0= )
 	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? ( x11-libs/gtk+:2
+	gtk? (
 		media-libs/libexif
-		x11-libs/pango )
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		>=media-sound/jack-audio-connection-kit-0.121.3
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( >=dev-lang/lua-5.1.4-r4:= )
 	opencv? ( >=media-libs/opencv-3.1.0:= )
 	opengl? ( media-video/movit )
-	rtaudio? (
-		media-libs/rtaudio
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	python? ( ${PYTHON_DEPS} )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -59,13 +57,21 @@ COMMON_DEPEND="
 		x11-libs/libX11
 		opengl? ( dev-qt/qtopengl:5 )
 	)
-	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )"
-#	sox? ( media-sound/sox )
+	rtaudio? (
+		media-libs/rtaudio
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	ruby? ( ${RUBY_DEPS} )
+	sdl? (
+		>=media-libs/libsdl-1.2.10[X,opengl,video]
+		>=media-libs/sdl-image-1.2.4
+	)
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
 #	java? ( >=virtual/jre-1.5 )
 #	perl? ( dev-lang/perl )
 #	php? ( dev-lang/php )
+#	sox? ( media-sound/sox )
 #	tcl? ( dev-lang/tcl:0= )
 #	vidstab? ( media-libs/libvidstab )
 SWIG_DEPEND=">=dev-lang/swig-2.0"
@@ -86,6 +92,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
 	"${FILESDIR}"/${P}-libebur128-unbundle.patch
+	"${FILESDIR}"/${P}-opencv-3.3.patch
 )
 
 pkg_setup() {
diff --git a/media-libs/mlt/mlt-6.4.1-r4.ebuild b/media-libs/mlt/mlt-6.4.1-r4.ebuild
new file mode 100644
index 000000000000..f644ac3bb1f0
--- /dev/null
+++ b/media-libs/mlt/mlt-6.4.1-r4.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+# this ebuild currently only supports installing ruby bindings for a single ruby version
+# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
+# /usr/bin/${USE_RUBY} directly
+USE_RUBY="ruby22"
+inherit eutils flag-o-matic multilib python-single-r1 ruby-single toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
+gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
+# java perl php tcl vidstab
+IUSE="${IUSE} kernel_linux"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+#rtaudio will use OSS on non linux OSes
+COMMON_DEPEND="
+	>=media-libs/libebur128-1.2.2
+	ffmpeg? (
+		libav? ( media-video/libav:0=[vdpau?] )
+		!libav? ( media-video/ffmpeg:0=[vdpau?] )
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		>=media-sound/jack-audio-connection-kit-0.121.3
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( >=dev-lang/lua-5.1.4-r4:= )
+	opencv? ( >=media-libs/opencv-3.1.0:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	rtaudio? (
+		media-libs/rtaudio
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	ruby? ( ${RUBY_DEPS} )
+	sdl? (
+		>=media-libs/libsdl-1.2.10[X,opengl,video]
+		>=media-libs/sdl-image-1.2.4
+	)
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+#	vidstab? ( media-libs/libvidstab )
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+RDEPEND="${COMMON_DEPEND}
+	!media-libs/mlt++
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
+	"${FILESDIR}"/${P}-libebur128-unbundle.patch
+	"${FILESDIR}"/${P}-opencv-3.3.patch
+	"${FILESDIR}"/${P}-glibc226-1.patch
+	"${FILESDIR}"/${P}-glibc226-2.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+	done
+	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
+
+	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# bug 589848
+	append-cxxflags -std=c++11
+
+	local myconf="--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-kde
+		--disable-swfdec
+		$(use_enable debug)
+		$(use compressed-lumas && echo ' --luma-compress')
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable gtk gtk2)
+		$(use_enable sdl)
+		$(use_enable jack jackrack)
+		$(use_enable ffmpeg avformat)
+		$(use ffmpeg && echo ' --avformat-swscale')
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable melt)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable libsamplerate resample)
+		$(use_enable rtaudio)
+		$(use vdpau && echo ' --avformat-vdpau')
+		$(use_enable xml)
+		$(use_enable xine)
+		$(use_enable kdenlive)
+		--disable-sox"
+		#$(use_enable sox) FIXME
+
+	if use qt5 ; then
+		myconf+=" --enable-qt
+			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
+			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)"
+	else
+		myconf+=" --disable-qt"
+	fi
+
+	if use x86 || use amd64 ; then
+		myconf+=" $(use_enable cpu_flags_x86_mmx mmx)"
+	else
+		myconf+=" --disable-mmx"
+	fi
+
+	if ! use melt; then
+		sed -i -e "s;src/melt;;" Makefile || die
+	fi
+
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang
+	# TODO: java perl php tcl
+	for i in lua python ruby ; do
+		use $i && swig_lang="${swig_lang} $i"
+	done
+	[ -z "${swig_lang}" ] && swig_lang="none"
+
+	econf ${myconf} --swig-languages="${swig_lang}"
+
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
+	if use qt5 ; then
+		if ! use opengl ; then
+			sed -i -e "/^USE_QT_OPENGL/ s/^/#/" "${S}/src/modules/qt/config.mak" || die
+		fi
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README docs/*.txt
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	docinto swig
+
+	# Install SWIG bindings
+	if use lua; then
+		cd "${S}"/src/swig/lua || die
+		exeinto $(pkg-config --variable INSTALL_CMOD lua)
+		doexe mlt.so
+		dodoc play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		insinto $(python_get_sitedir)
+		doins mlt.py
+		exeinto $(python_get_sitedir)
+		doexe _mlt.so
+		dodoc play.py
+		python_optimize
+	fi
+
+	if use ruby; then
+		cd "${S}"/src/swig/ruby || die
+		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+		doexe mlt.so
+		dodoc play.rb thumbs.rb
+	fi
+	# TODO: java perl php tcl
+}