Attachment #371354 for bug #502550

View | Details | Raw Unified | Return to bug 502550
Collapse All | Expand All

Lines 11-14 Link Here

(-)a/files/master-initd-2 (+1 lines)
11		11
12	depend() {	12	depend() {
13	use net	13	use net
		14	#need logger
14	}	15	}

Lines 11-14 Link Here

(-)a/files/minion-initd-2 (+1 lines)
11		11
12	depend() {	12	depend() {
13	need net	13	need net
		14	#need logger
14	}	15	}

Lines 11-14 Link Here

(-)a/files/syndic-initd-2 (+1 lines)
11		11
12	depend() {	12	depend() {
13	use net	13	use net
		14	#need logger
14	}	15	}





LICENSE="Apache-2.0"
SLOT="0"
IUSE="ldap libvirt mako mongodb mysql openssl redis syslog test"

RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
		dev-python/msgpack[${PYTHON_USEDEP}]

		)
		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
		mysql? ( dev-python/mysql-python[${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"
}

	distutils-r1_python_install_all

	for s in minion master syndic; do
		newinitd "${FILESDIR}"/${s}-initd-2 salt-${s}
		newconfd "${FILESDIR}"/${s}-confd-2 salt-${s}
	done

	insinto /etc/${PN}

Return to bug 502550

Lines 24-30 Link Here

(-)a/salt-9999.ebuild (-4 / +11 lines)
24		24
25	LICENSE="Apache-2.0"	25	LICENSE="Apache-2.0"
26	SLOT="0"	26	SLOT="0"
27	IUSE="ldap libvirt mako mongodb mysql openssl redis test"	27	IUSE="ldap libvirt mako mongodb mysql openssl redis syslog test"
28		28
29	RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]	29	RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
30	dev-python/msgpack[${PYTHON_USEDEP}]	30	dev-python/msgpack[${PYTHON_USEDEP}]
Lines 45-56 Link Here
45	)	45	)
46	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )	46	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
47	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )	47	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
48	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"	48	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
		49	syslog? ( virtual/logger )"
49	DEPEND="test? (	50	DEPEND="test? (
50	dev-python/virtualenv	51	dev-python/virtualenv
51	${RDEPEND}	52	${RDEPEND}
52	)"	53	)"
53		54
		55	python_prepare_all() {
		56	if use syslog
		57	sed -i 's/#\(need logger\)$/\1/' "${FILESDIR}"/*-initd-2
		58	then
		59	}
		60
54	python_prepare() {	61	python_prepare() {
55	sed -i '/install_requires=/ d' setup.py \|\| die "sed failed"	62	sed -i '/install_requires=/ d' setup.py \|\| die "sed failed"
56	}	63	}
Lines 59-66 Link Here
59	distutils-r1_python_install_all	66	distutils-r1_python_install_all
60		67
61	for s in minion master syndic; do	68	for s in minion master syndic; do
62	newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}	69	newinitd "${FILESDIR}"/${s}-initd-2 salt-${s}
63	newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}	70	newconfd "${FILESDIR}"/${s}-confd-2 salt-${s}
64	done	71	done
65		72
66	insinto /etc/${PN}	73	insinto /etc/${PN}