cleanup now that neovim and deps are in the official tree

19 files changed, 7 insertions, 251 deletions

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
deleted file mode 100644
index 7542740..0000000
--- a/app-editors/neovim/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST neovim-0.0.0_pre20150225.tar.xz 4768060 SHA256 c2b9e1d60d5006022938c0cef0a25178a8fc3aefe469dc555b9396f8240dd82b SHA512 7854aabd9384bf5c90cec2f478aa9b2f173f03d7f3a1f8645e3331a7f20cade58cf68e13a117785905564d09f5b6029d22aa9ea7263f739385135becfbd50ced WHIRLPOOL d0cf544d18d925fb809f1a4dcfc1622733a7079313d8c4462efd3c371ebb5db27a4c442a0913b122c0d2ed5e1c37dca605bbfc99ed4dd920a2b006eba0d98930
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 64020f8..0000000
--- 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: $
-
-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 "${EPREFIX}"/etc/vim
-	doins "${FILESDIR}"/nvimrc
-}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 64020f8..17723f0 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -55,6 +55,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 	# install a default configuration file
-	insinto "${EPREFIX}"/etc/vim
+	insinto /etc/vim
 	doins "${FILESDIR}"/nvimrc
 }
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
deleted file mode 100644
index e3c9ef4..0000000
--- a/dev-libs/libtermkey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libtermkey-0.17.tar.gz 42176 SHA256 68949364ed5eaad857b3dea10071cde74b00b9f236dfbb702169f246c3cef389 SHA512 8b96f9961ff77872a974b376c73abc4afbe444a761f96b3681fc5420e33548a02609bf8b2b24494965824ca5dd80c953d1d4e2701070559365633d7bf0fdcb12 WHIRLPOOL ef755c2de422d8778d8501be3aefe249b6194e71ffd862a2479158c009dd483508e6a4e35a5a1338d219e585ad465ccd3cfecfc8db6c7cd0440aa802d71f645a
diff --git a/dev-libs/libtermkey/libtermkey-0.17.ebuild b/dev-libs/libtermkey/libtermkey-0.17.ebuild
deleted file mode 100644
index c88687d..0000000
--- a/dev-libs/libtermkey/libtermkey-0.17.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Library for easy processing of keyboard entry from terminal-based programs"
-HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/"
-SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="demos"
-
-RDEPEND="dev-libs/unibilium:="
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig
-	demos? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	if ! use demos; then
-		sed -e '/^all:/s:$(DEMOS)::' -i Makefile || die
-	fi
-}
-
-src_compile() {
-	append-flags -fPIC -fPIE
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libtermkey/metadata.xml b/dev-libs/libtermkey/metadata.xml
deleted file mode 100644
index f2b4a5d..0000000
--- a/dev-libs/libtermkey/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
deleted file mode 100644
index dd3625e..0000000
--- a/dev-libs/msgpack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST msgpack-0.6.0_pre20150220.tar.xz 121096 SHA256 a0de45c66c0730012f0c6f12ed00bd6a6645c9b796f0168b66c03ce52d646080 SHA512 186e28dd2b7a8ddba0fe08ab73366ebf31bd22a9e52af320b542ff6b3c948fdaf2e5c27923d5a7315248378da27d6bd5eb199cf98cf2ea41ccebb96863b2cbfc WHIRLPOOL a708454ce41ba057011e8c7d513d44ada6bd2e4170c43cdbb2ef6597fe1912af2dc619267f3182d2869be742f3d09e8270f7b71aca14421cb8f43a4ee2ad3a15
diff --git a/dev-libs/msgpack/metadata.xml b/dev-libs/msgpack/metadata.xml
index 157326a..71d3191 100644
--- a/dev-libs/msgpack/metadata.xml
+++ b/dev-libs/msgpack/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+  <herd>vim</herd>
 </pkgmetadata>
diff --git a/dev-libs/msgpack/msgpack-0.6.0_pre20150220.ebuild b/dev-libs/msgpack/msgpack-0.6.0_pre20150220.ebuild
deleted file mode 100644
index 97273ac..0000000
--- a/dev-libs/msgpack/msgpack-0.6.0_pre20150220.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-
-DEPEND="test? ( >=dev-cpp/gtest-1.6.0-r2 )"
-DOCS=( CHANGELOG.md QUICKSTART-C.md QUICKSTART-CPP.md README.md CROSSLANG.md )
diff --git a/dev-libs/msgpack/msgpack-9999.ebuild b/dev-libs/msgpack/msgpack-9999.ebuild
index 3497fef..53a1a20 100644
--- a/dev-libs/msgpack/msgpack-9999.ebuild
+++ b/dev-libs/msgpack/msgpack-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/msgpack/msgpack-0.6.0_pre20150220.ebuild,v 1.3 2015/02/26 06:16:37 yngwin Exp $
 
 EAPI=5
-inherit cmake-utils
+inherit cmake-multilib
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
 HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
@@ -12,15 +12,13 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 	KEYWORDS=""
 else
-	inherit vcs-snapshot
-	COMMIT="f6d0cd9a4ba46f4341014a199e3d352fad76b215"
-	SRC_URI="https://github.com/${PN}/${PN}-c/tarball/${COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
 
-DEPEND="test? ( >=dev-cpp/gtest-1.6.0-r2 )"
+DEPEND="test? ( >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] )"
 DOCS=( CHANGELOG.md QUICKSTART-C.md QUICKSTART-CPP.md README.md CROSSLANG.md )
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
deleted file mode 100644
index 7988cf2..0000000
--- a/dev-libs/unibilium/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unibilium-1.1.2.tar.xz 50076 SHA256 8c7ac52c31ac9567967891c3006bf8a677ec98eeaf46cc4acfc52efe9e165c3c SHA512 275146b0f4ad15997876180143938ff782f3be24c6fcfc2a0a3dbf22e19bfc6999f4c27ec6a39ebf8e45ad5cc0c3e5a80caa1ef00526bf54c824b78eaa0c29d4 WHIRLPOOL c50c816de331c0715191a1801e759facc968ff17a24b4a4d21ded9ab43acfbae4fe5693cfc08fd32ce0a46e2faa11211153cbf76f641931c0fbf197ad52934e8
diff --git a/dev-libs/unibilium/metadata.xml b/dev-libs/unibilium/metadata.xml
deleted file mode 100644
index f2b4a5d..0000000
--- a/dev-libs/unibilium/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-libs/unibilium/unibilium-1.1.2.ebuild b/dev-libs/unibilium/unibilium-1.1.2.ebuild
deleted file mode 100644
index 9e0c792..0000000
--- a/dev-libs/unibilium/unibilium-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/mauke/unibilium/"
-SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	sys-devel/libtool"
-RDEPEND=""
-
-src_compile() {
-	append-flags -fPIC -fPIE
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest
deleted file mode 100644
index 5d8e625..0000000
--- a/dev-lua/messagepack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lua-messagepack-0.3.2.tar.xz 13416 SHA256 0f9e24d5a83678bf03a106504f95fc190513aa66cccf22f0f5c4129c6a3af27a SHA512 d5b0193f157ea5ce4df6fa54fab3662c279bdf03679ba4e5f9d4341875c66c4a96a5f11fd68e06a92fe2c47681584708dc79b9a9337356391c41f4de76c6ddcd WHIRLPOOL da8d7e72ba79232cf8e131c77a7f82850d60c47dc9772cced9a05842d5da92746564a6ff7ef7aefa9389173ba2183b87a4e2e954b37d598fc7b1fd96db1ec294
diff --git a/dev-lua/messagepack/messagepack-0.3.2.ebuild b/dev-lua/messagepack/messagepack-0.3.2.ebuild
deleted file mode 100644
index d2f633e..0000000
--- a/dev-lua/messagepack/messagepack-0.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A pure Lua implementation of the MessagePack serialization format"
-HOMEPAGE="http://fperrad.github.io/lua-MessagePack/"
-SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/lua-${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+luajit"
-
-RDEPEND="luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	local lua=lua
-	use luajit && lua=luajit
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
-	doins src/MessagePack.lua
-	dodoc CHANGES README.md
-}
diff --git a/dev-lua/messagepack/metadata.xml b/dev-lua/messagepack/metadata.xml
deleted file mode 100644
index f2b4a5d..0000000
--- a/dev-lua/messagepack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
deleted file mode 100644
index e71c8c2..0000000
--- a/dev-python/neovim-python-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST neovim-python-client-0.0.28.tar.xz 37940 SHA256 5e749cec8c2f43c58edee1726651a87f83ccc50f3184c18201bc529cbef4515d SHA512 a14b33fe4ebca04384c636ae6510c4866701862017b7a7e84d9ba72304e593162b888b08cf224f1d3aa2de4b645d1adf313044b7ef7ed8608722d22467c5e86b WHIRLPOOL 1f4b8e6a3f8b27d7f7a6810bcc1aaa8e683ebbfa58609e89c2905fc4b354d0df36a7e58adf0714c30c27479f235444dc32735ab7b76c7b86bb5559f7d03286a6
diff --git a/dev-python/neovim-python-client/metadata.xml b/dev-python/neovim-python-client/metadata.xml
deleted file mode 100644
index 087a225..0000000
--- a/dev-python/neovim-python-client/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>vim</herd>
-  <herd>python</herd>
-</pkgmetadata>
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.0.28.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.0.28.ebuild
deleted file mode 100644
index 6a52a48..0000000
--- a/dev-python/neovim-python-client/neovim-python-client-0.0.28.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-#PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-PYTHON_COMPAT=( python2_7 ) # currently only works on py2
-inherit distutils-r1
-
-DESCRIPTION="Python client to connect to Neovim thru its msgpack-rpc API"
-HOMEPAGE="https://github.com/neovim/python-client"
-SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/click-3.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/greenlet[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_2,3_3} 'pypy*')"
-RDEPEND="${DEPEND}"