gentoo resync : 11.02.2018

3 files changed, 54 insertions, 16 deletions

diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 8d1061f1239c..1637dbf0d17e 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,4 +1,5 @@
-DIST vis-0.3.tar.gz 334216 BLAKE2B 8cf89f1e3292beb5bf7bc9495e75b795225a4a29f4d949f212daf5dd42958f347b1400a0fd1bf00014b28cfbd424bb04152c35ef9025384a746e59143fc872bb SHA512 e1ca009bd7569f22dacf7464791f9f4499695d15d6e38e1be491d39e7ebe0530de643be5c1e7647e9beb7969a17efab6545d3e719fe8cf311562e89d636bba62
-EBUILD vis-0.3.ebuild 904 BLAKE2B c5e9b25d11f5a24b0e6813873ff9505ed75e1ef7c5b1504c293acb96d0fdcb2b68f966902bdafdcf82c84c9725c12890ddaf0e5aacffca12a7c01af9148ebc77 SHA512 eda1cf1e88cbe41746b0a5623afdabea7e4c8fe332744ad87cbb73ed2b9866bd5a6edd761c00a68282ff12c1e328802d435fe544d0f56bb0899a9d9e4d1f13bc
-EBUILD vis-9999.ebuild 881 BLAKE2B 37cac906c21238dbf05d90cb2ab8655dc513b59d061b9c632083baccbc7658c138fde8024e5ebfe5fcc95789d7f90a4e87bcc065cc940cfe09f8e51a2fc14608 SHA512 47c8bc9c096f9f738d560e89b75541ce31f8592bf5dd1f17c4350eca06633855bc24a4375c2af2648a3434303cb3f734e95f246a450bd2bf1bdf108a80ff435d
+DIST vis-0.4.tar.gz 381046 BLAKE2B 612d9f17c5ffb00be9e5c14da0d52257e55e53250cb9ba80750feaf5d90caa53aed0f02e32413a10f161e121019cf758902158ddeac09c2516d18779f4264cda SHA512 d8fcf667ecad7b32752d6c5dbd004544e1a9283775d54d93c24ce8f314b98154aed5c6014cc03223d8427c2b1e3fd0d4b348dfa12ce30236fddd93b34521ee5f
+DIST vis-test-0.2.tar.gz 97770 BLAKE2B 9f8e31eb70ab8f9ce089f66ef29520e8250e02de375f9f8f0e33722c6a392bc6e04e7122728826708b305fb439c2b39f7fe3e233d7be162930aa46bf31bdb005 SHA512 892effa08c80c75e78eeb993ba8a0ddc110cc6f654fa1bf970454c35c839e9467b0ab41578f49af1fba0514c61f887fa044b9d01ab58f4dd749582a9550a2c29
+EBUILD vis-0.4.ebuild 1517 BLAKE2B b337caa62c91c870ffa172995a1ad5332cbfb7384447f7c7d45e7329565128161da6ed3ae17596c6d3cb8bd4387a6070c3845868da02554a6947935da57b82e3 SHA512 3cf83463343ec55e19422488f98ebb6c48d9144a9f6d0f2970ac4d9bbad36ff277f10e48f850bf4a533a88a5eed85e021db00b895bc0fa30c05a54a819e00ddc
+EBUILD vis-9999.ebuild 1303 BLAKE2B 929cc3a3ee02777d1802dc646487ca33fe7896e3cd794693b2291451e7fee57be7f8c9627f2821daef411ecebd0e2569e383a570540c8301910bfe804ab3933c SHA512 64992a3c8dd0bc80115739bd441c89b089873d78edd273fd36164cf6449f66ee736970ea7dd24115a714489090b9c1605c9e0372e70b01a94aca0e918758228b
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.3.ebuild b/app-editors/vis/vis-0.4.ebuild
index e6ef1b663060..7d45b495cee2 100644
--- a/app-editors/vis/vis-0.3.ebuild
+++ b/app-editors/vis/vis-0.4.ebuild
@@ -1,28 +1,50 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+MY_PTV=0.2
 
 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"
+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 -> vis-test-${MY_PTV}.tar.gz )"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+ncurses selinux tre"
+IUSE="+ncurses selinux test tre"
 
 #Note: vis is reported to also work with NetBSD curses
 #TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
-DEPEND=" dev-libs/libtermkey
+DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
 	tre? ( dev-libs/tre:= )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	app-eselect/eselect-vi"
+
+src_prepare() {
+	if use test; then
+		rm -r test || die
+		mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
+		if ! type -P vim &>/dev/null; then
+			sed -i 's/.*vim.*//' test/Makefile || die
+		fi
+	fi
+
+	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
+	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
+	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
+
+	default
+}
 
 src_configure() {
-	econf \
+	./configure \
+		--prefix="${EROOT}usr" \
+		--docdir="${EROOT}usr/share/doc/${PF}" \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
-		$(use_enable tre)
+		$(use_enable tre) || die
 }
 
 update_symlinks() {
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 55adf2006010..228e63e98cd8 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit git-r3
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
@@ -10,20 +10,35 @@ EGIT_REPO_URI="https://github.com/martanne/vis.git"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS=""
-IUSE="+ncurses selinux tre"
+IUSE="+ncurses selinux test tre"
 
 #Note: vis is reported to also work with NetBSD curses
 #TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
-DEPEND=" dev-libs/libtermkey
+DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
 	tre? ( dev-libs/tre:= )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	app-eselect/eselect-vi"
+
+src_prepare() {
+	if use test && ! type -P vim &>/dev/null; then
+		sed -i 's/.*vim.*//' "${S}/test/Makefile" || die
+	fi
+
+	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
+	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
+	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
+
+	default
+}
 
 src_configure() {
-	econf \
+	./configure \
+		--prefix="${EROOT}usr" \
+		--docdir="${EROOT}usr/share/doc/${PF}" \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
-		$(use_enable tre)
+		$(use_enable tre) || die
 }
 
 update_symlinks() {