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

Package-Manager: portage-2.2.28

3 files changed, 6 insertions, 2 deletions

diff --git a/dev-python/flower/files/flower.initd b/dev-python/flower/files/flower.initd
index bd2008fc2f9e..8464cd2e511e 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 5220d89fcff8..dd2f1d9da105 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 bbbeb2ac7a57..2feb9ea58f00 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
 }