From a9e35ffb53d5eafee9cc399d32e1b7038c96cd0c Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Thu, 29 Mar 2018 16:49:22 +0200
Subject: [PATCH] app-metrics/prometheus-mysqld_exporter: Rev bump

Ebuild changes:
===============
- Runscript: Add "use mysql" to depend()

- Runscript: Add start_post function

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 ...d_exporter.initd => prometheus-mysqld_exporter-r1.initd} | 5 +++++
 ...0.ebuild => prometheus-mysqld_exporter-0.10.0-r1.ebuild} | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename app-metrics/prometheus-mysqld_exporter/files/{prometheus-mysqld_exporter.initd => prometheus-mysqld_exporter-r1.initd} (96%)
 rename app-metrics/prometheus-mysqld_exporter/{prometheus-mysqld_exporter-0.10.0.ebuild => prometheus-mysqld_exporter-0.10.0-r1.ebuild} (90%)

diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd
similarity index 96%
rename from app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd
rename to app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd
index 10a7ac1f1ab3..07d0483022c1 100644
--- a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd
+++ b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd
@@ -59,6 +59,7 @@ configtest() {
 
 depend() {
 	after net
+	use mysql
 }
 
 start_pre() {
@@ -66,3 +67,7 @@ start_pre() {
 		configtest || return 1
 	fi
 }
+
+start_post() {
+	service_set_value retry "${EXPORTER_TERMTIMEOUT}"
+}
diff --git a/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0.ebuild b/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild
similarity index 90%
rename from app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0.ebuild
rename to app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild
index c7e66857e6ad..77a69fda97f7 100644
--- a/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0.ebuild
+++ b/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild
@@ -32,13 +32,13 @@ src_prepare() {
 src_compile() {
 	pushd src/${EGO_PN} || die
 	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix mysqld_exporter || die
+	GOPATH="${S}" promu build -v --prefix bin || die
 	popd || die
 }
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	dobin mysqld_exporter/mysqld_exporter
+	dobin bin/mysqld_exporter
 	dodoc {README,CHANGELOG,CONTRIBUTING}.md
 	popd || die
 
@@ -46,7 +46,7 @@ src_install() {
 	fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
 	fperms 0770 /var/lib/mysqld_exporter
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
 	insinto /etc/logrotate.d/
-- 
2.26.2