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

Package-Manager: portage-2.1.13.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x5C350883

5 files changed, 25 insertions, 90 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/Manifest b/app-admin/salt/Manifest
index 6b03ff27f9d0..115fa414e057 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -7,27 +7,25 @@ AUX minion-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a
 AUX minion-initd-1 391 SHA256 1e927cf84e4baa368384d148b1b4ca544b53678f5f99280cc3e271ad28010161 SHA512 1d5ea1cd4dfac33ba93b391bfa36ba6ae0b5fc9399762fa0a4ac4165842da82550810264ccb63036b6ff1bc4f4c56aedee79900676894880832f1fb51c487130 WHIRLPOOL 53f21e804bae7067df2240c7143f0208e121873f5071714b4f7c4caceab3ea60d748d00bfa297b8a4fef0c58a3ad9933acb2a2eb6767e1dd51e7147f186cc626
 AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed WHIRLPOOL fed0dffe202d776cd5f1b74a28c5dac69b082603c9ddf695616a0a6bca5084b9589f1f4d03313f7271754166a9aa136c06aa61e6fd2e3b02d829798aa741c432
 AUX syndic-initd-1 390 SHA256 c9f76eadde7ab72728810dcefcf482f7e06afa398080b9866dd3424b924ac92e SHA512 b91a423031555a810c343f49eafc1e95b3a48f1491c42b5979240f73998b6c4cde679a886234020de7136df83b3da7f92590f9dee345f694678f4b386e5defb2 WHIRLPOOL 1d5feb3915a4986a66dce3ef84fd235cbcfdbd5611e5edb51005d97de81dfd1ad2998e252c0b48276983037c8faf39f40d3880a87c55fb9f42f62c7822c9cd61
-DIST salt-0.15.3.tar.gz 3427038 SHA256 19e2ca70b60cad9a2752d1c16d007a243f3dbf4a00bba24d8ecfba1b59e135b2 SHA512 f3cb1956862b3390b8f5bf2fa23dff42f98d4a413c8ba247241e9be06185a9a1ca2aa95f39fecfacc932d4287085e0e56547edf10f94f2f634005941486ff434 WHIRLPOOL 4904879107aead968104bb671d25e57fc6e6e3bd4ed9a01c9edfb225e6ce3d07138e3fda4eb0a3c8ff0bbc3b5214c4ca42026e8708f1a1d798f3f6a59f988138
 DIST salt-0.16.0.tar.gz 3523789 SHA256 2f79012838a5e674f5cd2126326606bffc3b3cb24c33d8667a11158241b656fc SHA512 1f02b20b71922717cf1ae4ab012e0e2b502a57d52b06ed446ab2fb3ce08912b1bc0a4ed702b0189b1890588af7b3ce94d98bc61815d9d3c03e650b88205fc7f9 WHIRLPOOL 5a597b3804576a5ace0e3f6cd937f81db25bf95b731f646a153c9af2bd28826116b2300f125e02cb5929c1dc8a1a4afcff446be2ee7c7bf2546a3b279f4930ab
-EBUILD salt-0.15.3.ebuild 1919 SHA256 41f1f85d4cfe82c5b11a6832599c256dafb65d098dd48612fbafdc7bc0f25814 SHA512 47a2212927632e09163d4693802c0df19ff3c07d42a3befafec32d23a4dcb888d4cab0e346a4246c3fa9cac9093fce9a25525348cc3a77c4912332c207914e6a WHIRLPOOL 3545cd33e24120307d714d37c1515303983835567ad41fc71fb9f55cb0a3d659f33f2de0cda99f9a302e758e1da93236390ab12779711a4f54096c6312ba3a18
-EBUILD salt-0.16.0.ebuild 1919 SHA256 bfac36af18a2ce5277b4e179ae45e971d39d7daf2958087e03ab9e44e04ce955 SHA512 048a839f7ae28d994d63bc778cfb1500d31d9a3ef20b2bf283321522a4c880962eb465f5aaee71fd3ed049ec7fec0897c8f8575d0c0c0112f707e5fc525a7ce3 WHIRLPOOL c83caf18db36fc743474d7a94b7cd2ace0a37e509ee4b9fc87426137b8aadd3b5001a2ba0b63e139dffa71637c6f79be2f6cae44bf3810b4b9b6bb159e8fdda9
-EBUILD salt-9999.ebuild 1917 SHA256 2dad2d0ac5b758f8e60c58d7d25e9a52067aa70b59879abbc13c12a9dc66ce2e SHA512 239e63ecf56ab045767f606370afe5ad770c299b90bae29179a1809c3ecbd6fd8ca7685a09b61f1436edaaf3e662e445d2709421d526d2f3bdf5d884ab223ba1 WHIRLPOOL a5114dbe6e804d7551984a83ef3bbbfc38ac59ba997e179412a6cefdb98bf4f17789278d1f418112a5838ad510ac59d88db9128e54f21e0729630b43c0a6a4c6
-MISC ChangeLog 3235 SHA256 41369293381563d2c6df55fd81c22b4be5ca7d1a9d210e0ed579f2a76db8bda8 SHA512 ab61e8cfb1955b3f99d1333d0b09ccd79dd44d38bb3c91c3df9879abc8acee8072faac0bb3db3b558c3905de86e918c33ca0713c172cc92e36a276af33739203 WHIRLPOOL 4e2664d9a616c1f5c6e44bb90a6cff6216a1144980716c4bbbe956c7eccd829364faf60fe927399c7278d77fb5d5670f7b934be1d5b3ac12fbb58be0d63f1fb9
+EBUILD salt-0.16.0.ebuild 1939 SHA256 56489702929c74ecd47323dc211df295795815d7330933e8d64b465ec18cd680 SHA512 7e58ff7423de29b9f751a9ff94e09c70057a06b21453d3cc36252b4d9303a493a2750261e0d6547411fafc0efc5e7cb62a2950a8ebaab1ff0a0a36b94a32bab1 WHIRLPOOL d00d3ec3b7947c68acc455ca94d5e68a40d7f814f57d4b9d3644ac76db0a86705d45b9c56283718ae0139324506d690e503279238f82667784fb3345858d7bfb
+EBUILD salt-9999.ebuild 1937 SHA256 4fe7fef0f0d06e22a8e9515e96910cb77c3a6f3c671c5824a4739390b512a03e SHA512 a642743fd6cb1f191c8d2e4c2ef8fe24fbc4d1d8e89095ea572ed0ef6e230c1cf444887f6aacff2332c85e9b9c30aebc5cf54868514366024a3e54ae902b8315 WHIRLPOOL 5debe7b070b59dbf20a015bc04e478932e7c3ef72699586d5dc4c2af8a5ea87774683762e2089ffd610900b2ef51ff8583201e25293b92a85a4d0097e4b9afd3
+MISC ChangeLog 3413 SHA256 787e14476060d32cc00f4fbb19419adbedde94216878a232b7831aafa6542cea SHA512 3798727a5e41a7ec57ab9a7c6bfcb06d2e2f4a2cc87c6f2550a777cc805fb4db1aecd0abbac6f530f03553798df82cf2223f4c9d91daca8a0e99797346be780c WHIRLPOOL d157daa893e95924c491a7660d1c3a4051383321fb0453ee9ff0dae3a6c0dc12e3208c40f9df84c1f1b4a00b1494dc83a5af7f72eabc8097c2e93263f4d9441c
 MISC metadata.xml 1349 SHA256 c381390f62360f243ee210d099ddfddfc81632186db11964416e5faeb5ef0256 SHA512 dc7da5bb40585036807c1158bd50bdb72f51e4d4255fa1f6b07c2d91fb39cfeda50d288c3367b3e23ee8adfeaddb05840f276639ed045ff5696f4a5c2d5375b3 WHIRLPOOL f137a52155ad3d3f2a5deb5ba66ea7a986d77c1ea271072e63bba5070619e87ba0838412d466abb6fdac705d45bc5fc06ce1950a78d95a8bf5b8932f8c8504fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR3KUDAAoJEHy/RO9cNQiDK08P/ROaA2cKGWLPk+Q9XP8YGLOR
-sBqdzfvf8fxedP53UPEL1cS6+6nu/8r7NTDhOEX5aZHiktFv+ceDpusnv3TvU8Qz
-v6MX249E9H8lS7O5t8Z0/XbmSLD4AdcPyNff865brgM/VLCORN8dvKYPoY4a8Gdu
-r2LvEIQPfuhsS2qfloziNzMBPaVUWXkcwwJ7C3jp2xgUAtz4KSMAw58oLmpmJEEC
-8hrR8eUKCg4OKAroAl6RyO11IOsVrjkkn2jU10YECLldskWrXUJZS+9F+H1WICzH
-CKStm1viaPlshklEsPKeiaFt5i07co6RiVAnutb9aNUM/AhX9aQJtCNQdj7ZYxWY
-GPwLKIYHESFk17tuAdfRaSZk4mn6rCo2G4stP69GL9g60DmYEUCIHBm6Aw2cRnKc
-GWH2WXsEnkKCOk19ykKPB4JOjZbOFCa0b7+QzF2OMvCDZQoPS0fX4xC5VC7+sM4N
-s2ubWaWCsgh8DFXZRcLGE4orjBwOPIfijfOfgjOysVfer3ojFB4bYdQKqhDaaD36
-JKSUZWqQxWUV3MVDmtf+E38e9XU/1luaVGnvI5JwXPJ+CbGlYJa5HIBPjjE8tPSj
-luOSwIowHTErPS9tspOvMAekSrg4cYwStouFtZ8iYnIdENvbgRQJHTW7S2PC4mG2
-rO34Qap91iGbR16O7aob
-=43/Q
+iQIcBAEBCAAGBQJR++uMAAoJEHy/RO9cNQiDETUP/2VOn+w1bTDsUahtTMKR/vXJ
+aQyL74DJno2UGK44x98Nq9HvDvqa5MafVgbAoTz9QoIWLya9g3/g64+9rRee9oqM
+Z4+Y6p8M4g1FuCKOAgozNiy5CIUuG4uF0eY9Tu/QqsEmCEvQ6rocwijibG97VX4m
+qyw2xQwOKdRgYElTW3+AvP1spUS+bD9dp9bMenFUOsldqpX0jJy+XrRILA6XKaX/
+EKsuFth7gP5W1AdR3+DqAvDJ210UvA6CWU2SDM4qp/8hx6kgNjQ8EF67NYB3Qfg+
+bfhLMliScIJl2rw0UMm7KHIkSbRHRv6g1JlGC9lKWd24CAFDwf4TnZV82AIXDBrJ
+Lq+Rlz6hr4AWPkMwhlxEhvYkGEdubd3gg/Mmsow5onpexWPvbFHgOII7h3IAt1JV
+CoPwrKz3bDAkErFaSXXKwhFE7k8CXgj6aV63R1qHncrWWaYGJ29bZZgCKB0+f4bw
+f2Jq9FTj1yzwTgsVqcJdwTrIbZyILgD1hlDOMwI+qMpC1751KIEour7gJS8c2HPD
+hAVSL7MR/KG1H89qAZ58IEEmO2zk5W7r93xv1MRpjVRYMuTbi56QpGgjBYj5TWuF
+DkNN/8M9KEDHDFvkKbUp+07384egbGc6MyiFI1rcmh3p5xcoiCHrtVWSGh3AayPo
+IEDo13+n1Eq4Mdi9O3UF
+=Y/RW
 -----END PGP SIGNATURE-----
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}] )