From 4de3563745ac22868d3ef261a1013ccd092a1384 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Sun, 21 Nov 2021 07:27:15 +0100
Subject: libre: asciidoc: sync with Arch Linux by updating to 9.1.0-1

The changes and rationale was added as well from
information that comes from the bug #717 [1].

[1]https://labs.parabola.nu/issues/717

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 libre/asciidoc/PKGBUILD | 70 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'libre/asciidoc')

diff --git a/libre/asciidoc/PKGBUILD b/libre/asciidoc/PKGBUILD
index 62c8fba1d..646f79915 100644
--- a/libre/asciidoc/PKGBUILD
+++ b/libre/asciidoc/PKGBUILD
@@ -1,68 +1,68 @@
+# Maintainer (Arch): Eli Schwartz <eschwartz@archlinux.org>
+# Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor (Arch): Florian Pritz <flo@xinu.at>
 # Contributor (Arch): Chris Brannon <cmbrannon79@gmail.com>
 # Contributor (Arch): Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor (Arch): Dan McGee <dan@archlinux.org>
 # Contributor (Arch): Jaroslaw Rosiek <philosoph@interia.pl>
 # Contributor (Arch): Darwin Bautista <djclue917@gmail.com>
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Arch): Florian Pritz <flo@xinu.at>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Andreas Grapentin <andreas@grapentin.org>
+# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+
+# parabola changes and rationale:
+#  - Removed fop optional dependency as fop is blacklisted
+
 
 pkgname=asciidoc
-pkgver=8.6.10
-pkgrel=3
+pkgver=9.1.0
+pkgrel=1
 pkgrel+=.parabola1
-pkgdesc='Text document format for short documents, articles, books and UNIX man pages.'
+pkgdesc='Text document format for short documents, articles, books and UNIX man pages'
 arch=('any')
-url='https://www.methods.co.nz/asciidoc/'
+url='https://asciidoc.org/'
 license=('GPL')
-depends=('python2' 'libxslt' 'docbook-xsl')
-optdepends=('lilypond: music-filter'
+depends=('python' 'libxslt' 'docbook-xsl')
+checkdepends=('dblatex' 'graphviz' 'lilypond' 'source-highlight')
+optdepends=('graphviz: graphviz-filter'
+            'lilypond: music-filter'
             'imagemagick: music-filter (used in conjunction with lilypond)'
             'source-highlight: source-highlight-filter'
             'dblatex: pdf generation'
-            'lynx: text generation'
-            'w3m: text generation (alternative to lynx)')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/asciidoc/asciidoc/archive/${pkgver}.tar.gz")
-sha256sums=('9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983')
+            'w3m: text generation (alternative to lynx)'
+            'lynx: text generation')
+source=("https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('8a6e3ae99785d9325fba0856e04dbe532492af3cb20d49831bfd757166d46c6b')
+b2sums=('dd2376a3b9ffa1d7a8016c9eb1030a9d0d3a01cde587d3179cb425a5be5ae120ea7fc1fa971cb1bb53faa2a7e93b4a1c2e8cf854e7e960c1299398a02b8aa42e')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-py3-${pkgver}
 
-  # python2 fix
-  #for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py filters/latex/latex2png.py \
-	  #filters/code/code-filter.py filters/graphviz/graphviz2png.py; do
-	#sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  #done
-  #sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' xhtml11.conf
-  #sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf
-  #sed -i -e 's/{python}/{python2}/g' \
-	  #-e 's#{language@python:py:#{language@python2:py:#' \
-	  #filters/source/source-highlight-filter.conf \
-	  #html5.conf xhtml11.conf xhtml11-quirks.conf
-  #sed -i -e "s#'python'#'python2'#g" filters/code/code-filter.py
-  sed -i -e 's#python a2x.py#python2 a2x.py#' Makefile.in
+  autoconf
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-py3-${pkgver}
 
-  autoconf
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc
+  make manpages
+}
+
+check() {
+  cd ${pkgname}-py3-${pkgver}
+
+  make test
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-py3-${pkgver}
 
-  make install DESTDIR=${pkgdir}
-  make docs DESTDIR=${pkgdir}
+  make install DESTDIR="${pkgdir}"
+  make docs DESTDIR="${pkgdir}"
 
   install -Dm644 asciidocapi.py \
-    ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py
-
-  # fix FS#21579 - [asciidoc] 8.6.2-2 "asciidoc" table style doesn't work (mismatched python version) 
-  #sed -i 's/python/python2/' \
-    #${pkgdir}/etc/asciidoc/asciidoc.conf
+    "${pkgdir}/$(python -c 'import sysconfig; print(sysconfig.get_paths()["platlib"])')"/asciidocapi.py
 }
-- 
cgit v1.2.3