Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
Date: Sat, 09 Dec 2017 13:52:47
Message-Id: 1512827544.9e84e6512ff8639f870499208ddf40608cc8d4d4.asturm@gentoo
1 commit: 9e84e6512ff8639f870499208ddf40608cc8d4d4
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 9 13:45:54 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 9 13:52:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e84e651
7
8 media-video/avidemux: Drop USE=qt4
9
10 Bug: https://bugs.gentoo.org/549818
11 Closes: https://bugs.gentoo.org/558166
12 Closes: https://bugs.gentoo.org/572070
13 Package-Manager: Portage-2.3.17, Repoman-2.3.6
14
15 media-video/avidemux/avidemux-2.6.20.ebuild | 15 +++++----------
16 1 file changed, 5 insertions(+), 10 deletions(-)
17
18 diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
19 index 72ad632f696..cd242925e7a 100644
20 --- a/media-video/avidemux/avidemux-2.6.20.ebuild
21 +++ b/media-video/avidemux/avidemux-2.6.20.ebuild
22 @@ -1,7 +1,7 @@
23 # Copyright 1999-2017 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI="6"
27 +EAPI=6
28
29 PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
30
31 @@ -13,7 +13,7 @@ HOMEPAGE="http://fixounet.free.fr/${PN}"
32 # Multiple licenses because of all the bundled stuff.
33 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
34 SLOT="2.6"
35 -IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau xv"
36 +IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv"
37
38 if [[ ${PV} == *9999* ]] ; then
39 MY_P="${P}"
40 @@ -29,7 +29,6 @@ fi
41 DEPEND="
42 ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
43 opengl? ( virtual/opengl:0 )
44 - qt4? ( >=dev-qt/qtgui-4.8.3:4 )
45 qt5? ( dev-qt/qtgui:5 )
46 vaapi? ( x11-libs/libva:0 )
47 nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
48 @@ -38,7 +37,7 @@ RDEPEND="
49 $DEPEND
50 nls? ( virtual/libintl:0 )
51 "
52 -PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
53 +PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
54
55 S="${WORKDIR}/${MY_P}"
56
57 @@ -46,7 +45,7 @@ src_prepare() {
58 default
59
60 processes="buildCli:avidemux/cli"
61 - if use qt4 || use qt5 ; then
62 + if use qt5 ; then
63 processes+=" buildQt4:avidemux/qt4"
64 fi
65
66 @@ -139,10 +138,6 @@ src_install() {
67 cd "${S}" || die "Can't enter source folder."
68 newicon ${PN}_icon.png ${PN}-2.6.png
69
70 - if [[ -f "${ED}"/usr/bin/avidemux3_qt4 ]] ; then
71 - fperms +x /usr/bin/avidemux3_qt4
72 - fi
73 -
74 if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
75 fperms +x /usr/bin/avidemux3_qt5
76 fi
77 @@ -151,7 +146,7 @@ src_install() {
78 fperms +x /usr/bin/avidemux3_jobs_qt5
79 fi
80
81 - if use qt4 || use qt5 ; then
82 + if use qt5 ; then
83 domenu ${PN}-2.6.desktop
84 fi
85 }