diff options
author | 2012-05-21 17:00:53 +0800 | |
---|---|---|
committer | 2012-05-21 17:00:53 +0800 | |
commit | bf34df1ca8ce444445ea4c3013427f52cffcdd41 (patch) | |
tree | 9c54987f7e3483de98ccbf1edfe07f2a9ba9fb3e | |
parent | [dev-python/starcluster] using bash-completion-r1, removed testfixtures (diff) | |
download | improvise-bf34df1ca8ce444445ea4c3013427f52cffcdd41.tar.gz improvise-bf34df1ca8ce444445ea4c3013427f52cffcdd41.tar.bz2 improvise-bf34df1ca8ce444445ea4c3013427f52cffcdd41.zip |
[dev-python/[workerpool,starcluster] final cleanups, rm unrequired phases
-rw-r--r-- | dev-python/starcluster/starcluster-0.93.3.ebuild | 32 | ||||
-rw-r--r-- | dev-python/workerpool/workerpool-0.9.2.ebuild | 38 |
2 files changed, 15 insertions, 55 deletions
diff --git a/dev-python/starcluster/starcluster-0.93.3.ebuild b/dev-python/starcluster/starcluster-0.93.3.ebuild index 2abd375..46b7234 100644 --- a/dev-python/starcluster/starcluster-0.93.3.ebuild +++ b/dev-python/starcluster/starcluster-0.93.3.ebuild @@ -14,16 +14,13 @@ inherit distutils bash-completion-r1 MY_PN="StarCluster" MY_P="${MY_PN}-${PV}" -# description is much too long -DESCRIPTION="StarCluster is a utility for creating and managing general purpose computing" -# clusters hosted on Amazonn's Elastic Compute Cloud" +DESCRIPTION="Utility for creating / managing general purpose computing clusters" HOMEPAGE="http://web.mit.edu/star/cluster" SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -#SRC_URI="http://pypi.python.org/packages/source/S/${MY_PN}/${MY_P}.tar.gz" + LICENSE="LGPL-3" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" SLOT="0" - IUSE="doc bash-completion epydoc" RDEPEND=">=dev-python/ssh-1.7.13 @@ -35,18 +32,14 @@ RDEPEND=">=dev-python/ssh-1.7.13 DEPEND="${RDEPEND} doc? ( dev-python/sphinx - dev-python/epydoc ) + dev-python/epydoc + dev-python/matplotlib ) dev-python/setuptools" S="${WORKDIR}/${MY_P}" -PYTHON_MODNAME="${PN}" - src_compile() { distutils_src_compile - - # epydoc and doc selections make entriely distinct documentation. epydoc builds apidocs - # Note: made shorter by avoiding if then clause. Ensures exit if build fails use doc && emake -C docs/sphinx html mkdocs() { @@ -54,8 +47,8 @@ src_compile() { local msg="build with epydoc failed" pushd docs/epydoc/ PATH=$PATH:./ PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" ./build.sh || exit_status=1 - ! [[ exit_status ]] && eerror "$msg" - popd + [[ $exit_status != 0 ]] && eerror "$msg" + popd sets return $exit_status } use epydoc && python_execute_function -f mkdocs @@ -63,12 +56,9 @@ src_compile() { src_install() { distutils_src_install - # --install-scripts="/usr/bin" is taken care of by distutils anyway - # the updated eclass uses a different name for dobashcompletion, + dobashcomp completion/${PN}-completion.sh ${PN} - # code in initial copy - # dohtml -A txt -r docs/sphinx/_build/html/* prefer mine but the results differ use doc && dohtml -r docs/sphinx/_build/html/ if use epydoc; then docompress -x usr/share/doc/${P}/apidocs/api-objects.txt @@ -80,9 +70,3 @@ src_install() { src_test() { distutils_src_test -v ${PN}/tests } - -pkg_postinst() { - # bash-completion-r1.eclass appears not to have this phase - #dobashcomp_pkg_postinst - distutils_pkg_postinst -} diff --git a/dev-python/workerpool/workerpool-0.9.2.ebuild b/dev-python/workerpool/workerpool-0.9.2.ebuild index 6d3720c..53ccc81 100644 --- a/dev-python/workerpool/workerpool-0.9.2.ebuild +++ b/dev-python/workerpool/workerpool-0.9.2.ebuild @@ -1,52 +1,28 @@ -#Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: +# $Header: $ EAPI="4" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="*-jython" DISTUTILS_SRC_TEST=nosetests -# package supports python3, tests don't -#PYTHON_TESTS_RESTRICTED_ABIS="3.*" +PYTHON_TESTS_RESTRICTED_ABIS="3.*" inherit distutils DESCRIPTION="Module for distributing jobs to a pool of worker threads." HOMEPAGE="http://github.com/shazow/workerpool" -SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="test examples" RDEPEND="" DEPEND="${RDEPEND} - dev-python/setuptool" - -src_prepare() { - # python3 can be used but not with tests - checkabi() { - local exit_status=0 - if use test && [[ $(python_get_version --major) == 3 ]]; then - # Green from einfo more readable than in red from eerror. - einfo "" - einfo "tests do not support python3" - einfo "tests can be run with python2" - einfo "" - exit_status=1 - return $exit_status - fi - } - python_execute_function checkabi - distutils_src_prepare -} - -src_compile() { - distutils_src_compile -} + dev-python/setuptool" src_test() { - # point distutils_src_test to tests distutils_src_test -v test } @@ -58,4 +34,4 @@ src_install() { insinto usr/share/doc/${P}/ doins -r samples fi -} +} |