gentoo resync : 10.01.2018

4 files changed, 221 insertions, 33 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index f84d7b00b3a6..8448909f9b9f 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,4 +1,6 @@
 DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
-EBUILD avidemux-2.6.20.ebuild 4354 BLAKE2B 252e87ca51d8ebad542e1c9e076be1665c9fdffcbcfd0d0c38bb0f79b0f32cf177fde668c2d04bcec7134e71da1392e2f2461f90b49ee7d8f8e383f5210f67f6 SHA512 21cd18dc642aa76bc77f012080f4ef2ca1b1d0b7dfe7b8a2f074edece99a21a8ab326fa31529848f03c6a438c5d0916c26a68cb24e312a6832968ccd6d4534bf
-EBUILD avidemux-9999.ebuild 4354 BLAKE2B ef29833baf7b3d04525760aa77beeb55ded9cbc8211d0cad69f38da95c28853dcc50c4785e3d817bc3002f46f89b1dd4013f68b366c049550ae1907f3987b6f4 SHA512 56db353d29f01d2b1bf1ab237fe2e51db7f0f98b465d6d9aaf214da318cbb10e6f5f61f14f006e8fce4e029a32e7f2bda79a427c786dcda34694fb67252e2542
+DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
+EBUILD avidemux-2.6.20-r1.ebuild 4366 BLAKE2B cf89350d867c09eb88d6efa63c1ef56d28eba7cb7b137b599d2431c9c129957296536d96438bc1d5f627110ef7cfa9b62fa29fdadd0b8eb287407e03251aad80 SHA512 7fb00801367a6c0adbe85641c28b4e09dc1ffcc8493e8066ae734a85e75cd957afb6b0366526e1fae1d072c6bc6c05b8fb1622491d97cfeedea0f715f9bd7988
+EBUILD avidemux-2.7.0.ebuild 4415 BLAKE2B 75d837d2175350a08465dbebbc13a078be84e5fd6119fd9848bdde06aa0e13bc81e0c15082be9980f1afa5ef088cd00a587c51857bd85daa53929d5374062cf0 SHA512 ca6a0baaffc0c84e4bcdae1d7f4c535f5039acad043cc9aaada764a90c213aebaf20c23c39c8eb51845afbd64fa035a92fab39657c6a0392fc46b2abed14a5cd
+EBUILD avidemux-9999.ebuild 4415 BLAKE2B 75d837d2175350a08465dbebbc13a078be84e5fd6119fd9848bdde06aa0e13bc81e0c15082be9980f1afa5ef088cd00a587c51857bd85daa53929d5374062cf0 SHA512 ca6a0baaffc0c84e4bcdae1d7f4c535f5039acad043cc9aaada764a90c213aebaf20c23c39c8eb51845afbd64fa035a92fab39657c6a0392fc46b2abed14a5cd
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20-r1.ebuild
index 59807f056433..0dfaecb51eaf 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20-r1.ebuild
@@ -59,7 +59,10 @@ src_prepare() {
 	# The desktop file is broken. It uses avidemux2 instead of avidemux3
 	# so it will actually launch avidemux-2.5 if it is installed.
 	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
-	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
+	if use qt5; then
+		sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \
+			die "Desktop file fix failed."
+	fi
 
 	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
 	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
@@ -88,7 +91,7 @@ src_configure() {
 		-DAVIDEMUX_SOURCE_DIR='${S}'
 		-DGETTEXT="$(usex nls)"
 		-DSDL="$(usex sdl)"
-		-DLIBVA="$(usex vaapi)"
+		-DLibVA="$(usex vaapi)"
 		-DVDPAU="$(usex vdpau)"
 		-DXVIDEO="$(usex xv)"
 	)
diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild
new file mode 100644
index 000000000000..d1ae46fc0768
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.7.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]] ; then
+	MY_P="${P}"
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+	inherit git-r3
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils qmake-utils xdg-utils
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+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="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
+
+COMMON_DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+	opengl? ( virtual/opengl:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	vaapi? ( x11-libs/libva:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl:0 )
+"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	processes="buildCli:avidemux/cli"
+	if use qt5 ; then
+		processes+=" buildQt4:avidemux/qt4"
+	fi
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+
+	# Fix icon name -> avidemux-2.7.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-${SLOT}:" ${PN}2.desktop || \
+		die "Icon name fix failed."
+
+	# The desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.7 if it is installed.
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || \
+		die "Desktop file fix failed."
+	if use qt5; then
+		sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \
+			die "Desktop file fix failed."
+	fi
+
+	# QA warnings: missing trailing ';' and 'Application' is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || \
+		die "Desktop file fix failed."
+
+	# Now rename the desktop file to not collide with 2.6.
+	mv ${PN}2.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
+
+	# Remove "Build Option" dialog because it doesn't reflect
+	# what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
+		die "Couldn't remove \"Build Option\" dialog."
+}
+
+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
+
+	# The build relies on an avidemux-core header that uses 'nullptr'
+	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DGETTEXT="$(usex nls)"
+		-DSDL="$(usex sdl)"
+		-DLibVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DENABLE_QT5="$(usex qt5)"
+			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		)
+	fi
+
+	if use debug ; then
+		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+	fi
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		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_test() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_test
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_install
+	done
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
+		fperms +x /usr/bin/avidemux3_cli
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs
+	fi
+
+	cd "${S}" || die "Can't enter source folder."
+	newicon ${PN}_icon.png ${PN}-${SLOT}.png
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
+		fperms +x /usr/bin/avidemux3_qt5
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs_qt5
+	fi
+
+	if use qt5 ; then
+		domenu ${PN}-${SLOT}.desktop
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 2e985fe5726f..d1ae46fc0768 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -3,33 +3,36 @@
 
 EAPI=6
 
-inherit cmake-utils qmake-utils xdg-utils
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/${PN}"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.6"
-IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv"
-
 if [[ ${PV} == *9999* ]] ; then
 	MY_P="${P}"
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-
 	inherit git-r3
 else
 	MY_P="${PN}_${PV}"
 	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
+inherit cmake-utils qmake-utils xdg-utils
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+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="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
 
 COMMON_DEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
 	opengl? ( virtual/opengl:0 )
-	qt5? ( dev-qt/qtgui:5 )
-	vaapi? ( x11-libs/libva:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	vaapi? ( x11-libs/libva:0= )
 "
 DEPEND="${COMMON_DEPEND}
 	qt5? ( dev-qt/linguist-tools:5 )
@@ -53,22 +56,30 @@ src_prepare() {
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
 	done
 
-	# Fix icon name -> avidemux-2.6.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
+	# Fix icon name -> avidemux-2.7.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-${SLOT}:" ${PN}2.desktop || \
+		die "Icon name fix failed."
 
 	# The desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.5 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
-	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
+	# so it will actually launch avidemux-2.7 if it is installed.
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || \
+		die "Desktop file fix failed."
+	if use qt5; then
+		sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \
+			die "Desktop file fix failed."
+	fi
 
-	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
+	# QA warnings: missing trailing ';' and 'Application' is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || \
+		die "Desktop file fix failed."
 
-	# Now rename the desktop file to not collide with 2.5.
-	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
+	# Now rename the desktop file to not collide with 2.6.
+	mv ${PN}2.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
 
-	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
-	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+	# Remove "Build Option" dialog because it doesn't reflect
+	# what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
+		die "Couldn't remove \"Build Option\" dialog."
 }
 
 src_configure() {
@@ -81,14 +92,13 @@ src_configure() {
 	use x86 && replace-flags -O0 -O1
 
 	# The build relies on an avidemux-core header that uses 'nullptr'
-	# which is from >=C++11.  Let's use the GCC-6 default C++ dialect.
+	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
 	append-cxxflags -std=c++14
 
 	local mycmakeargs=(
-		-DAVIDEMUX_SOURCE_DIR='${S}'
 		-DGETTEXT="$(usex nls)"
 		-DSDL="$(usex sdl)"
-		-DLIBVA="$(usex vaapi)"
+		-DLibVA="$(usex vaapi)"
 		-DVDPAU="$(usex vdpau)"
 		-DXVIDEO="$(usex xv)"
 	)
@@ -139,7 +149,7 @@ src_install() {
 	fi
 
 	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-2.6.png
+	newicon ${PN}_icon.png ${PN}-${SLOT}.png
 
 	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
 		fperms +x /usr/bin/avidemux3_qt5
@@ -150,7 +160,7 @@ src_install() {
 	fi
 
 	if use qt5 ; then
-		domenu ${PN}-2.6.desktop
+		domenu ${PN}-${SLOT}.desktop
 	fi
 }