revbump; add IUSE doc, docs build, install

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

4 files changed, 69 insertions, 48 deletions

diff --git a/dev-python/flask/ChangeLog b/dev-python/flask/ChangeLog
index d45a1e7d0766..cfa6d5d6b926 100644
--- a/dev-python/flask/ChangeLog
+++ b/dev-python/flask/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/flask
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/ChangeLog,v 1.37 2014/10/26 03:54:09 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/ChangeLog,v 1.38 2014/10/26 04:38:06 idella4 Exp $
+
+*flask-0.10.1-r2 (26 Oct 2014)
+
+  26 Oct 2014; Ian Delaney <idella4@gentoo.org> +flask-0.10.1-r2.ebuild,
+  -flask-0.10.1.ebuild, flask-0.10.1-r1.ebuild:
+  revbump; add IUSE doc, docs build, install
 
   10 Oct 2014; Ian Delaney <idella4@gentoo.org> flask-0.10.1-r1.ebuild,
   flask-9999.ebuild:
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index b9922011e474..096ecef0164c 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -6,14 +6,14 @@ AUX flask-0.10.1-sort_json.patch 1563 SHA256 50449f406b0164a5f2d1934e0f7f24aa489
 AUX flask-0.10.1-test_appcontext.patch 550 SHA256 866872ac74d58dc024dfbffbb6d16cddb18a09f1db69d6700d2b6ab26e4d7e27 SHA512 5510d536ee432429ba2f0da8248653192e9e5ed9ad107b05dd3cc640d63039327f1f495148da5b7de403cd124d04760fb94d185b6b774ce39a8ebb171bca4d61 WHIRLPOOL c9af7a75be4e6dc3b62b55248443686a2918826755be73ed9a11db7856254e163a6deacb00fa11dba4dc58398685a2ec11750a7dc1b78c2cbc6f85d18349354c
 DIST Flask-0.10.1.tar.gz 544247 SHA256 4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373 SHA512 0008d62d03a46b071c7d0510513d011a9bfd2b77df7f677371a446ca9805d16b1ee5e17dd8dd7cde6443a629370234e44735e20381de20a7da385969797f053f WHIRLPOOL f30a306ed00fe6d4c8e47b781c556c576b99b3545f833ae06f6b778d91c3127dc0adcc34d48221a0f1db1bb1633f2329d6085b7a4550afc672530525fdff474f
 EBUILD flask-0.10.1-r1.ebuild 1254 SHA256 5768fd3dcfd394efedb365a33d79188c143511ea4f70e2e1397810eb5f081959 SHA512 38e62f55f39837c00ba8e4094d7ccb82e630739e80f11d516f885b0cbdeb783786bac0f084fb2a567ec89c87f0abea0e04405182b44158f4461a5e9f6ed89db9 WHIRLPOOL 28dc63e09572cd6dbbd1f1d328fc7d1c0ab2f5d5d611786cf70b1d8f8d62d5550df8db477849113d4288402ccbd256ffdd1ccd6efcd3a71d5ddde53ebf7482b4
-EBUILD flask-0.10.1.ebuild 1111 SHA256 dd7a6a7baca42d24d355a0512a8e9372070448e9135c1f9b162acd73b0bcabdd SHA512 73a2a8a5c51f950482e15000f0c6c966e21a229edb3dddb85d985b65dd2dce45f4d92cfc2c18345f56a1c028373c26c7690b90980f336fcb145c2fc0566d9db6 WHIRLPOOL fb08d36ebf5bd239959c414015180f96bd104645a9ea31866e44e74355ddf8110964a80f962ef7a7cf806e04bb69c3b3895ab2c1b3d2e77ddd78a2b91fa2c27a
+EBUILD flask-0.10.1-r2.ebuild 1564 SHA256 9840ed900acee3f09b4ccc1793bcbc2983dfc5ef7a62ad73b87a6d37310f4fa6 SHA512 671ddd9c18313d2dd436834ad6310ffada442a8d469507990b286291273baafae22f9808dae8f570d5b31b62f6bdf5f26a9b93cd653a5a5721a961d186fa7af2 WHIRLPOOL 49d9334021e7419f36c57361e1a3652221e761833a739ba06322c9cd8572d5770e2fbc42e4bcf7b64b0d2aad6700fd40531c6a85d0ad3163cc728ae1b48b1d88
 EBUILD flask-9999.ebuild 1218 SHA256 e29ace11ca76abc21357cb5ae2a7263bde51511ea12c02e9ea6c0063264c51bf SHA512 4476c8aa88a68c477136ed8acc9443b1eb6af7a353d7714535206ff4384851f0d29ab596e548617ecd4951856428a5f7947d305e7574cb53eca9ed6b24095778 WHIRLPOOL 093ed792fc2dce9750acb571544a0377a21bf923eb6e283916eda03ff67cd69ab6ba0774dc63b6c881843676980fb45a70a390bb44e5960fddc3cc62adea7675
-MISC ChangeLog 5255 SHA256 48e90f22661963e3f3f4b53357bd2c802b5b29ba22695df1f74e9ee1be91b2c9 SHA512 16a5797cd582277b1fc4f5f288e8875aac544ad10f21eaa7ab4f4889a8c003f1753178eaf0cf4be27b230c9dfa6e84c529b979e2236afb7957bba088de1adb40 WHIRLPOOL 7a7dd5b29462ef8ae15d16f16fbd75ebe1b5c1883fe7bb73741b888795450a694f86a57417e8c15de2d495273d6aaf8e4e50e4d65b4c487d534115fe552bcec9
+MISC ChangeLog 5454 SHA256 a97159481c277555915fdd6b0cb9728cbc0942b979622d5364d9962ca69bb4a6 SHA512 fe543f84d061d1c9d8f421f4456a86d54a235dc716bab03468d3450d45b13b2259799bf37eaa2da10e72fa9e2e9b62c7e65ad6cadd274bec637e325878543969 WHIRLPOOL c231d396a44769c71a7ff61041e91c9eb57b84e9f4fcafef2a281087493bdac4ca894db75e10e40b279c4638f56b17af4834fc2ada5c3c8ff3c8bfe5cc0b0c7c
 MISC metadata.xml 228 SHA256 fb512dea8a54907a0d04e012d7a0b47a7f884600d1e1fcbd5094a17dde3f3cfe SHA512 147993a63e6528ff1250a76caf4b923d2307ee987eb38bb5cc9d61465c4d6156e65aa37e12377f56d70d8214a8a919fcb4cf9d461804c29d8b231072a179bc49 WHIRLPOOL eac02505f094986ae26315962fa10eee56249e432f5de219de3fd06d601eb0cadf8bb0b55fdd8055340f39a168791dcd8d3817074fa309adfb75e2841f6eaeda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRMcG8ACgkQso7CE7gHKw3C0ACg0gOAPzXTPwU7GUj/LszOZDGB
-b04AoKBWASow7e0N0V1iCz8tUlpU4fO/
-=4ad7
+iEYEAREIAAYFAlRMer4ACgkQso7CE7gHKw1KdQCgnYj5o/tKUiNVH03pi3QNUKfw
+CuUAoIO9gcyOel2uEieE+G83nEKM8pxk
+=43yV
 -----END PGP SIGNATURE-----
diff --git a/dev-python/flask/flask-0.10.1-r2.ebuild b/dev-python/flask/flask-0.10.1-r2.ebuild
new file mode 100644
index 000000000000..a1a9c7602ac9
--- /dev/null
+++ b/dev-python/flask/flask-0.10.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.10.1-r2.ebuild,v 1.1 2014/10/26 04:38:06 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/mitsuhiko/flask/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+# Usual; test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-is_package.patch
+		"${FILESDIR}"/${P}-sort_json.patch
+		"${FILESDIR}"/${P}-test_appcontext.patch )
+
+python_prepare_all() {
+	 # Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" run-tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-0.10.1.ebuild b/dev-python/flask/flask-0.10.1.ebuild
deleted file mode 100644
index 7c6837619ec1..000000000000
--- a/dev-python/flask/flask-0.10.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.10.1.ebuild,v 1.3 2014/08/11 22:26:08 blueness Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://pypi.python.org/pypi/Flask"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="examples test"
-
-RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-python_test() {
-	"${PYTHON}" run-tests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}