From 7f5a4f2028d80f1654175ac24d8fd8395ef7da50 Mon Sep 17 00:00:00 2001 From: Ben de Groot Date: Sun, 22 Feb 2015 02:54:56 +0800 Subject: neovim and related updates after review --- app-editors/neovim/Manifest | 1 + app-editors/neovim/neovim-0.0.0_pre20150220.ebuild | 45 ---------------------- app-editors/neovim/neovim-0.0.0_pre20150221.ebuild | 45 ++++++++++++++++++++++ dev-libs/libtermkey/libtermkey-0.17.ebuild | 7 ++-- dev-libs/unibilium/unibilium-1.1.1.ebuild | 2 +- .../neovim-python-client-0.0.28.ebuild | 10 ++--- 6 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 app-editors/neovim/neovim-0.0.0_pre20150220.ebuild create mode 100644 app-editors/neovim/neovim-0.0.0_pre20150221.ebuild diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 60ca0fa..9eaf903 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1 +1,2 @@ DIST neovim-0.0.0_pre20150220.tar.gz 7369427 SHA256 d6628a2de3f5fea5983a6ee9fa7d3eae4e1d3469ab5948ac4d5f27fd3131229c SHA512 4580539c975848cd94402e045e983ee40e585a515ac4dca343fa6ee354359a74222738b682359c1f98619a70578abaf4e482023fdb9b25ea80dbf6e8cf53a22d WHIRLPOOL f68b1d8512f62f8f3b6c7871642c4b257f6f72ed920e6c91a358180a559b0db87ba5e5758d1849437aa00f14322fe59d6318b071616c22e1e700929332bfa98f +DIST neovim-0.0.0_pre20150221.tar.gz 7346903 SHA256 b1bc7d6bcbee7a0b343f6419e2e314e9630e06c1fbd12c9c400efef0e91b3721 SHA512 c82038b3b38639d71a07bed5a0bb1ad7bdd363a5d4cf382cb8cf91ec226ab8cf00ce50f40ef0e08403d496a3de02f70e7e6d33d7f178f14912a61becf28775a1 WHIRLPOOL 6a6b40bb879fdd2e97f20ec8a8c8b45ce265ff1bf93d41b5417418b371ace38c0c2c0ecd59784a564eb9a859e7c57656f02b1e524663bcab084b99d591bdc43f diff --git a/app-editors/neovim/neovim-0.0.0_pre20150220.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150220.ebuild deleted file mode 100644 index 7c8bb7d..0000000 --- a/app-editors/neovim/neovim-0.0.0_pre20150220.ebuild +++ /dev/null @@ -1,45 +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 - inherit vcs-snapshot - COMMIT="8efb3607a7f6cefce450953c7f8d5e3299347bae" - SRC_URI="https://github.com/${PN}/${PN}/tarball/${COMMIT} -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0 vim" -SLOT="0" -IUSE="perl python" - -CDEPEND="dev-lang/luajit - >=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/LuaBitOp - dev-lua/lpeg - dev-lua/lua-MessagePack" -DEPEND="${CDEPEND} - virtual/libiconv - virtual/libintl" -RDEPEND="${CDEPEND} - perl? ( dev-lang/perl ) - python? ( dev-python/neovim-python-client )" - -src_configure() { - append-cflags "-Wno-error" - append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" - local mycmakeargs=( -DCMAKE_BUILD_TYPE=Release ) - cmake-utils_src_configure -} diff --git a/app-editors/neovim/neovim-0.0.0_pre20150221.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150221.ebuild new file mode 100644 index 0000000..bf39ac3 --- /dev/null +++ b/app-editors/neovim/neovim-0.0.0_pre20150221.ebuild @@ -0,0 +1,45 @@ +# 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 + inherit vcs-snapshot + COMMIT="e9c5f96964b1dcc7d7a013ffd056b97f2674f509" + SRC_URI="https://github.com/${PN}/${PN}/tarball/${COMMIT} -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Apache-2.0 vim" +SLOT="0" +IUSE="perl python" + +CDEPEND="dev-lang/luajit + >=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/LuaBitOp + dev-lua/lpeg + dev-lua/lua-MessagePack" +DEPEND="${CDEPEND} + virtual/libiconv + virtual/libintl" +RDEPEND="${CDEPEND} + perl? ( dev-lang/perl ) + python? ( dev-python/neovim-python-client )" + +src_configure() { + append-cflags "-Wno-error" + append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" + local mycmakeargs=( -DCMAKE_BUILD_TYPE=Release ) + cmake-utils_src_configure +} diff --git a/dev-libs/libtermkey/libtermkey-0.17.ebuild b/dev-libs/libtermkey/libtermkey-0.17.ebuild index e5da7b2..a414847 100644 --- a/dev-libs/libtermkey/libtermkey-0.17.ebuild +++ b/dev-libs/libtermkey/libtermkey-0.17.ebuild @@ -14,8 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="demos" -RDEPEND="|| ( dev-libs/unibilium - sys-libs/ncurses[unicode] )" +RDEPEND="dev-libs/unibilium:=" DEPEND="${RDEPEND} sys-devel/libtool virtual/pkgconfig @@ -23,12 +22,12 @@ DEPEND="${RDEPEND} src_prepare() { if ! use demos; then - sed -e 's|all: $(LIBRARY) $(DEMOS)|all: $(LIBRARY)|' -i Makefile || die + sed -e '/^all:/s:$(DEMOS)::' -i Makefile || die fi } src_compile() { - emake PREFIX="${EPREFIX}/usr" all + emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all } src_install() { diff --git a/dev-libs/unibilium/unibilium-1.1.1.ebuild b/dev-libs/unibilium/unibilium-1.1.1.ebuild index 3967d06..bd17ff6 100644 --- a/dev-libs/unibilium/unibilium-1.1.1.ebuild +++ b/dev-libs/unibilium/unibilium-1.1.1.ebuild @@ -19,7 +19,7 @@ DEPEND="dev-lang/perl RDEPEND="" src_compile() { - emake PREFIX="${EPREFIX}/usr" all + emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all } src_install() { 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 index 0c68887..1ccc930 100644 --- 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 @@ -8,17 +8,17 @@ inherit distutils-r1 DESCRIPTION="Python client to connect to Neovim thru its msgpack-rpc API" HOMEPAGE="https://github.com/neovim/python-client" -SRC_URI="https://github.com/neovim/python-client/archive/0.0.28.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND=">=dev-python/click-3.0 - >=dev-python/msgpack-0.4.0 - !python_targets_pypy? ( dev-python/greenlet ) - !python_targets_python3_4? ( dev-python/trollius )" +DEPEND=">=dev-python/click-3.0[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'python*' 'dev-python/greenlet[${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'python{2_7,3_2,3_3} pypy*' 'dev-python/trollius[${PYTHON_USEDEP}]')" RDEPEND="${DEPEND}" S=${WORKDIR}/${P/neovim-/} -- cgit v1.2.3-65-gdbad