* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/topgit/files/, dev-vcs/topgit/
@ 2020-09-14 0:03 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2020-09-14 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 362c948f2dae1284a995702d864d9f0c9d1052dc
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Aug 26 12:43:03 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 23:54:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362c948f
dev-vcs/topgit: fix test run failures
Closes: https://bugs.gentoo.org/739088
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17268
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../topgit-0.19.12-Rename-T-to-TESTSUITE.patch | 62 ++++++++++++++++++++++
dev-vcs/topgit/topgit-0.19.12.ebuild | 6 +++
2 files changed, 68 insertions(+)
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 00000000000..23e54f88649
--- /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 eab7ae62e25..be20e7d630d 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}"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/topgit/files/, dev-vcs/topgit/
@ 2021-11-20 1:08 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2021-11-20 1:08 UTC (permalink / raw
To: gentoo-commits
commit: e9416839ae447f96bb12aadf75f7e4a6471b72b9
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 01:05:56 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 01:05:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9416839
dev-vcs/topgit: drop old version
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-vcs/topgit/Manifest | 1 -
.../topgit-0.19.12-Rename-T-to-TESTSUITE.patch | 62 ----------------------
dev-vcs/topgit/topgit-0.19.12.ebuild | 38 -------------
3 files changed, 101 deletions(-)
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index 7629c671dfa1..40b593336a0e 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,2 +1 @@
-DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224c97e3deb90f4fef051dbcecd6a7d3c979fe6b7e6c9aac64d485b9c4324b4d666a7ae64cb82cd325498d33e0cae SHA512 cb9245fbec7a4a15822a5b70d7052be200aa8b574b528dd929121597eb7dcec97532b0fd4d6a4d6bb63676194ed0ab2129e106fb88f63561187620ec431f9efb
DIST topgit-0.19.13.tar.gz 355721 BLAKE2B 0f70d7720d0ca2f7724fe5fa3bb100c7f812c0bb18fd9acb4897487d90f31da957bc0b4e47e9dcdd08594366fb31c4f46447cf78989f828f337edd8f8f231bf3 SHA512 8e477504c5f873651854c9412864c9dcb0ee35d0349b65e7c5d618a0add0fad3f749381edbe17195981bae3ff9f0e7323286abf7a5c6b744721ba2cc2a5d40d4
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
deleted file mode 100644
index 23e54f886494..000000000000
--- a/dev-vcs/topgit/files/topgit-0.19.12-Rename-T-to-TESTSUITE.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index 7a7635c00079..000000000000
--- a/dev-vcs/topgit/topgit-0.19.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="A different patch queue manager"
-HOMEPAGE="https://mackyle.github.io/topgit/topgit.html https://github.com/mackyle/topgit"
-SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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}"
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="/usr" sharedir="/usr/share/doc/${PF}" install
-
- newbashcomp contrib/tg-completion.bash tg
- dodoc README
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-20 1:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-14 0:03 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/topgit/files/, dev-vcs/topgit/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-11-20 1:08 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox