[gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/, app-misc/tmux/files/

[Lars Wendler]

commit:     34d624d1ab647bfec8d8f6e0b31bf7da54d745db
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 19:17:33 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 19:18:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d624d1

app-misc/tmux: Bump to version 3.0a. Removed old

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-misc/tmux/Manifest                             |  2 +-
 app-misc/tmux/files/tmux-3.0-musl.patch            | 60 ----------------------
 .../tmux/{tmux-3.0.ebuild => tmux-3.0a.ebuild}     |  3 +-
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 18f3ea23956..4562315a654 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,3 +1,3 @@
 DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
-DIST tmux-3.0.tar.gz 546099 BLAKE2B 11a61bb88d2658147ba675cb6e334b90b334125d0fa783dfb1bcd999d1dfc178f30c4bcfb6ad39e67bcdf524caa20b32cb1518f21aed66c0f038341318676a29 SHA512 50fc25f84f04486e9b5dc598b884419d95ef158e9b36d63805db97149811cdfa71f086eafa9610a6a9a3041d1e9eb6d6ccc9277d1926d0e936b0d6a8e1d1cbf8
+DIST tmux-3.0a.tar.gz 546377 BLAKE2B 1e784d98e1f18e7850e92d8d5f849ee1b8bcbf62b9323b6eb4007e038bd84480b3a171c93c88954701487ef228db8717bac886f51dd21efdf2766e676b0c16e3 SHA512 f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979

diff --git a/app-misc/tmux/files/tmux-3.0-musl.patch b/app-misc/tmux/files/tmux-3.0-musl.patch
deleted file mode 100644
index 5369fdd78b0..00000000000
--- a/app-misc/tmux/files/tmux-3.0-musl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From eb4d60b1ce0e2dc917bd47b10a3ce89de840448a Mon Sep 17 00:00:00 2001
-From: nicm <nicm>
-Date: Wed, 27 Nov 2019 20:54:30 +0000
-Subject: [PATCH] REG_STARTEND is not portable, but it turns out we don't
- actually need it. From Evan Green, GitHub issue 1982.
-
----
- regsub.c | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/regsub.c b/regsub.c
-index 199b21714..22e236dc7 100644
---- a/regsub.c
-+++ b/regsub.c
-@@ -77,10 +77,7 @@ regsub(const char *pattern, const char *with, const char *text, int flags)
- 	end = strlen(text);
- 
- 	while (start <= end) {
--		m[0].rm_so = start;
--		m[0].rm_eo = end;
--
--		if (regexec(&r, text, nitems(m), m, REG_STARTEND) != 0) {
-+		if (regexec(&r, text + start, nitems(m), m, 0) != 0) {
- 			regsub_copy(&buf, &len, text, start, end);
- 			break;
- 		}
-@@ -89,22 +86,25 @@ regsub(const char *pattern, const char *with, const char *text, int flags)
- 		 * Append any text not part of this match (from the end of the
- 		 * last match).
- 		 */
--		regsub_copy(&buf, &len, text, last, m[0].rm_so);
-+		regsub_copy(&buf, &len, text, last, m[0].rm_so + start);
- 
- 		/*
- 		 * If the last match was empty and this one isn't (it is either
- 		 * later or has matched text), expand this match. If it is
- 		 * empty, move on one character and try again from there.
- 		 */
--		if (empty || m[0].rm_so != last || m[0].rm_so != m[0].rm_eo) {
--			regsub_expand(&buf, &len, with, text, m, nitems(m));
--
--			last = m[0].rm_eo;
--			start = m[0].rm_eo;
-+		if (empty ||
-+		    start + m[0].rm_so != last ||
-+		    m[0].rm_so != m[0].rm_eo) {
-+			regsub_expand(&buf, &len, with, text + start, m,
-+			    nitems(m));
-+
-+			last = start + m[0].rm_eo;
-+			start += m[0].rm_eo;
- 			empty = 0;
- 		} else {
--			last = m[0].rm_eo;
--			start = m[0].rm_eo + 1;
-+			last = start + m[0].rm_eo;
-+			start += m[0].rm_eo + 1;
- 			empty = 1;
- 		}
- 

diff --git a/app-misc/tmux/tmux-3.0.ebuild b/app-misc/tmux/tmux-3.0a.ebuild
similarity index 94%
rename from app-misc/tmux/tmux-3.0.ebuild
rename to app-misc/tmux/tmux-3.0a.ebuild
index b0b4fb817a7..2d07251c2cd 100644
--- a/app-misc/tmux/tmux-3.0.ebuild
+++ b/app-misc/tmux/tmux-3.0a.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
 	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
 else
-	SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P/_/-}.tar.gz"
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
@@ -46,7 +46,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.4-flags.patch"
 
 	# upstream fixes (can be removed with next version bump)
-	"${FILESDIR}/${P}-musl.patch"
 )
 
 src_prepare() {