Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 566666 Details for
Bug 678950
app-editors/vim app-editors/gvim - build against multiple python versions
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
git patch
file_678950.txt (text/plain), 4.36 KB, created by
Constantin Runge
on 2019-02-27 16:51:34 UTC
(
hide
)
Description:
git patch
Filename:
MIME Type:
Creator:
Constantin Runge
Created:
2019-02-27 16:51:34 UTC
Size:
4.36 KB
patch
obsolete
>diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild >index ec2135b35587..3d80eeee3f86 100644 >--- a/app-editors/gvim/gvim-9999.ebuild >+++ b/app-editors/gvim/gvim-9999.ebuild >@@ -2,12 +2,12 @@ > # Distributed under the terms of the GNU General Public License v2 > > EAPI=6 >-VIM_VERSION="8.0" >+VIM_VERSION="8.1" > PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) > PYTHON_REQ_USE="threads" > USE_RUBY="ruby23 ruby24 ruby25" > >-inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single >+inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-r1 ruby-single > > if [[ ${PV} == 9999* ]]; then > inherit git-r3 >@@ -89,8 +89,6 @@ pkg_setup() { > # Gnome sandbox silliness. bug #114475. > mkdir -p "${T}"/home || die > export HOME="${T}"/home >- >- use python && python-single-r1_pkg_setup > } > > src_prepare() { >@@ -196,8 +194,6 @@ src_configure() { > $(use_enable netbeans) > $(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) >@@ -205,6 +201,31 @@ src_configure() { > $(use_enable tcl tclinterp) > ) > >+ if use python ; then >+ local py2=0 py3=0 >+ >+ pyver() >+ { >+ [[ ${EPYTHON} == python2* ]] && py2=1 >+ [[ ${EPYTHON} == python3* ]] && py3=1 >+ } >+ >+ python_foreach_impl pyver >+ >+ if [ $py2 -eq 1 ] && [ $py3 -eq 1 ] ; then >+ myconf+=( >+ --enable-pythoninterp=dynamic >+ --enable-python3interp=dynamic >+ --with-python-config-dir=$(python_setup 'python2*' && ${EPYTHON} -c 'import sysconfig; print(sysconfig.get_config_var("LIBPL"))') >+ --with-python3-config-dir=$(python_setup 'python3*' && $(python_get_PYTHON_CONFIG) --configdir) >+ ) >+ elif [ $py2 -eq 1 ] && [ $py3 -eq 0 ] ; then >+ myconf+=( --enable-pythoninterp ) >+ elif [ $py2 -eq 0 ] && [ $py3 -eq 1 ] ; then >+ myconf+=( --enable-python3interp ) >+ fi >+ 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 4780f97dad96..745850dd67c6 100644 >--- a/app-editors/vim/vim-9999.ebuild >+++ b/app-editors/vim/vim-9999.ebuild >@@ -2,12 +2,12 @@ > # Distributed under the terms of the GNU General Public License v2 > > EAPI=6 >-VIM_VERSION="8.0" >+VIM_VERSION="8.1" > PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) > PYTHON_REQ_USE="threads" > USE_RUBY="ruby23 ruby24 ruby25" > >-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single >+inherit vim-doc flag-o-matic bash-completion-r1 python-r1 ruby-single > > if [[ ${PV} == 9999* ]] ; then > inherit git-r3 >@@ -67,8 +67,6 @@ pkg_setup() { > # Gnome sandbox silliness. bug #114475. > mkdir -p "${T}"/home || die "mkdir failed" > export HOME="${T}"/home >- >- use python && python-single-r1_pkg_setup > } > > src_prepare() { >@@ -204,8 +202,6 @@ 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) >@@ -213,6 +209,31 @@ src_configure() { > $(use_enable terminal) > ) > >+ if use python ; then >+ local py2=0 py3=0 >+ >+ pyver() >+ { >+ [[ ${EPYTHON} == python2* ]] && py2=1 >+ [[ ${EPYTHON} == python3* ]] && py3=1 >+ } >+ >+ python_foreach_impl pyver >+ >+ if [ $py2 -eq 1 ] && [ $py3 -eq 1 ] ; then >+ myconf+=( >+ --enable-pythoninterp=dynamic >+ --enable-python3interp=dynamic >+ --with-python-config-dir=$(python_setup 'python2*' && ${EPYTHON} -c 'import sysconfig; print(sysconfig.get_config_var("LIBPL"))') >+ --with-python3-config-dir=$(python_setup 'python3*' && $(python_get_PYTHON_CONFIG) --configdir) >+ ) >+ elif [ $py2 -eq 1 ] && [ $py3 -eq 0 ] ; then >+ myconf+=( --enable-pythoninterp ) >+ elif [ $py2 -eq 0 ] && [ $py3 -eq 1 ] ; then >+ myconf+=( --enable-python3interp ) >+ fi >+ 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 678950
: 566666