From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7550A138330 for ; Thu, 22 Sep 2016 00:10:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A1E8E08E1; Thu, 22 Sep 2016 00:10:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6CCFAE08E1 for ; Thu, 22 Sep 2016 00:10:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6D5333F9D2 for ; Thu, 22 Sep 2016 00:10:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A03CE248E for ; Thu, 22 Sep 2016 00:10:14 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1474502984.a7eab628e51515fc91489b4084813714704d2bdf.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/collectd/collectd-5.6.0.ebuild X-VCS-Directories: app-admin/collectd/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a7eab628e51515fc91489b4084813714704d2bdf X-VCS-Branch: master Date: Thu, 22 Sep 2016 00:10:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3650f851-a867-4f01-a27e-c3cf3ff896da X-Archives-Hash: 6ba131bbd5404d6cccaf4635b42d43df commit: a7eab628e51515fc91489b4084813714704d2bdf Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Sep 22 00:09:44 2016 +0000 Commit: Thomas Deutschmann gentoo 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}