diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2013-04-24 01:46:28 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2013-04-24 01:46:28 +0000 |
| commit | 3e3117985e3333dd67d598639d0f7418bd9676fd (patch) | |
| tree | f07de2c0b9529e28fd389f23ebd51d21e91e7dba /eclass | |
| parent | will the real maintainer please stand up (diff) | |
| download | gentoo-2-3e3117985e3333dd67d598639d0f7418bd9676fd.tar.gz gentoo-2-3e3117985e3333dd67d598639d0f7418bd9676fd.tar.bz2 gentoo-2-3e3117985e3333dd67d598639d0f7418bd9676fd.zip | |
Migrate from python-r1 to python-single-r1.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/vim.eclass | 37 |
2 files changed, 18 insertions, 24 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index bfcb9a4d9270..737525b132c1 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.799 2013/04/21 23:26:59 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.800 2013/04/24 01:46:28 radhermit Exp $ + + 24 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass: + Migrate from python-r1 to python-single-r1. 21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass: Use python-r1 in EAPI 5 (patch by mgorny, bug #458794). diff --git a/eclass/vim.eclass b/eclass/vim.eclass index e3912738258a..d457bc33a5fb 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.210 2013/04/21 23:26:59 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.211 2013/04/24 01:46:28 radhermit Exp $ # Authors: # Jim Ramsay <lack@gentoo.org> @@ -43,7 +43,7 @@ MY_PN=${PN%-cvs} if [[ ${MY_PN} != "vim-core" ]] ; then if [[ ${HAS_PYTHON_R1} ]]; then PYTHON_REQ_USE=threads - inherit python-r1 + inherit python-single-r1 else # vim supports python-2 only PYTHON_DEPEND="python? 2" @@ -90,13 +90,6 @@ else python? ( ${PYTHON_DEPS} )" RDEPEND="${RDEPEND} python? ( ${PYTHON_DEPS} )" - # at most one version of py2 and one of py3 - REQUIRED_USE="${REQUIRED_USE} - python? ( - || ( $(python_gen_useflags '*') ) - ?? ( $(python_gen_useflags 'python2*') ) - ?? ( $(python_gen_useflags 'python3*') ) - )" fi DEPEND="${DEPEND} @@ -255,8 +248,10 @@ vim_pkg_setup() { mkdir -p "${T}/home" export HOME="${T}/home" - if [[ ! ${HAS_PYTHON_R1} ]]; then - if [[ ${MY_PN} != "vim-core" ]] && use python; then + if [[ ${MY_PN} != "vim-core" ]] && use python; then + if [[ ${HAS_PYTHON_R1} ]]; then + python-single-r1_pkg_setup + else # vim supports python-2 only python_set_active_version 2 # python.eclass only defines python_pkg_setup for EAPIs that support @@ -436,19 +431,15 @@ vim_src_configure() { myconf="${myconf} `use_enable perl perlinterp`" if [[ ${HAS_PYTHON_R1} ]]; then if use python; then - py_add_interp() { - local v - - [[ ${EPYTHON} == python3* ]] && v=3 - - myconf="${myconf} --enable-python${v}interp - vi_cv_path_python${v}=${PYTHON}" - } - - python_foreach_impl py_add_interp + if [[ ${EPYTHON} == python3* ]]; then + myconf="${myconf} --enable-python3interp" + export vi_cv_path_python3="${PYTHON}" + else + myconf="${myconf} --enable-pythoninterp" + export vi_cv_path_python="${PYTHON}" + fi else - myconf="${myconf} --disable-pythoninterp - --disable-python3interp" + myconf="${myconf} --disable-pythoninterp --disable-python3interp" fi else myconf="${myconf} `use_enable python pythoninterp`" |