From 08a6ce85b5fcb5d006bd347ad1656e5755e46646 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 12 Feb 2013 13:17:14 +0000
Subject: Migrate to distutils-r1. Clean up a bit.

(Portage version: 2.2.0_alpha162/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
---
 dev-python/passlib/ChangeLog            |  6 +++++-
 dev-python/passlib/metadata.xml         |  1 +
 dev-python/passlib/passlib-1.6.1.ebuild | 23 ++++++++++-------------
 3 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'dev-python/passlib')

diff --git a/dev-python/passlib/ChangeLog b/dev-python/passlib/ChangeLog
index 08ce27bbde91..96a8958e5ad5 100644
--- a/dev-python/passlib/ChangeLog
+++ b/dev-python/passlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/passlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/passlib/ChangeLog,v 1.2 2013/01/01 06:22:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/passlib/ChangeLog,v 1.3 2013/02/12 13:17:14 mgorny Exp $
+
+  12 Feb 2013; Michał Górny <mgorny@gentoo.org> metadata.xml,
+  passlib-1.6.1.ebuild:
+  Migrate to distutils-r1. Clean up a bit.
 
   01 Jan 2013; Matthew Thode <prometheanfire@gentoo.org> passlib-1.6.1.ebuild:
   refactor into distutils-r1 and eapi5
diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml
index 8a3981ae7893..9b440153943e 100644
--- a/dev-python/passlib/metadata.xml
+++ b/dev-python/passlib/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>python</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
diff --git a/dev-python/passlib/passlib-1.6.1.ebuild b/dev-python/passlib/passlib-1.6.1.ebuild
index 9e930533adab..f3e6c1ab0644 100644
--- a/dev-python/passlib/passlib-1.6.1.ebuild
+++ b/dev-python/passlib/passlib-1.6.1.ebuild
@@ -1,33 +1,30 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/passlib/passlib-1.6.1.ebuild,v 1.2 2013/01/01 06:22:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/passlib/passlib-1.6.1.ebuild,v 1.3 2013/02/12 13:17:14 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
 
 inherit distutils-r1
 
-DESCRIPTION="comprehensive password hashing framework supporting over 20
-schemes"
+DESCRIPTION="Password hashing framework supporting over 20 schemes"
 HOMEPAGE="http://code.google.com/p/passlib/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
 LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test doc"
+
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose )"
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 python_test() {
-	"${PYTHON}" setup.py nosetests || die
+	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
 }
 
-python_install() {
-	distutils-r1_python_install
-	if use doc; then
-		dodoc "${S}"/docs/*.rst
-		dodoc "${S}"/docs/requirements.txt
-		dodoc "${S}"/docs/lib/*.rst
-	fi
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
 }
-- 
cgit v1.2.3-65-gdbad