dev-python/setproctitle: Use eclass functions to obtain build variables

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/dev-python/setproctitle/setproctitle-1.1.8.ebuild b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
index 0b853ee7ada6f3c335a56d85b8263ecd25327b27..b028123889ddf367c703e15c978cf8ee50337381 100644 (file)
--- a/dev-python/setproctitle/setproctitle-1.1.8.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+# pypy doesn't get started in test run. Still required by www-servers/gunicorn
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1 toolchain-funcs
@@ -18,8 +19,6 @@ KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-
 IUSE="test"
 
 RDEPEND=""
-# on <py2.7 the test suite uses SkipTest from nose,
-# so we need to run it using nose.
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 DOCS=( HISTORY.rst README.rst )
@@ -42,10 +41,18 @@ python_test() {
 
        cd "${BUILD_DIR}" || die
 
+       if [[ ${EPYTHON} =~ pypy ]]; then
+               # The suite via the Makefile appears to not cater to pypy
+               return
+       else
+               CPPFLAGS="${CPPFLAGS} $(python_get_CFLAGS)"
+               LDLIBS="$(python_get_LIBS)"
+       fi
+
        # prepare embedded executable
        emake tests/pyrun CC="$(tc-getCC)" \
-               CPPFLAGS="${CPPFLAGS} $(python-config --cflags)" \
-               LDLIBS="${LDLIBS} $(python-config --libs)"
+               CPPFLAGS="${CPPFLAGS}" \
+               LDLIBS="${LDLIBS}"
 
-       nosetests || die "Tests fail with ${EPYTHON}"
+       nosetests --verbose || die "Tests fail with ${EPYTHON}"
 }

diff --git a/dev-python/setproctitle/setproctitle-1.1.9.ebuild b/dev-python/setproctitle/setproctitle-1.1.9.ebuild
index c86c655d223d6fc947522878e2c49d486290ca9e..e09507e56968c66f4d9ec94c0df221ce4845f68b 100644 (file)
--- a/dev-python/setproctitle/setproctitle-1.1.9.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.9.ebuild
@@ -15,12 +15,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos \
-       ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
-
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 # Required for re-write of test suite
@@ -34,8 +32,13 @@ python_compile_all() {
 }
 
 python_test() {
-       # The suite via the Makefile appears to not cater to pypy
-       if [[ "${EPYTHON}" != pypy ]]; then
-               emake check
-       fi
+               # The suite via the Makefile appears to not cater to pypy
+       [[ ${EPYTHON} =~ pypy ]] && return
+
+       # prepare embedded executable
+       emake \
+               CC="$(tc-getCC)" \
+               PYINC="$(python_get_CFLAGS)" \
+               PYLIB="$(python_get_LIBS)" \
+               check
 }