Upgrade deps for -r1 eclass, drop py2.5

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 10 insertions, 54 deletions

diff --git a/dev-python/eventlet/ChangeLog b/dev-python/eventlet/ChangeLog
index 0228ad8acdc3..718367475dfd 100644
--- a/dev-python/eventlet/ChangeLog
+++ b/dev-python/eventlet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/eventlet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eventlet/ChangeLog,v 1.5 2013/02/12 12:22:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eventlet/ChangeLog,v 1.6 2013/06/07 13:36:41 idella4 Exp $
+
+  07 Jun 2013; Ian Delaney <idella4@gentoo.org> -eventlet-0.12.1.ebuild,
+  eventlet-0.12.1-r1.ebuild:
+  Upgrade deps for -r1 eclass, drop py2.5
 
 *eventlet-0.12.1-r1 (12 Feb 2013)
 
diff --git a/dev-python/eventlet/eventlet-0.12.1-r1.ebuild b/dev-python/eventlet/eventlet-0.12.1-r1.ebuild
index 8e59411099ba..fe815c5ca299 100644
--- a/dev-python/eventlet/eventlet-0.12.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.12.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/eventlet/eventlet-0.12.1-r1.ebuild,v 1.1 2013/02/12 12:22:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eventlet/eventlet-0.12.1-r1.ebuild,v 1.2 2013/06/07 13:36:41 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
@@ -17,8 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
-RDEPEND="dev-python/greenlet"
-DEPEND="doc? ( dev-python/sphinx )
+RDEPEND="dev-python/greenlet[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( ${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}] )"
 
@@ -39,10 +39,6 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
 	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
 }
diff --git a/dev-python/eventlet/eventlet-0.12.1.ebuild b/dev-python/eventlet/eventlet-0.12.1.ebuild
deleted file mode 100644
index b6cb0105f0ef..000000000000
--- a/dev-python/eventlet/eventlet-0.12.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eventlet/eventlet-0.12.1.ebuild,v 1.1 2013/01/26 05:22:00 prometheanfire Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="http://pypi.python.org/pypi/eventlet"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-DEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-python/greenlet )"
-RDEPEND="dev-python/greenlet"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake -C doc html || die
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	use doc && dohtml -r doc/_build/html/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}