[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/, sys-devel/patch/files/

["Sam James" <sam@gentoo.org>]

commit:     f5d0db4f4aecc36c9963dae13cde91cafe96b25d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 21:03:07 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 21:03:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d0db4f

sys-devel/patch: drop test patches modifying Makefile.am

The workaround in 7b8499943ab93e837b92eceaf8b85e5646327b7f doesn't seem
enough for Prefix as reported in #gentoo-prefix. While autotools.eclass
needs investigating (still), there's not much value in leaving these
tests here for now.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...20250206-no-backup-if-mismatch-regression.patch | 80 ----------------------
 ...ch-2.7.6_p20250206-traditional-diff-lines.patch | 78 ---------------------
 sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild    | 10 ---
 3 files changed, 168 deletions(-)

diff --git a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch b/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch
index f4d162694ab4..0891b855d998 100644
--- a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch
+++ b/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch
@@ -13,10 +13,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=949834
 * tests/Makefile.am (TESTS): Add it.
 ---
  src/patch.c       |  6 ++++-
- tests/Makefile.am |  1 +
- tests/no-backup   | 56 +++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 62 insertions(+), 1 deletion(-)
- create mode 100644 tests/no-backup
 
 diff --git a/src/patch.c b/src/patch.c
 index 6c460f7..e4d0524 100644
@@ -52,80 +49,3 @@ index 6c460f7..e4d0524 100644
  		break;
  	    case CHAR_MAX + 7:
  		posixly_correct = true;
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 43ddf66..acb449a 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -50,6 +50,7 @@ TESTS = \
- 	mixed-patch-types \
- 	munged-context-format \
- 	need-filename \
-+	no-backup \
- 	no-mode-change-git-diff \
- 	no-newline-triggers-assert \
- 	preserve-c-function-names \
-diff --git a/tests/no-backup b/tests/no-backup
-new file mode 100644
-index 0000000..57b73fa
---- /dev/null
-+++ b/tests/no-backup
-@@ -0,0 +1,56 @@
-+# Copyright 2025 Free Software Foundation, Inc.
-+#
-+# Copying and distribution of this file, with or without modification,
-+# in any medium, are permitted without royalty provided the copyright
-+# notice and this notice are preserved.
-+
-+# Test the --no-backup-if-mismatch option
-+
-+. $srcdir/test-lib.sh
-+
-+require cat
-+use_local_patch
-+use_tmpdir
-+
-+# ==============================================================
-+
-+cat >my_file <<'EOF'
-+/* ... */
-+void baz();
-+
-+
-+void baz() {
-+	/* ... */
-+}
-+
-+int main() {
-+	int foo;
-+	int bar;
-+
-+	/* ... */
-+	baz();
-+}
-+EOF
-+
-+cat >my_file.patch <<'EOF'
-+--- my_file	2025-02-16 11:22:12.881765792 +0000
-++++ my_file_new	2025-02-16 11:22:12.881796732 +0000
-+@@ -2,7 +2,7 @@
-+ void baz();
-+
-+ void baz() {
-+-	/* ... */
-++	// ...
-+ }
-+
-+ int main() {
-+EOF
-+
-+unset POSIXLY_CORRECT
-+
-+check 'patch -N --no-backup-if-mismatch <my_file.patch || echo "Status: $?"' <<'EOF'
-+patching file my_file
-+Hunk #1 succeeded at 3 with fuzz 1 (offset 1 line).
-+EOF
-+
-+ncheck 'test ! -f my_file.orig'
--- 
-2.45.3
-

diff --git a/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch b/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch
index 3d9d3109e91c..f33a79980f3e 100644
--- a/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch
+++ b/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch
@@ -34,81 +34,3 @@ index 63c9a0c..d9f5c61 100644
  	    p_ptrn_lines = (*s != 'a');
 -- 
 2.45.3
-
-
-From b3d0c933389208ccac795a1b517c5a8b11cc012e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
-Date: Wed, 26 Feb 2025 16:44:48 -0800
-Subject: [PATCH 2/2] Regression in commit abe92e8010ab affecting MariaDB tests
-
-I have disovered a regression in commit abe92e8010ab ("Prefer idx_t,
-ptrdiff_t to lin") while I was running MariaDB tests. The regression is
-related to a diff file [1], where the patch fails to apply it with
-following error:
-
-  patch: **** '---' expected at line 2 of patch
-
-To illustrate the issue, I have attached a git patch containing a
-testcase with simplified reproducer.
-
-[1] https://github.com/MariaDB/server/blob/mariadb-10.6.21/mysql-test/suite/innodb/r/innodb-wl5522%2Cstrict_crc32.rdiff file
----
- tests/Makefile.am             |  1 +
- tests/regression-abe92e8010ab | 33 +++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+)
- create mode 100644 tests/regression-abe92e8010ab
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index acb449a..8f1a248 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -57,6 +57,7 @@ TESTS = \
- 	preserve-mode-and-timestamp \
- 	quoted-filenames \
- 	read-only-files \
-+	regression-abe92e8010ab \
- 	reject-format \
- 	remember-backup-files \
- 	remember-reject-files \
-diff --git a/tests/regression-abe92e8010ab b/tests/regression-abe92e8010ab
-new file mode 100644
-index 0000000..0e11e34
---- /dev/null
-+++ b/tests/regression-abe92e8010ab
-@@ -0,0 +1,33 @@
-+. $srcdir/test-lib.sh
-+
-+require cat
-+use_local_patch
-+use_tmpdir
-+
-+cat > f <<EOF
-+1
-+2
-+test:
-+a
-+4
-+EOF
-+
-+cat > f.diff <<EOF
-+2,3c2
-+< test:
-+< a
-+---
-+> 3
-+EOF
-+
-+check 'patch f < f.diff' <<EOF
-+patching file f
-+Hunk #1 succeeded at 3 (offset 1 line).
-+EOF
-+
-+check 'cat f' <<EOF
-+1
-+2
-+3
-+4
-+EOF
--- 
-2.45.3
-

diff --git a/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild b/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild
index 0c0ae58d62c4..fbaa5fd97f05 100644
--- a/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild
+++ b/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild
@@ -3,11 +3,6 @@
 
 EAPI=8
 
-WANT_AUTOCONF=none
-WANT_LIBTOOL=none
-WANT_AUTOMAKE=1.16
-inherit autotools
-
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/patch.asc
 inherit flag-o-matic verify-sig
 
@@ -61,11 +56,6 @@ src_unpack() {
 	default
 }
 
-src_prepare() {
-	default
-	eautomake
-}
-
 src_configure() {
 	use static && append-ldflags -static