new 4-pythone EAPI passlib ebuild, and keystone doc and dep updates

funtoo · Apr 10, 2012 · 0da801f · 0da801f
1 parent a588666
commit 0da801f
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 54 deletions.
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
@@ -0,0 +1 @@
+DIST passlib-1.3.1.tar.gz 151494 RMD160 b67db450f19fafa3902970ff4b9e70f1d213b41b SHA1 738395634bf1ef85bff862c3cb6ccceb7dbadc83 SHA256 4cb312e18ee2c0f107a36799107dfd2e05c51faa54c5678397c38d89f35f1328
diff --git a/dev-python/passlib/passlib-1.3.1.ebuild b/dev-python/passlib/passlib-1.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation, Funtoo Technologies
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4-python
+PYTHON_MULTIPLE_ABIS=1
+PYTHON_RESTRICTED_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="comprehensive password hashing framework supporting over 20 schemes"
+HOMEPAGE="http://code.google.com/p/passlib/"
+SRC_URI="http://pypi.python.org/packages/source/p/passlib/${P}.tar.gz"
+LICENSE="BSD-2"
+KEYWORDS="*"
+SLOT="0"
+IUSE="test doc"
+DEPEND="$(python_abi_depend dev-python/setuptools ) test? ( $(python_abi_depend dev-python/nose ) )"
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dodoc "${S}"/docs/*
+	fi
+}
+
+src_test() {
+	PYTHONPATH=. "${python}" setup.py nosetests || die "tests failed"
+}
+
diff --git a/sys-auth/keystone/keystone-2012.1.ebuild b/sys-auth/keystone/keystone-2012.1.ebuild
diff --git a/sys-auth/keystone/keystone-2012.1.ebuild b/sys-auth/keystone/keystone-2012.1.ebuild
@@ -0,0 +1 @@
+keystone-9999.ebuild
diff --git a/sys-auth/keystone/keystone-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild
@@ -5,30 +5,37 @@
 EAPI=4-python
 
 PYTHON_MULTIPLE_ABIS=1
-PYTHON_RESTRICTED_ABIS="2.[45] 3.*"
+PYTHON_RESTRICTED_ABIS="2.[45] 3.* *-jython *-pypy-*"
 
-inherit git-2 distutils
+inherit distutils
 
-DESCRIPTIOn="Keystone is a cloud identity service written in Python, which
+if [ "$PV" = "9999" ]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+else
+	SRC_URI="http://launchpad.net/${PN}/essex/${PV}/+download/${P}.tar.gz"
+fi
+
+DESCRIPTION="Keystone is a cloud identity service written in Python, which
 provides authentication, authorization, and an OpenStack service catalog. It
 implements OpenStac's Identity API."
 HOMEPAGE="https://launchpad.net/keystone"
-EGIT_REPO_URI="https://github.com/openstack/keystone.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~*"
-IUSE=""
+IUSE="+doc"
-
+
-DEPEND="dev-python/setuptools
+DEPEND="$( python_abi_depend dev-python/setuptools dev-python/pep8 dev-python/lxml dev-python/python-daemon !dev-python/keystoneclient ) doc? ( dev-python/sphinx )"
-		dev-python/pep8
+RDEPEND="${DEPEND} $( python_abi_depend dev-python/python-novaclient dev-python/python-ldap dev-python/passlib )"
-		dev-python/lxml
+
-		dev-python/python-daemon
+src_compile() {
-		!dev-python/keystoneclient"
+	distutils_src_compile
-RDEPEND="${DEPEND}
+	if use doc; then
-		 dev-python/python-novaclient
+		cd ${S}/doc || die
-		 dev-python/python-ldap
+		make man singlehtml || die
-		 dev-python/passlib"
+	fi
+}
 
 src_install() {
 	distutils_src_install
@@ -37,5 +44,12 @@ src_install() {
 
 	diropts -m 0750
 	dodir /var/run/keystone /var/log/keystone
+
+	dodoc -r ${S}/etc
+	if use doc; then
+		doman ${S}/doc/build/man/keystone.1
+		dodoc -r ${S}/doc/build/singlehtml
+	fi
+
 }