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

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

5 files changed, 38 insertions, 33 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
 }
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index e36b32db932f..c50f71563b5b 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -12,13 +12,13 @@ EBUILD mrtg-2.16.2-r1.ebuild 1057 RMD160 19e620ff1a041637046a61e2820f638350eb7f5
 EBUILD mrtg-2.16.2.ebuild 946 RMD160 e5bce435f8cf90ab86cf9fb6209f6167621aaed6 SHA1 335e2cc2e9ef2e8ca93300cf365032bb651c7351 SHA256 d4e9d4bd111facb54d969d1dad2a3dbdf1c378789c1302b45567d9c7a30540bb
 EBUILD mrtg-2.16.4-r1.ebuild 1268 RMD160 ed4f08057e6f262760b8c84c3d291bda56ccc83b SHA1 42c60d8effb4ad09cbfa43df999210063abad3ea SHA256 363ff91111d5f2e43de2c9322b537c73dae52d6fbae68274497b38c40bf9a21e
 EBUILD mrtg-2.16.4.ebuild 1073 RMD160 0dac3e3271d463d26f7e1205879271708195d2e8 SHA1 fc505823cf96dede5ae695ed0fd23892f67e0b1a SHA256 a8540461d9e2c7fc22e890d8d189b3b48e92531061e6655df3b04825b34c616d
-EBUILD mrtg-2.17.2.ebuild 1109 RMD160 89a8e6358b1fb2c3a18319e2924f285314df8e1b SHA1 f9a123ed10a667df03da8b5c07808f44808c1ced SHA256 93b50a86cf3962c35d5b59ce2cf0eab4818ac9b0e05ea014d99ad92f817f795f
-MISC ChangeLog 13826 RMD160 218f5bfc3f77c870e5e5c600060882254bbe34b1 SHA1 ef306704c35a688a9734c883d883cc79f61d241b SHA256 3ed3aeb2402088c82ea0923b5aa00b91d39f1dcb39e0e3c4e32b102b28712419
+EBUILD mrtg-2.17.2.ebuild 1070 RMD160 4849d16687c938c74a17a16907aaa5502ee8d198 SHA1 d8f2d5f9fed6ce19eeb7056e41646c39c7b7d39d SHA256 554d61cd64bbc4118fd51c36e32156bee318645c8a63058a284274c4eb2d1888
+MISC ChangeLog 13953 RMD160 1e3231aa2e051072b66f118a7c865ce4406bb4a3 SHA1 51727633910af73889c2e6390964c94a0b9fe811 SHA256 f3b2d7ea7cac3bc44227d5687a551eeb9aed24b2eaee4a646b8eb83bb3414c58
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5QFu0ACgkQVWmRsqeSphOnoQCeKkPCkBBMhJW4TnuD3+touorg
-HbwAn0V9Lq7pBfxHB7ttsj92JVsj9Jri
-=Cccf
+iEYEARECAAYFAk5QGVgACgkQVWmRsqeSphOtdACdEqOCp8sOrnWLTAtFHyJNKioO
+3YQAnjdiFdqB5Du2rq6U4ljPJ6uf6rtm
+=3oM1
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/neti/Manifest b/net-analyzer/neti/Manifest
index 56212b63c330..ceb1224b1962 100644
--- a/net-analyzer/neti/Manifest
+++ b/net-analyzer/neti/Manifest
@@ -4,12 +4,12 @@ Hash: SHA1
 AUX neti-init2 488 RMD160 3c12986e2c5c0acfe4ea8a25644672496a161343 SHA1 dadb626dabb9edc39dfcadfd4e5aba1170f9459e SHA256 2432b233177ecdad7e9a7959e3957f6ac61e1c83e30bcb6f22d822bbea7b4aca
 DIST neti-2.0.tar.gz 383442 RMD160 89a11eaf14d2ef815c6f24a8aea0e58417b2f207 SHA1 ee24e7ca190e5c5687246b22aebb2c68ad6e3ca1 SHA256 483f2955baa17a1143ea60ead4a6744f4802dbe8a8a55ad22bd9992322a6e867
 EBUILD neti-2.0.ebuild 1281 RMD160 e976977b7df5d614875e60d0780b04fda0f95250 SHA1 d83d68c5bf9f8e6f537f3796cf298622eb4c73e9 SHA256 87ba04e105603289eb4b61ae78f6897dbbfc13e2dd7f85298f6a09a82ae4dfca
-MISC ChangeLog 2670 RMD160 3f5b8f73ae3b7d25aaf9f181c4e64b2a866b57cd SHA1 76e970d6af2f2c6a47ca7a7aa61822611ac861d6 SHA256 be880d2f22e90308f5d0703d6be324f2146983fc743c700db601ddf9e7d1d995
-MISC metadata.xml 286 RMD160 1213609ff14a0aaa9628fb4c55ab4824f1d41d96 SHA1 ec6b8b51645b73715529daa1d0c7d76c98a9e660 SHA256 9d58ff226975ecae29e1b29a0b608f3d4cac8e4fb8165eab86fc89c8179bc145
+MISC ChangeLog 2781 RMD160 589e66d8fc80ddee506f7a1c4b89db86e4e32419 SHA1 e0862c0cfc2789d993e52aba1a5fdff9de16a4cb SHA256 04796d541db96dc949f5b4b5f5c3add7d50a0ecfb2875627859bd54b8ef67de2
+MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4m5/EACgkQCaWpQKGI+9Ta7gCdGfu8giPNrrO/ZAcw638S7oFr
-hN4An0WqIPI4kWrILo90mbh5nIgljjJa
-=vskO
+iEYEARECAAYFAk5QGeUACgkQVWmRsqeSphPwlACeLUAtalZ4c7rohc0gykdRcpX3
+PC0Ania6YA/bM1B16A083JoXrro4gyrX
+=SsVQ
 -----END PGP SIGNATURE-----