logo

overlay

Personnal gentoo overlay
commit: 950a8938347475b6c09dfcb035c29768580f2cb7
parent: 761cc0574bbec11b60bfdabd9e8474c1d702c07c
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue, 15 Aug 2017 17:46:11 +0200

app-editors/vis: backport ::gentoo "add FEATURES=test"

Diffstat:

app-editors/vis/vis-0.3.ebuild | 25++++++++++++++-----------
app-editors/vis/vis-9999.ebuild | 13++++++++++---
2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app-editors/vis/vis-0.3.ebuild b/app-editors/vis/vis-0.3.ebuild @@ -3,12 +3,10 @@ EAPI=5 -# Package test version and name MY_PTV=0.1 -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,20 @@ 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 } src_configure() { diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild @@ -13,11 +13,18 @@ KEYWORDS="" 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 && which vim &>/dev/null || sed -i 's/.*vim.*//' "${S}/test/Makefile" + if use test; then + type -P vim &>/dev/null || sed -i 's/.*vim.*//' /test/Makefile || die + fi } src_configure() {