From 5f230fb2798e9862fba67228b9de89df8f36e8e0 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 29 Nov 2018 22:17:40 -0600
Subject: [PATCH] patchutils: Update to 0.3.4.

* gnu/packages/patchutils.scm (patchutils): Update to 0.3.4.
[arguments]: Simplify 'patch-test-scripts' phase.
* gnu/packages/patches/patchutils-xfail-gendiff-tests.patch: Rename to...
* gnu/packages/patches/patchutils-test-perms.patch: ...this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
 gnu/local.mk                                  |  2 +-
 .../patches/patchutils-test-perms.patch       | 14 ++++++++++
 .../patchutils-xfail-gendiff-tests.patch      | 26 -------------------
 gnu/packages/patchutils.scm                   | 12 ++++-----
 4 files changed, 20 insertions(+), 34 deletions(-)
 create mode 100644 gnu/packages/patches/patchutils-test-perms.patch
 delete mode 100644 gnu/packages/patches/patchutils-xfail-gendiff-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index bb152cd108..70968dbb8e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1026,7 +1026,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/p7zip-remove-unused-code.patch		\
   %D%/packages/patches/patchelf-page-size.patch			\
   %D%/packages/patches/patchelf-rework-for-arm.patch		\
-  %D%/packages/patches/patchutils-xfail-gendiff-tests.patch	\
+  %D%/packages/patches/patchutils-test-perms.patch		\
   %D%/packages/patches/patch-hurd-path-max.patch		\
   %D%/packages/patches/perf-gcc-ice.patch			\
   %D%/packages/patches/perl-archive-tar-CVE-2018-12015.patch	\
diff --git a/gnu/packages/patches/patchutils-test-perms.patch b/gnu/packages/patches/patchutils-test-perms.patch
new file mode 100644
index 0000000000..c7652b9af2
--- /dev/null
+++ b/gnu/packages/patches/patchutils-test-perms.patch
@@ -0,0 +1,14 @@
+Need to mark one of the tests as PHONY to get permissions set correctly on
+built scripts.
+
+--- a/Makefile.in	2011-02-10 09:44:43.000000000 -0600
++++ b/Makefile.in	2018-11-29 21:52:05.000000000 -0600
+@@ -1106,5 +1108,6 @@
+ 	rm -f $(DESTDIR)$(bindir)/"`echo lsdiff|sed '$(transform)'`"
+ 	rm -f $(DESTDIR)$(bindir)/"`echo grepdiff|sed '$(transform)'`"
+ 
++.PHONY: tests/newline1/run-test
+ tests/newline1/run-test: src/combinediff$(EXEEXT) src/flipdiff$(EXEEXT) \
+ 		src/lsdiff$(EXEEXT) src/grepdiff$(EXEEXT) \
+		scripts/splitdiff
+
diff --git a/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch b/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch
deleted file mode 100644
index b2e77d22f2..0000000000
--- a/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-The gendiff1 and gendiff2 tests need the gendiff script that's distributed
-with the rpm package management tool.  Without that script, these tests are
-expected to fail.
-
-Need to mark one of the tests as PHONY to get permissions set correctly on
-built scripts.
-
---- a/Makefile.in	2011-02-10 09:44:43.000000000 -0600
-+++ b/Makefile.in	2014-03-06 17:27:55.610048953 -0600
-@@ -378,6 +378,8 @@
- # These ones don't work yet.
- # Feel free to send me patches. :-)
- XFAIL_TESTS = \
-+	tests/gendiff1/run-test \
-+	tests/gendiff2/run-test \
- 	tests/delhunk5/run-test \
- 	tests/delhunk6/run-test
- 
-@@ -1106,6 +1108,7 @@
- 	rm -f $(DESTDIR)$(bindir)/"`echo lsdiff|sed '$(transform)'`"
- 	rm -f $(DESTDIR)$(bindir)/"`echo grepdiff|sed '$(transform)'`"
- 
-+.PHONY: tests/combine1/run-test
- tests/combine1/run-test: src/combinediff$(EXEEXT) src/flipdiff$(EXEEXT) \
- 		src/lsdiff$(EXEEXT) src/grepdiff$(EXEEXT)
- 	for script in $(bin_SCRIPTS); do \
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index 688e62cdc8..fa5ad62e44 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -43,7 +43,7 @@
 (define-public patchutils
   (package
     (name "patchutils")
-    (version "0.3.3")
+    (version "0.3.4")
     (source
      (origin
       (method url-fetch)
@@ -51,8 +51,8 @@
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i"))
-      (patches (search-patches "patchutils-xfail-gendiff-tests.patch"))))
+        "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg"))
+      (patches (search-patches "patchutils-test-perms.patch"))))
     (build-system gnu-build-system)
     (inputs `(("perl" ,perl)))
     (arguments
@@ -61,10 +61,8 @@
        (modify-phases %standard-phases
          (add-before 'check 'patch-test-scripts
            (lambda _
-             (let ((echo (which "echo")))
-               (substitute*
-                   (find-files "tests" "^run-test$")
-                 (("/bin/echo") echo)))
+             (substitute* (find-files "tests" "^run-test$")
+               (("/bin/echo") (which "echo")))
              #t))
          (add-after 'install 'wrap-program
            ;; Point installed scripts to the utilities they need.