revbump; substitute dobashcomp with newbashcomp, fixes Bug #526274, rm prior ebuilds

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 13 insertions, 81 deletions

diff --git a/dev-python/starcluster/ChangeLog b/dev-python/starcluster/ChangeLog
index 589e6e8543b8..c3c32cd914a8 100644
--- a/dev-python/starcluster/ChangeLog
+++ b/dev-python/starcluster/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/starcluster
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/ChangeLog,v 1.9 2014/08/28 11:16:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/ChangeLog,v 1.10 2014/10/22 15:20:34 idella4 Exp $
+
+*starcluster-0.93.3-r2 (22 Oct 2014)
+
+  22 Oct 2014; Ian Delaney <idella4@gentoo.org> +starcluster-0.93.3-r2.ebuild,
+  -starcluster-0.93.3-r1.ebuild, -starcluster-0.93.3.ebuild:
+  revbump; substitute dobashcomp with newbashcomp, fixes Bug #526274, rm prior
+  ebuilds
 
   28 Aug 2014; Michał Górny <mgorny@gentoo.org> starcluster-0.93.3-r1.ebuild,
   starcluster-0.93.3.ebuild:
diff --git a/dev-python/starcluster/starcluster-0.93.3-r1.ebuild b/dev-python/starcluster/starcluster-0.93.3-r2.ebuild
index 2deb04ed81e2..c47556aa6450 100644
--- a/dev-python/starcluster/starcluster-0.93.3-r1.ebuild
+++ b/dev-python/starcluster/starcluster-0.93.3-r2.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2014 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.2 2014/08/28 11:16:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/starcluster-0.93.3-r2.ebuild,v 1.1 2014/10/22 15:20:34 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
-DISTUTILS_SRC_TEST="nosetests"
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 bash-completion-r1
 MY_PN=StarCluster
@@ -49,9 +48,10 @@ python_compile_all() {
 	}
 	use epydoc && mkdocs
 }
-python_install() {
-	dobashcomp "${S}"/completion/${PN}-completion.sh ${PN}
 
+python_install() {
+	distutils-r1_python_install
+	newbashcomp "${S}"/completion/${PN}-completion.sh ${PN}
 	use doc && dohtml -r docs/sphinx/_build/html/
 	if use epydoc; then
 		docompress -x usr/share/doc/${PF}/apidocs/api-objects.txt
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 4919b6f7f64a..000000000000
--- a/dev-python/starcluster/starcluster-0.93.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 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.ebuild,v 1.7 2014/08/28 11:16:05 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils bash-completion-r1 eutils
-MY_PN=StarCluster
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Utility for creating / managing general purpose computing clusters"
-HOMEPAGE="http://web.mit.edu/star/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 epydoc"
-
-RDEPEND=">=dev-python/ssh-1.7.13
-	>=dev-python/boto-2.3.0
-	>=dev-python/jinja-2.6-r1
-	>=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
-	dev-python/epydoc
-	dev-python/matplotlib )
-	dev-python/setuptools"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-requires.patch
-}
-
-src_compile() {
-	distutils_src_compile
-	use doc && emake -C docs/sphinx html
-
-	mkdocs() {
-		local exit_status=0
-		local msg="build with epydoc failed"
-		pushd docs/epydoc/
-		PATH=$PATH:./ PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" ./build.sh || exit_status=1
-		[[ $exit_status != 0 ]] && eerror "$msg"
-		popd sets
-		return $exit_status
-	}
-	use epydoc && python_execute_function -f mkdocs
-}
-
-src_install() {
-	distutils_src_install
-
-	dobashcomp completion/${PN}-completion.sh ${PN}
-
-	use doc && dohtml -r docs/sphinx/_build/html/
-	if use epydoc; then
-		docompress -x usr/share/doc/${P}/apidocs/api-objects.txt
-		insinto usr/share/doc/${P}/
-		doins -r docs/apidocs/
-	fi
-}
-
-src_test() {
-	distutils_src_test -v ${PN}/tests
-}