[gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     9e84e6512ff8639f870499208ddf40608cc8d4d4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 13:45:54 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 13:52:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e84e651

media-video/avidemux: Drop USE=qt4

Bug: https://bugs.gentoo.org/549818
Closes: https://bugs.gentoo.org/558166
Closes: https://bugs.gentoo.org/572070
Package-Manager: Portage-2.3.17, Repoman-2.3.6

 media-video/avidemux/avidemux-2.6.20.ebuild | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index 72ad632f696..cd242925e7a 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
 
@@ -13,7 +13,7 @@ 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 qt4 qt5 sdl vaapi vdpau xv"
+IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv"
 
 if [[ ${PV} == *9999* ]] ; then
 	MY_P="${P}"
@@ -29,7 +29,6 @@ fi
 DEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
 	opengl? ( virtual/opengl:0 )
-	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
 	qt5? ( dev-qt/qtgui:5 )
 	vaapi? ( x11-libs/libva:0 )
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
@@ -38,7 +37,7 @@ RDEPEND="
 	$DEPEND
 	nls? ( virtual/libintl:0 )
 "
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -46,7 +45,7 @@ src_prepare() {
 	default
 
 	processes="buildCli:avidemux/cli"
-	if use qt4 || use qt5 ; then
+	if use qt5 ; then
 		processes+=" buildQt4:avidemux/qt4"
 	fi
 
@@ -139,10 +138,6 @@ src_install() {
 	cd "${S}" || die "Can't enter source folder."
 	newicon ${PN}_icon.png ${PN}-2.6.png
 
-	if [[ -f "${ED}"/usr/bin/avidemux3_qt4 ]] ; then
-		fperms +x /usr/bin/avidemux3_qt4
-	fi
-
 	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
 		fperms +x /usr/bin/avidemux3_qt5
 	fi
@@ -151,7 +146,7 @@ src_install() {
 		fperms +x /usr/bin/avidemux3_jobs_qt5
 	fi
 
-	if use qt4 || use qt5 ; then
+	if use qt5 ; then
 		domenu ${PN}-2.6.desktop
 	fi
 }