[gentoo-commits] dev/yngwin:master commit in: app-editors/neovim/files/, app-editors/neovim/, dev-lua/messagepack/

[Ben de Groot]

commit:     2790cee3c2c6bcabaaa674ffd1c2c58857a46248
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 26 04:28:27 2015 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 04:28:27 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=dev/yngwin.git;a=commit;h=2790cee3

neovim and messagepack ebuild improvements

---
 app-editors/neovim/Manifest                                      | 2 +-
 app-editors/neovim/files/nvimrc                                  | 9 +++++++--
 ...-0.0.0_pre20150223.ebuild => neovim-0.0.0_pre20150225.ebuild} | 7 ++++++-
 app-editors/neovim/neovim-9999.ebuild                            | 7 ++++++-
 dev-lua/messagepack/messagepack-0.3.2.ebuild                     | 4 ++--
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index da176de..7542740 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1 +1 @@
-DIST neovim-0.0.0_pre20150223.tar.xz 4764536 SHA256 
67b8df47d37172f1f87d4ce3480fbc68611f447ae53dea5b3e96ae7ae4ccdb17 SHA512 
f1aafe6e79f46c67394def4a72d50fe921c89f9209e7e23c785e7892006b97f4ce86eaccd470ccb980f822d3897f65a9934789d77f7ad5d05d92c259ecf16150
 WHIRLPOOL 
cb2069705bd6e62344667bb08e146bd159d60c9fb1331931462c3fb21f3a134e326fe228cfd50b8b14bd37648cab10c89721319ae29499d850f454942a3a783f
+DIST neovim-0.0.0_pre20150225.tar.xz 4768060 SHA256 
c2b9e1d60d5006022938c0cef0a25178a8fc3aefe469dc555b9396f8240dd82b SHA512 
7854aabd9384bf5c90cec2f478aa9b2f173f03d7f3a1f8645e3331a7f20cade58cf68e13a117785905564d09f5b6029d22aa9ea7263f739385135becfbd50ced
 WHIRLPOOL 
d0cf544d18d925fb809f1a4dcfc1622733a7079313d8c4462efd3c371ebb5db27a4c442a0913b122c0d2ed5e1c37dca605bbfc99ed4dd920a2b006eba0d98930

diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc
index 6e3ddfb..e49b3c4 100644
--- a/app-editors/neovim/files/nvimrc
+++ b/app-editors/neovim/files/nvimrc
@@ -8,12 +8,11 @@
 
 " {{{ General settings
 " The following are some sensible defaults for Vim for most users.
-" We attempt to change as little as possible from Vim's defaults,
-" deviating only where it makes sense
 set bs=2                " Allow backspacing over everything in insert mode
 set ai                  " Always set auto-indenting on
 set history=50          " keep 50 lines of command history
 set ruler               " Show the cursor position all the time
+set formatoptions+=j    " Delete comment character when joining commented lines
 
 " Don't use Ex mode, use Q for formatting
 map Q gq
@@ -27,6 +26,9 @@ set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
 " doesn't enable line numbers -- :set number will do that. The value given is a
 " minimum width to use for the number column, not a fixed size.
 set numberwidth=3
+
+" Use sensible whitespace indicators
+set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
 " }}}
 
 " {{{ Modeline settings
@@ -151,6 +153,9 @@ augroup gentoo
 
 augroup END
 
+" Strip trailing spaces on write
+autocmd BufWritePre * :%s/\s\+$//e
+
 endif " has("autocmd")
 " }}}
 

diff --git a/app-editors/neovim/neovim-0.0.0_pre20150223.ebuild 
b/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild
similarity index 85%
rename from app-editors/neovim/neovim-0.0.0_pre20150223.ebuild
rename to app-editors/neovim/neovim-0.0.0_pre20150225.ebuild
index ef449d4..64020f8 100644
--- a/app-editors/neovim/neovim-0.0.0_pre20150223.ebuild
+++ b/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild
@@ -35,6 +35,10 @@ RDEPEND="${CDEPEND}
        python? ( dev-python/neovim-python-client )"
 
 src_prepare() {
+       # do not link statically
+       sed -e '/^set(LIBUNIBILIUM/s|ON|OFF|' -e '/^set(LIBTERMKEY/s|ON|OFF|' \
+               -i CMakeLists.txt
+       # use our system vim dir
        sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
                -i src/nvim/os_unix_defs.h || die
        cmake-utils_src_prepare
@@ -49,7 +53,8 @@ src_configure() {
 }
 
 src_install() {
-       default
+       cmake-utils_src_install
+       # install a default configuration file
        insinto "${EPREFIX}"/etc/vim
        doins "${FILESDIR}"/nvimrc
 }

diff --git a/app-editors/neovim/neovim-9999.ebuild 
b/app-editors/neovim/neovim-9999.ebuild
index ef449d4..64020f8 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -35,6 +35,10 @@ RDEPEND="${CDEPEND}
        python? ( dev-python/neovim-python-client )"
 
 src_prepare() {
+       # do not link statically
+       sed -e '/^set(LIBUNIBILIUM/s|ON|OFF|' -e '/^set(LIBTERMKEY/s|ON|OFF|' \
+               -i CMakeLists.txt
+       # use our system vim dir
        sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
                -i src/nvim/os_unix_defs.h || die
        cmake-utils_src_prepare
@@ -49,7 +53,8 @@ src_configure() {
 }
 
 src_install() {
-       default
+       cmake-utils_src_install
+       # install a default configuration file
        insinto "${EPREFIX}"/etc/vim
        doins "${FILESDIR}"/nvimrc
 }

diff --git a/dev-lua/messagepack/messagepack-0.3.2.ebuild 
b/dev-lua/messagepack/messagepack-0.3.2.ebuild
index 31c329b..d2f633e 100644
--- a/dev-lua/messagepack/messagepack-0.3.2.ebuild
+++ b/dev-lua/messagepack/messagepack-0.3.2.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 src_install() {
        local lua=lua
        use luajit && lua=luajit
-       emake LUAVER="$($(tc-getPKG_CONFIG) --variable V ${lua})" \
-               PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
+       insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
+       doins src/MessagePack.lua
        dodoc CHANGES README.md
 }