From c2649f2811c4d2931a406f272c4af74dfd05cd1a Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Tue, 18 May 2021 19:35:14 +0200
Subject: gnu: asciidoc: Remove Python 2 variant.

* gnu/packages/documentation.scm (asciidoc): Update to 9.1.0.
[inputs]: Replace PYTHON-2 with PYTHON.
(asciidoc-py3): Define as deprecated alias for ASCIIDOC.
* gnu/packages/version-control.scm (git)[native-inputs]: Change from
ASCIIDOC-PY3 to ASCIIDOC.
* gnu/packages/wm.scm (i3-wm)[native-inputs]: Likewise.
---
 gnu/packages/documentation.scm   | 44 ++++++++++++----------------------------
 gnu/packages/version-control.scm |  2 +-
 gnu/packages/wm.scm              |  2 +-
 3 files changed, 15 insertions(+), 33 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 17f73aa58f..39510316d2 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,6 +35,7 @@ (define-module (gnu packages documentation)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system qt)
+  #:use-module (guix deprecation)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages backup)
@@ -101,16 +103,16 @@ (define-public latex2html
 (define-public asciidoc
   (package
     (name "asciidoc")
-    (version "8.6.10")
+    (version "9.1.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/asciidoc-py/asciidoc-py2")
-                     (commit version)))
+                    (url "https://github.com/asciidoc/asciidoc-py")
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1hrqkgjmp1gq3f9rkbr8l0y62fzvwb9n8ys35s25bg2ld04y4g4y"))))
+                "1clf1axkns23wfmh48xfspzsnw04pjh4mq1pshpzvj0cwxhz0yaq"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                     ; no 'check' target
@@ -159,11 +161,12 @@ (define-public asciidoc
                        #t)))))
     (native-inputs
      `(("autoconf" ,autoconf)))
-    (inputs `(("python" ,python-2)
-              ("docbook-xml" ,docbook-xml)
-              ("docbook-xsl" ,docbook-xsl)
-              ("libxml2" ,libxml2)
-              ("libxslt" ,libxslt)))
+    (inputs
+     `(("python" ,python)
+       ("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("libxml2" ,libxml2)
+       ("libxslt" ,libxslt)))
     (home-page "https://asciidoc.org/")
     (synopsis "Text-based document generation system")
     (description
@@ -177,28 +180,7 @@ (define-public asciidoc
 markup) can be customized and extended by the user.")
     (license gpl2+)))
 
-(define-public asciidoc-py3
-  (package (inherit asciidoc)
-    (name "asciidoc-py3")
-    (version "9.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/asciidoc/asciidoc-py")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1clf1axkns23wfmh48xfspzsnw04pjh4mq1pshpzvj0cwxhz0yaq"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)))
-    (inputs
-     `(("python" ,python)
-       ("docbook-xml" ,docbook-xml)
-       ("docbook-xsl" ,docbook-xsl)
-       ("libxml2" ,libxml2)
-       ("libxslt" ,libxslt)))))
+(define-deprecated asciidoc-py3 asciidoc)
 
 (define-public doxygen
   (package
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 167495c80c..80842ecf0c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -204,7 +204,7 @@ (define-public git
            (base32
             "00n7vbfmd3ywgjksgwrszwj0l2niba64qkaq07ra4p8mawy483ax"))))
       ;; For subtree documentation.
-      ("asciidoc" ,asciidoc-py3)
+      ("asciidoc" ,asciidoc)
       ("docbook-xsl" ,docbook-xsl)
       ("xmlto" ,xmlto)
       ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index da850acb00..c7a1c5a7ac 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -334,7 +334,7 @@ (define-public i3-wm
      `(("which" ,which)
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
-       ("asciidoc-py3" ,asciidoc-py3)
+       ("asciidoc" ,asciidoc)
        ;; For building the documentation.
        ("libxml2" ,libxml2)
        ("docbook-xsl" ,docbook-xsl)))
-- 
cgit v1.2.3