Add unit files (#492382 by Michael Jones)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 126 insertions, 15 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 62c481ab135b..46657e7b1628 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.29 2013/12/12 23:26:17 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.30 2013/12/26 10:56:49 pacho Exp $
+
+*salt-0.17.4-r1 (26 Dec 2013)
+
+  26 Dec 2013; Pacho Ramos <pacho@gentoo.org> +files/salt-master.service,
+  +files/salt-minion.service, +files/salt-syndic.service,
+  +salt-0.17.4-r1.ebuild:
+  Add unit files (#492382 by Michael Jones)
 
 *salt-0.17.4 (12 Dec 2013)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index c21852763f53..860ad13a4daa 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -6,6 +6,9 @@ AUX master-initd-1 390 SHA256 acbc410fd5537f046815abe4fda8dde3414f8217143bdb1e2d
 AUX minion-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed WHIRLPOOL fed0dffe202d776cd5f1b74a28c5dac69b082603c9ddf695616a0a6bca5084b9589f1f4d03313f7271754166a9aa136c06aa61e6fd2e3b02d829798aa741c432
 AUX minion-initd-1 391 SHA256 1e927cf84e4baa368384d148b1b4ca544b53678f5f99280cc3e271ad28010161 SHA512 1d5ea1cd4dfac33ba93b391bfa36ba6ae0b5fc9399762fa0a4ac4165842da82550810264ccb63036b6ff1bc4f4c56aedee79900676894880832f1fb51c487130 WHIRLPOOL 53f21e804bae7067df2240c7143f0208e121873f5071714b4f7c4caceab3ea60d748d00bfa297b8a4fef0c58a3ad9933acb2a2eb6767e1dd51e7147f186cc626
 AUX salt-0.17.1-tests-nonroot.patch 688 SHA256 a557f2a226d771a110f8b8085d39d9fe76d28020807038dbfbd1244b7b1b8db1 SHA512 838c2626bcf9399fc33d6f387b95e13010a2e32a68529ff10d97b3f3b96960255606630b6a2466edfb52c0b37aa4b14fd41b8ed2d5744a20f35eafc647f882a8 WHIRLPOOL 7ff95728e6e6727aaa79fbf683ee7af83239089f7969de91a1e6ee4f6bf281276d02717f48cf64c2fe807dfeb9ea8ad1c15ba70038c92698a321a9d8564ad826
+AUX salt-master.service 169 SHA256 5a8c43e469c47ce8cc5b4175105ca6233daa47b411ebf4002aad84003cb9f4a6 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 WHIRLPOOL ebb632028483e8849eb8ab61677967477bd4f420277b1360b3c28424a5192615aecf2d62372df76d6dee8855e6cd5557075ce17bcf85a999d92a0734cf849628
+AUX salt-minion.service 162 SHA256 829f0f25e5ae73befaa107bd5d2317ec608e8be95d5f60f9650c01e5d19d07a6 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed WHIRLPOOL 50255e88a81c64d461b70b6d990545561f4e9cdbc1f4b0caf0048b8ca46eef3233f5d174b88b1e07bf52aaab5ba16355b72fdea675a0099578acab2d5cb27e1b
+AUX salt-syndic.service 169 SHA256 2199cd525392b3f6615acd2ef8b9c1b31be96c69f7e26c6acd28a3c5fc0d3079 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0 WHIRLPOOL 1162d09a6b454f710823d60c559eb92320fcec7ba2216e7c3e2e670bb61371877c897a12acf014f6c97732b2aa991574569125fa91157791c25d46c4dc6a41fc
 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.16.4.tar.gz 3542126 SHA256 aa880a7008995be88e417e3639ff9326c3df73650fe3155a7dec43a3b1cb498d SHA512 d4aa7d9395f164a7a9efe76ddebd2aa72d695cfb33fa2c3e9efd6f1a1288f6aaa910d635835a4f22e47cb9c126bfc24c30ef0e9054fdb42cbbc4299ded17f0ef WHIRLPOOL 73ded2adde59f4aa1d982e6f59b31ad91f9a41d4fa2913fdd046ab0157fa9e936852724e5529a173db339a4b11a80b1ed64b35b5c252a72ed23fedf6cee4eecf
@@ -13,24 +16,15 @@ DIST salt-0.17.2.tar.gz 1866629 SHA256 f1339c02c40b8aa9c55db66bd5780037aa7f6eb4d
 DIST salt-0.17.4.tar.gz 1871032 SHA256 5a7b3f4d5c22aa4b8e7c03d60dc429b0428c575fb8f0c285616239c0fe5a0ddd SHA512 3ea8d42c321d111bc3d277167c85a3ac6eb99c97eb5d53030e462372d227e0a0c2a93b4b13eae38eed2e73ec591e1e78b535493bf77d66c3d19102baf13cb445 WHIRLPOOL 27acf1f7adb0fbe9ad393711d6bd5998feb090f5bb38ec05d11dbd85a434ffbb19d921ec90e462a212ff080729a553701ca1d750fe8b31346e903e8944285180
 EBUILD salt-0.16.4.ebuild 2041 SHA256 63470d69ab4e751537ec0637b7a2f87278f03b3476a616bccdaa62eaf3d98f7b SHA512 d42632bc25e96bfb6b3bc9491cdc8188537362ec8828f64d1ca9671263bd05ab2a5a856608be8fc9c6972e8e969a9e8c57f9c7836a1b53cb067da394f623c7cd WHIRLPOOL 2bb1ab120dba94d2ce5b6874fa123789b5eedf55731ca916313db3d6531be45b3b54e6a4f23c6ac8eb5464cf0d2b3f1a5fd7b063f6de6f1f343362172f1d827c
 EBUILD salt-0.17.2.ebuild 2151 SHA256 6c62a7aea235dc1dff7f585977e229dae6bbbe4252d24418bac748321f115d7f SHA512 3e3b59fe36f32b8d544911880f6ef0a376680172e9bc50be152045c9da05658e5dbba551b7702b31c1039b7a0e3c8b46bbb4d696d89c763c3bd7b1a9b7493cf4 WHIRLPOOL c6ceaab08a93a9814fe672e25813022ecfb1d49bf0b644424922d445a069d587fc59e2e8179158cbd1395d58258e8a2c44f0c4d1d0b35b02b7bbd5d8ae18a487
+EBUILD salt-0.17.4-r1.ebuild 2210 SHA256 84118ec9636ea3b4343214785ef0ba357369efd700fb3a246627dfb4db39d9a8 SHA512 08115dc32e2ff3838a299181f34832ff389326c341588fa91ec87cafe6ef4cdbf3761dcc43681019b6ac84d9cbb4746a65c8d25a07176b9f6f57c2b248d08865 WHIRLPOOL bb1289348706dcaee3b4ae80a90cbfaca3c5ee1946e79c7063c698c99018b82c6ecb41568da0595e878e4e163b0c49e22733b8197d808bb2a33131c5486c74a7
 EBUILD salt-0.17.4.ebuild 2153 SHA256 b633d068252cad2de01f6cb65f0848ec9ad9136b471644bd646b72b575151783 SHA512 e7869d3dd220802c014026ae040b52fbac1d401578e30feea6c9268e6375130496df3945c32f90934ac283b1747d74ed254baf12d44ef2e1260b04dc289914de WHIRLPOOL f4321393fad0c1ebb4bfbf2f05697dbbd6662fcc191ccee2b011e15139a10e92bc817de8281e910d7b77670297fb49628cfd5aea9225314155515b41e020ff3c
 EBUILD salt-9999.ebuild 2048 SHA256 7172ea7d2e846578b7e44447c3fb88b59f8ff2dc20990c5d5a4153053cb8b70d SHA512 052f1bd15d17b62ef4b1fa7e8a679426261ff06b2240dd588f25f6d21f8d55c5af1c47bb26175640866c8f49724627207f2e6df213f247059656ecb9eef032bf WHIRLPOOL 7100976954db139e33632c543ae7640c25106bbeb9f056b68deaf1101dff00caac61224d63b23fffb20c84fba42ce5aaddede168f1b689e80b82bdcfe9b55b90
-MISC ChangeLog 4888 SHA256 da2f83f786184504b682ff9f9530572f4f062b6149e07ad5fac66a520fcb036d SHA512 818dd6fe7d52f166c2f168f2293239083076dc63393bdb661ce91c54ec221f258698766de1dc58879a1d4bd7e1208aaa195ad2fc3f71dbaee5c8088cd1244af0 WHIRLPOOL c611d0dd2928369403215daec3d7c3621587a1364bc5abe0ac59fd9c12833dbc7805d3916cf3d49db0dbab97bfe9b5ffeb163cea8ccb4943b46b8ea537995afb
+MISC ChangeLog 5119 SHA256 2b4576d589e29a973a7ec3c98715a841f4919b2727afbbba3fd883ade6576755 SHA512 8b82af9c68ddccff510a78fa619b1f56e4cd56a190177a79d645d19a0e5bbc5f97dd07418e35180295b565bb7dc58c372f197b82b4960f243400e21032d15ebb WHIRLPOOL 8a498514444e8ca3a5ba1efa9fb8857cc55fdb52f4c4b0f80d30224811e0a690f129ddebd6eb0b0fa657e910f6e660df76cd30eb2523113078f8bbad3a257b57
 MISC metadata.xml 1349 SHA256 c381390f62360f243ee210d099ddfddfc81632186db11964416e5faeb5ef0256 SHA512 dc7da5bb40585036807c1158bd50bdb72f51e4d4255fa1f6b07c2d91fb39cfeda50d288c3367b3e23ee8adfeaddb05840f276639ed045ff5696f4a5c2d5375b3 WHIRLPOOL f137a52155ad3d3f2a5deb5ba66ea7a986d77c1ea271072e63bba5070619e87ba0838412d466abb6fdac705d45bc5fc06ce1950a78d95a8bf5b8932f8c8504fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSqkYaAAoJEHy/RO9cNQiDmP8QAJ8rZrXi/mtXdDTtU2GyLmLq
-ooXPb/g3o8JstOyL8U1TP1lA0giI36bpooUvSPhIVL8XInez3YabkUxOr+0w63o1
-ZS5+4SxsUlajw67D+/Y8lE6Zh7Rh3d2hyOfke74gJze4f/X0yB8ZKcayDfjDuuRC
-gVsgKw8H0Oshsm2qk+jilqWABUdB77J2pE84rM2DVbHi8aVpsZBzrfFDljUKylZf
-Rawr+5wUvCMf+OL0DebFW17oU7pfRoAPH95vgZ9Lt9NdqgV6eu5iCQiG6TcXaoaU
-17UudfvUxr92XpiykBG/hbx5WqAG1/Sk6+l5X8emHZwnpD43Q42VuJO8GH7TpOmR
-S47BL9W0AN+KktQKqozJcP/GrWCYgofdVi6xxzm5rFhjEZ7UevWs95AkdR6y+xES
-e3CoK0fFaKlivHJxX5pY0AwFzmULCTNQ7zrx/xLdK80VpZnRq7Jt1MOin6PUZlQJ
-LDgIuH4debLwL/y4vemboboxxpZQPS7YlkyvG+ykpYPBLpkFMwSCdWCpV6SBkxkF
-11EScYFgypbPtM4nPPUEnuxgfSAAm0jWYxPtNb4vCp9YiTTX98g8bGGvGXVVLW1h
-jq49nuYM8BJvNq1T47bQrF3kQ1qobYW3agyu+D3jUqNJXwb+XGrwm+9u+TPndqOo
-2EB2q+urb8YUQ9HPmItT
-=KbnI
+iEYEAREIAAYFAlK8C3IACgkQCaWpQKGI+9SfnACeLbGSEaNEOSvj2xmnPRY4usAP
+zzYAmwQhy3hdpgFtZdlZpFx0zoHu4le7
+=z8VU
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/files/salt-master.service b/app-admin/salt/files/salt-master.service
new file mode 100644
index 000000000000..4f3827ede6df
--- /dev/null
+++ b/app-admin/salt/files/salt-master.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-master
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-minion.service b/app-admin/salt/files/salt-minion.service
new file mode 100644
index 000000000000..2f199f998eca
--- /dev/null
+++ b/app-admin/salt/files/salt-minion.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Minion
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-minion
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-syndic.service b/app-admin/salt/files/salt-syndic.service
new file mode 100644
index 000000000000..922eef35af8b
--- /dev/null
+++ b/app-admin/salt/files/salt-syndic.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-syndic
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/salt-0.17.4-r1.ebuild b/app-admin/salt/salt-0.17.4-r1.ebuild
new file mode 100644
index 000000000000..446407967231
--- /dev/null
+++ b/app-admin/salt/salt-0.17.4-r1.ebuild
@@ -0,0 +1,80 @@
+# 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.17.4-r1.ebuild,v 1.1 2013/12/26 10:56:49 pacho 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 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}]
+		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}] )"
+DEPEND="test? (
+			dev-python/pip
+			dev-python/virtualenv
+			dev-python/SaltTesting
+			${RDEPEND}
+		)"
+
+PATCHES=("${FILESDIR}/${PN}-0.17.1-tests-nonroot.patch")
+DOCS=(README.rst AUTHORS)
+
+python_prepare() {
+	sed -i '/install_requires=/ d' setup.py || die "sed failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	for s in minion master syndic; do
+		newinitd "${FILESDIR}"/${s}-initd-1 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
+	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
+}