From 0da801f47626984aee5e79c32a3b1803d988afe3 Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Tue, 10 Apr 2012 08:28:32 -0600 Subject: [PATCH] new 4-pythone EAPI passlib ebuild, and keystone doc and dep updates --- dev-python/passlib/Manifest | 1 + dev-python/passlib/passlib-1.3.1.ebuild | 29 ++++++++++++++++ sys-auth/keystone/keystone-2012.1.ebuild | 40 +-------------------- sys-auth/keystone/keystone-9999.ebuild | 44 ++++++++++++++++-------- 4 files changed, 60 insertions(+), 54 deletions(-) create mode 100644 dev-python/passlib/Manifest create mode 100644 dev-python/passlib/passlib-1.3.1.ebuild mode change 100644 => 120000 sys-auth/keystone/keystone-2012.1.ebuild diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest new file mode 100644 index 000000000..d001b37a1 --- /dev/null +++ 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 new file mode 100644 index 000000000..14de447f4 --- /dev/null +++ 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 deleted file mode 100644 index f4fac5c31..000000000 --- a/sys-auth/keystone/keystone-2012.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4-python - -PYTHON_MULTIPLE_ABIS=1 -PYTHON_RESTRICTED_ABIS="2.[45] 3.*" - -inherit distutils - -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" -SRC_URI="http://launchpad.net/${PN}/essex/${PV}/+download/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="*" -IUSE="" - -DEPEND="dev-python/setuptools - dev-python/pep8 - dev-python/lxml - dev-python/python-daemon" -RDEPEND="${DEPEND} - dev-python/python-novaclient - dev-python/python-ldap - dev-python/passlib" - -src_install() { - distutils_src_install - newconfd "${FILESDIR}/keystone.confd" keystone - newinitd "${FILESDIR}/keystone.initd" keystone - - diropts -m 0750 - dodir /var/run/keystone /var/log/keystone -} diff --git a/sys-auth/keystone/keystone-2012.1.ebuild b/sys-auth/keystone/keystone-2012.1.ebuild new file mode 120000 index 000000000..a36840066 --- /dev/null +++ b/sys-auth/keystone/keystone-2012.1.ebuild @@ -0,0 +1 @@ +keystone-9999.ebuild \ No newline at end of file diff --git a/sys-auth/keystone/keystone-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild index c233d84b2..a6db76849 100644 --- 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="" - -DEPEND="dev-python/setuptools - dev-python/pep8 - dev-python/lxml - dev-python/python-daemon - !dev-python/keystoneclient" -RDEPEND="${DEPEND} - dev-python/python-novaclient - dev-python/python-ldap - dev-python/passlib" +IUSE="+doc" + +DEPEND="$( python_abi_depend dev-python/setuptools dev-python/pep8 dev-python/lxml dev-python/python-daemon !dev-python/keystoneclient ) doc? ( dev-python/sphinx )" +RDEPEND="${DEPEND} $( python_abi_depend dev-python/python-novaclient dev-python/python-ldap dev-python/passlib )" + +src_compile() { + distutils_src_compile + if use doc; then + cd ${S}/doc || die + make man singlehtml || die + 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 + }