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 B431E138334 for ; Tue, 16 Jul 2019 18:19:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 893ADE0806; Tue, 16 Jul 2019 18:19:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 68534E0806 for ; Tue, 16 Jul 2019 18:19:44 +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 B7198347D07 for ; Tue, 16 Jul 2019 18:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F2985F1 for ; Tue, 16 Jul 2019 18:19:40 +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: <1563299572.59124c368c5d9673d5e4adc813ddff8b542d63fb.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 media-libs/mlt/mlt-6.16.0-r2.ebuild X-VCS-Directories: media-libs/mlt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 59124c368c5d9673d5e4adc813ddff8b542d63fb X-VCS-Branch: master Date: Tue, 16 Jul 2019 18:19:40 +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: 549ad61d-4e91-4f1f-a8a4-bd61a425c80f X-Archives-Hash: c88183ce4d10fc5f1191e08ad599eb9d commit: 59124c368c5d9673d5e4adc813ddff8b542d63fb Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 16 17:52:52 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 16 17:52:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59124c36 media-libs/mlt: Re-add python2_7 support Thanks-to: ak <4nykey gmail.com> Closes: https://bugs.gentoo.org/689068 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/mlt/mlt-6.16.0-r1.ebuild | 10 +++++++--- media-libs/mlt/mlt-6.16.0-r2.ebuild | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild index 6161697e042..dee7260c926 100644 --- a/media-libs/mlt/mlt-6.16.0-r1.ebuild +++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python2_7 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 @@ -112,8 +112,12 @@ src_prepare() { 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 + # fix python include dir + if use python; then + python_export PYTHON_INCLUDEDIR + sed -e "/PYTHON_INCLUDE=/s:=.*:=${PYTHON_INCLUDEDIR}:" \ + -i src/swig/python/build || die + fi } src_configure() { diff --git a/media-libs/mlt/mlt-6.16.0-r2.ebuild b/media-libs/mlt/mlt-6.16.0-r2.ebuild index 1605afaedce..31ed25573ff 100644 --- a/media-libs/mlt/mlt-6.16.0-r2.ebuild +++ b/media-libs/mlt/mlt-6.16.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python2_7 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 @@ -112,8 +112,12 @@ src_prepare() { 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 + # fix python include dir + if use python; then + python_export PYTHON_INCLUDEDIR + sed -e "/PYTHON_INCLUDE=/s:=.*:=${PYTHON_INCLUDEDIR}:" \ + -i src/swig/python/build || die + fi } src_configure() {