[patch] Patch sketching out my suggested approach for the 9999 ebuild

salt-syslog.patch (text/plain), 1.96 KB, created by W. Trevor King on 2014-02-26 18:30:27 UTC

diff -ru a/files/master-initd-2 b/files/master-initd-2
--- a/files/master-initd-2	2014-02-26 10:17:35.457585157 -0800
+++ b/files/master-initd-2	2014-02-26 10:26:02.432598303 -0800
@@ -11,4 +11,5 @@
 
 depend() {
 	use net
+	#need logger
 }
diff -ru a/files/minion-initd-2 b/files/minion-initd-2
--- a/files/minion-initd-2	2014-02-26 10:17:35.457585157 -0800
+++ b/files/minion-initd-2	2014-02-26 10:26:05.822598391 -0800
@@ -11,4 +11,5 @@
 
 depend() {
 	need net
+	#need logger
 }
diff -ru a/files/syndic-initd-2 b/files/syndic-initd-2
--- a/files/syndic-initd-2	2014-02-26 10:17:35.457585157 -0800
+++ b/files/syndic-initd-2	2014-02-26 10:26:08.820598469 -0800
@@ -11,4 +11,5 @@
 
 depend() {
 	use net
+	#need logger
 }
diff -ru a/salt-9999.ebuild b/salt-9999.ebuild
--- a/salt-9999.ebuild	2013-12-03 11:01:01.000000000 -0800
+++ b/salt-9999.ebuild	2014-02-26 10:25:34.075597568 -0800
@@ -24,7 +24,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis test"
+IUSE="ldap libvirt mako mongodb mysql openssl redis syslog test"
 
 RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
 		dev-python/msgpack[${PYTHON_USEDEP}]
@@ -45,12 +45,19 @@
 		)
 		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		syslog? ( virtual/logger )"
 DEPEND="test? (
 			dev-python/virtualenv
 			${RDEPEND}
 		)"
 
+python_prepare_all() {
+	if use syslog
+		sed -i 's/#\(need logger\)$/\1/' "${FILESDIR}"/*-initd-2
+	then
+}
+
 python_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
 }
@@ -59,8 +66,8 @@
 	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}
+		newinitd "${FILESDIR}"/${s}-initd-2 salt-${s}
+		newconfd "${FILESDIR}"/${s}-confd-2 salt-${s}
 	done
 
 	insinto /etc/${PN}