Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed handling of Python 2.7 USE flag in app-vim/powerline-vim. #97

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app-vim/powerline-vim/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
DIST powerline-status-2.6.tar.gz 231421 BLAKE2B d4717850d37bfc031531afb8d1f0fc17f1dac5619e35b0bb122cc50b984c63ec2a095ee21ebcd48991ce71f43bb522d6f4baba1492e876d79a302ae24ba01972 SHA512 42a75822d7657a4c03b55fd115b382d821e2683b94db8a9513bec33fbc8de8c23df8ae6df2633dd2d45d86fce8a1a9a61aeb6ed72ef9446e4a8fd345a747b648
DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
2 changes: 1 addition & 1 deletion app-vim/powerline-vim/powerline-vim-2.7.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ else
S="${WORKDIR}/${MY_P}"
fi

default_to_py3() {
# Make the plugin default to using Python 3.x instead of 2.x.
sed -i -e \
"/if exists('g:powerline_pycmd')/i \\let g:powerline_pycmd = 'py3'" \
"${S}"/powerline/bindings/vim/plugin/powerline.vim ||
die
}


src_prepare() {
default
Expand All @@ -75,11 +83,12 @@ src_prepare() {
# should set g:powerline_pycmd to "py3" to make it load correctly.
# Unable to import powerline, is it installed?
# Press ENTER or type command to continue
if ! use python_targets_python2_7; then
sed -i -e \
"/if exists('g:powerline_pycmd')/i \\let g:powerline_pycmd = 'py3'" \
"${S}"/powerline/bindings/vim/plugin/powerline.vim ||
die
if has python_targets_python2_7 ${IUSE} ; then
if ! use python_targets_python2_7; then
default_to_py3
fi
else
default_to_py3
fi

# vim-plugin_src_install() expects ${S} to be the top-level directory for
Expand Down