summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-07-09 12:48:11 +0000
committerJeroen Roovers <jer@gentoo.org>2013-07-09 12:48:11 +0000
commit3a60f5a3fd83ec55be3ccd2a5c409a65bdbb3a67 (patch)
tree22e3d303be1bfd4579534c8bd5e5ecc59a695dcc /net-analyzer/smokeping
parentMake unrar dependency optional (bug #476254, thanks to Ulrich Müller). (diff)
downloadgentoo-2-3a60f5a3fd83ec55be3ccd2a5c409a65bdbb3a67.tar.gz
gentoo-2-3a60f5a3fd83ec55be3ccd2a5c409a65bdbb3a67.tar.bz2
gentoo-2-3a60f5a3fd83ec55be3ccd2a5c409a65bdbb3a67.zip
More /var/run => /run.
(Portage version: 2.2.0_alpha187/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/smokeping')
-rw-r--r--net-analyzer/smokeping/ChangeLog5
-rw-r--r--net-analyzer/smokeping/smokeping-2.6.9.ebuild17
2 files changed, 12 insertions, 10 deletions
diff --git a/net-analyzer/smokeping/ChangeLog b/net-analyzer/smokeping/ChangeLog
index 0c0080f66a70..30d27405b3c7 100644
--- a/net-analyzer/smokeping/ChangeLog
+++ b/net-analyzer/smokeping/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/smokeping
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.47 2013/07/09 12:41:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.48 2013/07/09 12:48:11 jer Exp $
+
+ 09 Jul 2013; Jeroen Roovers <jer@gentoo.org> smokeping-2.6.9.ebuild:
+ More /var/run => /run.
*smokeping-2.6.9 (09 Jul 2013)
diff --git a/net-analyzer/smokeping/smokeping-2.6.9.ebuild b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
index 5448f0fd86ca..6cafbf110e39 100644
--- a/net-analyzer/smokeping/smokeping-2.6.9.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v 1.1 2013/07/09 12:41:50 jer Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v 1.2 2013/07/09 12:48:11 jer Exp $
+EAPI=5
inherit eutils user systemd
DESCRIPTION="A powerful latency measurement tool."
@@ -66,11 +65,11 @@ src_compile() {
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ default
- newinitd "${FILESDIR}/${PN}.init.3" ${PN} || die
- systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf || die
- systemd_dounit "${FILESDIR}"/"${PN}".service || die
+ newinitd "${FILESDIR}/${PN}.init.3" ${PN}
+ systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
+ systemd_dounit "${FILESDIR}"/"${PN}".service
mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
@@ -81,7 +80,7 @@ src_install() {
sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
- -e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \
+ -e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
@@ -107,7 +106,7 @@ src_install() {
if use apache2 ; then
insinto /etc/apache2/modules.d
- doins "${FILESDIR}/79_${PN}.conf" || die
+ doins "${FILESDIR}/79_${PN}.conf"
fi
dodir /var/cache/smokeping