gentoo resync : 07.01.2018

11 files changed, 14 insertions, 178 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index fb7f1360d987..e010e6f4b1f1 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index e0b83ebe2a7c..ded6e9ead4b1 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -9,7 +9,7 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 EBUILD gvim-8.0.0386.ebuild 11569 BLAKE2B 2e9803cd0cad4f6d9ba86f7a4f9242a1850c4017a1b7cc894ab57d9c450f173d9f24f7deb2a2f7c26a4598bfb79d2bfecfc29c777473e0759c6e89fcd99cb5d6 SHA512 93d54860172f0e8caf22d129d55a26276e4ba0d68f91c74dcc969fb2f738f3197ee77de983d65c9533029a04e0cd74fbefabf6802ecba6bb0d4ba0807b68783c
 EBUILD gvim-8.0.1188.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
-EBUILD gvim-8.0.1298.ebuild 10472 BLAKE2B 06445daf6e99a9acf9ffdc9e4f7de0cfcfeb0c14b327cf48f57d13301e0ba98987713fd8edea9c6f973cdabe73d5f17d55ca13b87feee7b2289043ebbc0acb6f SHA512 dc6700fbf59921d13b24787023493c1c0617ca783e3d961235bfa43b0e7aca13779502796dd1621b14e9b87330a62e944b1cb5960a8c682ec221cf1ae422b65f
+EBUILD gvim-8.0.1298.ebuild 10471 BLAKE2B 2e3dbabe5f486349e5e0faf18080f35b495df382f3c47b21f6f02d7934fd5d335d21717f7c77d2880ca4ea6f4c8f5fc05cbfdfa45996850d13f62dd4f260863f SHA512 ba4598cf1dda69db0b84ce8014a07c646f5b8a8e6c770f7d279d888ee65ebd0af5f95a7277054600b68bd3fbe287d33af39a0611d25e827f5d877c59fc028dfd
 EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-9999.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 MISC metadata.xml 675 BLAKE2B 4c96806a5744b61f168512c28512c9c6114ca42522ff8ed266cb14c5e16ef538e4de8aa15ce233cf1044f98dabf27c6654592eb296e4a83175940f88ddd4b1a3 SHA512 df75c9e935ae47b8961c8b6b984483b8032e39d3833ffcf4784e2630cea870579d45ef5f104b71d6b35f4128ef689394edd72510fce82a76e596749ce69d835d
diff --git a/app-editors/gvim/gvim-8.0.1298.ebuild b/app-editors/gvim/gvim-8.0.1298.ebuild
index 5441635ae1df..1f8cba24c707 100644
--- a/app-editors/gvim/gvim-8.0.1298.ebuild
+++ b/app-editors/gvim/gvim-8.0.1298.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
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 46de1edbfd0b..567cfb72d277 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -4,7 +4,7 @@ DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c
 DIST nano-2.9.1.tar.gz 2839465 BLAKE2B e0d443dc3c86446478edad73042c6b4698a86fdfe3727deac858fa99d52bf319e2b3a120ba57bf79f3b78d9d3d7e8f4b5bdee234f6450882fee06647be371191 SHA512 7eeefd4cb5f02f1ac14ca10c536f873a1a85f3a5ccc5d5c40a12770b26dd0d5b0bbb3a0770b394779c8234891d7226e0d06d72465d7687c971bc62606100d0b6
 DIST nano-2.9.2.tar.gz 2839256 BLAKE2B 6e27ad0ff72a17461d614f2222ef33bf2abaaa0f4576a8e378524b090c702adafa86e78d976cf5b5dcd2ca1da802aeeff9b3f4bc5e81fa31b8164ef2979708d6 SHA512 b45afb593a04029a137f49551242f2dae901482878cca4aac6cba1c0c8af38a83994daadbd025e90f019cfa9d1273784de4491bbadf47104914904af804661d1
 EBUILD nano-2.7.5.ebuild 2281 BLAKE2B ad2c9f6a6b66c74e309022de21f0e233af8e0f091d7be79843753b244509c98e5c7115b3dfcd42566d2d3da46c1856a72dfc8da96399ad5eedd3a3d73395ecce SHA512 65c76d2744ad7bfc0fca1b0c9dcab041777a542c921f0526de18251b64bf32d12fe71fb8fd050eea4da074b56c12f0086036065e7ecdda4dd5b66b06382d81a0
-EBUILD nano-2.8.7.ebuild 2328 BLAKE2B 38d3f9c65355744e83f4f04417e51564f4c7a8c026818a794703b87f9116c1a934ecfd7ff17a004775321df22fd5cd7eb73c08d590ed806d737213cd5e1373e9 SHA512 962d7c08ae1a09b18d8daf892525b1a3e093f161bb12c8f4ae888005640e5a43995e93fd8d830f0771f4cc791fbae1073406f415595215aa94016087d26335e2
+EBUILD nano-2.8.7.ebuild 2325 BLAKE2B 3a142894a06ed990afabae1858f409e077e441019cfc09233f21b724f22632190440db393178ab8eb776aa36556a15c152bd4f5bdfae142f2052d6589fba0b8d SHA512 7cd68aca6245bfe33b4de8287c82096d523bff7f5fc31b8846c6e9d2fe768520556dd44de5e27a94be702b3f8b4ebacc04aee25fa7badddfe5338b076fbbe0eb
 EBUILD nano-2.9.1.ebuild 2265 BLAKE2B c47ba305fd6dd42749764ea90bfc9f5b5482b7a5eadea6c179e01f082657398bf89d586f17f0e3eec23df78f6d4d76038017314905acb06cda870b4b80dbd471 SHA512 0bd91b9afea8c8f6592e84047870098c9948687d516fabf8e18be5fa8a2690db0b76f96fd45aba59743dae4cb6630fe2b76825628f0b954550ff95de3feedcb4
 EBUILD nano-2.9.2.ebuild 2265 BLAKE2B ae9bada0b50e6cce6d136e56cdaed2e40b2b86564a5f6367587f19690641cda8431d6399c5ed959c16acbf859edcdae51eed961cb57729644bf39514271dc71f SHA512 05be72b2e1dc44db6211f154165dd6268fe51bde7468ad3f2c2628bbdc161fef47e90672f43a0200048134711fcb415e6da3386dfc601b8ea052c33277cf8cf3
 EBUILD nano-9999.ebuild 2265 BLAKE2B 678ff8f900f19d4879d857dc2f06a99edd0db894cef8d78abce94fce25684930cce93c0e9822d693415b5c5a5ca87217c4f6ff7b0da7ee4f65312eca5c9a6cdb SHA512 9d4902c001632ba5139d4dc14ad8faba1f1bd133c85092682376ec8835c5b491fdc2cdb1abda2aca311fbc57e72b93ab6f38923e067c744e02c6ee6795357d9e
diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild
index 5e7efe2e7c87..debedfbeccc3 100644
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ b/app-editors/nano/nano-2.8.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 097fca784394..a3105f6d4f00 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,9 +1,7 @@
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.2.0.tar.gz 7846467 BLAKE2B ee929122b3855ccab6247a0e8ab975b09d77e1034229ea324ed82ad705cacbd39f55d2fa96eea3f3677c7efe64c69ebecedd5fde09e508a6fd23acb6a1f5b489 SHA512 fc4be03c5bee1c9928376938679f9a900f3ee2e58df817d1cb9b5af51350dccca63a7638114b0326ec4565a047faaa4b50fecfc932c1d59ee92efa54625e22cd
 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
+EBUILD neovim-0.2.0-r1.ebuild 1839 BLAKE2B bdc11a064f4dacdce4996acd949268afe389f8363a353d898fb26cd12215d700aa2df38cb2c58fa800783c9a9df0df90f233b6215d109dd193ec964a07816716 SHA512 f7f41e260069f113a7f993f5afce2d8d850574bad5ee24d67c1b0858caf4d8cf0b9a7d1d23ef753b2527bf8f3d0ad0ae702aa2b859784b301f7429b9fa7076a1
+EBUILD neovim-0.2.2-r1.ebuild 1839 BLAKE2B bdc11a064f4dacdce4996acd949268afe389f8363a353d898fb26cd12215d700aa2df38cb2c58fa800783c9a9df0df90f233b6215d109dd193ec964a07816716 SHA512 f7f41e260069f113a7f993f5afce2d8d850574bad5ee24d67c1b0858caf4d8cf0b9a7d1d23ef753b2527bf8f3d0ad0ae702aa2b859784b301f7429b9fa7076a1
+EBUILD neovim-9999.ebuild 1839 BLAKE2B bdc11a064f4dacdce4996acd949268afe389f8363a353d898fb26cd12215d700aa2df38cb2c58fa800783c9a9df0df90f233b6215d109dd193ec964a07816716 SHA512 f7f41e260069f113a7f993f5afce2d8d850574bad5ee24d67c1b0858caf4d8cf0b9a7d1d23ef753b2527bf8f3d0ad0ae702aa2b859784b301f7429b9fa7076a1
 MISC metadata.xml 823 BLAKE2B 6aac695d8e1ceef11309dca9d529808f890b67665688450e683f1a980f09909d2e4c2ea165a2aeac623f6224bc00b7e67d9e67c27a623a13595710e60e7e49bf SHA512 b87aa5497b7c5e9b61647cfd3413e7c6d232698952b778d4ed3a39d4c2a39e6947a5b7e19ef803f4172dda0d2465651f19a127d4aa5b37004224e5c3ec86a94d
diff --git a/app-editors/neovim/neovim-0.2.0-r1.ebuild b/app-editors/neovim/neovim-0.2.0-r1.ebuild
index 9694b6c32c21..13a7786ff184 100644
--- a/app-editors/neovim/neovim-0.2.0-r1.ebuild
+++ b/app-editors/neovim/neovim-0.2.0-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
-CMAKE_BUILD_TYPE=RelWithDebInfo
+CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	# use our system vim dir
@@ -64,7 +64,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DFEAT_TUI=$(usex tui)
 		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/app-editors/neovim/neovim-0.2.0.ebuild b/app-editors/neovim/neovim-0.2.0.ebuild
deleted file mode 100644
index 374bd28354fd..000000000000
--- a/app-editors/neovim/neovim-0.2.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-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="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=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}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-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() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
-	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.2.2-r1.ebuild b/app-editors/neovim/neovim-0.2.2-r1.ebuild
index 9694b6c32c21..13a7786ff184 100644
--- a/app-editors/neovim/neovim-0.2.2-r1.ebuild
+++ b/app-editors/neovim/neovim-0.2.2-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
-CMAKE_BUILD_TYPE=RelWithDebInfo
+CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	# use our system vim dir
@@ -64,7 +64,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DFEAT_TUI=$(usex tui)
 		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/app-editors/neovim/neovim-0.2.2.ebuild b/app-editors/neovim/neovim-0.2.2.ebuild
deleted file mode 100644
index 374bd28354fd..000000000000
--- a/app-editors/neovim/neovim-0.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-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="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=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}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-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() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
-	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-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 9694b6c32c21..13a7786ff184 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
-CMAKE_BUILD_TYPE=RelWithDebInfo
+CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	# use our system vim dir
@@ -64,7 +64,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DFEAT_TUI=$(usex tui)
 		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
+	)
 	cmake-utils_src_configure
 }