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-libs/avidemux-plugins/
Date: Tue, 09 Jan 2018 17:33:15
Message-Id: 1515518888.beeee9831132febf0c95d5b14b3171aee20a696b.asturm@gentoo
1 commit: beeee9831132febf0c95d5b14b3171aee20a696b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 7 23:10:43 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 9 17:28:08 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beeee983
7
8 media-libs/avidemux-plugins: Sorting, style fixes
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 .../avidemux-plugins/avidemux-plugins-9999.ebuild | 32 ++++++++++------------
13 1 file changed, 15 insertions(+), 17 deletions(-)
14
15 diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
16 index 02d96ecd4ad..c39414c1f97 100644
17 --- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
18 +++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
19 @@ -1,25 +1,11 @@
20 -# Copyright 1999-2017 Gentoo Foundation
21 +# Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=6
25
26 -PYTHON_COMPAT=( python2_7 )
27 -
28 -inherit cmake-utils python-single-r1
29 -
30 -DESCRIPTION="Plugins for the video editor media-video/avidemux"
31 -HOMEPAGE="http://fixounet.free.fr/avidemux"
32 -
33 -# Multiple licenses because of all the bundled stuff.
34 -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
35 -SLOT="2.6"
36 -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"
37 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
38 -
39 if [[ ${PV} == *9999* ]] ; then
40 EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
41 EGIT_CHECKOUT_DIR=${WORKDIR}
42 -
43 inherit git-r3
44 else
45 MY_PN="${PN/-plugins/}"
46 @@ -27,6 +13,17 @@ else
47 SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
48 KEYWORDS="~amd64 ~x86"
49 fi
50 +PYTHON_COMPAT=( python2_7 )
51 +inherit cmake-utils python-single-r1
52 +
53 +DESCRIPTION="Plugins for the video editor media-video/avidemux"
54 +HOMEPAGE="http://fixounet.free.fr/avidemux"
55 +
56 +# Multiple licenses because of all the bundled stuff.
57 +LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
58 +SLOT="2.6"
59 +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"
60 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
61
62 RDEPEND="${PYTHON_DEPS}
63 ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
64 @@ -73,7 +70,8 @@ RDEPEND="${PYTHON_DEPS}
65 vpx? ( media-libs/libvpx:0= )
66 "
67 DEPEND="${RDEPEND}
68 - oss? ( virtual/os-headers:0 )"
69 + oss? ( virtual/os-headers:0 )
70 +"
71
72 S="${WORKDIR}/${MY_P}"
73
74 @@ -82,7 +80,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
75 src_prepare() {
76 default
77
78 - #Don't reapply PATCHES during cmake-utils_src_prepare
79 + # Don't reapply PATCHES during cmake-utils_src_prepare
80 unset PATCHES
81
82 processes="buildPluginsCommon:avidemux_plugins