EAPI bump. Clean up patch.

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

4 files changed, 14 insertions, 32 deletions

diff --git a/net-analyzer/mping/ChangeLog b/net-analyzer/mping/ChangeLog
index 15e51e304cdd..6713c45ee2ab 100644
--- a/net-analyzer/mping/ChangeLog
+++ b/net-analyzer/mping/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/mping
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mping/ChangeLog,v 1.15 2007/02/20 00:06:41 jokey Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mping/ChangeLog,v 1.16 2014/07/13 14:05:39 jer Exp $
+
+  13 Jul 2014; Jeroen Roovers <jer@gentoo.org> -mping-2.0_rc1.ebuild,
+  mping-2.01.ebuild, files/mping-2.01-RFC3542.patch:
+  EAPI bump. Clean up patch.
 
   20 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/net-analyzer/mping/files/mping-2.01-RFC3542.patch b/net-analyzer/mping/files/mping-2.01-RFC3542.patch
index 564da2172664..be34aa7357fd 100644
--- a/net-analyzer/mping/files/mping-2.01-RFC3542.patch
+++ b/net-analyzer/mping/files/mping-2.01-RFC3542.patch
@@ -2,8 +2,8 @@ http://www.ietf.org/rfc/rfc3542.txt
 
 http://bugs.gentoo.org/153252
 
---- mping-2.01/src/mping.c
-+++ mping-2.01/src/mping.c
+--- a/src/mping.c
++++ b/src/mping.c
 @@ -1688,6 +1688,20 @@
          }
  }
diff --git a/net-analyzer/mping/mping-2.01.ebuild b/net-analyzer/mping/mping-2.01.ebuild
index 309417d8fbba..a664aed96363 100644
--- a/net-analyzer/mping/mping-2.01.ebuild
+++ b/net-analyzer/mping/mping-2.01.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mping/mping-2.01.ebuild,v 1.7 2006/11/15 12:58:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mping/mping-2.01.ebuild,v 1.8 2014/07/13 14:05:39 jer Exp $
 
+EAPI=5
 inherit eutils
 
 DESCRIPTION="IPv4/6 round-robin multiping client"
@@ -11,15 +12,9 @@ SRC_URI="http://mping.uninett.no/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-RFC3542.patch
-}
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-RFC3542.patch
 }
diff --git a/net-analyzer/mping/mping-2.0_rc1.ebuild b/net-analyzer/mping/mping-2.0_rc1.ebuild
deleted file mode 100644
index a90319850088..000000000000
--- a/net-analyzer/mping/mping-2.0_rc1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mping/mping-2.0_rc1.ebuild,v 1.10 2006/01/10 00:07:37 vapier Exp $
-
-DESCRIPTION="IPv4/6 round-robin multiping client"
-HOMEPAGE="http://mping.uninett.no"
-SRC_URI="http://mping.uninett.no/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 sparc x86"
-IUSE=""
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}