[gentoo-commits] repo/gentoo:master commit in: dev-python/flower/files/, dev-python/flower/

[Zac Medico]

commit:     17c6bd2cb7b20096c3fd4472e84b9195e2fd326e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 18:56:26 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 18:57:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c6bd2c

dev-python/flower: install script in /usr/libexec/flower for bug 578444

Package-Manager: portage-2.2.28

 dev-python/flower/files/flower.initd   | 2 +-
 dev-python/flower/files/flower.service | 2 +-
 dev-python/flower/flower-0.8.4.ebuild  | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/flower/files/flower.initd b/dev-python/flower/files/flower.initd
index bd2008f..8464cd2 100644
--- a/dev-python/flower/files/flower.initd
+++ b/dev-python/flower/files/flower.initd
@@ -8,7 +8,7 @@ pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
 user=${SVCNAME}
 group=${SVCNAME}
 
-command="/usr/bin/${SVCNAME}"
+command="/usr/libexec/${SVCNAME}/${SVCNAME}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \

diff --git a/dev-python/flower/files/flower.service b/dev-python/flower/files/flower.service
index 5220d89..dd2f1d9 100644
--- a/dev-python/flower/files/flower.service
+++ b/dev-python/flower/files/flower.service
@@ -7,7 +7,7 @@ After=network-online.target
 User=flower
 PrivateDevices=Yes
 Environment=_FLOWER_OPTS="--conf=/etc/flower/config.py"
-ExecStart=/usr/bin/flower $_FLOWER_OPTS
+ExecStart=/usr/libexec/flower/flower $_FLOWER_OPTS
 
 [Install]
 WantedBy=multi-user.target

diff --git a/dev-python/flower/flower-0.8.4.ebuild b/dev-python/flower/flower-0.8.4.ebuild
index bbbeb2a..2feb9ea 100644
--- a/dev-python/flower/flower-0.8.4.ebuild
+++ b/dev-python/flower/flower-0.8.4.ebuild
@@ -46,6 +46,10 @@ src_install() {
 	fowners ${PN}:${PN} /var/log/${PN}
 }
 
+python_install() {
+	distutils-r1_python_install --install-scripts "${EPREFIX}/usr/libexec/flower"
+}
+
 python_test() {
 	esetup.py test || die
 }