commit: 3fdb06d5464e16fbcdd115472c639e5d6c7df03e
parent: 4e142d8f0862b444b9eb918ab4eeea0b8ecf1883
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sun, 15 Jan 2017 19:31:36 +0100
app-editors/vis: Fix issue #7
Diffstat:
5 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
@@ -1,5 +1,6 @@
DIST v0.1.tar.gz 221342 SHA256 c695b095f85f4360590865b0b7007aa019463b24c1026c0e624a78b31f3ac54b SHA512 f2647971660ceb14a16371129e01027264c80818e1143684dffd19a7b99df5ee83978751b497b5678bb36a910203f9546366db335ccaf721b906b8e5b1bb9100 WHIRLPOOL 4772ac8f29625dc74ab95684986bd7e8fce703624279d939f10742c67b8f157be41a121fd31a569f7ae225c8288280d85e338e988ffbefdea6cabc960647bbbb
DIST v0.2.tar.gz 241415 SHA256 3e5b81d760849c56ee378421e9ba0f653c641bf78e7594f71d85357be99a752d SHA512 ded2566105b890e21ee010f2f2809986e405f76bed2f7a969d2f818bcf437f3969a140ed0be2af7631e36b3c7fb6b73a3d715ba9ddb7fdd67a2e983b0765918a WHIRLPOOL 01634f9fb3f131f8cede67cfe30b06cdc1667093e66eb6536b83363dda8e682d3a95e960626d5a0d5654e9b3356bf7b5607f68659f73a5d61e9a2b1082e04308
-EBUILD vis-0.1.ebuild 758 SHA256 bb106f8ec55a5b2136215d9e70d7a26c3e38695d856605562b3418777b6382ef SHA512 8a27a5f3a06cdaaeb0eff559b694b4921b807d42f9d93f828e4d65c298c51efcd5d7fed59f8e369becad56f765ec95f7ea3efdf9baed9af06589c0e493051e97 WHIRLPOOL 409bf8689d5c5a883fae670194fbce16e07e23e6b0a37b657359248ffec8d46eb8ed66ca4695058c9970cd1911c67d91b08f4cd24bb66c991f5e6ab08a8a48d7
-EBUILD vis-0.2.ebuild 760 SHA256 7ca1da9a3546a1805c6cd1eb027d70917d0428dd8aa468eb4c8f4cab985e5282 SHA512 4a70670c11fc07fbbcf706b0926e777f4fe28f9761c2ffbb9268fd49348d86b74a480a07f9755c5d614f06f6097f716c56b142efd070d8cf13aaf0425daa0378 WHIRLPOOL 7e12341dfdc253de547a1c28145f40aed8fcf1eb127aec7ddcaab9ae986f5edcd176cdb7c84fefbf1d629a3696a55159bff53269b7866fb5756bc4d5a53b0752
-EBUILD vis-9999.ebuild 952 SHA256 037c5437629ac8b76d54be6728b74f63c6840fd8010db95bfd268049fc2b260a SHA512 09a95e8d6d1daea0f7511dd6caceb0860e30f1845ac7c708374b885f724f9b00cbafa496ddcd6eb9f73cea3e5055f51b27d15b5984e48730db55e6d370f3a4da WHIRLPOOL 62321a15aee0bcc707ace5c3d1f8bb26d9b8d6bd365b91a525d01c81912247b0cf92acd4a7a28d1a202e112f07dadd02f3a614c18b806193d1194969c0c55d50
+EBUILD vis-0.1.ebuild 936 SHA256 c5a0878697c9215c47692040a08c990c44d9296162866a4d7aed48ece41aa742 SHA512 cbd50ddd5f08688c86b46ca751253a64a8144dd82e341344a9669d89fc5342bc24439c5a5f46ca1a9ebd5ac770a5f601be3d6b9db55e740941e66f6749c9c1e7 WHIRLPOOL dbc9881bbca9a8b8972799d5f397ea14759fcce488b51eae025a93606f34814802d3c96046c873c7459533a2214594363ca5dad10c31e9659b1bf9c2f5974d46
+EBUILD vis-0.2.ebuild 936 SHA256 c5a0878697c9215c47692040a08c990c44d9296162866a4d7aed48ece41aa742 SHA512 cbd50ddd5f08688c86b46ca751253a64a8144dd82e341344a9669d89fc5342bc24439c5a5f46ca1a9ebd5ac770a5f601be3d6b9db55e740941e66f6749c9c1e7 WHIRLPOOL dbc9881bbca9a8b8972799d5f397ea14759fcce488b51eae025a93606f34814802d3c96046c873c7459533a2214594363ca5dad10c31e9659b1bf9c2f5974d46
+EBUILD vis-9999.ebuild 923 SHA256 c42fd5236556cba7b8027bc083d0cf09c9319dae5f20e6d9ed5afd917d679dde SHA512 09c56e11eaa335ac304ef7ad4d54a2d1373d0fb1e6171516568d62efc2a9361436628b7c0ec67e37786aa5b88d8a7b621d423173488c9fe0d14b141c95684cf8 WHIRLPOOL abd2ed01d6186128b14afddf223d77c4658158f5b6dda348e76f2b9e47bc02ade018b3ecc65cfe3dc8d990c849b2beef2dd9dbd058b37656fc1af42c97b3517f
+MISC metadata.xml 376 SHA256 908500b0d9972d7688c85c4103682760341ef48c7e3b2da445ec31a7dee02889 SHA512 c19d5f510eedf12c65f9e0f11ef27d55085e2f8a3c7e8706c712f097e582eccbe3196755d705290349c3b7dd5ed97a3b96040b4a08978480d1a60f9d6405a1c2 WHIRLPOOL 7f93d1bc9571233b3490d0046f6e98507e246d3243a144e907ed198736cb950d76bf77ab70c5ade4d8b7a1fd9674caf3cacb2aea81d47b898db2457b555a678d
diff --git a/app-editors/vis/metadata.xml b/app-editors/vis/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>contact@hacktivis.me</email>
+</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>
+</pkgmetadata>
diff --git a/app-editors/vis/vis-0.1.ebuild b/app-editors/vis/vis-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,13 +7,12 @@ 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"
-
-LICENSE="as-is"
+LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ~x86 arm"
+KEYWORDS="~amd64 ~x86 ~arm"
IUSE="+lua -selinux"
-DEPEND="sys-libs/ncurses dev-libs/libtermkey lua? ( dev-lang/lua:5.2 )"
+DEPEND="sys-libs/ncurses:= dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2:= )"
RDEPEND="${DEPEND} lua? ( >=dev-lua/lpeg-0.12 )"
src_prepare() {
@@ -21,9 +20,22 @@ src_prepare() {
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,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,13 +7,12 @@ 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"
-
-LICENSE="as-is"
+LICENSE="ISC"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~arm"
IUSE="+lua -selinux"
-DEPEND="sys-libs/ncurses dev-libs/libtermkey lua? ( dev-lang/lua:5.2 )"
+DEPEND="sys-libs/ncurses:= dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2:= )"
RDEPEND="${DEPEND} lua? ( >=dev-lua/lpeg-0.12 )"
src_prepare() {
@@ -21,9 +20,22 @@ src_prepare() {
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-9999.ebuild b/app-editors/vis/vis-9999.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit git-r3 lua
+inherit git-r3
-EGIT_REPO_URI="https://github.com/martanne/vis.git"
DESCRIPTION="Vis aims to be a modern, legacy free, simple yet efficient vim-like editor."
HOMEPAGE="https://github.com/martanne/vis"
-KEYWORDS=""
+EGIT_REPO_URI="https://github.com/martanne/vis.git"
LICENSE="ISC"
SLOT="0"
+KEYWORDS=""
IUSE="+lua -selinux"
-DEPEND="sys-libs/ncurses dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="sys-libs/ncurses:= dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2:= )"
RDEPEND="${DEPEND} lua? ( >=dev-lua/lpeg-0.12 )"
-LUA_COMPAT=( lua{5.2, 5.3} )
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"
@@ -40,4 +39,4 @@ pkg_postrm() {
pkg_postinst() {
update_symlinks
-}-
\ No newline at end of file
+}
