Add RDEPEND on pciutils (bug #479450). Clean out version 0.15.3.

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

4 files changed, 9 insertions, 72 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index e0a8c4e1f79f..9569af2b09df 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.18 2013/07/10 00:02:54 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.19 2013/08/02 17:25:31 chutzpah Exp $
+
+  02 Aug 2013; Patrick McLean <chutz@gentoo.org> -salt-0.15.3.ebuild,
+  salt-0.16.0.ebuild, salt-9999.ebuild:
+  Add RDEPEND on pciutils (bug #479450). Clean out version 0.15.3.
 
 *salt-0.16.0 (10 Jul 2013)
 
diff --git a/app-admin/salt/salt-0.15.3.ebuild b/app-admin/salt/salt-0.15.3.ebuild
deleted file mode 100644
index 372ffcb4541c..000000000000
--- a/app-admin/salt/salt-0.15.3.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.3.ebuild,v 1.1 2013/06/04 17:33:41 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
-}
diff --git a/app-admin/salt/salt-0.16.0.ebuild b/app-admin/salt/salt-0.16.0.ebuild
index cb556eddb2f4..52d995904ee0 100644
--- a/app-admin/salt/salt-0.16.0.ebuild
+++ b/app-admin/salt/salt-0.16.0.ebuild
@@ -1,6 +1,6 @@
 # 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.16.0.ebuild,v 1.1 2013/07/10 00:02:54 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.16.0.ebuild,v 1.2 2013/08/02 17:25:31 chutzpah Exp $
 
 EAPI=5
 
@@ -34,6 +34,7 @@ RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
 		dev-python/pycryptopp[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
+		sys-apps/pciutils
 		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
 		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
index 5f20ef1bfc55..6b65031e0eb6 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.5 2013/05/04 23:11:34 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.6 2013/08/02 17:25:31 chutzpah Exp $
 
 EAPI=5
 
@@ -34,6 +34,7 @@ RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
 		dev-python/pycryptopp[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
+		sys-apps/pciutils
 		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
 		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )