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 4E23A139694 for ; Sat, 27 May 2017 15:19:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7646F21C012; Sat, 27 May 2017 15:19:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AB02E0D14 for ; Sat, 27 May 2017 15:19:31 +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 A9B5434164B for ; Sat, 27 May 2017 15:19:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E755745F for ; Sat, 27 May 2017 15:19:28 +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: <1495898356.778b69c618b4e33ae5a129c9276d75c91ad3b46a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/vim/vim-8.0.0386-r1.ebuild app-editors/vim/vim-9999.ebuild X-VCS-Directories: app-editors/vim/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 778b69c618b4e33ae5a129c9276d75c91ad3b46a X-VCS-Branch: master Date: Sat, 27 May 2017 15:19:28 +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-Archives-Salt: 28614fd7-0cfd-4361-b7e4-f8ff9752da0e X-Archives-Hash: 35cba625717c656d7ed6dcd3d90f65c3 commit: 778b69c618b4e33ae5a129c9276d75c91ad3b46a Author: Michał Górny gentoo org> AuthorDate: Thu Apr 20 19:05:13 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat May 27 15:19:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778b69c6 app-editors/vim: Convert to python-single-r1, #615832 .../{vim-9999.ebuild => vim-8.0.0386-r1.ebuild} | 33 +++++----------------- app-editors/vim/vim-9999.ebuild | 31 ++++---------------- 2 files changed, 13 insertions(+), 51 deletions(-) diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-8.0.0386-r1.ebuild similarity index 93% copy from app-editors/vim/vim-9999.ebuild copy to app-editors/vim/vim-8.0.0386-r1.ebuild index 7bbc4a62c5c..dcd88946537 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-8.0.0386-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 VIM_VERSION="8.0" PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE=threads -inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1 +inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1 if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" @@ -24,11 +24,7 @@ LICENSE="vim" IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" REQUIRED_USE=" luajit? ( lua ) - python? ( - || ( $(python_gen_useflags '*') ) - ?? ( $(python_gen_useflags 'python2*') ) - ?? ( $(python_gen_useflags 'python3*') ) - ) + python? ( ${PYTHON_REQUIRED_USE} ) " RDEPEND=" @@ -67,6 +63,8 @@ pkg_setup() { # Gnome sandbox silliness. bug #114475. mkdir -p "${T}"/home export HOME="${T}"/home + + use python && python-single-r1_pkg_setup } src_prepare() { @@ -195,31 +193,14 @@ src_configure() { $(use_with luajit) $(use_enable nls) $(use_enable perl perlinterp) + $(use_enable python pythoninterp) + $(use_enable python python3interp) $(use_enable racket mzschemeinterp) $(use_enable ruby rubyinterp) $(use_enable selinux) $(use_enable tcl tclinterp) ) - if use python ; then - py_add_interp() { - local v - - [[ ${EPYTHON} == python3* ]] && v=3 - myconf+=( - --enable-python${v}interp - vi_cv_path_python${v}="${PYTHON}" - ) - } - - python_foreach_impl py_add_interp - else - myconf+=( - --disable-pythoninterp - --disable-python3interp - ) - fi - # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) if ! use cscope ; then diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 7bbc4a62c5c..f1b87f0b3ab 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 VIM_VERSION="8.0" PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE=threads -inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1 +inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1 if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -24,11 +24,7 @@ LICENSE="vim" IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" REQUIRED_USE=" luajit? ( lua ) - python? ( - || ( $(python_gen_useflags '*') ) - ?? ( $(python_gen_useflags 'python2*') ) - ?? ( $(python_gen_useflags 'python3*') ) - ) + python? ( ${PYTHON_REQUIRED_USE} ) " RDEPEND=" @@ -67,6 +63,8 @@ pkg_setup() { # Gnome sandbox silliness. bug #114475. mkdir -p "${T}"/home export HOME="${T}"/home + + use python && python-single-r1_pkg_setup } src_prepare() { @@ -195,31 +193,14 @@ src_configure() { $(use_with luajit) $(use_enable nls) $(use_enable perl perlinterp) + $(use_enable python pythoninterp) + $(use_enable python python3interp) $(use_enable racket mzschemeinterp) $(use_enable ruby rubyinterp) $(use_enable selinux) $(use_enable tcl tclinterp) ) - if use python ; then - py_add_interp() { - local v - - [[ ${EPYTHON} == python3* ]] && v=3 - myconf+=( - --enable-python${v}interp - vi_cv_path_python${v}="${PYTHON}" - ) - } - - python_foreach_impl py_add_interp - else - myconf+=( - --disable-pythoninterp - --disable-python3interp - ) - fi - # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) if ! use cscope ; then