gentoo Easter resync : 12.04.2020

10 files changed, 6 insertions, 628 deletions

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index de363488ebcd..eb05b4ab5290 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,14 +1,5 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
-AUX mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch 2661 BLAKE2B e17a6143998c207a1686b40dbb0d7ce01d02a012b22bf2a78f4e866b362a9293db0e1acd9f540e9a3c701959cfdea493b9834289423c0d28a4998ea38d41c422 SHA512 6e2f396736f46d9a1bdfeb5acfe7deb51a97ca80c99460fc838d569209739bb01c59f0ca1109b24a43c7c1d9757d820f44a721e295c0e0a394e7065404ce2872
-AUX mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch 1056 BLAKE2B 506087e2785f17dfd1dbc64d0a0a3271e4ea05eed742451085dbbf234629f940ad7c646845474ed6969de2ea41fdb765861623264c4b42b549b57aeb1285b477 SHA512 5ca89ca1a49763f9fcb80e1beff6a33830c360fbe5c88929701da305d67cfc76313503bc7438e5b9419c62668768065777263c305dec140958112933e6ef8556
-AUX mlt-6.16.0-crop-filter.patch 1420 BLAKE2B 359f02e95c7afd66c412e8b1e8dbd59d676d3923939f017bf27b19fff114797c3ee269018fd6fed5dc0d666cf1616fca4ea041ee9150a2aa920ed37a01c81695 SHA512 91bde7e934f1a856453ae375699650f2b7f0ac0fafb954af992aa2b35363abb4424aa5adc61c246f56dfdf63f69f7de8d7b741d0c22184fa2fffd31c7d697de6
-AUX mlt-6.16.0-mlt_consumer-race-condition.patch 936 BLAKE2B 1ac34744d8bab9cc18c37092bb7f62a92cd297ab7a31b3ce4927f08257bf0fb87bf33c533df6a12c045c6573f5d8d0ce4105c99a740dd75e9b9e4ab3764c8abd SHA512 3bbcd1172263e8e6048e329075a0ea521dab7f27f6f92496f4e39f8ddd48d6c3b65c96f4ea0620aa1ab5dca886aeb5b58ad09b757acd2ad33ea3cb5729e7bc2f
-AUX mlt-6.16.0-rotoscoping-interpolation.patch 998 BLAKE2B 22ae634e46fa61cc60113a4d8f35454ecabd73f4f9de0c0a9c385aad44a941610ed075bd278d0b45f9101bb3939b82a0565938d4e3c4f29f320d93334cfad4b0 SHA512 f785df6e7db75018c05f57f49537e57e86fbd0b3cf2aad705c0179f36d2cb1115cd8f20f2b4977db0c32b485fef3ba32283fc68c817db4eddcc161e549a63685
-DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433 SHA512 554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26
-DIST mlt-6.18.0.tar.gz 1430398 BLAKE2B 43d33756ace75dd38c7a223ff297323d3f47d8b7cdf2791709ee8cafcfed56c345b49ac3943ad4c49123e69a182dbb551cc93b1f56358fb96966e1b336691d90 SHA512 af6042fa554a7bf87060aaab401c51111fd03a1e50037024662fe727a2281c218f62db07f2c44db62d46f2b9ff67d4599f7aaccc2b337e20394383a24e3c5953
 DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B 50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac SHA512 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
-EBUILD mlt-6.16.0-r1.ebuild 5776 BLAKE2B 87676544fa092cee5ea8b39d710f2ee62fe22f3d7cea6ccb07d8d64aab6ba5d032ad709ef05fd5d981dcee66e7297b7367398bda118e4ce6c1c48d0f1f86c009 SHA512 d608429a2c3c62d5e2507e28789f57ee394aa04362bae8e7b2a22a15aecba221effffb065a9e1031a5d11302ede425b03f7f3b04bace9eb766b507b726e197a1
-EBUILD mlt-6.16.0-r2.ebuild 5776 BLAKE2B f7a30d589351353030d89799d8fe719fbdf434c2ab16648f024297f3f24d4d8e3436acc633ccdfb15f7d0a5a27bacea42a372fd445353dc4f6d59f8912455ea7 SHA512 c34b90ff7bcb17f3673f43312ee088154d0a9845f168afc74b7c3e07af52ba18d955e949a2db1ab48b32d1585d58c0f2af3ee7bca33f0df9d223f7e719c55a49
-EBUILD mlt-6.18.0.ebuild 5374 BLAKE2B 2b1702e9bb100178d620a68e5cbc444fced88662cc187e3c03167a456e913a8b99ded0a9417c0207c38b4070d2afacbce09241d587d4b615c8434b7c387189f5 SHA512 267861c33a99b38c26e291af7fdd893bc5ba607ac2fd74f78189b3be032f077d367db17d41ebd031f42b3537c1ead6285f236b9b7eec71531a78b87f3d969cb0
-EBUILD mlt-6.20.0.ebuild 5376 BLAKE2B 47553f7c3a4dfed6be9498c0170193c0e1562cc817f7bbf80f0ce47b60c00a6441f28b083850e2e14b38e71550bd82c6cd908ab4439e249e1ae5c30e5670b43e SHA512 5bea27b4d4bedd5b41ab0548befbd6104e9da2257a0bed78e4b40000cf7676c960019719d9d1971298422b6b5bd302bae26fd8f16cb300ad76b75b8b86a4d790
+EBUILD mlt-6.20.0-r1.ebuild 5376 BLAKE2B 47553f7c3a4dfed6be9498c0170193c0e1562cc817f7bbf80f0ce47b60c00a6441f28b083850e2e14b38e71550bd82c6cd908ab4439e249e1ae5c30e5670b43e SHA512 5bea27b4d4bedd5b41ab0548befbd6104e9da2257a0bed78e4b40000cf7676c960019719d9d1971298422b6b5bd302bae26fd8f16cb300ad76b75b8b86a4d790
+EBUILD mlt-6.20.0.ebuild 5373 BLAKE2B 963f71f2da2faecb5ab98777bcecd980512260c5400bb7f90b988c2ad7a5386ccf0f8f625b51ac76a8b552bcc937fb3efc2f5e26565f1377899342acace32078 SHA512 9458e019f94d9ed985a3a250df6546a5fb4493ea4f53070a0c9bc3f7c25c98ae2434df12d844e3e62c5041dfd3002edae8b1cf3a98309a62b4e6b374bbe5ba76
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch b/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch
deleted file mode 100644
index c2bc1946a81c..000000000000
--- a/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f0628d1fe7f61a267f1adad8824b9a2083e3376a Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 31 May 2019 19:03:32 -0700
-Subject: [PATCH] Fix #453 bad aspect ratio computed resulting in black.
-
-This occured when the s, width, or height properties are supplied with
-no "aspect."
----
- src/modules/avformat/consumer_avformat.c | 34 +++++++++++++-----------
- 1 file changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
-index 738f5a972..dd2719997 100644
---- a/src/modules/avformat/consumer_avformat.c
-+++ b/src/modules/avformat/consumer_avformat.c
-@@ -271,22 +271,24 @@ mlt_consumer consumer_avformat_init( mlt_profile profile, char *arg )
- static void recompute_aspect_ratio( mlt_properties properties )
- {
- 	double ar = mlt_properties_get_double( properties, "aspect" );
--	AVRational rational = av_d2q( ar, 255 );
--	int width = mlt_properties_get_int( properties, "width" );
--	int height = mlt_properties_get_int( properties, "height" );
--
--	// Update the profile and properties as well since this is an alias
--	// for mlt properties that correspond to profile settings
--	mlt_properties_set_int( properties, "display_aspect_num", rational.num );
--	mlt_properties_set_int( properties, "display_aspect_den", rational.den );
--
--	// Now compute the sample aspect ratio
--	rational = av_d2q( ar * height / FFMAX(width, 1), 255 );
--
--	// Update the profile and properties as well since this is an alias
--	// for mlt properties that correspond to profile settings
--	mlt_properties_set_int( properties, "sample_aspect_num", rational.num );
--	mlt_properties_set_int( properties, "sample_aspect_den", rational.den );
-+	if (ar > 0.0) {
-+		AVRational rational = av_d2q( ar, 255 );
-+		int width = mlt_properties_get_int( properties, "width" );
-+		int height = mlt_properties_get_int( properties, "height" );
-+	
-+		// Update the profile and properties as well since this is an alias
-+		// for mlt properties that correspond to profile settings
-+		mlt_properties_set_int( properties, "display_aspect_num", rational.num );
-+		mlt_properties_set_int( properties, "display_aspect_den", rational.den );
-+	
-+		// Now compute the sample aspect ratio
-+		rational = av_d2q( ar * height / FFMAX(width, 1), 255 );
-+	
-+		// Update the profile and properties as well since this is an alias
-+		// for mlt properties that correspond to profile settings
-+		mlt_properties_set_int( properties, "sample_aspect_num", rational.num );
-+		mlt_properties_set_int( properties, "sample_aspect_den", rational.den );
-+	}
- }
- 
- static void color_trc_from_colorspace( mlt_properties properties )
diff --git a/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch b/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch
deleted file mode 100644
index 946d06ae357c..000000000000
--- a/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 434dbcf62048cc1220c425c2adc77697b4d40ffb Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Mon, 10 Jun 2019 18:18:44 +0200
-Subject: [PATCH] Fix multi consumer doesn't correctly handle in point
-
----
- src/modules/core/consumer_multi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/core/consumer_multi.c b/src/modules/core/consumer_multi.c
-index 4bb16ddf5..d9b5fbc0f 100644
---- a/src/modules/core/consumer_multi.c
-+++ b/src/modules/core/consumer_multi.c
-@@ -304,7 +304,7 @@ static void foreach_consumer_start( mlt_consumer consumer )
- 		if ( nested )
- 		{
- 			mlt_properties nested_props = MLT_CONSUMER_PROPERTIES(nested);
--			mlt_properties_set_position( nested_props, "_multi_position", 0 );
-+			mlt_properties_set_position( nested_props, "_multi_position", mlt_properties_get_position( properties, "in" ) );
- 			mlt_properties_set_data( nested_props, "_multi_audio", NULL, 0, NULL, NULL );
- 			mlt_properties_set_int( nested_props, "_multi_samples", 0 );
- 			mlt_consumer_start( nested );
diff --git a/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch b/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch
deleted file mode 100644
index d42da685bdba..000000000000
--- a/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f6225b7f4cd5e9b6011ca79c3849dc9e286a7acb Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Mon, 13 May 2019 11:44:13 -0700
-Subject: [PATCH] Fix crop filter not working with color producer.
-
-Fixes https://github.com/mltframework/shotcut/issues/737
----
- src/modules/core/producer_colour.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c
-index e1cfe5284..67d36dfb2 100644
---- a/src/modules/core/producer_colour.c
-+++ b/src/modules/core/producer_colour.c
-@@ -1,6 +1,6 @@
- /*
-  * producer_colour.c
-- * Copyright (C) 2003-2018 Meltytech, LLC
-+ * Copyright (C) 2003-2019 Meltytech, LLC
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -248,6 +248,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
- 		mlt_properties_set_int( properties, "progressive", 1 );
- 		mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) );
- 		mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
-+		mlt_properties_set_int( properties, "meta.media.width", profile->width );
-+		mlt_properties_set_int( properties, "meta.media.height", profile->height );
- 
- 		// colour is an alias for resource
- 		if ( mlt_properties_get( producer_props, "colour" ) != NULL )
diff --git a/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch b/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch
deleted file mode 100644
index 7fd1c5775411..000000000000
--- a/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9b89b781b9d06181c8d486605ed4c2b3089d64d6 Mon Sep 17 00:00:00 2001
-From: alcinos <nicolas.carion@ens-lyon.fr>
-Date: Wed, 1 May 2019 23:50:41 +0200
-Subject: [PATCH] Fix race in mlt_consumer
-
----
- src/framework/mlt_consumer.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
-index 491bc5e99..0e36bde3c 100644
---- a/src/framework/mlt_consumer.c
-+++ b/src/framework/mlt_consumer.c
-@@ -31,6 +31,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/time.h>
-+#include <stdatomic.h>
- 
- /** Define this if you want an automatic deinterlace (if necessary) when the
-  * consumer's producer is not running at normal speed.
-@@ -65,7 +66,7 @@ typedef struct
- 	double fps;
- 	int channels;
- 	int frequency;
--	int speed;
-+	atomic_int speed;
- 	/* additional fields added for the parallel work queue */
- 	mlt_deque worker_threads;
- 	pthread_mutex_t done_mutex;
diff --git a/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch b/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch
deleted file mode 100644
index 935a2d13f61b..000000000000
--- a/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ddf6983b4aaaf662944b84103dd4412aff45a428 Mon Sep 17 00:00:00 2001
-From: alcinos <nicolas.carion@ens-lyon.fr>
-Date: Fri, 10 May 2019 23:20:22 +0200
-Subject: [PATCH] Fix interpolation in rotoscoping filter
-
----
- src/modules/plusgpl/filter_rotoscoping.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/plusgpl/filter_rotoscoping.c b/src/modules/plusgpl/filter_rotoscoping.c
-index 0667929cd..70e3a093b 100644
---- a/src/modules/plusgpl/filter_rotoscoping.c
-+++ b/src/modules/plusgpl/filter_rotoscoping.c
-@@ -572,7 +572,7 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame )
-             int c2 = json2BCurves( keyframe, &p2 );
- 
-             // range 0-1
--            double position = ( time - pos1 ) / (double)( pos2 - pos1 + 1 );
-+            double position = ( time - pos1 ) / (double)( pos2 - pos1 );
- 
-             count = MIN( c1, c2 );  // additional points are ignored
-             points = mlt_pool_alloc( count * sizeof( BPointF ) );
diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild
deleted file mode 100644
index 6b79b5c3feab..000000000000
--- a/media-libs/mlt/mlt-6.16.0-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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="ruby24"
-inherit python-single-r1 qmake-utils ruby-single toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~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 kernel_linux libav libsamplerate lua melt opencv opengl python
-qt5 rtaudio ruby sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-BDEPEND="
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#rtaudio will use OSS on non linux OSes
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	ffmpeg? (
-		libav? ( >=media-video/libav-12:0=[vdpau?] )
-		!libav? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	)
-	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
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	opencv? ( >=media-libs/opencv-3.2.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
-	)
-	rtaudio? (
-		>=media-libs/rtaudio-4.1.2
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	ruby? ( ${RUBY_DEPS} )
-	sdl? (
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image
-	)
-	vidstab? ( media-libs/vidstab )
-	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= )
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${P}-mlt_consumer-race-condition.patch
-	"${FILESDIR}"/${P}-rotoscoping-interpolation.patch
-	"${FILESDIR}"/${P}-crop-filter.patch
-	"${FILESDIR}"/${P}-consumer_multi-does-not-correctly-handle-in-point.patch
-	"${FILESDIR}"/${P}-bad-aspect-ratio-resulting-in-black.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 -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
-
-	# fix python include dir
-	if use python; then
-		python_export PYTHON_INCLUDEDIR
-		sed -e "/PYTHON_INCLUDE=/s:=.*:=${PYTHON_INCLUDEDIR}:" \
-			-i src/swig/python/build || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-kde
-		--disable-sdl
-		--disable-swfdec
-		$(use_enable debug)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable ffmpeg avformat)
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable gtk gtk2)
-		$(use_enable jack jackrack)
-		$(use_enable kdenlive)
-		$(use_enable libsamplerate resample)
-		$(use_enable melt)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable qt5 qt)
-		$(use_enable rtaudio)
-		$(use_enable sdl sdl2)
-		$(use_enable vidstab vid.stab )
-		$(use_enable xine)
-		$(use_enable xml)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	use compressed-lumas && myconf+=( --luma-compress )
-	use ffmpeg && myconf+=( --avformat-swscale )
-	use vdpau && myconf+=( --avformat-vdpau )
-
-	if use qt5 ; then
-		myconf+=(
-			--qt-includedir=$(qt5_get_headerdir)
-			--qt-libdir=$(qt5_get_libdir)
-		)
-	fi
-
-	if use amd64 || use x86 ; 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+=( $i )
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang=( none )
-
-	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
-
-	sed -i -e s/^OPT/#OPT/ config.mak || die
-}
-
-src_install() {
-	default
-
-	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
-		python_domodule mlt.py _mlt.so
-		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
-		dodoc play.py
-		python_optimize
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby || die
-		local rubydir=$("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
-		exeinto "${rubydir#${EPREFIX}}"
-		doexe mlt.so
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
diff --git a/media-libs/mlt/mlt-6.16.0-r2.ebuild b/media-libs/mlt/mlt-6.16.0-r2.ebuild
deleted file mode 100644
index 3113c3933d91..000000000000
--- a/media-libs/mlt/mlt-6.16.0-r2.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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="ruby25"
-inherit python-single-r1 qmake-utils ruby-single toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~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 kernel_linux libav libsamplerate lua melt opencv opengl python
-qt5 rtaudio ruby sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-BDEPEND="
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#rtaudio will use OSS on non linux OSes
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	ffmpeg? (
-		libav? ( >=media-video/libav-12:0=[vdpau?] )
-		!libav? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	)
-	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
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	opencv? ( >=media-libs/opencv-3.2.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
-	)
-	rtaudio? (
-		>=media-libs/rtaudio-4.1.2
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	ruby? ( ${RUBY_DEPS} )
-	sdl? (
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image
-	)
-	vidstab? ( media-libs/vidstab )
-	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= )
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${P}-mlt_consumer-race-condition.patch
-	"${FILESDIR}"/${P}-rotoscoping-interpolation.patch
-	"${FILESDIR}"/${P}-crop-filter.patch
-	"${FILESDIR}"/${P}-consumer_multi-does-not-correctly-handle-in-point.patch
-	"${FILESDIR}"/${P}-bad-aspect-ratio-resulting-in-black.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 -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
-
-	# fix python include dir
-	if use python; then
-		python_export PYTHON_INCLUDEDIR
-		sed -e "/PYTHON_INCLUDE=/s:=.*:=${PYTHON_INCLUDEDIR}:" \
-			-i src/swig/python/build || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-kde
-		--disable-sdl
-		--disable-swfdec
-		$(use_enable debug)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable ffmpeg avformat)
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable gtk gtk2)
-		$(use_enable jack jackrack)
-		$(use_enable kdenlive)
-		$(use_enable libsamplerate resample)
-		$(use_enable melt)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable qt5 qt)
-		$(use_enable rtaudio)
-		$(use_enable sdl sdl2)
-		$(use_enable vidstab vid.stab )
-		$(use_enable xine)
-		$(use_enable xml)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	use compressed-lumas && myconf+=( --luma-compress )
-	use ffmpeg && myconf+=( --avformat-swscale )
-	use vdpau && myconf+=( --avformat-vdpau )
-
-	if use qt5 ; then
-		myconf+=(
-			--qt-includedir=$(qt5_get_headerdir)
-			--qt-libdir=$(qt5_get_libdir)
-		)
-	fi
-
-	if use amd64 || use x86 ; 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+=( $i )
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang=( none )
-
-	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
-
-	sed -i -e s/^OPT/#OPT/ config.mak || die
-}
-
-src_install() {
-	default
-
-	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
-		python_domodule mlt.py _mlt.so
-		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
-		dodoc play.py
-		python_optimize
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby || die
-		local rubydir=$("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
-		exeinto "${rubydir#${EPREFIX}}"
-		doexe mlt.so
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
diff --git a/media-libs/mlt/mlt-6.18.0.ebuild b/media-libs/mlt/mlt-6.20.0-r1.ebuild
index c835916cd8cb..faf5025e814d 100644
--- a/media-libs/mlt/mlt-6.18.0.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 # 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="ruby25"
+USE_RUBY="ruby26"
 inherit python-single-r1 qmake-utils ruby-single toolchain-funcs
 
 DESCRIPTION="Open source multimedia framework for television broadcasting"
diff --git a/media-libs/mlt/mlt-6.20.0.ebuild b/media-libs/mlt/mlt-6.20.0.ebuild
index faf5025e814d..bb5c456337a5 100644
--- a/media-libs/mlt/mlt-6.20.0.ebuild
+++ b/media-libs/mlt/mlt-6.20.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 # 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="ruby26"
+USE_RUBY="ruby25"
 inherit python-single-r1 qmake-utils ruby-single toolchain-funcs
 
 DESCRIPTION="Open source multimedia framework for television broadcasting"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~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 kernel_linux libav libsamplerate lua melt opencv opengl python
 qt5 rtaudio ruby sdl vdpau vidstab xine xml"