Set proper DEPEND/RDEPEND. Make sed die(). Remove default src_compile(). Quote variables.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 28 insertions, 23 deletions

diff --git a/net-analyzer/mrtg-ping-probe/ChangeLog b/net-analyzer/mrtg-ping-probe/ChangeLog
index 8f267dbb6e1e..2256d58411ee 100644
--- a/net-analyzer/mrtg-ping-probe/ChangeLog
+++ b/net-analyzer/mrtg-ping-probe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/mrtg-ping-probe
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg-ping-probe/ChangeLog,v 1.5 2011/08/20 20:20:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg-ping-probe/ChangeLog,v 1.6 2011/08/20 20:27:48 jer Exp $
+
+  20 Aug 2011; Jeroen Roovers <jer@gentoo.org> mrtg-ping-probe-2.2.0.ebuild:
+  Set proper DEPEND/RDEPEND. Make sed die(). Remove default src_compile().
+  Quote variables.
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove useless maintainer tag.
diff --git a/net-analyzer/mrtg-ping-probe/Manifest b/net-analyzer/mrtg-ping-probe/Manifest
index 4cb4dcc94430..8b15fe6bfd72 100644
--- a/net-analyzer/mrtg-ping-probe/Manifest
+++ b/net-analyzer/mrtg-ping-probe/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX mrtg-ping-cfg 2077 RMD160 5801933346f073652915b85a3789d50a9b41b166 SHA1 f4897051f11edd23fe3dda4d754caf8d5f650e19 SHA256 771bbe8321fa806c86b45b18c0c697a29702ec6b30f167d4b9f757f511ed0c95
 DIST mrtg-ping-probe-2.2.0.tar.gz 36923 RMD160 86c655ceb9f55dfb8061dfc6eb1770bdd7d11a20 SHA1 f741a9078e3c24e0ab177b147b3eb01fc4ca882d SHA256 2708459c1beb5ab482fa28ff62720f6a2d5707475d40e53a2829927572c96a0e
-EBUILD mrtg-ping-probe-2.2.0.ebuild 1086 RMD160 2cbc82e566458e681f33c5a7713b6918ca1a5223 SHA1 16973cfd68d882bba9b94cb6cbe6d0f9c56bbebc SHA256 085b3dda8efe02f8c6c3ba6b84424a1362b34e5a0886ccec30ca757cc6a1ba03
-MISC ChangeLog 924 RMD160 8b0a0c19dc6d57309dcfddcd2cd84d1eea0759b0 SHA1 1fed8c322e1ebfb0b6c3e9f25ab39bc421b3ad09 SHA256 b84b3039985575c9ff8a131501c5ae69ee6de51796509fa99f5fd8c756119130
+EBUILD mrtg-ping-probe-2.2.0.ebuild 865 RMD160 a99e4096a67f70906628af89a8020ad6f2dbdeba SHA1 2579591d477bc8d49c42a660e373530309562d53 SHA256 2448d12aa3fd1b45d7c95cc94f5740e14a55593544202a88bdb82590564772c5
+MISC ChangeLog 1096 RMD160 edb9cd0a9be3cf4e0c0650476a7aeb511f787854 SHA1 146c1392b3385268de6bbb30927ad4c32aaf35d5 SHA256 9723e524b9eb2c9539e94a743572ba8febd81828b087742a323c5322caca8cc9
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5QFxcACgkQVWmRsqeSphN8sACfXbDTH2oCszHje1ziV95r0Gix
-IA0AniOTd0LAKx0wWhIvNZrojcPm+ZZ6
-=hmTc
+iEYEARECAAYFAk5QGMoACgkQVWmRsqeSphOSlwCcC+o+suo9M4Pld4sHz8vzmjnv
+cIEAn3ICQdrz/yuoRLyWKsd6GE9fqYu1
+=YvLY
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
index 337995cdc677..edc8bff82e1b 100644
--- a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
+++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild,v 1.4 2008/01/18 19:10:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild,v 1.5 2011/08/20 20:27:48 jer Exp $
+
+EAPI="4"
 
 DESCRIPTION="Addon mrtg contrib for stats ping/loss packets"
-SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/mrtg-ping-probe/${P}.tar.gz"
+SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/${PN}/${P}.tar.gz"
 HOMEPAGE="http://pwo.de/projects/mrtg/"
 
 KEYWORDS="~x86"
@@ -11,24 +13,23 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="net-analyzer/mrtg"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	sed -i -e 's:#!/usr/local/bin/perl -w:#!/usr/bin/perl -w:' check-ping-fmt
-	#sed -i -e 's:#!/bin/ksh:#!/bin/sh:' mrtg-ping-cfg
-	#sed -i -e 's:head -10:head -n 10:' mrtg-ping-cfg
-	#sed -i -e 's:PING_PROBE=/usr/local/httpd/mrtg/mrtg-ping-probe:PING_PROBE=/usr/bin/mrtg-ping-probe:' mrtg-ping-cfg
-	sed -i -e 's:#!/bin/perl:#!/usr/bin/perl:' mrtg-ping-probe
-}
+DEPEND="dev-lang/perl"
+RDEPEND="
+	${DEPEND}
+	net-analyzer/mrtg
+"
 
-src_compile() {
-	emake || die
+src_prepare() {
+	sed -i check-ping-fmt \
+		-e 's:#!/usr/local/bin/perl -w:#!/usr/bin/perl -w:' \
+		|| die
+	sed -i mrtg-ping-probe \
+		-e 's:#!/bin/perl:#!/usr/bin/perl:' \
+		|| die
 }
 
 src_install () {
 	dodoc ChangeLog NEWS README TODO mrtg.cfg-ping
 	doman mrtg-ping-probe.1
-	dobin check-ping-fmt mrtg-ping-probe ${FILESDIR}/mrtg-ping-cfg
+	dobin check-ping-fmt mrtg-ping-probe "${FILESDIR}"/mrtg-ping-cfg
 }