Change Python USEdep to ssl(+) due to change in dev-python/pypy. Drop ancient.

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

5 files changed, 12 insertions, 57 deletions

diff --git a/dev-python/pyftpdlib/ChangeLog b/dev-python/pyftpdlib/ChangeLog
index 639d977f3f74..812cf821fc7c 100644
--- a/dev-python/pyftpdlib/ChangeLog
+++ b/dev-python/pyftpdlib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2013/03/13 15:42:44 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.26 2013/07/22 11:54:52 mgorny Exp $
+
+  22 Jul 2013; Michał Górny <mgorny@gentoo.org> -pyftpdlib-0.6.0.ebuild,
+  pyftpdlib-0.7.0.ebuild, pyftpdlib-1.0.1-r1.ebuild, pyftpdlib-1.0.1.ebuild:
+  Change Python USEdep to ssl(+) due to change in dev-python/pypy. Drop ancient.
 
 *pyftpdlib-1.0.1-r1 (13 Mar 2013)
 
diff --git a/dev-python/pyftpdlib/pyftpdlib-0.6.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-0.6.0.ebuild
deleted file mode 100644
index 7f30835f4137..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-0.6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-0.6.0.ebuild,v 1.12 2012/11/17 12:08:34 idella4 Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ssl"
-PYTHON_USE_WITH_OPT="ssl"
-SUPPORT_PYTHON_ABIS="1"
-# pypy has no spwd.so
-PYTHON_TESTS_RESTRICTED_ABIS="2.7-pypy-*"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-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 ppc ppc64 ~s390 ~sh ~sparc x86 ~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
-)"
-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
-}
-
-src_install() {
-	distutils_src_install
-	dohtml -r doc/* || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r demo test
-	fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-0.7.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-0.7.0.ebuild
index 8fd3021b1813..129d1662a9ab 100644
--- a/dev-python/pyftpdlib/pyftpdlib-0.7.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-0.7.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-0.7.0.ebuild,v 1.12 2012/12/30 14:02:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-0.7.0.ebuild,v 1.13 2013/07/22 11:54:52 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ssl"
+PYTHON_USE_WITH="ssl(+)"
 PYTHON_USE_WITH_OPT="ssl"
 SUPPORT_PYTHON_ABIS="1"
 # pypy has no spwd.so
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
index 1ec811a205e5..3c2de3ee57cd 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.2 2013/07/22 11:54:52 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{5,6,7} pypy2_0 )
-PYTHON_REQ_USE="ssl"
+PYTHON_REQ_USE="ssl(+)"
 # pypy has no spwd.so
 
 inherit distutils-r1
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild
index a72b0035ea64..12163c5c1324 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild
@@ -1,10 +1,10 @@
 # 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.ebuild,v 1.1 2013/03/11 06:27:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild,v 1.2 2013/07/22 11:54:52 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ssl"
+PYTHON_USE_WITH="ssl(+)"
 PYTHON_USE_WITH_OPT="ssl"
 SUPPORT_PYTHON_ABIS="1"
 # pypy has no spwd.so