Convert to python-single-r1, bug 458802 by mgorny.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 139 insertions, 32 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index 80c2ff2317c5..cb63319bf111 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.85 2012/12/27 19:09:35 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.86 2013/02/23 00:44:44 floppym Exp $
+
+*asciidoc-8.6.8-r1 (23 Feb 2013)
+
+  23 Feb 2013; Mike Gilbert <floppym@gentoo.org> +asciidoc-8.6.8-r1.ebuild,
+  asciidoc-9999.ebuild:
+  Convert to python-single-r1, bug 458802 by mgorny.
 
   27 Dec 2012; Christoph Junghans <ottxor@gentoo.org> asciidoc-8.2.6.ebuild,
   asciidoc-8.6.5.ebuild, asciidoc-8.6.7.ebuild, asciidoc-8.6.8.ebuild,
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index ec3e03d4c37a..3e3de2bd6e11 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -8,18 +8,15 @@ DIST asciidoc-8.6.8.tar.gz 900422 SHA256 ffb67f59dccaf6f15db72fcd04fdf21a2f9b703
 EBUILD asciidoc-8.2.6.ebuild 1656 SHA256 59ce75c749e8e3cf0587a51dc2ea7ebfd0524f67d815c149e6fabadcc1ee1fbc SHA512 af7334f7b03f0408d3e695d8481d5072fa1e898dbcbc05a2558baaeb8b1e6c905c0ef583c8c5b0fa32c3a7c4af2bd80105874554de3f19ff821d9345bba0ee42 WHIRLPOOL acb686100281f3a192bfd545184bdd559e67d21b1f5dc71d7634e4d132222c8830081e373260b6b620a5bed7e2016db3227cc6f4a7ef6d64b2dd644fff48943f
 EBUILD asciidoc-8.6.5.ebuild 2735 SHA256 56b5d3783f27f2a73aaf11ca0af5a316f92def25d9a7b6ac6e59ba75f27e36e2 SHA512 c363856330f95f524bf0a5e6ccfd020a9eb9b1555c6e0a4214cb8764069cc08355974b2b60aabb12b610cc1f9a5833405c878d853cd0cb9ea4b5c57411ed5cdf WHIRLPOOL d40d9fd0d8a2158d4286c016f2e1655e680bcd27252c9596328dfcec4e5fc584414db0c83a8e0a8533c43ffeb485e4e5e474ced3f870b860c7851d6664123dd7
 EBUILD asciidoc-8.6.7.ebuild 2784 SHA256 892dd5fe323270d849200e96f182a530051c92268e8e7c4638fb5128c6b28d0f SHA512 b065c6a777695040b9b6cd6add9e63f0be9b3b959d9c028071249cb98d25bdc877e9a05fa1211cb33f42093f6f3688dd5f25f312acf6f71d739b87e10a797c86 WHIRLPOOL a46e2878badd323d0a2c9bb720a72e6e04c23ca396139036f5a2935d5a74d8bd0e3b3ce7115900ae417d2a753af34ece5d0ee005c843288ee02a679a346194b5
+EBUILD asciidoc-8.6.8-r1.ebuild 2772 SHA256 852e48c162c17763e767cdd8445a78ba24d62380fc92ce9e4f2f4ac68be1ea2a SHA512 65a05f762a2d228d956123411fbf403e319a0ff3050fb18579dc9ea012d03c8fcd2adbab9b43bfd55f49f72de329d9f60421f9f0ab4961817c3169c98a45e662 WHIRLPOOL ece30b226f627e14e20006fb5f5f6770c121ff767278d5e2a87630712d54cf0e07a57b34bc16439b4eabc9ca27d6980a28b16fdde38fd5e9388db6f2f8109232
 EBUILD asciidoc-8.6.8.ebuild 2784 SHA256 e6a28ef3528879e27fba66be92c82cefcd64c58576cea3121be086aeaf5bd940 SHA512 ad9934ba0c57f7907e4c58c40e314caf18b521681a6b2b89b27629c0682f516fac34ca4755d5631e351f9bd9cfb4297d7bb577c8eb58c8b942c2f6b9ee128756 WHIRLPOOL 4f2fb3e5214c738dc0c61721698d997bfb13d13c2762fb26c77e1163240f77cb9ffda85d903e733822135bc2ab63363808e0ff6bcd8ebb49337c342c1b67542e
-EBUILD asciidoc-9999.ebuild 2784 SHA256 198a5c461e9aecc0301af04c3ebc1af8a4468657b18efc2a15338e1d863a5c5a SHA512 dbcef0bec1afc3b67bc8ae6208953bd812b9dc52b259b3fc5f73ac026e1ead852fbfd353c40f1144a1e6c6d1263a97e81d6186a3da793d0c3884fdbdd77f068b WHIRLPOOL 2b6a8da38bce05919be7770c7519a6ffd4550e0452c1bde9c63bc4bd06396a140a8ca1d217366032bc431c6e7394cda8374f48098a17eb495a749bb8b2ee6d78
-MISC ChangeLog 12291 SHA256 02efc0b4a2509aaeff97df665ef89a7382f311a4a77f97f12b28c0545013de04 SHA512 c8b3db757541e36156fcf1e580a5d7abb4a661f05d6142cfb3473dc641b7929fa675b219baae8341a71080e3a06a270e04d489a623effee09781b7c15ec7c43e WHIRLPOOL 898e5894f2d8e67c66d75ed7549a134953feda6fe4993820b6f2f1cac2909cb28a0c04388ac425a33439676b0e359578f59e4695c9dfc954169712978147de61
+EBUILD asciidoc-9999.ebuild 2769 SHA256 2472a07638fddfaf4176b5a0f8d03f03d009b1b9f22660012ab26b7d010d4c8c SHA512 f3ebfd0e10b774b648ae2929dbc565bc32dace834bb1940ea50b4ac783e5ea319f8ba40f7a6c3bc6d15cbdc41bbf2924898f11a183ac25c80996adb181dcd5ad WHIRLPOOL ec7963d5cd200da7385fb97eb6e47fb1abadf468514d23f59ef629a43edb273f07989eaa78469a5ccd0a95c22eb7effe58bae71bdd6915e4e57cc0a1e015b1fd
+MISC ChangeLog 12480 SHA256 f9fe67c0408b00cc5833b59512290edc31811431dffe388daad1e0380011e01c SHA512 01ffc7c318ad9168da174f983b224f9c97ae5693206f1899ff461cf99612d7015f082235dacd50cc8559d81254de808a79209e6f034b2f62cb3f42c33c7cf87e WHIRLPOOL 87ad3568cef603d9da79f2af89a1da7e85503b9acd5b6986a211574dd350cf4798d33f93e674cdf3d73e6513a0d39e50238a46a4d7506c6397fa2f25d5bf4ebd
 MISC metadata.xml 242 SHA256 32153166cf423cfa9e1baa2b469d8da28fae8d661492feaabefc4ca667e94908 SHA512 751bc4b0785e1675e53d90aaf5786f93bf547a6e5ca284f7b880746c620fc0a3394866791642739504b213ac46424ef04d3a6899e7cb9af81d7ba9e7098b4518 WHIRLPOOL be55cac214c841f15373c2e7fd83b54b34b89823d392f59cad9493e2b99b49726018dc4a881b787bc85c52eedbfb06af18a3466377bb683910fa2a464481b94b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3JzxAAoJEOeBhlrCAAWG8H8H/39b+ZNUNN28xB+bnJp/y0jV
-ga2xOXRzjp2+HZ9LA5TEo3h731x5drJ9680+hmhEUgTSxpODAe0C8FdCn/NFKqQx
-a4xG7dXFiWXOkmeFDiay9xE39alaoXvpr0QgHduMC/W0MKb+d2kPUPfIquh7EgOA
-5zcGflsBVPClnlRJ6tdbqQ5dPV+J0P2AfkkF23ub8jCWtbt3x5/4L53Ee2iVgRf+
-kQrPlCyqvwV3iRxUwWXoVzN13tyQVHf10wEh7t8q2KtqYexHWI2eWczc1ykqp/3T
-pr+B5BNvCdyMaB9EMdU0scSIQu9GlXPJmQsj9jOOMe4fFtrC9gQQfJynY+uxfyM=
-=bWs3
+iF4EAREIAAYFAlEoEP4ACgkQC77qH+pIQ6T26wEAhhPGG90fFVITzlN77/xnFUaN
+mLutUpiy8qhPVfyfM8ABAMjRDWXOdgDPu/0MMoaCFGWWjbs3xjs7b5jLpDw0TB68
+=Y7bb
 -----END PGP SIGNATURE-----
diff --git a/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
new file mode 100644
index 000000000000..dd6cc8728991
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/02/23 00:44:44 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+[ "$PV" == "9999" ] && inherit mercurial autotools
+inherit python-single-r1
+
+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=""
+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[${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} )
+"
+
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		dev-util/aap
+		www-client/lynx
+		dev-util/source-highlight"
+fi
+
+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 || die
+		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
+	fi
+}
+
+src_install() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	emake DESTDIR="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	if use examples; then
+		# This is a symlink to a directory
+		rm examples/website/images || die
+
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
+	fi
+
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+}
+
+src_test() {
+	cd tests || die
+	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" test${PN}.py run || die
+}
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index 9bb8b13e3e5d..0d5c45f70c70 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.10 2012/12/27 19:09:35 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.11 2013/02/23 00:44:44 floppym Exp $
 
-EAPI="3"
+EAPI=5
 
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
 
 [ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python
+inherit python-single-r1
 
 DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
 HOMEPAGE="http://www.methods.co.nz/asciidoc/"
@@ -29,14 +28,16 @@ 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 ) )
+		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 )
+			media-gfx/graphviz
+			${PYTHON_DEPS} )
 "
 
 if [ "$PV" == "9999" ]; then
@@ -46,10 +47,6 @@ if [ "$PV" == "9999" ]; then
 		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
@@ -75,32 +72,34 @@ src_compile() {
 	default
 
 	if [ "$PV" == "9999" ]; then
-		( cd doc && aap -f main.aap ../{CHANGELOG,README,BUGS} )
+		cd doc || die
+		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
 	fi
 }
 
 src_install() {
 	use vim-syntax && dodir /usr/share/vim/vimfiles
 
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 
-	python_convert_shebangs -r 2 "${D}"
+	python_fix_shebang "${ED}"/usr/bin/*.py
 
 	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
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
 	fi
 
 	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt || die
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 }
 
 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
+	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" test${PN}.py run || die
 }