From 6e08e7b9e0cd1d5cdaa3ea1a7dcd75f01c198100 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 7 Aug 2012 14:40:04 -0500
Subject: ascii-doc 8.6.8
---
abs/extra/asciidoc/ChangeLog | 10 --------
abs/extra/asciidoc/PKGBUILD | 61 +++++++++++++++++++++++++++++++-------------
2 files changed, 43 insertions(+), 28 deletions(-)
delete mode 100644 abs/extra/asciidoc/ChangeLog
diff --git a/abs/extra/asciidoc/ChangeLog b/abs/extra/asciidoc/ChangeLog
deleted file mode 100644
index e9e5156..0000000
--- a/abs/extra/asciidoc/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-
-2009-11-07 Chris Brannon <cmbrannon79@gmail.com>
-
- * Fixed optdepends, converted to arch=('any').
-
-
-2008-07-06 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for x86_64 - 8.2.7
-
diff --git a/abs/extra/asciidoc/PKGBUILD b/abs/extra/asciidoc/PKGBUILD
index e7ab081..a333a43 100644
--- a/abs/extra/asciidoc/PKGBUILD
+++ b/abs/extra/asciidoc/PKGBUILD
@@ -1,36 +1,61 @@
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 73972 2012-07-17 22:26:29Z bluewind $
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
# Contributor: Dan McGee <dan@archlinux.org>
# Contributor: Jaroslaw Rosiek <philosoph@interia.pl>
# Contributor: Darwin Bautista <djclue917@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Florian Pritz <flo@xinu.at>
pkgname=asciidoc
-pkgver=8.6.3
+pkgver=8.6.8
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="http://www.methods.co.nz/asciidoc/"
+url='http://www.methods.co.nz/asciidoc/'
license=('GPL')
depends=('python2' 'libxslt' 'docbook-xsl')
optdepends=('lilypond: music-filter'
- 'imagemagick: music-filter (used in conjunction with lilypond)'
- 'source-highlight: source-highlight-filter'
- 'fop: pdf generation'
- 'lynx: text generation'
- 'w3m: text generation (alternative to lynx)')
-source=(http://downloads.sourceforge.net/asciidoc/asciidoc-${pkgver}.tar.gz)
+ 'imagemagick: music-filter (used in conjunction with lilypond)'
+ 'source-highlight: source-highlight-filter'
+ 'dblatex: pdf generation'
+ 'fop: alternative pdf generation'
+ 'lynx: text generation'
+ 'w3m: text generation (alternative to lynx)')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('6ffff1ab211f30481741ce4d1e4b12bf')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc || return 1
+ cd ${pkgname}-${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
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc
}
+
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make install DESTDIR="${pkgdir}" || return 1
- install -Dm644 asciidocapi.py ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py
+ cd ${pkgname}-${pkgver}
+
+ make install DESTDIR=${pkgdir}
+
+ install -Dm644 asciidocapi.py \
+ ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py
+
+ install -Dm644 vim/syntax/asciidoc.vim \
+ ${pkgdir}/usr/share/vim/vimfiles/syntax/asciidoc.vim
+
+ install -Dm644 vim/ftdetect/asciidoc_filetype.vim \
+ ${pkgdir}/usr/share/vim/vimfiles/ftdetect/asciidoc.vim
- find "$pkgdir/" -name '*.py' | \
- xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+ # 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
}
-md5sums=('1ef39786ee1b4c8a788584e73db2c55a')
--
cgit v0.12