gentoo resync : 02.11.2017

3 files changed, 2 insertions, 225 deletions

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 6f9ff69deddb..58383f05c2eb 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -5,8 +5,7 @@ AUX mlt-6.4.1-libebur128-unbundle.patch 4162 SHA256 4872117b2b43e3bb82f96f9bb531
 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 5740 SHA256 5fb64cd944e2766e6c25e40c116b9f9ae3866e8511a1ac0965cbf6228197f478 SHA512 bd60ee226c895d492215aae324c03a971af16c8e81b90c6a67c6ade0e39437d0e506407a69616bcf48ac15e1c63d9f31c1fa31f61f8fb952f8eb306ce583adaf WHIRLPOOL 3e4525d34ffefbe93e5eed0a98d4f1ea9003d1df1ffd5dd2a166b51d44bb4c0b87c251f4c9951fa60e420d21a4a1ef79cb68c456fe5d9917a5bf776bdaa00cf1
-EBUILD mlt-6.4.1-r4.ebuild 5814 SHA256 4ea03713e2e9af9981dad48bb96be51011684399fc77ce8017fdc220a9741378 SHA512 c3cbfa307c8b2e6b163e46d3a6ce0daa0b2ba45b3316c5ca55d4de79bcfaba3019416854bd2594d1cb538a5731e343468bc3fa0e408ac67c6f1935cef17ce0cf WHIRLPOOL 20dc81a231908bc315a5eb396a5bd5cd443cd406410be7e4e3b55bd5aa34059854a9d6d530d5bd838e2e0e810cde9ff982af38cd115074bd29b5901385c74427
+EBUILD mlt-6.4.1-r4.ebuild 5814 SHA256 9ec5ffdc4ec51b4a8b541d792eaa75f820ca54a466114bb39a4f76db05803d56 SHA512 a9dad9ccaf640182da4f94bcdc5f9ce1a7a8cb0462a98b1a01dcaf8781c50b734ba74d0c4f597f6c41b2d1fe2de29f3ad0e73def1562768d30fc2f16fb880064 WHIRLPOOL db7f514c7df75790085c8b941286930056a08c9813a35b3ced3eaf8c175c944bbfdf59177b248c585e73268829c4b72b21a919209d60eb30943813e217fd1ff3
 MISC ChangeLog 7686 SHA256 18446c0ec5118510f377ab8b8f40ee3740acc91467c96b7e7e6a1249071042c0 SHA512 c46342484514eeccf9aa8febcef9124251282a837881ca810f2eed3b0e80c6a049de0b666feb75a3e5416a4090dba8c6fd8d4394d178512acf5019b7e066bca9 WHIRLPOOL ec9d22690d6e07969f4bdaab649de2d5410e083e7b57f7c4d349a19dfe4378183dc540111c34e2719a4f1b769b4564ee70a83707aceee0211e571a0f5bdc28c0
 MISC ChangeLog-2015 17633 SHA256 b35b70222bff7554b6e4173e6aa0efc79a1eb996fa97d2e27629f4728c8581e0 SHA512 b408d322a82ab8558ab7048739a5dacd1298b5d02e6a1f32bdb0da9fd2c1f6ad44d463f536f2592cb02537cc0fafde8d9b57ae92c47847f08afff43ef732c0a6 WHIRLPOOL 254f90f3f76a534c1e1bdbb2126e5778601c55c71df41bcebda7a3959fb62d1b023d2d374028f3c08c02f7106678ad8cf8b3d6f2c3111713365ffcc524da09a0
 MISC metadata.xml 1501 SHA256 f1723731cc9d4d48fb2c87dea4c7a6205038ecf2f804408759cc813b131219d0 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4 WHIRLPOOL 2ecbf7d62271b255c04d2d954fecb1e9b41404c214d72648daec718377e08b2515339751c5a8b0aea76d880a153de31e742d3e2c35ab95801cdc7eb641df547f
diff --git a/media-libs/mlt/mlt-6.4.1-r3.ebuild b/media-libs/mlt/mlt-6.4.1-r3.ebuild
deleted file mode 100644
index 326ab2493b78..000000000000
--- a/media-libs/mlt/mlt-6.4.1-r3.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# 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
-)
-
-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
-}
diff --git a/media-libs/mlt/mlt-6.4.1-r4.ebuild b/media-libs/mlt/mlt-6.4.1-r4.ebuild
index f644ac3bb1f0..669426cf7eff 100644
--- a/media-libs/mlt/mlt-6.4.1-r4.ebuild
+++ b/media-libs/mlt/mlt-6.4.1-r4.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	)
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
 	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	opencv? ( >=media-libs/opencv-3.1.0:= )
+	opencv? ( >=media-libs/opencv-3.2.0:= )
 	opengl? ( media-video/movit )
 	python? ( ${PYTHON_DEPS} )
 	qt5? (