Add asciidoc-8.6.9-r1 with fixes from Calchan (fixes bug 483336)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 101 insertions, 15 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index deca46203639..b3ed11e06917 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/asciidoc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.95 2014/09/23 19:32:57 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.96 2014/11/03 13:04:32 djc Exp $
+
+*asciidoc-8.6.9-r1 (03 Nov 2014)
+
+  03 Nov 2014; Dirkjan Ochtman <djc@gentoo.org> +asciidoc-8.6.9-r1.ebuild:
+  Add asciidoc-8.6.9-r1 with fixes from Calchan (fixes bug 483336)
 
   23 Sep 2014; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
   Add myself as a maintainer
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 0dfebb293518..3bc08f8616b6 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -6,24 +6,25 @@ DIST asciidoc-8.6.8.tar.gz 900422 SHA256 ffb67f59dccaf6f15db72fcd04fdf21a2f9b703
 DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d
 EBUILD asciidoc-8.6.5.ebuild 2741 SHA256 4f4ef36e8bd51493dd9698360d18e8083b867fac559b75cedd215951ff3cfff2 SHA512 3fceda4db6c90d8416e82210122b10a460f3e3bf6e135a7cc60e2d9a3ebda2c3cff194fd4cab07e7bf7277bff8c9858b0382c8a5eeae903e8c4cb612661f2cce WHIRLPOOL 275fbcdd2e3692cd0d7f8e4b748de562eccddfddc4cb297ddf84fd3044903c8c8867e366196263553661d6c373eff58de564eea8eddc2c8e17913c04babdcb45
 EBUILD asciidoc-8.6.8-r1.ebuild 2823 SHA256 fa393676350c9e9dcff641376512f00d7acf2b101943aceceac337834e3b5794 SHA512 065da64da5cfc508f04161a07ce2b7037decde1db9fd39e0195994504f78400f779627c5d13f6365a962aaad7b4cbb25580321048e4ed8a328a9575d9b6599f2 WHIRLPOOL 8569ace53c368468267c5f789dee60709b425ec8f25e419c0c9b0be2cec069da021400da9b02a0cf857c830b650f300f51a183933477ace446f12a03939782b9
+EBUILD asciidoc-8.6.9-r1.ebuild 2451 SHA256 cd848636fcb168b0befcac86eac50cb1b0d8ea58f09d4d148011d5a2da510883 SHA512 8a941098bf995045cea9b8fc17cdeeff1b1a71c5f815668e2f1b9ad900bdb92702acaa1ef46813cc35b972630ec2b4e5e02f22149f35f134c067aad6e3fc903d WHIRLPOOL 6708ce85cbd255d16428d165e69b7d88da84a34103287079d32e3b882e73a451262ccdde0454d00a6655ad41320ceb8750079f649a911a14e70b2a4acaded51a
 EBUILD asciidoc-8.6.9.ebuild 2817 SHA256 2035b3dee24263f6880e7c081b821c62416f64bf73bf73ae99383607cd5287bf SHA512 d4d7e6cddf6913b0f16fc345fd473a8d363021f5bb55fd48c399a4714848199cc6698308089c9c0d6b01540bfe9b958bf955f9e4e5ef1d6c8eed1a72980ba378 WHIRLPOOL 2a5621bdaaec76dcc771ec0a67ba9829bae7c115105cb6b9cdff39d3e90bbc3f007b870c15faca94b95f49b21f02434813feb55c9e56b0f74c9725fed8df9f2d
 EBUILD asciidoc-9999.ebuild 2835 SHA256 b7be526bff7b13807af5e44e89dce1c1ca916624b97d243f324da94c1c872fa0 SHA512 c58070c5aac34508eab346215b7538660f83ac18f6e69862b717b00093ad1bfe1c0443c0ff2069c267a50359b41aad56830ad3cb95b2ad360ee56c60bcd82888 WHIRLPOOL 27c9b197667a7a2e29504d76d6263ca743f0aeb00e19537871eb4b26e2fc3b240cffb16b3d80af48db4efb6e4aaec9a642d06ad5a4f733d20ac33f0474202319
-MISC ChangeLog 13774 SHA256 dd83f246dd2771d0e67e48bc0263a6b3f261eefc6df9e1806eef5b8907bbf057 SHA512 8da90773b85d30cc77b5f1add78372fe682997dc8f17596cb31c6c51734f3d24fc759afed1b60c90d77dc82b7ab0f4250e321e3a736421a3bc83432a30ded837 WHIRLPOOL 14118f9858cafadd5e995164858074ca67660a50d6f3593d9b001940d3d615438a0808fce3f4cd4c86b97df0be71770a51a40fef0fe65af79b36cc332b780357
+MISC ChangeLog 13951 SHA256 d614fafdbc061ab63c54d3be8b9edadc1fc79af768e8f0a946f8e39c8861d093 SHA512 fde6a2b48df722e373b70d58664b620c2c8a8839efddba5bc3dab0ac9c23869f060549c395b63d60ee94c219d1604776c7aaf985e608b7f507305dce2bafd319 WHIRLPOOL 31542609d010b8b7c24b28d3ac79ee2b22f0173e1842550fd495df2b6a95597e83fbecca281322c6d9daa02440c08a4e1e66e8fa14bae782b9493fb14f066a2e
 MISC metadata.xml 320 SHA256 848322dd58123a1cf9d2e35e2d32705defd8eb80f2efc29da1ff54ab54531f11 SHA512 90215098e0d41b4c642891af0be5067dc12bcc7cb394b25258c20feadf514931e203fa695c14b1567c478f6e9667eb4153c75c3d49db67ae8ebd78ed2d3f5596 WHIRLPOOL 9bade435bfee544a1b31bb9462a7f0054dfdb1f03454bcb1d6b62418ebce827a6453b301d48ba8213563e5796eebe687eef99a6ad6d7402c4fc9365da0603333
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUIctoAAoJEJ+WuSkwOAOByAgP/RsqP8zXno+F2L9YDkSmo/pF
-gikphhK4O5zeqKfrUBvYXYW51rbZqStkrUV82L1AMoblnIU3rMMc+qbqdmf7fpfq
-UJAhfB973+Vr4LWsjoXpZ41Inhr3Bm8b/mY5tipKVjOeCpptKGf5g80mU2BV5HLG
-t9WvQeY8T1y7xZAuDlF86eeZWOaHovX/5a+xpPh4geGAQngZSj4G0LthSXoyjCvd
-EK3eRWwHOU6vKO+ctbJFhIfhqxBJgUWOLWifNZDLggsLyuMKWcBxPfaHsVrtQoJB
-gIEr0NTqUT4stLg5WgBEAspDaln+3LG7x4FN14tgTXP813M1pU7NHegK2euTrsho
-2n1XRTXv7JebH1FYiQgVtfuxOsEz4ENL7OEn+JgxdDy1ZtORXohowojP/lUy689a
-OAqZHET0yIL16CZKmISkwzRxxgLwfkHiGXzi7mORYkoTbHQSdUvEhkC2DDbbDChO
-HCMP/7+EdQdRDFJ0VphOPDFjIsShRr1spneX3CZzwC2/2o4feapRtb5FbB4KDeEo
-R5P5TkhQ9uoNX4LeBxcTTPvvA57YUHLjPRKhxFIy4Rs9O44d9UkxuUWl9fkBAqPz
-CeYiVIYjeMy2tVb+7jYIOzALb0HbipXpHTJ+xLx/BBH2qrJIMVzCig6Msv2wVT6B
-0nzm7e7YKmGyGW3Tx86D
-=jSoc
+iQIcBAEBCAAGBQJUV35QAAoJEJ+WuSkwOAOBugwP/2mjVOpRXktyYm5Fv9Cx2A1A
+qe/PFHjY/9qmL1720pUHUfA9LHFCV2kZg3IzscSKLZ/KeswUoWqBs/o/6QLjFf2f
+jXI3u8HjkAnNmMuBTcvToeSHMidoyQwup7rlbMM1yz8aG+GNyTo5xabXsmUyJVQ2
+KfNZrINKO+YBt28VijUrIssLFDnGSWgd9EfmqeCqNZIBja9n6rfC+Y9rZujeNoF1
+ujS23sAQ6XqcbMTFv0a2Qo023/AN2k6YOO+ZRGAIZVhA8JV2DNT5guT2XZu8JmSB
+prdkelIMTjQwOdnrl1YFuI8aof8NcawZ6bYpjiO36YEkZdZEbI9+QsP/kE++XBMz
+H/D70HgMmuxWuMqCcvSmBMGoxGkArnpALlUlRCoE+94Lp7C0A0LF9o9+x35NToQx
+NjeHY8k0xWXjoP2YwDh9nCJDXEd49qF41y3W+fgNGoUpyqv3Eo1czZget9qwhinc
+u85v6JwSZIynYgFDOQIsG+NPfkR8HqtHeHgA1r7GUdtrLCyvFgivySGv1wirCH+S
+Yl+2GG5fhUrvg+El3atEzDVPi2t6DNf9nvou2Q5XVZippZmoPeVJKVyWWApUXPRC
+9DOn0rzapE3kc8OEgfXyaYiFYp09ugnthjl6T0fYWTsZN9HWtiVoy+XOyP5eC0+A
+vZynlkbRH80PmKrEefY2
+=Jw3x
 -----END PGP SIGNATURE-----
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
new file mode 100644
index 000000000000..5841c50e6f8c
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild,v 1.1 2014/11/03 13:04:32 djc Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
+
+inherit python-single-r1
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://asciidoc.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test vim-syntax"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
+		dev-libs/libxslt
+		graphviz? ( media-gfx/graphviz )
+		app-text/docbook-xml-dtd:4.5
+		highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) )
+		${PYTHON_DEPS}
+"
+DEPEND="test? ( dev-util/source-highlight
+			media-sound/lilypond
+			media-gfx/imagemagick
+			dev-texlive/texlive-latex
+			app-text/dvipng
+			media-gfx/graphviz
+			${PYTHON_DEPS} )
+"
+
+src_prepare() {
+	if ! use vim-syntax; then
+		sed -i -e '/^install/s/install-vim//' Makefile.in || die
+	else
+		sed -i\
+			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
+			-e 's:/etc/vim::' \
+			Makefile.in || die
+	fi
+
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_install() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	emake DESTDIR="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are in the right place,
+	# uncompressed, and there won't be any broken links. See bug #483336.
+	if use examples; then
+		cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
+	fi
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+src_test() {
+	cd tests || die
+	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" test${PN}.py run || die
+}