4 files changed, 9 insertions, 87 deletions
diff --git a/net-analyzer/fping/ChangeLog b/net-analyzer/fping/ChangeLog
index 421021061689..b2f6a4eed996 100644
--- a/net-analyzer/fping/ChangeLog
+++ b/net-analyzer/fping/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/fping
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/ChangeLog,v 1.35 2011/06/12 15:08:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/ChangeLog,v 1.36 2011/06/13 20:22:44 jer Exp $
+
+  13 Jun 2011; Jeroen Roovers <jer@gentoo.org> -fping-2.4_beta2-r2.ebuild,
+  -fping-2.4_beta2_p161.ebuild:
+  [ This space left intentionally blank. ]
 
   12 Jun 2011; Raúl Porcel <armin76@gentoo.org>
   fping-2.4_beta2_p161-r1.ebuild:
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index ea0b0dd5179f..6168eec9f9dd 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -2,18 +2,15 @@
 Hash: SHA1
 
 AUX fping-2.4_beta2_p161-min-time.patch 1729 RMD160 b62496abaff96b470c8adbfdb24c0318222a0ccc SHA1 da2acba170d5ebd3b9fbe0c31b961e3370d5c7b9 SHA256 f23acaf5eff5dc4bde103444d03026bff36982dd86904ad8b92523f583aa64d2
-DIST fping-2.4b2_to.tar.gz 60968 RMD160 643af0593e42a78534026498adc544bf21afe4fd SHA1 9318f2ec4b389cd74ca32f561fea95f9528f16a3 SHA256 9f3b3ed7c9fffccefefa9af432eee7244a65592118851f75b5897814cb79b86f
 DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 RMD160 6cfef676c8fb9f3275729258199be02e00716527 SHA1 b4a6d412a041a4f5601b78772fda77bed699cfbc SHA256 de0021aba41ba6b1b98d34fb98f99bfd55455d332ed6aece83690e2d93159e6e
 DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 RMD160 cff101a53baec9cc23063ff2004db69a3510c51f SHA1 d310c6fe951f64660d4c0a5f2bd1c5379c1e5bde SHA256 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172
-EBUILD fping-2.4_beta2-r2.ebuild 679 RMD160 0ddf7aad7ba0f5214c9f9fa179430e32645e890e SHA1 3025f105d9d5a45e6db275fc9c6a2460f49a7f56 SHA256 e2f44b96f442f8afcb8f2effbdcfbcfa5fe162f51abe3b0c2805c1154ed992ab
 EBUILD fping-2.4_beta2_p161-r1.ebuild 1387 RMD160 5b8c76ec230c2406acd0e4796e9503f1c6ddb186 SHA1 5f3258d1ebfb30494a2bd707f7a5f9e97f701c0d SHA256 625825cd3130b8bc6f0e6999682286ae4fa9e26ffaa21784aca128c1718a8cf2
-EBUILD fping-2.4_beta2_p161.ebuild 1350 RMD160 94d41f29f3db672d2c4512547a0a99c1b1de65d4 SHA1 7695e6a799756377c1283b601017db337df1d632 SHA256 e191e55905b2be646c60d221241acebe37f2ee7bb613452c9d417ae53c0d69ec
-MISC ChangeLog 4390 RMD160 9d48445969cbdffa7a0a902cec29072952689896 SHA1 1cef0c19d15cebe678136a1d79913a575244a603 SHA256 501588bf5fa4dfbf58505f82fa7ee601a2706fd092ca9e612b0ce9084e65ae1c
+MISC ChangeLog 4537 RMD160 38ac8a6ea3984b277dcf3b8307323e373034c176 SHA1 efd0501403ab55aaf77ad64b0c18ce557cf42e4d SHA256 046c35f67c8519d333d1c00719f00f8ced016145f9dd24f42406d328c9659210
 MISC metadata.xml 235 RMD160 c48a2e2c9623d4955bec90326201223f8db28f80 SHA1 72d7f33fb677a9c8ed7bdfc9f6f228f5659dcb4d SHA256 f69f7fcaf748f3ad0282cdbbd476c8199178e2dec5ce333b313826d584ed3948
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk301moACgkQuQc30/atMkCcuACghbChGs4j6JUCrmhmAbpBV+AK
-zQEAoIGmw890xux8dbiWqrgClXI7Vo9J
-=HxDm
+iEYEARECAAYFAk32cZ0ACgkQVWmRsqeSphN8VwCbBzlOLn4HedLJq+QqTL/yefaQ
+hCEAn11CcdhkDl1IY2WVjMmce1kfepEF
+=8Na0
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/fping/fping-2.4_beta2-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2-r2.ebuild
deleted file mode 100644
index 31312b014124..000000000000
--- a/net-analyzer/fping/fping-2.4_beta2-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-2.4_beta2-r2.ebuild,v 1.10 2010/06/03 04:28:33 jer Exp $
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-SRC_URI="mirror://gentoo/${PN}-2.4b2_to.tar.gz"
-HOMEPAGE="http://www.fping.com/"
-
-SLOT="0"
-LICENSE="fping"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-S=${WORKDIR}/fping-2.4b2_to
-
-src_install () {
-	dosbin fping || die "Failed to install fping."
-	fperms 4555 /usr/sbin/fping #241930
-	doman fping.8
-	dodoc ChangeLog README
-}
diff --git a/net-analyzer/fping/fping-2.4_beta2_p161.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161.ebuild
deleted file mode 100644
index a40dddc2942f..000000000000
--- a/net-analyzer/fping/fping-2.4_beta2_p161.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-2.4_beta2_p161.ebuild,v 1.1 2010/07/12 18:39:32 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A utility to ping multiple hosts at once"
-SRC_URI="
-	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6.orig.tar.gz
-	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6-16.1.diff.gz
-	"
-HOMEPAGE="http://www.fping.com/"
-
-SLOT="0"
-LICENSE="fping"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6"
-
-S="${WORKDIR}/fping-2.4b2_to-ipv6"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}/fping_2.4b2-to-ipv6-16.1.diff"
-	eautoreconf
-
-	if use ipv6; then
-		cp -a "${S}" "${S}-6"
-	fi
-}
-
-src_configure() {
-	econf || die "econf failed"
-	if use ipv6; then
-		cd "${S}-6"
-		append-flags -DIPV6
-		econf || die "econf failed"
-	fi
-}
-
-src_compile() {
-	emake || die "econf failed"
-	if use ipv6; then
-		cd "${S}-6"
-		emake || die "econf failed"
-	fi
-}
-
-src_install () {
-	dosbin "${S}"/${PN} || die "Failed to install fping."
-	if use ipv6; then
-		newsbin "${S}"-6/fping fping6 || die "Failed to install fping."
-	fi
-	fperms 4555 /usr/sbin/fping /usr/sbin/fping6 #241930
-	doman fping.8
-	dodoc ChangeLog README
-}