Re-add old version, correctly fix bug #551132

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x7EF137EC935B0EAF

3 files changed, 41 insertions, 42 deletions

diff --git a/dev-python/pyftpdlib/ChangeLog b/dev-python/pyftpdlib/ChangeLog
index 2d4c3a2a9863..f8eafd0da888 100644
--- a/dev-python/pyftpdlib/ChangeLog
+++ b/dev-python/pyftpdlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyftpdlib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.51 2015/06/04 08:01:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.52 2015/06/06 14:04:04 perfinion Exp $
+
+*pyftpdlib-1.0.1-r1 (06 Jun 2015)
+
+  06 Jun 2015; Jason Zaman <perfinion@gentoo.org> +pyftpdlib-1.0.1-r1.ebuild,
+  -pyftpdlib-0.7.0.ebuild:
+  Re-add old version, correctly fix bug #551132
 
 *pyftpdlib-0.7.0 (04 Jun 2015)
 
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index ad22bd221202..f1e756239e1d 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX pyftpdlib-1-pypy-test.patch 597 SHA256 2cccf1383ba6568252bb1917188969e6f7b3c39181440a4c89c1f30838541b9a SHA512 fbd535526c50e9a11f7a9f0bb1ad8870584fcfc250ebcfaf210aca2722c821fd14ba1c66c1fd3ddb5e5d941eb71b65ab70cbbe1513320a32344a946847a6d456 WHIRLPOOL 64bddf5fa3ae14bdaff046f9580d5a8662f0240b1fd44093463bae1c88145bfff14585098a1ad1bfe7b1f16014b11469f71e67621fe5f3058dccfacee9bbb562
-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
 DIST pyftpdlib-1.3.0.tar.gz 120206 SHA256 5dec22e691bd75ee0097f2e623df6c7b81a7cc373118f1550a16079dbddc701f SHA512 eacd617aa136c2a9a8836d25c632f30fbc9ad14650d34e0a8f6562c1a5af8e2e3ae0592d7f5456b88818142d63a08c140e75ce2e0a73811c29a7dd5e08700b87 WHIRLPOOL e4ee34587e60f9a41b5332a62a5e4d4914822ffa1bd4cc700ebb03a31fdca50ffa15a55d6d5afb73177d20bbbb30123ca6756629eef936d6bbb8a5d959535d74
 DIST pyftpdlib-1.4.0.tar.gz 116280 SHA256 5fdd1492efe478f4c354f7d65d9308359751c8fb1d0376466b74a76721c5fcf3 SHA512 61cf28d72a3a99bdc9bddcf434275e4edaeff60bf6481c1e854d81a4ea23ae97b73c8da9d0629a705a003ae8a941c529f9b9ed7cfa25759bd5cd6517f9958ff9 WHIRLPOOL 676f58061e07aa8a9dcce9c7076962875866cebca8eacdd624053cab32de3a7bdb0b17337105839b6c997bf2b4263e759c962362930afddaedc1e9a151b855fa
-EBUILD pyftpdlib-0.7.0.ebuild 1265 SHA256 3b1566b7969ffd2f510c6cfcdaeff8c34cfd76a8cdce2b648bc08ea32311e9df SHA512 50fdacfb2b61ff48dd879ff9360bbb6ce021c77bd52c73a10696651e0daea381fc6fbb660b078b9bd4465732b68afbca56c74c95726020b9415243408a0f190a WHIRLPOOL 23ade1faf92bf44f91c88b7538f829373e84c4469df2ed21ba71888ae2fcb5d4358e259e0ebec9d26b033dfc9bf6b54a969e365f921ff091188bce008ad438b8
+EBUILD pyftpdlib-1.0.1-r1.ebuild 1197 SHA256 55d53b449d28ab5a528f62ee25d2a4d1535f1e7a8baef3ec1547968b98026c06 SHA512 422aef52fc9b0f01b9764c51c164224c9b3971b4f5ef0ba8e2a8f45e8f10993f34f9e87b75039093949df150300b8be16e7db7186bea169211cc1159fac053be WHIRLPOOL 9acd5788543b0a34ef5e6f9bd41a778326516f496c9259209fd4123e1267d5c224149400f75de7086cd1ba29ecbf27c1830cf3a199652bf853ce78299d8742e8
 EBUILD pyftpdlib-1.3.0.ebuild 1283 SHA256 6b24615b6015084b6943b6995ae3a2e7667adfc31f0a216f0eb85d973b6cf962 SHA512 336c4dcbde086ef426fb4ac9bca9b19ad3842d2f3e3d337a4d8aca5112af86818909028c44c175275287799b84af333fa898df019494e47008fea88bbdf35028 WHIRLPOOL 333fe462e6297b1e85bcf4d6098282d745eef891b34af012743c34180d22f0781117d5df616f7ca3f746e3a1da291fabdd7162b870457ebd8b3961da3b1647b3
 EBUILD pyftpdlib-1.4.0.ebuild 1008 SHA256 3d719d84adb96e26344ea0043fe829327e8c76359a27dc39ddf31d27d0983bc7 SHA512 cf084cc44a077fce5526fe0ada4d55e9321e1120495bba1d53526bfd96a6f14a6a47617a95e4747649e0b84eba5e692f1700d8edfb79579cd0221041831d7f0c WHIRLPOOL 6bf4aa4c0c30982a7c813e80833732351e26138b630b07b33594eecaae2e99fb85a3ecd12d08625802fc15470215b081ed6d9ccd567308ea45b894ffda50c420
-MISC ChangeLog 6457 SHA256 e4f602010aebf935064319f42a934b94b927a3f9f7e8ad2764faacb3148c80ca SHA512 f3947879db2f5d7c8ca1454e8cedc7779912b80be05afea8c3915ae90155e1795558cce6d6dbd0444796103d7b2d5697bd9d3424be917d0b55b366a7cc95a5ad WHIRLPOOL 121a8ff5a217638fd95c4e9e342e5a237b933ac991ea1ff670228e1bd36109d1ca0bc20619457276d88ae191b8ab017a60a353d0022cdd17dc26dae057219596
+MISC ChangeLog 6651 SHA256 4d4983e448c387008b9979f4dc547d8bbf5b062b241a43d23b46ff4e337bdf01 SHA512 97831286c842173dc14de6cd320c29c38f15f8976428c7222275ec02c6af708a83e1e741f79c56cc415c82ab6468c3a640a6d7c557010fb912fd1f7a75325e57 WHIRLPOOL 8b98b0107b44f66fd998c75788f029bcbc0e7fb1cb064d5202150fa7178d0cae243f914cca60e99064855706f071c92da320c069db2ff6eff71732d6d299d0b3
 MISC metadata.xml 398 SHA256 c71363a5001842a8102ddcb49a683feeb6b139b1ad49aea47a8ae0e3da9a2532 SHA512 14acf2a45aadeca707f03f85c6d06968fa4f750e58909ebdf5052ba38807373139ceeb205de812470f020877b045586596ba248be7b9095fb00c232ce97b552d WHIRLPOOL 9d35a8c77d912247bdd2dac8450751ba9b3195621a84df817cdd44b7e95407b24e0f7080333c3fc3a85519db235b60dc2900df01840369095ce1856f48671237
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcAXLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiK0kP/jFinIc5mGRW+EyCPcBvJy9i
-TaZOYTluJKujAxHIoaMvx43zq8R/+DVHgdElNFDRKZ4M7C5g+TlPx4zUsP+oZ6SL
-4nrwNMDJnrRdWdAfl4IphKpY8qIFM3rXTQG49j01ADd6oTQDjW3t0f2W6BsO7eBX
-8Pjhd3rDT8uMkJMntIRbzHYQPXtZPWYVz+K8OFsI2dAHFWTsvBPby4ArFmfNhtBv
-9oL2JsTjktBedoH2TKD0zCtIcIZsuob9k1PqWR33457qv6TUnGjJcCandVOXN6CK
-G1U0bh5wkTow1Fvj1iD8n4mSkyne77Ui3BTkel/zi3zrWNpemvoGZlGq/C2eoUns
-QonuIsOQCKUQBsRML4B1du5ar9i4HsG8YvctS79tV/e7Uq3+gthwKaDcywjYYfmf
-USHIVrB924KOfExC5o9zeJd4ZsHWic6b0uUIyVgUaHeVHTq4kQGsvTUXY8VkfZ/L
-ctOjHnW9vu/vXTxVvtPP/9xfymP0f+CDsfjJ1B+UUDmqEKoHmHd4viRADnfNvskW
-CWJEYOUsdW+fpDGy61ntayI2a3ufLI2sZMjdmPNylAa60vJJzCuim25lV/Yavyu/
-Reg6LYaAIWnWWBkKNPpe23kIKunxS4I4sTdAmMuKDwb5+CxwnlRowkN5/Sbf6zde
-2ffJ570XsIGEvPnsG0h3
-=fVd2
+iQJ8BAEBCABmBQJVcv3bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V9iAP/jFUdiZKzyrMvm4ctnSpJGFT
+g9jcHTDRcOukG30N0eAG6f4Qs/lbw1shP7UQh9QFyMEQFb28VFz9BXU+LsTjvUY/
+rptdT16glLI24lvODo6Oy3PiSixcU/hvacIjNCA7zL9pWW2wh+IH0NfuuU+Lx85k
+3+tBeJjWaNHXjQeH+LZ3j4ptVJPGRMBnNK7KHUe6GsUugVf5/OGkJ/SB7SbeTzS5
+7B1ACSxfGqegY19vuRwUdQS4NbcBMsVK4xTwOYWV5SzanWMN0rYweWk94D2dCVfu
+FqR4KEQN9gaghRhNXOK6omYidZbiAygM0/a4xDQqeVaIohV6/HGxZF64vfhegRVH
+qixOAxOPEld5+Yxip8EHKBLSFBBLi+Omutu/tzuaPw3F6Ked0U9Qir8D2L6zJj8E
+bId8jvrzxg6OT9yHrhFPr0jUH7jvrvIt/5ryIAvGHgGOGeLy7tOgvBoSm6W8dQ+F
+4HPMJqyxLfapn5i+d/dlMsgSaBhcSkRl7klsPllIFXsrH7/I1K0XTxZSwxqpMrBk
+8j7iSqhsebf/0OXgHDms82PrLGYidM0FJvtA/TQ78/Bhjx0sbkLD75ZE5O68/JTb
+epFDxUVELtGbXgKCHpmly9vssf0UGg+gCbQQZ2yKbvvTcSl+Q5KIDD5c3lLwGEew
++5vEyGiKiDmFIzyNFBYT
+=BpsD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyftpdlib/pyftpdlib-0.7.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
index 5a0223d94665..2903d6826dd0 100644
--- a/dev-python/pyftpdlib/pyftpdlib-0.7.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
@@ -1,17 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-0.7.0.ebuild,v 1.15 2015/06/04 08:01:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.17 2015/06/06 14:04:04 perfinion Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ssl(+)"
-PYTHON_USE_WITH_OPT="ssl"
-SUPPORT_PYTHON_ABIS="1"
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="ssl(+)"
 # pypy has no spwd.so
-PYTHON_TESTS_RESTRICTED_ABIS="2.7-pypy-*"
-RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Python FTP server library"
 HOMEPAGE="http://code.google.com/p/pyftpdlib/ http://pypi.python.org/pypi/pyftpdlib"
@@ -22,25 +18,22 @@ 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-lang/python:2.7
-	dev-python/pyopenssl
-)"
+DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 DOCS="CREDITS HISTORY"
 
-src_test() {
-	testing() {
-		for test in test/{test_ftpd.py,test_contrib.py}; do
-			PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $test || die
-		done
-	}
-	python_execute_function testing
+#PATCHES=( "${FILESDIR}"/${PN}-1-pypy-test.patch )
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	for test in "${S}"/test/test_*.py; do
+		"${PYTHON}" "${test}" || die "Testing failed with ${EPYTHON}"
+	done
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r demo test