Remove old versions, removing 0.14.1 from the tree due to bug #475438.

(Portage version: 2.1.12.10/cvs/Linux x86_64, signed Manifest commit with key 5C350883)

4 files changed, 5 insertions, 152 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 0e146d0cbf69..508a3ece9782 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.16 2013/06/04 17:33:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.17 2013/07/02 23:34:25 chutzpah Exp $
+
+  02 Jul 2013; Patrick McLean <chutz@gentoo.org> -salt-0.14.1.ebuild,
+  -salt-0.15.1.ebuild, -files/salt-0.13.1-disable-failing-tests.patch:
+  Remove old versions, removing 0.14.1 from the tree due to bug #475438.
 
 *salt-0.15.3 (04 Jun 2013)
 
diff --git a/app-admin/salt/files/salt-0.13.1-disable-failing-tests.patch b/app-admin/salt/files/salt-0.13.1-disable-failing-tests.patch
deleted file mode 100644
index c646413b278e..000000000000
--- a/app-admin/salt/files/salt-0.13.1-disable-failing-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tests/unit/modules/win_status_test.py b/tests/unit/modules/win_status_test.py
-index d3bb7a6..5f8ecb0 100644
---- a/tests/unit/modules/win_status_test.py
-+++ b/tests/unit/modules/win_status_test.py
-@@ -184,8 +184,9 @@ class TestProcsComInitialization(TestProcsBase):
-         self.expected_calls = [call()] * call_count
- 
-     def test_initialize_and_unintialize_called(self):
--        pythoncom.CoInitialize.assert_has_calls(self.expected_calls)
--        pythoncom.CoUninitialize.assert_has_calls(self.expected_calls)
-+        pass
-+        #pythoncom.CoInitialize.assert_has_calls(self.expected_calls)
-+        #pythoncom.CoUninitialize.assert_has_calls(self.expected_calls)
- 
- 
- if __name__ == "__main__":
diff --git a/app-admin/salt/salt-0.14.1.ebuild b/app-admin/salt/salt-0.14.1.ebuild
deleted file mode 100644
index 0e7d9b0d1f0a..000000000000
--- a/app-admin/salt/salt-0.14.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.14.1.ebuild,v 1.1 2013/04/16 00:51:35 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager."
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libvirt mongodb mysql openssl redis test"
-
-RDEPEND=">=dev-python/pyzmq-2.1.9
-		dev-python/msgpack
-		dev-python/pyyaml
-		dev-python/m2crypto
-		dev-python/pycrypto
-		dev-python/pycryptopp
-		dev-python/jinja
-		ldap? ( dev-python/python-ldap )
-		openssl? ( dev-python/pyopenssl )
-		libvirt? ( app-emulation/libvirt[python] )
-		mongodb? ( dev-python/pymongo )
-		mysql? ( dev-python/mysql-python )
-		redis? ( dev-python/redis-py )"
-DEPEND="test? (
-			dev-python/virtualenv
-			${RDEPEND}
-		)"
-
-src_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-	done
-
-	dodoc README.rst AUTHORS
-}
-
-python_test() {
-	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
-}
diff --git a/app-admin/salt/salt-0.15.1.ebuild b/app-admin/salt/salt-0.15.1.ebuild
deleted file mode 100644
index 6287ef115a1b..000000000000
--- a/app-admin/salt/salt-0.15.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.15.1.ebuild,v 1.1 2013/05/11 01:02:48 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager."
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis test"
-
-RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( app-emulation/libvirt[python] )
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/virtualenv
-			${RDEPEND}
-		)"
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-}
-
-python_install_all() {
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-	done
-
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc README.rst AUTHORS
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
-}