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 0343E13835A for ; Sun, 21 Jun 2020 14:58:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9D4DE0872; Sun, 21 Jun 2020 14:58:13 +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 5772FE0872 for ; Sun, 21 Jun 2020 14:58:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 ECD3834FBD8 for ; Sun, 21 Jun 2020 14:58:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39A3C1AC for ; Sun, 21 Jun 2020 14:58:10 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1592751471.f1448b354ef4d5204520103ab87b6334ca8bba51.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-vim/vimoutliner/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild X-VCS-Directories: app-vim/vimoutliner/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: f1448b354ef4d5204520103ab87b6334ca8bba51 X-VCS-Branch: master Date: Sun, 21 Jun 2020 14:58:10 +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: 0bc48250-9733-4ea7-b5ba-5499c93601fc X-Archives-Hash: d5db5204f9d0e25b97f8f85b04910adc commit: f1448b354ef4d5204520103ab87b6334ca8bba51 Author: Patrice Clement gentoo org> AuthorDate: Sun Jun 21 12:45:44 2020 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sun Jun 21 14:57:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1448b35 app-vim/vimoutliner: add back Python 3 support. Closes: https://bugs.gentoo.org/708392 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrice Clement gentoo.org> .../vimoutliner-0.4.0_p20180301-r2.ebuild | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild index e35b5c0b147..67a530a89de 100644 --- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild +++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) inherit python-single-r1 vim-plugin vcs-snapshot @@ -22,16 +22,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" VIM_PLUGIN_HELPFILES="vimoutliner" VIM_PLUGIN_MESSAGES="filetype" -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/autopep8[${PYTHON_MULTI_USEDEP}] - ')" -DEPEND="${RDEPEND}" +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/autopep8[${PYTHON_MULTI_USEDEP}]') +" + +DEPEND=" + ${RDEPEND}" src_prepare() { default - sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py || die + sed -e '1s:^:#!/usr/bin/python\n:' \ + -i "${S}"/vimoutliner/scripts/otl2latex/otl2latex.py || die find "${S}" -type f -exec chmod a+r {} \; || die } @@ -39,7 +42,8 @@ src_compile() { local pyscript _pyscript for pyscript in $(find "${S}" -type f -name \*.py); do _pyscript=$(basename "${pyscript}") - [ ${_pyscript} == "otl.py" ] && continue - python_fix_shebang -q "${pyscript}" + [[ ${_pyscript} == "otl.py" ]] && continue + 2to3 -w -n --no-diffs "${pyscript}" >& /dev/null || die + python_fix_shebang -f -q "${pyscript}" done }