Fix src_test for Prefix, thanks Dan Wallis in bug #316739

Package-Manager: portage-2.2.00.15842-prefix/cvs/SunOS i386

diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index 17edd0948fa22e01a1e4eb5e24f871bf5d760c46..2c7024138ef5442c9a14e13a0203905740b3f28b 100644 (file)
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/twisted
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.127 2010/03/17 10:39:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.128 2010/04/23 08:48:42 grobian Exp $
+
+  23 Apr 2010; Fabian Groffen <grobian@gentoo.org> twisted-10.0.0.ebuild:
+  Fix src_test for Prefix, thanks Dan Wallis in bug #316739
 
 *twisted-10.0.0 (17 Mar 2010)
 

diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index da1370dbdba2b393663e62301e33863696211f8e..f45c4f91a97f86ccdf9bd760b62999e5452ae763 100644 (file)
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -7,8 +7,8 @@ AUX twisted-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 419 RMD1
 DIST TwistedCore-10.0.0.tar.bz2 1278918 RMD160 8d0e3e12fa6f8a10c674c503cfa29eb39a6be25b SHA1 c6fe0f57819d40c1b635b18e87bb93846b5cbb31 SHA256 e0bd3d1d2fd582392ca05363f9d4ec5bee21f4cb375df40c61ddfd21755d2786
 DIST TwistedCore-8.2.0.tar.bz2 1205654 RMD160 7162be0d4f131e2e8379ba4330b0ff8978a6530c SHA1 0c4f24c661316a650ed1493d2c6a9ace6c10fd27 SHA256 481e8ea4b05b482aa1396ca3ad09fac6086acddfd57eed7bb63e1385717adde4
 DIST TwistedCore-9.0.0.tar.bz2 1270053 RMD160 c71864bf174d4eaabfa1df2b579d6598ae8fe1a7 SHA1 6966ce9f481fccc6a8abfeec144314ba70e29b1c SHA256 6e71eeecf5c4fa5fd4ae1b2a3f907da69d62897eda02d23135ccf0ea36a2958e
-EBUILD twisted-10.0.0.ebuild 3858 RMD160 8295dfdf2e81f3b71cf53a2ca733247cdea87cac SHA1 bfb5cf907a6277da9b39e26552234d2667b0ee94 SHA256 16058089da2bb26cd327612f791a74a8259d47373622c4a056da84eb25634662
+EBUILD twisted-10.0.0.ebuild 3869 RMD160 24db167466ce216dbb76d0eb57f8d920842a61fe SHA1 2f0520bc5d34bdd04ccf9e5aa820ff9241a92d97 SHA256 007161cd8112dd1c9b6e49ccdbae614a621fdc3014cdd99b8b71331ada3e0ca5
 EBUILD twisted-8.2.0-r2.ebuild 3534 RMD160 58c82cff4e179255cb9dfe69474a07a32fd77fbd SHA1 17d422a1da003d43f5f31bc1850420381d1430a8 SHA256 74df451cccec426eededa1fc731173ad90a2ff331e616dc3d220a8caaba24498
 EBUILD twisted-9.0.0-r1.ebuild 3843 RMD160 9b8b196f0cddee361fed867fd802248e89a656f5 SHA1 ddaeb9b9c7800d758c8b7420c965c6cfc5d5e639 SHA256 e947a7923d906e0fe8a47d3f9d07aa9a64a194032557d5d80fe52df872fe6d52
-MISC ChangeLog 21156 RMD160 ddd27dceee316b8d1fa72810cc3799e572e190dd SHA1 2ddace0c9923127ead2bf1f44e02bfa0ec107f7f SHA256 1aa61a34442ca128626b11adbeab5169a61cdfd48d1bf4d436544d70ea21ef58
+MISC ChangeLog 21291 RMD160 9a43b4b0561f0132b735d184915c216ac755276f SHA1 cf103ac5d3f5fefacdacf7da23f5cb6220380594 SHA256 1f9cf1a2a8d163701a6b24d2efecbcbf32b3cbbdc8079ee34a4f42d22fc782b8
 MISC metadata.xml 516 RMD160 3603e0b110b1486ed5c02ec37ccee6712e2098c8 SHA1 3fe53dc137c9bd5437e8f6fb1d397491f5e9281e SHA256 702ffca7fc318ecb382067e3bccf620bebd7da614430ea82de24445b9f75524c

diff --git a/dev-python/twisted/twisted-10.0.0.ebuild b/dev-python/twisted/twisted-10.0.0.ebuild
index 40f26c4d41913921f312a0fbd5e446a10e3358f1..c60ff83c8be3539513db9445c7c7b52998f28a4c 100644 (file)
--- a/dev-python/twisted/twisted-10.0.0.ebuild
+++ b/dev-python/twisted/twisted-10.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-10.0.0.ebuild,v 1.1 2010/03/17 10:39:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-10.0.0.ebuild,v 1.2 2010/04/23 08:48:42 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit eutils distutils versionator
@@ -46,7 +46,7 @@ src_test() {
                local return_status="0"
                "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${T}/tests" --no-compile || die "Installation of tests failed with Python ${PYTHON_ABI}"
 
-               pushd "${T}/tests$(python_get_sitedir)" > /dev/null || die
+               pushd "${T}/tests${EPREFIX}$(python_get_sitedir)" > /dev/null || die
 
                # Skip broken tests.
                rm -f twisted/python/test/test_release.py
@@ -58,7 +58,7 @@ src_test() {
                # docstrings in all packages
                echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
 
-               if ! PYTHONPATH="." "${T}/tests/usr/bin/trial" twisted; then
+               if ! PYTHONPATH="." "${T}/tests${EPREFIX}/usr/bin/trial" twisted; then
                        if [[ -n "${TWISTED_DEBUG_TESTS}" ]]; then
                                die "Tests failed with Python ${PYTHON_ABI}"
                        else
@@ -102,7 +102,7 @@ src_install() {
 
 update_plugin_cache() {
        # Update dropin.cache only when Twisted is still installed.
-       if [[ -f "${ROOT%/}${EPREFIX}$(python_get_sitedir)/twisted/plugin.py" ]]; then
+       if [[ -f "${EROOT%/}$(python_get_sitedir)/twisted/plugin.py" ]]; then
                einfo "Regenerating plugin cache with Python ${PYTHON_ABI}"
                # http://twistedmatrix.com/documents/current/core/howto/plugin.html
                "$(PYTHON)" -c "from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))"