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 D9250138334 for ; Mon, 22 Jul 2019 09:25:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B331E0858; Mon, 22 Jul 2019 09:25:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C17C9E0858 for ; Mon, 22 Jul 2019 09:25:19 +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 17A353486C3 for ; Mon, 22 Jul 2019 09:25:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A90DF72B for ; Mon, 22 Jul 2019 09:25:16 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1563787512.e419e962046e8d82749427bd9882fb43c2952e97.mgorny@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.3.6-r1.ebuild app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild app-vim/vimoutliner/vimoutliner-0.3.6.ebuild app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild X-VCS-Directories: app-vim/vimoutliner/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e419e962046e8d82749427bd9882fb43c2952e97 X-VCS-Branch: master Date: Mon, 22 Jul 2019 09:25:16 +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: 6ec1b13f-f551-4a5c-abd1-295dcff0f3b2 X-Archives-Hash: 9b796ae66bb0eff50c779466d617260e commit: e419e962046e8d82749427bd9882fb43c2952e97 Author: Michał Górny gentoo org> AuthorDate: Mon Jul 22 09:13:48 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jul 22 09:25:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e419e962 app-vim/vimoutliner: Add missing PYTHON_DEPS Signed-off-by: Michał Górny gentoo.org> app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild | 31 +++------------------- ...0.3.6-r1.ebuild => vimoutliner-0.3.6-r2.ebuild} | 3 ++- app-vim/vimoutliner/vimoutliner-0.3.6.ebuild | 23 ---------------- ...build => vimoutliner-0.4.0_p20180301-r1.ebuild} | 7 ++--- 4 files changed, 9 insertions(+), 55 deletions(-) diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild index d7c15479021..36ebfb95a0a 100644 --- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild +++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild @@ -1,31 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit vim-plugin python-single-r1 +inherit vim-plugin DESCRIPTION="vim plugin: easy and fast outlining" HOMEPAGE="https://github.com/vimoutliner/vimoutliner" SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86" VIM_PLUGIN_HELPFILES="vimoutliner" VIM_PLUGIN_MESSAGES="filetype" -PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" ) - -RDEPEND="dev-python/autopep8" - -pkg_setup() { - python-single-r1_pkg_setup -} - src_prepare() { default sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die @@ -33,16 +21,3 @@ src_prepare() { rm -v install.sh || die find "${S}" -type f -exec chmod a+r {} \; || die } - -src_compile() { - local pyscript _pyscript - for pyscript in $(find "${S}" -type f -name \*.py); do - _pyscript=$(basename "${pyscript}") - einfo "Processing ${_pyscript}" - sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die - 2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die - autopep8 -i "${pyscript}" || die - python_fix_shebang -q "${pyscript}" || die - eend $? - done -} diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild similarity index 95% copy from app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild copy to app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild index d7c15479021..b9d58e98e88 100644 --- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild +++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild @@ -20,7 +20,8 @@ VIM_PLUGIN_MESSAGES="filetype" PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" ) -RDEPEND="dev-python/autopep8" +RDEPEND="${PYTHON_DEPS} + dev-python/autopep8[${PYTHON_USEDEP}]" pkg_setup() { python-single-r1_pkg_setup diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild deleted file mode 100644 index 36ebfb95a0a..00000000000 --- a/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit vim-plugin - -DESCRIPTION="vim plugin: easy and fast outlining" -HOMEPAGE="https://github.com/vimoutliner/vimoutliner" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86" - -VIM_PLUGIN_HELPFILES="vimoutliner" -VIM_PLUGIN_MESSAGES="filetype" - -src_prepare() { - default - sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die - sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die - rm -v install.sh || die - find "${S}" -type f -exec chmod a+r {} \; || die -} diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild similarity index 88% rename from app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild rename to app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild index 69354227976..91f8bce967c 100644 --- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild +++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,13 +22,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" VIM_PLUGIN_HELPFILES="vimoutliner" VIM_PLUGIN_MESSAGES="filetype" -RDEPEND="dev-python/autopep8" +RDEPEND="${PYTHON_DEPS} + dev-python/autopep8[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" src_prepare() { default - sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py + sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py || die find "${S}" -type f -exec chmod a+r {} \; || die }