gentoo resync : 15.12.2019

5 files changed, 88 insertions, 16 deletions

diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index e80a2f323f7a..569e21bfba34 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,6 +1,8 @@
 DIST tig-2.3.3.tar.gz 1082818 BLAKE2B 0e9bcd02726b004c233a5efd7f58e4fda478dc1d2b738a7f8c086a3d71807d319ac8bd296b0f7c7569ed69a5b2b1db18e5c957cc5ce890a67b8f6ee7ead29551 SHA512 1d1cdf7184eeb3fea301c1959023f4aa97c4f8e25fc96cd61933ca39cf7549b6c7e1d9517f7ffd45d212ae9542ea4be07370b41c623cf6d0db8d025634b1d6d1
 DIST tig-2.4.1.tar.gz 1181900 BLAKE2B 85bb76008e5c10e94d97ac4cd88ac4eb2a0675ef5b45e9f21a9d2219cf0b6ed55ce52b579b831bc6c6fc530c89fb99f5dfd1f62dab3e1ab329e132707dccf908 SHA512 516114ed267a9459e356ca1af35c9eba521f9a11e9462cc5120cc7ea8fba4e54ea0a2e8e0ab96263754d6516354c296df541f8e3642392eaeb205cd88428077c
+DIST tig-2.5.0.tar.gz 1143004 BLAKE2B 77ccb2e754335f2ceaf26f1885cbca093d811ca479ef21fed532e43aab710fccfab85f1b5944273f53d9ed5ab0a5917392129c5d96f2c3c20d5da5029367b308 SHA512 26736fe241dd2dac25d5133ed847a7c1dab4bfeaad83af2effc8e523f8c6d8c179fe3ff05cd4343e4b1048c3c50309908aa32e81dd0789e35afe9bd8ff8772ee
 EBUILD tig-2.3.3.ebuild 1309 BLAKE2B c0ce1fc4074b0f10e4fc4320c9112dc83c7410fab9777d39b457658cd5465c06e3b33175b7321d88e33af34c8e4fbad9d2243cca51affcca009a670c5dff0b59 SHA512 d81ecd9f350604411e9e3eba6fe14c81ab0b3c90d19d2d8983f464eeec2d416ec5fc9e00784ff32ff37a601ab7a0e54f240c7a408eae190385d1f04ceb440a06
-EBUILD tig-2.4.1.ebuild 1312 BLAKE2B 70510a638ae9b2ae092fbc31fac8a8a1bbef8a00d9a88cf092514a5586e782527dac9dfcb72b47dbeb22da2b3514181202c03883cebad6ead38737363f49c616 SHA512 703d50ce120ea251b50a25dda0bc6a1c27e546bdda1053a0fb397145c637340c40f59016075b16c79d3316c308a306c944006bc6b6a8f224cb9d8530f2695331
-EBUILD tig-9999.ebuild 1312 BLAKE2B 70510a638ae9b2ae092fbc31fac8a8a1bbef8a00d9a88cf092514a5586e782527dac9dfcb72b47dbeb22da2b3514181202c03883cebad6ead38737363f49c616 SHA512 703d50ce120ea251b50a25dda0bc6a1c27e546bdda1053a0fb397145c637340c40f59016075b16c79d3316c308a306c944006bc6b6a8f224cb9d8530f2695331
-MISC metadata.xml 330 BLAKE2B b73d4c5a79937e78cff86c138950085a6c69ed2b28c8615d37065c7143df047237c014e8c3306b795a3b4fb64a4584fe06bf23d41caa75138f5d6ca07eb75b22 SHA512 bc921303a62d48f0b1b9792df22bf54c1555545c17a2c44a4f946b800c012067cc122011f7735b0f44d0275279450d6290970f127132dc6947ebe09fcba83e98
+EBUILD tig-2.4.1.ebuild 1306 BLAKE2B 0130514b0f3bfbd24c4fc6706fafb84c9c0952bc0f2550a8cd9f199cdb3ba94a4138ad291201b1727faa01a95e8642ef150ab76a7fdf3ee99c4ea0e2e11c4857 SHA512 450b990481cc6cad4ff908cfb9e00e2755a85b93ba0bc7a3e139c342de20873354225154caf83cda82dfd57dac6bb4a77782919860a9c2343d8b51a59b10f2e2
+EBUILD tig-2.5.0.ebuild 1310 BLAKE2B ccdee9a2425a67428edec2075c2dc55eb683557d87b680425589e37879ea740635715d61f40be567b94d53d58e729b43aa0b0b1cb370e0fca960dd82bd402544 SHA512 5ddc72ce517ca195e4d92a0f2440c5805cf871b27efaa968dbf2fcf0bbcf5b048c1211b3383dbf7092d33f4ab4d46f1d8ef605632c238d64994d76d1a837cb4a
+EBUILD tig-9999.ebuild 1310 BLAKE2B ccdee9a2425a67428edec2075c2dc55eb683557d87b680425589e37879ea740635715d61f40be567b94d53d58e729b43aa0b0b1cb370e0fca960dd82bd402544 SHA512 5ddc72ce517ca195e4d92a0f2440c5805cf871b27efaa968dbf2fcf0bbcf5b048c1211b3383dbf7092d33f4ab4d46f1d8ef605632c238d64994d76d1a837cb4a
+MISC metadata.xml 716 BLAKE2B 646f183cc6cc5110a69304f5343a0f1dcc9f42c82d8e16d0a06102b8052589d92bfffee948c78d2d4ce0ae6f29f1df38ae034c6fa160471823bb4457bcfa6603 SHA512 ae1521940d81aa080326f070b79a8a0a01b2ec1406088695e1e8462cdd78ce046131f9542c878ab5f919fa75e3c91aff0739a12511d18693ae050183db10343d
diff --git a/dev-vcs/tig/metadata.xml b/dev-vcs/tig/metadata.xml
index beb9c6e702ff..7f64b4433533 100644
--- a/dev-vcs/tig/metadata.xml
+++ b/dev-vcs/tig/metadata.xml
@@ -1,11 +1,21 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jonas/tig</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		Tig is an ncurses-based text-mode interface for git.
+		It functions mainly as a Git repository browser,
+		but can also assist in staging changes for commit at chunk level
+		and act as a pager for output from various Git commands.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jonas/tig</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/tig/tig-2.4.1.ebuild b/dev-vcs/tig/tig-2.4.1.ebuild
index aa1ad8245659..bf02b0fba850 100644
--- a/dev-vcs/tig/tig-2.4.1.ebuild
+++ b/dev-vcs/tig/tig-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
 
 DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-2.5.0.ebuild b/dev-vcs/tig/tig-2.5.0.ebuild
new file mode 100644
index 000000000000..149399f133e2
--- /dev/null
+++ b/dev-vcs/tig/tig-2.5.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	docinto examples
+	dodoc contrib/*.tigrc
+}
diff --git a/dev-vcs/tig/tig-9999.ebuild b/dev-vcs/tig/tig-9999.ebuild
index aa1ad8245659..149399f133e2 100644
--- a/dev-vcs/tig/tig-9999.ebuild
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit bash-completion-r1
 
@@ -26,7 +26,7 @@ DEPEND="
 	sys-libs/readline:0="
 RDEPEND="${DEPEND}
 	dev-vcs/git"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
 
 # encoding/env issues
 RESTRICT="test"