gentoo resync : 10.01.2018

3 files changed, 210 insertions, 22 deletions

diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 2d2886a0ac6b..d0b532dd9ae2 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,5 +1,7 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
+DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
 EBUILD avidemux-plugins-2.6.20.ebuild 4638 BLAKE2B 1ab4804335317d6c12906ec9a000a38cf1665ebcd0223b8dc563ed75f9e23f0631125c5b6521611b96a375a509ad8b54ba82095cb6f626ff122904572a95e692 SHA512 48e038364240357a6c6328b101973b94dd3cc813273ae5e36711aa4b3121b0ac322d2577a0faca8a7455ae6e2063cb4e1b0db3100564f84a77c3a44e4154ddb2
-EBUILD avidemux-plugins-9999.ebuild 4636 BLAKE2B 390405868f1f92d64f9ceda18f789a21c4e472a3d5c2da9a1cb034de78248223ddc54006ef4963e83875894b77ef28a5cf596bd320964aa30bec4e9753c73efe SHA512 8a759c8519da36a701a5bc20f1f044a671d787c0350b92b2ce1862cc5de405f5df29df63f237cb0b0e703244ee1ace1ce3a571f12c691efaa7c48adb8c9feeee
+EBUILD avidemux-plugins-2.7.0.ebuild 4846 BLAKE2B c2570de96b15f10903cd0bbffd1d91a8956b6b344a365adcaeb23ed5a398ecd248c4bfe66322fe02c9da224ab00cfdfe0c492eaf272de88f4389a958ffdc0572 SHA512 a45bc5a0ef692045cf660fa771264012ab1ed5b07720b97ffda198dcbe140aac34c6aa112c34143993c1ac5e69931ba3d5060ef4a5219355ca477b6c159582db
+EBUILD avidemux-plugins-9999.ebuild 4846 BLAKE2B c2570de96b15f10903cd0bbffd1d91a8956b6b344a365adcaeb23ed5a398ecd248c4bfe66322fe02c9da224ab00cfdfe0c492eaf272de88f4389a958ffdc0572 SHA512 a45bc5a0ef692045cf660fa771264012ab1ed5b07720b97ffda198dcbe140aac34c6aa112c34143993c1ac5e69931ba3d5060ef4a5219355ca477b6c159582db
 MISC metadata.xml 1406 BLAKE2B 11611c16434167ee45901a059c37d8802c7b605d21cee9f813982cd8e22e98aac1fa0921662178ef532ef060e7d2c61353a2e057caef3b63a9bf5df06fa6f2a6 SHA512 117225570689a4b78a36b18f5e6c50e185d2db2b10ba6d38869105fa5e718d5dc753eb151cba411df8eba48705e0eee29c2acae8c1a491cc343832d9cfa0290c
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
new file mode 100644
index 000000000000..fb70ffe36c29
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}
+	inherit git-r3
+else
+	MY_PN="${PN/-plugins/}"
+	MY_P="${MY_PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Plugins for the video editor media-video/avidemux"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
+	>=dev-lang/spidermonkey-1.5-r2:0=
+	dev-libs/libxml2:2
+	media-libs/a52dec:0
+	media-libs/libass:0=
+	media-libs/libmad:0
+	media-libs/libmp4v2:0
+	media-libs/libpng:0=
+	virtual/libiconv:0
+	aac? (
+		>=media-libs/faac-1.29.9.2:0
+		media-libs/faad2:0
+	)
+	aften? ( media-libs/aften:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
+	amr? ( media-libs/opencore-amr:0 )
+	dcaenc? ( media-sound/dcaenc:0 )
+	dts? ( media-libs/libdca:0 )
+	fdk? ( media-libs/fdk-aac:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	fribidi? ( dev-libs/fribidi:0 )
+	jack? (
+		media-sound/jack-audio-connection-kit:0
+		libsamplerate? ( media-libs/libsamplerate:0 )
+	)
+	lame? ( media-sound/lame:0 )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+	opus? ( media-libs/opus:0 )
+	pulseaudio? ( media-sound/pulseaudio:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	truetype? ( media-libs/freetype:2 )
+	twolame? ( media-sound/twolame:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xv? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXv:0
+	)
+	xvid? ( media-libs/xvid:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	oss? ( virtual/os-headers:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/avidemux-plugins-${PV}:${SLOT}
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+
+src_prepare() {
+	default
+
+	# Don't reapply PATCHES during cmake-utils_src_prepare
+	unset PATCHES
+
+	processes="buildPluginsCommon:avidemux_plugins
+		buildPluginsCLI:avidemux_plugins"
+	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+}
+
+src_configure() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+
+		local mycmakeargs=(
+			-DAVIDEMUX_SOURCE_DIR='${S}'
+			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
+			-DFAAC="$(usex aac)"
+			-DFAAD="$(usex aac)"
+			-DALSA="$(usex alsa)"
+			-DAFTEN="$(usex aften)"
+			-DDCAENC="$(usex dcaenc)"
+			-DFDK_AAC="$(usex fdk)"
+			-DOPENCORE_AMRWB="$(usex amr)"
+			-DOPENCORE_AMRNB="$(usex amr)"
+			-DLIBDCA="$(usex dts)"
+			-DFONTCONFIG="$(usex fontconfig)"
+			-DJACK="$(usex jack)"
+			-DLAME="$(usex lame)"
+			-DNVENC="$(usex nvenc)"
+			-DOPUS="$(usex opus)"
+			-DOSS="$(usex oss)"
+			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
+			-DQT4=OFF
+			-DFREETYPE2="$(usex truetype)"
+			-DTWOLAME="$(usex twolame)"
+			-DX264="$(usex x264)"
+			-DX265="$(usex x265)"
+			-DXVIDEO="$(usex xv)"
+			-DXVID="$(usex xvid)"
+			-DVDPAU="$(usex vdpau)"
+			-DVORBIS="$(usex vorbis)"
+			-DLIBVORBIS="$(usex vorbis)"
+			-DVPXDEC="$(usex vpx)"
+			-DUSE_EXTERNAL_LIBA52=yes
+			-DUSE_EXTERNAL_LIBASS=yes
+			-DUSE_EXTERNAL_LIBMAD=yes
+			-DUSE_EXTERNAL_LIBMP4V2=yes
+		)
+
+		if use qt5 ; then
+			mycmakeargs+=( -DENABLE_QT5=True )
+		fi
+
+		if use debug ; then
+			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+		fi
+
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		# cmake-utils_src_install doesn't respect BUILD_DIR
+		# and there sometimes is a preinstall phase present.
+		pushd "${WORKDIR}/${P}_build/${process%%:*}" > /dev/null || die
+			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
+			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
+		popd > /dev/null || die
+	done
+}
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
index 02d96ecd4adb..fb70ffe36c29 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
@@ -1,25 +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 cmake-utils python-single-r1
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.6"
-IUSE="aac aften a52 alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl nvenc opus oss pulseaudio qt5 vorbis truetype twolame xv xvid x264 x265 vdpau vpx"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}
-
 	inherit git-r3
 else
 	MY_PN="${PN/-plugins/}"
@@ -27,8 +13,19 @@ else
 	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
 
-RDEPEND="${PYTHON_DEPS}
+DESCRIPTION="Plugins for the video editor media-video/avidemux"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
 	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
 	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
 	>=dev-lang/spidermonkey-1.5-r2:0=
@@ -59,8 +56,15 @@ RDEPEND="${PYTHON_DEPS}
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
 	opus? ( media-libs/opus:0 )
 	pulseaudio? ( media-sound/pulseaudio:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
 	truetype? ( media-libs/freetype:2 )
 	twolame? ( media-sound/twolame:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
 	xv? (
@@ -69,11 +73,13 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/libXv:0
 	)
 	xvid? ( media-libs/xvid:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
 "
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers:0 )"
+DEPEND="${COMMON_DEPEND}
+	oss? ( virtual/os-headers:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/avidemux-plugins-${PV}:${SLOT}
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -82,11 +88,12 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
 src_prepare() {
 	default
 
-	#Don't reapply PATCHES during cmake-utils_src_prepare
+	# Don't reapply PATCHES during cmake-utils_src_prepare
 	unset PATCHES
 
 	processes="buildPluginsCommon:avidemux_plugins
 		buildPluginsCLI:avidemux_plugins"
+	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
 
 	for process in ${processes} ; do
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare