revbump, patch managing pypy issue in tests

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 83 insertions, 2 deletions

diff --git a/dev-python/pyftpdlib/ChangeLog b/dev-python/pyftpdlib/ChangeLog
index 8dcdce451782..639d977f3f74 100644
--- a/dev-python/pyftpdlib/ChangeLog
+++ b/dev-python/pyftpdlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyftpdlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.24 2013/03/11 06:27:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.25 2013/03/13 15:42:44 idella4 Exp $
+
+*pyftpdlib-1.0.1-r1 (13 Mar 2013)
+
+  13 Mar 2013; Ian Delaney <idella4@gentoo.org>
+  +files/pyftpdlib-1-pypy-test.patch, +pyftpdlib-1.0.1-r1.ebuild,
+  pyftpdlib-1.0.1.ebuild:
+  revbump, patch managing pypy issue in tests
 
 *pyftpdlib-1.0.1 (11 Mar 2013)
 
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index f9b9cf9065db..654945e83805 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pyftpdlib-1-pypy-test.patch 597 SHA256 2cccf1383ba6568252bb1917188969e6f7b3c39181440a4c89c1f30838541b9a SHA512 fbd535526c50e9a11f7a9f0bb1ad8870584fcfc250ebcfaf210aca2722c821fd14ba1c66c1fd3ddb5e5d941eb71b65ab70cbbe1513320a32344a946847a6d456 WHIRLPOOL 64bddf5fa3ae14bdaff046f9580d5a8662f0240b1fd44093463bae1c88145bfff14585098a1ad1bfe7b1f16014b11469f71e67621fe5f3058dccfacee9bbb562
 DIST pyftpdlib-0.6.0.tar.gz 128878 SHA256 547afb8bca676e508dbb15c42a9fd3f5af6bdc289781a4c22abd007f74e9936a SHA512 e382a98d4e483b086e0a5055ff034d6fb25feeba32eeab4dce6a17a1d0a2a53571ea9c9b124d7a249d5a7f53f5739cdfdee7553a6db22e1181bc68abfa7b797f WHIRLPOOL 5c0ee7c2ba81a790f580f72a59c040a0dd637627bcd546b1dabe9aea7ccb3d6d9c422ea79c8ea065eed234f582496515ce81e86b5508e3b44dbce22f9c596e4d
 DIST pyftpdlib-0.7.0.tar.gz 94898 SHA256 a11a4b6b5cffa7eab8fb48b24cc90777c21fbedb8873fa15c2231526df0596c6 SHA512 d08a81771538f6b898cb327fd44f2743c8da06d5bff07cd720731dc7f0072f3be6dfba19841b7b6ac3e9c8ba91fdad72c191e0e83e0f8b069f147ccb2f6bc169 WHIRLPOOL aee4d5a9c13eb059eaaf61f2798a194be1e955a0d69c3c7f2e5c06d860ecf837ea282d850b9672ff1a0efc9ce2c1a82fc354d2bad09efe6547440076bc60cf59
 DIST pyftpdlib-1.0.1.tar.gz 116428 SHA256 bec5c2af5942c3970d53b1a9fa27286eba40c2089e3e0ef653ff6f5ed0c4865b SHA512 478f04cb156a6178f03aee40190f17b65e42f04c60311936bf068d11f9ffbd8ae9a118fea456386ccf5184e3fed6270b40b4dfec6523902e310f78ec73785be8 WHIRLPOOL 71b34ef1031b402b2be0d7aac64f796820a20e022fc71fb451777cc4dc50b28ba48dca20608958cd670d90a9baf839c8e4933ddb63b0484fff425faaa5e5e3b1
 EBUILD pyftpdlib-0.6.0.ebuild 1273 SHA256 37a780cd94c90c6bbe1ec105bf4c30950842db9f0657abbe201e722e3023cede SHA512 267c2ed25d8a33952f3cb1c88f02985d2b4667adc61ec3d59b5c666a1c36031341e55220f6544df62d4c19115dc55574f11dc7ec5abdde3a8fef6147cea04995 WHIRLPOOL f174f0587987dd7e6ae86053047fe7c046c29d9786adaf910c4090b87a91e4d1fcddd9651b68e60956731a8fafc9e1f4e52758ed473cfed9b2ac730123cecb96
 EBUILD pyftpdlib-0.7.0.ebuild 1261 SHA256 458b025ecbbd3fee660922c593aa6f8dc5ee24e95b44be02dc1d2dab3f5f0ef8 SHA512 ab806aa913ca606f72569c601ae8ea96f8baeec105e83a4db360785bfe4894293fe4ce7efca907c8d225b903c019064eb5998e90863792a46125aac01e62b9f7 WHIRLPOOL 821224a94c29c5c39185de9dc068d3ba8e971a217d26ad26e98e117f033831d8fb1bdf22e0e7037a87b44277a9e3208894980cbf6613c4ab0a165c5a9413728d
+EBUILD pyftpdlib-1.0.1-r1.ebuild 1223 SHA256 d86778461bda3237c9665b50bc85e241798b7de907d31a856ff2fe5e6548079a SHA512 8261829bc9b4554d07d90e54bc839e50ac7b1766bd244d5873ca54e5b4c311910251063ad3e47f9a1b797f718f28390e760336a508f0e5ba9738463c537a6ce8 WHIRLPOOL a4c97e55a27344830d31567deb040d115ae8eca62884929affe1cb85ccdb24befcd9e1c1d6377e606c6d09c000d58c24ad3a828c09e0f90d629fb4341d445716
 EBUILD pyftpdlib-1.0.1.ebuild 1273 SHA256 aec29e46523778b6c76b23d69d14c61f973338c12d4419e7c86c1186a8a2151f SHA512 7655fb7a54313d73e783cfd8f1764805a8a6a96fef1d1fdd09b9293e78ec90d0b683cdddc6232fefd5b371f96b56d62ccef7a22b1844849c3468be42214212fb WHIRLPOOL e15758cdd4dfa33604bfbd894968953c196b9bca8c58694346492f1cfda03bcbb516e36f17e4b319780cda386362139978ba1045c436aab653ca72ae63667f10
-MISC ChangeLog 2993 SHA256 c21c6090580305a9a2d67f87133a6e88e56591a21bce1042068ac2689432fcd6 SHA512 c10de89e6af623bfc21cc49a5cd60d261ae4d5edf2be85eb15d9c993bb68723509e8e2319801697ce19d0c5b2e8284675138bdef135b611a31f42c3905ed9103 WHIRLPOOL 2a60f5bd5fbedfff7c683f2a0d641dc86cf18b8434b1f3c3fd877afd020b160a4d3b0ae34b48f3651437af6d31609cfeaef4cf21d7e095122c789e5eedcff240
+MISC ChangeLog 3215 SHA256 492c43f42ad436c22b99fa8c02f0f2cb36b6eb20b5ee4589a9fb3410d9af9c94 SHA512 39a6cd97505f6a95f6abf8911b3aee64d88b14de4842e9587ddf52341a85538be7c747b1553e770365c049b53c3806b5de8e50b7225336ee7f2d2fa44b5ad40f WHIRLPOOL 5b425541d55d7e07b9beaf1fe049635e54379cb991239bdb83a402cc3ab305043c64242c9bc0198a37977b36393726540ec519f5260ae305c6ec6037415e1e4f
 MISC metadata.xml 338 SHA256 f7d97b3fe24029a19e8e06b81b3c8479f612adf2ac64dcb148073289a6661b6b SHA512 b82fc5de0e5c6c07d07af2912371a8281ac3e4e34f07562ab808f0dd40fce79ca59c76c74845d59c9fa51d8dac8edfdb8152dfc6bf5433d4e7be0f7dff265e79 WHIRLPOOL 70e62672714d6a6fd0d71ae57241816f47f2bc1dbe485ab6ccdab26fee970cfb7f4a9acd3c35c1ce3d13f69747fbb08166b4f321d0d19f2bf223dd841b00a93f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlFAnoIACgkQso7CE7gHKw38vACdFXy4rby7ODEK+0wUt8GTdQwe
+F/cAoJAaIODvk85+aXDOtNi4qWErNRqc
+=yi3c
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch b/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch
new file mode 100644
index 000000000000..e1b30553fcbe
--- /dev/null
+++ b/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch
@@ -0,0 +1,20 @@
+diff -ur pyftpdlib-1.0.1.orig/test/test_ftpd.py pyftpdlib-1.0.1/test/test_ftpd.py
+--- test/test_ftpd.py	2013-02-23 03:07:13.000000000 +0800
++++ test/test_ftpd.py	2013-03-13 23:05:48.392965468 +0800
+@@ -33,7 +33,7 @@
+ import threading
+ import unittest
+ import socket
+-import os
++import os, sys
+ import shutil
+ import time
+ import re
+@@ -1358,6 +1358,7 @@
+                 self.assertEqual(getmode(), '0555')
+ 
+ 
++@unittest.skipIf(hasattr(sys, 'pypy_version_info'), "temp. disabling of pypy")
+ class TestFtpStoreData(TestCase):
+     """Test STOR, STOU, APPE, REST, TYPE."""
+     server_class = FTPd
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..1ec811a205e5
--- /dev/null
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 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.1 2013/03/13 15:42:44 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{5,6,7} pypy2_0 )
+PYTHON_REQ_USE="ssl"
+# pypy has no spwd.so
+
+inherit distutils-r1
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="http://code.google.com/p/pyftpdlib/ http://pypi.python.org/pypi/pyftpdlib"
+SRC_URI="http://pyftpdlib.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+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 )"
+RDEPEND="${DEPEND}"
+
+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
+}
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r demo test
+	fi
+}