From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2AF7138334 for ; Sat, 29 Jun 2019 21:34:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83E7BE082F; Sat, 29 Jun 2019 21:34:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57D05E082F for ; Sat, 29 Jun 2019 21:34:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CA5E346CCE for ; Sat, 29 Jun 2019 21:34:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1829462C for ; Sat, 29 Jun 2019 21:34:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1561844032.b07857a21fa10ede044d9a5fc0484c20fdb84281.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mlt/mlt-6.16.0-r1.ebuild X-VCS-Directories: media-libs/mlt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b07857a21fa10ede044d9a5fc0484c20fdb84281 X-VCS-Branch: master Date: Sat, 29 Jun 2019 21:34:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 073cf259-33a5-4665-b24c-39187f4ffc85 X-Archives-Hash: f301ac27d18af5cb35af2561d32f4d56 commit: b07857a21fa10ede044d9a5fc0484c20fdb84281 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 29 18:44:54 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 29 21:33:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07857a2 media-libs/mlt: Drop broken USE ruby support Bug: https://bugs.gentoo.org/684436 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/mlt/mlt-6.16.0-r1.ebuild | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild index 7520d72f6a7..7f71384a4b2 100644 --- a/media-libs/mlt/mlt-6.16.0-r1.ebuild +++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild @@ -4,11 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) -# this ebuild currently only supports installing ruby bindings for a single ruby version -# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls -# /usr/bin/${USE_RUBY} directly -USE_RUBY="ruby24" -inherit python-single-r1 qmake-utils ruby-single toolchain-funcs +inherit python-single-r1 qmake-utils toolchain-funcs DESCRIPTION="Open source multimedia framework for television broadcasting" HOMEPAGE="https://www.mltframework.org/" @@ -19,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python -qt5 rtaudio ruby sdl vdpau vidstab xine xml" +qt5 rtaudio sdl vdpau vidstab xine xml" # java perl php tcl REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -28,13 +24,13 @@ SWIG_DEPEND=">=dev-lang/swig-2.0" # java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 ) # perl? ( ${SWIG_DEPEND} ) # php? ( ${SWIG_DEPEND} ) +# ruby? ( ${SWIG_DEPEND} ) # tcl? ( ${SWIG_DEPEND} ) BDEPEND=" virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) - python? ( ${SWIG_DEPEND} ) - ruby? ( ${SWIG_DEPEND} )" + python? ( ${SWIG_DEPEND} )" #rtaudio will use OSS on non linux OSes DEPEND=" >=media-libs/libebur128-1.2.2:= @@ -72,7 +68,6 @@ DEPEND=" >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) - ruby? ( ${RUBY_DEPS} ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image @@ -83,6 +78,7 @@ DEPEND=" # java? ( >=virtual/jre-1.5 ) # perl? ( dev-lang/perl ) # php? ( dev-lang/php ) +# ruby? ( ${RUBY_DEPS} ) # sox? ( media-sound/sox ) # tcl? ( dev-lang/tcl:0= ) RDEPEND="${DEPEND}" @@ -110,8 +106,6 @@ src_prepare() { sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die done - sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die - # fix python3 include dir sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die } @@ -175,8 +169,8 @@ src_configure() { # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover local swig_lang=() - # TODO: java perl php tcl - for i in lua python ruby ; do + # TODO: java perl php ruby tcl + for i in lua python ; do use $i && swig_lang+=( $i ) done [[ -z "${swig_lang}" ]] && swig_lang=( none ) @@ -213,11 +207,5 @@ src_install() { python_optimize fi - if use ruby; then - cd "${S}"/src/swig/ruby || die - exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]') - doexe mlt.so - dodoc play.rb thumbs.rb - fi - # TODO: java perl php tcl + # TODO: java perl php ruby tcl }