new development snapshot; remove older

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

4 files changed, 11 insertions, 127 deletions

diff --git a/app-editors/neovim/ChangeLog b/app-editors/neovim/ChangeLog
index b95b2bb82fd4..afd23cbeb518 100644
--- a/app-editors/neovim/ChangeLog
+++ b/app-editors/neovim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/neovim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/neovim/ChangeLog,v 1.5 2015/06/27 03:54:39 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/neovim/ChangeLog,v 1.6 2015/07/27 05:12:15 yngwin Exp $
+
+*neovim-0.0.0_pre20150727 (27 Jul 2015)
+
+  27 Jul 2015; Ben de Groot <yngwin@gentoo.org>
+  +neovim-0.0.0_pre20150727.ebuild, -neovim-0.0.0_pre20150225.ebuild,
+  -neovim-0.0.0_pre20150329.ebuild, -neovim-0.0.0_pre20150505.ebuild:
+  new development snapshot; remove older
 
 *neovim-0.0.0_pre20150627 (27 Jun 2015)
 
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild
deleted file mode 100644
index 17b9a2eb97d5..000000000000
--- a/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild,v 1.1 2015/02/26 06:08:10 yngwin Exp $
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim's rebirth for the 21st century"
-HOMEPAGE="https://github.com/neovim/neovim"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="perl python"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	>=dev-libs/unibilium-1.1.1
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-0.6.0_pre20150220
-	dev-lua/lpeg
-	dev-lua/messagepack"
-DEPEND="${CDEPEND}
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${CDEPEND}
-	perl? ( dev-lang/perl )
-	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
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
-	local mycmakeargs=( -DCMAKE_BUILD_TYPE=Release )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/nvimrc
-}
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150505.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150505.ebuild
deleted file mode 100644
index 9a941abadb15..000000000000
--- a/app-editors/neovim/neovim-0.0.0_pre20150505.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/neovim/neovim-0.0.0_pre20150505.ebuild,v 1.1 2015/05/06 13:53:55 yngwin Exp $
-
-EAPI=5
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Vim's rebirth for the 21st century"
-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="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="perl python"
-
-CDEPEND="dev-lang/luajit:2
-	>=dev-libs/libtermkey-0.17
-	dev-libs/libvterm-neovim
-	>=dev-libs/unibilium-1.1.1
-	>=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-0.6.0_pre20150220
-	dev-lua/lpeg
-	dev-lua/messagepack"
-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
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	export USE_BUNDLED_DEPS=OFF
-	append-cflags "-Wno-error"
-	append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-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
-}
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150329.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild
index 064946d43bcb..0ef32e719f0b 100644
--- a/app-editors/neovim/neovim-0.0.0_pre20150329.ebuild
+++ b/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/neovim/neovim-0.0.0_pre20150329.ebuild,v 1.1 2015/03/29 04:03:56 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/neovim/neovim-0.0.0_pre20150727.ebuild,v 1.1 2015/07/27 05:12:15 yngwin Exp $
 
 EAPI=5
 inherit cmake-utils flag-o-matic
 
-DESCRIPTION="Vim's rebirth for the 21st century"
+DESCRIPTION="Ambitious 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"
-	KEYWORDS=""
 else
 	SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -38,7 +37,7 @@ RDEPEND="${CDEPEND}
 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
+		-i src/nvim/os/unix_defs.h || die
 	cmake-utils_src_prepare
 }