From ad0072edf44e8c644bc7b2e282fde18805bbb1da Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Fri, 26 Jul 2013 12:05:21 -0400 Subject: starcluster: add new 0.94 ebuild * Added new package: iptools 0.6.1 * StarCluster now depends on optcomplete (in tree) and iptools (not in tree) * Updated live ebuild with changes from new 0.94 ebuild * Remove old and outdated 0.93.3 ebuild * Updated the starcluster Manifest --- dev-python/iptools/Manifest | 1 + dev-python/iptools/iptools-0.6.1.ebuild | 33 +++++++++ dev-python/starcluster/Manifest | 2 +- .../files/starcluster-0.94-requires.patch | 16 +++++ dev-python/starcluster/starcluster-0.93.3.ebuild | 65 ------------------ dev-python/starcluster/starcluster-0.94.ebuild | 67 +++++++++++++++++++ dev-python/starcluster/starcluster-0.9999.ebuild | 78 +++++++++++----------- 7 files changed, 157 insertions(+), 105 deletions(-) create mode 100644 dev-python/iptools/Manifest create mode 100644 dev-python/iptools/iptools-0.6.1.ebuild create mode 100644 dev-python/starcluster/files/starcluster-0.94-requires.patch delete mode 100644 dev-python/starcluster/starcluster-0.93.3.ebuild create mode 100644 dev-python/starcluster/starcluster-0.94.ebuild (limited to 'dev-python') diff --git a/dev-python/iptools/Manifest b/dev-python/iptools/Manifest new file mode 100644 index 0000000..c2ef322 --- /dev/null +++ b/dev-python/iptools/Manifest @@ -0,0 +1 @@ +DIST iptools-0.6.1.tar.gz 13928 SHA256 0f03875a5bed740ba4bf44decb6a78679cca914a1ee8a6cc468114485c4d98e3 SHA512 5a2b7fab028cc81699b791bf1669c3eb8311af1d9b17b2f3aa4bdd92dae3a9dc4ec38cf1de385bb592559b0ce560764debc152f11d98e6082e6c9fcdf643db3b WHIRLPOOL f69a5bbb926a59c6dc21eac2dd86ffc86402144d3dcca7d5a86bc5c96c44acaf7d3c59a233ce42ea84486dc6a843952161e37e81cad99c6133dd5add794f262e diff --git a/dev-python/iptools/iptools-0.6.1.ebuild b/dev-python/iptools/iptools-0.6.1.ebuild new file mode 100644 index 0000000..8183dd4 --- /dev/null +++ b/dev-python/iptools/iptools-0.6.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.9.8.ebuild,v 1.1 2013/07/21 09:05:17 radhermit Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} ) +DISTUTILS_SRC_TEST="nosetests" + +inherit distutils-r1 + +DESCRIPTION="Python utilites for manipulating IPv4 and IPv6 addresses" +HOMEPAGE="https://github.com/bd808/python-iptools http://pypi.python.org/pypi/iptools" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="doc" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + +python_test() { + nosetests || die -v tests || die +} + +python_install_all() { + distutils-r1_python_install_all + # iptools doesnt package its sphinx Makefile, config, templates, etc. + # for now install the single doc until the following PR gets merged and + # released: https://github.com/bd808/python-iptools/pull/10 + use doc && dodoc docs/index.rst +} diff --git a/dev-python/starcluster/Manifest b/dev-python/starcluster/Manifest index d68905d..c7002e8 100644 --- a/dev-python/starcluster/Manifest +++ b/dev-python/starcluster/Manifest @@ -1 +1 @@ -DIST StarCluster-0.93.3.tar.gz 2334885 SHA256 fcda894be33ba309b1c7a94d6c28f1674c3f05ec756133138a39db2138d080d0 SHA512 f81cfc528a00f45f6e720645f44666947f1c51dd3453ac5d78b201d6c3a3cd9f6d97cb7a2802eaf04603d9a19810045ca6071722c9af884ba7e407ffc99078ea WHIRLPOOL b6bfde98f3b660211c5e08965cc6ee31fc9038ec4039ef5aa12ab9c5d474f60f66c1745fb93cce7e05cb361cff6091f60714168ffca81e4033f2fecc5d9d448f +DIST StarCluster-0.94.tar.gz 2356637 SHA256 0fea911c1363e6a42c2d5c097719e2681186866d0d829b184a6f53828c8f058a SHA512 8334f4a3f5923417feb56ed79f6e9bba8524171b2de7df71cb01348290d96d4721ad9aa4a2d253cbdaab3a3c3ffc28303a4b5761ea9ed06a92b017633f8fa324 WHIRLPOOL 830c25f24645d275b530777a7dcd4bb1c463bda924bb76e53ae8078df3a4455a658dc54054cb4e0dbf39bd2e13282b9db22749c5e343ee8625fe53317b5e46d8 diff --git a/dev-python/starcluster/files/starcluster-0.94-requires.patch b/dev-python/starcluster/files/starcluster-0.94-requires.patch new file mode 100644 index 0000000..e5d26fc --- /dev/null +++ b/dev-python/starcluster/files/starcluster-0.94-requires.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py b/setup.py +index b6c4f06..52f7ece 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,9 +30,9 @@ try: + extra = dict(test_suite="starcluster.tests", + tests_require="nose", + install_requires=["paramiko>=1.10.1", "boto>=2.9.8", +- "workerpool>=0.9.2", "Jinja2>=2.7", ++ "workerpool>=0.9.2", "Jinja2>=2.6", + "decorator>=3.4.0", "pyasn1>=0.1.7", +- "iptools>=0.6.1", "optcomplete>=1.2-devel"], ++ "iptools>=0.6.1", "optcomplete>=1.2"], + include_package_data=True, + entry_points=dict(console_scripts=console_scripts), + zip_safe=False) diff --git a/dev-python/starcluster/starcluster-0.93.3.ebuild b/dev-python/starcluster/starcluster-0.93.3.ebuild deleted file mode 100644 index 4bdd248..0000000 --- a/dev-python/starcluster/starcluster-0.93.3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: dev-python/starcluster-0.93.3.ebuild 2012/04/18 jtriley - -EAPI="4" - -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" -DISTUTILS_SRC_TEST="nosetests" - -inherit distutils bash-completion - -MY_PN="StarCluster" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="StarCluster is a utility for creating and managing general purpose computing clusters hosted on Amazon's Elastic Compute Cloud (EC2)." -HOMEPAGE="http://web.mit.edu/star/cluster" -SRC_URI="http://pypi.python.org/packages/source/S/${MY_PN}/${MY_P}.tar.gz" -LICENSE="LGPL-3" -KEYWORDS="~x86 ~amd64" -SLOT="0" - -IUSE="doc bash-completion" - -RDEPEND=">=dev-python/ssh-1.7.13 - >=dev-python/boto-2.3.0 - >=dev-python/jinja-2.6 - >=dev-python/decorator-3.1.1 - >=dev-python/pyasn1-0.0.13_beta - >=dev-python/workerpool-0.9.2" - -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) - test? ( dev-python/nose ) - dev-python/setuptools" - -S="${WORKDIR}/${MY_P}" - -PYTHON_MODNAME="${PN}" - -DOCS="docs/sphinx/*" - -src_compile() { - distutils_src_compile - if use doc; then - einfo "Generation of documentation" - pushd docs/sphinx > /dev/null - emake html || die "Generation of documentation failed" - popd > /dev/null - fi -} - -src_install() { - distutils_src_install --install-scripts="/usr/bin" - dobashcompletion completion/${PN}-completion.sh ${PN} - if use doc; then - dohtml -A txt -r docs/sphinx/_build/html/* - fi -} - -pkg_postinst() { - bash-completion_pkg_postinst - distutils_pkg_postinst -} diff --git a/dev-python/starcluster/starcluster-0.94.ebuild b/dev-python/starcluster/starcluster-0.94.ebuild new file mode 100644 index 0000000..8ba2d6d --- /dev/null +++ b/dev-python/starcluster/starcluster-0.94.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/starcluster-0.93.3-r1.ebuild,v 1.1 2013/04/19 13:56:41 idella4 Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) +DISTUTILS_SRC_TEST="nosetests" + +inherit distutils-r1 bash-completion-r1 +MY_PN=StarCluster +MY_P=${MY_PN}-${PV} + +DESCRIPTION="StarCluster is a Cluster Computing Toolkit for the Cloud (EC2)." +HOMEPAGE="http://star.mit.edu/cluster" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="LGPL-3" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="doc bash-completion epydoc" + +RDEPEND=">=dev-python/paramiko-1.10.1[${PYTHON_USEDEP}] + >=dev-python/boto-2.9.8[${PYTHON_USEDEP}] + >=dev-python/jinja-2.6[${PYTHON_USEDEP}] + >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}] + >=dev-python/workerpool-0.9.2[${PYTHON_USEDEP}] + >=dev-python/iptools-0.6.1[${PYTHON_USEDEP}] + >=dev-python/optcomplete-1.2" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/epydoc[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] ) + dev-python/setuptools[${PYTHON_USEDEP}]" + +S=${WORKDIR}/${MY_P} + +PATCHES=( "${FILESDIR}"/${P}-requires.patch ) + +python_compile_all() { + use doc && emake -C docs/sphinx html + mkdocs() { + local exit_status=0 + local msg="build with epydoc failed" + pushd docs/epydoc/ + PATH=$PATH:./ PYTHONPATH="${BUILD_DIR}/lib" ./build.sh || exit_status=1 + [[ $exit_status != 0 ]] && eerror "$msg" + popd sets + return $exit_status + } + use epydoc && mkdocs +} +python_install_all() { + distutils-r1_python_install_all + use bash-completion && newbashcomp completion/${PN}-completion.sh ${PN} + use doc && local HTML_DOCS=( docs/sphinx/_build/html/. ) + if use epydoc; then + docompress -x usr/share/doc/${PF}/apidocs/api-objects.txt + insinto usr/share/doc/${PF}/ + doins -r "${S}"/docs/apidocs/ + fi +} + +python_test() { + nosetests || die -v ${PN}/tests || die +} diff --git a/dev-python/starcluster/starcluster-0.9999.ebuild b/dev-python/starcluster/starcluster-0.9999.ebuild index a1b990f..0efd1d5 100644 --- a/dev-python/starcluster/starcluster-0.9999.ebuild +++ b/dev-python/starcluster/starcluster-0.9999.ebuild @@ -1,66 +1,66 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: dev-python/starcluster-0.9999.ebuild 2012/04/19 jtriley +EAPI=5 -EAPI="4" - -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" +PYTHON_COMPAT=( python{2_6,2_7} ) DISTUTILS_SRC_TEST="nosetests" -inherit distutils bash-completion git-2 +inherit distutils-r1 bash-completion-r1 git-2 MY_PN="StarCluster" MY_P="${MY_PN}-${PV}" -DESCRIPTION="StarCluster is a utility for creating and managing general purpose computing clusters hosted on Amazon's Elastic Compute Cloud (EC2)." -HOMEPAGE="http://web.mit.edu/star/cluster" +DESCRIPTION="StarCluster is a Cluster Computing Toolkit for the Cloud (EC2)." +HOMEPAGE="http://star.mit.edu/cluster" EGIT_REPO_URI="http://github.com/jtriley/${MY_PN}.git" EGIT_BRANCH="develop" LICENSE="LGPL-3" KEYWORDS="" SLOT="0" -IUSE="doc bash-completion" - -RDEPEND=">=dev-python/ssh-1.7.13 - >=dev-python/boto-2.3.0 - >=dev-python/jinja-2.6 - >=dev-python/decorator-3.1.1 - >=dev-python/pyasn1-0.0.13_beta - >=dev-python/workerpool-0.9.2" +IUSE="doc bash-completion epydoc" +RDEPEND=">=dev-python/paramiko-1.10.1[${PYTHON_USEDEP}] + >=dev-python/boto-2.9.8[${PYTHON_USEDEP}] + >=dev-python/jinja-2.7[${PYTHON_USEDEP}] + >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}] + >=dev-python/workerpool-0.9.2[${PYTHON_USEDEP}] + >=dev-python/optcomplete-1.2[${PYTHON_USEDEP}] + >=dev-python/iptools-0.6.1[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) - test? ( dev-python/nose ) - dev-python/setuptools" + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/epydoc[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] ) + dev-python/setuptools[${PYTHON_USEDEP}]" S="${WORKDIR}/${MY_P}" -PYTHON_MODNAME="${PN}" - -DOCS="docs/sphinx/*" - -src_compile() { - distutils_src_compile - if use doc; then - einfo "Generation of documentation" - pushd docs/sphinx > /dev/null - emake html || die "Generation of documentation failed" - popd > /dev/null - fi +python_compile_all() { + use doc && emake -C docs/sphinx html + mkdocs() { + local exit_status=0 + local msg="build with epydoc failed" + pushd docs/epydoc/ + PATH=$PATH:./ PYTHONPATH="${BUILD_DIR}/lib" ./build.sh || exit_status=1 + [[ $exit_status != 0 ]] && eerror "$msg" + popd sets + return $exit_status + } + use epydoc && mkdocs } +python_install() { + dobashcomp "${S}"/completion/${PN}-completion.sh ${PN} -src_install() { - distutils_src_install --install-scripts="/usr/bin" - dobashcompletion completion/${PN}-completion.sh ${PN} - if use doc; then - dohtml -A txt -r docs/sphinx/_build/html/* + use doc && dohtml -r docs/sphinx/_build/html/ + if use epydoc; then + docompress -x usr/share/doc/${PF}/apidocs/api-objects.txt + insinto usr/share/doc/${PF}/ + doins -r "${S}"/docs/apidocs/ fi } -pkg_postinst() { - bash-completion_pkg_postinst - distutils_pkg_postinst +python_test() { + nosetests || die -v ${PN}/tests || die } -- cgit v1.2.3-65-gdbad