gentoo resync : 05.01.2018

13 files changed, 67 insertions, 511 deletions

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 59d8ddade057..097fca784394 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,22 +1,9 @@
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.1.0.tar.gz 7644722 BLAKE2B 81364b998c697e7f1ccec5c66c1de04516f275469456b77da54582bfb1a8fe1e196db7dc4e730d75adfc266524dea9928a6379c6020a35696a1c550ebcf04b18 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a
-DIST neovim-0.1.1.tar.gz 7584560 BLAKE2B 3ed242e83d1be5cb9afd0da89643decebd1cfd68aca80a2daf3a379c942ab48ba6a46df3fb90e196ea8955f9e0cef686d2476946e86c757da7e8e368033fa497 SHA512 7098bef9b81862f009789cff49a063d56d52d2f5c74e2fe68ad65c952c61c07eabeb6be150b369a5a179957f20187de3051caaa30b1e0cb4ec1e9e49b4e77333
-DIST neovim-0.1.2.tar.gz 7610804 BLAKE2B 186dd73c16c49490ba7d3c520f983d4340d14284dee1ab125f2d3f65e98a4e7d558513a8f938fed5b2ff003140ab493a5f85c41d337257e1f13b7550309d501e SHA512 dc03d92ff296f3ff55225d514479f1ac201a5a65eb8a6c02e71935ca44feb8ab15897b26a2ea46e53771f902c57b027d07e02f95673268ee060c6b77c4aa90e4
-DIST neovim-0.1.3.tar.gz 7636777 BLAKE2B a39ffd668e5a69914062415aef6b1c4ff4f1093b9519432fcb6284798a425f95c0dc589ed71f5168163b72dd32dbaab9ff4443f80b98dd781b5caa8eb192ec6f SHA512 70c979fa06784cae4ded43c7fef7906c743729ed43a50003deec1d2ab7a800bfeab81c394893796a06d0f37811867062b2f766936c2a871f7d968b350729d4c8
-DIST neovim-0.1.4.tar.gz 7678847 BLAKE2B 3204cd3859cb45bd360cc18e783b15b8be1621835c5d66b5c726c38279f806abeefa4b6dcef00cc5b408eddc8af1d68373d1dfe626e52aa8c500570100f91e6a SHA512 e96e768703e4b842355a7543e5c9980b148b9b10cd032570fb420e3e1207102f9769fa6d36fba1d263ed9333d339eab387a196d4a8f724d89db2800097b89d37
-DIST neovim-0.1.5.tar.gz 7813974 BLAKE2B 244633b131b86a15bee13abf003ee04d5c3243d1d6af21ff6374737d6cdead85a956c5e994451484a205f2da0b8b84cf7b152f064200d8691c642581a6b45d94 SHA512 3332b151d23b4f2b133b8f30f4af41686f7092cebbc7ab402b742be7b302bb6acbe9a01c2f475caad8d14a78dd3570109a5c447ab31f0b65ebf442631a31c6f9
-DIST neovim-0.1.6.tar.gz 7810818 BLAKE2B c36cd224d767687b07c187940033fcbabb00f4b0a2ed2fc1838aadbeeb5acbf0c729c42ab0f82029fa2dc10b997e69f3ec2e85a01500f11380160ad9202bbba8 SHA512 360d69bc11a3cb7b2c203adc7e76edad736b1a2fb7033d2d0c6444da168053ea0b621daf7978e9c158e14c5e04af8599005bf5eb800d9d1776007257b0e0e56f
-DIST neovim-0.1.7.tar.gz 7601279 BLAKE2B 473665470740256fd9f555b3e85901f19a1800c68e2303f5fbf062bd5961f2735c6a836a48d6616e31c56ae97481d461e299bb358b7658ffea1a1b1b9c2147dd SHA512 f7dbac4b2090fbf9764585ebf147c529b655d6e30cca9404cd161e2bd78f3aaa2f714d86a8c3efd1935dc92363757c381833d0059043807db0bea3db2fc6d10c
 DIST neovim-0.2.0.tar.gz 7846467 BLAKE2B ee929122b3855ccab6247a0e8ab975b09d77e1034229ea324ed82ad705cacbd39f55d2fa96eea3f3677c7efe64c69ebecedd5fde09e508a6fd23acb6a1f5b489 SHA512 fc4be03c5bee1c9928376938679f9a900f3ee2e58df817d1cb9b5af51350dccca63a7638114b0326ec4565a047faaa4b50fecfc932c1d59ee92efa54625e22cd
-EBUILD neovim-0.1.0.ebuild 1871 BLAKE2B 74bd4e4d31951e6fda8519048fa8c2975f3e63024922d60e61d8f4f4700e238748aaaf2beabbbeddeef569407ae02c02766fb078fedba9d62de9e0132d0b10a2 SHA512 fc9713e49aa3b740107f5767728d0f399c9ef038eedcd3efb920cda965bb0a86b9bddf3058ec4e3b6201e450082499e85936d71b65214d15c4327d4e15844414
-EBUILD neovim-0.1.1-r1.ebuild 1866 BLAKE2B 88fdba33284a52847db34a6b1c984df2d7fbffcfe95cbf1b1cd6427e48da99c04d30feb2de775a443eb27f2f8c1e7c981bb042d8a24c13d90d403290d7299bf4 SHA512 03551ea2585738b51c26be872ffd0534d44da1089adbd025c51f65fb518f7fe9da0f2c099f9cde8b9d69a8d3980009f4a1d420e873add1721b23685e89781bb1
-EBUILD neovim-0.1.2.ebuild 1854 BLAKE2B a15e24d757789fc1c2236d6c91b04a5de0dc2f3b36367469d0aa4ce6b02ba9b22bdb126785bf4d074e2da28e02dda78dd5605a5277f19c6466d6867217e45d7a SHA512 64856d802ff90f8c933d6c9f2c36b8160ab7d44169ee7c6857ebc642ca7f81b278b91de7e32857a1f7dc575ee958c93adef7f9776f5604b58f15c3d75e1cdd5b
-EBUILD neovim-0.1.3.ebuild 1747 BLAKE2B 6b000d4496203f82ab25c26b340faa223b710ad042ed3bfaa341ce9ee1b4b21aba65f248eeb4913eb8f34f8efd9fd4c5e8df45a6c508030d7696b993eb6f54aa SHA512 2ce69cccdc4ad2d5abe9329fe03df01552fd600b066e68bcf8b4b1d11903e27c521d9f0ed3b02e9cf34dec965e146f603087e1bc8a1008fc288e7d8557b36d59
-EBUILD neovim-0.1.4.ebuild 1757 BLAKE2B 3f7d765a39f400ab2ad6e0d7439be0310944a205280479ea3225c161524a41d5aecc545bf4c825db1210340356559c522673bc2226d3c802df23d64b491ac6ca SHA512 fc434c3dcdde97b531b4f247146f237aa32704f8129408643a5e0dc6d77a756ca8cd549bc44452d50851a1c26fe691ee4699c26a1166260c26c9827e9526252c
-EBUILD neovim-0.1.5-r1.ebuild 1776 BLAKE2B e240fec11a11315542ef8e39f092e0131d484205578342e1c7dd17160e62a3a6cb61ea7fa0eed5b84f29a355995d6f729fd1e7f080d1ce1cfc0016c85e6ae052 SHA512 6eb3c152fbad2c6864203da0150f6f837b4414f0b02096740720ee758276698bb6c21549da38c81fcd933005acaccc759af05133e5856e6c4cf78f877d2781dc
-EBUILD neovim-0.1.5.ebuild 1797 BLAKE2B 1fe1eef04d9b3ac9ad8a494e91797a4667400e3140ac8ca1d077dbe7a560f15b2a5cb2bf6150dd98935bb531252c8048d35a28b5375b0cb76b1efc033e1d7792 SHA512 613a4e81f62f1a9f15edef436f7b4263a91229d4baf448783edaa73e9b80248f0ac4772c3aac84c58d82800bf64f8c6c4fff3405de42c0db13195fc19ea20bd6
-EBUILD neovim-0.1.6.ebuild 1776 BLAKE2B e240fec11a11315542ef8e39f092e0131d484205578342e1c7dd17160e62a3a6cb61ea7fa0eed5b84f29a355995d6f729fd1e7f080d1ce1cfc0016c85e6ae052 SHA512 6eb3c152fbad2c6864203da0150f6f837b4414f0b02096740720ee758276698bb6c21549da38c81fcd933005acaccc759af05133e5856e6c4cf78f877d2781dc
-EBUILD neovim-0.1.7.ebuild 1776 BLAKE2B e240fec11a11315542ef8e39f092e0131d484205578342e1c7dd17160e62a3a6cb61ea7fa0eed5b84f29a355995d6f729fd1e7f080d1ce1cfc0016c85e6ae052 SHA512 6eb3c152fbad2c6864203da0150f6f837b4414f0b02096740720ee758276698bb6c21549da38c81fcd933005acaccc759af05133e5856e6c4cf78f877d2781dc
-EBUILD neovim-0.2.0.ebuild 1776 BLAKE2B c122b202446cfebb3e403eca0bbb2e3db92d82b5c2267781e96d7c6972b8b3d4b8d1558acff47a0271588977e2a618c4e48293899e193884df6cda1e388895b5 SHA512 9b85850a47b62f7098e7c1b2a70c3d49ec8ab462a32d7d62666b930122c2ab323be5e284003b249be1574d9b9fdc6ea1b5477b61f0ea9677eb1394724a5ee54d
-EBUILD neovim-9999.ebuild 1776 BLAKE2B c122b202446cfebb3e403eca0bbb2e3db92d82b5c2267781e96d7c6972b8b3d4b8d1558acff47a0271588977e2a618c4e48293899e193884df6cda1e388895b5 SHA512 9b85850a47b62f7098e7c1b2a70c3d49ec8ab462a32d7d62666b930122c2ab323be5e284003b249be1574d9b9fdc6ea1b5477b61f0ea9677eb1394724a5ee54d
-MISC metadata.xml 748 BLAKE2B da762c7f4f1703b28f8720651f3e148eb8921546c20c258a303e175c5ca0ebc276d0d2bf9a660763a58c7ec5b603d098ce0b132e737648cc2a3d7360044d4772 SHA512 6c03ebda6086660d862bfc7bb863e5602f91b5e1715a21c0776c49fa2efd6ab9fbc540e757d858c52dd35a9597348a19c5f0b2f04858a399fa26ed4f41854235
+DIST neovim-0.2.2.tar.gz 8325879 BLAKE2B dbf43c5927b8c8719adae9a3f73c57429de47f1b7c7489a118b7467df2f0d32cd02df8e10889727b4dd77fe8b4fb4f95520c678d6775d5d908705770a47cec0c SHA512 5609defe86ac98356f1b9ae9adc6049bb4df920a9a2ae3104f761d52d4dd54cbc84d2596231595dd9b0aa97201fef2121e6c5c86a19267ab6b871dbf4b568209
+EBUILD neovim-0.2.0-r1.ebuild 1847 BLAKE2B 1a6b247bf75651cf568ba20813060bc5ee0d311fe69baaa22c3de7d5563048530bb3206843863b7b0fe9c17ed027b00edaf53e19af3c2f75308d68df9af1149a SHA512 f7eda7eff045f341cc97af5061f50996b735b294178c58ec68851795b03e2246a8b36823c5245f79ba178e04084c081088cb8b70a5babcb018c77ace922c3476
+EBUILD neovim-0.2.0.ebuild 1802 BLAKE2B b28c67e67b6fb793e1d589d844b3b04117974036d908a96aed3b7ab0e8893f66d742af71d235907989114b9df0b8d98cee52d8a6b4ee98214a78abba2837dca2 SHA512 719e37a3304fc08980a37021b49667dd5a53a4963c479e1f60136d88455ae6c2df7ab669f2354a8d974bc49dd218c116377cc8c5128a1b29473d9735de7c6946
+EBUILD neovim-0.2.2-r1.ebuild 1847 BLAKE2B 1a6b247bf75651cf568ba20813060bc5ee0d311fe69baaa22c3de7d5563048530bb3206843863b7b0fe9c17ed027b00edaf53e19af3c2f75308d68df9af1149a SHA512 f7eda7eff045f341cc97af5061f50996b735b294178c58ec68851795b03e2246a8b36823c5245f79ba178e04084c081088cb8b70a5babcb018c77ace922c3476
+EBUILD neovim-0.2.2.ebuild 1802 BLAKE2B b28c67e67b6fb793e1d589d844b3b04117974036d908a96aed3b7ab0e8893f66d742af71d235907989114b9df0b8d98cee52d8a6b4ee98214a78abba2837dca2 SHA512 719e37a3304fc08980a37021b49667dd5a53a4963c479e1f60136d88455ae6c2df7ab669f2354a8d974bc49dd218c116377cc8c5128a1b29473d9735de7c6946
+EBUILD neovim-9999.ebuild 1847 BLAKE2B 1a6b247bf75651cf568ba20813060bc5ee0d311fe69baaa22c3de7d5563048530bb3206843863b7b0fe9c17ed027b00edaf53e19af3c2f75308d68df9af1149a SHA512 f7eda7eff045f341cc97af5061f50996b735b294178c58ec68851795b03e2246a8b36823c5245f79ba178e04084c081088cb8b70a5babcb018c77ace922c3476
+MISC metadata.xml 823 BLAKE2B 6aac695d8e1ceef11309dca9d529808f890b67665688450e683f1a980f09909d2e4c2ea165a2aeac623f6224bc00b7e67d9e67c27a623a13595710e60e7e49bf SHA512 b87aa5497b7c5e9b61647cfd3413e7c6d232698952b778d4ed3a39d4c2a39e6947a5b7e19ef803f4172dda0d2465651f19a127d4aa5b37004224e5c3ec86a94d
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index 0671c79ddf39..158212f33e00 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -9,6 +9,7 @@
     <flag name="clipboard">Enable clipboard support through a provider</flag>
     <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
+    <flag name="remote">Enable support for remote options using nvr</flag>
     <flag name="tui">Build the neovim unix tui</flag>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
       <pkg>dev-lang/lua</pkg></flag>
diff --git a/app-editors/neovim/neovim-0.1.0.ebuild b/app-editors/neovim/neovim-0.1.0.ebuild
deleted file mode 100644
index bf147417d956..000000000000
--- a/app-editors/neovim/neovim-0.1.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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 )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-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}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.1.1-r1.ebuild b/app-editors/neovim/neovim-0.1.1-r1.ebuild
deleted file mode 100644
index bb7acc2174c9..000000000000
--- a/app-editors/neovim/neovim-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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 )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-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}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.1.2.ebuild b/app-editors/neovim/neovim-0.1.2.ebuild
deleted file mode 100644
index 9a7de9569b26..000000000000
--- a/app-editors/neovim/neovim-0.1.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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-1.0.0
-	>=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 )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-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}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.1.3.ebuild b/app-editors/neovim/neovim-0.1.3.ebuild
deleted file mode 100644
index 2e25e7c950ea..000000000000
--- a/app-editors/neovim/neovim-0.1.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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-1.0.0
-	>=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 )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-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}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.1.4.ebuild b/app-editors/neovim/neovim-0.1.4.ebuild
deleted file mode 100644
index d706ff0a3bab..000000000000
--- a/app-editors/neovim/neovim-0.1.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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-1.0.0
-	>=dev-libs/unibilium-1.1.1
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit]
-	dev-lua/mpack[luajit]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-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}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.1.5.ebuild b/app-editors/neovim/neovim-0.1.5.ebuild
deleted file mode 100644
index 038ff654cc92..000000000000
--- a/app-editors/neovim/neovim-0.1.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager perl python ruby +jemalloc"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	>=dev-libs/unibilium-1.1.1
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit]
-	dev-lua/mpack[luajit]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	local mycmakeargs=(
-		$(cmake-utils_use_enable jemalloc JEMALLOC)
-		-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}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.1.5-r1.ebuild b/app-editors/neovim/neovim-0.2.0-r1.ebuild
index 50b861caaf73..9694b6c32c21 100644
--- a/app-editors/neovim/neovim-0.1.5-r1.ebuild
+++ b/app-editors/neovim/neovim-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,12 +11,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
+IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
 
 CDEPEND=">=dev-libs/libuv-1.2.0
 	>=dev-libs/msgpack-1.0.0
@@ -26,20 +26,25 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 		dev-lua/LuaBitOp
 	)
 	tui? (
-		>=dev-libs/libtermkey-0.17
+		>=dev-libs/libtermkey-0.19
 		>=dev-libs/unibilium-1.1.1
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
+	jemalloc? ( dev-libs/jemalloc )"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
+	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/app-editors/neovim/neovim-0.2.0.ebuild b/app-editors/neovim/neovim-0.2.0.ebuild
index dace3d4ec43a..374bd28354fd 100644
--- a/app-editors/neovim/neovim-0.2.0.ebuild
+++ b/app-editors/neovim/neovim-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -32,12 +32,16 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
+	jemalloc? ( dev-libs/jemalloc )"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
diff --git a/app-editors/neovim/neovim-0.1.7.ebuild b/app-editors/neovim/neovim-0.2.2-r1.ebuild
index 50b861caaf73..9694b6c32c21 100644
--- a/app-editors/neovim/neovim-0.1.7.ebuild
+++ b/app-editors/neovim/neovim-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,12 +11,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
+IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
 
 CDEPEND=">=dev-libs/libuv-1.2.0
 	>=dev-libs/msgpack-1.0.0
@@ -26,20 +26,25 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 		dev-lua/LuaBitOp
 	)
 	tui? (
-		>=dev-libs/libtermkey-0.17
+		>=dev-libs/libtermkey-0.19
 		>=dev-libs/unibilium-1.1.1
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
+	jemalloc? ( dev-libs/jemalloc )"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
+	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/app-editors/neovim/neovim-0.1.6.ebuild b/app-editors/neovim/neovim-0.2.2.ebuild
index 50b861caaf73..374bd28354fd 100644
--- a/app-editors/neovim/neovim-0.1.6.ebuild
+++ b/app-editors/neovim/neovim-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -26,18 +26,22 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 		dev-lua/LuaBitOp
 	)
 	tui? (
-		>=dev-libs/libtermkey-0.17
+		>=dev-libs/libtermkey-0.19
 		>=dev-libs/unibilium-1.1.1
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
+	jemalloc? ( dev-libs/jemalloc )"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index dace3d4ec43a..9694b6c32c21 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,12 +11,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
+IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
 
 CDEPEND=">=dev-libs/libuv-1.2.0
 	>=dev-libs/msgpack-1.0.0
@@ -32,14 +32,19 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-"
-DEPEND="${CDEPEND}
+	jemalloc? ( dev-libs/jemalloc )"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
+	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo