commit: 038835cc2510f231eccfbece0defc92703bbf668
parent: fc47c0e2c5b2ce8d132c163483d808ef21683cd5
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Tue, 15 Aug 2017 17:49:26 +0200
app-editors/vis: backport ::gentoo "Bump to version 0.4"
Diffstat:
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/app-editors/vis/vis-0.4.ebuild b/app-editors/vis/vis-0.4.ebuild
@@ -1,14 +1,12 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-# Package test version and name
MY_PTV=0.2
-MY_PTN=${PN}-test
-MY_PT=${MY_PTN}-${MY_PTV}
+MY_PT=${PN}-test-${MY_PTV}
-DESCRIPTION="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 -> ${P}.tar.gz
test? ( https://github.com/martanne/vis-test/archive/v${MY_PTV}.tar.gz -> ${MY_PT}.tar.gz )"
@@ -18,15 +16,22 @@ KEYWORDS="~amd64 ~arm ~x86"
IUSE="+ncurses lua lpeg selinux test tre"
#TODO: virtual/curses
-DEPEND="dev-libs/libtermkey lua? ( >=dev-lang/lua-5.2:= ) tre? ( dev-libs/tre:= ) ncurses? ( sys-libs/ncurses:= ) app-eselect/eselect-vi"
-RDEPEND="${DEPEND} lua? ( lpeg? ( >=dev-lua/lpeg-0.12 ) ) "
+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 ) )
+ app-eselect/eselect-vi"
src_prepare() {
- use test && (
- rm -r "${S}/test"
- mv "${WORKDIR}/${MY_PT}" "${S}/test"
- which vim &>/dev/null || sed -i 's/.*vim.*//' "${S}/test/Makefile"
- )
+ if use test; then
+ rm -r test || die
+ mv "${WORKDIR}/${MY_PT}" test
+ which vim &>/dev/null || sed -i 's/.*vim.*//' test/Makefile
+ fi
+
+ default
}
src_configure() {
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
src_prepare() {
if use test; then
- type -P vim &>/dev/null || sed -i 's/.*vim.*//' /test/Makefile || die
+ type -P vim &>/dev/null || sed -i 's/.*vim.*//' test/Makefile || die
fi
default