Remove previous version.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

3 files changed, 18 insertions, 107 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index ba2642602a6a..f5b1138f0004 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.41 2014/07/09 21:58:37 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.42 2014/07/09 22:00:04 chutzpah Exp $
+
+  09 Jul 2014; Patrick McLean <chutzpah@gentoo.org> -salt-2014.1.6.ebuild:
+  Remove previous version.
 
 *salt-2014.1.7 (09 Jul 2014)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 1e9f28f6e708..c48a8068a9c4 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -19,30 +19,28 @@ AUX syndic-initd-2 405 SHA256 9deb3f395a9d47558bcdb709d4f1f68f7ab72286fc0933e172
 AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb77614e810a7bf8c SHA512 0be38f5ec653852459b28b319c1c1b99b0a22b2cbeeadc27ccdbbc574e0a138e3d11f44b257b818655ac156fc3c6e719cde6c98391173621488e2c3000b4313f WHIRLPOOL 88c0c3f8def37e3bc2fb96c5af679ee8813f03f537bcb4356eab07c3eedb01debd1844e87ecba0d8927cc43d81191ab00efea481e9f9143b8c647ab5ae160ed7
 DIST salt-0.17.4.tar.gz 1871032 SHA256 5a7b3f4d5c22aa4b8e7c03d60dc429b0428c575fb8f0c285616239c0fe5a0ddd SHA512 3ea8d42c321d111bc3d277167c85a3ac6eb99c97eb5d53030e462372d227e0a0c2a93b4b13eae38eed2e73ec591e1e78b535493bf77d66c3d19102baf13cb445 WHIRLPOOL 27acf1f7adb0fbe9ad393711d6bd5998feb090f5bb38ec05d11dbd85a434ffbb19d921ec90e462a212ff080729a553701ca1d750fe8b31346e903e8944285180
 DIST salt-2014.1.5.tar.gz 2800978 SHA256 0b69e831b0446f3bee47407a8cb455eb0fd05fbdf4b27abeff10dd29e0ca8e1d SHA512 3eef5e3efa3f999921ec7ea66ffc4598875c0592a880e686fe4b2f535130451c166867cee1fef0076b97deadca57dafede31d04c8449811591116e356f574725 WHIRLPOOL f2bfd3c53fb1a4ed0ce8803499aad0a23d39da53417c43e7d1c7ee747facfe1837aa5d13f8d3da61cb7fac714f387d7043ec9c10f3aaf2c58f7c87b3ad318ab9
-DIST salt-2014.1.6.tar.gz 2813353 SHA256 8224955d3545afb306ae246c414e1816dee1b151dd5b4451d36c3e40d0e22652 SHA512 5bcde15e7836ec80cb59907569db72b97efd6167ebf38a4ab37990ac646eee60f49b83ea1ca7747383fe480d6b9899f3949d1930dbb915e58ff446152463902a WHIRLPOOL d9c48ebe475d10b018b2e9fe56da16b41000a28c2768cbb65df97f5af2266a2eec62de6ab0ccd9762f934e360a67d8101dea2152ec036440966d501d775c4eb0
 DIST salt-2014.1.7.tar.gz 2813070 SHA256 6f48ebe9bf78899f43bdbbf065fdb7c5f6852ba78c91850b3ed42d21b906122a SHA512 bcca55e922d44dda4d608c12bc9548e38ca9ca812200f95437983b197b1a6af2d4e8eb640c7510fef109346ec4e986ee621fad9ebfb9c6ef6df9ad61cf5ea71d WHIRLPOOL 21986273deefa50ee6189e582ffe161a1f5c068dffa2d74b37ac42e81513d5314d28cd2e3a2dbdb4edb38fa016328a501f75a02189fa92afb071802359e27589
 EBUILD salt-0.17.4-r2.ebuild 2214 SHA256 99ac240c300950df1617983b0094e4f47361659d25a5d55a7afc01620c4de489 SHA512 e8c473134a71308b41293849f06d0378b72f7bb1f1479927b9bbd8bdcb4c4868d55ccda5e53f7bbdcb6068b14b089de8a80061b851d86307dd819240711c0edc WHIRLPOOL 5ca3224a701065b9bacd6dcfb4fd807e4d1fd8009a090724e60c7117d9e12025074616aca8b966742d60fb424402aed9ed40a93f78f00b9975bb1e538a36f6de
 EBUILD salt-2014.1.5-r1.ebuild 2602 SHA256 234d2ca907fa609008a119cb36b23ad2106869efe3eaf9f39e8be8af04a42b88 SHA512 cbd0ef7301a92d16c5f56ff0e196c5f28e312090c5b3d576522423d7b253fa20f6747ac8fb907810189b5a5115e00129ccaab1912b50a199c4ffd1e0405f81a7 WHIRLPOOL 1143f4ad30989f9950ae69f84b268756688b4aa24c8d0249b6ee84f432c34efc94eff188624cafdd79f0718f0122225f1dc2d71eaddab87470231ad0bee4161f
 EBUILD salt-2014.1.5.ebuild 2560 SHA256 2f4c7eeee943198fb6eae1df8504249e762f6e423c7a5b1626e149b042ab3b19 SHA512 be86f29f6a08c19d425aec84d1c381b5f3cd68d9cb677929acd671303f6b5bf5c2ed343e7e58e0210c9ae30793b69a0af03d7159a6006b3a83ec26c020865e86 WHIRLPOOL b1f31482dbea7f5b3472525353c1482d60a1e0b68301409eb36665340d5c9b75de4de88d342dc22b0f796faed099b50184eaf74197fa0586a8d533bde888c84a
-EBUILD salt-2014.1.6.ebuild 2641 SHA256 325bc9901d1ec1d71fbadc93f4c336783944e7e9be0c22312946a909231fd1f3 SHA512 7c4beb7b0dc15eb2e66bba331327ba7e0b10e94686ab79b58f643358a1d33f16a990ea10ce39a05ca73aa18ab134caf4611f40525dcda6d58c962e0aceabbaeb WHIRLPOOL 2bcfe59452c8b31cc8b07edd3a24ac10fbec28db7b6e948c1852bdd3869b23415c206674e5231b9b096d66b8320cf453c6598d807fad8b9bec4bd489815a778f
 EBUILD salt-2014.1.7.ebuild 2641 SHA256 4cc243ffbc8ce68ba23d5a5fa0b2178230c4f8dbc336d76ba0bd4124bc4380eb SHA512 b23efe8dd5cfd99988fd6f97cec267727d5fdaab1c86a9cfffd9d6174f2f2d624bd688a2961ce686d7ec8d2d50c83e033562e9b353b171b084e78d8ef8bb6498 WHIRLPOOL a04913d362d814d4d860831f2b2db6a9fa772f2e2b1e8555ef4ad0dadbe666d007a556485cb3c4ffb25d6f85f15b8c878645f6c4fc08e177e252094c1fff23d3
 EBUILD salt-9999.ebuild 2516 SHA256 96a543fbb9c32fe6d591be6748c1dc061d8e01b5a0806d48d2899fc937fb81de SHA512 d699a4199f48a704cbf13dd72822e455374ea544902db99f4d527f836dd3942830b7468d230a159d10e1447e48a4087fadf1d13089935bb31b1cfc2408ef7bc8 WHIRLPOOL d19ea6462062990496ff92a0010963f258d8ff80276329dd4de319e615a293e51e6002ff6c8641b8a83996df0f0384e761ec8f719e1b8f3e717b12a82d782c7c
-MISC ChangeLog 7508 SHA256 0d4fbcca022daecf19efbc6ac289c1bf5f7fb39b4fb566fe67b09150a258584a SHA512 b3cc492d699740c85d9128b737b437539f82bc9cd600ae478a9afe291a3e556128f7c0bb9e7df7f30e0a8ceb867c0354a50b6381162dca22b642eeb051eb5c9e WHIRLPOOL 8398e7d470b2f1f1537b1d4295de80058f68fa8a97c0aa419cefee6d6c09470a3eb7c7830ac24b77914881f44342a13495efa16a0ae987e943fbc3eb52843259
+MISC ChangeLog 7611 SHA256 765b570b1b38ec07b5b3b7fefe5f854895f2e6cfc92ead8d8e96b3f41e2ff142 SHA512 27afdaba852d4a96dd8f398f971e2421186a5068b81757a7aef06f5e2fd2e1a2d0f85deeec28b7617ac92a1c4d0f4a6555d8ba29d3c9145bf257c27a0a7c122d WHIRLPOOL 456a75e409e5579a5348456d03628c3aa36e3125011aac2b88875996eed3c30f4cc61c83623ce2cab9e780f21d99df23a67a4d4c1e2f374ba36682f621e8fb3e
 MISC metadata.xml 1506 SHA256 ae73efc765e4fcb1806a7f8da5e27e00fd3c42b90494ba9870304b9abd49df93 SHA512 00d2c68cd6edb7ae2b26c5b16dc182d136dd2969844a5dbedc1864b5af8783885fc597f20df427dbfa57cc1a59c1e43299c6aa7ecf7d1a5a9e512b2f61a1c8f4 WHIRLPOOL 29859710a53a6cba45848b8ea0cb283c268124c592d5b95e31b7956b3e95449f607a7675087f851933b661252a7599eda869b04116279ca00261fa2008cde929
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTvbsPAAoJEHy/RO9cNQiD3xsP/ReKK/2uFAOuO8bRqoCGCCiA
-aa/QtsKtleW3GiAWvTWBW1FNkmNodTjzMmT1K5IL+lra1xejzuSQCpac+D7IvXkV
-XimQWksyDiORHt91pxBMHa408cAeRRH4q/7s/ahegUYteBxRtMzbuHRvtRMP+lr3
-CPqbzz9hITv60y582h33ar+nehNVFa+iwkLOvZ0mhKkxkxYzhD9HHh/QIuOK8ASa
-yHD+4Mzj+/JKvqbXBmeGsepy+w+Ywsc1zc6A1Uil661SZXWwwmt8Y79thYOCeAtC
-LAvWyAOJMuLrittn2pvQjXokwaVsv0RJ4Cio7IDp9UTzaWznFKv3QEjdHGuHK1wu
-tKXNz0D1Pj9/Il/0WCkSNte/qJLsVPqbl1EgENI882l6DYAk+ESbcyfLVMYoFcOS
-RRGFtNdW0oy1FETHBXbzPchJdP9pZhCIuSkXx8AaSR9q5UgYchzfx81nK8lWf7L+
-a/0kOdsyetVKTTsMPf33H2gh1IVfFy62udPH3GxIVpRs7O1ExxN8GEMjIf5bEX8n
-QYAQM8ganBBWf2FoFPMpj1o+5gSYyO7KBXN6qFoHVu76B7IWqzCcbUSuECyD1sRZ
-WyBhZGwBQza3W7fo6Gynf9UuBu/dw6Wzkkfnns0r0WpvtVTKCLb9zXuslLhOaFID
-can7dNnoBpOBkbk886+4
-=Cv+D
+iQIcBAEBCAAGBQJTvbtmAAoJEHy/RO9cNQiDmAsP/20Oy/f4o+uhwwPGg336tUvS
+fR7o6ovV0jgYaFs8TQAbmwutwGqSjz4cBrJZnYshl+Sam50lHGZIm20ZaPljkuu4
+KRVfxGSQXJZEG0OaffKglKgrEYsXdfjb9N+M8KRLxDGeE9HJO4+kOvJO8tCZoM6d
+YRQ68Z4xoj89tzkaDZCsxVQ6ceUdHAbrtU4yueKHiuCbgT9FDMkxYqOCnW1DRejt
++y/pfYVLmz1Emi3cQ1LZObQnI8KERpZNq2Z75P9kqbHYbWlUdUnLGPybdiZG2MGX
+sZIitYWQbyM0NvzyxV0jMaDL/NhLXhj8vYb5zSIDuh25miBuXrmiaTJgwibrgZpj
+ASqOaz0fv6Oh58pnmw2kQgJBNaQcmBoBsI230ribs+gHEJagOo8gqQEl6Vr4lh/s
+85Nh2CyUgwiKZf8GjJCJf3SIgHrglVwleSmGamrmMpkywVQgzvUcKi9ewOVenSil
+KwH28kJYp5QmycNipdKfSt4riKRGnDYKhf3QzhMib83zN+e7a9TFhq9rHHBCQvVS
+x4UmvlcU9+4cMXQCkqLigkw0blVe2orLCUPQ1CtFg9Knm9Q2R1Hnm38pDypE77AZ
+snqmmNkAwxb7r+zPM7x0eXdLMe8JO1dPyr1uxcLcpPxfjwKmdATPajlWAwZF1FdZ
+urEkAZ5+6Vfhb3y8gela
+=qsKD
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-2014.1.6.ebuild b/app-admin/salt/salt-2014.1.6.ebuild
deleted file mode 100644
index 28c62a1e03c0..000000000000
--- a/app-admin/salt/salt-2014.1.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.6.ebuild,v 1.1 2014/07/08 21:45:21 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1 systemd
-
-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 libcloud libvirt mako mongodb mysql openssl redis timelib test"
-
-RDEPEND=">=dev-python/pyzmq-2.2.0[${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}]
-		libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-		sys-apps/pciutils
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/pip
-			dev-python/virtualenv
-			dev-python/timelib
-			>=dev-python/SaltTesting-2014.4.24
-			${RDEPEND}
-		)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch"
-	"${FILESDIR}/${PN}-2014.1.5-tests-nonroot.patch"
-	"${FILESDIR}/${PN}-2014.1.5-minion-error.patch"
-)
-DOCS=(README.rst AUTHORS)
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-		systemd_dounit "${FILESDIR}"/salt-${s}.service
-	done
-
-	insinto /etc/${PN}
-	doins conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
-}