Actually clean out old versions.

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

4 files changed, 19 insertions, 235 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 600d4800fc7a..bc7acc814317 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.55 2015/02/17 20:07:03 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.56 2015/02/17 20:08:27 chutzpah Exp $
+
+  17 Feb 2015; Patrick McLean <chutzpah@gentoo.org> -salt-2014.7.0-r1.ebuild,
+  -salt-2014.7.1.ebuild:
+  Actually clean out old versions.
 
 *salt-2014.7.2 (17 Feb 2015)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 805a46a998ac..e505d7360579 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -20,30 +20,27 @@ AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a
 AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb77614e810a7bf8c SHA512 0be38f5ec653852459b28b319c1c1b99b0a22b2cbeeadc27ccdbbc574e0a138e3d11f44b257b818655ac156fc3c6e719cde6c98391173621488e2c3000b4313f WHIRLPOOL 88c0c3f8def37e3bc2fb96c5af679ee8813f03f537bcb4356eab07c3eedb01debd1844e87ecba0d8927cc43d81191ab00efea481e9f9143b8c647ab5ae160ed7
 DIST salt-2014.1.13.tar.gz 2846659 SHA256 0ab37478e18e6490eccef4deb9f77a20c99ffcc6f97b48e25eb546f8b73f3c22 SHA512 967f7759cbeb55dba0842c8f6efa281a28afa3e9ad7fd0771c587629e8e601cdaf440573e2453e1f21ec3dafa01f0b042ecbd1faa515c9d088cefb19f6ce6629 WHIRLPOOL d992900416f55f857f7685b2110fad6aa43e5859005259dc7db66853aa57c74a8ac06c1894d4c4bf26959c61ccacdff3273c1cbf18039ec005d36fffbc30fbbb
 DIST salt-2014.7.0.tar.gz 3518342 SHA256 d4a64436636a5e6839c1ae1d16052d2e965b9aed5c3c58735bd89fddb9a0ed5c SHA512 2954c9c3fa061823a315e26c5e5b34d8cf982a91b39f123dbeb85afa92451a5dd176394af9ae5667ffd5ab9463766ae08c5d5a00d5ef6d9107669b45b0c6778f WHIRLPOOL 348b49cdb852d3af40dd68592b1b6cd40f8088889a062f44767d23912eef61474571c35633cceee49fd0057df26662eb3e4b3d53b6f3f118c4c9e0b10f2df08f
-DIST salt-2014.7.1.tar.gz 3583585 SHA256 fbb292ec9bd77fce0965bfaf429021916edbee83f6544c0216738d8653fff10a SHA512 37c3e368bb2467409a1576cf0311de3b38d670b242694c0757f05cfc4062d4c358417d0d307fad6044ad239ebea79559f895a5bffe2e9715690b8ffa32151ad0 WHIRLPOOL 45ba016aa8d220e0004123ec849b32d1906366a56f182d70490c2fae456cac3b18d1aa278c9fcabcc8d6bc59df5aa4a451190e759378b36be4192233a03e2108
 DIST salt-2014.7.2.tar.gz 3570683 SHA256 92e6b9afe764c836cd24aa210d98050bc0fdb4d8ee9f813edc504ea19651e505 SHA512 baf9e856a84e208fe3906100e10b31ca06992a90d64aecb7a95315c5048a6a627fc0cc56276302afcd1f0a4230c7bd564e37d0c09ebcb8eedad9ee6c96830da1 WHIRLPOOL 72b3511ecb3de0a5a97f883b7329ae1a92735fde39942c8f70679f358c8ef7f0115de518c79158505b91b517d22a0188dbf97c4bfa79fcdeeefe79dd43e53ac4
 EBUILD salt-2014.1.13.ebuild 2527 SHA256 c8f768b7ef740be9bf50b832fb2e43ad81462e7afeb2da43e937b356091342fa SHA512 f38379e1b2a845d5eb6842ef6996c945d1bde7ab299845d1d225b3c0fb3240d23d3a3bce7a258b5350842fe05753c5247a5906231cf8524b10ed33ba0f2fcd0b WHIRLPOOL 99578601102b96b3ff9948b25a134d0833e2ae6f179df87ef390af2bc2ffc05bc41458da734afb1d95b5401630d07fcece8c2352433b9ff2059e1ab8ee6930b7
-EBUILD salt-2014.7.0-r1.ebuild 3184 SHA256 04ee25a5c80a2970aabad903f75587529187c3d71309eb992895e0d9dd4f802e SHA512 9f4b586490363306036c442b5d366b29282ad0929d9c489eefe70e333232e1282a3300973641307ad01a4c2ec2a04e996bb5f19124da75fb22f08c992002b080 WHIRLPOOL 1e9fb394527bc03da14ed1f1f13456a9746c082c7dc85bb3efbe648e552dbc0ad1bb8982973e476ad4c04ed309d13193de591b42ce7ca642e553ba0d85846e94
 EBUILD salt-2014.7.0.ebuild 3120 SHA256 3f4b005d97b6f08211debdccad15646abf87e08c2991cac464dfc569acbbcb81 SHA512 f3da3fb7ebf637a20bcc7e262076ca37b16ac46838f141648d7cc38fdeb9e58098be3162a6c0e588f75edb925c346d639076d5517ca9725952d272269846eca9 WHIRLPOOL 0ded0c0c7247a006f1eb538ff367f755077aef5c5f961f954a932e75f089b3693ffb663b319204263f05cf77ecc2106edf34185a90e7c25cbc64e9c1325122f6
-EBUILD salt-2014.7.1.ebuild 3385 SHA256 738d69e69619133f62310451735696c1ed3defea763b219f69b973541daca854 SHA512 17f1398b045187a117a654c253225713a687c76ca845a853448855fc1e5a024c00c13d49dd77091a6dcb2e290cd20a3e97e3e86a4f7c4138c14887100082f474 WHIRLPOOL 7fac18a9287bb93a466670d31c9f5c0e16f8bfdf569382b66642597e4aae357da14c1aeef5b7884f74c4af726e988fd6ccd38d1225c2f2b5021bad81c6be8c4c
 EBUILD salt-2014.7.2.ebuild 3259 SHA256 88d301326e7192849235a7ec546ed46d8479e479693b1e3aeb7c3d4a4da66934 SHA512 6d027585c2e126929a823cd51d2b1c799324279c8e7d9cddaf4dc01408bd7fd86915fffc1656b72f65ef4e52ac1d3209e96f913762e36a31b4fef24068e63f4d WHIRLPOOL 7601250d54a7d2b6d3bc03d501c1b262529b0abc856603822a5ed21de26f4504eabd859295dcd2b8a4ed9643cec15b576b9c1dc1395988827b453feda3d8dcd5
 EBUILD salt-9999.ebuild 3180 SHA256 effeffcda9616e178870f68068287fd34c02de92525e2fe36381c99199f17ada SHA512 0d3ddf76dfb69699c9e7cf163dd83d43a12b3ec893ebc84ed44db1e3b2d992684b2bcab8a2829457cc65c8c195e7f4d0d809bdee6191035848e16019db2de2a4 WHIRLPOOL d86fb53e41d3c2d555906925ede2819e527784628a87476e6a672b185fc9a94055036d966fd94fd72c0f6a31000ac2bfd454d904235f835341ad30b9ff446b50
-MISC ChangeLog 10436 SHA256 1e6e1027a675e22aca5a973175fd2d495f8670a9008eba4414f704050eefd860 SHA512 31d8bc2fdc61b8c57dc800f249d70a840aacb68254f58d93facc551761d322648d8ff04b91126ea851e735047b97461a2f32e3e3a4fef60581f84ff4c621dd6d WHIRLPOOL d8d4cfbf8b9de6c91b2af1322ff7cc170a18f4ea54f7891ea04476c2143bd2074a2140003cbd566029fba04c3e56880ca7547826d573025a70d1752551f33575
+MISC ChangeLog 10575 SHA256 bfd53afd007eac923aab0befbb766230b1e6eda6e50ddb12560adb7d25361a0c SHA512 d911bfe6f10c4732282614517f947eb9fed3667f201adcb73faa0aafceea7b96b6fc08f7fd01126de05f7a44641306e2fe24a5c15af98a31053eb183220f375d WHIRLPOOL 7273edb1506c8e8566b7896046fefbd3789ee374ac03165a09267141ed30b788c4c84cc8627aa741b228400aa372281dca123ef7d180e26681dd46e59ccfa6c4
 MISC metadata.xml 1973 SHA256 9cd6ed9773018e0d406f1155f704c6660bf703cf992c7aee3458f34f3c90cdea SHA512 b26708b1407e867af702927ef395415f838ca25354e8fa3451b30d632b112511d1a902a521f5b8e3bde1218b3c810e1ebc27ca247266a210e872df9a05e05950 WHIRLPOOL 27904b1812756d483e1b28502422a2ed9a1c0410987529dbf5996394baa31901ae5671430223fa350f5f7f4bb05f8c45a247b43376a55ae4330e1044d8faff46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU45+AAAoJEHy/RO9cNQiDAiIP/j2znjpnRWK3LILQDoaS2F0z
-Y1yhG/8kxO5hTSNGOKrupSy931tlQkmWbbKV6PeaUDlTfelvZv8vL/CKs5RVorc2
-LHmY2CQfrCSSxj9EvFP/VvU67C7h9mc6FhtYykwim1nWveQ4cX2kXJquL6qzIRhU
-3sT4Vb0XAL8x+S34j1BA8aJ4/tPNsR+uKDmvkDhphQ2n3R2i5u2ndJYm2r0gKz0A
-D3hdq6Jalzw5SJeN603MxvoYzuKCiLoFosi/LF5o2CdS3y4v3qiFNLsKuWMtkq0Z
-ZQZ86hEAkIrQPZkQLBegw2eyV5/pXicKUyOUdKkqEEV8eftl/dmB6AxXY6NDDvxR
-9QaMjkJ45on6dOHcq+hVKQueSTytoLJ0Y3mkjpx8PLgxp6DBCb6tamhhJFfaHpnv
-7sycc3I9/u4IVQBN6MUhtSnK2kLRBAmHi/pttOFLvBe/JlYMCLeOEin4xIjdZ3tN
-tnX4+cDNavJ+s6Ov3IHCOQyte7LDNLZmhPPNzakbvg08gRX6IwW0yjJ3ColfIIi9
-dXWe2LkUD9VIedKPFmd0O7aTLmr5KAkERdF45A/zccejW0i6n+2Hf9fm79WXqXmq
-PIjv6BTtPS2UXcGlL+LMN3Kk7WW9btA4elzuqf86y1nyOBS/+YoOuupaDoW3Mest
-VML6gK9+dM86v3Y3NbuS
-=v5vJ
+iQIcBAEBCAAGBQJU45/RAAoJEHy/RO9cNQiD4VEP/i2IsGwPuWK0B8mFWLpRMhvl
+s6Lg43C0XwiN4lBDTOlrLH7yKrqXp/RITg7Tn1Kvsgt5Vme3atn9X09xiM+0kT+Q
+ketfS/dglgeTUPWmrOlq2Eep1FsN+Rn97V0UTJowRymIGJcuyev/WGPij+n/8Nn8
+icLi72dVD8OJXHrpDPmjEEnnfRNR/eCqDZlrmTH9RVL0hih7npZU9qMTXOy5DLlW
+n/31PoQTpxiZsr76xofw2WP5b87oDeSslWYervXEFK5DqJCwpISXgH6W2QQ75CX/
+S6JuqcYomlq3HLJmwjLVRfLwWzCl0LhX/PdRAv+DpvrDH9tBafSyBjwNoikiyjyv
+Vd6/jTq+RrGOeapKqmpDQpzo9CjcJju8hD0VhVbi7JDW/+Ta4sp3BAn8qloFTNDb
+KmpKWDVl2rMZFDBbqeagH9jx7u4m+Qhb9UdydUjETr9rOxahouybKud6sc49mru9
+OEg2V7D+jgYvq3nbWGSXMg4Z1yCNHovcwgHityTq0UOZbvJ9ihmxqLl48sm2CJXr
+rVXDscAy9tFAqFtuyp6BwNDBn7i43GfpQyhMn8jWja4kkMfHAsFvNNh7W2fZic8J
+Fl08/z/azp/Ed4znjlZzOj8AjcKxQ7cKn3wI6ULKtHzSvIXM9SVFyNvF61ZVISUb
+Rv38murf1A5soqoyiExY
+=huEa
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-2014.7.0-r1.ebuild b/app-admin/salt/salt-2014.7.0-r1.ebuild
deleted file mode 100644
index 53faa1e6198a..000000000000
--- a/app-admin/salt/salt-2014.7.0-r1.ebuild
+++ /dev/null
@@ -1,106 +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.7.0-r1.ebuild,v 1.1 2014/12/03 22:10:14 chutzpah Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_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-r3
-	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="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
-IUSE+=" openssl redis timelib raet +zeromq test"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	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}] )
-	raet? (
-		dev-python/libnacl[${PYTHON_USEDEP}]
-		dev-python/ioflo[${PYTHON_USEDEP}]
-		dev-python/raet[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	api? (
-		|| (
-			dev-python/cherrypy[${PYTHON_USEDEP}]
-			www-servers/tornado[${PYTHON_USEDEP}]
-		)
-	)
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2014.4.24[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-pydsl-includes-test.patch"
-)
-
-python_prepare() {
-	# 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 $(use api && echo api); 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 -r conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-
-	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-		./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2014.7.1.ebuild b/app-admin/salt/salt-2014.7.1.ebuild
deleted file mode 100644
index 8916ac8ffbe6..000000000000
--- a/app-admin/salt/salt-2014.7.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.1.ebuild,v 1.1 2015/01/16 22:56:46 chutzpah Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_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-r3
-	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="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
-IUSE+=" openssl redis selinux timelib raet +zeromq test"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	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}] )
-	raet? (
-		dev-python/libnacl[${PYTHON_USEDEP}]
-		dev-python/ioflo[${PYTHON_USEDEP}]
-		dev-python/raet[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	api? (
-		|| (
-			dev-python/cherrypy[${PYTHON_USEDEP}]
-			www-servers/tornado[${PYTHON_USEDEP}]
-		)
-	)
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2014.8.5[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-pydsl-includes-test.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
-
-	# these tests fail because they depend on features that are only
-	# in git versions of SaltTesting
-	rm tests/unit/{templates/jinja,modules/hashutil}_test.py
-}
-
-python_install_all() {
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for s in minion master syndic $(use api && echo api); 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 -r conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-
-	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-		./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed"
-}