app-text/asciidoc: Bump to 8.6.4

Package-Manager: portage-2.1.9.40/cvs/Linux x86_64

4 files changed, 134 insertions, 8 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index c9eb58bdce4b..8bb508f13ddf 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/asciidoc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.64 2010/11/14 19:28:43 sping Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.65 2011/02/22 07:40:40 sping Exp $
+
+*asciidoc-8.6.4 (22 Feb 2011)
+
+  22 Feb 2011; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.4.ebuild,
+  asciidoc-9999.ebuild:
+  Bump to 8.6.4, integrate test suite, sync live ebuild
 
 *asciidoc-9999 (14 Nov 2010)
 *asciidoc-8.6.3 (14 Nov 2010)
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 746428aedd99..e3c179ae10bc 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,9 +1,11 @@
 DIST asciidoc-8.2.6.tar.gz 739790 RMD160 c07d2eaa04d16275c44756236023c0789cf54310 SHA1 cce98ed670c462a3a007b03b6f92d2108c5bc405 SHA256 5e9c966cfcb9d08487da625b41ed5e007eedb2d1abbb996dd6f78f2c5bde08dc
 DIST asciidoc-8.5.3.tar.gz 1254979 RMD160 c34aa2be7bc30f8ac0dbbd162f9feecbb345cf98 SHA1 78fd756e17c9b83abfeb43806dff95db10bff8bc SHA256 9e9f69dd10b5975436d48d87c202082a128329696191ea8dbc6d2f7722fd41b5
 DIST asciidoc-8.6.3.tar.gz 788543 RMD160 4ec1a9e1363ffa68b357455e5db9bda9472f5a1f SHA1 96ac2a3593cd0787627288359d629f8b7e69f03f SHA256 f64cddd87e3610a84d4fcfd7eaeb670ed059062bee807f525478b1041d23fa1f
+DIST asciidoc-8.6.4.tar.gz 853136 RMD160 24c160d8d23926d27bed721673497018e074cb57 SHA1 accb97167a17e7872c7d0633db1727d6453ccbb1 SHA256 6b405c0366ae432e1984b117e15c95f0935a617c90fe0a448aa03fece3927f8a
 EBUILD asciidoc-8.2.6.ebuild 1637 RMD160 679248508c7be257f43cc382a012ce3c4af33a61 SHA1 2a2b77520e6891000ef964ee26d09e962729d8c0 SHA256 edbb13f2c919c85faa2b426881d8f0fe7fad7fd9b314c3dd0efe1824b646c5d6
 EBUILD asciidoc-8.5.3.ebuild 1980 RMD160 b841e624417e2354f1be06c89882d230db400c51 SHA1 7190caa363d3e8c268d6a0a5a10f7e7c0a60f798 SHA256 08066e6e53900e1df02d750b7ce8fb181a2f0fa99968ffaac984f14b3e9849b3
 EBUILD asciidoc-8.6.3.ebuild 2354 RMD160 9c251072d2ac29a482ac1c4b7bcfe5592ac84b98 SHA1 02c200445640e0f26dc98b01fb10675a0e726169 SHA256 5eda3c63ab98374fc34203a7064290b5abd92ece32545ca962ac4a3f74392aad
-EBUILD asciidoc-9999.ebuild 2353 RMD160 2e65545b4315c4ee48fb14eebbd81460c186b084 SHA1 5dc0b7339d7e58821b03dc2fd2bbfa957cc6a6b0 SHA256 45fa9b7c60811e1143f72931b858d25a49aa0ebd7721b5a160bd5e707f659632
-MISC ChangeLog 9088 RMD160 9925d7cf8e2dbb21abfac9e0488ecd72f46fee94 SHA1 9160ae13d8ba16df57772345b113afa5583f4ef1 SHA256 66fe9fce3097744f06aaca85e7e84a27d603519efa490370723689a9be41a19e
+EBUILD asciidoc-8.6.4.ebuild 2678 RMD160 e95a112c60c5897d4702ad80cbdd024a120e40ac SHA1 0caf36d2976327e1ee0645f816ac9858c179d307 SHA256 ddbbed8cd8e67cf67b74b64ddfdf7381bbd1dcc722861303d89cb2494d9a7705
+EBUILD asciidoc-9999.ebuild 2677 RMD160 7ae0eedc479b6938c636dfa5f3874c3ad8502c23 SHA1 d828cde62df53900924560d8cfcd3616733af47f SHA256 5ad463a8d26005856290fa2a94d92ccea440952e16260666cae23d29d6b53d2c
+MISC ChangeLog 9276 RMD160 3a5e0fe7641443d63606939fa935e37b3dea69a5 SHA1 b54514f989774467e9720faee1c2ee488dfb68be SHA256 456a3d01c0b983012855b4adaf84814626f94b0e2d2316c7545d754a934dc5ef
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
diff --git a/app-text/asciidoc/asciidoc-8.6.4.ebuild b/app-text/asciidoc/asciidoc-8.6.4.ebuild
new file mode 100644
index 000000000000..16c82f7ddfaf
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.4.ebuild,v 1.1 2011/02/22 07:40:40 sping Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="3.*"
+
+[ "$PV" == "9999" ] && inherit mercurial autotools
+inherit python
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+if [ "$PV" == "9999" ]; then
+	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
+	SRC_URI=""
+	KEYWORDS=""
+	S=${WORKDIR}/hg
+else
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test vim-syntax"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
+		dev-libs/libxslt
+		media-gfx/graphviz
+		app-text/docbook-xml-dtd:4.5
+"
+DEPEND="test? ( dev-util/source-highlight
+			media-sound/lilypond
+			media-gfx/imagemagick
+			dev-texlive/texlive-latex
+			app-text/dvipng
+			media-gfx/graphviz )
+"
+
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		dev-util/aap
+		www-client/lynx
+		dev-util/source-highlight"
+fi
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	if ! use vim-syntax; then
+		sed -i -e '/^install/s/install-vim//' Makefile.in
+	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
+
+	[ "$PV" == "9999" ] && eautoconf
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_compile() {
+	default
+
+	if [ "$PV" == "9999" ]; then
+		( cd doc && aap -f main.aap ../{CHANGELOG,README,BUGS} )
+	fi
+}
+
+src_install() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	emake DESTDIR="${D}" install || die "install failed"
+
+	python_convert_shebangs -r 2 "${D}"
+
+	if use examples; then
+		# This is a symlink to a directory
+		rm examples/website/images || die
+
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples || die
+	fi
+
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt || die
+}
+
+src_test() {
+	cd tests || die
+	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py update || die
+	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py run || die
+}
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index 681ea3f75030..f14e51c6800d 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.1 2010/11/14 19:28:43 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.2 2011/02/22 07:40:40 sping Exp $
 
 EAPI="3"
 
@@ -24,14 +24,20 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="examples vim-syntax"
+IUSE="examples test vim-syntax"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
 		dev-libs/libxslt
 		media-gfx/graphviz
 		app-text/docbook-xml-dtd:4.5
 "
-DEPEND=""
+DEPEND="test? ( dev-util/source-highlight
+			media-sound/lilypond
+			media-gfx/imagemagick
+			dev-texlive/texlive-latex
+			app-text/dvipng
+			media-gfx/graphviz )
+"
 
 if [ "$PV" == "9999" ]; then
 	DEPEND="${DEPEND}
@@ -92,3 +98,9 @@ src_install() {
 	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
 			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt || die
 }
+
+src_test() {
+	cd tests || die
+	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py update || die
+	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py run || die
+}