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