diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-02-22 15:27:00 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-02-22 15:27:00 +0000 |
| commit | f0a0a56fb2a0c26d89ac93fd1ca950abbc6ff93e (patch) | |
| tree | 24e38549d181dda057cc9e7b95cfb26b638f6cf9 /dev-python/pyftpdlib | |
| parent | arch stable, bug 888 (diff) | |
| download | gentoo-2-f0a0a56fb2a0c26d89ac93fd1ca950abbc6ff93e.tar.gz gentoo-2-f0a0a56fb2a0c26d89ac93fd1ca950abbc6ff93e.tar.bz2 gentoo-2-f0a0a56fb2a0c26d89ac93fd1ca950abbc6ff93e.zip | |
Call distutils-r1_python_install all, and cleanup python_test a bit. Bug 502116.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/pyftpdlib')
| -rw-r--r-- | dev-python/pyftpdlib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/dev-python/pyftpdlib/ChangeLog b/dev-python/pyftpdlib/ChangeLog index 4c6984d2c849..85fa679c0cd1 100644 --- a/dev-python/pyftpdlib/ChangeLog +++ b/dev-python/pyftpdlib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pyftpdlib # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.34 2014/01/26 12:23:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.35 2014/02/22 15:27:00 floppym Exp $ + + 22 Feb 2014; Mike Gilbert <floppym@gentoo.org> pyftpdlib-1.0.1-r1.ebuild: + Call distutils-r1_python_install all, and cleanup python_test a bit. Bug + 502116. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> pyftpdlib-1.0.1-r1.ebuild: Stable for sparc, wrt bug #498014 diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild index 175d881d74e9..9479ca4d604c 100644 --- a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild +++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.10 2014/01/26 12:23:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.11 2014/02/22 15:27:00 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} pypy2_0 ) @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" IUSE="examples ssl" -DEPEND="ssl? ( dev-python/pyopenssl )" +DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )" RDEPEND="${DEPEND}" DOCS="CREDITS HISTORY" @@ -26,15 +26,14 @@ DOCS="CREDITS HISTORY" #PATCHES=( "${FILESDIR}"/${PN}-1-pypy-test.patch ) python_test() { - # While BUILD_DIR has no build dir - pushd "${BUILD_DIR/build}"/lib > /dev/null - for test in test/{test_ftpd.py,test_contrib.py} - do - "${PYTHON}" "${S}"/test/test_contrib.py || die - done > /dev/null + cd "${BUILD_DIR}" || die + for test in "${S}"/test/test_*.py; do + "${PYTHON}" "${test}" || die "Testing failed with ${EPYTHON}" + done } python_install_all() { + distutils-r1_python_install_all if use examples; then insinto /usr/share/doc/${PF} doins -r demo test |