[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

[Thomas Deutschmann]

commit:     a7eab628e51515fc91489b4084813714704d2bdf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 00:09:44 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 00:09:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7eab628

app-admin/collectd: Fix systemd unit name

Package-Manager: portage-2.3.1

 app-admin/collectd/collectd-5.6.0.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-admin/collectd/collectd-5.6.0.ebuild b/app-admin/collectd/collectd-5.6.0.ebuild
index e64baa9..8bd0762 100644
--- a/app-admin/collectd/collectd-5.6.0.ebuild
+++ b/app-admin/collectd/collectd-5.6.0.ebuild
@@ -280,12 +280,10 @@ src_prepare() {
 
 	# There's some strange prefix handling in the default config file, resulting in
 	# paths like "/usr/var/..."
-	#sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
-	#sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
 
 	# fix installdirs for perl, bug 444360
-	#sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+	sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
 
 	if use collectd_plugins_java; then
 		# Set javac -source and -target flags according to (R)DEPEND.
@@ -450,7 +448,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	systemd_dounit "contrib/systemd.${PN}.service"
+	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}