gentoo resync : 11.02.2018

4 files changed, 64 insertions, 11 deletions

diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 68c3154bd01c..6a3d2e13632d 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -4,8 +4,8 @@ DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0
 DIST zile-2.4.11.tar.gz 1293707 BLAKE2B 30317856303cd093e767f7c057fab74cddcd49e95d8218b550e343d689914db02c82c5f35c66335e0685df9113dcbef93b4640fcf42438fb600f360b82c4e396 SHA512 dbcbae98d8b9fc7ea71abc8ad0c4248edf1498a731172e800dd4b1fd598597924cc61e24fbfce5eb44dd2b3a0b2aea416c6373843a450e19cc8c98aa83d6ae0e
 DIST zile-2.4.13.tar.gz 1296379 BLAKE2B 00dce642e6b452f66fd06e70a7f9e9047abb2c79af7fbc0c9150da37bfda31027c06c43028e22b657ce6a948f2e3e89375a6f5bddfe5222aa69f843cc5fc3ec9 SHA512 ada0eabe6285894ab4c25fa71c3ca6f07f0df2d36ad64f92037cb1b02d7b898dbd64fa47ef96800b7d995a5958ddec525e0d849a427e1f9bf14da944a4c30e88
 DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a639f78e736c7fe6220c972ce600a8db557dd592065bb27e1d35a5d3a42b6a4a8d5d76eefc4274a8ce27b1d9c2 SHA512 0dea56fd13a82015ec73de3139a4b2c27ad4c001ed535f1bae557ee49f9d8a188610a08160998d0a36b95fec42b46a019fd43634ef6502ebd27e162164de98cc
-EBUILD zile-2.3.24-r2.ebuild 889 BLAKE2B f66a9c8e3049d9a837855979f54c06dc1e39bbe9ed14f6861d6701ec517adc546cc078d7da134633ab685530cad1e30cfb004ab634f335ade6dbfd70e8821a86 SHA512 22f325d01af4bc598c06c63eb5cd395fbacb982af9b697d3c93c32a68f34eb858d4ba71416d9bcb5733a32c1e576812da75413d88e94940275f5612f60cc799b
+EBUILD zile-2.3.24-r2.ebuild 1364 BLAKE2B 40fa024bc57b7c62136001d4885943d670f6c2f8f7f49ae283c846648ec58c863dc24d2509c08d6288093e74f1d6af6bdb4eaeabf0e959ce0afbfa796a1fb2d9 SHA512 6eb6bcb7a5364d2615a957da3c6ceaba32f646b7ba263e749a49937b054d6d409c178e8b78b17ae820e0e81aa3d6f0d8fb888a95185df690a9e666bb37558fa3
 EBUILD zile-2.4.11.ebuild 901 BLAKE2B e0ec9fa51062e9438d35aef6c8ccd18d5bb506719166c2a8198b331a8f0c94c034923e09a1becd65dcd8f09380e98cd061fcdf645dcc48883a13fffbe7e4ec03 SHA512 c0229948c5c9d813ae8a5530ce3de60a0eab82de587d985975a77933207e3034432dedb73f37b86fc824a1cbee747cb6b39b67e7c6571dfb04c6e240d31a58ad
-EBUILD zile-2.4.13.ebuild 909 BLAKE2B 687ae226a301dfe13eb40cf0b99e018df99a3ec4dbb097f61af853e44c08c73f80adfe5b12792a06baea69702eeccc01b41f848f2e939c98c454e6d2b3ff915f SHA512 d3e8d0a0ab0cf46f18149b6403c19ca50de798cf5ff7d4b21e2977b100c5d6183381f15f6328591d2a54df536b43460044b92fa84115ba01dc42f61f2baa14d8
-EBUILD zile-2.4.14.ebuild 909 BLAKE2B 687ae226a301dfe13eb40cf0b99e018df99a3ec4dbb097f61af853e44c08c73f80adfe5b12792a06baea69702eeccc01b41f848f2e939c98c454e6d2b3ff915f SHA512 d3e8d0a0ab0cf46f18149b6403c19ca50de798cf5ff7d4b21e2977b100c5d6183381f15f6328591d2a54df536b43460044b92fa84115ba01dc42f61f2baa14d8
+EBUILD zile-2.4.13.ebuild 1383 BLAKE2B fc340260a2e20cb5530c3910b08fa04396efb2c45b1cd6442d4aed60bc3f418aa4eeab1fbcdd90c12c1c73198cfd2acf2c23f2f4dea23c1367589cf8e5ea3be8 SHA512 d41edf9dbab4290f47b5301263a962e21c459d4b1740a95e04f58c5a3c273870c9b2a7f7c505ab8a8b760afe7edf8a84df3e33373aa0aa745f3e91fdba129a61
+EBUILD zile-2.4.14.ebuild 1414 BLAKE2B 58877639a95bb2069cd4c62a98a5e970748c19891db3536f0a0cbf074bfaa51c520d6f4ecfde6486bbdc3e852c11d0c6fd02285d23063c4d9a93eaa9bee64d64 SHA512 421171734b26201e48a1b686023002ae34ea7fe498ffa1bf866f7b68ab9517ffe96ac6d827e68d2a51e768509422e62da57bb042af1504d76d243c8f7c30209d
 MISC metadata.xml 638 BLAKE2B 4830ef65d641a21c208c6e856daf949d8b931c1beef92f93e5428fae095e0c81e39ca93b9d9ec4cdafc74b689b1469e86d73f8a31fd3f775d728f1f973b1b743 SHA512 f2214ca22b8c80124f264991e70ad97047a5705dda78bc59573f1c80d3ee144343502bd7f610117af263611c11cb1c7c0b732fe44b6274272a50b7cf5d595ad1
diff --git a/app-editors/zile/zile-2.3.24-r2.ebuild b/app-editors/zile/zile-2.3.24-r2.ebuild
index 49d18af56379..f60cd5b9ec32 100644
--- a/app-editors/zile/zile-2.3.24-r2.ebuild
+++ b/app-editors/zile/zile-2.3.24-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="Zile is a small Emacs clone"
 HOMEPAGE="https://www.gnu.org/software/zile/"
 SRC_URI="mirror://gnu/zile/${P}.tar.gz"
@@ -12,14 +14,30 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test valgrind"
 
-RDEPEND="sys-libs/ncurses:0"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	test? ( valgrind? ( dev-util/valgrind ) )"
 
 PATCHES=("${FILESDIR}"/${P}-{userhome,gets}.patch)
 
 src_configure() {
-	econf $(use test && use_with valgrind || echo "--without-valgrind")
+	# --without-emacs to suppress tests for GNU Emacs #630652
+	econf \
+		--without-emacs \
+		$(use test && use_with valgrind || echo "--without-valgrind") \
+		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_test() {
+	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
+		# We have a sane terminal that can move the cursor
+		emake check
+	else
+		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
+		ewarn "Running the tests with TERM=vt100 instead"
+		TERM=vt100 emake check
+	fi
 }
 
 src_install() {
diff --git a/app-editors/zile/zile-2.4.13.ebuild b/app-editors/zile/zile-2.4.13.ebuild
index 74d312cf2c51..9f1ac547e516 100644
--- a/app-editors/zile/zile-2.4.13.ebuild
+++ b/app-editors/zile/zile-2.4.13.ebuild
@@ -3,28 +3,45 @@
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="Zile is a small Emacs clone"
 HOMEPAGE="https://www.gnu.org/software/zile/"
 SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"
 
 RDEPEND=">=dev-libs/boehm-gc-7.2:=
-	sys-libs/ncurses:0
+	sys-libs/ncurses:0=
 	acl? ( virtual/acl )"
 
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
 
 src_configure() {
+	# --without-emacs to suppress tests for GNU Emacs #630652
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable acl)
+		--without-emacs \
+		$(use_enable acl) \
+		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_test() {
+	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
+		# We have a sane terminal that can move the cursor
+		emake check
+	else
+		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
+		ewarn "Running the tests with unset TERM instead"
+		( unset TERM; emake check )
+	fi
 }
 
 src_install() {
diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
index 74d312cf2c51..6b6774de68e1 100644
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="Zile is a small Emacs clone"
 HOMEPAGE="https://www.gnu.org/software/zile/"
 SRC_URI="mirror://gnu/zile/${P}.tar.gz"
@@ -13,18 +15,34 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 IUSE="acl test"
 
 RDEPEND=">=dev-libs/boehm-gc-7.2:=
-	sys-libs/ncurses:0
+	sys-libs/ncurses:0=
 	acl? ( virtual/acl )"
 
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
 
 src_configure() {
+	# --without-emacs to suppress tests for GNU Emacs #630652
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable acl)
+		--without-emacs \
+		--disable-valgrind-tests \
+		$(use_enable acl) \
+		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_test() {
+	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
+		# We have a sane terminal that can move the cursor
+		emake check
+	else
+		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
+		ewarn "Running the tests with unset TERM instead"
+		( unset TERM; emake check )
+	fi
 }
 
 src_install() {