bump; correct and update deps, rm IUSE doc and build / install since doc build fails in both prior and bumped versions

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

5 files changed, 67 insertions, 86 deletions

diff --git a/dev-python/routes/ChangeLog b/dev-python/routes/ChangeLog
index 72a2cae404af..14896e43fd43 100644
--- a/dev-python/routes/ChangeLog
+++ b/dev-python/routes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/routes
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/ChangeLog,v 1.25 2015/03/08 23:58:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/ChangeLog,v 1.26 2015/03/26 04:12:08 idella4 Exp $
+
+*routes-2.1 (26 Mar 2015)
+
+  26 Mar 2015; Ian Delaney <idella4@gentoo.org> +routes-2.1.ebuild,
+  -routes-1.12.3-r1.ebuild, -routes-1.13-r1.ebuild:
+  bump; correct and update deps, rm IUSE doc and build / install since doc build
+  fails in both prior and bumped versions
 
   08 Mar 2015; Pacho Ramos <pacho@gentoo.org> routes-2.0.ebuild:
   x86 stable, bug 540290
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index f47a39edf021..db4d3cfdff10 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -3,18 +3,16 @@ Hash: SHA256
 
 AUX routes-2.0-setup.py.patch 1068 SHA256 67494c1b57466627d460d3c348ce6219eb0706542e7ef6dbdecc3b8f7db28aab SHA512 7c5f44715e332689b2f41b02e7398ec513d0e9436b3f6cf5ab17a673ac9993cec0ff5bdcaad6869a2eb66f0ba32f4b0c29936a052701cef1bf18b8be4f354a10 WHIRLPOOL c0693412d64670ba81cefbd66f373e2dc79150208f553795f0550330902485cb83724c5d2f584d806682a5dc81779058113786762e4da5be2a022d35b6266e08
 AUX routes-2.0-tests-py3.patch 2261 SHA256 9077ebe17ca7f405b806356ccea9ca2a3e83f252ec7c347563375759ee604a7c SHA512 23f49438792daf8302e77a2b2a228c06ff4ecc982580b844dbfde59492b5a1c558155fa06467158f9ac9ae357db11d8f08c154db065c1a9cb6e1443042e3f05f WHIRLPOOL 8427e7e31b308f1eb2989cf6e8b5f49b5c73628ff072c37d54310537f51d4c4a1a970a14bf68b446b72be5bbbad7a6f2c74a81afbfe84bab379bcfb375721f20
-DIST Routes-1.12.3.tar.gz 799601 SHA256 eacc0dfb7c883374e698cebaa01a740d8c78d364b6e7f3df0312de042f77aa36 SHA512 682fa544b1e5ac2983b8b1e80c9806ab87bd82be49dc7521ac9368e6646405348f772b42bf753727c18225b4205147c034e564d99527856469727cdd198b81d0 WHIRLPOOL b035e20627ccc94d6ae8190ba528e5e60a074b6471fdba1c797af6f04c68f28a415b662443fa6c26221f5811a1c33a14d85eb3cc40665fd18cc81f64deab1648
-DIST Routes-1.13.tar.gz 797539 SHA256 cc03d1a357cdb7af82e3909ee8ff93cb2b2afb48aca23bfde0117d6f49f624a7 SHA512 052b04e0ee803394ffe1675a075fb633e790fdcabf1ee012a73d0c4ef211b4d0b18be13f680537fe5f8424193245d0b4bb2d76a20b9e74707e73b25e076a9f6a WHIRLPOOL 7b83a24719ca2e051f9ba44ca712c10c2eca1590e1fc39afb731777de9c9bd73af4ef99868bf1e3dfa688ff38b9068f30311fe146973d9b55e1c61c501a08ebb
 DIST Routes-2.0.tar.gz 199195 SHA256 6e4eb6437a9def22e1344ee8f766d7795bedfe6f615d3ea138e4035d6fbd33f8 SHA512 a049efc8774ded555f597d165cc536891cf7c008a753cb0d3c44ebb5c763e117b5050c0ef68489e05f7d9bd6009250465cc56ce6954010a84ec9b3416f728e91 WHIRLPOOL b9e5e88071c32c51427cfb16ad16cdea4cdace35579b053ea4fd2e81b27858c163244fd7976e2bdf93ab79e413ba72e48b2db8fc6991a6199ef7ba56c9620e5a
-EBUILD routes-1.12.3-r1.ebuild 959 SHA256 509ef7f1757c58b6c4c55fd0885765ff29abb4bad67ef5fa6bc472b94ae7616d SHA512 b426307df82dfa5e774243c30d8c71fc0caf1694d0e089251aaecd9eca59f48d4da2aa1b8ded293c7836a314af20d49df8b2461fffcb62d0a6465600d0aae2f6 WHIRLPOOL 9b432b49482ca01a0c3eb513ec4ad6afe119c627a281d7cf206bfe9841f487b5c3794b775dcb9fed229991351fb10f19c41c45eecde8140d64ffe2b2f2975d0b
-EBUILD routes-1.13-r1.ebuild 1221 SHA256 644bd843293216025c8ea35d694e12f32c360ea89594e7250c1b71d3b8c59c2a SHA512 59a0738c6be77aa641b07e60b0e9f535d7634f42c193997fff90e9b841b8eef8bb0c54c9fd8f78ba4747bdba4942d854765737171e69a381aea243fd1faf7895 WHIRLPOOL b21ef20df55db06380c0f544fd2306e85e36db7782f6d3bb0ba2bbbada5d701534e1e72b6c22b55f348be2e04f106ddbbb9562f0caae522ab8315abbf976a56a
+DIST Routes-2.1.tar.gz 179737 SHA256 ebf4126e244cf11414653b5ba5f27ed4abfad38b906a01e5d4c93d3ce5568ea3 SHA512 6dcea3e20d9883e29d6aea5949eef3b265094f46084234a15530c266930163918c6eb2ad00bb49cd9cbf947a0019c2d91a5455f997bc7a7e5b8c662837a728c2 WHIRLPOOL fbdb8e1a84aa2b1b8bf011aa68a31364f0fd48cabcaaf413274679f34e514283fbd8aac9497444b24f69f7d72393f38aeab5eeeb96659e3aae009ed2eebc4fbf
 EBUILD routes-2.0.ebuild 1621 SHA256 91c8cb7d48eeacf3e990d34385fe21b4c8dad4227ab5af06810ee81bad7afbb6 SHA512 1822a0b1049a6bed3b2a2a6b52d362f416d1dce2fc894995d3a7ec3e5ae378b32534eb5266de7a599c4ddfc7134893ce11863217a946698d182882e3ad64c840 WHIRLPOOL d3f9575f07072ba8ffdb6a6de59de521b2966f48882b63230b864c3f2abe55ecef657a90b4b4149d4e55f0ddc0b648f30a316d6c1c1ea577898774b2569941a7
-MISC ChangeLog 3785 SHA256 4a3ef6d8a72888388141365861691bf08cf9177eabfab8dc5150c756dc80daa4 SHA512 b8300a3d53a611e0343c620579c154b2ef341e6cca65434515c544b53900be5af66a756897d896192b5804d7ceee66e7cc15f36e30670c12d1643750b8c80dfd WHIRLPOOL 514a7ef7f7cf94f909f7afc393088aedc878cd0dc9f2e70707410c92b9ec8ccf6ee0ba9eb83cb5cf2bb7994e184514f3741b319eb376b5b166c86f627c176c3f
+EBUILD routes-2.1.ebuild 1615 SHA256 80d73fa09dbce08bab6aa421e6722cb951b49351fa4f688b89d24a30a7ae1a41 SHA512 3b485c8b269999a3dd09c289742687f1926c9fc7f3c82296e1902c723d2101660b7bd120c535369b549785ae1a860d1070240c5c190493e88bc04c1c27fc7fa0 WHIRLPOOL fdb56569df4ea224141ba5507e2e53d8ce6f58c4c1af87be9f59643862fe4d3dcc060e7ae34a7a3814ca6f26575f61cc47b437878b753a0a661b6fbf3b29d1ba
+MISC ChangeLog 4058 SHA256 9602c4440b67431065a36aa110f3b48b62a3e836355146a065f0a80c190bc70b SHA512 0e54bb34b0034700e5d69867524eabd526c8889fe005497a4602a315becce6b1f8944bdade5577cd7e79554ef200954b8c4cde56421e98fe429af5e2f649024e WHIRLPOOL 0f0a9e48893e14c13a98172b17874a8c64d58fe2a3748c649cd76cf7497d8b14a13c338cde6b33890946d2c41af4582db567de9ebaf045ece67071d558e81292
 MISC metadata.xml 229 SHA256 dfa0cf150e448f373a15e09b7134990e29a65e6b35c53ae8773dedc89825371e SHA512 421ce7c4735ff92b9784a9b79fad6f71cf8d9bc46ae064f3b32fd85fff896781fc12fdc9a1562e28966e6e215d05ac470825748ba6905df4bd684462de9a90e6 WHIRLPOOL e284e64d0d34aac2b76e895fa25fdc20a066c58c2d59b2bd2f2062ec783622b1eca6c6ddb24ddcae157e90fcd4c7b8735be8166d03bfe49d468625eedc1915a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT84hsACgkQCaWpQKGI+9TXIQCfS3cXonmnDsByLUuVds1jFmRL
-kqsAniM0CvGJktxOFm4bRFpE/li7ubUK
-=pmi3
+iEYEAREIAAYFAlUThy0ACgkQso7CE7gHKw1U6QCcDBWVJTA+A2ifO3aU427JpP4C
+gfkAniRfJcmnAxlhB7mzL89iWgQcEw0k
+=O/aQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/routes/routes-1.12.3-r1.ebuild b/dev-python/routes/routes-1.12.3-r1.ebuild
deleted file mode 100644
index 377cb75e5962..000000000000
--- a/dev-python/routes/routes-1.12.3-r1.ebuild
+++ /dev/null
@@ -1,35 +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/routes/routes-1.12.3-r1.ebuild,v 1.3 2014/08/10 21:21:16 slyfox Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="Routes"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python re-implementation of the Rails routes system for mapping URL's to Controllers/Actions"
-HOMEPAGE="http://routes.groovie.org http://pypi.python.org/pypi/Routes"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-
-	if use doc; then
-		cd docs/_build/html
-		docinto html
-		cp -R [a-z]* _images _static "${ED}usr/share/doc/${PF}/html" || die "Installation of documentation failed"
-	fi
-}
diff --git a/dev-python/routes/routes-1.13-r1.ebuild b/dev-python/routes/routes-1.13-r1.ebuild
deleted file mode 100644
index b291a474b6a2..000000000000
--- a/dev-python/routes/routes-1.13-r1.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/routes/routes-1.13-r1.ebuild,v 1.4 2014/03/31 21:15:13 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_PN="Routes"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python re-implementation of the Rails routes system for mapping URL's to Controllers/Actions"
-HOMEPAGE="http://routes.groovie.org http://pypi.python.org/pypi/Routes"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-# Note: although setup.py states that tests require webtest,
-# it isn't used anywhere.
-RDEPEND="dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/repoze-lru[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/routes/routes-2.1.ebuild b/dev-python/routes/routes-2.1.ebuild
new file mode 100644
index 000000000000..3c488f593df2
--- /dev/null
+++ b/dev-python/routes/routes-2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/routes-2.1.ebuild,v 1.1 2015/03/26 04:12:08 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+MY_PN="Routes"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python re-implementation of Rails routes system, mapping URL's to Controllers/Actions"
+HOMEPAGE="http://routes.groovie.org http://pypi.python.org/pypi/Routes"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+# It appears there's an epidemic of missing testsuites coming out of github. Restrict for now
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+# Comment out patch for tests for now
+#PATCHES=( "${FILESDIR}"/${PN}-2.0-setup.py.patch )
+
+# The doc build possibly never built.  Just know that the doc builds in
+# neither the previous nor this
+# https://github.com/bbangert/routes/issues/42
+python_prepare_all() {
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp -r tests "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}