|
Lines 29-34
case "${EAPI:-0}" in
Link Here
|
| 29 |
;; |
29 |
;; |
| 30 |
2|3) |
30 |
2|3) |
| 31 |
;; |
31 |
;; |
|
|
32 |
5) |
| 33 |
HAS_PYTHON_R1=1 |
| 34 |
;; |
| 32 |
*) |
35 |
*) |
| 33 |
die "Unknown EAPI ${EAPI}" |
36 |
die "Unknown EAPI ${EAPI}" |
| 34 |
;; |
37 |
;; |
|
Lines 38-48
esac
Link Here
|
| 38 |
MY_PN=${PN%-cvs} |
41 |
MY_PN=${PN%-cvs} |
| 39 |
|
42 |
|
| 40 |
if [[ ${MY_PN} != "vim-core" ]] ; then |
43 |
if [[ ${MY_PN} != "vim-core" ]] ; then |
| 41 |
# vim supports python-2 only |
44 |
if [[ ${HAS_PYTHON_R1} ]]; then |
| 42 |
PYTHON_DEPEND="python? 2" |
45 |
PYTHON_REQ_USE=threads |
| 43 |
PYTHON_USE_WITH_OPT="python" |
46 |
inherit python-r1 |
| 44 |
PYTHON_USE_WITH="threads" |
47 |
else |
| 45 |
inherit python |
48 |
# vim supports python-2 only |
|
|
49 |
PYTHON_DEPEND="python? 2" |
| 50 |
PYTHON_USE_WITH_OPT="python" |
| 51 |
PYTHON_USE_WITH="threads" |
| 52 |
inherit python |
| 53 |
fi |
| 46 |
fi |
54 |
fi |
| 47 |
inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix |
55 |
inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix |
| 48 |
|
56 |
|
|
Lines 76-81
if [[ ${MY_PN} == "vim-core" ]] ; then
Link Here
|
| 76 |
else |
84 |
else |
| 77 |
IUSE="${IUSE} cscope debug gpm perl python ruby" |
85 |
IUSE="${IUSE} cscope debug gpm perl python ruby" |
| 78 |
|
86 |
|
|
|
87 |
if [[ ${HAS_PYTHON_R1} ]]; then |
| 88 |
DEPEND="${DEPEND} |
| 89 |
python? ( ${PYTHON_DEPS} )" |
| 90 |
RDEPEND="${RDEPEND} |
| 91 |
python? ( ${PYTHON_DEPS} )" |
| 92 |
# at most one version of py2 and one of py3 |
| 93 |
REQUIRED_USE="${REQUIRED_USE} |
| 94 |
python? ( |
| 95 |
|| ( $(python_gen_useflags '*') ) |
| 96 |
?? ( $(python_gen_useflags 'python2*') ) |
| 97 |
?? ( $(python_gen_useflags 'python3*') ) |
| 98 |
)" |
| 99 |
fi |
| 100 |
|
| 79 |
DEPEND="${DEPEND} |
101 |
DEPEND="${DEPEND} |
| 80 |
cscope? ( dev-util/cscope ) |
102 |
cscope? ( dev-util/cscope ) |
| 81 |
gpm? ( >=sys-libs/gpm-1.19.3 ) |
103 |
gpm? ( >=sys-libs/gpm-1.19.3 ) |
|
Lines 232-243
vim_pkg_setup() {
Link Here
|
| 232 |
mkdir -p "${T}/home" |
254 |
mkdir -p "${T}/home" |
| 233 |
export HOME="${T}/home" |
255 |
export HOME="${T}/home" |
| 234 |
|
256 |
|
| 235 |
if [[ ${MY_PN} != "vim-core" ]] && use python; then |
257 |
if [[ ! ${HAS_PYTHON_R1} ]]; then |
| 236 |
# vim supports python-2 only |
258 |
if [[ ${MY_PN} != "vim-core" ]] && use python; then |
| 237 |
python_set_active_version 2 |
259 |
# vim supports python-2 only |
| 238 |
# python.eclass only defines python_pkg_setup for EAPIs that support |
260 |
python_set_active_version 2 |
| 239 |
# USE dependencies |
261 |
# python.eclass only defines python_pkg_setup for EAPIs that support |
| 240 |
python_pkg_setup |
262 |
# USE dependencies |
|
|
263 |
python_pkg_setup |
| 264 |
fi |
| 241 |
fi |
265 |
fi |
| 242 |
} |
266 |
} |
| 243 |
|
267 |
|
|
Lines 409-415
vim_src_configure() {
Link Here
|
| 409 |
myconf="${myconf} `use_enable cscope`" |
433 |
myconf="${myconf} `use_enable cscope`" |
| 410 |
myconf="${myconf} `use_enable gpm`" |
434 |
myconf="${myconf} `use_enable gpm`" |
| 411 |
myconf="${myconf} `use_enable perl perlinterp`" |
435 |
myconf="${myconf} `use_enable perl perlinterp`" |
| 412 |
myconf="${myconf} `use_enable python pythoninterp`" |
436 |
if [[ ${HAS_PYTHON_R1} ]]; then |
|
|
437 |
if use python; then |
| 438 |
py_add_interp() { |
| 439 |
local v |
| 440 |
|
| 441 |
[[ ${EPYTHON} == python3* ]] && v=3 |
| 442 |
|
| 443 |
myconf="${myconf} --enable-python${v}interp |
| 444 |
vi_cv_path_python${v}=${PYTHON}" |
| 445 |
} |
| 446 |
|
| 447 |
python_foreach_impl py_add_interp |
| 448 |
else |
| 449 |
myconf="${myconf} --disable-pythoninterp |
| 450 |
--disable-python3interp" |
| 451 |
fi |
| 452 |
else |
| 453 |
myconf="${myconf} `use_enable python pythoninterp`" |
| 454 |
fi |
| 413 |
myconf="${myconf} `use_enable ruby rubyinterp`" |
455 |
myconf="${myconf} `use_enable ruby rubyinterp`" |
| 414 |
# tclinterp is broken; when you --enable-tclinterp flag, then |
456 |
# tclinterp is broken; when you --enable-tclinterp flag, then |
| 415 |
# the following command never returns: |
457 |
# the following command never returns: |
| 416 |
- |
|
|
