From e7acd95904e0de0214e2322327078a7982e5fbc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 6 May 2017 11:12:20 +0200
Subject: [PATCH] dev-python/pyramid: Fix deps, enable tests

Correct the package dependencies, and enable tests. The former includes:

1. putting dev-python/setuptools in RDEPEND since the package uses
   entry_points (pkg_resources),

2. adding dev-python/zope-deprecation to RDEPEND since the package
   states that as a runtime dependency,

3. removing nose & coverage from test dependencies since they are not
   used for testing upstream (it is extra dep for post-install testing
   but setup.py and the tests use plain unittest),

4. adding missing py2-conditional dependency on dev-python/zope-component
   for tests.

Appropriately switch python_test() to use 'setup.py test'.
---
 ...d-1.5.7.ebuild => pyramid-1.5.7-r1.ebuild} | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)
 rename dev-python/pyramid/{pyramid-1.5.7.ebuild => pyramid-1.5.7-r1.ebuild} (57%)

diff --git a/dev-python/pyramid/pyramid-1.5.7.ebuild b/dev-python/pyramid/pyramid-1.5.7-r1.ebuild
similarity index 57%
rename from dev-python/pyramid/pyramid-1.5.7.ebuild
rename to dev-python/pyramid/pyramid-1.5.7-r1.ebuild
index 15cb002605503..99de90acd49b3 100644
--- a/dev-python/pyramid/pyramid-1.5.7.ebuild
+++ b/dev-python/pyramid/pyramid-1.5.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,6 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 
 inherit distutils-r1
 
-RESTRICT="test" # Can't package dependencies
-
 DESCRIPTION="A small open source Python web framework"
 HOMEPAGE="http://www.pylonsproject.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -15,31 +13,26 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="repoze"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-#IUSE="test"
-# tests would pull in dev-python/zope-deprecation with its deps - not a good idea
+IUSE="test"
 
-RDEPEND="
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/chameleon[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/webob[${PYTHON_USEDEP}]
 	dev-python/repoze-lru[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/zope-deprecation[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	dev-python/translationstring[${PYTHON_USEDEP}]
 	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/venusian[${PYTHON_USEDEP}]
-	"
+	dev-python/venusian[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-	#test? ( dev-python/webtest[${PYTHON_USEDEP}]
-	#	dev-python/nose[${PYTHON_USEDEP}]
-	#	dev-python/coverage[${PYTHON_USEDEP}]
-	#	dev-python/virtualenv[${PYTHON_USEDEP}]
-	#	)
-	#"
+	test? ( dev-python/webtest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep \
+			'dev-python/zope-component[${PYTHON_USEDEP}]' \
+			'python2*' pypy)
+	)"
 
 python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
+	esetup.py test
 }