commit: 36bbf62ad8075e59f6db6ec71b6571b022b39420
parent: 25bce5ca21a36afb9621763b12a26ec99334f801
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Tue, 9 May 2017 03:30:56 +0200
app-editors/vis: Backport changes done for gentoo inclusion
Diffstat:
6 files changed, 20 insertions(+), 102 deletions(-)
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
@@ -1,3 +1 @@
-DIST vis-0.1.tar.gz 221342 SHA256 c695b095f85f4360590865b0b7007aa019463b24c1026c0e624a78b31f3ac54b SHA512 f2647971660ceb14a16371129e01027264c80818e1143684dffd19a7b99df5ee83978751b497b5678bb36a910203f9546366db335ccaf721b906b8e5b1bb9100 WHIRLPOOL 4772ac8f29625dc74ab95684986bd7e8fce703624279d939f10742c67b8f157be41a121fd31a569f7ae225c8288280d85e338e988ffbefdea6cabc960647bbbb
-DIST vis-0.2.tar.gz 241415 SHA256 3e5b81d760849c56ee378421e9ba0f653c641bf78e7594f71d85357be99a752d SHA512 ded2566105b890e21ee010f2f2809986e405f76bed2f7a969d2f818bcf437f3969a140ed0be2af7631e36b3c7fb6b73a3d715ba9ddb7fdd67a2e983b0765918a WHIRLPOOL 01634f9fb3f131f8cede67cfe30b06cdc1667093e66eb6536b83363dda8e682d3a95e960626d5a0d5654e9b3356bf7b5607f68659f73a5d61e9a2b1082e04308
DIST vis-0.3.tar.gz 334216 SHA256 bed8ed32ef4f81bc4fd28e297ea8edc80027ac6923b9d3b5bd955d24899c7077 SHA512 e1ca009bd7569f22dacf7464791f9f4499695d15d6e38e1be491d39e7ebe0530de643be5c1e7647e9beb7969a17efab6545d3e719fe8cf311562e89d636bba62 WHIRLPOOL a0ddd69b88b4131d4b9c2ba5494e255f20cd99f91998e4ad4fcec3e0298e39d9319571201b8ae4c8b4d21da78b99d865d72bfb534024a89863d66b9968e562c8
diff --git a/app-editors/vis/metadata.xml b/app-editors/vis/metadata.xml
@@ -2,14 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
-<email>contact@hacktivis.me</email>
+ <email>contact@hacktivis.me</email>
+ <name>Haelwenn (lanodan) Monnier</name>
</maintainer>
<longdescription lang="en">
Vis aims to be a modern, legacy free, simple yet efficient editor combining the strengths of both vi(m) and sam.
</longdescription>
<use>
-<flag name="tre">more memory efficient regex search using <pkg>dev-libs/tre</pkg></flag>
-<flag name="lpeg">runtime for syntax highlight using <pkg>dev-lua/lpeg</pkg></flag>
-<flag name="curses">use curses (not only GNU ncurses), else it can cause flickering</flag>
+ <flag name="tre">more memory efficient regex search using <pkg>dev-libs/tre</pkg></flag>
+ <flag name="lpeg">runtime for syntax highlight using <pkg>dev-lua/lpeg</pkg></flag>
</use>
</pkgmetadata>
diff --git a/app-editors/vis/vis-0.1.ebuild b/app-editors/vis/vis-0.1.ebuild
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Vis aims to be a modern, legacy free, simple yet efficient vim-like editor."
-HOMEPAGE="https://github.com/martanne/vis"
-SRC_URI="https://github.com/martanne/vis/archive/v${PV}.tar.gz -> vis-0.1.tar.gz"
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE="+lua -selinux"
-
-DEPEND="sys-libs/ncurses:= dev-libs/libtermkey lpeg? ( >=dev-lang/lua-5.2:= )"
-RDEPEND="${DEPEND} lpeg? ( >=dev-lua/lpeg-0.12 )"
-
-src_prepare() {
- use lua || {
- sed -i -e 's|CONFIG_LUA=1|CONFIG_LUA=0|' \
- config.mk || die "sed config.mk failed"
- }
-
- use selinux && {
- sed -i -e 's|CONFIG_SELINUX=0|CONFIG_SELINUX=1|' \
- config.mk || die "sed config.mk failed"
- }
-}
-
-update_symlinks() {
- einfo "Calling eselect vi update --if-unset…"
- eselect vi update --if-unset
-}
-
-pkg_postrm() {
- update_symlinks
-}
-
-pkg_postinst() {
- update_symlinks
-}
diff --git a/app-editors/vis/vis-0.2.ebuild b/app-editors/vis/vis-0.2.ebuild
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Vis aims to be a modern, legacy free, simple yet efficient vim-like editor."
-HOMEPAGE="https://github.com/martanne/vis"
-SRC_URI="https://github.com/martanne/vis/archive/v${PV}.tar.gz -> vis-0.2.tar.gz"
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE="lpeg -selinux"
-
-DEPEND="sys-libs/ncurses:= dev-libs/libtermkey lpeg? ( >=dev-lang/lua-5.2:= )"
-RDEPEND="${DEPEND} lpeg? ( >=dev-lua/lpeg-0.12 )"
-
-src_prepare() {
- use lua || {
- sed -i -e 's|CONFIG_LUA=1|CONFIG_LUA=0|' \
- config.mk || die "sed config.mk failed"
- }
-
- use selinux && {
- sed -i -e 's|CONFIG_SELINUX=0|CONFIG_SELINUX=1|' \
- config.mk || die "sed config.mk failed"
- }
-}
-
-update_symlinks() {
- einfo "Calling eselect vi update --if-unset…"
- eselect vi update --if-unset
-}
-
-pkg_postrm() {
- update_symlinks
-}
-
-pkg_postinst() {
- update_symlinks
-}
diff --git a/app-editors/vis/vis-0.3.ebuild b/app-editors/vis/vis-0.3.ebuild
@@ -4,23 +4,24 @@
EAPI=5
-DESCRIPTION="Vis aims to be a modern, legacy free, simple yet efficient vim-like editor."
+DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor."
HOMEPAGE="https://github.com/martanne/vis"
-SRC_URI="https://github.com/martanne/vis/archive/v${PV}.tar.gz -> vis-0.3.tar.gz"
+SRC_URI="https://github.com/martanne/vis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE="lua lpeg -selinux tre +curses"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+ncurses lua lpeg selinux tre"
#TODO: virtual/curses
-DEPEND="dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2:= ) tre? ( dev-libs/tre:* ) curses? ( sys-libs/ncurses:= )"
+DEPEND="dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2:= ) tre? ( dev-libs/tre:= ) ncurses? ( sys-libs/ncurses:= )"
RDEPEND="${DEPEND} lua? ( lpeg? ( >=dev-lua/lpeg-0.12 ) ) "
src_configure() {
- econf $(use_enable lua) \
- $(use_enable tre) \
+ econf \
+ $(use_enable lua) \
+ $(use_enable ncurses curses) \
$(use_enable selinux) \
- $(use_enable curses)
+ $(use_enable tre)
}
update_symlinks() {
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
@@ -5,23 +5,24 @@
EAPI=5
inherit git-r3
-DESCRIPTION="Vis aims to be a modern, legacy free, simple yet efficient vim-like editor."
+DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor."
HOMEPAGE="https://github.com/martanne/vis"
EGIT_REPO_URI="https://github.com/martanne/vis.git"
LICENSE="ISC"
SLOT="0"
KEYWORDS=""
-IUSE="lua lpeg -selinux tre +curses"
+IUSE="+ncurses lua lpeg selinux tre"
#TODO: virtual/curses
-DEPEND="dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2:= ) tre? ( dev-libs/tre:* ) curses? ( sys-libs/ncurses:= )"
+DEPEND="dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2:= ) tre? ( dev-libs/tre:= ) ncurses? ( sys-libs/ncurses:= )"
RDEPEND="${DEPEND} lua? ( lpeg? ( >=dev-lua/lpeg-0.12 ) ) "
src_configure() {
- econf $(use_enable lua) \
- $(use_enable tre) \
+ econf \
+ $(use_enable curses) \
+ $(use_enable lua) \
$(use_enable selinux) \
- $(use_enable curses)
+ $(use_enable tre)
}
update_symlinks() {