commit: a1c6712b550f978bd12e228557bb0b8e986c84cd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 19:16:04 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 27 15:19:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c6712b
app-editors/gvim: Convert to python-single-r1, #615832
.../{gvim-9999.ebuild => gvim-8.0.0386-r1.ebuild} | 31 +++++-----------------
app-editors/gvim/gvim-9999.ebuild | 31 +++++-----------------
2 files changed, 12 insertions(+), 50 deletions(-)
diff --git a/app-editors/gvim/gvim-9999.ebuild
b/app-editors/gvim/gvim-8.0.0386-r1.ebuild
similarity index 95%
copy from app-editors/gvim/gvim-9999.ebuild
copy to app-editors/gvim/gvim-8.0.0386-r1.ebuild
index ba7529e5ea0..b56a0e66757 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-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 gnome2-utils versionator
bash-completion-r1 prefix python-r1
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator
bash-completion-r1 prefix python-single-r1
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
@@ -25,11 +25,7 @@ LICENSE="vim"
IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls
perl python racket ruby selinux session tcl"
REQUIRED_USE="
luajit? ( lua )
- python? (
- || ( $(python_gen_useflags '*') )
- ?? ( $(python_gen_useflags 'python2*') )
- ?? ( $(python_gen_useflags 'python3*') )
- )
+ python? ( ${PYTHON_REQUIRED_USE} )
"
RDEPEND="
@@ -92,6 +88,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() {
@@ -188,6 +186,8 @@ 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)
@@ -195,25 +195,6 @@ src_configure() {
$(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/gvim/gvim-9999.ebuild
b/app-editors/gvim/gvim-9999.ebuild
index ba7529e5ea0..b56a0e66757 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-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 gnome2-utils versionator
bash-completion-r1 prefix python-r1
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator
bash-completion-r1 prefix python-single-r1
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
@@ -25,11 +25,7 @@ LICENSE="vim"
IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls
perl python racket ruby selinux session tcl"
REQUIRED_USE="
luajit? ( lua )
- python? (
- || ( $(python_gen_useflags '*') )
- ?? ( $(python_gen_useflags 'python2*') )
- ?? ( $(python_gen_useflags 'python3*') )
- )
+ python? ( ${PYTHON_REQUIRED_USE} )
"
RDEPEND="
@@ -92,6 +88,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() {
@@ -188,6 +186,8 @@ 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)
@@ -195,25 +195,6 @@ src_configure() {
$(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
