[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/

[Tim Harder]

commit:     f4d9c83716cf99b62fbad3583536e0ef9c0aefbb
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 20:59:18 2018 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 21:04:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d9c837

app-editors/neovim: re-add dep versions along with slot ops

Closes: https://bugs.gentoo.org/669710

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 .../{neovim-9999.ebuild => neovim-0.3.1-r1.ebuild} | 23 ++++++++++++++++------
 app-editors/neovim/neovim-9999.ebuild              | 23 ++++++++++++++++------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.3.1-r1.ebuild
similarity index 85%
copy from app-editors/neovim/neovim-9999.ebuild
copy to app-editors/neovim/neovim-0.3.1-r1.ebuild
index 28da413392a..6b502b1c3d9 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-0.3.1-r1.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils
+EAPI=7
+
+inherit cmake-utils xdg-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"
@@ -18,8 +20,8 @@ LICENSE="Apache-2.0 vim"
 SLOT="0"
 IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
 
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
+CDEPEND=">=dev-libs/libuv-1.2.0:0=
+	>=dev-libs/msgpack-1.0.0:0=
 	luajit? ( dev-lang/luajit:2 )
 	!luajit? (
 		dev-lang/lua:=
@@ -27,12 +29,13 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	)
 	tui? (
 		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-2.0.0
+		>=dev-libs/unibilium-1.1.1:0=
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
+	jemalloc? ( dev-libs/jemalloc )
+	net-libs/libnsl"
 
 DEPEND="
 	${CDEPEND}
@@ -81,3 +84,11 @@ src_install() {
 		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
 	fi
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}

diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 28da413392a..bab41265d1f 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils
+EAPI=7
+
+inherit cmake-utils xdg-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"
@@ -18,8 +20,8 @@ LICENSE="Apache-2.0 vim"
 SLOT="0"
 IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
 
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
+CDEPEND=">=dev-libs/libuv-1.2.0:0=
+	>=dev-libs/msgpack-1.0.0:0=
 	luajit? ( dev-lang/luajit:2 )
 	!luajit? (
 		dev-lang/lua:=
@@ -27,12 +29,13 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	)
 	tui? (
 		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-2.0.0
+		>=dev-libs/unibilium-2.0.0:0=
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
+	jemalloc? ( dev-libs/jemalloc )
+	net-libs/libnsl"
 
 DEPEND="
 	${CDEPEND}
@@ -81,3 +84,11 @@ src_install() {
 		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
 	fi
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}