Version bump for bug 430260 by Sean McCovern.

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

4 files changed, 130 insertions, 6 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index f84a4336d914..c15b0ce08fce 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/asciidoc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.81 2012/04/26 18:29:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.82 2012/09/10 03:04:04 floppym Exp $
+
+*asciidoc-8.6.8 (10 Sep 2012)
+
+  10 Sep 2012; Mike Gilbert <floppym@gentoo.org> +asciidoc-8.6.8.ebuild,
+  asciidoc-9999.ebuild:
+  Version bump for bug 430260 by Sean McCovern.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> asciidoc-8.6.7.ebuild,
   asciidoc-9999.ebuild:
@@ -329,4 +335,3 @@
   29 May 2005; Mamoru KOMACHI <usata@gentoo.org> +metadata.xml,
   +asciidoc-6.0.3.ebuild:
   Initial import. Thanks to Brandon Philips <brandon@ifup.org>; bug #91096.
-
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index f2bd522850f0..b656e514d944 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,15 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST asciidoc-8.2.6.tar.gz 739790 SHA256 5e9c966cfcb9d08487da625b41ed5e007eedb2d1abbb996dd6f78f2c5bde08dc SHA512 5b7cf5ec91af2fdc092f6121b30a748428bdfc6c69b4f2dfbca80b61fe136596a7cfd42e52dcb73dbbf62f632be39aed83dcde725e7410964469a8a9e09369dd WHIRLPOOL 172cf894d0962d68d64f28dea5e50e729b91023fca090bc0deb6592eba1628791dbf826ad725a328df902f21155724368d255b34ccc6d93cac8332820412edaa
 DIST asciidoc-8.5.3.tar.gz 1254979 SHA256 9e9f69dd10b5975436d48d87c202082a128329696191ea8dbc6d2f7722fd41b5 SHA512 91dfef200ff97956ddeafbd96a77f4b2435accee03c29b39a46169a381bf0cb472f6cf501418edab2bbe00dc55f47a56ab0427fa9a748cb1e1d8d0efc5cdb73d WHIRLPOOL 01876ebfbf277c41a4b1aa9875876e15d391020c160e603ffa31cf81b1b4b59d25e766d8d2ea020cfb1fd9e2d6fbf39fb1b35d2c88423bd4615f8d189d37b36a
 DIST asciidoc-8.6.3.tar.gz 788543 SHA256 f64cddd87e3610a84d4fcfd7eaeb670ed059062bee807f525478b1041d23fa1f SHA512 7fe5d6e444b2f6539cb5b45595474d6a89b8f2b4c795ac9e771cff52aa25220012fbae3358d36aaca2b35dc66c80cc1fe6eb0c640623538f8a4bee0ded9cdea8 WHIRLPOOL 1e2faf832657f8157877c3e6dea56a32734714a8a1fa3ba0efbbc3a7af958e20f6baf2cfcf2e03af078f17d0c1d15b62fd822a83cf5d566fc8f47fa222bd379c
 DIST asciidoc-8.6.4.tar.gz 853136 SHA256 6b405c0366ae432e1984b117e15c95f0935a617c90fe0a448aa03fece3927f8a SHA512 8ba923ad6763b1b00ef6fe7a2d025796b64f1fb4bd274552cdc00681b2c94726a40858e3055f289f144881afdc813aae77e16ebcbb50c9ffe3e206bbddcbf060 WHIRLPOOL 69f94537d2f95de881f162c641b7ddcd3848cc345a9f49ce62a15ae01866d0e188da51ec4e3abf9d9b68e4c687acf2545dd7413d4fece1b6b8ab413eb61db9bb
 DIST asciidoc-8.6.5.tar.gz 867402 SHA256 f9da38afaf04186145739c10551341a448b3bf50a37a10392fbe584e9fb2a85f SHA512 bece29540d36a9e071a0746b08ef21a0ecf68a40ae3d593d98dd33d0ab5fcfa85b7895b545b9e5a8e33f78c7ecb142758697decf45e9c2ce26b068ca77c1f2e6 WHIRLPOOL 0c6a85fe848205cbe1b13a8717718b2c6fd6613ded252da13ead4145fdaed5ab763fb5c3c80997e69f39897c3cdd48309e9ef832f36027af75af3381255f22e8
 DIST asciidoc-8.6.7.tar.gz 889107 SHA256 48d3cc0367d05a8118058ee6cfb8b66592cd6dc58053186f8a6c54bb5229798f SHA512 16243bab9a9eb2f3e696e6d8e4ad64f5a3e6313f95a7d1c47f9ca080366b23b45bbc5bf63ff75ae58085bbed035e4ccd94b9304e67d1c2b0ebfa4f7ba72bc261 WHIRLPOOL d277ca53cb8499f9faeb1db6a06b2c33e15dfb0490497fb39cb34e615ed888d410fc7f0e556ee3d9758efd5ee77964969993f203acc2af5196ff03df4ff2fe15
+DIST asciidoc-8.6.8.tar.gz 900422 SHA256 ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4 SHA512 74c5444124f138862a92a1884b8afe8f968c9a2bbe5a8bbaa9413b0fa4f29fb1ab2eab3c59a68e6c6ddd518866f504e34f43c81406a77c1b2033fbff79df7373 WHIRLPOOL 64a8e20b9718368da7a409cd93ad1906975a09594490982d915146ab721c9b969d714a86318c65e6a328716fbe151d3d2effb012e86a3207fd7717fdbd88ee2c
 EBUILD asciidoc-8.2.6.ebuild 1635 SHA256 d0b8f0cc2880c4c0a7c5d3062ce7084cebda673734965135186e14911e424b61 SHA512 c48a69f54db2261c8960fb3f78582286c11b72598e061db1941a3e59123bf5eeaf258b481f559de798119ac6980fdf62bf105710a95280b22412649f5f09a222 WHIRLPOOL 514117be018d6212f55d5d4954d43de98d711adb400beb18d8f4644c902dd9bb8b8fcef578d247a8c816403b7b0048a23d59cab93acfdbb3cf1e5ffc87a9991d
 EBUILD asciidoc-8.5.3.ebuild 2002 SHA256 4c62d77f4a1a2b3f7c6d232c78c1ce61f355e15107853c49b5dfb2052d09c2b5 SHA512 1dffc06c22a173796c959f39b662ead8ead27b78cf9bd13dce98d94d9be916241feea0bfc13f975bb07d70d841b77e959800f74a27cddc8d89a2fe13bd7518a0 WHIRLPOOL 392376250b9aebbb2dae8b985b7ceb45120200c1e64f9b484be67ba167c693a726d5386c1fd9b012a27a36448786a1dff3b83c7d7b66155a4d9551974d64d0d2
 EBUILD asciidoc-8.6.3.ebuild 2377 SHA256 5dee0492399fbddef2f19a5bf4c1cc9e904e4739cab272f6b5fc7d00d6d65c49 SHA512 69ae19c50050b097b19a149889214b7dffcabf4a4d4b659f201ae2fcfa664c8704dd25269b10869f02f198cec230aa3966dd60e13fb51b0d51b36eb395f4e7b4 WHIRLPOOL 0c049e318a75c8d2653dfa9fdad83ee8a8125dccd847373e3e0800695a5bdec6aec44a26a52ece745d3e3bb98d1c07c7b349e3c7b676eb40d24984e114a6dcdd
 EBUILD asciidoc-8.6.4.ebuild 2754 SHA256 b5f321b27afb5ac1003a71c3fca8f6735b1c2dd222481b16acffc429fc77130d SHA512 3c8cf585d1775082a259f38102aab64531c38b552d8935234a700d18aa16566929e1d470c6098ec0f54c6e2bbd187b675bddb328a0a5ae75e9a0390ab0e795e5 WHIRLPOOL 9417bce798b70751d160371c1ad05654e3e1fc4a4f74f21ab226c2bb4bc432e4391a74b8789dac351d8bb3e94857fe447c9f65d878d6e215eb50793275d33c44
 EBUILD asciidoc-8.6.5.ebuild 2753 SHA256 780c985d447bf37a28246161c46dfa8701352d9c5da591f1462f53347ac1f37b SHA512 b97dca0da1a611389ae20ce6387eb042beabaed656f1ca2208f10d474f47c07fdbc8c376fc87a95efd07a60fff888a7d6e364fa03c4dbaea109b272c506e0377 WHIRLPOOL 6bbe6ced053e62bf1873b9c81ac35f725449167aee780d660cc387c4c795d982ef35df2b2d3d7e7e31ef7a5f7763be007c3e975fc13228773e51f3ea2d8f8c61
 EBUILD asciidoc-8.6.7.ebuild 2803 SHA256 3c440b7e80a3713742250624411a167b5eb61885fa50b4fdbab6c069d076690e SHA512 3fc56c3745e8ec6fa512bc9121cc6fbd5ca5c32cd025159c5b74abd1bf441aff3ef57838155f54912d87822e308d5beb0fa4d13a406df58504de748e55c2f20d WHIRLPOOL e4dc3e68d364bf1e92852d32593ae0a33f707c519e4791ad8a45fe17a58dd8d53c7d9d69498a536b342bb8e302fba583d3ac8f770ecc3e46c31a2fb5b0664372
-EBUILD asciidoc-9999.ebuild 2802 SHA256 0cbe15e004f7ef2743e5055995a78b6696c51b6cd123df55154ac09dff8cb4df SHA512 318d8eb278581038a8fdc4d48909f4ac72a100bbd07510549f76fab708ff6d8d0a09f315f06463a64325b5985cf0f0ffe1848a36bd4190c8314d07a3fb07ddb2 WHIRLPOOL 4bce46100409c35a15e92b0e1e7ab38cbca06299befd798a4ffe4ac0655689a4081ef319970fba62fb9fd8850c9f8989ad9fccfd6f08a460b3f520278ef2d72c
-MISC ChangeLog 11620 SHA256 1b404761d7825abfe225d9b587a36fdeba9984f35f9d53ffb57be1edc696d2de SHA512 8e488a99de50d9f0c59968c0b8da2902bd537ead794ddeee4185473536fa609080f9d704cad5cb005fa0e31d45d5cdf26104fd739aedaa66ed7f4522980f221f WHIRLPOOL abb61b526eb86b2b3aa5d36359f5f1c5c246629f2644b81df883272f17ba28b3ef9e527c4d2e8ec17dfce8fddc702d74401581a0725798c368303090e52fd074
+EBUILD asciidoc-8.6.8.ebuild 2802 SHA256 2bd950e630534950aab12fbc5c961a2a4f32b127e5fcdb3e59dca4bd59cae17a SHA512 e58795675d5ead64f15a63c875a3cd06173d94cf8f4e1dc7c07502d806c1a93155f5e5b90fe21c871cf80f2accd0c95b950137783e10eba2e16effba5b9c7f75 WHIRLPOOL 4be7ba03489d192ff576a177d32d2981ecdfa151f4378881f6de5d8b0b29ce846ecb961384dbef4a42fd673003f7e315d55b4a844b94ae9c222f3376339a9b14
+EBUILD asciidoc-9999.ebuild 2801 SHA256 c6ab624276dbae525262907c06933cdc25e63bcefc120bb3fc23a2f3acac0ee3 SHA512 b1f106635994fa9190ba61e4c513d7569b3fff7d580fa099805ae3c803ba75182c4b33cff1b907a9d444b06d9ba8d7fc588dbcd2f97c70ea634fa8e320e8f5a5 WHIRLPOOL d0c754ac9fe243d71d266be545f64409e09ebed635799fabbc4ef8d753821bbc6c3af0abf2d9402982627b47200e692c19eb516c5ae6eec746bb4e8e580ed9aa
+MISC ChangeLog 11795 SHA256 65d2f013546776fcbb612cbc8bf7e96528266e4574e2e3d2ef2be9cdb60c4d7e SHA512 1fc1f0d93f5a6074bb439aab3909631c1279bde6404dda3ce6681b2d5227e5f9128d2122afcfaa405c5ec994aea0632a37fed99d5fa6b5b2e80c5f703864f13d WHIRLPOOL cece6c37178ff138ae80c87858c9093bd62fe13980ce869e7fa5d343daa38b03882b548a38988326309c648f0f4cabbc273be6cb19290b292702e98a84899dcb
 MISC metadata.xml 242 SHA256 32153166cf423cfa9e1baa2b469d8da28fae8d661492feaabefc4ca667e94908 SHA512 751bc4b0785e1675e53d90aaf5786f93bf547a6e5ca284f7b880746c620fc0a3394866791642739504b213ac46424ef04d3a6899e7cb9af81d7ba9e7098b4518 WHIRLPOOL be55cac214c841f15373c2e7fd83b54b34b89823d392f59cad9493e2b99b49726018dc4a881b787bc85c52eedbfb06af18a3466377bb683910fa2a464481b94b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlBNWKoACgkQC77qH+pIQ6QUcwD+NPzqRMX+vKyNav/xuAveGD9Q
+iqOBN7mldQ0QG+Kw12wA/3UVK8ddc6Vje/vBBl/GPh2/nJndWagd8dTmTMj7pmQG
+=Qdoc
+-----END PGP SIGNATURE-----
diff --git a/app-text/asciidoc/asciidoc-8.6.8.ebuild b/app-text/asciidoc/asciidoc-8.6.8.ebuild
new file mode 100644
index 000000000000..0b40e40e2d6c
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.8.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.8.ebuild,v 1.1 2012/09/10 03:04:04 floppym 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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test vim-syntax"
+
+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 dev-util/source-highlight ) )
+"
+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 || 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
+
+	[ "$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 4f3a94b2cb30..cd969d81bc54 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8 2012/04/26 18:29:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.9 2012/09/10 03:04:04 floppym Exp $
 
 EAPI="3"
 
@@ -30,7 +30,7 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
 		dev-libs/libxslt
 		graphviz? ( media-gfx/graphviz )
 		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-util/source-highlight dev-python/pygments ) )
+		highlight? ( || ( dev-python/pygments dev-util/source-highlight ) )
 "
 DEPEND="test? ( dev-util/source-highlight
 			media-sound/lilypond