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/mlt/
Date: Sat, 29 Jun 2019 21:34:29
Message-Id: 1561844032.b07857a21fa10ede044d9a5fc0484c20fdb84281.asturm@gentoo
1 commit: b07857a21fa10ede044d9a5fc0484c20fdb84281
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 29 18:44:54 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 29 21:33:52 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07857a2
7
8 media-libs/mlt: Drop broken USE ruby support
9
10 Bug: https://bugs.gentoo.org/684436
11 Package-Manager: Portage-2.3.67, Repoman-2.3.16
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 media-libs/mlt/mlt-6.16.0-r1.ebuild | 28 ++++++++--------------------
15 1 file changed, 8 insertions(+), 20 deletions(-)
16
17 diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild
18 index 7520d72f6a7..7f71384a4b2 100644
19 --- a/media-libs/mlt/mlt-6.16.0-r1.ebuild
20 +++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild
21 @@ -4,11 +4,7 @@
22 EAPI=7
23
24 PYTHON_COMPAT=( python3_{6,7} )
25 -# this ebuild currently only supports installing ruby bindings for a single ruby version
26 -# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
27 -# /usr/bin/${USE_RUBY} directly
28 -USE_RUBY="ruby24"
29 -inherit python-single-r1 qmake-utils ruby-single toolchain-funcs
30 +inherit python-single-r1 qmake-utils toolchain-funcs
31
32 DESCRIPTION="Open source multimedia framework for television broadcasting"
33 HOMEPAGE="https://www.mltframework.org/"
34 @@ -19,7 +15,7 @@ SLOT="0"
35 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
36 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
37 fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
38 -qt5 rtaudio ruby sdl vdpau vidstab xine xml"
39 +qt5 rtaudio sdl vdpau vidstab xine xml"
40 # java perl php tcl
41
42 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
43 @@ -28,13 +24,13 @@ SWIG_DEPEND=">=dev-lang/swig-2.0"
44 # java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
45 # perl? ( ${SWIG_DEPEND} )
46 # php? ( ${SWIG_DEPEND} )
47 +# ruby? ( ${SWIG_DEPEND} )
48 # tcl? ( ${SWIG_DEPEND} )
49 BDEPEND="
50 virtual/pkgconfig
51 compressed-lumas? ( virtual/imagemagick-tools[png] )
52 lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
53 - python? ( ${SWIG_DEPEND} )
54 - ruby? ( ${SWIG_DEPEND} )"
55 + python? ( ${SWIG_DEPEND} )"
56 #rtaudio will use OSS on non linux OSes
57 DEPEND="
58 >=media-libs/libebur128-1.2.2:=
59 @@ -72,7 +68,6 @@ DEPEND="
60 >=media-libs/rtaudio-4.1.2
61 kernel_linux? ( media-libs/alsa-lib )
62 )
63 - ruby? ( ${RUBY_DEPS} )
64 sdl? (
65 media-libs/libsdl2[X,opengl,video]
66 media-libs/sdl2-image
67 @@ -83,6 +78,7 @@ DEPEND="
68 # java? ( >=virtual/jre-1.5 )
69 # perl? ( dev-lang/perl )
70 # php? ( dev-lang/php )
71 +# ruby? ( ${RUBY_DEPS} )
72 # sox? ( media-sound/sox )
73 # tcl? ( dev-lang/tcl:0= )
74 RDEPEND="${DEPEND}"
75 @@ -110,8 +106,6 @@ src_prepare() {
76 sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
77 done
78
79 - sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
80 -
81 # fix python3 include dir
82 sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die
83 }
84 @@ -175,8 +169,8 @@ src_configure() {
85 # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
86
87 local swig_lang=()
88 - # TODO: java perl php tcl
89 - for i in lua python ruby ; do
90 + # TODO: java perl php ruby tcl
91 + for i in lua python ; do
92 use $i && swig_lang+=( $i )
93 done
94 [[ -z "${swig_lang}" ]] && swig_lang=( none )
95 @@ -213,11 +207,5 @@ src_install() {
96 python_optimize
97 fi
98
99 - if use ruby; then
100 - cd "${S}"/src/swig/ruby || die
101 - exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
102 - doexe mlt.so
103 - dodoc play.rb thumbs.rb
104 - fi
105 - # TODO: java perl php tcl
106 + # TODO: java perl php ruby tcl
107 }