gentoo resync : 16.09.2020

3 files changed, 70 insertions, 1 deletions

diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index e847adc02ba9..8f928f7472d1 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,5 +1,6 @@
+AUX topgit-0.19.12-Rename-T-to-TESTSUITE.patch 2339 BLAKE2B a1a23b807bc76880123acb51949eb948b9398bf2c39a22c4223aa029e67225ef493fe2b7fd1bf934e8652c833d39e9ecc504352020f5b1d1899442c875baf77c SHA512 c447a7d18e7486dd5fd4b6173389603177fb9986293cd1bf46035f786fb689b112659cf170e0c431f6c09aaf4415d3d4e3e520c26610afba56281efa9e35d43f
 DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224c97e3deb90f4fef051dbcecd6a7d3c979fe6b7e6c9aac64d485b9c4324b4d666a7ae64cb82cd325498d33e0cae SHA512 cb9245fbec7a4a15822a5b70d7052be200aa8b574b528dd929121597eb7dcec97532b0fd4d6a4d6bb63676194ed0ab2129e106fb88f63561187620ec431f9efb
 DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c
-EBUILD topgit-0.19.12.ebuild 748 BLAKE2B a4aecf5eca106139cd3343ec418a1852a534dbef94a5655e99a92aec6b052a60f03dfecaed4767abf01502fcf932e9201665df1fe106b1ed57e8a2e5a7bba498 SHA512 3e2de52d6d464c1eb5d00cc0da38f806b7aacbc08670675c423c2611a0199726147f98cf928a78c32c96d627b1329b38cbc7c9633a7c994c5fdde6ef54c96c97
+EBUILD topgit-0.19.12.ebuild 848 BLAKE2B ed7dac8adb25a33e775f385c7eaca1acfbb3c7e05b19827710db18cf84cd404dd599a31c9e1b57a53a3bb4bb0a2e5a3f331c503309e710adee09b71df61f49a2 SHA512 8923725255455e128c44c343d6a5589b4bdf4794ab8ce6c4072699a9e76095435d818a119eb9c75d2e7f178e700c10354abcfd539c2c99cb8342d9865ca6dcc6
 EBUILD topgit-0.9-r1.ebuild 692 BLAKE2B d604f1d2800d5953d2d7f296b5596fee898b95d51eedb80dda8d121dbad3c3611f4ecb40a2e5f22e8143981961639f68d5086539fe08a9d0e8e67940fc5df08d SHA512 2984e19bb3c22e8d83b0c8ad85b8c9939c3dddec3844ffeffd5e5cb6b2d857c3da9e214a3e89fe16acaede8aecf20c820b68c5793080d87476bb3bf40d90f996
 MISC metadata.xml 455 BLAKE2B 6928af22b505988592f48120217cf6c8a9e5f4fd0a0d2040126bb730f3a4dc7b1a5d428d00ffe6fcf0abc5b00cf5c4eb847e5d4ff3288f38b79483708980aa08 SHA512 12408a1b03499ee4718189bec87eb725462c8e2d279bcaef81b18f411f86d0588bffb145dbc793fb9fb9419f7644ff2529a03db636443b157f55b2d7a9c6594e
diff --git a/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch b/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch
new file mode 100644
index 000000000000..23e54f886494
--- /dev/null
+++ b/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch
@@ -0,0 +1,62 @@
+From 3df81dacc84bc20471542855139c5b1948409412 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Wed, 26 Aug 2020 15:27:06 +0300
+Subject: [PATCH] Rename $(T) to $(TESTSUITE)
+
+$(T) is used in Gentoo for temp directory during builging package.
+---
+ t/Makefile.mak | 8 ++++----
+ t/Makefile.sh  | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/t/Makefile.mak b/t/Makefile.mak
+index bf8805c..73f6171 100644
+--- a/t/Makefile.mak
++++ b/t/Makefile.mak
+@@ -116,11 +116,11 @@ test: pre-clean TG-TEST-SETTINGS $(TEST_LINT) FORCE
+ 	$(Q)set -m && $(CACHE_SETUP_TTY) $(MAKE) $${GNO_PD_OPT} -f Makefile.mak aggregate-results-and-cleanup
+ 
+ prove: pre-clean TG-TEST-SETTINGS $(TEST_LINT) FORCE
+-	@echo "*** prove ***" && set -m && $(CACHE_SETUP) $(PROVE) --exec $(SHELL_PATH_SQ)'' $(TESTLIB_PROVE_OPTS) $(T) :: $(TESTLIB_TEST_OPTS)
++	@echo "*** prove ***" && set -m && $(CACHE_SETUP) $(PROVE) --exec $(SHELL_PATH_SQ)'' $(TESTLIB_PROVE_OPTS) $(TESTSUITE) :: $(TESTLIB_TEST_OPTS)
+ 	$(Q)$(NOCLEANCMT)$(MAKE) $${GNO_PD_OPT} -f Makefile.mak -s post-clean-except-prove-cache
+ 
+-.PRECIOUS: $(T)
+-$(T): FORCE
++.PRECIOUS: $(TESTSUITE)
++$(TESTSUITE): FORCE
+ 	@echo "*** $@ ***"; $(SHELL_PATH_SQ)'' $@ $(TESTLIB_TEST_OPTS)
+ 
+ # How to clean up
+@@ -169,7 +169,7 @@ test-lint-filenames:
+ 
+ # Run the tests without using prove
+ 
+-run-individual-tests: $(T)
++run-individual-tests: $(TESTSUITE)
+ 
+ aggregate-results-and-cleanup:
+ 	$(Q)set -m && ec=0 && $(SHELL_PATH_SQ)'' -c 'TESTLIB_TEST_PARENT_INT_ON_ERROR=$$$$ exec "$$@"' $(SHELL_PATH_SQ)'' \
+diff --git a/t/Makefile.sh b/t/Makefile.sh
+index ca2cf9c..dc94168 100644
+--- a/t/Makefile.sh
++++ b/t/Makefile.sh
+@@ -35,12 +35,12 @@ quotevar TEST_RESULTS_DIRECTORY TEST_RESULTS_DIRECTORY_SQ
+ 
+ v_wildcard ALLT 't[0-9][0-9][0-9][0-9]-*.sh'
+ v_sort ALLT $ALLT
+-[ -n "$T" ] || T="$ALLT"
+-[ -n "$LINTTESTS" ] || LINTTESTS="$T"
++[ -n "$TESTSUITE" ] || TESTSUITE="$ALLT"
++[ -n "$LINTTESTS" ] || LINTTESTS="$TESTSUITE"
+ 
+ # Extra shell scripts to run through check-non-portable-shell.pl
+ # These will ALWAYS be "checked" whenever the test-lint target is made
+-# By default all $(T) test files are checked so they don't need to be
++# By default all $(TESTSUITE) test files are checked so they don't need to be
+ # in this list
+ 
+ v_wildcard LINTSCRIPTS '*.sh'
+-- 
+2.26.2
+
diff --git a/dev-vcs/topgit/topgit-0.19.12.ebuild b/dev-vcs/topgit/topgit-0.19.12.ebuild
index eab7ae62e258..be20e7d630dc 100644
--- a/dev-vcs/topgit/topgit-0.19.12.ebuild
+++ b/dev-vcs/topgit/topgit-0.19.12.ebuild
@@ -16,9 +16,15 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="sys-apps/sed
 	virtual/awk"
 RDEPEND=">=dev-vcs/git-2.10.0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${PN}-${P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-Rename-T-to-TESTSUITE.patch"
+)
+
 src_compile() {
 	# Needed because of "hardcoded" paths
 	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"