gentoo resync 04.02.2018

6 files changed, 72 insertions, 6 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 075429f1d8d3..89cc2383da00 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index e965edd2893f..7d85b34aae40 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,10 +1,10 @@
 DIST git-lfs-1.5.6.tar.gz 604139 BLAKE2B a87c3054a5ff354409581f3153b8291646c7a403a5b80f0d7e7c6efd393e93ba728689033b79030ade207c371e5726f4e7920f6ce0016b66e618109c7d8aa9e5 SHA512 f5f2da9ac44647335b25cad3104027cf5476e25ef9763019744123f9e1ef81edadbf5b08a146b8070487b32a18aa202c799f910aee6f2f0144ca411ad6d7cfd2
 DIST git-lfs-2.1.1.tar.gz 649611 BLAKE2B 6a2a499ac446cfbf04977ff56ba0c33ac49f4cfd8d269a4e16e9d15ef7010752fcdc439e09625b76c814ba1b3c3bc086c333ad44ff87da8288da86a31c19cf17 SHA512 9061cb9fdf93a0c119d5762ceebdbc0573491dedb1815512e7eae9da54574087c1e499ea97ba0a87d7356499314beb53d60d1800b5c85983ef835dae37e7dd84
 DIST git-lfs-2.2.1.tar.gz 708806 BLAKE2B f5527c45a9b2415b9c17be8bf8ff04ea1d324cef74fe72ff9c91b5831d3b866d6dd57ab047addc762a4ad84d8f92e1a8dd5a2c21a532c4dffe2f7b3675463217 SHA512 8e1edd588916e6a09c0fe84bdcd80b8773f3874554f941c65819bbb29cdce4846de6408dbb34b33e420d9bc768f6cd07c2dbb0979d243c98f25a32d4fc69dea4
-DIST git-lfs-2.3.1.tar.gz 746077 BLAKE2B 3824caaae18cdfe70064acc40dbf9711de861f9d45324366b5376c56d222cb2c85b3100e372f9c4f49ef32b3b9b7e9b67cbbeebd021bb08af4fc1cc5d3f34538 SHA512 677d963162fdaa8e1de3ecd7f3b86818ee075dc8a293752f89ce67439eebbb32a2d590b19f29547676bf2eb5090b284d5d90c029fe580a6bfbeddb47153936e9
+DIST git-lfs-2.3.4.tar.gz 747313 BLAKE2B c1b2d452894c07974f9857116cab4f2aad547584b6d713824103b2e7f82c8179146a080330ee1154369c22843766a63a09ce1f990c968b55dce9eccc7a306302 SHA512 97174dc9346979777c3951baa86cfc07c85e2df04f13a50114e016facbb3fd5fde08d38825493d4e7ff149a13c87ae44e9e40350cd4950f27fe309ef62b6724a
 EBUILD git-lfs-1.5.6.ebuild 968 BLAKE2B 8064abf9f67f61e1018c5251eb929d39cdb634f9ad35c43d54d4380d5bdf3ec0afbb5f601d942e2a910a6aa9a67f3b5ef36d04f878470738c5b4e621eb498d1f SHA512 030eab94da2e9522b2359261f9b0091c2440672a58ecfb2c67df5aa14cb1c853c6b056702a5594e3a18061e3f9bbfb27b27bb45a0a9d749c57bd943514a0ecf4
 EBUILD git-lfs-2.1.1.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
 EBUILD git-lfs-2.2.1.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
-EBUILD git-lfs-2.3.1.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
+EBUILD git-lfs-2.3.4.ebuild 1153 BLAKE2B 73e72eb7d312d717f3b6a91582acea976744afb8c204926485aa421f8a6d2133a068040d2b11c627e478d2667de599bd8fae984dcaf6c48600c6ab4628153195 SHA512 6d3616d85a7bc7457bfd0ee4499366273cf8b60e029b134da7201f2f087fa3945d81ef9b10f7577d7b9db653179a431fc3115f011fbb829cc86d131b014ac56a
 EBUILD git-lfs-9999.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
 MISC metadata.xml 331 BLAKE2B ec49bde06277ccbdacd3b6c50e0e32c5b14464ad015e1a7a57446e905d0ed9b3b0b71650a455a3b77c5e0ac2530874f37327b1fef3c924577b08c1e1c815c201 SHA512 51f68466f5396fe0326aab5f3a5fa70761647d722d02339fd6072d21976dfd27fdafa1ee44680be98dd0c1b80b29801eb7ed1508aa850104bed564c5f1a38011
diff --git a/dev-vcs/git-lfs/git-lfs-2.3.1.ebuild b/dev-vcs/git-lfs/git-lfs-2.3.4.ebuild
index 7a32ca36cc92..91e0bbf77511 100644
--- a/dev-vcs/git-lfs/git-lfs-2.3.1.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index a4c2695b2c03..985b9e4a9b57 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,8 +1,10 @@
 DIST tig-2.2.2.tar.gz 1046910 BLAKE2B b88b48fd24257f32a5892a8a60cf13a51e553c4f0e18918e36fc6afea68befa6d12155f143bcebf37e1beab513cf1a39d50254ac76e406d97b5552389c048222 SHA512 e43cf8b4e7938342b581a1238222d5cbf62e242208cd65fc9b3261c4076b7c60c182f9a80613538fcf8b50187cc2844c22f6d1aeaaa8b23864670667a91dbfcd
 DIST tig-2.3.0.tar.gz 1080956 BLAKE2B 48eaa4803a189df8dd8456b58687d4a7cd3b13c003165fba3f705a3e15eb19d4d1e23f9cc1306c5463e21501ee547ce9551c2278d10a6b069cb49e7af93d449f SHA512 d5e8bf04689fdbeab4f2ee60eef1e8e7686827228dc2f87b20c40a3a1c31aa3476d5088423ba8bcb72616a9f0f211a2dbb631a72cc946553e41cb225ea60ab37
 DIST tig-2.3.2.tar.gz 1083036 BLAKE2B 382e17486e79348b72ec67b71db2c09276262b8a9b092e657814f9d3693f2c70c46dc54a7b05ef890497f55fbc41f2232603c936f16d26a0c4d9b73d0d9281fc SHA512 092e1ea876b077a5026ee7b820e908d1d7aaa340805eb4ff975791f88ba1983eab13af669f5e663b28dfdd9e014cb92ef8c164a335705b777be417e3a7d1d5fb
+DIST tig-2.3.3.tar.gz 1082818 BLAKE2B 0e9bcd02726b004c233a5efd7f58e4fda478dc1d2b738a7f8c086a3d71807d319ac8bd296b0f7c7569ed69a5b2b1db18e5c957cc5ce890a67b8f6ee7ead29551 SHA512 1d1cdf7184eeb3fea301c1959023f4aa97c4f8e25fc96cd61933ca39cf7549b6c7e1d9517f7ffd45d212ae9542ea4be07370b41c623cf6d0db8d025634b1d6d1
 EBUILD tig-2.2.2.ebuild 1242 BLAKE2B 9467f9b83664ace378deaed3ff4083515b8d027f67a018a7c82e554e22a0dd6bb5a86c49a78bda76bbfb857a1d0bbf15ba6fc974c58ca2384212d42e45b9bcb7 SHA512 a42a3cf7b2c4b77f7ab8079092b093d1ba83434263a2cf35278466b2bd50edd3165514ac87f6928ea0356e233880bd6ee38d0e6213c70e45090e293a406094cc
 EBUILD tig-2.3.0.ebuild 1247 BLAKE2B 01007fd3d5d4f56aefda7ad21e9df0ef141b8f292e8692f30f5ea0b4b2acfaed4bdcb0c2356a206c85c0103d212d3806ada0ddfcc158c39118b9a2147f6843f5 SHA512 f72db9554da8ad7d348a8c71b0a0e5d8d58ed07f8f2d933df6572e0450dfb26ac1fb49bfcf724a650a264c47bd7833914681b934b2e9719a1b6a057f8f97ead2
 EBUILD tig-2.3.2.ebuild 1247 BLAKE2B 01007fd3d5d4f56aefda7ad21e9df0ef141b8f292e8692f30f5ea0b4b2acfaed4bdcb0c2356a206c85c0103d212d3806ada0ddfcc158c39118b9a2147f6843f5 SHA512 f72db9554da8ad7d348a8c71b0a0e5d8d58ed07f8f2d933df6572e0450dfb26ac1fb49bfcf724a650a264c47bd7833914681b934b2e9719a1b6a057f8f97ead2
-EBUILD tig-9999.ebuild 1245 BLAKE2B a7725f6ee9bba619b877f432c16d00307d771a51d528122c5d8103e114058953850557bfe90ee93b6f744080ed033e46f1c247620faaa367c538c82aa97b8386 SHA512 6fc626f7ff9ebc0bbc83872b75cf9d4d8ad808d3930467de76ff23ac71cb454defc9393ddfd855daa5c7955baad38b4f30c36fe69109532d18e5fa6d3a8d24a8
+EBUILD tig-2.3.3.ebuild 1322 BLAKE2B 6f0cd425ccbe143e45fa5934b2340560a1cad00863cd4691cfb062b745d3f2a8f67672e2e112943d096df23297e11c457d6223e05036780a70cac977591d9302 SHA512 22c37d4453001599b3c7e2cd57da25cb29ac00f44538a916ce1b5cc1c0c95b0e8847a0d5c5223f5fe797355c2c64343eb33dabd34fe84d25ae74a7b26117bafb
+EBUILD tig-9999.ebuild 1322 BLAKE2B 6f0cd425ccbe143e45fa5934b2340560a1cad00863cd4691cfb062b745d3f2a8f67672e2e112943d096df23297e11c457d6223e05036780a70cac977591d9302 SHA512 22c37d4453001599b3c7e2cd57da25cb29ac00f44538a916ce1b5cc1c0c95b0e8847a0d5c5223f5fe797355c2c64343eb33dabd34fe84d25ae74a7b26117bafb
 MISC metadata.xml 330 BLAKE2B b73d4c5a79937e78cff86c138950085a6c69ed2b28c8615d37065c7143df047237c014e8c3306b795a3b4fb64a4584fe06bf23d41caa75138f5d6ca07eb75b22 SHA512 bc921303a62d48f0b1b9792df22bf54c1555545c17a2c44a4f946b800c012067cc122011f7735b0f44d0275279450d6290970f127132dc6947ebe09fcba83e98
diff --git a/dev-vcs/tig/tig-2.3.3.ebuild b/dev-vcs/tig/tig-2.3.3.ebuild
new file mode 100644
index 000000000000..59b31c7161c2
--- /dev/null
+++ b/dev-vcs/tig/tig-2.3.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~x86-fbsd ~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" ]] && DEPEND+=" 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 6e50ecf1bf1c..59b31c7161c2 100644
--- a/dev-vcs/tig/tig-9999.ebuild
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,8 @@ HOMEPAGE="https://jonas.github.io/tig/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="unicode"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
 
 DEPEND="
 	sys-libs/ncurses:0=[unicode?]
@@ -27,6 +28,9 @@ RDEPEND="${DEPEND}
 	dev-vcs/git"
 [[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
 
+# encoding/env issues
+RESTRICT="test"
+
 src_prepare() {
 	default
 	[[ ${PV} == "9999" ]] && eautoreconf