Clean up patch.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 7 insertions, 55 deletions

diff --git a/net-analyzer/bwping/ChangeLog b/net-analyzer/bwping/ChangeLog
index 431a00008626..8223e236b079 100644
--- a/net-analyzer/bwping/ChangeLog
+++ b/net-analyzer/bwping/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/bwping
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/ChangeLog,v 1.16 2014/02/22 08:06:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/ChangeLog,v 1.17 2014/07/10 19:53:23 jer Exp $
+
+  10 Jul 2014; Jeroen Roovers <jer@gentoo.org> -bwping-1.4.ebuild,
+  -bwping-1.7.ebuild, files/bwping-1.7-buildsystem-configurable-ipv6.patch:
+  Clean up patch.
 
   22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> bwping-1.7-r1.ebuild:
   Stable for x86, wrt bug #495828
diff --git a/net-analyzer/bwping/bwping-1.4.ebuild b/net-analyzer/bwping/bwping-1.4.ebuild
deleted file mode 100644
index 9e50ff142678..000000000000
--- a/net-analyzer/bwping/bwping-1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/bwping-1.4.ebuild,v 1.3 2012/01/28 15:04:00 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="http://bwping.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install () {
-	dosbin bwping || die "dosbin failed"
-	doman  bwping.8 || die "doman failed"
-	dodoc  ChangeLog README || die "dodoc failed"
-}
diff --git a/net-analyzer/bwping/bwping-1.7.ebuild b/net-analyzer/bwping/bwping-1.7.ebuild
deleted file mode 100644
index d94a87a94198..000000000000
--- a/net-analyzer/bwping/bwping-1.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/bwping-1.7.ebuild,v 1.3 2013/01/30 19:00:10 ago Exp $
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="http://bwping.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install () {
-	dosbin ${PN}
-	doman  ${PN}.8
-	dodoc  ChangeLog README
-}
diff --git a/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch b/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch
index 553303722293..d9c01c45a812 100644
--- a/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch
+++ b/net-analyzer/bwping/files/bwping-1.7-buildsystem-configurable-ipv6.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2012-10-11 14:32:29.000000000 +0400
-+++ configure.in	2013-07-17 00:12:52.569550315 +0400
+--- a/configure.in
++++ b/configure.in
 @@ -32,8 +32,29 @@
  if test $ac_cv_func_getaddrinfo = no; then
      AC_SEARCH_LIBS(getaddrinfo, [nsl socket], [], [ echo "getaddrinfo() is required for build"; exit -1 ])