Upgrade deps for -r1 eclass, drop py2.5

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

4 files changed, 15 insertions, 62 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/Manifest b/dev-python/eventlet/Manifest
index 1b745f15c9fa..d4db7bd9ef78 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -3,17 +3,14 @@ Hash: SHA256
 
 DIST eventlet-0.12.1.tar.gz 267022 SHA256 aaf97960b7e00f36844549399a22746c7ef27d76fffcd4056fb36bd242dd1e47 SHA512 601730bb6aafa83ee67dd3530c6b9649f78f9d348c1ef549133ffe076464309785eeed405f4a7786010e79963f3bf1ad70f0995b88f291df870c9c3f353d1a6c WHIRLPOOL 72c0573e182d3b411928bf18fea915bcc1cf3b416368262464418002b40a6dc8769f3594e662fc92e1c6fc7fe0e8bd55565c198f0afc9b618d7486b4fdc51d20
 DIST eventlet-0.9.16.tar.gz 317198 SHA256 b2d38084809b2f2a8e3cc5815b10912870cdbe97d9a4e5c1ff231ebc8da0e430 SHA512 4a6f0b883dcea17c435ab3d966285c1977def598c175cc002b33f30de4aff0992d03005ec3b358a7628d98bd4a752d39aba348c60feac6808cff01c1d10d7318 WHIRLPOOL fc9ab15bb6da5b0d08f4ba53d3755128e9dd043bf6f675f971497c83dbe06b99491513b9719d15299edf1f7a86c691369ffdc2e49f1c62fbab600e0a0c43a874
-EBUILD eventlet-0.12.1-r1.ebuild 1086 SHA256 252a37b7c95bf1b8fa497a7e931792fef6779561554a131532ba9eae1cc6435e SHA512 ea1319502cea698ac75bd2f2bc6b0c221919e7420f68f33f4e4a6f49251d3df34375dc60e45f943a99096134315a0df8afc7214ccb92b47ef914ff608f3b542d WHIRLPOOL ea1eede166a0a96bca1a8c737ba9302d7c66dc8210c5ebc85673cdbe3ed7b175154a7591b2a83d331552ddf350100c20b9ad3f4023905d45aa47264b9c61da6b
-EBUILD eventlet-0.12.1.ebuild 936 SHA256 8e584796f542483e2ce4f66c999a3b4ac97a869338e39f03572c0d94f9fde517 SHA512 9d9f617fe9dbc9f0d9bf98968d76426ce3eed2a44bdfb16e517903311c662f06b89d6379bf95cc1cf14d1a7e12bdd17aa2980ed85b57e1a57e159a04679b8af7 WHIRLPOOL 48fbe2497df54b7f7e6a04b67e2574cec909ef1a117ab01929de30cc5656a48a6da030e6aea4b89a3e294aac277cdad047ae36fdaf951b1aa768a242b1af677d
+EBUILD eventlet-0.12.1-r1.ebuild 1072 SHA256 5fa8ee92541fb9de927c5ae98a9c5e3e0f36b067eced96476b875c2244bc382c SHA512 e9d694dd6dd733d2e823aefe8a4f3080f9320bb3549a3394c6ed38df05fba3c1125ae30c4636e8b9bef76f50e85112ddc46f86fa2a6b25df9329fd267828f1ea WHIRLPOOL 012dc63f538946f6eb137f33930a6e2ac30b976bd732c95a13dc189eb66badf8fcdbe0648176c3386d50268cc63a53e13cb1485e1b6c42748fe18fda02aa6c2a
 EBUILD eventlet-0.9.16.ebuild 1091 SHA256 9e65a09e4746cb64445602b77b984c5d4697015bc87b57b3bb926bc5648b6800 SHA512 26264bc581c1879710e8d9e86db76b871fa429d5e909be51d008312f3d2cec0e84ff562fe11e57bb7c6ff08f413653f074597896c832aab86a295f7e93f90f22 WHIRLPOOL 1a4df8b79aace6d056bbc6fb68aee4daa454c7c9ef8088d71d5419e89fa1cd80a5931d53ebe0e14348375a8ed13d8dc3c189a3790980dcf5ba65cf8df36020ef
-MISC ChangeLog 976 SHA256 1831e75d77d76f1b911a36d45d87cc87dcb7fd2c074c9f04c7bc814297360c7b SHA512 3526313d05d4a6aa3fd856f3c0a0fa62f3d9d88773d039c557041a7e1b8923480d5443f7778459c13f4fd99562eeaa7a6b281a090cf7b41bdb9754f509963aba WHIRLPOOL 68a6487a8966cc776ed9a057530db7c11234a7843a1b5a28ac23ce8fe0882f47286ce42a83e9cfd1b6f219bb6b2d9c616e4e93cfa0f61d3477d9cca7875f03d3
+MISC ChangeLog 1122 SHA256 70bf1453775ba47fc3def99e05e54bb47335a1e78a81ce26736357b200f70ae0 SHA512 ec8c294a0efcad0d64ea247f631faa546feb1fb4ad815311229226ec277a990ed9c0734981e7b8412037341ab4b6d221f15301cdd8147cd709dfe6d998cde82a WHIRLPOOL e779a74e510680e438a9c6f77f99787cfd1fb0081de4b3fd10e4800b3baa40dff617df511e4c43d32c6e3d6be9d4f8e64b22a52cfb0751fc477bf6c13dca3cde
 MISC metadata.xml 167 SHA256 a96c7a7081b1a192fc4758c24f63e3f458ce37c90ef5594005e91e01a5daf934 SHA512 05f506754bd3182ba88befefe0609d354f9ee335bea2d866f30719b292ebae30dbe64d6c68ff1a918bfd380bd638146b30754d072229491e8ed6f9d6745510c9 WHIRLPOOL 59ac07478ebcd8bb8b5edba5af0041df85949cf69083c3aae6945e371e6b79c6c92e2bd21189b2d8a87de72c9a4cd299e0773ff73332e247f95b8e850a76d054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlEaNAYACgkQfXuS5UK5QB1fQwP/cNv2VVut5VpGMbvneZCYJO2+
-v60vVOBgPUmhEjzZ2XqFRvzd0Z+0NnSwpNTuwEwx2Cd1O1JDKradzK9YkH710zuL
-1PGzJU5Ivy1pR4/AnFbpDipQ76z8VGGbD0CyrkEb2Id0jSZ58H2Thf3cs6Tvc7+c
-AwEyUk81YimylBi2+L8=
-=uT9V
+iEYEAREIAAYFAlGx4fUACgkQso7CE7gHKw2mLACgwbBygnGCpfWAOookUOummh6o
+kGEAnidTatLNGacNvlIHbZTlQ/s8EdwW
+=5AW7
 -----END PGP SIGNATURE-----
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
-}