From 3b1f0a7b05b9cc3bbea378d90a05927f5450aff4 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 20 Apr 2023 15:41:47 -0400
Subject: gnu: po4a: Remove patch-docbook-xml phase.

* gnu/packages/gettext.scm (po4a) [arguments]: Remove patch-docbook-xml phase.
Remove trailing #t.  Use gexps.
[native-inputs]: Remove labels.
---
 gnu/packages/gettext.scm | 93 ++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 3aae332311..9387f4fb8a 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 EuAndreh <eu@euandre.org>
 ;;; Copyright © 2022 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -250,57 +251,49 @@ (define-public po4a
                 "045i8izp2dqmkdzvnxyy5sy27ffrwl85dk8n6cmg1804ikk28qdg"))))
     (build-system perl-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'wrap-programs
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            ;; Make sure all executables in "bin" find the Perl modules
-            ;; required by this package at runtime.
-            (let* ((out  (assoc-ref outputs "out"))
-                   (bin  (string-append out "/bin/"))
-                   (path (string-append out "/lib/perl5/site_perl:"
-                                        (string-join
-                                         (map (lambda (name)
-                                                (string-append (assoc-ref inputs name)
-                                                               "/lib/perl5/site_perl"))
-                                              (list "perl-gettext"
-                                                    "perl-pod-parser"
-                                                    "perl-sgmls"
-                                                    "perl-syntax-keyword-try"
-                                                    "perl-xs-parse-keyword"
-                                                    "perl-term-readkey"
-                                                    "perl-text-wrapi18n"
-                                                    "perl-unicode-linebreak"
-                                                    "perl-yaml-tiny"))
-                                         ":"))))
-              (for-each (lambda (file)
-                          (wrap-program file
-                            `("PERL5LIB" ":" prefix (,path))))
-                        (find-files bin "\\.*$"))
-              #t)))
-         (add-after 'unpack 'patch-docbook-xml
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* (find-files "." ".*\\.xml(-good)?")
-               (("http://www.oasis-open.org/docbook/xml/4.1.2/")
-                (string-append (assoc-ref inputs "docbook-xml")
-                               "/xml/dtd/docbook/")))
-             #t))
-         (add-before 'check 'disable-failing-tests
-           (lambda _
-             ;; FIXME: fails despite of importing SGMLS
-             (delete-file "t/fmt-sgml.t")
-             #t)))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'wrap-programs
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              ;; Make sure all executables in "bin" find the Perl modules
+              ;; required by this package at runtime.
+              (let* ((out  #$output)
+                     (bin  (string-append out "/bin/"))
+                     (path (string-append
+                            out "/lib/perl5/site_perl:"
+                            (string-join
+                             (map (lambda (name)
+                                    (string-append (assoc-ref inputs name)
+                                                   "/lib/perl5/site_perl"))
+                                  (list "perl-gettext"
+                                        "perl-pod-parser"
+                                        "perl-sgmls"
+                                        "perl-syntax-keyword-try"
+                                        "perl-xs-parse-keyword"
+                                        "perl-term-readkey"
+                                        "perl-text-wrapi18n"
+                                        "perl-unicode-linebreak"
+                                        "perl-yaml-tiny"))
+                             ":"))))
+                (for-each (lambda (file)
+                            (wrap-program file
+                              `("PERL5LIB" ":" prefix (,path))))
+                          (find-files bin "\\.*$")))))
+          (add-before 'check 'disable-failing-tests
+            (lambda _
+              ;; FIXME: fails despite of importing SGMLS
+              (delete-file "t/fmt-sgml.t"))))))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("perl-module-build" ,perl-module-build)
-       ("docbook-xsl" ,docbook-xsl)
-       ("libxml2" ,libxml2)
-       ("xsltproc" ,libxslt)
-
-       ;; For tests.
-       ("docbook-xml" ,docbook-xml-4.1.2)
-       ("perl-test-pod" ,perl-test-pod)
-       ("texlive" ,texlive-tiny)))
+     (list gettext-minimal
+           perl-module-build
+           docbook-xsl
+           libxml2
+           libxslt
+           ;; For tests.
+           docbook-xml-4.1.2
+           perl-test-pod
+           texlive-tiny))
     (inputs
      (list bash-minimal
            perl-gettext
-- 
cgit v1.2.3