Merge branch 'staging' into core-updates.

With "conflicts" resolved in (mostly in favor of master/staging):
	gnu/packages/admin.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/gtk.scm
	gnu/packages/kerberos.scm
	gnu/packages/linux.scm
	guix/lint.scm

1 files changed, 54 insertions, 1 deletions

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index c6d63ce041..d2c9d0d24e 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -52,6 +52,7 @@
   #:use-module (srfi srfi-1)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -76,11 +77,13 @@
   #:use-module (gnu packages perl-maths)
   #:use-module (gnu packages perl-web)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages video)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
 ;;;
@@ -398,6 +401,54 @@ users can force the decision of which backend to use by setting the environment
 variable ANY_MOOSE to be Moose or Mouse.")
     (license (package-license perl))))
 
+(define-public perl-app-xml-docbook-builder
+  (package
+    (name "perl-app-xml-docbook-builder")
+    (version "0.1003")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/S/SH/SHLOMIF/"
+                           "App-XML-DocBook-Builder-" version ".tar.gz"))
+       (sha256
+        (base32 "12423lk4r7m5pkm1dvk1ci6s1d6rsnnl4chnavckpmja18jyay3j"))))
+    (build-system perl-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+             (add-after 'unpack 'refer-to-xsltproc
+               (lambda* (#:key inputs #:allow-other-keys)
+                 (substitute* (list "lib/App/XML/DocBook/Docmake.pm"
+                                    "t/01-use.t")
+                   (("\"xsltproc\"")
+                    (format #f "\"~a\""
+                            (search-input-file inputs "bin/xsltproc")))))))))
+    (native-inputs
+     (list perl-module-build python))
+    (inputs
+     (list libxslt))
+    (propagated-inputs
+     (list perl-class-xsaccessor perl-test-trap))
+    (native-search-paths
+     ;; xsltproc's search paths, to avoid propagating libxslt.
+     (list (search-path-specification
+            (variable "XML_CATALOG_FILES")
+            (separator " ")
+            (files '("xml"))
+            (file-pattern "^catalog\\.xml$")
+            (file-type 'regular))))
+    (home-page "https://www.shlomifish.org/open-source/projects/docmake/")
+    (synopsis "Translate DocBook/XML documentation into other file formats")
+    (description
+     "This package provides the @command{docmake} command-line tool, and the
+@code{App::XML::DocBook::Docmake} and @code{App::XML::DocBook::Builder} Perl
+modules.
+
+It translates DocBook/XML mark-up into various other documentation formats such
+as XHTML, RTF, PDF, and XSL-FO, using the more low-level tools.  It aims to be a
+replacement for @command{xmlto}.")
+    (license license:expat)))
+
 (define-public perl-appconfig
   (package
     (name "perl-appconfig")
@@ -11617,6 +11668,8 @@ arduous to type for one-liners.")
         (base32
          "1njgr2zly9nrwvfrjhgk9dqq48as1pmbb2rs4bh3irvla75v7azg"))))
     (build-system perl-build-system)
+    (propagated-inputs
+     (list perl-pod-parser))
     (home-page "https://metacpan.org/release/Pod-Constants")
     (synopsis "Include constants from POD")
     (description "This module allows you to specify those constants that
@@ -11644,7 +11697,7 @@ lookup in %INC or by assuming it is $0 if the caller is @code{main}
     (build-system perl-build-system)
     (home-page
      "https://metacpan.org/release/Text-Soundex")
-    (synopsis "Implementation of the soundex algorithm.")
+    (synopsis "Implementation of the soundex algorithm")
     (description "Soundex is a phonetic algorithm for indexing names by sound,
 as pronounced in English.  The goal is for names with the same pronunciation to
 be encoded to the same representation so that they can be matched despite