commit: 9ee199efa3844017354de72e6f822517895f314e Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> AuthorDate: Sun Dec 6 21:56:23 2015 +0000 Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> CommitDate: Sun Dec 6 21:57:19 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee199ef
app-editors/neovim: Remove old Package-Manager: portage-2.2.25 app-editors/neovim/Manifest | 1 - app-editors/neovim/files/automagic-jemalloc.patch | 35 ------- app-editors/neovim/files/nvimrc | 105 --------------------- app-editors/neovim/neovim-0.0.0_pre20151025.ebuild | 80 ---------------- 4 files changed, 221 deletions(-) diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index fedeb44..ebbad18 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,3 +1,2 @@ -DIST neovim-0.0.0_pre20151025.tar.xz 4947384 SHA256 62b3bd93e0395c3f2d1f829a1e4e444ac081de1acc99114f6ceba7d61a7055a3 SHA512 a0390097cc0cfae401779ddd229a6237fa63522caaa6515dfff025b506b83e2597a10711bae0a1a60770d2a244963aa56af58f734885ce73091a19865a420bf0 WHIRLPOOL becfec39f4aa1a22f48991f17dbca003f38dfa6b085ed6043e34ed7e852217dddd3e4fce4d33873b0385e1b46754ae11db21ce47cbecd12822e5073d38a5fda1 DIST neovim-0.1.0.tar.gz 7644722 SHA256 e8659558103b8f5a65aac84007a12e3581b32736321778028017fd07365cfff8 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a WHIRLPOOL 33d7b88588c214ddc670a7b3cffcfd855699e90b15c5e327ac0c17972fddb73bd519b1a8eb609f8454d6c463f18764f17bc1314b6b27448c5ac4607cdbce1551 DIST neovim-0.1.1.tar.gz 7584560 SHA256 f39bcab23457c66ce0d67dcf8029743703f860413db0070f75d4f0ffad27c6c1 SHA512 7098bef9b81862f009789cff49a063d56d52d2f5c74e2fe68ad65c952c61c07eabeb6be150b369a5a179957f20187de3051caaa30b1e0cb4ec1e9e49b4e77333 WHIRLPOOL 9df0d6d59bdda2def2d8a393eec579f341256aff18c485cbb08c96637c597ee4df73a68a09105e776605194412274df2c82b78f7ca0e0bc1e20d4780fcdfa57f diff --git a/app-editors/neovim/files/automagic-jemalloc.patch b/app-editors/neovim/files/automagic-jemalloc.patch deleted file mode 100644 index a08fc07..0000000 --- a/app-editors/neovim/files/automagic-jemalloc.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit bb3c3cbee65ef42b2b3048afae008c719bc2056a -Author: Ole Reifschneider <[email protected]> -Date: Sat Oct 24 18:48:01 2015 +0200 - - Make jemalloc optional - - Don't enable it automagically if it exists - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 348e138..53e3873 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -260,12 +260,16 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA - message(FATAL_ERROR "Sanitizers are only supported for Clang.") - endif() - --if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) -- message(STATUS "Sanitizers have been enabled; don't use jemalloc.") --else() -- find_package(JeMalloc) -- if(JEMALLOC_FOUND) -- include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) -+option(ENABLE_JEMALLOC "enable jemalloc" OFF) -+ -+if (ENABLE_JEMALLOC) -+ if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) -+ message(STATUS "Sanitizers have been enabled; don't use jemalloc.") -+ else() -+ find_package(JeMalloc) -+ if(JEMALLOC_FOUND) -+ include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) -+ endif() - endif() - endif() - diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc deleted file mode 100644 index 635fc62..0000000 --- a/app-editors/neovim/files/nvimrc +++ /dev/null @@ -1,105 +0,0 @@ -" Default Gentoo configuration file for neovim -" Based on the default vimrc shipped by Gentoo with app-editors/vim-core -" $Id$ - -" You can override any of these settings on a global basis via the -" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc". -" You may need to create these. - -" Neovim comes with sensible defaults, see: -" https://github.com/neovim/neovim/issues/2676 -" Most of the general settings from Gentoo's vimrc have been dropped here. -" We add only some necessary fixes and a few Gentoo specific settings. - -" {{{ Locale settings -" If we have a BOM, always honour that rather than trying to guess. -if &fileencodings !~? "ucs-bom" - set fileencodings^=ucs-bom -endif - -" Always check for UTF-8 when trying to determine encodings. -if &fileencodings !~? "utf-8" - " If we have to add this, the default encoding is not Unicode. - let g:added_fenc_utf8 = 1 - set fileencodings+=utf-8 -endif -" }}} - -" {{{ Fix &shell, see bug #101665. -if "" == &shell - if executable("/bin/bash") - set shell=/bin/bash - elseif executable("/bin/sh") - set shell=/bin/sh - endif -endif -"}}} - -" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh -" files should default to bash. See :help sh-syntax and bug #101819. -if has("eval") - let is_bash=1 -endif -" }}} - -" {{{ Autocommands -if has("autocmd") - -augroup gentoo - au! - - " Gentoo-specific settings for ebuilds. These are the federally-mandated - " required tab settings. See the following for more information: - " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml - " Note that the rules below are very minimal and don't cover everything. - " Better to emerge app-vim/gentoo-syntax, which provides full syntax, - " filetype and indent settings for all things Gentoo. - au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab - - " In text files, limit the width of text to 78 characters, but be careful - " that we don't override the user's setting. - autocmd BufNewFile,BufRead *.txt - \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") | - \ setlocal textwidth=78 | - \ endif - - " When editing a file, always jump to the last cursor position - autocmd BufReadPost * - \ if ! exists("g:leave_my_cursor_position_alone") | - \ if line("'\"") > 0 && line ("'\"") <= line("$") | - \ exe "normal g'\"" | - \ endif | - \ endif - - " When editing a crontab file, set backupcopy to yes rather than auto. See - " :help crontab and bug #53437. - autocmd FileType crontab set backupcopy=yes - - " If we previously detected that the default encoding is not UTF-8 - " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no - " characters at all) isn't a Unicode file, but is in the default encoding. - " Except of course if a byte-order mark is in effect. - autocmd BufReadPost * - \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" && - \ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable | - \ set fileencoding= | - \ endif - - " Strip trailing spaces on write - autocmd BufWritePre *.e{build,class} - \ if ! exists("g:leave_my_trailing_space_alone") | - \ :%s/\s\+$//e | - \ endif - -augroup END - -endif " has("autocmd") -" }}} - -" {{{ nvimrc.local -if filereadable("/etc/vim/nvimrc.local") - source /etc/vim/nvimrc.local -endif -" }}} - -" vim: set tw=80 sw=2 sts=2 et foldmethod=marker : diff --git a/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild b/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild deleted file mode 100644 index c084410..0000000 --- a/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit cmake-utils eutils flag-o-matic - -DESCRIPTION="Vim-fork focused on extensibility and agility." -HOMEPAGE="https://github.com/neovim/neovim"; -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/neovim/neovim.git" -else - SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"; - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0 vim" -SLOT="0" -IUSE="+nvimpager perl python jemalloc" - -CDEPEND="dev-lang/luajit:2 - >=dev-libs/libtermkey-0.17 - >=dev-libs/libuv-1.2.0 - >=dev-libs/msgpack-0.6.0_pre20150220 - >=dev-libs/unibilium-1.1.1 - dev-libs/libvterm - dev-lua/lpeg - dev-lua/messagepack - jemalloc? ( dev-libs/jemalloc ) -" -DEPEND="${CDEPEND} - virtual/libiconv - virtual/libintl" -RDEPEND="${CDEPEND} - perl? ( dev-lang/perl ) - python? ( dev-python/neovim-python-client )" - -src_prepare() { - # use our system vim dir - sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \ - -i src/nvim/os/unix_defs.h || die - - # add eclass to bash filetypes - sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die - - # make less.sh macro actually work with neovim - sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die - - # make sure the jemalloc dependency is not automagic - epatch "${FILESDIR}"/automagic-jemalloc.patch - - cmake-utils_src_prepare -} - -src_configure() { - export USE_BUNDLED_DEPS=OFF - append-cflags "-Wno-error" - local mycmakeargs=( - $(cmake-utils_use_enable jemalloc JEMALLOC) - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DLIBUNIBILIUM_USE_STATIC=OFF - -DLIBTERMKEY_USE_STATIC=OFF - -DLIBVTERM_USE_STATIC=OFF - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # install a default configuration file - insinto /etc/vim - doins "${FILESDIR}"/nvimrc - - # conditionally install a symlink for nvimpager - if use nvimpager; then - dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager - fi -}
