| 1 |
commit: a1c6712b550f978bd12e228557bb0b8e986c84cd |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 20 19:16:04 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 27 15:19:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c6712b |
| 7 |
|
| 8 |
app-editors/gvim: Convert to python-single-r1, #615832 |
| 9 |
|
| 10 |
.../{gvim-9999.ebuild => gvim-8.0.0386-r1.ebuild} | 31 +++++----------------- |
| 11 |
app-editors/gvim/gvim-9999.ebuild | 31 +++++----------------- |
| 12 |
2 files changed, 12 insertions(+), 50 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.0.0386-r1.ebuild |
| 15 |
similarity index 95% |
| 16 |
copy from app-editors/gvim/gvim-9999.ebuild |
| 17 |
copy to app-editors/gvim/gvim-8.0.0386-r1.ebuild |
| 18 |
index ba7529e5ea0..b56a0e66757 100644 |
| 19 |
--- a/app-editors/gvim/gvim-9999.ebuild |
| 20 |
+++ b/app-editors/gvim/gvim-8.0.0386-r1.ebuild |
| 21 |
@@ -5,7 +5,7 @@ EAPI=6 |
| 22 |
VIM_VERSION="8.0" |
| 23 |
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 24 |
PYTHON_REQ_USE=threads |
| 25 |
-inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-r1 |
| 26 |
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-single-r1 |
| 27 |
|
| 28 |
if [[ ${PV} == 9999* ]] ; then |
| 29 |
inherit git-r3 |
| 30 |
@@ -25,11 +25,7 @@ LICENSE="vim" |
| 31 |
IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" |
| 32 |
REQUIRED_USE=" |
| 33 |
luajit? ( lua ) |
| 34 |
- python? ( |
| 35 |
- || ( $(python_gen_useflags '*') ) |
| 36 |
- ?? ( $(python_gen_useflags 'python2*') ) |
| 37 |
- ?? ( $(python_gen_useflags 'python3*') ) |
| 38 |
- ) |
| 39 |
+ python? ( ${PYTHON_REQUIRED_USE} ) |
| 40 |
" |
| 41 |
|
| 42 |
RDEPEND=" |
| 43 |
@@ -92,6 +88,8 @@ pkg_setup() { |
| 44 |
# Gnome sandbox silliness. bug #114475. |
| 45 |
mkdir -p "${T}"/home |
| 46 |
export HOME="${T}"/home |
| 47 |
+ |
| 48 |
+ use python && python-single-r1_pkg_setup |
| 49 |
} |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
@@ -188,6 +186,8 @@ src_configure() { |
| 53 |
$(use_enable netbeans) |
| 54 |
$(use_enable nls) |
| 55 |
$(use_enable perl perlinterp) |
| 56 |
+ $(use_enable python pythoninterp) |
| 57 |
+ $(use_enable python python3interp) |
| 58 |
$(use_enable racket mzschemeinterp) |
| 59 |
$(use_enable ruby rubyinterp) |
| 60 |
$(use_enable selinux) |
| 61 |
@@ -195,25 +195,6 @@ src_configure() { |
| 62 |
$(use_enable tcl tclinterp) |
| 63 |
) |
| 64 |
|
| 65 |
- if use python ; then |
| 66 |
- py_add_interp() { |
| 67 |
- local v |
| 68 |
- |
| 69 |
- [[ ${EPYTHON} == python3* ]] && v=3 |
| 70 |
- myconf+=( |
| 71 |
- --enable-python${v}interp |
| 72 |
- vi_cv_path_python${v}="${PYTHON}" |
| 73 |
- ) |
| 74 |
- } |
| 75 |
- |
| 76 |
- python_foreach_impl py_add_interp |
| 77 |
- else |
| 78 |
- myconf+=( |
| 79 |
- --disable-pythoninterp |
| 80 |
- --disable-python3interp |
| 81 |
- ) |
| 82 |
- fi |
| 83 |
- |
| 84 |
# --with-features=huge forces on cscope even if we --disable it. We need |
| 85 |
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) |
| 86 |
if ! use cscope ; then |
| 87 |
|
| 88 |
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild |
| 89 |
index ba7529e5ea0..b56a0e66757 100644 |
| 90 |
--- a/app-editors/gvim/gvim-9999.ebuild |
| 91 |
+++ b/app-editors/gvim/gvim-9999.ebuild |
| 92 |
@@ -5,7 +5,7 @@ EAPI=6 |
| 93 |
VIM_VERSION="8.0" |
| 94 |
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 95 |
PYTHON_REQ_USE=threads |
| 96 |
-inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-r1 |
| 97 |
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-single-r1 |
| 98 |
|
| 99 |
if [[ ${PV} == 9999* ]] ; then |
| 100 |
inherit git-r3 |
| 101 |
@@ -25,11 +25,7 @@ LICENSE="vim" |
| 102 |
IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" |
| 103 |
REQUIRED_USE=" |
| 104 |
luajit? ( lua ) |
| 105 |
- python? ( |
| 106 |
- || ( $(python_gen_useflags '*') ) |
| 107 |
- ?? ( $(python_gen_useflags 'python2*') ) |
| 108 |
- ?? ( $(python_gen_useflags 'python3*') ) |
| 109 |
- ) |
| 110 |
+ python? ( ${PYTHON_REQUIRED_USE} ) |
| 111 |
" |
| 112 |
|
| 113 |
RDEPEND=" |
| 114 |
@@ -92,6 +88,8 @@ pkg_setup() { |
| 115 |
# Gnome sandbox silliness. bug #114475. |
| 116 |
mkdir -p "${T}"/home |
| 117 |
export HOME="${T}"/home |
| 118 |
+ |
| 119 |
+ use python && python-single-r1_pkg_setup |
| 120 |
} |
| 121 |
|
| 122 |
src_prepare() { |
| 123 |
@@ -188,6 +186,8 @@ src_configure() { |
| 124 |
$(use_enable netbeans) |
| 125 |
$(use_enable nls) |
| 126 |
$(use_enable perl perlinterp) |
| 127 |
+ $(use_enable python pythoninterp) |
| 128 |
+ $(use_enable python python3interp) |
| 129 |
$(use_enable racket mzschemeinterp) |
| 130 |
$(use_enable ruby rubyinterp) |
| 131 |
$(use_enable selinux) |
| 132 |
@@ -195,25 +195,6 @@ src_configure() { |
| 133 |
$(use_enable tcl tclinterp) |
| 134 |
) |
| 135 |
|
| 136 |
- if use python ; then |
| 137 |
- py_add_interp() { |
| 138 |
- local v |
| 139 |
- |
| 140 |
- [[ ${EPYTHON} == python3* ]] && v=3 |
| 141 |
- myconf+=( |
| 142 |
- --enable-python${v}interp |
| 143 |
- vi_cv_path_python${v}="${PYTHON}" |
| 144 |
- ) |
| 145 |
- } |
| 146 |
- |
| 147 |
- python_foreach_impl py_add_interp |
| 148 |
- else |
| 149 |
- myconf+=( |
| 150 |
- --disable-pythoninterp |
| 151 |
- --disable-python3interp |
| 152 |
- ) |
| 153 |
- fi |
| 154 |
- |
| 155 |
# --with-features=huge forces on cscope even if we --disable it. We need |
| 156 |
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) |
| 157 |
if ! use cscope ; then |
Archives