Updated to 10.2.0.8.g6d9f76c

2 files changed, 59 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae0b468147bd..41e43bbb0ee0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,36 @@
-# Generated by mksrcinfo v8
-# Sat Jan 23 10:48:00 UTC 2016
 pkgbase = asciidoc-git
-	pkgdesc = Text document format for short documents, articles, books and UNIX man pages.
-	pkgver = 1
+	pkgdesc = Text document format for short documents, articles, books and UNIX man pages
+	pkgver = 10.2.0.8.g6d9f76c
 	pkgrel = 1
-	url = git+http://www.methods.co.nz/asciidoc/
+	url = https://asciidoc-py.github.io
 	arch = any
 	license = GPL
-	depends = python2
+	checkdepends = dblatex
+	checkdepends = graphviz
+	checkdepends = lilypond
+	checkdepends = python-pytest
+	checkdepends = python-pytest-mock
+	checkdepends = source-highlight
+	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
+	makedepends = python-setuptools
+	depends = python
 	depends = libxslt
 	depends = docbook-xsl
+	optdepends = graphviz: graphviz-filter
 	optdepends = lilypond: music-filter
-	optdepends = imagemagick: music-filter (used in conjunction with lilypond)
+	optdepends = imagemagick: music-filter
 	optdepends = source-highlight: source-highlight-filter
 	optdepends = dblatex: pdf generation
 	optdepends = fop: alternative pdf generation
-	optdepends = lynx: text generation
-	optdepends = w3m: text generation (alternative to lynx)
+	optdepends = w3m: text generation
+	optdepends = lynx: alternative text generation
 	provides = asciidoc
 	conflicts = asciidoc
 	source = git+https://github.com/asciidoc/asciidoc.git
-	sha1sums = SKIP
+	sha256sums = SKIP
+	b2sums = SKIP
 
 pkgname = asciidoc-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 31efb51f4440..f8d5e35c77e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,29 @@
 # Maintainer: Christoph Gysin <christoph.gysin@gmail.com>
 
-pkgname=asciidoc-git
 _pkgname=asciidoc
-pkgver=8.6.9.84.gd919c61
+pkgname=asciidoc-git
+pkgver=10.2.0.8.g6d9f76c
 pkgrel=1
-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='git+http://www.methods.co.nz/asciidoc/'
+url='https://asciidoc-py.github.io'
 license=('GPL')
-depends=('python2' 'libxslt' 'docbook-xsl')
+depends=('python' 'libxslt' 'docbook-xsl')
+checkdepends=('dblatex' 'graphviz' 'lilypond' 'python-pytest'{,-mock} 'source-highlight')
+makedepends=(git python-{build,installer,wheel} python-setuptools)
 provides=('asciidoc')
 conflicts=('asciidoc')
-optdepends=('lilypond: music-filter'
-            'imagemagick: music-filter (used in conjunction with lilypond)'
+optdepends=('graphviz: graphviz-filter'
+            'lilypond: music-filter'
+            'imagemagick: music-filter'
             'source-highlight: source-highlight-filter'
             'dblatex: pdf generation'
             'fop: alternative pdf generation'
-            'lynx: text generation'
-            'w3m: text generation (alternative to lynx)')
-source=('git+https://github.com/asciidoc/asciidoc.git')
-sha1sums=('SKIP')
+            'w3m: text generation'
+            'lynx: alternative text generation')
+source=("git+https://github.com/asciidoc/asciidoc.git")
+sha256sums=('SKIP')
+b2sums=('SKIP')
 
 pkgver() {
     cd $_pkgname
@@ -27,35 +31,35 @@ pkgver() {
 }
 
 prepare() {
-    cd $_pkgname
-
-    # python2 fix
-    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' \
-        a2x.py \
-        asciidoc.py \
-        asciidocapi.py \
-        filters/code/code-filter.py \
-        filters/graphviz/graphviz2png.py \
-        filters/latex/latex2img.py \
-        filters/music/music2png.py
-    sed -i 's_python a2x.py_./a2x.py_' \
-        Makefile.in
+  cd $_pkgname
+  sed -i \
+    -e '/^build: /a \\tpython3 -m build -wn' \
+    -e '/pip install/{s#pip install --root#installer -d#;s#\.$#dist/*.whl#}' \
+    Makefile.in
+  # https://github.com/asciidoc-py/asciidoc-py/issues/234
+  autoconf
 }
 
 build() {
-    cd $_pkgname
+  cd $_pkgname
+  # https://github.com/asciidoc-py/asciidoc-py/issues/234#issuecomment-1045970138
+  ./configure \
+      --docdir /usr/share/doc/$pkgname \
+      --prefix /usr
+  make build
+}
 
-    autoconf -i
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc
+check() {
+  cd $_pkgname
+  make test
 }
 
 package() {
     cd $_pkgname
-
-    make install DESTDIR=$pkgdir
-
-    install -Dm644 asciidocapi.py \
-        $pkgdir/usr/lib/python2.7/site-packages/asciidocapi.py
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" docs
+  install -Dm0644 -t "$pkgdir/usr/share/man/man1/" doc/*.1
+  # ascidocapi is deprecated, but still included in 10.x on a "provisional" basis
+  local _platlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["platlib"])')"
+  install -Dm0644 -t "${pkgdir}/${_platlib}/${pkgname}/" asciidoc/api.py
 }