summaryrefslogtreecommitdiff
path: root/app-editors
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/neovim/Manifest8
-rw-r--r--app-editors/neovim/metadata.xml34
-rw-r--r--app-editors/neovim/neovim-0.4.2.ebuild95
-rw-r--r--app-editors/neovim/neovim-9999.ebuild42
4 files changed, 146 insertions, 33 deletions
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 8ea52feb0897..baa46f2fd138 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,5 +1,13 @@
AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7
+<<<<<<< HEAD
EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d
EBUILD neovim-9999.ebuild 1953 BLAKE2B 628bf1d0fd2883e930722178b9530a8b391bd23fe5dd69cafcf4027bf5ebea2ef4085d2ce2e09e27e97f4ab67f8c00baafddf4759a6754c132c3b75c61992fce SHA512 964119b4ac52f276a558fc9cb01edfc585cdf6aee0be64b62344f8382db501196e06f847e34b71b7de8ae0c3510dedcd9efc281b3d7a4e54054fe97a7a8d09ef
MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
+=======
+DIST neovim-0.4.2.tar.gz 9552134 BLAKE2B 4004a2e2788344ab96c97f145acc4f75680961ad004fcaa017731557899bbed24c6003b799c1496067a3ca75d8a4c2e63344b9646e8dab0ed00c9fa329d90ab2 SHA512 cc0de18ee7ca5105a0dd9f5f06b4d58335618b22c4dc3d584a024683785ff9d541c7f5131742b8a818ac9acb2218da92f9b8a881d56c4b963237918e589fac22
+EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d
+EBUILD neovim-0.4.2.ebuild 1860 BLAKE2B b2ede90a493ac5963f3e4adaf28d27c64c14165ea0e2f0e8140b2204fd111553ad6b8c7729aea594049eec7ff66aebccdabdba61fa34c0f31e575b236f917561 SHA512 544546dc90aa1d010b1ae9f23845b753d91a59c1c4180d6df0ed079b56ad7c0ce60b93d98d20da2b4dd8864be3bab71f17eef8eb9c9723f0f9cbc42f67dad40b
+EBUILD neovim-9999.ebuild 1860 BLAKE2B b2ede90a493ac5963f3e4adaf28d27c64c14165ea0e2f0e8140b2204fd111553ad6b8c7729aea594049eec7ff66aebccdabdba61fa34c0f31e575b236f917561 SHA512 544546dc90aa1d010b1ae9f23845b753d91a59c1c4180d6df0ed079b56ad7c0ce60b93d98d20da2b4dd8864be3bab71f17eef8eb9c9723f0f9cbc42f67dad40b
+MISC metadata.xml 862 BLAKE2B e9725c43d1a34d8da4fd779a2a945594914ed51a2fc0b87a9a2a6ddefcc8d38d88c94c426a59df9f94b08045b2f8820ee205e7982a19c15f1872d2a73b35fae6 SHA512 9eb46f7862d26c27f400d22023ac3cc81f5671e8b17d4f52b0743abcfdf53d63366cd16c06ac1e391f02bf35fb9b70e0864eda9457c1f45ff74a06f528d1b8a7
+>>>>>>> next
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index d9da9e93722d..0a78b2540a2f 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -1,17 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>vim@gentoo.org</email>
- <name>Gentoo Vim Project</name>
- </maintainer>
- <use>
- <flag name="clipboard">Enable clipboard support through a provider</flag>
- <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
- <flag name="remote">Enable support for remote options using nvr</flag>
- <flag name="tui">Build the neovim unix tui</flag>
- </use>
- <upstream>
- <remote-id type="github">neovim/neovim</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>bernardo@standard.ai</email>
+ <name>Bernardo Meurer</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Gentoo Proxy Maintainers Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <use>
+ <flag name="clipboard">Enable clipboard support through a provider</flag>
+ <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
+ <flag name="remote">Enable support for remote options using nvr</flag>
+ <flag name="tui">Build the neovim unix tui</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">neovim/neovim</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-editors/neovim/neovim-0.4.2.ebuild b/app-editors/neovim/neovim-0.4.2.ebuild
new file mode 100644
index 000000000000..7726bfae3ede
--- /dev/null
+++ b/app-editors/neovim/neovim-0.4.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+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 remote ruby +tui"
+
+BDEPEND="
+ dev-util/gperf
+ virtual/libiconv
+ virtual/libintl
+ virtual/pkgconfig
+"
+
+DEPEND="
+ dev-libs/libuv:0=
+ >=dev-libs/libvterm-0.1
+ dev-libs/msgpack:0=
+ dev-lua/lpeg[luajit=]
+ dev-lua/luv[luajit=]
+ dev-lua/mpack[luajit=]
+ net-libs/libnsl
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? (
+ dev-lang/lua:=
+ dev-lua/LuaBitOp
+ )
+ tui? (
+ dev-libs/libtermkey
+ >=dev-libs/unibilium-2.0.0:0=
+ )
+"
+
+RDEPEND="
+ ${DEPEND}
+ app-eselect/eselect-vi
+ python? ( dev-python/neovim-python-client )
+ ruby? ( dev-ruby/neovim-ruby-client )
+ remote? ( dev-python/neovim-remote )
+ clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+ # use our system vim dir
+ sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+ -i src/nvim/globals.h || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DFEAT_TUI=$(usex tui)
+ -DPREFER_LUA=$(usex luajit no yes)
+ )
+ 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
+}
+
+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 ca75f7a61c94..7726bfae3ede 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -20,46 +20,48 @@ LICENSE="Apache-2.0 vim"
SLOT="0"
IUSE="+clipboard +luajit +nvimpager python remote ruby +tui"
-CDEPEND=">=dev-libs/libuv-1.2.0:0=
- >=dev-libs/msgpack-1.0.0:0=
+BDEPEND="
+ dev-util/gperf
+ virtual/libiconv
+ virtual/libintl
+ virtual/pkgconfig
+"
+
+DEPEND="
+ dev-libs/libuv:0=
+ >=dev-libs/libvterm-0.1
+ dev-libs/msgpack:0=
+ dev-lua/lpeg[luajit=]
+ dev-lua/luv[luajit=]
+ dev-lua/mpack[luajit=]
+ net-libs/libnsl
luajit? ( dev-lang/luajit:2 )
!luajit? (
dev-lang/lua:=
dev-lua/LuaBitOp
)
tui? (
- >=dev-libs/libtermkey-0.21.1
+ dev-libs/libtermkey
>=dev-libs/unibilium-2.0.0:0=
)
- dev-libs/libvterm
- dev-lua/lpeg[luajit=]
- dev-lua/mpack[luajit=]
- net-libs/libnsl"
-
-DEPEND="
- ${CDEPEND}
- dev-util/gperf
- virtual/libintl
- virtual/libiconv
- app-eselect/eselect-vi"
+"
RDEPEND="
- ${CDEPEND}
+ ${DEPEND}
+ app-eselect/eselect-vi
python? ( dev-python/neovim-python-client )
ruby? ( dev-ruby/neovim-ruby-client )
remote? ( dev-python/neovim-remote )
- clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
+ clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+"
CMAKE_BUILD_TYPE=Release
src_prepare() {
# use our system vim dir
- sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+ 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
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 03:00:36 +0000