| 1 |
floppym 14/02/22 15:27:00 |
| 2 |
|
| 3 |
Modified: pyftpdlib-1.0.1-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Call distutils-r1_python_install all, and cleanup python_test a bit. Bug 502116. |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.11 dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild?rev=1.11&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild?rev=1.11&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild?r1=1.10&r2=1.11 |
| 15 |
|
| 16 |
Index: pyftpdlib-1.0.1-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v |
| 19 |
retrieving revision 1.10 |
| 20 |
retrieving revision 1.11 |
| 21 |
diff -u -r1.10 -r1.11 |
| 22 |
--- pyftpdlib-1.0.1-r1.ebuild 26 Jan 2014 12:23:03 -0000 1.10 |
| 23 |
+++ pyftpdlib-1.0.1-r1.ebuild 22 Feb 2014 15:27:00 -0000 1.11 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
PYTHON_COMPAT=( python2_{6,7} pypy2_0 ) |
| 32 |
@@ -18,7 +18,7 @@ |
| 33 |
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" |
| 34 |
IUSE="examples ssl" |
| 35 |
|
| 36 |
-DEPEND="ssl? ( dev-python/pyopenssl )" |
| 37 |
+DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )" |
| 38 |
RDEPEND="${DEPEND}" |
| 39 |
|
| 40 |
DOCS="CREDITS HISTORY" |
| 41 |
@@ -26,15 +26,14 @@ |
| 42 |
#PATCHES=( "${FILESDIR}"/${PN}-1-pypy-test.patch ) |
| 43 |
|
| 44 |
python_test() { |
| 45 |
- # While BUILD_DIR has no build dir |
| 46 |
- pushd "${BUILD_DIR/build}"/lib > /dev/null |
| 47 |
- for test in test/{test_ftpd.py,test_contrib.py} |
| 48 |
- do |
| 49 |
- "${PYTHON}" "${S}"/test/test_contrib.py || die |
| 50 |
- done > /dev/null |
| 51 |
+ cd "${BUILD_DIR}" || die |
| 52 |
+ for test in "${S}"/test/test_*.py; do |
| 53 |
+ "${PYTHON}" "${test}" || die "Testing failed with ${EPYTHON}" |
| 54 |
+ done |
| 55 |
} |
| 56 |
|
| 57 |
python_install_all() { |
| 58 |
+ distutils-r1_python_install_all |
| 59 |
if use examples; then |
| 60 |
insinto /usr/share/doc/${PF} |
| 61 |
doins -r demo test |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.35 dev-python/pyftpdlib/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyftpdlib/ChangeLog?rev=1.35&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyftpdlib/ChangeLog?rev=1.35&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyftpdlib/ChangeLog?r1=1.34&r2=1.35 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v |
| 74 |
retrieving revision 1.34 |
| 75 |
retrieving revision 1.35 |
| 76 |
diff -u -r1.34 -r1.35 |
| 77 |
--- ChangeLog 26 Jan 2014 12:23:03 -0000 1.34 |
| 78 |
+++ ChangeLog 22 Feb 2014 15:27:00 -0000 1.35 |
| 79 |
@@ -1,6 +1,10 @@ |
| 80 |
# ChangeLog for dev-python/pyftpdlib |
| 81 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.34 2014/01/26 12:23:03 ago Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.35 2014/02/22 15:27:00 floppym Exp $ |
| 84 |
+ |
| 85 |
+ 22 Feb 2014; Mike Gilbert <floppym@g.o> pyftpdlib-1.0.1-r1.ebuild: |
| 86 |
+ Call distutils-r1_python_install all, and cleanup python_test a bit. Bug |
| 87 |
+ 502116. |
| 88 |
|
| 89 |
26 Jan 2014; Agostino Sarubbo <ago@g.o> pyftpdlib-1.0.1-r1.ebuild: |
| 90 |
Stable for sparc, wrt bug #498014 |
Archives